[evolution] Update Finnish translation



commit 7baf811db738966b2f3db7a41c17432615654687
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Wed Feb 7 17:21:19 2018 +0000

    Update Finnish translation

 po/fi.po | 7441 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 3712 insertions(+), 3729 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 35aedbb..903be57 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,14 +15,13 @@
 # Lasse Liehu <lasse liehu gmail com>, 2014.
 # Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013, 2014, 2015, 2016, 2017.
 #
-#: ../src/shell/main.c:519
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-30 16:34+0000\n"
-"PO-Revision-Date: 2017-09-05 10:25+0300\n"
+"POT-Creation-Date: 2018-01-31 11:35+0000\n"
+"PO-Revision-Date: 2018-02-07 19:20+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -32,115 +31,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2010-09-13 15:08+0000\n"
 "X-POT-Import-Date: 2012-03-05 15:05:59+0000\n"
-"X-Generator: Gtranslator 2.91.7\n"
-
-#: ../evolution.appdata.xml.in.h:1 ../data/evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1098
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:240
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../evolution.appdata.xml.in.h:2 ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "Hallitse sähköposteja, yhteystietoja ja ajan käyttöä"
-
-#: ../evolution.appdata.xml.in.h:3
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution on henkilökohtaisen tiedon hallintasovellus, joka tarjoaa "
-"sähköpostin, kalenterin ja osoitekirjan."
-
-#: ../evolution.appdata.xml.in.h:4
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
-msgstr ""
-"Evolution tukee lukuisia standardeja tiedostomuotoja ja verkkoprotokollia "
-"tiedonvaihtoa varten, painoarvoa on asetettu erityisesti standardien "
-"noudattamiseen ja tietoturvaan. Evolution voi myös integroitua Microsoft "
-"Exchange -palvelimeen Exchange Web Services (EWS) -laajennuksen avulla."
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Evolutionin hälytysilmoitukset"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "Kalenteritapahtumien ilmoitukset"
-
-#: ../data/evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
-msgid "Groupware Suite"
-msgstr "Ryhmätyöohjelmisto"
-
-#: ../data/evolution.desktop.in.in.h:3
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution-sähköposti ja -kalenteri"
-
-#: ../data/evolution.desktop.in.in.h:5
-msgid "email;calendar;contact;addressbook;task;"
-msgstr ""
-"email;calendar;contact;addressbook;task;sähköposti;kalenteri;yhteystiedot;"
-"osoitekirja;tehtävä;"
-
-#: ../data/evolution.desktop.in.in.h:6
-msgid "New Window"
-msgstr "Uusi ikkuna"
-
-#: ../data/evolution.desktop.in.in.h:7
-msgid "Compose a Message"
-msgstr "Uusi viesti"
-
-#: ../data/evolution.desktop.in.in.h:8
-#: ../src/e-util/e-name-selector-dialog.c:448
-#: ../src/modules/addressbook/e-book-shell-backend.c:307
-#: ../src/modules/addressbook/e-book-shell-view.c:371
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
-#: ../data/evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
-#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
-#: ../src/modules/calendar/e-cal-shell-view.c:582
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Kalenteri"
-
-#: ../data/evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
-#: ../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:1247
-#: ../src/smime/gui/certificate-manager.c:1682
-msgid "Mail"
-msgstr "Sähköposti"
-
-#: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368
-#: ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1719
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
-#: ../src/modules/calendar/e-memo-shell-view.c:313
-msgid "Memos"
-msgstr "Muistilaput"
-
-#: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696
-#: ../src/calendar/gui/print.c:2418
-#: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1114
-#: ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
-#: ../src/modules/calendar/e-cal-shell-content.c:1679
-#: ../src/modules/calendar/e-task-shell-view-actions.c:218
-#: ../src/modules/calendar/e-task-shell-view-actions.c:233
-#: ../src/modules/calendar/e-task-shell-view.c:471
-msgid "Tasks"
-msgstr "Tehtävät"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -148,8 +39,8 @@ msgstr "Käytä osoitteen muotoilua"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
 msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
+"Whether addresses should be formatted according to standard in their destination "
+"country"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
@@ -161,8 +52,8 @@ msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"Kuinka monta merkkiä tulee kirjoittaa ennen kuin Evolution yrittää "
-"automaattista täydennystä."
+"Kuinka monta merkkiä tulee kirjoittaa ennen kuin Evolution yrittää automaattista "
+"täydennystä."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
 msgid "Show autocompleted name with an address"
@@ -170,8 +61,8 @@ msgstr "Näytä automaattitäydennetyt nimet osoitteen kanssa"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
 msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
+"Whether force showing the mail address with the name of the autocompleted contact "
+"in the entry."
 msgstr ""
 "Pakotetaanko sähköpostiosoitteen näyttäminen nimen lisäksi automaattisesti "
 "täydennetyn yhteystiedon kohdalla kentässä."
@@ -190,10 +81,9 @@ msgstr "Yhteystiedon asettelutyyli"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. “0” (Classic View) places the preview pane below the "
-"contact list. “1” (Vertical View) places the preview pane next to the "
-"contact list."
+"The layout style determines where to place the preview pane in relation to the "
+"contact list. “0” (Classic View) places the preview pane below the contact list. "
+"“1” (Vertical View) places the preview pane next to the contact list."
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
@@ -316,8 +206,8 @@ msgstr "Luo uusi yhteystietoluettelo"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:34
 msgid ""
-"Currently supported values are “openstreetmap” and “google”; if unknown set, "
-"uses “openstreetmap”"
+"Currently supported values are “openstreetmap” and “google”; if unknown set, uses "
+"“openstreetmap”"
 msgstr ""
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
@@ -338,9 +228,8 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
 msgid ""
-"Full path to a Bogofilter command. If not set, then a compile-time path is "
-"used, usually /usr/bin/bogofilter. The command should not contain any other "
-"arguments."
+"Full path to a Bogofilter command. If not set, then a compile-time path is used, "
+"usually /usr/bin/bogofilter. The command should not contain any other arguments."
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
@@ -370,8 +259,7 @@ msgstr "Syntymä- ja vuosipäivät"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
 #, fuzzy
-msgid ""
-"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
+msgid "Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
@@ -381,11 +269,11 @@ msgstr "Tiivistä viikonloput kuukausinäkymässä"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
 #, fuzzy
 msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
+"Whether to compress weekends in the month view, which puts Saturday and Sunday in "
+"the space of one weekday"
 msgstr ""
-"Pakataanko viikonloput kuukausinäkymässä. Tämä tiivistää lauantain ja "
-"sunnuntain yhden viikonpäivän kokoisiksi."
+"Pakataanko viikonloput kuukausinäkymässä. Tämä tiivistää lauantain ja sunnuntain "
+"yhden viikonpäivän kokoisiksi."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
 msgid "Ask for confirmation when deleting items"
@@ -412,8 +300,8 @@ msgstr "Kuukausinäkymän pystypaneelin sijainti"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
 #, fuzzy
 msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
+"Position of the vertical pane, between the calendar lists and the date navigator "
+"calendar"
 msgstr ""
 "Vaakapaneelin sijainti pikseleinä , kalenterin listojen ja päivämäärien "
 "selausnäkymän välissä."
@@ -459,8 +347,8 @@ msgstr "Työpäivän alkamisaika maanantaille"
 #, fuzzy
 #| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgid ""
-"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
-"or -1 to use day-start-hour and day-start-minute"
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, or -1 "
+"to use day-start-hour and day-start-minute"
 msgstr "Tunti jona työpäivä alkaa 24-tunnin muodossa, väliltä 0-23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
@@ -470,8 +358,8 @@ msgstr "Työpäivän päättymisaika maanantaille"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
 #, fuzzy
 msgid ""
-"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
-"-1 to use day-end-hour and day-end-minute"
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or -1 to "
+"use day-end-hour and day-end-minute"
 msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
@@ -481,8 +369,8 @@ msgstr "Työpäivän alkamisaika tiistaille"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
 #, fuzzy
 msgid ""
-"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
-"-1 to use day-start-hour and day-start-minute"
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or -1 to "
+"use day-start-hour and day-start-minute"
 msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
@@ -536,8 +424,8 @@ msgstr "Päivänäkymän toissijainen aikavyöhyke"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
 #, fuzzy
 msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a “timezone” key"
+"Shows the second time zone in a Day View, if set. Value is similar to one used in "
+"a “timezone” key"
 msgstr ""
 "Näyttää toissijaisen aikavyöhykkeen aikanäkymässä, jos asetettu. Arvo on "
 "samanlainen kuin avaimessa \"timezone\"."
@@ -559,8 +447,7 @@ msgstr "Kuinka monta äskettäin valittua aikavyöhykettä muistetaan."
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
 #, fuzzy
 msgid ""
-"Maximum number of recently used timezones to remember in a “day-second-"
-"zones” list"
+"Maximum number of recently used timezones to remember in a “day-second-zones” list"
 msgstr ""
 "Enimmäismäärä äskettäin valittuja toissijaisia aikavyöhykkeitä avaimen "
 "\"day_second_zones\" luettelossa."
@@ -609,8 +496,7 @@ msgstr "Näytä roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+msgstr "Näytetäänkö roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Show RSVP field in the event/task/meeting editor"
@@ -618,8 +504,7 @@ msgstr "Näytä RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+msgstr "Näytetäänkö RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Show status field in the event/task/meeting editor"
@@ -643,8 +528,7 @@ msgstr "Näytä tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+msgstr "Näytetäänkö tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide completed tasks"
@@ -663,8 +547,8 @@ msgstr "Piilota tehtävien yksiköt"
 #, fuzzy
 msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
 msgstr ""
-"Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot \"minutes"
-"\", \"hours\" tai \"days\"."
+"Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot \"minutes\", "
+"\"hours\" tai \"days\"."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid "Hide task value"
@@ -682,11 +566,11 @@ msgstr "Vaakapaneelin sijainti"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 #, fuzzy
 msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels"
+"Position of the horizontal pane, between the date navigator calendar and the task "
+"list when not in the month view, in pixels"
 msgstr ""
-"Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
-"välissä jos ei olla kuukausinäkymässä."
+"Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan välissä jos "
+"ei olla kuukausinäkymässä."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 #, fuzzy
@@ -706,8 +590,7 @@ msgid "Allow past reminders"
 msgstr "sisältää muistutuksia"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-msgid ""
-"Whether can show reminders for events/tasks/memos which already happened"
+msgid "Whether can show reminders for events/tasks/memos which already happened"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
@@ -730,8 +613,7 @@ msgstr "Marcus Bains -viivan väri - aikajana"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 #, fuzzy
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr ""
-"Väri, jolla Marcus Bains -viiva piirretään aikajanassa (tyhjä oletuksena)."
+msgstr "Väri, jolla Marcus Bains -viiva piirretään aikajanassa (tyhjä oletuksena)."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Marcus Bains Line"
@@ -739,8 +621,7 @@ msgstr "Marcus Bains -viiva"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 #, fuzzy
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "Piirretäänkö Marcus Bains -viiva (viiva nykyhetkessä) kalenteriin."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
@@ -758,9 +639,9 @@ msgstr "Muistilappujen asettelutyyli"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. “0” (Classic View) places the preview pane below the memo "
-"list. “1” (Vertical View) places the preview pane next to the memo list"
+"The layout style determines where to place the preview pane in relation to the "
+"memo list. “0” (Classic View) places the preview pane below the memo list. "
+"“1” (Vertical View) places the preview pane next to the memo list"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
@@ -779,11 +660,11 @@ msgstr "Kuukausinäkymän vaakapaneelin sijainti"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 #, fuzzy
 msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
+"Position of the horizontal pane, between the view and the date navigator calendar "
+"and task list in the month view, in pixels"
 msgstr ""
-"Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
-"välissä käytettäessä kuukausinäkymää."
+"Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan välissä "
+"käytettäessä kuukausinäkymää."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 #, fuzzy
@@ -821,8 +702,8 @@ msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
-"Whether or not to show reminder notification dialog always on top. Note this "
-"works only as a hint for the window manager, which may or may not obey it."
+"Whether or not to show reminder notification dialog always on top. Note this works "
+"only as a hint for the window manager, which may or may not obey it."
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
@@ -839,8 +720,8 @@ msgstr "Ensisijainen kalenteri"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
-"The UID of the selected (or “primary”) calendar in the sidebar of the "
-"“Calendar” view"
+"The UID of the selected (or “primary”) calendar in the sidebar of the “Calendar” "
+"view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
@@ -849,8 +730,7 @@ msgstr "Ensisijainen muistilappulista"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid ""
-"The UID of the selected (or “primary”) memo list in the sidebar of the "
-"“Memos” view"
+"The UID of the selected (or “primary”) memo list in the sidebar of the “Memos” view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
@@ -859,8 +739,7 @@ msgstr "Ensisijainen tehtävälista"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid ""
-"The UID of the selected (or “primary”) task list in the sidebar of the "
-"“Tasks” view"
+"The UID of the selected (or “primary”) task list in the sidebar of the “Tasks” view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
@@ -870,8 +749,8 @@ msgstr "Vapaa/varattu-mallin osoite"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 #, fuzzy, no-c-format
 msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain"
+"The URL template to use as a free/busy data fallback, %u is replaced by the user "
+"part of the mail address and %d is replaced by the domain"
 msgstr ""
 "URL-malli, jota käytetään vapaa/varattu-tiedon varaosoitteena. %u korvataan "
 "sähköpostiosoitteen käyttäjäosalla ja %d aluenimellä."
@@ -890,9 +769,8 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 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"
+"How many years can the time-based search go forward or backward from currently "
+"selected day when searching for another occurrence; default is ten years"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
@@ -952,8 +830,7 @@ msgid "Highlight tasks due today"
 msgstr "Korosta tänään erääntyvät tehtävät"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid ""
-"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgid "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
@@ -963,8 +840,8 @@ msgstr "Tänään erääntyvien tehtävien väri"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 #, fuzzy
 msgid ""
-"Background color of tasks that are due today, in “#rrggbb” format. Used "
-"together with task-due-today-highlight"
+"Background color of tasks that are due today, in “#rrggbb” format. Used together "
+"with task-due-today-highlight"
 msgstr "Tänään erääntyvien tehtävien väri, \"#rrggbb\"-muodossa."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
@@ -977,9 +854,9 @@ msgstr "Tehtävien asettelutapa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 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"
+"The layout style determines where to place the preview pane in relation to the "
+"task list. “0” (Classic View) places the preview pane below the task list. "
+"“1” (Vertical View) places the preview pane next to the task list"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
@@ -999,8 +876,8 @@ msgstr "Piilota valmistuneet tehtävät"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
-"Whether to show reminders for completed tasks. When set to false, reminders "
-"for completed tasks are suppressed."
+"Whether to show reminders for completed tasks. When set to false, reminders for "
+"completed tasks are suppressed."
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
@@ -1008,8 +885,7 @@ msgid "Highlight overdue tasks"
 msgstr "Korosta eräpäivän ylittäneet tehtävät"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
-msgid ""
-"Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgid "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
@@ -1019,8 +895,8 @@ msgstr "Eräpäivän ylittäneiden tehtävien väri"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 #, fuzzy
 msgid ""
-"Background color of tasks that are overdue, in “#rrggbb” format. Used "
-"together with task-overdue-highlight."
+"Background color of tasks that are overdue, in “#rrggbb” format. Used together "
+"with task-overdue-highlight."
 msgstr "Eräpäivän ylittäneiden tehtävien väri, \"#rrggbb\"-muodossa."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
@@ -1043,8 +919,7 @@ msgid ""
 "untranslated Olson timezone database location like “America/New York”"
 msgstr ""
 "Oletusaikavyöhyke käytettävissä päivämäärissä ja kalenterissa, muodossa "
-"kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/"
-"Helsinki\"."
+"kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/Helsinki\"."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Twenty four hour time format"
@@ -1118,25 +993,35 @@ msgid "Create events, memos and tasks as Private by default"
 msgstr "Luo tapahtumat, muistiinpanot ja tehtävät yksityisenä oletuksena"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+msgid "Draw events as flat, not shaded."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+msgid ""
+"Whether to order days in the Week View from left to right, rather than from top to "
+"bottom."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
 #, 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:161
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
 msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"“week-start-day-name” instead."
+"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:162
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:164
 msgid "(Deprecated) Work days"
 msgstr "(Vanhennettu) Työpäivät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:165
 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-monday”, “work-day-tuesday”, etc. keys instead.)"
+"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-"
+"monday”, “work-day-tuesday”, etc. keys instead.)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
@@ -1145,9 +1030,8 @@ msgstr "Evolutionin edellinen versio"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
 msgid ""
-"The most recently used version of Evolution, expressed as “major.minor."
-"micro”. This is used for data and settings migration from older to newer "
-"versions."
+"The most recently used version of Evolution, expressed as “major.minor.micro”. "
+"This is used for data and settings migration from older to newer versions."
 msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
@@ -1201,10 +1085,8 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Tarkista onko Evolution sähköpostin oletusohjelma"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Tarkista aina Evolutionin käynnistyessä onko se sähköpostin oletusohjelma."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Tarkista aina Evolutionin käynnistyessä onko se sähköpostin oletusohjelma."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
 msgid "Default charset in which to compose messages"
@@ -1235,8 +1117,8 @@ msgstr "Polku, josta kuvagallerian tulisi etsiä sisältöä"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
 msgid ""
 "This value can be an empty string, which means it’ll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder"
+"folder, usually set to ~/Pictures. This folder will be also used when the set path "
+"is not pointing to the existent folder"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
@@ -1263,8 +1145,7 @@ msgstr "Tunnista hymiöt automaattisesti"
 #, fuzzy
 #| msgid "Recognize emoticons in text and replace them with images."
 msgid ""
-"Recognize emoticons in text and replace them with images or Unicode "
-"characters."
+"Recognize emoticons in text and replace them with images or Unicode characters."
 msgstr "Tunnista hymiöt tekstissä ja korvaa ne kuvilla."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
@@ -1284,8 +1165,8 @@ msgstr "Liitetty viesti"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
+"The text that is inserted when replying to a message, attributing the message to "
+"the original author"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
@@ -1294,8 +1175,8 @@ msgstr "Välitetty viesti"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
+"The text that is inserted when forwarding a message, saying that the forwarded "
+"message follows"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
@@ -1304,8 +1185,8 @@ msgstr "Alkuperäinen viesti"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
+"The text that is inserted when replying to a message (top posting), saying that "
+"the original message follows"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
@@ -1314,10 +1195,9 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 msgid ""
-"Instead of the normal “Reply to All” behaviour, this option will make the "
-"“Group Reply” toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you’re "
-"replying."
+"Instead of the normal “Reply to All” behaviour, this option will make the “Group "
+"Reply” toolbar button try to reply only to the mailing list through which you "
+"happened to receive the copy of the message to which you’re replying."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
@@ -1327,12 +1207,12 @@ msgstr "Aseta osoitin viestin loppuun vastattaessa"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
+"message. This determines whether the cursor is placed at the top of the message or "
+"the bottom."
 msgstr ""
 "Käyttäjät ovat välillä hyvin tarkkoja siitä, mihin kohdistimen tulisi mennä "
-"vastattaessa viestiin. Tämä asetus määrittää, viedäänkö kursori viestin "
-"alkuun vai loppuun."
+"vastattaessa viestiin. Tämä asetus määrittää, viedäänkö kursori viestin alkuun vai "
+"loppuun."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Always request read receipt"
@@ -1367,11 +1247,11 @@ msgstr "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 #, fuzzy
 #| msgid ""
-#| "Show the \"Bcc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
+#| "Show the \"Bcc\" field when sending a mail message. This is controlled from the "
+#| "View menu when a mail account is chosen."
 msgid ""
-"Show the “Bcc” field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+"Show the “Bcc” field when sending a mail message. This is controlled from the View "
+"menu when a mail account is chosen."
 msgstr ""
 "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
@@ -1385,11 +1265,11 @@ msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 #, fuzzy
 #| msgid ""
-#| "Show the \"Cc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
+#| "Show the \"Cc\" field when sending a mail message. This is controlled from the "
+#| "View menu when a mail account is chosen."
 msgid ""
-"Show the “Cc” field when sending a mail message. This is controlled from the "
-"View menu when a mail account is chosen."
+"Show the “Cc” field when sending a mail message. This is controlled from the View "
+"menu when a mail account is chosen."
 msgstr ""
 "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
@@ -1403,11 +1283,11 @@ msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 #, fuzzy
 #| msgid ""
-#| "Show the \"Cc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
+#| "Show the \"Cc\" field when sending a mail message. This is controlled from the "
+#| "View menu when a mail account is chosen."
 msgid ""
-"Show the “From” override field when sending a mail message. This is "
-"controlled from the View menu when a mail account is chosen."
+"Show the “From” override field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
 msgstr ""
 "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
@@ -1421,14 +1301,14 @@ msgstr "Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 #, fuzzy
 #| msgid ""
-#| "Show the \"Reply To\" field when sending a mail message. This is "
-#| "controlled from the View menu when a mail account is chosen."
+#| "Show the \"Reply To\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
 msgid ""
-"Show the “Reply To” field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
+"Show the “Reply To” field when sending a mail message. This is controlled from the "
+"View menu when a mail account is chosen."
 msgstr ""
-"Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan "
-"Näytä-valikosta, kun sähköpostitili on valittu."
+"Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
+"valikosta, kun sähköpostitili on valittu."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 #, fuzzy
@@ -1439,14 +1319,14 @@ msgstr "Näytä \"From\"-kenttä lähetettäessä uutisryhmään"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 #, fuzzy
 #| msgid ""
-#| "Show the \"From\" field when posting to a newsgroup. This is controlled "
-#| "from the View menu when a news account is chosen."
+#| "Show the \"From\" field when posting to a newsgroup. This is controlled from "
+#| "the View menu when a news account is chosen."
 msgid ""
-"Show the “From” field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
+"Show the “From” field when posting to a newsgroup. This is controlled from the "
+"View menu when a news account is chosen."
 msgstr ""
-"Näytä \"From\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
-"Näytä-valikosta, kun sähköpostitili on valittu."
+"Näytä \"From\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan Näytä-"
+"valikosta, kun sähköpostitili on valittu."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 #, fuzzy
@@ -1457,25 +1337,24 @@ msgstr "Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 #, fuzzy
 #| msgid ""
-#| "Show the \"Reply To\" field when posting to a newsgroup. This is "
-#| "controlled from the View menu when a news account is chosen."
+#| "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+#| "from the View menu when a news account is chosen."
 msgid ""
-"Show the “Reply To” field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
+"Show the “Reply To” field when posting to a newsgroup. This is controlled from the "
+"View menu when a news account is chosen."
 msgstr ""
-"Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
-"Näytä-valikosta, kun sähköpostitili on valittu."
+"Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan Näytä-"
+"valikosta, kun sähköpostitili on valittu."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Digitally sign replies when the original message is signed"
 msgstr ""
-"Allekirjoita digitaalisesti vastaukset, kun alkuperäinen viesti on "
-"allekirjoitettu"
+"Allekirjoita digitaalisesti vastaukset, kun alkuperäinen viesti on allekirjoitettu"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
+"Automatically enable PGP or S/MIME signatures when replying to a message which is "
+"also PGP or S/MIME signed."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
@@ -1486,15 +1365,14 @@ msgstr "Muotoile tiedostonimet Outlookin ja GMailin tapaan."
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 #, fuzzy
 msgid ""
-"Encode filenames in the mail headers same as Outlook or GMail do, to let "
-"them display correctly filenames with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+"Encode filenames in the mail headers same as Outlook or GMail do, to let them "
+"display correctly filenames with UTF-8 letters sent by Evolution, because they do "
+"not follow the RFC 2231, but use the incorrect RFC 2047 standard."
 msgstr ""
-"Koodaa tiedostonimet postiotsakkeissa samalla tavalla kuin Outlook ja Gmail, "
-"jotta ne pystyvät tunnistamaan Evolution lähettämät tiedostonimet, joissa on "
-"UTF-8 merkistön merkkejä. Nämä ohjelmat eivät noudata standardia RFC 2231, "
-"vaan käyttävät virheellistä standardia RFC 2047."
+"Koodaa tiedostonimet postiotsakkeissa samalla tavalla kuin Outlook ja Gmail, jotta "
+"ne pystyvät tunnistamaan Evolution lähettämät tiedostonimet, joissa on UTF-8 "
+"merkistön merkkejä. Nämä ohjelmat eivät noudata standardia RFC 2231, vaan "
+"käyttävät virheellistä standardia RFC 2047."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 #, fuzzy
@@ -1503,8 +1381,8 @@ msgstr "Tallennetaan viestiä kansioon"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
-"Always save messages to Outbox folder when sending, to let a user choose "
-"when the messages should be sent."
+"Always save messages to Outbox folder when sending, to let a user choose when the "
+"messages should be sent."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
@@ -1513,8 +1391,8 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
-"Include selected signature only for new messages, but have no signature "
-"added for Replies or Forwards."
+"Include selected signature only for new messages, but have no signature added for "
+"Replies or Forwards."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
@@ -1523,13 +1401,13 @@ msgstr "Lisää oma allekirjoitus vastauksen alkuun"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
+"Users get all up in arms over where their signature should go when replying to a "
+"message. This determines whether the signature is placed at the top of the message "
+"or the bottom."
 msgstr ""
-"Käyttäjät ovat välillä hyvin tarkkoja siitä, mihin allekirjoitus tulisi "
-"lisätä vastattaessa viestiin. Tämä asetus määrittää, lisätäänkö se viestin "
-"alkuun vai loppuun."
+"Käyttäjät ovat välillä hyvin tarkkoja siitä, mihin allekirjoitus tulisi lisätä "
+"vastattaessa viestiin. Tämä asetus määrittää, lisätäänkö se viestin alkuun vai "
+"loppuun."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Do not add signature delimiter"
@@ -1542,399 +1420,409 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "Ignore list Reply-To:"
+msgid "Keep original message signature in replies"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the “Reply to List” action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+"When set to TRUE, keep original message signature in replies, otherwise strip the "
+"signature and everything below it when replying to the message."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-msgid "List of localized “Re”"
+msgid "Ignore list Reply-To:"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
-"Comma-separated list of localized “Re” abbreviations to skip in a subject "
-"text when replying to a message, as an addition to the standard “Re” prefix. "
-"An example is “SV,AV”."
+"Some mailing lists set a Reply-To: header to trick users into sending replies to "
+"the list, even when they ask Evolution to make a private reply. Setting this "
+"option to TRUE will attempt to ignore such Reply-To: headers, so that Evolution "
+"will do as you ask it. If you use the private reply action, it will reply "
+"privately, while if you use the “Reply to List” action it will do that. It works "
+"by comparing the Reply-To: header with a List-Post: header, if there is one."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "List of localized “Re” separators"
+msgid "List of localized “Re”"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid ""
-"A list of localized “Re” separators, used to skip in a subject text when "
-"replying to a message, as an addition to the standard “:” and the Unicode "
-"“︰” separators."
+"Comma-separated list of localized “Re” abbreviations to skip in a subject text "
+"when replying to a message, as an addition to the standard “Re” prefix. An example "
+"is “SV,AV”."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-msgid "Number of characters for wrapping"
+msgid "List of localized “Re” separators"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-msgid "Will autowrap lines after given number of characters."
+msgid ""
+"A list of localized “Re” separators, used to skip in a subject text when replying "
+"to a message, as an addition to the standard “:” and the Unicode “︰” separators."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-msgid ""
-"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
+msgid "Use localized “Fwd”/“Re” in message Subject"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid ""
-"When to ask, when the number of To and CC recipients reaches this value."
+"When set to true, uses localized “Fwd”/“Re” in message Subject on reply and "
+"forward as provided by current locale translation, otherwise uses unlocalized "
+"version."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgid "Number of characters for wrapping"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-msgid ""
-"If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
-"always shown in the composer’s toolbar. Otherwise they are shown only when "
-"being used."
+msgid "Will autowrap lines after given number of characters."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-msgid "Wrap quoted text in replies"
+msgid "Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-msgid "If set to “true” quoted text in replies will be wrapped."
+msgid "When to ask, when the number of To and CC recipients reaches this value."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-msgid "Whether to obey Content-Disposition:inline message header hint"
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
-"Set to “false” to block automatic display of attachments with Content-"
-"Disposition: inline."
+"If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are always "
+"shown in the composer’s toolbar. Otherwise they are shown only when being used."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-msgid "Save file format for drag-and-drop operation"
+msgid "Wrap quoted text in replies"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+msgid "If set to “true” quoted text in replies will be wrapped."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+msgid ""
+"Set to “false” to block automatic display of attachments with Content-Disposition: "
+"inline."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "Save file format for drag-and-drop operation"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Voi olla joko “mbox” tai “pdf”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"Enable animated images in HTML mail. Many users find animated images annoying and "
+"prefer to see a static image instead."
 msgstr ""
-"Näytä animoidut kuvat HTML-viesteissä. Monista käyttäjistä animoidut kuvat "
-"ovat ärsyttäviä ja he haluavat nähdä kuvat ilman animaatioita."
+"Näytä animoidut kuvat HTML-viesteissä. Monista käyttäjistä animoidut kuvat ovat "
+"ärsyttäviä ja he haluavat nähdä kuvat ilman animaatioita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable or disable type ahead search feature"
 msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
+"Enable the side bar search feature to allow interactive searching of folder names."
 msgstr ""
-"Ota sivupalkin hakutoiminto käyttöön etsiäksesi kansionimiä "
-"interaktiivisesti."
+"Ota sivupalkin hakutoiminto käyttöön etsiäksesi kansionimiä interaktiivisesti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Enable or disable magic space bar"
 msgstr "Käytetäänkö maagista välilyöntinäppäintä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+"Enable this to use Space bar key to scroll in message preview, message list and "
+"folders."
 msgstr ""
 "Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 #, fuzzy
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 #, fuzzy
 #| msgid "Mark citations in the message \"Preview\""
 msgid "Mark citations in the message “Preview”"
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 #, fuzzy
 #| msgid "Mark citations in the message \"Preview\"."
 msgid "Mark citations in the message “Preview”."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Kytke caret-tila, jolloin näet kursorin lukiessasi sähköpostia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Lataa HTML-viestien kuvat HTTP:n yli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show notification about missing remote content"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "When the message preview shows a message which requires to download remote "
-"content, while the download is not allowed for the user or the site, then "
-"show a notification about it on top of the preview panel."
+"content, while the download is not allowed for the user or the site, then show a "
+"notification about it on top of the preview panel."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Show all message headers"
 msgstr "Näytä kaikki otsakkeet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Show all the headers when viewing a messages."
 msgstr "Näytä kaikki viestin otsakkeet näytettäessä viestiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "List of headers to show when viewing a message."
 msgstr "Luettelo otsakkeista, jotka näytetään viestiä katsellessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid ""
-"Each header is represented as a pair: the header name, and a boolean "
-"indicating whether the header is enabled. Disabled headers are not shown "
-"when viewing a message, but are still listed in Preferences."
+"Each header is represented as a pair: the header name, and a boolean indicating "
+"whether the header is enabled. Disabled headers are not shown when viewing a "
+"message, but are still listed in Preferences."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 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:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Näytä lähettäjän valokuvaa gravatar.comista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 #, fuzzy
 #| msgid "Mark as Seen after specified timeout"
 msgid "Mark as Seen always after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
-"If set to true, the selected message will be set as unread after the timeout "
-"also after the folder change."
+"If set to true, the selected message will be set as unread after the timeout also "
+"after the folder change."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 #, fuzzy
 msgid "Timeout for marking messages as seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 #, fuzzy
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Show Attachment Bar"
 msgstr "Näytä liitepalkki"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Sender email-address column in the message list"
 msgstr "Näytä lähettäjän sähköposti viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr ""
-"Näytä lähettäjän sähköpostiosoite viestiluettelossa erillisessä sarakkeessa."
+"Show the email-address of the sender in a separate column in the message list."
+msgstr "Näytä lähettäjän sähköpostiosoite viestiluettelossa erillisessä sarakkeessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 #, fuzzy
 #| msgid "Show deleted messages in the message-list"
 msgid "Show junk messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 #, fuzzy
 #| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 #, fuzzy
 #| msgid "Enable search folders"
 msgid "Enable Unmatched search folder"
 msgstr "Ota hakunäkymät käyttöön"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid ""
-"Enable Unmatched search folder within Search Folders. It does nothing if "
-"Search Folders are disabled."
+"Enable Unmatched search folder within Search Folders. It does nothing if Search "
+"Folders are disabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Piilottaa kansiokohtaisen esikatselun ja poistaa valinnan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 #, fuzzy
 #| msgid ""
-#| "This key is read only once and reset to \"false\" after read. This "
-#| "unselects the mail in the list and removes the preview for that folder."
+#| "This key is read only once and reset to \"false\" after read. This unselects "
+#| "the mail in the list and removes the preview for that folder."
 msgid ""
-"This key is read only once and reset to “false” after read. This unselects "
-"the mail in the list and removes the preview for that folder."
+"This key is read only once and reset to “false” after read. This unselects the "
+"mail in the list and removes the preview for that folder."
 msgstr ""
-"Tämä avain luetaan kerran, ja nollataan arvoksi \"false\" lukemisen "
-"jälkeen.  Tämä peruu sähköpostin valinnan luettelosta ja poistaa esikatselun "
-"kansiolta."
+"Tämä avain luetaan kerran, ja nollataan arvoksi \"false\" lukemisen jälkeen.  Tämä "
+"peruu sähköpostin valinnan luettelosta ja poistaa esikatselun kansiolta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Layout style"
 msgstr "Asettelutyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. “0” (Classic View) places the preview pane below the "
-"message list. “1” (Vertical View) places the preview pane next to the "
-"message list."
+"The layout style determines where to place the preview pane in relation to the "
+"message list. “0” (Classic View) places the preview pane below the message list. "
+"“1” (Vertical View) places the preview pane next to the message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen fontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Terminal font"
 msgstr "Päätteen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "The terminal font for mail display."
 msgstr "Päätefontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Use custom fonts"
 msgstr "Käytä omia fontteja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Use custom fonts for displaying mail."
 msgstr "Käytä omia fontteja näytettäessä viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Rajaa näytettäviä To-, Cc- ja Bcc-osoitteita"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -1942,760 +1830,773 @@ msgstr ""
 "Rajaa To-, Cc- ja Bcc-kentissä näytettävien osoitteiden lukumäärä avaimessa "
 "address_count määrättyyn arvoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "To-, Cc- ja Bcc-osoitteiden näytettävä lukumäärä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 #, fuzzy
 #| msgid ""
-#| "This sets the number of addresses to show in default message list view, "
-#| "beyond which a '...' is shown."
+#| "This sets the number of addresses to show in default message list view, beyond "
+#| "which a '...' is shown."
 msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a “...” is shown."
+"This sets the number of addresses to show in default message list view, beyond "
+"which a “...” is shown."
 msgstr ""
-"Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin "
-"lukumäärän, jonka jälkeen näytetään '...'."
+"Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin lukumäärän, "
+"jonka jälkeen näytetään '...'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+"Whether or not to fall back on threading by subjects when the messages do not "
+"contain In-Reply-To or References headers."
 msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"This setting specifies whether the threads should be in expanded or collapsed "
+"state by default. Evolution requires a restart."
 msgstr ""
-"Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. "
-"Muutos vaatii Evolutionin uudelleenkäynnistyksen."
+"Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. Muutos "
+"vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Järjestetäänkö säikeet säikeen viimeisen viestin mukaan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 #, fuzzy
 #| msgid ""
-#| "This setting specifies whether the threads should be sorted based on "
-#| "latest message in each thread, rather than by message's date. Evolution "
-#| "requires a restart."
+#| "This setting specifies whether the threads should be sorted based on latest "
+#| "message in each thread, rather than by message's date. Evolution requires a "
+#| "restart."
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message’s date. Evolution requires a "
 "restart."
 msgstr ""
-"Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin "
-"mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
-"uudelleenkäynnistyksen."
+"Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin mukaan "
+"viestin päiväyksen sijasta. Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Whether sort thread children always ascending"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 #, fuzzy
 #| msgid ""
-#| "This setting specifies whether the threads should be sorted based on "
-#| "latest message in each thread, rather than by message's date. Evolution "
-#| "requires a restart."
+#| "This setting specifies whether the threads should be sorted based on latest "
+#| "message in each thread, rather than by message's date. Evolution requires a "
+#| "restart."
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
 msgstr ""
-"Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin "
-"mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
-"uudelleenkäynnistyksen."
+"Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin mukaan "
+"viestin päiväyksen sijasta. Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user"
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to true "
+"accounts are sorted alphabetically, with an exception of On This Computer and "
+"Search folders, otherwise accounts are sorted based on an order given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
-"If not set, or being “stdout”, then the logging is done to stdout, instead "
-"to a file."
+"If not set, or being “stdout”, then the logging is done to stdout, instead to a "
+"file."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any “Forward to” filter action and approximately "
-"one minute after the last action invocation."
+"Whether to flush Outbox after filtering is done. Outbox flush will happen only "
+"when there was used any “Forward to” filter action and approximately one minute "
+"after the last action invocation."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 #, fuzzy
-#| msgid ""
-#| "Prompt the user when he or she tries to send a message without a Subject."
+#| msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgid ""
-"Prompt the user when he or she tries to send a message with a key "
-"accelerator."
-msgstr ""
-"Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
+"Prompt the user when he or she tries to send a message with a key accelerator."
+msgstr "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when emptying the trash"
 msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Kysy vahvistus käyttäjältä, kun roskakoria ollaan tyhjentämässä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
-"Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
+msgstr "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 #, fuzzy
 #| msgid "Prompt when user expunges"
 msgid "Prompt when user calls Empty Junk"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to expunge a folder."
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
-msgstr ""
-"Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
+msgstr "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 #, fuzzy
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
-"Seuraavia vastaanottajia ei tunnistettu kelvollisiksi "
-"sähköpostiosoitteiksi:\n"
+"Seuraavia vastaanottajia ei tunnistettu kelvollisiksi sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 #, fuzzy
 msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
+"It disables/enables the repeated prompts to warn that you are trying to send a "
+"message to recipients not entered as mail addresses"
 msgstr ""
-"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
-"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
+"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
+"siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
-"Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-"
-"kenttiä."
+"Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-kenttiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
-"eivät sellaista halua vastaanottaa."
+"Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka eivät "
+"sellaista halua vastaanottaa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Kysy kun käyttäjä yrittää avata kymmenen tai useampia kerralla"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+"If a user tries to open 10 or more messages at one time, ask the user if they "
+"really want to do it."
 msgstr ""
-"Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko "
-"todella tehdä sen."
+"Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko todella "
+"tehdä sen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Näytetäänkö kehto merkittäessä useita viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
+"It disables/enables the repeated prompts to warn that deleting messages from a "
+"search folder permanently deletes the message, not simply removing it from the "
+"search results."
 msgstr ""
-"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
-"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
+"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
+"siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
-"Possible values are: “never” — do not allow copy with drag &amp; drop of "
-"folders in folder tree, “always” — allow copy with drag &amp; drop of "
-"folders in folder tree without asking, or “ask” — (or any other value) will "
-"ask user."
+"Possible values are: “never” — do not allow copy with drag &amp; drop of folders "
+"in folder tree, “always” — allow copy with drag &amp; drop of folders in folder "
+"tree without asking, or “ask” — (or any other value) will ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
-"Possible values are: “never” — do not allow move with drag &amp; drop of "
-"folders in folder tree, “always” — allow move with drag &amp; drop of "
-"folders in folder tree without asking, or “ask” — (or any other value) will "
-"ask user."
+"Possible values are: “never” — do not allow move with drag &amp; drop of folders "
+"in folder tree, “always” — allow move with drag &amp; drop of folders in folder "
+"tree without asking, or “ask” — (or any other value) will ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 #, fuzzy
 msgid "Prompt when replying privately to list messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #, fuzzy
 msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
+"It disables/enables the repeated prompts to warn that you are sending a private "
+"reply to a message which arrived via a mailing list."
 msgstr ""
-"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
-"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
+"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
+"siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 #, fuzzy
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
+"It disables/enables the repeated prompts to warn that you are trying sending a "
+"private reply to a message which arrived via a mailing list, but the list sets a "
+"Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 #, fuzzy
 msgid "Prompt when replying to many recipients"
-msgstr ""
-"Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
+msgstr "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 #, fuzzy
 msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
+"It disables/enables the repeated prompts to warn that you are sending a reply to "
+"many people."
 msgstr ""
-"Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko "
-"synkronointia yhteydettömään tilaan siirryttäessä."
+"Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko synkronointia "
+"yhteydettömään tilaan siirryttäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 #, fuzzy
 msgid ""
-"Prompt when switching composer format and the content needs to lose its "
-"formatting"
+"Prompt when switching composer format and the content needs to lose its formatting"
 msgstr ""
-"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
-"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
+"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
+"siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 #, fuzzy
 msgid ""
-"It disables/enables the repeated prompts to warn that you are switching "
-"composer format and the content needs to lose its formatting."
+"It disables/enables the repeated prompts to warn that you are switching composer "
+"format and the content needs to lose its formatting."
 msgstr ""
-"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
-"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
+"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
+"siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 #, fuzzy
 msgid "Prompt when sending to many To and CC recipients"
-msgstr ""
-"Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
+msgstr "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid ""
-"Policy for automatically closing the message browser window when forwarding "
-"or replying to the displayed message."
+"Policy for automatically closing the message browser window when forwarding or "
+"replying to the displayed message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskakori tyhjennetään suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Vähimmäisaika roskakorin tyhjennysten välillä (päiviä)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Last time Empty Trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 #, fuzzy
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Aika sekunteina, kuinka pitkään virheet näytetään tilarivillä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Level beyond which the message should be logged."
 msgstr "Taso, jonka jälkeen viesti kirjoitetaan lokiin."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 #, fuzzy
 #| msgid ""
-#| "This can have three possible values. \"0\" for errors. \"1\" for "
-#| "warnings. \"2\" for debug messages."
+#| "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+#| "\"2\" for debug messages."
 msgid ""
-"This can have three possible values. “0” for errors. “1” for warnings. “2” "
-"for debug messages."
+"This can have three possible values. “0” for errors. “1” for warnings. “2” for "
+"debug messages."
 msgstr ""
-"Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), "
-"\"1\" (varoitukset) tai \"2\" (vianetsintäviestit)."
+"Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), \"1\" (varoitukset) "
+"tai \"2\" (vianetsintäviestit)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 #, fuzzy
 #| msgid "Show original \"Date\" header value."
 msgid "Show original “Date” header value."
 msgstr "Näytä alkuperäinen \"Date\"-otsakearvo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
-"Show the original “Date” header (with a local time only if the time zone "
-"differs). Otherwise always show “Date” header value in a user preferred "
-"format and local time zone."
+"Show the original “Date” header (with a local time only if the time zone differs). "
+"Otherwise always show “Date” header value in a user preferred format and local "
+"time zone."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "List of Labels and their associated colors"
 msgstr "Merkinnät ja niihin liittyvät värit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
+"List of labels known to the mail component of Evolution. The list contains strings "
+"containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"Evolutionin sähköpostiosan tuntemat etiketit. Luettelo sisältää nimi:väri "
-"pareja, joissa väri on määritelty HTML-värien heksadesimaalisessa muodossa."
+"Evolutionin sähköpostiosan tuntemat etiketit. Luettelo sisältää nimi:väri pareja, "
+"joissa väri on määritelty HTML-värien heksadesimaalisessa muodossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskapostit poistetaan suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Minimum time between emptying the junk on exit, in days."
-msgstr ""
-"Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo päivinä."
+msgstr "Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo päivinä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 #, fuzzy
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskapostien poistokerran unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletuslisäosa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 #, fuzzy
 #| msgid ""
 #| "This is the default junk plugin, even though there are multiple plugins "
-#| "enabled. If the default listed plugin is disabled, then it won't fall "
-#| "back to the other available plugins."
+#| "enabled. If the default listed plugin is disabled, then it won't fall back to "
+#| "the other available plugins."
 msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won’t fall back "
-"to the other available plugins."
+"This is the default junk plugin, even though there are multiple plugins enabled. "
+"If the default listed plugin is disabled, then it won’t fall back to the other "
+"available plugins."
 msgstr ""
-"Tämä on roskapostin käsittelyn oletuslisäosa, vaikka useita olisi käytössä. "
-"Jos oletuslisäosa ei ole käytössä, ei palata käyttämään muita käytössä "
-"olevia lisäosia."
+"Tämä on roskapostin käsittelyn oletuslisäosa, vaikka useita olisi käytössä. Jos "
+"oletuslisäosa ei ole käytössä, ei palata käyttämään muita käytössä olevia lisäosia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Määrittää, etsitäänkö osoitekirjasta lähettäjän sähköpostiosoitetta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 #, fuzzy
 #| msgid ""
-#| "Determines whether to lookup the sender email in address book. If found, "
-#| "it shouldn't be a spam. It looks up in the books marked for "
-#| "autocompletion. It can be slow, if remote address books (like LDAP) are "
-#| "marked for autocompletion."
+#| "Determines whether to lookup the sender email in address book. If found, it "
+#| "shouldn't be a spam. It looks up in the books marked for autocompletion. It can "
+#| "be slow, if remote address books (like LDAP) are marked for autocompletion."
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
-"shouldn’t be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
+"shouldn’t be a spam. It looks up in the books marked for autocompletion. It can be "
+"slow, if remote address books (like LDAP) are marked for autocompletion."
 msgstr ""
-"Määrittää etsitäänkö lähettäjän osoitetta osoitekirjasta. Jos lähettäjä "
-"löytyy, ei viestiä tulkita roskapostiksi. Lähettäjää etsitään "
-"osoitekirjoista, jotka on valittu automaattista täydennystä varten. Tämä "
-"haku voi olla hidas, jos osoitteita täydennetään esimerkiksi LDAP-"
-"osoitekirjoista."
+"Määrittää etsitäänkö lähettäjän osoitetta osoitekirjasta. Jos lähettäjä löytyy, ei "
+"viestiä tulkita roskapostiksi. Lähettäjää etsitään osoitekirjoista, jotka on "
+"valittu automaattista täydennystä varten. Tämä haku voi olla hidas, jos osoitteita "
+"täydennetään esimerkiksi LDAP-osoitekirjoista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
+"Determines whether to look up addresses for junk filtering in local address book "
+"only"
 msgstr ""
-"Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta "
-"varten vain paikallisista osoitekirjoista"
+"Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta varten "
+"vain paikallisista osoitekirjoista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
+"This option is related to the key lookup_addressbook and is used to determine "
+"whether to look up addresses in local address book only to exclude mail sent by "
+"known contacts from junk filtering."
 msgstr ""
-"Tämä valinta liittyy avaimeen lookup_addressbook ja sitä käytetään "
-"määrittämään, etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, "
-"joille ei tehdä roskapostisuodatusta."
+"Tämä valinta liittyy avaimeen lookup_addressbook ja sitä käytetään määrittämään, "
+"etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, joille ei tehdä "
+"roskapostisuodatusta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
-"Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
+msgstr "Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
+"Determines whether to use custom headers to check for junk. If this option is "
+"enabled and the headers are mentioned, it will be improve the junk checking speed."
 msgstr ""
-"Määrittää käytetäänkö omia roskapostiotsakkeita. Jos tämä valinta on "
-"käytössä ja otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin "
-"tunnistamista."
+"Määrittää käytetäänkö omia roskapostiotsakkeita. Jos tämä valinta on käytössä ja "
+"otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin tunnistamista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Custom headers to use while checking for junk."
 msgstr "Omat otsakkeet, joiden perusteella roskaposti tunnistetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 #, fuzzy
 #| msgid ""
-#| "Custom headers to use while checking for junk. The list elements are "
-#| "string in the format \"headername=value\"."
+#| "Custom headers to use while checking for junk. The list elements are string in "
+#| "the format \"headername=value\"."
 msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format “headername=value”."
+"Custom headers to use while checking for junk. The list elements are string in the "
+"format “headername=value”."
 msgstr ""
-"Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
-"kohdat ovat muodossa \"otsakenimi=arvo\"."
+"Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon kohdat "
+"ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "Directory for loading/attaching files to composer."
 msgstr "Kansio, josta sähköpostin liitteitä etsitään."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "Check for new messages on start"
 msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
-"Whether to check for new messages when Evolution is started. This includes "
-"also sending messages from Outbox."
+"Whether to check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "Check for new messages in all active accounts"
 msgstr "Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
-"Whether to check for new messages in all active accounts regardless of the "
-"account “Check for new messages every X minutes” option when Evolution is "
-"started. This option is used only together with “send_recv_on_start” option."
+"Whether to check for new messages in all active accounts regardless of the account "
+"“Check for new messages every X minutes” option when Evolution is started. This "
+"option is used only together with “send_recv_on_start” option."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
-"Määrittää kuinka usein paikalliset muutokset synkronoidaan "
-"postipalvelimelle. Aikavälin täytyy olla vähintään 30 sekuntia."
+"Määrittää kuinka usein paikalliset muutokset synkronoidaan postipalvelimelle. "
+"Aikavälin täytyy olla vähintään 30 sekuntia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 #, fuzzy
 #| msgid "Confirm _when expunging a folder"
 msgid "Allow expunge in virtual folders"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
-"Enables Expunge in virtual folders, which means that the Folder→Expunge will "
-"be callable in virtual folders, while the expunge itself will be done in all "
-"folders for all deleted messages within the virtual folder, not only for "
-"deleted messages belonging to the virtual folder."
+"Enables Expunge in virtual folders, which means that the Folder→Expunge will be "
+"callable in virtual folders, while the expunge itself will be done in all folders "
+"for all deleted messages within the virtual folder, not only for deleted messages "
+"belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid ""
-"When enabled the theme colors for background, text and links are sent in "
-"resulting HTML formatted message."
+"When enabled the theme colors for background, text and links are sent in resulting "
+"HTML formatted message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid "An Archive folder for On This Computer folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 #, fuzzy
 msgid "Whether the To Do bar is visible in the main window"
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 #, fuzzy
 msgid "Width of the To Do bar in the main window"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 #, fuzzy
 #| msgid "Apply the given geometry to the main window"
 msgid "Holds the width of the To Do bar for the main window."
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar is visible in a sub-window"
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 msgid "Width of the To Do bar in a sub-window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar should show also completed tasks"
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
-#| msgid "Show the status bar"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Whether the To Do bar should show also tasks without Due date"
+msgstr "Näytetäänkö työkalupalkki."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Stores whether the To Do bar should show also tasks without Due date."
+msgstr "Näytetäänkö työkalupalkki."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 msgid "Show start up wizard"
 msgstr "Näytä käynnistyksen avustaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+msgid "Whether go to the previous message after message deletion"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+msgid ""
+"If set to true, goes to the previous message when the selected is deleted; or to "
+"the next message, when it’s set to false."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+msgid "Show Subject above Sender in Messages column"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+msgid ""
+"Whether to show Subject above Sender (From/To) in the Messages column, usually "
+"shown in the Vertical/Wide view of the message list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+msgid "Visually wrap long lines in composer"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../src/composer/e-composer-actions.c:552
+msgid "Whether to visually wrap long lines of text to avoid horizontal scrolling"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 #, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"“forward-style-name” instead."
+"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:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"“reply-style-name” instead."
+"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:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 #, 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:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"“show-headers” instead."
+"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:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 #, 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:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"“image-loading-policy” instead."
+"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:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 msgid ""
-"(Deprecated) Asks whether to close the message window when the user forwards "
-"or replies to the message shown in the window"
+"(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:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"“browser-close-on-reply-policy” instead."
+"This key was deprecated in version 3.10 and should no longer be used. Use “browser-"
+"close-on-reply-policy” instead."
 msgstr ""
 
 #. Translators: This is the a list of words for the attach reminder plugin to look
@@ -2707,14 +2608,12 @@ msgstr "['attachment','attaching','attached','enclosed,'liite','liitteenä','lii
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+"List of clues for the attachment reminder plugin to look for in a message body"
 msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta"
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
 msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
+"List of clues for the attachment reminder plugin to look for in a message body."
 msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
@@ -2740,8 +2639,7 @@ msgid "Enable autocontacts"
 msgstr "Valitse kaikki yhteystiedot"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-msgid ""
-"Whether contacts should be automatically added to the user’s address book."
+msgid "Whether contacts should be automatically added to the user’s address book."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
@@ -2750,8 +2648,7 @@ msgstr "Pidginin osoitekirjan lähde"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
 #, fuzzy
-msgid ""
-"Address book to use for storing automatically synced contacts from Pidgin."
+msgid "Address book to use for storing automatically synced contacts from Pidgin."
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
@@ -2785,18 +2682,17 @@ msgstr "Luettelo omista otsakkeista"
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
 #, fuzzy
 #| msgid ""
-#| "The key specifies the list of custom headers that you can add to an "
-#| "outgoing message. The format for specifying a Header and Header value is: "
-#| "Name of the custom header followed by \"=\" and the values separated by "
-#| "\";\""
+#| "The key specifies the list of custom headers that you can add to an outgoing "
+#| "message. The format for specifying a Header and Header value is: Name of the "
+#| "custom header followed by \"=\" and the values separated by \";\""
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by “=” and the values separated by “;”"
 msgstr ""
 "Avain määrittää luettelon omista otsakkeita, joita voit lisätä lähteviin "
-"viesteihin. Muoto otsakkeiden määrittelyksi avaimessa on seuraava: Otsakkeen "
-"nimi, \"=\"-merkki ja otsakkeen sisältö, eroteltuna \";\"-merkeillä."
+"viesteihin. Muoto otsakkeiden määrittelyksi avaimessa on seuraava: Otsakkeen nimi, "
+"\"=\"-merkki ja otsakkeen sisältö, eroteltuna \";\"-merkeillä."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
 msgid "Default External Editor"
@@ -2822,11 +2718,11 @@ msgstr "Lisää kasvokuva oletuksena"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
 msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
+"Whether insert Face picture to outgoing messages by default. The picture should be "
+"set before checking this, otherwise nothing happens."
 msgstr ""
-"Lisätäänkö kasvokuva lähteviin viestiin automaattisesti. Kuva on asetettava "
-"ennen tämän valintaa, muuten mitään ei tapahdu."
+"Lisätäänkö kasvokuva lähteviin viestiin automaattisesti. Kuva on asetettava ennen "
+"tämän valintaa, muuten mitään ei tapahdu."
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
 msgid "Delete processed"
@@ -2876,9 +2772,9 @@ msgstr "Näytä sähköpostikuvake ilmoitusalueella, kun uusia viestejä saapuu.
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
 msgid ""
-"Whether to make a sound of any kind when new messages arrive. If “false”, "
-"the “notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and "
-"“notify-sound-use-theme” keys are disregarded."
+"Whether to make a sound of any kind when new messages arrive. If “false”, the "
+"“notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and “notify-"
+"sound-use-theme” keys are disregarded."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
@@ -2899,13 +2795,11 @@ msgstr "Soitettavan äänitiedoston nimi."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
 #, fuzzy
-#| msgid ""
-#| "Sound file to be played when new messages arrive, if not in beep mode."
+#| msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgid ""
-"Sound file to be played when new messages arrive, if “notify-sound-play-"
-"file” is “true”."
-msgstr ""
-"Soitettava äänitiedosto, kun uusia viestejä saapuu (jos ei piippaustilassa)."
+"Sound file to be played when new messages arrive, if “notify-sound-play-file” is "
+"“true”."
+msgstr "Soitettava äänitiedosto, kun uusia viestejä saapuu (jos ei piippaustilassa)."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
 msgid "Whether to play a sound file."
@@ -2913,8 +2807,8 @@ msgstr "Toistetaanko äänitiedosto."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
 msgid ""
-"Whether to play a sound file when new messages arrive. The name of the sound "
-"file is given by the “notify-sound-file” key."
+"Whether to play a sound file when new messages arrive. The name of the sound file "
+"is given by the “notify-sound-file” key."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
@@ -2923,8 +2817,7 @@ msgstr "Käytä ääniteemaa"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr ""
-"Soita teeman äänitiedosto viestin saapuessa, jos ei olla piippaustilassa."
+msgstr "Soita teeman äänitiedosto viestin saapuessa, jos ei olla piippaustilassa."
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
 #, fuzzy
@@ -2933,8 +2826,8 @@ msgstr "Käytä omia fontteja näytettäessä viestejä."
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
 msgid ""
-"The mode to use for displaying mails. “normal” makes Evolution choose the "
-"best part to show, “prefer_plain” makes it use the text part, if present, "
+"The mode to use for displaying mails. “normal” makes Evolution choose the best "
+"part to show, “prefer_plain” makes it use the text part, if present, "
 "“prefer_source” makes it use the text part, if present, otherwise shows HTML "
 "source, and “only_plain” forces Evolution to only show plain text"
 msgstr ""
@@ -2952,27 +2845,25 @@ msgstr "Luettelo osoitteista, joissa julkaistaan vapaa/varattu tietoja."
 
 #: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
 msgid ""
-"The key specifies the list of destinations to where publish calendars. Each "
-"values specifies an XML with setup for publishing to one destination."
+"The key specifies the list of destinations to where publish calendars. Each values "
+"specifies an XML with setup for publishing to one destination."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
 msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
+"List of keyword/value pairs for the Templates plugin to substitute in a message "
+"body."
 msgstr ""
-"Luettelo avainsana- ja arvopareista, joita pohjat-lisäosa käyttää viestin "
-"rungon osien korvaamiseen."
+"Luettelo avainsana- ja arvopareista, joita pohjat-lisäosa käyttää viestin rungon "
+"osien korvaamiseen."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
 msgid "Skip development warning dialog"
 msgstr "Ohita kehitysversiovaroitus"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Piilotetaanko varoitusikkuna Evolutionin kehitysversion käytöstä vai ei."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "Piilotetaanko varoitusikkuna Evolutionin kehitysversion käytöstä vai ei."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
 msgid "Initial attachment view"
@@ -2981,13 +2872,10 @@ msgstr "Liitenäkymän oletusarvo"
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
 #, fuzzy
 #| msgid ""
-#| "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is "
-#| "List View."
-msgid ""
-"Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
+#| "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgid "Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
 msgstr ""
-"Liitepalkin elementtien oletusnäkymä. \"0\" on kuvakenäkymä, \"1\" "
-"luettelonäkymä."
+"Liitepalkin elementtien oletusnäkymä. \"0\" on kuvakenäkymä, \"1\" luettelonäkymä."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
 msgid "Initial file chooser folder"
@@ -3002,8 +2890,7 @@ msgid "Compression format used by autoar"
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-msgid ""
-"Compression format used when compressing attached directories with autoar."
+msgid "Compression format used when compressing attached directories with autoar."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
@@ -3011,12 +2898,10 @@ msgid "Compression filter used by autoar"
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-msgid ""
-"Compression filter used when compressing attached directories with autoar."
+msgid "Compression filter used when compressing attached directories with autoar."
 msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../src/shell/main.c:320
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../src/shell/main.c:317
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -3031,11 +2916,10 @@ msgstr "Avataan kansiota %s"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
 #, fuzzy
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage."
+msgid "List of paths for the folders to be synchronized to disk for offline usage."
 msgstr ""
-"Luettelo poluista kansioihin, jotka synkronisoidaan kovalevylle "
-"yhteydettömään käyttöön"
+"Luettelo poluista kansioihin, jotka synkronisoidaan kovalevylle yhteydettömään "
+"käyttöön"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Enable express mode"
@@ -3051,8 +2935,8 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
-"Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. "
-"Change of this requires restart of the application."
+"Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. Change of "
+"this requires restart of the application."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
@@ -3070,27 +2954,24 @@ msgstr "Ikkunan painikkeiden tyyli"
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 #, fuzzy
 #| msgid ""
-#| "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-#| "\"toolbar\". If \"toolbar\" is set, the style of the buttons is "
-#| "determined by the GNOME toolbar setting."
+#| "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar"
+#| "\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME "
+#| "toolbar setting."
 msgid ""
-"The style of the window buttons. Can be “text”, “icons”, “both”, “toolbar”. "
-"If “toolbar” is set, the style of the buttons is determined by the GNOME "
-"toolbar setting."
+"The style of the window buttons. Can be “text”, “icons”, “both”, “toolbar”. If "
+"“toolbar” is set, the style of the buttons is determined by the GNOME toolbar "
+"setting."
 msgstr ""
 "Näytettävien painikkeiden tyyli. Voi olla \"text\", \"icons\", \"both\" tai "
-"\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen "
-"asetusta."
+"\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen asetusta."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Menubar is visible"
 msgstr "Valikkopalkki on näkyvissä"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#, fuzzy
-#| msgid "Whether the sidebar should be visible."
 msgid "Whether the menubar should be visible."
-msgstr "Näytetäänkö sivupaneeli."
+msgstr "Näytetäänkö valikkopalkki vai ei."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "Toolbar is visible"
@@ -3136,6 +3017,16 @@ msgstr "Käytä erikoisia WebKitin kehittäjäominaisuuksia"
 msgid "Any change of this option requires restart of Evolution."
 msgstr ""
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:36
+msgid "The last extension being used when backing up Evolution data."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:37
+msgid ""
+"It can be either “.gz” or “.xz” and it influences what extension will be "
+"preselected in the file chooser."
+msgstr ""
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia."
@@ -3150,9 +3041,8 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
 msgid ""
-"Full path to a spamassassin command. If not set, then a compile-time path is "
-"used, usually /usr/bin/spamassassin. The command should not contain any "
-"other arguments."
+"Full path to a spamassassin command. If not set, then a compile-time path is used, "
+"usually /usr/bin/spamassassin. The command should not contain any other arguments."
 msgstr ""
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
@@ -3161,9 +3051,8 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
 msgid ""
-"Full path to a sa-learn command. If not set, then a compile-time path is "
-"used, usually /usr/bin/sa-learn. The command should not contain any other "
-"arguments."
+"Full path to a sa-learn command. If not set, then a compile-time path is used, "
+"usually /usr/bin/sa-learn. The command should not contain any other arguments."
 msgstr ""
 
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
@@ -3172,17 +3061,126 @@ msgstr "Käytettävän teeman nimi, oletuksena “bclear”"
 
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
 msgid ""
-"Use “highlight --list-scripts=themes” to get the list of installed themes "
-"and then the value to one of them. The change requires only re-format of the "
-"message part to take into effect, like using right-click→Format As→...."
+"Use “highlight --list-scripts=themes” to get the list of installed themes and then "
+"the value to one of them. The change requires only re-format of the message part "
+"to take into effect, like using right-click→Format As→...."
 msgstr ""
 
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:1
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1112
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
+#: ../src/shell/e-shell-window-private.c:240
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:2
+#: ../data/org.gnome.Evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Hallitse sähköposteja, yhteystietoja ja ajan käyttöä"
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:3
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution on henkilökohtaisen tiedon hallintasovellus, joka tarjoaa sähköpostin, "
+"kalenterin ja osoitekirjan."
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:4
+msgid ""
+"Evolution supports a wide range of industry standard data formats and network "
+"protocols for information exchange, with an emphasis on standards compliance and "
+"security. Evolution can also integrate smoothly with Microsoft Exchange by way of "
+"the “Exchange Web Services” (EWS) extension."
+msgstr ""
+"Evolution tukee lukuisia standardeja tiedostomuotoja ja verkkoprotokollia "
+"tiedonvaihtoa varten, painoarvoa on asetettu erityisesti standardien "
+"noudattamiseen ja tietoturvaan. Evolution voi myös integroitua Microsoft Exchange -"
+"palvelimeen Exchange Web Services (EWS) -laajennuksen avulla."
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
+msgid "Groupware Suite"
+msgstr "Ryhmätyöohjelmisto"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution-sähköposti ja -kalenteri"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr ""
+"email;calendar;contact;addressbook;task;sähköposti;kalenteri;yhteystiedot;"
+"osoitekirja;tehtävä;"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "Uusi ikkuna"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:7
+msgid "Compose a Message"
+msgstr "Uusi viesti"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:8
+#: ../src/e-util/e-name-selector-dialog.c:448
+#: ../src/modules/addressbook/e-book-shell-backend.c:307
+#: ../src/modules/addressbook/e-book-shell-view.c:371
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
+#: ../src/e-util/e-collection-account-wizard.c:559 ../src/e-util/e-send-options.c:544
+#: ../src/e-util/e-webdav-browser.c:469
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
+#: ../src/modules/calendar/e-cal-shell-view.c:582
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
+#: ../src/mail/importers/elm-importer.c:330
+#: ../src/mail/importers/kmail-importer.c:251
+#: ../src/mail/importers/pine-importer.c:423
+#: ../src/modules/mail/e-mail-shell-view.c:1249
+#: ../src/smime/gui/certificate-manager.c:1682
+msgid "Mail"
+msgstr "Sähköposti"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:11
+#: ../src/calendar/gui/e-memo-table.c:368 ../src/e-util/e-webdav-browser.c:459
+#: ../src/modules/calendar/e-cal-shell-content.c:1719
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
+#: ../src/modules/calendar/e-memo-shell-view.c:313
+msgid "Memos"
+msgstr "Muistilaput"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:12
+#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2408
+#: ../src/calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:1110
+#: ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-cal-shell-content.c:1679
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
+#: ../src/modules/calendar/e-task-shell-view.c:471
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolutionin hälytysilmoitukset"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "Kalenteritapahtumien ilmoitukset"
+
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "_Osoitekortit"
 
-#: ../data/views/addressbook/galview.xml.h:2
-#: ../data/views/calendar/galview.xml.h:5
+#: ../data/views/addressbook/galview.xml.h:2 ../data/views/calendar/galview.xml.h:5
 msgid "_List View"
 msgstr "_Luettelonäkymä"
 
@@ -3260,236 +3258,200 @@ msgid "This address book could not be opened."
 msgstr "Tätä osoitekirjaa ei voi avata."
 
 #: ../src/addressbook/addressbook.error.xml.h:2
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"Tämä osoitekirjapalvelin voi olla saavuttamattomissa, palvelimen nimi väärin "
-"kirjoitettu tai verkkoyhteytesi ei ehkä ole käytettävissä."
+msgid "Failed to communicate with LDAP server."
+msgstr "Kommunikointi LDAP-palvelimen kanssa epäonnistui."
 
 #: ../src/addressbook/addressbook.error.xml.h:3
-msgid "Failed to authenticate with LDAP server."
-msgstr "LDAP-palvelimelle tunnistautuminen epäonnistui."
-
-#: ../src/addressbook/addressbook.error.xml.h:4
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Tarkista, että salasanasi on kirjoitettu oikein ja käytät palvelimen tukemaa "
-"kirjautumistapaa. Muista että monissa salasanoissa isot ja pienet kirjaimet "
-"ovat eri asia. Tarkista myös ettei Caps Lock ole päällä."
-
-#: ../src/addressbook/addressbook.error.xml.h:5
 msgid "This address book server does not have any suggested search bases."
 msgstr "Tällä osoitekirjapalvelimella ei ole tuettuja hakupohjia."
 
-#: ../src/addressbook/addressbook.error.xml.h:6
-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 search bases."
-msgstr ""
-"Tämä LDAP-palvelin saattaa käyttää vanhempaa versiota LDAP:ista, joka ei tue "
-"tätä toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy "
-"ylläpidoltasi mitkä ovat tuetut hakupohjat."
-
-#: ../src/addressbook/addressbook.error.xml.h:7
+#: ../src/addressbook/addressbook.error.xml.h:4
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Tämä palvelin ei tue LDAPv3-skeematietoja."
 
-#: ../src/addressbook/addressbook.error.xml.h:8
+#: ../src/addressbook/addressbook.error.xml.h:5
 msgid "Could not get schema information for LDAP server."
 msgstr "Skeematietoja ei voi hakea LDAP-palvelimelta."
 
-#: ../src/addressbook/addressbook.error.xml.h:9
+#: ../src/addressbook/addressbook.error.xml.h:6
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-palvelin ei vastannut kelvollisella skeematiedolla."
 
-#: ../src/addressbook/addressbook.error.xml.h:10
+#: ../src/addressbook/addressbook.error.xml.h:7
 msgid "Could not remove address book."
 msgstr "Osoitekirjaa ei voitu poistaa."
 
-#: ../src/addressbook/addressbook.error.xml.h:11
+#: ../src/addressbook/addressbook.error.xml.h:8
 msgid "Are you sure you want to delete address book “{0}”?"
 msgstr "Haluatko varmasti poistaa osoitekirjan “{0}”?"
 
-#: ../src/addressbook/addressbook.error.xml.h:12
+#: ../src/addressbook/addressbook.error.xml.h:9
 msgid "This address book will be removed permanently."
 msgstr "Tämä osoitekirja poistetaan pysyvästi."
 
-#: ../src/addressbook/addressbook.error.xml.h:13
+#: ../src/addressbook/addressbook.error.xml.h:10
 #: ../src/calendar/calendar.error.xml.h:7 ../src/e-util/e-system.error.xml.h:27
 #: ../src/mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "_Älä poista"
 
-#: ../src/addressbook/addressbook.error.xml.h:14
+#: ../src/addressbook/addressbook.error.xml.h:11
 msgid "Delete remote address book “{0}”?"
 msgstr "Poistetaanko etäosoitekirja “{0}”?"
 
-#: ../src/addressbook/addressbook.error.xml.h:15
+#: ../src/addressbook/addressbook.error.xml.h:12
 msgid ""
-"This will permanently remove the address book “{0}” from the server. Are you "
-"sure you want to proceed?"
+"This will permanently remove the address book “{0}” from the server. Are you sure "
+"you want to proceed?"
 msgstr "Osoitekirja “{0}” poistetaan palvelimelta pysyvästi. Haluatko jatkaa?"
 
-#: ../src/addressbook/addressbook.error.xml.h:16
-#: ../src/calendar/calendar.error.xml.h:65
-#: ../src/e-util/e-system.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:13
+#: ../src/calendar/calendar.error.xml.h:65 ../src/e-util/e-system.error.xml.h:28
 msgid "_Delete From Server"
 msgstr "_Poista palvelimelta"
 
-#: ../src/addressbook/addressbook.error.xml.h:17
+#: ../src/addressbook/addressbook.error.xml.h:14
 msgid "Category editor not available."
 msgstr "Luokkien muokkain ei ole käytettävissä."
 
-#: ../src/addressbook/addressbook.error.xml.h:18
+#: ../src/addressbook/addressbook.error.xml.h:15
 msgid "Unable to open address book “{0}”"
 msgstr "Osoitekirjan “{0}” avaaminen epäonnistui"
 
-#: ../src/addressbook/addressbook.error.xml.h:19
+#: ../src/addressbook/addressbook.error.xml.h:16
 msgid "Unable to perform search."
 msgstr "Hakua ei voi suorittaa."
 
-#: ../src/addressbook/addressbook.error.xml.h:20
+#: ../src/addressbook/addressbook.error.xml.h:17
 msgid "Failed to refresh address book “{0}”"
 msgstr "Osoitekirjan “{0}” päivittäminen epäonnistui"
 
-#: ../src/addressbook/addressbook.error.xml.h:21
+#: ../src/addressbook/addressbook.error.xml.h:18
 msgid "Would you like to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: ../src/addressbook/addressbook.error.xml.h:22
+#: ../src/addressbook/addressbook.error.xml.h:19
 msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr ""
-"Olet tehnyt muutoksia tähän yhteystietoon. Haluatko tallentaa muutoksesi?"
+"You have made modifications to this contact. Do you want to save these changes?"
+msgstr "Olet tehnyt muutoksia tähän yhteystietoon. Haluatko tallentaa muutoksesi?"
 
-#: ../src/addressbook/addressbook.error.xml.h:23
+#: ../src/addressbook/addressbook.error.xml.h:20
 msgid "_Discard"
 msgstr "_Hylkää"
 
-#: ../src/addressbook/addressbook.error.xml.h:24
+#: ../src/addressbook/addressbook.error.xml.h:21
 msgid "Cannot move contact."
 msgstr "Yhteystietoa ei voi siirtää."
 
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:22
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
-"Yrität siirtää yhteystietoa osoitekirjasta toiseen, mutta sitä ei voi "
-"poistaa lähteestä. Haluatko sen sijaan tallentaa kopion?"
+"Yrität siirtää yhteystietoa osoitekirjasta toiseen, mutta sitä ei voi poistaa "
+"lähteestä. Haluatko sen sijaan tallentaa kopion?"
 
-#: ../src/addressbook/addressbook.error.xml.h:26
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Valitsemasi kuva on suuri. Haluatko muuttaa kuvan kokoa ja tallentaa sen?"
+#: ../src/addressbook/addressbook.error.xml.h:23
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Valitsemasi kuva on suuri. Haluatko muuttaa kuvan kokoa ja tallentaa sen?"
 
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:24
 msgid "_Resize"
 msgstr "_Muuta kokoa"
 
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid "_Use as it is"
 msgstr "Käytä _sellaisenaan"
 
-#: ../src/addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid "_Do not save"
 msgstr "Ä_lä tallenna"
 
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "Unable to save {0}."
 msgstr "{0} ei voi tallentaa."
 
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Virhe tallennettaessa {0} kohteeseen {1}: {2}"
 
-#: ../src/addressbook/addressbook.error.xml.h:32
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "Address “{0}” already exists."
 msgstr "Osoite “{0}” on jo olemassa."
 
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
+"A contact already exists with this address. Would you like to add a new card with "
+"the same address anyway?"
 msgstr ""
-"Tälle osoitteelle on jo yhteystieto. Haluatko lisätä uuden yhteystiedon "
-"samalla osoitteella?"
+"Tälle osoitteelle on jo yhteystieto. Haluatko lisätä uuden yhteystiedon samalla "
+"osoitteella?"
 
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:31
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1355
-#: ../src/e-util/e-accounts-window.c:1540
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1359
+#: ../src/e-util/e-accounts-window.c:1526
 #: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:23
-#: ../src/mail/e-mail-account-manager.c:719
-#: ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1031
-#: ../src/mail/em-vfolder-editor-rule.c:397
+#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-account-manager.c:719 ../src/mail/e-mail-label-manager.c:371
+#: ../src/mail/em-folder-properties.c:1031 ../src/mail/em-vfolder-editor-rule.c:397
 #: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:61
 #: ../src/modules/mail/em-composer-prefs.c:422
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:543
 #: ../src/plugins/email-custom-header/email-custom-header.c:837
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../src/plugins/templates/templates.c:463
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:32
 msgid "Some addresses already exist in this contact list."
 msgstr "Jotkin osoitteet ovat jo olemassa tässä yhteystietoluettelossa."
 
-#: ../src/addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
+"You are trying to add addresses that are part of this list already. Would you like "
+"to add them anyway?"
 msgstr ""
-"Olet lisäämässä osoitteita, jotka ovat jo tässä luettelossa. Haluatko lisätä "
-"ne silti?"
+"Olet lisäämässä osoitteita, jotka ovat jo tässä luettelossa. Haluatko lisätä ne "
+"silti?"
 
-#: ../src/addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:34
 msgid "Skip duplicates"
 msgstr "Ohita kaksoiskappaleet"
 
-#: ../src/addressbook/addressbook.error.xml.h:38
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Add with duplicates"
 msgstr "Lisää kaksoiskappaleineen"
 
-#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid "List “{0}” is already in this contact list."
 msgstr "Luettelo “{0}” on jo tässä yhteystietoluettelossa."
 
-#: ../src/addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid ""
-"A contact list named “{0}” is already in this contact list. Would you like "
-"to add it anyway?"
+"A contact list named “{0}” is already in this contact list. Would you like to add "
+"it anyway?"
 msgstr ""
-"Yhteystieto nimellä “{0}” on jo tässä yhteystietoluettelossa. Haluatko "
-"lisätä sen silti?"
+"Yhteystieto nimellä “{0}” on jo tässä yhteystietoluettelossa. Haluatko lisätä sen "
+"silti?"
 
-#: ../src/addressbook/addressbook.error.xml.h:41
+#: ../src/addressbook/addressbook.error.xml.h:38
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
-#: ../src/addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:39
 msgid "You do not have permission to delete contacts in this address book."
-msgstr ""
-"Oikeutesi eivät riitä yhteystietojen poistamiseen tästä osoitekirjasta."
+msgstr "Oikeutesi eivät riitä yhteystietojen poistamiseen tästä osoitekirjasta."
 
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:40
 msgid "Cannot add new contact"
 msgstr "Uutta yhteystietoa ei voi lisätä"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:42
 #, fuzzy
 #| msgid ""
 #| "'{0}' is a read-only address book and cannot be modified. Please select a "
@@ -3501,26 +3463,26 @@ msgstr ""
 "\"{0}\" on vain luettavissa oleva osoitekirja eikä sitä voi muokata. Valitse "
 "yhteystietonäkymän sivupalkista toinen osoitekirja."
 
-#: ../src/addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Yhteystiedon tallennus ei onnistu, osoitekirja avautuu edelleen"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:45
 msgid ""
-"Cannot save a contact to the address book “{0}”, because it is still "
-"opening. Either wait till it’s opened, or select a different address book."
+"Cannot save a contact to the address book “{0}”, because it is still opening. "
+"Either wait till it’s opened, or select a different address book."
 msgstr ""
-"Yhteystiedon tallennus osoitekirjaan “{0}” ei onnistu, koska osoitekirja "
-"avautuu edelleen. Odota sen avautumista, tai valitse toinen osoitekirja."
+"Yhteystiedon tallennus osoitekirjaan “{0}” ei onnistu, koska osoitekirja avautuu "
+"edelleen. Odota sen avautumista, tai valitse toinen osoitekirja."
 
-#: ../src/addressbook/addressbook.error.xml.h:49
+#: ../src/addressbook/addressbook.error.xml.h:46
 #, fuzzy
 #| msgid "Search for text in the displayed contact"
 msgid "Something has gone wrong when displaying the contact"
 msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
 
-#: ../src/addressbook/addressbook.error.xml.h:50
+#: ../src/addressbook/addressbook.error.xml.h:47
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
@@ -3591,7 +3553,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:1996
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1976
 #: ../src/mail/mail-config.ui.h:38
 msgid "Options"
 msgstr "Asetukset"
@@ -3612,38 +3574,37 @@ msgstr "Asetukset"
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
 #: ../src/calendar/gui/e-cal-dialogs.c:694
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
-#: ../src/composer/e-composer-actions.c:227 ../src/e-util/e-activity-bar.c:357
-#: ../src/e-util/e-attachment-dialog.c:309
-#: ../src/e-util/e-attachment-store.c:664
+#: ../src/composer/e-composer-actions.c:229 ../src/e-util/e-activity-bar.c:357
+#: ../src/e-util/e-attachment-dialog.c:309 ../src/e-util/e-attachment-store.c:664
 #: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:302
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
 #: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-color-chooser-widget.c:125
-#: ../src/e-util/e-filter-datespec.c:289
+#: ../src/e-util/e-collection-account-wizard.c:1563
+#: ../src/e-util/e-collection-account-wizard.c:1798
+#: ../src/e-util/e-color-chooser-widget.c:125 ../src/e-util/e-filter-datespec.c:289
 #: ../src/e-util/e-html-editor-actions.c:321
 #: ../src/e-util/e-html-editor-actions.c:415
 #: ../src/e-util/e-image-chooser-dialog.c:169
-#: ../src/e-util/e-mail-signature-script-dialog.c:366
-#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
-#: ../src/e-util/e-rule-editor.c:178 ../src/e-util/e-rule-editor.c:280
-#: ../src/e-util/e-rule-editor.c:789 ../src/e-util/e-send-options.ui.h:16
-#: ../src/e-util/e-source-config-dialog.c:360
-#: ../src/e-util/e-source-selector-dialog.c:370
-#: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
-#: ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4096
+#: ../src/e-util/e-mail-signature-script-dialog.c:366 ../src/e-util/e-passwords.c:468
+#: ../src/e-util/e-rule-context.c:813 ../src/e-util/e-rule-editor.c:187
+#: ../src/e-util/e-rule-editor.c:298 ../src/e-util/e-rule-editor.c:930
+#: ../src/e-util/e-send-options.ui.h:16 ../src/e-util/e-source-config-dialog.c:360
+#: ../src/e-util/e-source-selector-dialog.c:370 ../src/e-util/e-table-config.c:548
+#: ../src/e-util/e-table-config.ui.h:3 ../src/e-util/e-timezone-dialog.ui.h:2
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4118
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
 #: ../src/mail/e-mail-tag-editor.c:168 ../src/mail/em-folder-selector.c:318
 #: ../src/mail/mail-config.ui.h:2 ../src/mail/mail.error.xml.h:16
-#: ../src/mail/mail-send-recv.c:747 ../src/mail/mail-send-recv.c:829
+#: ../src/mail/mail-send-recv.c:867 ../src/mail/mail-send-recv.c:949
 #: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
-#: ../src/modules/backup-restore/evolution-backup-tool.c:932
+#: ../src/modules/backup-restore/evolution-backup-tool.c:936
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:295
-#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:419
 #: ../src/plugins/save-calendar/save-calendar.c:185
 #: ../src/shell/e-shell-content.c:639 ../src/shell/e-shell-content.c:746
@@ -3651,8 +3612,8 @@ msgstr "Asetukset"
 #: ../src/smime/gui/certificate-manager.c:665
 #: ../src/smime/gui/certificate-manager.c:742
 #: ../src/smime/gui/certificate-manager.c:966
-#: ../src/smime/gui/certificate-manager.c:1348
-#: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
+#: ../src/smime/gui/certificate-manager.c:1348 ../src/smime/gui/e-cert-selector.c:235
+#: ../src/smime/gui/smime-ui.ui.h:17
 msgid "_Cancel"
 msgstr "_Peru"
 
@@ -3660,13 +3621,11 @@ msgstr "_Peru"
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
-#: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2115
-#: ../src/composer/e-composer-actions.c:228
-#: ../src/composer/e-composer-actions.c:348
+#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2115
+#: ../src/composer/e-composer-actions.c:230 ../src/composer/e-composer-actions.c:350
 #: ../src/e-util/e-attachment-store.c:833
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4097
+#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4119
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
 #: ../src/shell/e-shell-content.c:640 ../src/shell/e-shell-utils.c:140
 #: ../src/smime/gui/certificate-manager.c:666
@@ -3675,16 +3634,15 @@ msgid "_Save"
 msgstr "_Tallenna"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2012
-#: ../src/calendar/gui/e-comp-editor.c:2084
-#: ../src/e-util/e-preferences-window.c:390
-#: ../src/e-util/e-send-options.ui.h:15
+#: ../src/calendar/gui/e-comp-editor.c:2012 ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/e-util/e-preferences-window.c:390 ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
 #: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:994
 msgid "_Help"
 msgstr "O_hje"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../src/e-util/e-misc-utils.c:3493
 msgid "Image"
 msgstr "Kuva"
 
@@ -3742,8 +3700,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:727
-#: ../src/modules/itip-formatter/itip-view.c:2045
+#: ../src/calendar/gui/e-comp-editor-event.c:725
+#: ../src/modules/itip-formatter/itip-view.c:2048
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -3833,14 +3791,14 @@ msgstr "_Vuosipäivä:"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2045
+#: ../src/calendar/gui/e-calendar-view.c:2056
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2044
+#: ../src/calendar/gui/e-calendar-view.c:2055
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -3896,7 +3854,7 @@ msgstr "Työ"
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
-#: ../src/calendar/gui/e-cal-model.c:3798
+#: ../src/calendar/gui/e-cal-model.c:3805
 msgid "Other"
 msgstr "Muut"
 
@@ -3920,19 +3878,18 @@ msgstr "Lisää _X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1371
-#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:223
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1375
+#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:409
 #: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1037
-#: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-config-identity-page.c:871
-#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
-#: ../src/mail/em-folder-properties.c:1037
-#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:62
+#: ../src/e-util/e-name-selector-dialog.c:1037 ../src/e-util/filter.error.xml.h:18
+#: ../src/e-util/filter.ui.h:27 ../src/mail/e-mail-config-identity-page.c:871
+#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
+#: ../src/mail/em-folder-properties.c:1037 ../src/mail/em-vfolder-editor-rule.c:631
+#: ../src/mail/mail-config.ui.h:62
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:553
 #: ../src/plugins/email-custom-header/email-custom-header.c:847
-#: ../src/plugins/publish-calendar/publish-calendar.c:789
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/publish-calendar/publish-calendar.c:790
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
 #: ../src/plugins/templates/templates.c:473
 msgid "_Remove"
 msgstr "_Poista"
@@ -3951,8 +3908,7 @@ msgid "Certificates"
 msgstr "Varmenteet"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
-#: ../src/calendar/gui/e-comp-editor.c:2047
-#: ../src/e-util/e-html-editor-actions.c:913
+#: ../src/calendar/gui/e-comp-editor.c:2047 ../src/e-util/e-html-editor-actions.c:913
 msgid "_Undo"
 msgstr "_Kumoa"
 
@@ -3962,8 +3918,7 @@ msgid "Undo"
 msgstr "Kumoa"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
-#: ../src/calendar/gui/e-comp-editor.c:2054
-#: ../src/e-util/e-html-editor-actions.c:899
+#: ../src/calendar/gui/e-comp-editor.c:2054 ../src/e-util/e-html-editor-actions.c:899
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
@@ -4102,19 +4057,15 @@ msgstr "Virheellinen yhteystieto."
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
-#: ../src/e-util/e-attachment-dialog.c:311
-#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:212
-#: ../src/e-util/e-charset-combo-box.c:100
-#: ../src/e-util/e-color-chooser-widget.c:126
-#: ../src/e-util/e-filter-datespec.c:290
-#: ../src/e-util/e-html-editor-link-dialog.c:255
-#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
-#: ../src/e-util/e-rule-editor.c:179 ../src/e-util/e-rule-editor.c:281
-#: ../src/e-util/e-rule-editor.c:790 ../src/e-util/e-send-options.ui.h:17
-#: ../src/e-util/e-source-config-dialog.c:361
-#: ../src/e-util/e-source-selector-dialog.c:371
-#: ../src/e-util/e-table-config.c:549 ../src/e-util/e-table-config.ui.h:4
-#: ../src/e-util/e-timezone-dialog.ui.h:3
+#: ../src/e-util/e-attachment-dialog.c:311 ../src/e-util/e-categories-dialog.c:81
+#: ../src/e-util/e-category-editor.c:212 ../src/e-util/e-charset-combo-box.c:100
+#: ../src/e-util/e-color-chooser-widget.c:126 ../src/e-util/e-filter-datespec.c:290
+#: ../src/e-util/e-html-editor-link-dialog.c:255 ../src/e-util/e-passwords.c:469
+#: ../src/e-util/e-rule-context.c:814 ../src/e-util/e-rule-editor.c:188
+#: ../src/e-util/e-rule-editor.c:299 ../src/e-util/e-rule-editor.c:931
+#: ../src/e-util/e-send-options.ui.h:17 ../src/e-util/e-source-config-dialog.c:361
+#: ../src/e-util/e-source-selector-dialog.c:371 ../src/e-util/e-table-config.c:549
+#: ../src/e-util/e-table-config.ui.h:4 ../src/e-util/e-timezone-dialog.ui.h:3
 #: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:169
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
 #: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
@@ -4123,7 +4074,7 @@ msgstr "Virheellinen yhteystieto."
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420
 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:747
-#: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1349
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "_OK"
@@ -4256,22 +4207,22 @@ msgid "Insert email addresses from Address Book"
 msgstr "Lisää sähköpostiosoitteita osoitekirjasta"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../src/e-util/filter.ui.h:26
+#: ../src/e-util/filter.ui.h:28
 msgid "_Top"
 msgstr "Ylimm_äiseksi"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:27
+#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:29
 msgid "_Up"
 msgstr "_Ylös"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:28
+#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "_Alas"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../src/e-util/filter.ui.h:29
+#: ../src/e-util/filter.ui.h:31
 msgid "_Bottom"
 msgstr "Ali_mmaiseksi"
 
@@ -4306,8 +4257,7 @@ msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../src/calendar/gui/caltypes.xml.in.h:26
-#: ../src/calendar/gui/memotypes.xml.in.h:19
+#: ../src/calendar/gui/caltypes.xml.in.h:26 ../src/calendar/gui/memotypes.xml.in.h:19
 #: ../src/calendar/gui/tasktypes.xml.in.h:30
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1211
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1713
@@ -4327,22 +4277,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:368
+#: ../src/e-util/e-web-view.c:370
 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:380
+#: ../src/e-util/e-web-view.c:382
 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:382
+#: ../src/e-util/e-web-view.c:384
 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:1349
+#: ../src/e-util/e-web-view.c:1374
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
@@ -4508,11 +4458,10 @@ msgstr "Blogi"
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
 #: ../src/calendar/gui/e-cal-component-preview.c:308
 #: ../src/calendar/gui/e-cal-model-tasks.c:314
-#: ../src/calendar/gui/e-cal-model-tasks.c:556
-#: ../src/calendar/gui/e-task-table.c:209
-#: ../src/calendar/gui/e-task-table.c:224
-#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3596
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
+#: ../src/calendar/gui/e-cal-model-tasks.c:556 ../src/calendar/gui/e-task-table.c:210
+#: ../src/calendar/gui/e-task-table.c:225 ../src/calendar/gui/e-task-table.c:635
+#: ../src/calendar/gui/print.c:3586 ../src/calendar/gui/tasktypes.xml.in.h:14
+#: ../src/mail/mail-send-recv.c:1086
 msgid "Cancelled"
 msgstr "Peruttu"
 
@@ -4563,35 +4512,35 @@ msgstr "Vanha yhteystieto:"
 
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
+"This address book cannot be opened. This either means this book is not marked for "
+"offline usage or not yet downloaded for offline usage. Please load the address "
+"book once in online mode to download its contents."
 msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Joko tämä osoitekirja ei ole merkitty "
-"verkottomaan käyttöön tai sitä ei ole vielä ladattu yhteydettömään tilaan. "
-"Nouda osoitekirjan sisältö ollessasi verkottomassa tilassa."
+"verkottomaan käyttöön tai sitä ei ole vielä ladattu yhteydettömään tilaan. Nouda "
+"osoitekirjan sisältö ollessasi verkottomassa tilassa."
 
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:138
 #, c-format
 msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
+"This address book cannot be opened.  Please check that the path %s exists and that "
+"permissions are set to access it."
 msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Tarkista että polku %s on olemassa ja että "
 "sinulla on oikeudet käyttää sitä."
 
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:151
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+"This version of Evolution does not have LDAP support compiled in to it.  To use "
+"LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
-"Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
-"tuen evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
+"Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-tuen "
+"evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
 
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:160
 msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI was "
+"entered, or the server is unreachable."
 msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Osoitekirjan URI voi olla virheellinen tai "
 "palvelinta ei voi tavoittaa."
@@ -4634,8 +4583,7 @@ msgstr "Tämän osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
-"Tämän osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä. "
-"%s"
+"Tämän osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:235
@@ -4744,16 +4692,14 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:2005
-#: ../src/e-util/e-accounts-window.c:1727 ../src/e-util/e-focus-tracker.c:783
-#: ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2688
-#: ../src/mail/e-mail-account-manager.c:737
+#: ../src/calendar/gui/e-comp-editor.c:2005 ../src/e-util/e-accounts-window.c:1714
+#: ../src/e-util/e-focus-tracker.c:783 ../src/e-util/evolution-source-viewer.c:806
+#: ../src/e-util/e-webdav-browser.c:2688 ../src/mail/e-mail-account-manager.c:737
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1093
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:676
 #: ../src/modules/calendar/e-task-shell-view-actions.c:830
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
 #: ../src/shell/e-shell-window-actions.c:852
 #: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
@@ -4953,7 +4899,7 @@ msgstr "Lä_hennä"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2415
+#: ../src/mail/e-mail-reader.c:2500
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
@@ -5027,8 +4973,8 @@ msgstr ""
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
 #: ../src/calendar/importers/icalendar-importer.c:479
-#: ../src/calendar/importers/icalendar-importer.c:976
-#: ../src/calendar/importers/icalendar-importer.c:1016
+#: ../src/calendar/importers/icalendar-importer.c:972
+#: ../src/calendar/importers/icalendar-importer.c:1012
 #: ../src/shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Tuodaan..."
@@ -5212,30 +5158,30 @@ msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:103
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:116
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:118
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:129
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:131
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivä"
 
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:357
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:373
 msgid "Start time"
 msgstr "Alkamisaika"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../src/calendar/alarm-notify/alarm-queue.c:1988
+#: ../src/calendar/alarm-notify/alarm-queue.c:2002
 msgid "Appointments"
 msgstr "Tapaamiset"
 
@@ -5248,21 +5194,19 @@ msgid "_Snooze"
 msgstr "_Torku"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1363
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor.c:2070
-#: ../src/e-util/e-accounts-window.c:1719
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1367
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2222
+#: ../src/calendar/gui/e-comp-editor.c:2070 ../src/e-util/e-accounts-window.c:1706
 #: ../src/e-util/e-html-editor-actions.c:922
-#: ../src/e-util/e-mail-signature-manager.c:358
-#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:24
-#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
-#: ../src/mail/e-mail-label-manager.c:380
+#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2681
+#: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:728
+#: ../src/mail/e-mail-browser.c:172 ../src/mail/e-mail-label-manager.c:380
 #: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:66
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:548
 #: ../src/plugins/email-custom-header/email-custom-header.c:842
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:468
-#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/templates/templates.c:468 ../src/shell/e-shell-window-actions.c:980
+#: ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Muokkaa"
 
@@ -5276,11 +5220,11 @@ msgid "_Dismiss"
 msgstr "_Hylkää"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../src/calendar/alarm-notify/alarm-queue.c:1955
-#: ../src/calendar/alarm-notify/alarm-queue.c:1965
+#: ../src/calendar/alarm-notify/alarm-queue.c:1969
+#: ../src/calendar/alarm-notify/alarm-queue.c:1979
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1678
-#: ../src/modules/itip-formatter/itip-view.c:1789
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1792
 msgid "Location:"
 msgstr "Sijainti:"
 
@@ -5297,7 +5241,7 @@ msgstr "Torkkumis_aika:"
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:342
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "days"
 msgstr "päivä"
 
@@ -5312,64 +5256,63 @@ msgstr "tuntia"
 msgid "minutes"
 msgstr "minuutti"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1756
-#: ../src/calendar/alarm-notify/alarm-queue.c:1936
+#: ../src/calendar/alarm-notify/alarm-queue.c:1770
+#: ../src/calendar/alarm-notify/alarm-queue.c:1950
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla."
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1765
-#: ../src/calendar/alarm-notify/alarm-queue.c:1767
+#: ../src/calendar/alarm-notify/alarm-queue.c:1779
+#: ../src/calendar/alarm-notify/alarm-queue.c:1781
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla."
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1775
+#: ../src/calendar/alarm-notify/alarm-queue.c:1789
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla."
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1780
-#: ../src/calendar/alarm-notify/alarm-queue.c:1927
-#: ../src/calendar/alarm-notify/alarm-queue.c:2278
+#: ../src/calendar/alarm-notify/alarm-queue.c:1794
+#: ../src/calendar/alarm-notify/alarm-queue.c:1941
+#: ../src/calendar/alarm-notify/alarm-queue.c:2292
 msgid "Evolution Reminders"
 msgstr "Evolution-muistuttajat"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1823
+#: ../src/calendar/alarm-notify/alarm-queue.c:1837
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Sinulla on %d muistutus"
 msgstr[1] "Sinulla on %d muistutusta"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2096
+#: ../src/calendar/alarm-notify/alarm-queue.c:2110
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2097
-#: ../src/mail/mail-dialogs.ui.h:20
+#: ../src/calendar/alarm-notify/alarm-queue.c:2111 ../src/mail/mail-dialogs.ui.h:20
 msgid "_No"
 msgstr "_Ei"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2098
+#: ../src/calendar/alarm-notify/alarm-queue.c:2112
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2102
+#: ../src/calendar/alarm-notify/alarm-queue.c:2116
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to "
+"run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Evolution kalenterin muistutus laukeaa nyt. Muistutus on määritelty "
-"suorittamaan seuraavan ohjelman:\n"
+"Evolution kalenterin muistutus laukeaa nyt. Muistutus on määritelty suorittamaan "
+"seuraavan ohjelman:\n"
 "\n"
 "         %s\n"
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2117
+#: ../src/calendar/alarm-notify/alarm-queue.c:2131
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan."
 
@@ -5378,8 +5321,8 @@ msgid "invalid time"
 msgstr "epäkelpo aika"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../src/calendar/alarm-notify/util.c:91
-#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
+#: ../src/calendar/alarm-notify/util.c:91 ../src/calendar/gui/e-alarm-list.c:368
+#: ../src/calendar/gui/misc.c:95
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -5387,8 +5330,8 @@ msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../src/calendar/alarm-notify/util.c:97
-#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
+#: ../src/calendar/alarm-notify/util.c:97 ../src/calendar/gui/e-alarm-list.c:380
+#: ../src/calendar/gui/misc.c:101
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -5396,8 +5339,8 @@ msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../src/calendar/alarm-notify/util.c:103
-#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
+#: ../src/calendar/alarm-notify/util.c:103 ../src/calendar/gui/e-alarm-list.c:386
+#: ../src/calendar/gui/misc.c:107
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -5407,8 +5350,8 @@ msgstr[1] "%d minuuttia"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../src/calendar/alarm-notify/util.c:107
-#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
+#: ../src/calendar/alarm-notify/util.c:107 ../src/calendar/gui/e-alarm-list.c:392
+#: ../src/calendar/gui/misc.c:111
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -5421,11 +5364,11 @@ msgstr "Haluatko lähettää perumisilmoituksen kaikille osanottajille?"
 
 #: ../src/calendar/calendar.error.xml.h:2
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"If you do not send a cancelation 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 peruttu."
+"Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että kokous on "
+"peruttu."
 
 #: ../src/calendar/calendar.error.xml.h:3
 msgid "Do _not Send"
@@ -5435,27 +5378,24 @@ msgstr "Älä läh_etä"
 msgid "_Send Notice"
 msgstr "_Lähetä huomautus"
 
-#: ../src/calendar/calendar.error.xml.h:5
-#: ../src/calendar/gui/e-cal-dialogs.c:507
+#: ../src/calendar/calendar.error.xml.h:5 ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
 #: ../src/calendar/calendar.error.xml.h:6
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+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
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+"If you do not send a cancelation 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 peruttu."
+"Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että tehtävä on "
+"peruttu."
 
-#: ../src/calendar/calendar.error.xml.h:9
-#: ../src/calendar/gui/e-cal-dialogs.c:510
+#: ../src/calendar/calendar.error.xml.h:9 ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Haluatko varmasti poistaa tämän tehtävän?"
@@ -5470,14 +5410,13 @@ msgstr "Haluatko lähettää perumisilmoituksen tälle muistilapulle?"
 
 #: ../src/calendar/calendar.error.xml.h:12
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+"If you do not send a cancelation 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ä "
 "muistilappu on poistettu."
 
-#: ../src/calendar/calendar.error.xml.h:13
-#: ../src/calendar/gui/e-cal-dialogs.c:513
+#: ../src/calendar/calendar.error.xml.h:13 ../src/calendar/gui/e-cal-dialogs.c:513
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
@@ -5495,8 +5434,7 @@ msgid "Are you sure you want to delete the appointment titled “{0}”?"
 msgstr "Haluatko varmasti poistaa tapaamisen nimeltään “{0}”?"
 
 #: ../src/calendar/calendar.error.xml.h:17
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "Kaikki tiedot tästä tapaamisesta poistetaan eikä niitä voi palauttaa."
 
 #: ../src/calendar/calendar.error.xml.h:18
@@ -5521,8 +5459,7 @@ msgstr "Haluatko varmasti poistaa nämä {0} tapaamista?"
 
 #: ../src/calendar/calendar.error.xml.h:23
 msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+"All information on these appointments will be deleted and can not be restored."
 msgstr "Kaikki tiedot näistä tapaamisista poistetaan eikä niitä voi palauttaa."
 
 #: ../src/calendar/calendar.error.xml.h:24
@@ -5539,8 +5476,7 @@ msgstr "Haluatko varmasti poistaa nämä {0} muistilappua?"
 
 #: ../src/calendar/calendar.error.xml.h:27
 msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"Kaikki tiedot näissä muistilapuissa poistetaan eikä niitä voi palauttaa."
+msgstr "Kaikki tiedot näissä muistilapuissa poistetaan eikä niitä voi palauttaa."
 
 #: ../src/calendar/calendar.error.xml.h:28
 msgid "Would you like to save your changes to this meeting?"
@@ -5555,7 +5491,7 @@ msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
 #: ../src/calendar/calendar.error.xml.h:31
-#: ../src/composer/mail-composer.error.xml.h:13
+#: ../src/composer/mail-composer.error.xml.h:15
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
@@ -5588,13 +5524,11 @@ msgid "Would you like to send meeting invitations to participants?"
 msgstr "Haluatko lähettää kokouskutsuja osallistujille?"
 
 #: ../src/calendar/calendar.error.xml.h:39
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
-msgstr ""
-"Kutsu lähetetään kaikille osanottajille ja he voivat kuitata osanottonsa."
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "Kutsu lähetetään kaikille osanottajille ja he voivat kuitata osanottonsa."
 
 #: ../src/calendar/calendar.error.xml.h:40
-#: ../src/composer/mail-composer.error.xml.h:38 ../src/mail/mail.error.xml.h:8
+#: ../src/composer/mail-composer.error.xml.h:40 ../src/mail/mail.error.xml.h:8
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Lähetä"
@@ -5605,11 +5539,11 @@ msgstr "Haluatko lähettää päivitetyt kokouksen tiedot osanottajille?"
 
 #: ../src/calendar/calendar.error.xml.h:42
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+"Sending updated information allows other participants to keep their calendars up "
+"to date."
 msgstr ""
-"Päivitettyjen tietojen lähettäminen antaa muille mahdollisuuden pitää "
-"kalenterinsa ajan tasalla."
+"Päivitettyjen tietojen lähettäminen antaa muille mahdollisuuden pitää kalenterinsa "
+"ajan tasalla."
 
 #: ../src/calendar/calendar.error.xml.h:43
 msgid "Would you like to send this task to participants?"
@@ -5617,8 +5551,8 @@ msgstr "Haluatko lähettää tämän tehtävän osanottajille?"
 
 #: ../src/calendar/calendar.error.xml.h:44
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+"Email invitations will be sent to all participants and allow them to accept this "
+"task."
 msgstr ""
 "Kutsu lähetetään kaikille osanottajille ja he voivat hyväksyä tämän tehtävän."
 
@@ -5628,11 +5562,11 @@ msgstr "Tietojen haku on kesken. Haluatko tallentaa tehtävän?"
 
 #: ../src/calendar/calendar.error.xml.h:46
 msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
+"Some attachments are being downloaded. Saving the task would result in the loss of "
+"these attachments."
 msgstr ""
-"Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt "
-"aiheuttaa tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
+"Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt aiheuttaa "
+"tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
 
 #: ../src/calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
@@ -5640,8 +5574,8 @@ msgstr "Tietojen haku kesken. Haluatko varmasti tallentaa tämän tapaamisen?"
 
 #: ../src/calendar/calendar.error.xml.h:49
 msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+"Some attachments are being downloaded. Saving the appointment would result in the "
+"loss of these attachments."
 msgstr ""
 "Joidenkin liitteiden lataus on vielä kesken. Tapaamisen tallentaminen nyt "
 "aiheuttaa tapaamisen tallentamisen ilman näitä hakemattomia liitteitä."
@@ -5652,8 +5586,8 @@ msgstr "Halutako lähettää päivitetyn tehtävätiedon osanottajille?"
 
 #: ../src/calendar/calendar.error.xml.h:51
 msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+"Sending updated information allows other participants to keep their task lists up "
+"to date."
 msgstr ""
 "Päivitettyjen tehtävätietojen lähettäminen antaa muille mahdollisuuden pitää "
 "tehtävälistansa ajan tasalla."
@@ -5667,11 +5601,11 @@ msgstr "Haluatko lähettää tämän tehtävän osanottajille?"
 #: ../src/calendar/calendar.error.xml.h:53
 #, fuzzy
 #| msgid ""
-#| "Email invitations will be sent to all participants and allow them to "
-#| "accept this task."
+#| "Email invitations will be sent to all participants and allow them to accept "
+#| "this task."
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this memo."
+"Email invitations will be sent to all participants and allow them to accept this "
+"memo."
 msgstr ""
 "Kutsu lähetetään kaikille osanottajille ja he voivat hyväksyä tämän tehtävän."
 
@@ -5684,11 +5618,11 @@ msgstr "Haluatko lähettää päivitetyt kokouksen tiedot osanottajille?"
 #: ../src/calendar/calendar.error.xml.h:55
 #, fuzzy
 #| msgid ""
-#| "Sending updated information allows other participants to keep their task "
-#| "lists up to date."
+#| "Sending updated information allows other participants to keep their task lists "
+#| "up to date."
 msgid ""
-"Sending updated information allows other participants to keep their memo "
-"lists up to date."
+"Sending updated information allows other participants to keep their memo lists up "
+"to date."
 msgstr ""
 "Päivitettyjen tehtävätietojen lähettäminen antaa muille mahdollisuuden pitää "
 "tehtävälistansa ajan tasalla."
@@ -5732,14 +5666,13 @@ msgstr "Haluatko varmasti poistaa etäkalenterin “{0}”?"
 #: ../src/calendar/calendar.error.xml.h:64
 #, fuzzy
 #| msgid ""
-#| "This will permanently remove the calendar '{0}' from the server. Are you "
-#| "sure you want to proceed?"
+#| "This will permanently remove the calendar '{0}' from the server. Are you sure "
+#| "you want to proceed?"
 msgid ""
-"This will permanently remove the calendar “{0}” from the server. Are you "
-"sure you want to proceed?"
+"This will permanently remove the calendar “{0}” from the server. Are you sure you "
+"want to proceed?"
 msgstr ""
-"Etäkalenteri \"{0}\" poistetaan pysyvästi palvelimelta. Haluatko varmasti "
-"jatkaa?"
+"Etäkalenteri \"{0}\" poistetaan pysyvästi palvelimelta. Haluatko varmasti jatkaa?"
 
 #: ../src/calendar/calendar.error.xml.h:66
 #, fuzzy
@@ -5750,11 +5683,11 @@ msgstr "Haluatko varmasti poistaa muistilapun “{0}”?"
 #: ../src/calendar/calendar.error.xml.h:67
 #, fuzzy
 #| msgid ""
-#| "This will permanently remove the task list '{0}' from the server. Are you "
-#| "sure you want to proceed?"
+#| "This will permanently remove the task list '{0}' from the server. Are you sure "
+#| "you want to proceed?"
 msgid ""
-"This will permanently remove the task list “{0}” from the server. Are you "
-"sure you want to proceed?"
+"This will permanently remove the task list “{0}” from the server. Are you sure you "
+"want to proceed?"
 msgstr ""
 "Etätehtävälista \"{0}\" poistetaan palvelimelta pysyvästi. Haluatko varmasti "
 "jatkaa?"
@@ -5768,11 +5701,11 @@ msgstr "Haluatko varmasti poistaa muistilapun “{0}”?"
 #: ../src/calendar/calendar.error.xml.h:69
 #, fuzzy
 #| msgid ""
-#| "This will permanently remove the memo list '{0}' from the server. Are you "
-#| "sure you want to proceed?"
+#| "This will permanently remove the memo list '{0}' from the server. Are you sure "
+#| "you want to proceed?"
 msgid ""
-"This will permanently remove the memo list “{0}” from the server. Are you "
-"sure you want to proceed?"
+"This will permanently remove the memo list “{0}” from the server. Are you sure you "
+"want to proceed?"
 msgstr ""
 "Etämuistiolista \"{0}\" poistetaan palvelimelta pysyvästi. Haluatko varmasti "
 "jatkaa?"
@@ -5783,11 +5716,11 @@ msgstr "Haluatko varmasti tallentaa tapaamisen ilman yhteenvetoa?"
 
 #: ../src/calendar/calendar.error.xml.h:71
 msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of what your "
+"appointment is about."
 msgstr ""
-"Merkityksellisen yhteenvedon lisääminen helpottaa ymmärtämään, mistä "
-"tapaamisessa on kyse."
+"Merkityksellisen yhteenvedon lisääminen helpottaa ymmärtämään, mistä tapaamisessa "
+"on kyse."
 
 #: ../src/calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
@@ -5795,11 +5728,11 @@ msgstr "Haluatko varmasti tallentaa tehtävän ilman yhteenvetoa?"
 
 #: ../src/calendar/calendar.error.xml.h:73
 msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
+"Adding a meaningful summary to your task will give you an idea of what your task "
+"is about."
 msgstr ""
-"Merkityksellisen yhteenvedon lisääminen tehtävään helpottaa ymmärtämään, "
-"mistä tehtävässä on kyse."
+"Merkityksellisen yhteenvedon lisääminen tehtävään helpottaa ymmärtämään, mistä "
+"tehtävässä on kyse."
 
 #: ../src/calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
@@ -5822,14 +5755,14 @@ msgstr "Tapahtumaa ei voi tallentaa"
 #: ../src/calendar/calendar.error.xml.h:80
 #, fuzzy
 #| msgid ""
-#| "'{0}' is a read-only calendar and cannot be modified. Please select a "
-#| "different calendar that can accept appointments."
+#| "'{0}' is a read-only calendar and cannot be modified. Please select a different "
+#| "calendar that can accept appointments."
 msgid ""
-"“{0}” is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
+"“{0}” is a read-only calendar and cannot be modified. Please select a different "
+"calendar that can accept appointments."
 msgstr ""
-"\"{0}\" on vain luettavissa oleva kalenteri eikä sitä voi muokata. Valitse "
-"toinen kalenteri, johon tapaamisia voidaan lisätä."
+"\"{0}\" on vain luettavissa oleva kalenteri eikä sitä voi muokata. Valitse toinen "
+"kalenteri, johon tapaamisia voidaan lisätä."
 
 #: ../src/calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
@@ -5837,8 +5770,7 @@ msgstr "Tehtävää ei voi tallentaa"
 
 #. Translators: {0} is the name of the calendar source
 #: ../src/calendar/calendar.error.xml.h:83
-msgid ""
-"“{0}” does not support assigned tasks, please select a different task list."
+msgid "“{0}” does not support assigned tasks, please select a different task list."
 msgstr ""
 
 #. Translators: {0} is the name of the task list.
@@ -5861,8 +5793,7 @@ msgstr "Virhe ladattaessa muistilappulistaa"
 
 #: ../src/calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
-msgstr ""
-"Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa."
+msgstr "Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
 #. Translators: {0} is the name of the calendar/memo list/task list.
 #: ../src/calendar/calendar.error.xml.h:91
@@ -6154,16 +6085,14 @@ msgid "Failed to make an occurrence movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
 #: ../src/calendar/calendar.error.xml.h:173
-#, fuzzy
-#| msgid "Create a new window displaying this view"
 msgid "Something has gone wrong when displaying the event"
-msgstr "Luo uusi ikkuna tälle näkymälle"
+msgstr "Jokin meni vikaan tapahtumaa näyttäessä"
 
 #: ../src/calendar/calendar.error.xml.h:174
 msgid ""
-"A WebKitWebProcess crashed when displaying the event. You can try again by "
-"moving to another event and back. If the issue persists, please file a bug "
-"report in the GNOME bugzilla."
+"A WebKitWebProcess crashed when displaying the event. You can try again by moving "
+"to another event and back. If the issue persists, please file a bug report in the "
+"GNOME bugzilla."
 msgstr ""
 
 #: ../src/calendar/calendar.error.xml.h:175
@@ -6174,42 +6103,38 @@ msgstr "Luo uusi ikkuna tälle näkymälle"
 
 #: ../src/calendar/calendar.error.xml.h:176
 msgid ""
-"A WebKitWebProcess crashed when displaying the memo. You can try again by "
-"moving to another memo and back. If the issue persists, please file a bug "
-"report in the GNOME bugzilla."
+"A WebKitWebProcess crashed when displaying the memo. You can try again by moving "
+"to another memo and back. If the issue persists, please file a bug report in the "
+"GNOME bugzilla."
 msgstr ""
 
 #: ../src/calendar/calendar.error.xml.h:177
-#, fuzzy
 msgid "Something has gone wrong when displaying the task"
-msgstr "Käytä omia fontteja näytettäessä viestejä."
+msgstr "Jokin meni vikaan tehtävää näyttäessä"
 
 #: ../src/calendar/calendar.error.xml.h:178
 msgid ""
-"A WebKitWebProcess crashed when displaying the task. You can try again by "
-"moving to another task and back. If the issue persists, please file a bug "
-"report in the GNOME bugzilla."
+"A WebKitWebProcess crashed when displaying the task. You can try again by moving "
+"to another task and back. If the issue persists, please file a bug report in the "
+"GNOME bugzilla."
 msgstr ""
 
 #: ../src/calendar/gui/caltypes.xml.in.h:1
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:3
 #: ../src/calendar/gui/e-memo-table.etspec.h:2
 #: ../src/calendar/gui/e-task-table.etspec.h:4
-#: ../src/calendar/gui/memotypes.xml.in.h:1
-#: ../src/calendar/gui/tasktypes.xml.in.h:1
+#: ../src/calendar/gui/memotypes.xml.in.h:1 ../src/calendar/gui/tasktypes.xml.in.h:1
 #: ../src/plugins/save-calendar/csv-format.c:373
 msgid "Summary"
 msgstr "Kuvaus"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:2
-#: ../src/calendar/gui/memotypes.xml.in.h:2
+#: ../src/calendar/gui/caltypes.xml.in.h:2 ../src/calendar/gui/memotypes.xml.in.h:2
 #: ../src/calendar/gui/tasktypes.xml.in.h:2 ../src/mail/filtertypes.xml.in.h:2
 #: ../src/mail/searchtypes.xml.in.h:2 ../src/mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "sisältää"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:3
-#: ../src/calendar/gui/memotypes.xml.in.h:3
+#: ../src/calendar/gui/caltypes.xml.in.h:3 ../src/calendar/gui/memotypes.xml.in.h:3
 #: ../src/calendar/gui/tasktypes.xml.in.h:3 ../src/mail/filtertypes.xml.in.h:3
 #: ../src/mail/searchtypes.xml.in.h:3 ../src/mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
@@ -6217,65 +6142,55 @@ msgstr "ei sisällä"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:4
 #: ../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/calendar/gui/memotypes.xml.in.h:4 ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
+#: ../src/e-util/e-collection-account-wizard.c:1655
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:5
-#: ../src/calendar/gui/memotypes.xml.in.h:5
+#: ../src/calendar/gui/caltypes.xml.in.h:5 ../src/calendar/gui/memotypes.xml.in.h:5
 #: ../src/calendar/gui/tasktypes.xml.in.h:7
 msgid "Any Field"
 msgstr "Mikä tahansa kenttä"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:6
-#: ../src/calendar/gui/memotypes.xml.in.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:6 ../src/calendar/gui/memotypes.xml.in.h:7
 msgid "Classification"
 msgstr "Luokittelu"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:7
-#: ../src/calendar/gui/memotypes.xml.in.h:8
+#: ../src/calendar/gui/caltypes.xml.in.h:7 ../src/calendar/gui/memotypes.xml.in.h:8
 #: ../src/calendar/gui/tasktypes.xml.in.h:9 ../src/mail/filtertypes.xml.in.h:4
 #: ../src/mail/searchtypes.xml.in.h:4 ../src/mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "on"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:8
-#: ../src/calendar/gui/memotypes.xml.in.h:9
+#: ../src/calendar/gui/caltypes.xml.in.h:8 ../src/calendar/gui/memotypes.xml.in.h:9
 #: ../src/calendar/gui/tasktypes.xml.in.h:10 ../src/mail/filtertypes.xml.in.h:5
 #: ../src/mail/searchtypes.xml.in.h:5 ../src/mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "ei ole"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:9
-#: ../src/calendar/gui/e-cal-list-view.c:238
+#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:238
 #: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-task-table.c:522
-#: ../src/calendar/gui/memotypes.xml.in.h:10
+#: ../src/calendar/gui/e-task-table.c:523 ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:10
-#: ../src/calendar/gui/e-cal-list-view.c:239
-#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:239
+#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:11
-#: ../src/calendar/gui/e-cal-list-view.c:240
-#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:240
+#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
 #: ../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:113 ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:12
-#: ../src/calendar/gui/memotypes.xml.in.h:6
+#: ../src/calendar/gui/caltypes.xml.in.h:12 ../src/calendar/gui/memotypes.xml.in.h:6
 #: ../src/calendar/gui/tasktypes.xml.in.h:5
 msgid "Organizer"
 msgstr "Järjestäjä"
@@ -6289,21 +6204,19 @@ msgstr "Osanottaja"
 #: ../src/calendar/gui/caltypes.xml.in.h:14
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:5
 #: ../src/mail/message-list.etspec.h:14
-#: ../src/plugins/publish-calendar/publish-calendar.c:860
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+#: ../src/plugins/publish-calendar/publish-calendar.c:861
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../src/plugins/save-calendar/csv-format.c:387
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:15
-#: ../src/calendar/gui/memotypes.xml.in.h:13
+#: ../src/calendar/gui/caltypes.xml.in.h:15 ../src/calendar/gui/memotypes.xml.in.h:13
 #: ../src/calendar/gui/tasktypes.xml.in.h:23
 #: ../src/e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Luokka"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:16
-#: ../src/calendar/gui/memotypes.xml.in.h:14
+#: ../src/calendar/gui/caltypes.xml.in.h:16 ../src/calendar/gui/memotypes.xml.in.h:14
 #: ../src/calendar/gui/tasktypes.xml.in.h:15
 #: ../src/em-format/e-mail-formatter-print.c:51
 #: ../src/em-format/e-mail-formatter-print-headers.c:155
@@ -6312,24 +6225,20 @@ msgstr "Luokka"
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:17
-#: ../src/calendar/gui/memotypes.xml.in.h:15
-#: ../src/calendar/gui/tasktypes.xml.in.h:16
-#: ../src/mail/filtertypes.xml.in.h:48 ../src/mail/searchtypes.xml.in.h:50
-#: ../src/mail/vfoldertypes.xml.in.h:51
+#: ../src/calendar/gui/caltypes.xml.in.h:17 ../src/calendar/gui/memotypes.xml.in.h:15
+#: ../src/calendar/gui/tasktypes.xml.in.h:16 ../src/mail/filtertypes.xml.in.h:48
+#: ../src/mail/searchtypes.xml.in.h:50 ../src/mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "On olemassa"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:18
-#: ../src/calendar/gui/memotypes.xml.in.h:16
-#: ../src/calendar/gui/tasktypes.xml.in.h:17
-#: ../src/mail/filtertypes.xml.in.h:49 ../src/mail/searchtypes.xml.in.h:51
-#: ../src/mail/vfoldertypes.xml.in.h:52
+#: ../src/calendar/gui/caltypes.xml.in.h:18 ../src/calendar/gui/memotypes.xml.in.h:16
+#: ../src/calendar/gui/tasktypes.xml.in.h:17 ../src/mail/filtertypes.xml.in.h:49
+#: ../src/mail/searchtypes.xml.in.h:51 ../src/mail/vfoldertypes.xml.in.h:52
 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:2003
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2002
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -6349,18 +6258,30 @@ msgstr "Tasan"
 msgid "More Than"
 msgstr "Enemmän kuin"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:24
-#: ../src/calendar/gui/memotypes.xml.in.h:17
+#: ../src/calendar/gui/caltypes.xml.in.h:24 ../src/calendar/gui/memotypes.xml.in.h:17
 #: ../src/calendar/gui/tasktypes.xml.in.h:28
 msgid "Summary Contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:25
-#: ../src/calendar/gui/memotypes.xml.in.h:18
+#: ../src/calendar/gui/caltypes.xml.in.h:25 ../src/calendar/gui/memotypes.xml.in.h:18
 #: ../src/calendar/gui/tasktypes.xml.in.h:29
 msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
+#: ../src/calendar/gui/comp-util.c:1490
+#: ../src/modules/itip-formatter/itip-view.c:2365
+#, c-format
+msgid "with one guest"
+msgid_plural "with %d guests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/calendar/gui/comp-util.c:1546
+#, c-format
+#| msgid "Comment:"
+msgid "Comments: %s"
+msgstr "Kommentit: %s"
+
 #: ../src/calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
@@ -6472,28 +6393,28 @@ msgstr[1] "%d viikkoa"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1827
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1811
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Toista ääni"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1825
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1809
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Ponnahdusikkuna hälytykselle"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1831
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1815
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Lähetä sähköposti"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1829
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1813
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Suorita ohjelma"
@@ -6590,7 +6511,7 @@ msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:214
-#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:124
+#: ../src/e-util/e-filter-rule.c:985 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Nimetön"
 
@@ -6615,18 +6536,17 @@ msgid "Due Date:"
 msgstr "Eräpäivä:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:298
-#: ../src/modules/itip-formatter/itip-view.c:1681
-#: ../src/modules/itip-formatter/itip-view.c:1798
+#: ../src/modules/itip-formatter/itip-view.c:1684
+#: ../src/modules/itip-formatter/itip-view.c:1801
 msgid "Status:"
 msgstr "Tila:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:302
 #: ../src/calendar/gui/e-cal-model-tasks.c:310
 #: ../src/calendar/gui/e-cal-model-tasks.c:552
-#: ../src/calendar/gui/e-cal-model-tasks.c:633
-#: ../src/calendar/gui/e-task-table.c:205
-#: ../src/calendar/gui/e-task-table.c:220
-#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3590
+#: ../src/calendar/gui/e-cal-model-tasks.c:633 ../src/calendar/gui/e-task-table.c:206
+#: ../src/calendar/gui/e-task-table.c:221 ../src/calendar/gui/e-task-table.c:633
+#: ../src/calendar/gui/print.c:3580
 msgid "In Progress"
 msgstr "Työn alla"
 
@@ -6634,22 +6554,18 @@ msgstr "Työn alla"
 #: ../src/calendar/gui/e-cal-model-tasks.c:312
 #: ../src/calendar/gui/e-cal-model-tasks.c:554
 #: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/calendar/gui/e-meeting-store.c:225
-#: ../src/calendar/gui/e-task-table.c:207
-#: ../src/calendar/gui/e-task-table.c:222
-#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3593
-#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/calendar/gui/e-meeting-store.c:225 ../src/calendar/gui/e-task-table.c:208
+#: ../src/calendar/gui/e-task-table.c:223 ../src/calendar/gui/e-task-table.c:634
+#: ../src/calendar/gui/print.c:3583 ../src/calendar/gui/tasktypes.xml.in.h:13
 #: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Completed"
 msgstr "Valmis"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:312
 #: ../src/calendar/gui/e-cal-model-tasks.c:308
-#: ../src/calendar/gui/e-cal-model-tasks.c:550
-#: ../src/calendar/gui/e-task-table.c:203
-#: ../src/calendar/gui/e-task-table.c:218
-#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3587
-#: ../src/calendar/gui/tasktypes.xml.in.h:11
+#: ../src/calendar/gui/e-cal-model-tasks.c:550 ../src/calendar/gui/e-task-table.c:204
+#: ../src/calendar/gui/e-task-table.c:219 ../src/calendar/gui/e-task-table.c:632
+#: ../src/calendar/gui/print.c:3577 ../src/calendar/gui/tasktypes.xml.in.h:11
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
@@ -6658,24 +6574,21 @@ msgid "Priority:"
 msgstr "Prioriteetti:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:327
-#: ../src/calendar/gui/e-task-table.c:548
-#: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:323
+#: ../src/calendar/gui/e-task-table.c:549 ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:327
 msgid "High"
 msgstr "Korkea"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:329
-#: ../src/calendar/gui/e-cal-model.c:1890
-#: ../src/calendar/gui/e-task-table.c:549
-#: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:322
+#: ../src/calendar/gui/e-cal-model.c:1890 ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/tasktypes.xml.in.h:20 ../src/e-util/e-send-options.ui.h:5
+#: ../src/mail/message-list.c:326
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:331
-#: ../src/calendar/gui/e-task-table.c:550
-#: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:321
+#: ../src/calendar/gui/e-task-table.c:551 ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:325
 msgid "Low"
 msgstr "Matala"
 
@@ -6829,14 +6742,12 @@ msgstr "Tätä ja tulevia kertoja"
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1174
-#: ../src/calendar/gui/e-cal-dialogs.c:1256
+#: ../src/calendar/gui/e-cal-dialogs.c:1174 ../src/calendar/gui/e-cal-dialogs.c:1256
 #, fuzzy
 msgid "Send my reminders with this event"
 msgstr "Lähetä hälytys tälle tapahtumalle"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1176
-#: ../src/calendar/gui/e-cal-dialogs.c:1258
+#: ../src/calendar/gui/e-cal-dialogs.c:1176 ../src/calendar/gui/e-cal-dialogs.c:1258
 msgid "Notify new attendees _only"
 msgstr "Muistuta uusia osallistuja _vain"
 
@@ -6860,20 +6771,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:864
-#: ../src/calendar/gui/e-cal-ops.c:1556
+#: ../src/calendar/gui/e-calendar-view.c:864 ../src/calendar/gui/e-cal-ops.c:1556
 msgid "Default calendar not found"
 msgstr "Oletuskalenteria ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:869
-#: ../src/calendar/gui/e-cal-ops.c:1559
+#: ../src/calendar/gui/e-calendar-view.c:869 ../src/calendar/gui/e-cal-ops.c:1559
 #, fuzzy
 #| msgid "Mark as default memo list"
 msgid "Default memo list not found"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../src/calendar/gui/e-calendar-view.c:874
-#: ../src/calendar/gui/e-cal-ops.c:1562
+#: ../src/calendar/gui/e-calendar-view.c:874 ../src/calendar/gui/e-cal-ops.c:1562
 msgid "Default task list not found"
 msgstr "Oletustehtävälistaa ei löytynyt"
 
@@ -6892,9 +6800,8 @@ msgstr "Tallenna iCalendar-muodossa"
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1831
-#: ../src/calendar/gui/e-memo-table.c:493
-#: ../src/calendar/gui/e-task-table.c:818
+#: ../src/calendar/gui/e-calendar-view.c:1831 ../src/calendar/gui/e-memo-table.c:493
+#: ../src/calendar/gui/e-task-table.c:819
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
@@ -6902,9 +6809,8 @@ msgstr "Järjestäjä: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1835
-#: ../src/calendar/gui/e-memo-table.c:498
-#: ../src/calendar/gui/e-task-table.c:822
+#: ../src/calendar/gui/e-calendar-view.c:1835 ../src/calendar/gui/e-memo-table.c:498
+#: ../src/calendar/gui/e-task-table.c:823
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
@@ -6912,24 +6818,23 @@ msgstr "Järjestäjä: %s"
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
 #: ../src/calendar/gui/e-calendar-view.c:1851
-#: ../src/calendar/gui/e-meeting-time-sel.c:2731
-#: ../src/calendar/gui/e-to-do-pane.c:343 ../src/calendar/gui/print.c:3541
+#: ../src/calendar/gui/e-meeting-time-sel.c:2671
+#: ../src/calendar/gui/e-to-do-pane.c:346 ../src/calendar/gui/print.c:3531
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
 #. Translators: It will display "Time: StartDateAndTime (Duration)"
-#: ../src/calendar/gui/e-calendar-view.c:1891
-#: ../src/calendar/gui/e-to-do-pane.c:411
+#: ../src/calendar/gui/e-calendar-view.c:1891 ../src/calendar/gui/e-to-do-pane.c:438
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
-#: ../src/calendar/gui/e-calendar-view.c:2277
-#: ../src/calendar/gui/e-calendar-view.c:2284
-#: ../src/calendar/gui/e-calendar-view.c:2291
-#: ../src/calendar/gui/e-calendar-view.c:2294
+#: ../src/calendar/gui/e-calendar-view.c:2288
+#: ../src/calendar/gui/e-calendar-view.c:2295
+#: ../src/calendar/gui/e-calendar-view.c:2302
+#: ../src/calendar/gui/e-calendar-view.c:2305
 msgid "%d %b %Y"
 msgstr "%e. %Bta %Y"
 
@@ -6938,14 +6843,13 @@ msgstr "%e. %Bta %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2282
-#: ../src/calendar/gui/e-day-view.c:3078
-#: ../src/calendar/gui/e-day-view-top-item.c:849
+#: ../src/calendar/gui/e-calendar-view.c:2293 ../src/calendar/gui/e-day-view.c:3104
+#: ../src/calendar/gui/e-day-view-top-item.c:865
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%e. %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2304
+#: ../src/calendar/gui/e-calendar-view.c:2315
 msgid "%A %d %b %Y"
 msgstr "%A %e. %Bta %Y"
 
@@ -6955,16 +6859,15 @@ msgstr "%A %e. %Bta %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2308
-#: ../src/calendar/gui/e-day-view.c:3062
-#: ../src/calendar/gui/e-day-view-top-item.c:845
+#: ../src/calendar/gui/e-calendar-view.c:2319 ../src/calendar/gui/e-day-view.c:3088
+#: ../src/calendar/gui/e-day-view-top-item.c:861
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a %e. %bta"
 
-#: ../src/calendar/gui/e-calendar-view.c:2311
-#: ../src/calendar/gui/e-calendar-view.c:2317
-#: ../src/calendar/gui/e-calendar-view.c:2320
+#: ../src/calendar/gui/e-calendar-view.c:2322
+#: ../src/calendar/gui/e-calendar-view.c:2328
+#: ../src/calendar/gui/e-calendar-view.c:2331
 msgid "%a %d %b %Y"
 msgstr "%a %e. %b %Y"
 
@@ -7002,17 +6905,17 @@ msgstr "Lähde"
 #: ../src/calendar/gui/e-meeting-list-view.c:197
 #: ../src/calendar/gui/e-meeting-store.c:132
 #: ../src/calendar/gui/e-meeting-store.c:167
-#: ../src/calendar/gui/e-meeting-store.c:230 ../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:3412
-#: ../src/modules/itip-formatter/itip-view.c:6082
+#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
+#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3559
+#: ../src/modules/itip-formatter/itip-view.c:6301
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:614
 #: ../src/calendar/gui/e-cal-ops.c:1250
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:289
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:388
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr ""
@@ -7056,45 +6959,45 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: ../src/calendar/gui/e-cal-model.c:3793
+#: ../src/calendar/gui/e-cal-model.c:3800
 #: ../src/calendar/gui/e-meeting-list-view.c:219
 #: ../src/calendar/gui/e-meeting-store.c:194
 #: ../src/calendar/gui/e-meeting-store.c:217
-#: ../src/modules/itip-formatter/itip-view.c:6070
+#: ../src/modules/itip-formatter/itip-view.c:6289
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../src/calendar/gui/e-cal-model.c:3794
+#: ../src/calendar/gui/e-cal-model.c:3801
 #: ../src/calendar/gui/e-meeting-list-view.c:220
 #: ../src/calendar/gui/e-meeting-store.c:196
 #: ../src/calendar/gui/e-meeting-store.c:219
-#: ../src/modules/itip-formatter/itip-view.c:6076
+#: ../src/modules/itip-formatter/itip-view.c:6295
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../src/calendar/gui/e-cal-model.c:3795
+#: ../src/calendar/gui/e-cal-model.c:3802
 #: ../src/calendar/gui/e-meeting-list-view.c:221
 #: ../src/calendar/gui/e-meeting-store.c:198
 #: ../src/calendar/gui/e-meeting-store.c:221
-#: ../src/calendar/gui/e-meeting-time-sel.c:533
+#: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../src/calendar/gui/e-cal-model.c:3796
+#: ../src/calendar/gui/e-cal-model.c:3803
 #: ../src/calendar/gui/e-meeting-list-view.c:222
 #: ../src/calendar/gui/e-meeting-store.c:200
 #: ../src/calendar/gui/e-meeting-store.c:223
-#: ../src/modules/itip-formatter/itip-view.c:6079
+#: ../src/modules/itip-formatter/itip-view.c:6298
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../src/calendar/gui/e-cal-model.c:3797
+#: ../src/calendar/gui/e-cal-model.c:3804
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../src/calendar/gui/e-cal-model.c:3852
+#: ../src/calendar/gui/e-cal-model.c:3859
 #: ../src/calendar/gui/e-meeting-list-view.c:687
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -7105,13 +7008,13 @@ msgid "Status"
 msgstr "Tila"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:148
-#: ../src/calendar/gui/e-task-table.c:606
+#: ../src/calendar/gui/e-task-table.c:607
 msgid "Free"
 msgstr "Vapaa"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:151
-#: ../src/calendar/gui/e-meeting-time-sel.c:534
-#: ../src/calendar/gui/e-task-table.c:607
+#: ../src/calendar/gui/e-meeting-time-sel.c:524
+#: ../src/calendar/gui/e-task-table.c:608
 msgid "Busy"
 msgstr "Varattu"
 
@@ -7145,17 +7048,17 @@ msgstr "Nimi puuttuu."
 msgid "Modifying a task"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1812
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1918
 msgid "Removing an event"
 msgstr "Poistetaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1816
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1922
 #, fuzzy
 #| msgid "Removing attachments"
 msgid "Removing a memo"
 msgstr "Poistetaan liitteitä"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1820
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1926
 msgid "Removing a task"
 msgstr "Poistetaan tehtävä"
 
@@ -7356,8 +7259,7 @@ msgid "Event’s time is in the past"
 msgstr "Tapahtuman ajankohta on mennyt"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:200
-msgid ""
-"Event cannot be edited, because the selected calendar could not be opened"
+msgid "Event cannot be edited, because the selected calendar could not be opened"
 msgstr "Tapahtumaa ei voi muokata, koska valittua kalenteria ei voida avata"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:202
@@ -7381,9 +7283,10 @@ msgstr "Alkamisaika on virheellinen"
 #: ../src/calendar/gui/e-comp-editor-event.c:458
 #: ../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/mail/e-mail-display.c:2116 ../src/mail/e-mail-reader-utils.c:806
-#: ../src/mail/mail-send-recv.c:490 ../src/mail/mail-send-recv.c:1288
+#: ../src/em-format/e-mail-part-secure-button.c:93 ../src/e-util/e-misc-utils.c:4136
+#: ../src/e-util/e-misc-utils.c:4148 ../src/e-util/e-misc-utils.c:4162
+#: ../src/mail/e-mail-display.c:2191 ../src/mail/e-mail-reader-utils.c:806
+#: ../src/mail/mail-send-recv.c:569 ../src/mail/mail-send-recv.c:1422
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1073
 #: ../src/shell/e-shell.c:1097 ../src/smime/gui/certificate-manager.c:357
@@ -7398,119 +7301,119 @@ msgstr "Päättymispäivä ei ole kelvollinen päivä"
 msgid "End time is not a valid time"
 msgstr "Päättymisaika ei ole kelvollinen aika"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:586
+#: ../src/calendar/gui/e-comp-editor-event.c:584
 #: ../src/calendar/gui/e-comp-editor-memo.c:126
 #: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:588
+#: ../src/calendar/gui/e-comp-editor-event.c:586
 #: ../src/calendar/gui/e-comp-editor-memo.c:128
 #: ../src/calendar/gui/e-comp-editor-task.c:593
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:594
+#: ../src/calendar/gui/e-comp-editor-event.c:592
 #: ../src/calendar/gui/e-comp-editor-task.c:599
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:596
+#: ../src/calendar/gui/e-comp-editor-event.c:594
 #: ../src/calendar/gui/e-comp-editor-task.c:601
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:602
+#: ../src/calendar/gui/e-comp-editor-event.c:600
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:604
+#: ../src/calendar/gui/e-comp-editor-event.c:602
 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:610
+#: ../src/calendar/gui/e-comp-editor-event.c:608
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:612
+#: ../src/calendar/gui/e-comp-editor-event.c:610
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:621
+#: ../src/calendar/gui/e-comp-editor-event.c:619
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:623
+#: ../src/calendar/gui/e-comp-editor-event.c:621
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:628
+#: ../src/calendar/gui/e-comp-editor-event.c:626
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:630
+#: ../src/calendar/gui/e-comp-editor-event.c:628
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:635
+#: ../src/calendar/gui/e-comp-editor-event.c:633
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:637
+#: ../src/calendar/gui/e-comp-editor-event.c:635
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:738
+#: ../src/calendar/gui/e-comp-editor-event.c:736
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:743
+#: ../src/calendar/gui/e-comp-editor-event.c:741
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:753
+#: ../src/calendar/gui/e-comp-editor-event.c:751
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:806
+#: ../src/calendar/gui/e-comp-editor-event.c:804
 #: ../src/calendar/gui/e-comp-editor-memo.c:213
 #: ../src/calendar/gui/e-comp-editor-task.c:765
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:809
+#: ../src/calendar/gui/e-comp-editor-event.c:807
 #: ../src/calendar/gui/e-comp-editor-task.c:782
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:812
+#: ../src/calendar/gui/e-comp-editor-event.c:810
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:815
+#: ../src/calendar/gui/e-comp-editor-event.c:813
 #: ../src/calendar/gui/e-comp-editor-memo.c:216
 #: ../src/calendar/gui/e-comp-editor-task.c:785
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:825
+#: ../src/calendar/gui/e-comp-editor-event.c:823
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-event.c:857
+#: ../src/calendar/gui/e-comp-editor-event.c:855
 #, c-format
 msgid "Meeting — %s"
 msgstr "Kokous — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:858
+#: ../src/calendar/gui/e-comp-editor-event.c:856
 #, c-format
 msgid "Appointment — %s"
 msgstr "Tapaaminen — %s"
@@ -7518,17 +7421,14 @@ msgstr "Tapaaminen — %s"
 #: ../src/calendar/gui/e-comp-editor-memo.c:88
 #, 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"
+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"
+"Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain lukutilassa"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:90
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
-"Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain "
-"lukutilassa"
+"Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain lukutilassa"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:92
 msgid "Memo cannot be fully edited, because you are not the organizer"
@@ -7561,8 +7461,8 @@ msgstr "Muistilappu - %s"
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
 #: ../src/em-format/e-mail-formatter-attachment.c:333
 #: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
-#: ../src/e-util/e-attachment-paned.c:175
-#: ../src/e-util/e-attachment-paned.c:180 ../src/mail/message-list.etspec.h:4
+#: ../src/e-util/e-attachment-paned.c:175 ../src/e-util/e-attachment-paned.c:180
+#: ../src/mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Liite"
@@ -7570,10 +7470,10 @@ msgstr[1] "Liitteet"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:201
 #: ../src/e-util/e-attachment.c:2442
-#, fuzzy, c-format
+#, c-format
 #| msgid "Could not load '%s'"
 msgid "Could not load “%s”"
-msgstr "%s ei voitu ladata"
+msgstr "Ei voitu ladata “%s”"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:203
 #: ../src/e-util/e-attachment.c:2445
@@ -7584,14 +7484,14 @@ msgstr "Liitettä ei voitu avata"
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
 #, fuzzy
 #| msgid ""
-#| "Some attachments are being downloaded. Saving the task would result in "
-#| "the loss of these attachments."
+#| "Some attachments are being downloaded. Saving the task would result in the loss "
+#| "of these attachments."
 msgid ""
-"Some attachments are still being downloaded. Please wait until the download "
-"is finished."
+"Some attachments are still being downloaded. Please wait until the download is "
+"finished."
 msgstr ""
-"Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt "
-"aiheuttaa tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
+"Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt aiheuttaa "
+"tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
 #, c-format
@@ -7604,13 +7504,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:647
-#: ../src/composer/e-composer-actions.c:320
+#: ../src/composer/e-composer-actions.c:322
 msgid "_Attachment..."
 msgstr "_Liite..."
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
-#: ../src/composer/e-composer-actions.c:322
-#: ../src/e-util/e-attachment-view.c:344
+#: ../src/composer/e-composer-actions.c:324 ../src/e-util/e-attachment-view.c:344
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
@@ -7623,12 +7522,12 @@ msgid "Show attachments"
 msgstr "Näytä liitteet"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
-#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:725
+#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Kuvakenäkymä"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
-#: ../src/e-util/e-attachment-bar.c:768 ../src/e-util/e-attachment-paned.c:727
+#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "Luettelonäkymä"
 
@@ -7652,62 +7551,68 @@ msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Yhteystiedon poisto epäonnistui"
 msgstr[1] "Yhteystiedon poisto epäonnistui"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:581
+#: ../src/calendar/gui/e-comp-editor-page-general.c:434
+#, fuzzy
+#| msgid "Email Address is not a valid email"
+msgid "Organizer address is not a valid user mail address"
+msgstr "Sähköpostiosoite ei ole kelvollinen osoite"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:584
 msgid "A_ttendees"
 msgstr "_Osanottajat"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:583
+#: ../src/calendar/gui/e-comp-editor-page-general.c:586
 #, fuzzy
 #| msgid "Toggles whether the Attendee Type is displayed"
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:592
+#: ../src/calendar/gui/e-comp-editor-page-general.c:595
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:594
+#: ../src/calendar/gui/e-comp-editor-page-general.c:597
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:600
+#: ../src/calendar/gui/e-comp-editor-page-general.c:603
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:602
+#: ../src/calendar/gui/e-comp-editor-page-general.c:605
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:608
+#: ../src/calendar/gui/e-comp-editor-page-general.c:611
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:610
+#: ../src/calendar/gui/e-comp-editor-page-general.c:613
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:616
+#: ../src/calendar/gui/e-comp-editor-page-general.c:619
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:618
+#: ../src/calendar/gui/e-comp-editor-page-general.c:621
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:943
+#: ../src/calendar/gui/e-comp-editor-page-general.c:947
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:953
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1084
+#: ../src/calendar/gui/e-comp-editor-page-general.c:957
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1088
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1207
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1211
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1286
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1290
 msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "_Osanottajat..."
@@ -7889,22 +7794,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:1485
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2015
-#| msgid "This appointment rec_urs"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1484
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2014
 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:1490
-#| msgid "This task recurs"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1489
 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:1495
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1494
 #, fuzzy
 #| msgid "This memo recurs"
 msgctxt "ECompEditorPageRecur"
@@ -7912,121 +7815,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:1500
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1499
 #, 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:1861
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1860
 #, 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:1909
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1908
 #, 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:1952
-#| msgid "Recurrence"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1951
 msgid "R_ecurrence"
 msgstr "Toistu_vuus"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1954
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1953
 #, fuzzy
 #| msgid "It has recurrences."
 msgid "Set or unset recurrence"
 msgstr "Sisältää toistuvuuksia."
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
-#| msgid "Every"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2046
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Joka"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
-#| msgid "day(s)"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2081
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "päivä"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
-#| msgctxt "recurrpage"
-#| msgid "week(s)"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2083
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "viikko"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
-#| msgctxt "recurrpage"
-#| msgid "month(s)"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2085
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "kuukausi"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
-#| msgctxt "recurrpage"
-#| msgid "year(s)"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2087
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "vuosi"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
-#| msgctxt "eventpage"
-#| msgid "for"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2116
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "kesto"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
-#| msgctxt "eventpage"
-#| msgid "until"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2118
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "päättyen"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
-#| msgctxt "recurrpage"
-#| msgid "forever"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2120
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "ikuisesti"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2136
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
+msgstr "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2162
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2149
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
-#: ../src/mail/e-mail-config-identity-page.c:853
-#: ../src/mail/mail-config.ui.h:65
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2214
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1765
+#: ../src/mail/e-mail-config-identity-page.c:853 ../src/mail/mail-config.ui.h:65
 msgid "A_dd"
 msgstr "_Lisää"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2230
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1773
 #: ../src/mail/mail-config.ui.h:67
 msgid "Re_move"
 msgstr "_Poista"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2255
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2238
 msgid "Preview"
 msgstr "Esikatselu"
 
@@ -8036,40 +7922,40 @@ msgstr "Esikatselu"
 msgid "Send To"
 msgstr "Lähetä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1554
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
 msgid "_Reminders"
 msgstr "_Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
 #, fuzzy
 #| msgid "Set or unset reminders for this event"
 msgid "Set or unset reminders"
 msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1609
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1605
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1638
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1630
 msgid "_Reminder"
 msgstr "_Muistutus"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1671
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1663
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d päivä ennen"
 msgstr[1] "%d päivää ennen"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1678
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1670
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d tunti ennen"
 msgstr[1] "%d tuntia ennen"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1677
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -8077,31 +7963,31 @@ msgstr[0] "%d minuutti ennen"
 msgstr[1] "%d minuuttia ennen"
 
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1693
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ei mitään"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1687
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 minuuttia ennen"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1697
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1689
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 tunti ennen"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1699
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1691
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 päivä ennen"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1711
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
 #, fuzzy
 #| msgid "Custom"
 msgctxt "cal-reminders"
@@ -8109,7 +7995,7 @@ msgid "Custom"
 msgstr "Omavalintainen"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1846
 #, fuzzy
 #| msgid "minute(s)"
 msgctxt "cal-reminders"
@@ -8117,7 +8003,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:1864
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1848
 #, fuzzy
 #| msgid "hour(s)"
 msgctxt "cal-reminders"
@@ -8125,7 +8011,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:1866
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1850
 #, fuzzy
 #| msgid "day(s)"
 msgctxt "cal-reminders"
@@ -8133,7 +8019,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:1883
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1867
 #, fuzzy
 #| msgid "before"
 msgctxt "cal-reminders"
@@ -8141,7 +8027,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:1885
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1869
 #, fuzzy
 #| msgid "after"
 msgctxt "cal-reminders"
@@ -8149,7 +8035,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:1901
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
 #, fuzzy
 #| msgid "Start"
 msgctxt "cal-reminders"
@@ -8157,7 +8043,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:1903
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1887
 #, fuzzy
 #| msgid "_Send"
 msgctxt "cal-reminders"
@@ -8165,14 +8051,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:1926
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1906
 #, 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:1951
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1931
 #, fuzzy
 #| msgid "extra times every"
 msgctxt "cal-reminders"
@@ -8180,48 +8066,48 @@ msgid "extra times every"
 msgstr "ylimääräistä kertaa joka"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1988
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1968
 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:1990
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1970
 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:1992
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1972
 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:2033
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2009
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2166
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Oma _viesti"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2077
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2053
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Oma _hälytysääni muistutukselles"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2088
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
 msgid "Select a sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2116
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2092
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2141
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2117
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2173
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2149
 #, fuzzy
 #| msgid "Send To:"
 msgid "_Send To:"
@@ -8261,106 +8147,106 @@ msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "K_uvaus:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:686
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:687
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Verkkosivusto:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1057
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1058
 #, fuzzy
 #| msgid "D_ue date:"
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "_Eräpäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1117
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1118
 #, fuzzy
 #| msgid "Date _completed:"
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Valmistumispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1133
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1136
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1151
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1152
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "Lu_okittelu:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
 msgctxt "ECompEditor"
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
 msgctxt "ECompEditor"
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
 msgctxt "ECompEditor"
 msgid "Completed"
 msgstr "Valmis"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1174
 msgctxt "ECompEditor"
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1183
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1212
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1216
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Matala"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1224
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1225
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Prioriteetti:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1278
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1279
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Prosenttia valmiina:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1359
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1360
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Aika_vyöhyke:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1485
 #, fuzzy
 #| msgid "Show Time as _Busy"
 msgctxt "ECompEditor"
@@ -8382,15 +8268,12 @@ msgstr "Tehtävän aloitusaika on mennyt"
 #: ../src/calendar/gui/e-comp-editor-task.c:461
 #, fuzzy
 #| msgid "Task cannot be edited, because the selected task list is read only"
-msgid ""
-"Task cannot be edited, because the selected task list could not be opened"
-msgstr ""
-"Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
+msgid "Task cannot be edited, because the selected task list could not be opened"
+msgstr "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:463
 msgid "Task cannot be edited, because the selected task list is read only"
-msgstr ""
-"Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
+msgstr "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:465
 msgid "Task cannot be fully edited, because you are not the organizer"
@@ -8459,17 +8342,14 @@ msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1984
-#: ../src/composer/e-composer-actions.c:327
-#: ../src/e-util/e-accounts-window.c:1743
-#: ../src/e-util/e-html-editor-dialog.c:194
+#: ../src/calendar/gui/e-comp-editor.c:1984 ../src/composer/e-composer-actions.c:329
+#: ../src/e-util/e-accounts-window.c:1730 ../src/e-util/e-html-editor-dialog.c:194
 #: ../src/e-util/e-mail-signature-editor.c:309
 #: ../src/e-util/e-name-selector-dialog.c:548
 #: ../src/e-util/e-preferences-window.c:399
-#: ../src/e-util/e-table-field-chooser-dialog.c:205
-#: ../src/mail/e-mail-browser.c:127 ../src/mail/e-mail-notes.c:931
-#: ../src/mail/em-folder-properties.c:1158
-#: ../src/mail/em-subscription-editor.c:1765
+#: ../src/e-util/e-table-field-chooser-dialog.c:205 ../src/mail/e-mail-browser.c:128
+#: ../src/mail/e-mail-notes.c:931 ../src/mail/em-folder-properties.c:1158
+#: ../src/mail/em-subscription-editor.c:1737
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
 #: ../src/shell/e-shell-window-actions.c:296
 #: ../src/shell/e-shell-window-actions.c:817
@@ -8483,31 +8363,31 @@ msgstr "Sulje nykyinen ikkuna"
 
 #. copy menu item
 #: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110
-#: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
+#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:135
 #: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838
 msgid "_Copy"
 msgstr "_Kopioi"
 
 #: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
 #: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
-#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409
-#: ../src/e-util/e-web-view.c:1977 ../src/mail/e-mail-browser.c:136
+#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:411
+#: ../src/e-util/e-web-view.c:2003 ../src/mail/e-mail-browser.c:137
 #: ../src/shell/e-shell-window-actions.c:840
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
 #. cut menu item
 #: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
-#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2096
-#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:845
+#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:142 ../src/shell/e-shell-window-actions.c:845
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
 #: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
 #: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1986
-#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:847
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2012
+#: ../src/mail/e-mail-browser.c:144 ../src/shell/e-shell-window-actions.c:847
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
@@ -8523,26 +8403,26 @@ msgstr "Näytä ohje"
 
 #. paste menu item
 #: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2122
-#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:873
+#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:149 ../src/shell/e-shell-window-actions.c:873
 msgid "_Paste"
 msgstr "_Liitä"
 
 #: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
 #: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1995
-#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:875
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2021
+#: ../src/mail/e-mail-browser.c:151 ../src/shell/e-shell-window-actions.c:875
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2026
-#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2317
+#: ../src/calendar/gui/e-comp-editor.c:2026 ../src/composer/e-composer-actions.c:383
+#: ../src/mail/e-mail-reader.c:2402
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1249
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2324
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2409
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1242
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1744
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:813
@@ -8551,14 +8431,14 @@ msgid "Pre_view..."
 msgstr "E_sikatselu..."
 
 #: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
-#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417
-#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:950
+#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:419
+#: ../src/mail/e-mail-browser.c:156 ../src/shell/e-shell-window-actions.c:950
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
 #: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
 #: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:952
+#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:952
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
@@ -8566,26 +8446,22 @@ msgstr "Valitse kaikki teksti"
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../src/calendar/gui/e-comp-editor.c:2077
-#: ../src/e-util/e-html-editor-actions.c:929
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:164
+#: ../src/calendar/gui/e-comp-editor.c:2077 ../src/e-util/e-html-editor-actions.c:929
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:165
 #: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../src/calendar/gui/e-comp-editor.c:2091
-#: ../src/e-util/e-html-editor-actions.c:950
+#: ../src/calendar/gui/e-comp-editor.c:2091 ../src/e-util/e-html-editor-actions.c:950
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../src/calendar/gui/e-comp-editor.c:2098
-#: ../src/composer/e-composer-actions.c:371
+#: ../src/calendar/gui/e-comp-editor.c:2098 ../src/composer/e-composer-actions.c:373
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../src/calendar/gui/e-comp-editor.c:2105
-#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:178
-#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/calendar/gui/e-comp-editor.c:2105 ../src/e-util/e-html-editor-actions.c:971
+#: ../src/mail/e-mail-browser.c:179 ../src/shell/e-shell-window-actions.c:1030
 #: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Näytä"
@@ -8604,18 +8480,18 @@ msgid "Save current changes and close editor"
 msgstr "Tallenna nykyiset muutokset ja sulje muokkain"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-to-do-pane.c:239
-#: ../src/calendar/gui/e-week-view.c:1726 ../src/calendar/gui/print.c:1080
-#: ../src/calendar/gui/print.c:1099 ../src/calendar/gui/print.c:2636
-#: ../src/calendar/gui/print.c:2656
+#: ../src/calendar/gui/e-day-view.c:2156 ../src/calendar/gui/e-to-do-pane.c:241
+#: ../src/calendar/gui/e-week-view.c:1781 ../src/calendar/gui/print.c:1070
+#: ../src/calendar/gui/print.c:1089 ../src/calendar/gui/print.c:2626
+#: ../src/calendar/gui/print.c:2646
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-to-do-pane.c:243
-#: ../src/calendar/gui/e-week-view.c:1729 ../src/calendar/gui/print.c:1085
-#: ../src/calendar/gui/print.c:1101 ../src/calendar/gui/print.c:2641
-#: ../src/calendar/gui/print.c:2658
+#: ../src/calendar/gui/e-day-view.c:2159 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1784 ../src/calendar/gui/print.c:1075
+#: ../src/calendar/gui/print.c:1091 ../src/calendar/gui/print.c:2631
+#: ../src/calendar/gui/print.c:2648
 msgid "pm"
 msgstr "pm"
 
@@ -8625,15 +8501,14 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3045
-#: ../src/calendar/gui/e-day-view-top-item.c:841
-#: ../src/calendar/gui/e-week-view-main-item.c:205
-#: ../src/calendar/gui/print.c:2103
+#: ../src/calendar/gui/e-day-view.c:3071
+#: ../src/calendar/gui/e-day-view-top-item.c:857
+#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2093
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3770
+#: ../src/calendar/gui/e-day-view.c:3792
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -8691,51 +8566,51 @@ msgstr "Osanottajat"
 #: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:107
 #: ../src/calendar/gui/e-meeting-store.c:124
-#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1253
+#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1243
 msgid "Individual"
 msgstr "Henkilö"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:180
 #: ../src/calendar/gui/e-meeting-store.c:109
-#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1254
+#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1244
 #: ../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:111
-#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1255
+#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1245
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:182
 #: ../src/calendar/gui/e-meeting-store.c:113
-#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1256
+#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1246
 msgid "Room"
 msgstr "Huone"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:142
-#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1270
+#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1260
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:144
 #: ../src/calendar/gui/e-meeting-store.c:161
-#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1271
+#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1261
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:195
 #: ../src/calendar/gui/e-meeting-store.c:146
-#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1272
+#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1262
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:196
 #: ../src/calendar/gui/e-meeting-store.c:148
-#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1273
+#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1263
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
@@ -8753,11 +8628,10 @@ msgstr "Osallistuja                          "
 #: ../src/calendar/gui/e-meeting-list-view.c:644
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
-#: ../src/calendar/gui/e-task-table.etspec.h:3
-#: ../src/e-util/e-accounts-window.c:1370
+#: ../src/calendar/gui/e-task-table.etspec.h:3 ../src/e-util/e-accounts-window.c:1407
 #: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-webdav-browser.c:2381
-#: ../src/mail/e-mail-account-tree-view.c:158
+#: ../src/e-util/e-collection-account-wizard.c:1696
+#: ../src/e-util/e-webdav-browser.c:2381 ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -8783,76 +8657,77 @@ msgid "Failure reason: %s"
 msgstr "Epäonnistumisen syy: %s"
 
 #: ../src/calendar/gui/e-meeting-store.c:1914
-#: ../src/plugins/publish-calendar/publish-calendar.c:349
+#: ../src/e-util/e-collection-account-wizard.c:268
+#: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
 msgstr "Syötä salasana"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:535
+#: ../src/calendar/gui/e-meeting-time-sel.c:525
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:537
+#: ../src/calendar/gui/e-meeting-time-sel.c:527
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:553
+#: ../src/calendar/gui/e-meeting-time-sel.c:543
 msgid "Atte_ndees..."
 msgstr "_Osanottajat..."
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:572
+#: ../src/calendar/gui/e-meeting-time-sel.c:562
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:593
+#: ../src/calendar/gui/e-meeting-time-sel.c:583
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:606
+#: ../src/calendar/gui/e-meeting-time-sel.c:596
 msgid "Show _zoomed out"
 msgstr "Näytä _etäämpää"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:624
+#: ../src/calendar/gui/e-meeting-time-sel.c:614
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:641
+#: ../src/calendar/gui/e-meeting-time-sel.c:631
 msgid "_<<"
 msgstr "_<<"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:661
+#: ../src/calendar/gui/e-meeting-time-sel.c:651
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:678
+#: ../src/calendar/gui/e-meeting-time-sel.c:668
 msgid ">_>"
 msgstr ">_>"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:700
+#: ../src/calendar/gui/e-meeting-time-sel.c:690
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:711
+#: ../src/calendar/gui/e-meeting-time-sel.c:701
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:722
+#: ../src/calendar/gui/e-meeting-time-sel.c:712
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:732
+#: ../src/calendar/gui/e-meeting-time-sel.c:722
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:771
+#: ../src/calendar/gui/e-meeting-time-sel.c:761
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:800
+#: ../src/calendar/gui/e-meeting-time-sel.c:790
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2727
+#: ../src/calendar/gui/e-meeting-time-sel.c:2667
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -8861,8 +8736,7 @@ msgstr ""
 "Yhteenveto: %s\n"
 "Sijainti: %s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2729
-#: ../src/calendar/gui/print.c:3530
+#: ../src/calendar/gui/e-meeting-time-sel.c:2669 ../src/calendar/gui/print.c:3520
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
@@ -8891,20 +8765,17 @@ msgstr "Yhteinen nimi"
 msgid "Language"
 msgstr "Kieli"
 
-#: ../src/calendar/gui/e-memo-table.c:455
-#: ../src/calendar/gui/e-task-table.c:781
+#: ../src/calendar/gui/e-memo-table.c:455 ../src/calendar/gui/e-task-table.c:782
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:540
-#: ../src/calendar/gui/e-task-table.c:863
+#: ../src/calendar/gui/e-memo-table.c:540 ../src/calendar/gui/e-task-table.c:864
 msgid "Start: "
 msgstr "Alkaa: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:560
-#: ../src/calendar/gui/e-task-table.c:882
+#: ../src/calendar/gui/e-memo-table.c:560 ../src/calendar/gui/e-task-table.c:883
 msgid "Due: "
 msgstr "Erääntyy: "
 
@@ -8933,8 +8804,7 @@ msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 msgid "Click to add a memo"
 msgstr "Lisää muistilappu tästä"
 
-#: ../src/calendar/gui/e-task-table.c:551
-#: ../src/calendar/gui/tasktypes.xml.in.h:22
+#: ../src/calendar/gui/e-task-table.c:552 ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Määrittämätön"
@@ -8943,29 +8813,29 @@ msgstr "Määrittämätön"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../src/calendar/gui/e-task-table.c:579
+#: ../src/calendar/gui/e-task-table.c:580
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../src/calendar/gui/e-task-table.c:1084
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Cut selected tasks to the clipboard"
 msgstr "Leikkaa valitut tehtävät leikepöydälle"
 
-#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/calendar/gui/e-task-table.c:1102
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopioi valitut tehtävät leikepöydälle"
 
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1108
 msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
-#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/calendar/gui/e-task-table.c:1114
 #: ../src/modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ../src/calendar/gui/e-task-table.c:1108
+#: ../src/calendar/gui/e-task-table.c:1120
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
@@ -8981,7 +8851,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:968
+#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:1088
 msgid "Complete"
 msgstr "Valmis"
 
@@ -9004,81 +8874,96 @@ msgstr "Prioriteetti"
 msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
 
+#. Translators: It will display "Start: StartDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:370
+#, fuzzy, c-format
+#| msgid "Start: "
+msgid "Start: %s"
+msgstr "Alkaa: "
+
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:365
+#: ../src/calendar/gui/e-to-do-pane.c:390
 #, fuzzy, c-format
 #| msgid "Due: "
 msgid "Due: %s"
 msgstr "Erääntyy: "
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:377
+#: ../src/calendar/gui/e-to-do-pane.c:404
 #, fuzzy, c-format
 #| msgid "Completed "
 msgid "Completed: %s"
 msgstr "Valmis "
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1328 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1424 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:206
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1842
-#: ../src/modules/itip-formatter/itip-view.c:253
+#: ../src/modules/itip-formatter/itip-view.c:254
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1330
-#: ../src/e-util/e-datetime-format.c:217
-#: ../src/modules/itip-formatter/itip-view.c:281
+#: ../src/calendar/gui/e-to-do-pane.c:1426 ../src/e-util/e-datetime-format.c:217
+#: ../src/modules/itip-formatter/itip-view.c:282
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1892
+#: ../src/calendar/gui/e-to-do-pane.c:1436
+#, fuzzy
+#| msgid "With _Due Date"
+msgid "Tasks without Due date"
+msgstr "_Eräpäivän kanssa"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2009
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:1900
+#: ../src/calendar/gui/e-to-do-pane.c:2017
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New _Meeting..."
 msgstr "Uusi _kokous..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:1908
+#: ../src/calendar/gui/e-to-do-pane.c:2025
 #, fuzzy
 #| msgid "New _Task"
 msgid "New _Task..."
 msgstr "Uusi _tehtävä"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1916
+#: ../src/calendar/gui/e-to-do-pane.c:2033
 #, fuzzy
 #| msgctxt "New"
 #| msgid "Assigne_d Task"
 msgid "_New Assigned Task..."
 msgstr "Tehtäväksi_anto"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1929
-#, fuzzy
+#: ../src/calendar/gui/e-to-do-pane.c:2046
 #| msgid "_Open"
 msgid "_Open..."
-msgstr "_Avaa"
+msgstr "_Avaa..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:1943
+#: ../src/calendar/gui/e-to-do-pane.c:2060
 #, fuzzy
 #| msgid "Delete This _Occurrence"
 msgid "_Delete This Instance..."
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1951
+#: ../src/calendar/gui/e-to-do-pane.c:2068
 #, fuzzy
 #| msgid "All Instances"
 msgid "D_elete All Instances..."
 msgstr "Kaikki kerrat"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1959
+#: ../src/calendar/gui/e-to-do-pane.c:2076
 msgid "_Delete..."
 msgstr "_Poista..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2249
+#: ../src/calendar/gui/e-to-do-pane.c:2093
+msgid "_Show Tasks without Due date"
+msgstr ""
+
+#: ../src/calendar/gui/e-to-do-pane.c:2379
 #, fuzzy
 #| msgid "_To Do"
 msgid "To Do"
@@ -9087,37 +8972,36 @@ msgstr "Te_htävää"
 #. 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:2082
+#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:798 ../src/calendar/gui/itip-utils.c:860
-#: ../src/calendar/gui/itip-utils.c:994
+#: ../src/calendar/gui/itip-utils.c:785 ../src/calendar/gui/itip-utils.c:847
+#: ../src/calendar/gui/itip-utils.c:981
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../src/calendar/gui/itip-utils.c:851
+#: ../src/calendar/gui/itip-utils.c:838
 msgid "At least one attendee is necessary"
 msgstr "Vähintään yksi läsnäolija on välttämätön"
 
-#: ../src/calendar/gui/itip-utils.c:1082 ../src/calendar/gui/itip-utils.c:1243
+#: ../src/calendar/gui/itip-utils.c:1069 ../src/calendar/gui/itip-utils.c:1230
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1085 ../src/calendar/gui/itip-utils.c:1246
+#: ../src/calendar/gui/itip-utils.c:1072 ../src/calendar/gui/itip-utils.c:1233
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1088 ../src/calendar/gui/itip-utils.c:1249
+#: ../src/calendar/gui/itip-utils.c:1075 ../src/calendar/gui/itip-utils.c:1236
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1091 ../src/calendar/gui/itip-utils.c:1267
+#: ../src/calendar/gui/itip-utils.c:1078 ../src/calendar/gui/itip-utils.c:1254
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1094
+#: ../src/calendar/gui/itip-utils.c:1081
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -9125,7 +9009,7 @@ msgstr "Kalenteritiedot"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1131
+#: ../src/calendar/gui/itip-utils.c:1118
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -9134,7 +9018,7 @@ msgstr "Hyväksytty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1138
+#: ../src/calendar/gui/itip-utils.c:1125
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -9146,7 +9030,7 @@ msgstr "Alustavasti hyväksytty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1145 ../src/calendar/gui/itip-utils.c:1193
+#: ../src/calendar/gui/itip-utils.c:1132 ../src/calendar/gui/itip-utils.c:1180
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -9155,7 +9039,7 @@ msgstr "Hylätty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1152
+#: ../src/calendar/gui/itip-utils.c:1139
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -9163,7 +9047,7 @@ msgstr "Valtuutettu"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1165
+#: ../src/calendar/gui/itip-utils.c:1152
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -9171,7 +9055,7 @@ msgstr "Päivitetty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1172
+#: ../src/calendar/gui/itip-utils.c:1159
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -9179,7 +9063,7 @@ msgstr "Peru"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1179
+#: ../src/calendar/gui/itip-utils.c:1166
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -9187,31 +9071,30 @@ msgstr "Päivitä"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1186
+#: ../src/calendar/gui/itip-utils.c:1173
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../src/calendar/gui/itip-utils.c:1264
+#: ../src/calendar/gui/itip-utils.c:1251
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1272
+#: ../src/calendar/gui/itip-utils.c:1259
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1301
+#: ../src/calendar/gui/itip-utils.c:1288
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
-"Resurssia ei voida varata, uusi tehtävä on ristiriidassa aiemman kanssa."
+msgstr "Resurssia ei voida varata, uusi tehtävä on ristiriidassa aiemman kanssa."
 
-#: ../src/calendar/gui/itip-utils.c:1306
+#: ../src/calendar/gui/itip-utils.c:1293
 msgid "Unable to book a resource, error: "
 msgstr "Resurssin varaaminen ei onnistu, virhe:"
 
-#: ../src/calendar/gui/itip-utils.c:1477
+#: ../src/calendar/gui/itip-utils.c:1464
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
@@ -9233,242 +9116,118 @@ msgstr "Lähetetään viestiä"
 msgid "Sending a task"
 msgstr "Lähetys"
 
-#: ../src/calendar/gui/print.c:665
-msgid "1st"
-msgstr "1."
-
-#: ../src/calendar/gui/print.c:665
-msgid "2nd"
-msgstr "2."
-
-#: ../src/calendar/gui/print.c:665
-msgid "3rd"
-msgstr "3."
-
-#: ../src/calendar/gui/print.c:665
-msgid "4th"
-msgstr "4."
-
-#: ../src/calendar/gui/print.c:665
-msgid "5th"
-msgstr "5."
-
-#: ../src/calendar/gui/print.c:666
-msgid "6th"
-msgstr "6."
-
-#: ../src/calendar/gui/print.c:666
-msgid "7th"
-msgstr "7."
-
-#: ../src/calendar/gui/print.c:666
-msgid "8th"
-msgstr "8."
-
-#: ../src/calendar/gui/print.c:666
-msgid "9th"
-msgstr "9."
-
-#: ../src/calendar/gui/print.c:666
-msgid "10th"
-msgstr "10."
-
-#: ../src/calendar/gui/print.c:667
-msgid "11th"
-msgstr "11."
-
-#: ../src/calendar/gui/print.c:667
-msgid "12th"
-msgstr "12."
-
-#: ../src/calendar/gui/print.c:667
-msgid "13th"
-msgstr "13."
-
-#: ../src/calendar/gui/print.c:667
-msgid "14th"
-msgstr "14."
-
-#: ../src/calendar/gui/print.c:667
-msgid "15th"
-msgstr "15."
-
-#: ../src/calendar/gui/print.c:668
-msgid "16th"
-msgstr "16."
-
-#: ../src/calendar/gui/print.c:668
-msgid "17th"
-msgstr "17."
-
-#: ../src/calendar/gui/print.c:668
-msgid "18th"
-msgstr "18."
-
-#: ../src/calendar/gui/print.c:668
-msgid "19th"
-msgstr "19."
-
-#: ../src/calendar/gui/print.c:668
-msgid "20th"
-msgstr "20."
-
-#: ../src/calendar/gui/print.c:669
-msgid "21st"
-msgstr "21."
-
-#: ../src/calendar/gui/print.c:669
-msgid "22nd"
-msgstr "22."
-
-#: ../src/calendar/gui/print.c:669
-msgid "23rd"
-msgstr "23."
-
-#: ../src/calendar/gui/print.c:669
-msgid "24th"
-msgstr "24."
-
-#: ../src/calendar/gui/print.c:669
-msgid "25th"
-msgstr "25."
-
-#: ../src/calendar/gui/print.c:670
-msgid "26th"
-msgstr "26."
-
-#: ../src/calendar/gui/print.c:670
-msgid "27th"
-msgstr "27."
-
-#: ../src/calendar/gui/print.c:670
-msgid "28th"
-msgstr "28."
-
-#: ../src/calendar/gui/print.c:670
-msgid "29th"
-msgstr "29."
-
-#: ../src/calendar/gui/print.c:670
-msgid "30th"
-msgstr "30."
-
-#: ../src/calendar/gui/print.c:671
-msgid "31st"
-msgstr "31."
-
 #. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:721
 msgid "Mo"
 msgstr "Ma"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:722
 msgid "Tu"
 msgstr "Ti"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:723
 msgid "We"
 msgstr "Ke"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:734
+#: ../src/calendar/gui/print.c:724
 msgid "Th"
 msgstr "To"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:735
+#: ../src/calendar/gui/print.c:725
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:736
+#: ../src/calendar/gui/print.c:726
 msgid "Sa"
 msgstr "La"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:737
+#: ../src/calendar/gui/print.c:727
 msgid "Su"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3323
+#: ../src/calendar/gui/print.c:3313
 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:3333
+#: ../src/calendar/gui/print.c:3323
 msgid " (Completed "
 msgstr " (Valmis "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3339
+#: ../src/calendar/gui/print.c:3329
 msgid "Completed "
 msgstr "Valmis "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3349
+#: ../src/calendar/gui/print.c:3339
 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:3356
+#: ../src/calendar/gui/print.c:3346
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../src/calendar/gui/print.c:3500
+#: ../src/calendar/gui/print.c:3490
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../src/calendar/gui/print.c:3502 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3492 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../src/calendar/gui/print.c:3504
+#: ../src/calendar/gui/print.c:3494
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../src/calendar/gui/print.c:3560
+#: ../src/calendar/gui/print.c:3550
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../src/calendar/gui/print.c:3604
+#: ../src/calendar/gui/print.c:3594
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../src/calendar/gui/print.c:3620
+#: ../src/calendar/gui/print.c:3610
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../src/calendar/gui/print.c:3638
+#: ../src/calendar/gui/print.c:3628
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../src/calendar/gui/print.c:3652
+#: ../src/calendar/gui/print.c:3642
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/calendar/gui/print.c:3666
+#: ../src/calendar/gui/print.c:3656
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../src/calendar/gui/print.c:3677
+#: ../src/calendar/gui/print.c:3667
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
@@ -9481,15 +9240,13 @@ msgstr "Kesken"
 msgid "% Completed"
 msgstr "% valmiina"
 
-#: ../src/calendar/gui/tasktypes.xml.in.h:26
-#: ../src/mail/filtertypes.xml.in.h:31 ../src/mail/searchtypes.xml.in.h:33
-#: ../src/mail/vfoldertypes.xml.in.h:33
+#: ../src/calendar/gui/tasktypes.xml.in.h:26 ../src/mail/filtertypes.xml.in.h:31
+#: ../src/mail/searchtypes.xml.in.h:33 ../src/mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: ../src/calendar/gui/tasktypes.xml.in.h:27
-#: ../src/mail/filtertypes.xml.in.h:32 ../src/mail/searchtypes.xml.in.h:34
-#: ../src/mail/vfoldertypes.xml.in.h:34
+#: ../src/calendar/gui/tasktypes.xml.in.h:27 ../src/mail/filtertypes.xml.in.h:32
+#: ../src/mail/searchtypes.xml.in.h:34 ../src/mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
@@ -9498,15 +9255,16 @@ msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
 #: ../src/calendar/importers/icalendar-importer.c:306
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:432
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:181
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:480
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:76
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:280
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:178
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
 #: ../src/calendar/importers/icalendar-importer.c:309
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:440
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:189
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
 #: ../src/modules/calendar/e-task-shell-view-actions.c:202
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
@@ -9520,183 +9278,183 @@ msgid "Cre_ate new task list"
 msgstr "Luo _uusi tehtävälista"
 
 #: ../src/calendar/importers/icalendar-importer.c:501
-#: ../src/calendar/importers/icalendar-importer.c:944
+#: ../src/calendar/importers/icalendar-importer.c:940
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../src/calendar/importers/icalendar-importer.c:652
+#: ../src/calendar/importers/icalendar-importer.c:648
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:653
+#: ../src/calendar/importers/icalendar-importer.c:649
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:745
+#: ../src/calendar/importers/icalendar-importer.c:741
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../src/calendar/importers/icalendar-importer.c:830
+#: ../src/calendar/importers/icalendar-importer.c:826
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:831
+#: ../src/calendar/importers/icalendar-importer.c:827
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:1107
+#: ../src/calendar/importers/icalendar-importer.c:1103
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../src/calendar/importers/icalendar-importer.c:1150
+#: ../src/calendar/importers/icalendar-importer.c:1146
 msgid "GNOME Calendar"
 msgstr "Gnomen kalenteri"
 
-#: ../src/calendar/importers/icalendar-importer.c:1151
+#: ../src/calendar/importers/icalendar-importer.c:1147
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:1222
-#: ../src/calendar/importers/icalendar-importer.c:1536
+#: ../src/calendar/importers/icalendar-importer.c:1218
+#: ../src/calendar/importers/icalendar-importer.c:1532
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../src/calendar/importers/icalendar-importer.c:1222
-#: ../src/calendar/importers/icalendar-importer.c:1536
+#: ../src/calendar/importers/icalendar-importer.c:1218
+#: ../src/calendar/importers/icalendar-importer.c:1532
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/calendar/importers/icalendar-importer.c:1225
-#: ../src/calendar/importers/icalendar-importer.c:1537
+#: ../src/calendar/importers/icalendar-importer.c:1221
+#: ../src/calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../src/calendar/importers/icalendar-importer.c:1228
-#: ../src/calendar/importers/icalendar-importer.c:1538
+#: ../src/calendar/importers/icalendar-importer.c:1224
+#: ../src/calendar/importers/icalendar-importer.c:1534
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../src/calendar/importers/icalendar-importer.c:1237
+#: ../src/calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../src/calendar/importers/icalendar-importer.c:1242
+#: ../src/calendar/importers/icalendar-importer.c:1238
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "on instanssi"
 
-#: ../src/calendar/importers/icalendar-importer.c:1247
+#: ../src/calendar/importers/icalendar-importer.c:1243
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../src/calendar/importers/icalendar-importer.c:1252
+#: ../src/calendar/importers/icalendar-importer.c:1248
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1265
+#: ../src/calendar/importers/icalendar-importer.c:1261
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1268
+#: ../src/calendar/importers/icalendar-importer.c:1264
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1271
+#: ../src/calendar/importers/icalendar-importer.c:1267
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1275
+#: ../src/calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1280
-#: ../src/calendar/importers/icalendar-importer.c:1580
+#: ../src/calendar/importers/icalendar-importer.c:1276
+#: ../src/calendar/importers/icalendar-importer.c:1576
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1286
+#: ../src/calendar/importers/icalendar-importer.c:1282
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Sijainti"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1294
-#: ../src/calendar/importers/icalendar-importer.c:1575
+#: ../src/calendar/importers/icalendar-importer.c:1290
+#: ../src/calendar/importers/icalendar-importer.c:1571
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1305
+#: ../src/calendar/importers/icalendar-importer.c:1301
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1317
+#: ../src/calendar/importers/icalendar-importer.c:1313
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1327
+#: ../src/calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Ryhmät"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1351
+#: ../src/calendar/importers/icalendar-importer.c:1347
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1359
+#: ../src/calendar/importers/icalendar-importer.c:1355
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1370
-#: ../src/calendar/importers/icalendar-importer.c:1373
+#: ../src/calendar/importers/icalendar-importer.c:1366
+#: ../src/calendar/importers/icalendar-importer.c:1369
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1393
-#: ../src/calendar/importers/icalendar-importer.c:1396
+#: ../src/calendar/importers/icalendar-importer.c:1389
+#: ../src/calendar/importers/icalendar-importer.c:1392
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../src/calendar/importers/icalendar-importer.c:1410
+#: ../src/calendar/importers/icalendar-importer.c:1406
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Kuvaus"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1570
+#: ../src/calendar/importers/icalendar-importer.c:1566
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
@@ -11248,145 +11006,144 @@ msgstr "Tyyni_Valtameri/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
-#: ../src/composer/e-composer-actions.c:225
+#: ../src/composer/e-composer-actions.c:227
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../src/composer/e-composer-actions.c:329
+#: ../src/composer/e-composer-actions.c:331
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../src/composer/e-composer-actions.c:334
+#: ../src/composer/e-composer-actions.c:336
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../src/composer/e-composer-actions.c:336
+#: ../src/composer/e-composer-actions.c:338
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
+#: ../src/composer/e-composer-actions.c:343 ../src/shell/e-shell.c:1302
 #: ../src/shell/e-shell-window-actions.c:887
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../src/composer/e-composer-actions.c:343
-#: ../src/shell/e-shell-window-actions.c:889
+#: ../src/composer/e-composer-actions.c:345 ../src/shell/e-shell-window-actions.c:889
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
-#: ../src/composer/e-composer-actions.c:350
+#: ../src/composer/e-composer-actions.c:352
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../src/composer/e-composer-actions.c:355
+#: ../src/composer/e-composer-actions.c:357
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../src/composer/e-composer-actions.c:357
+#: ../src/composer/e-composer-actions.c:359
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ../src/composer/e-composer-actions.c:364
+#: ../src/composer/e-composer-actions.c:366
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../src/composer/e-composer-actions.c:388
+#: ../src/composer/e-composer-actions.c:390
 msgid "Print Pre_view"
 msgstr "Tulostuksen _esikatselu"
 
-#: ../src/composer/e-composer-actions.c:395
+#: ../src/composer/e-composer-actions.c:397
 msgid "Save as _Draft"
 msgstr "Tallenna _luonnoksena"
 
-#: ../src/composer/e-composer-actions.c:397
+#: ../src/composer/e-composer-actions.c:399
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../src/composer/e-composer-actions.c:402
+#: ../src/composer/e-composer-actions.c:404
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:406
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../src/composer/e-composer-actions.c:412
+#: ../src/composer/e-composer-actions.c:414
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:416
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../src/composer/e-composer-actions.c:420
+#: ../src/composer/e-composer-actions.c:422
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:424
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../src/composer/e-composer-actions.c:428
+#: ../src/composer/e-composer-actions.c:430
 msgid "_Picture Gallery"
 msgstr "_Kuvagalleria"
 
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:432
 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:436
+#: ../src/composer/e-composer-actions.c:438
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:440
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../src/composer/e-composer-actions.c:444
+#: ../src/composer/e-composer-actions.c:446
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:448
 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:452
+#: ../src/composer/e-composer-actions.c:454
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:456
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME-salausvarmenteellasi"
 
-#: ../src/composer/e-composer-actions.c:460
+#: ../src/composer/e-composer-actions.c:462
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../src/composer/e-composer-actions.c:462
+#: ../src/composer/e-composer-actions.c:464
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tämä viesti S/MIME-allekirjoitusvarmenteellasi"
 
-#: ../src/composer/e-composer-actions.c:516
+#: ../src/composer/e-composer-actions.c:518
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:520
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee näytetäänkö BCC-kenttä"
 
-#: ../src/composer/e-composer-actions.c:524
+#: ../src/composer/e-composer-actions.c:526
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:528
 msgid "Toggles whether the CC field is displayed"
 msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
-#: ../src/composer/e-composer-actions.c:532
+#: ../src/composer/e-composer-actions.c:534
 msgid "_From Override Field"
 msgstr "_Lähettäjän korvauskenttä"
 
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:536
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid ""
@@ -11394,23 +11151,28 @@ msgid ""
 "displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/composer/e-composer-actions.c:540
+#: ../src/composer/e-composer-actions.c:542
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../src/composer/e-composer-actions.c:542
+#: ../src/composer/e-composer-actions.c:544
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
-#: ../src/composer/e-composer-actions.c:597
+#: ../src/composer/e-composer-actions.c:550
+msgid "Visually _Wrap Long Lines"
+msgstr ""
+
+#: ../src/composer/e-composer-actions.c:607
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../src/composer/e-composer-actions.c:603
+#: ../src/composer/e-composer-actions.c:613
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
 #: ../src/composer/e-composer-from-header.c:108
+#: ../src/e-util/e-collection-account-wizard.c:1728
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
 #: ../src/e-util/e-webdav-browser.c:2408
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
@@ -11433,8 +11195,8 @@ msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
-"Anna osoitteet, joihin lähetetään kopiot viestistä ilman että muut "
-"vastaanottajat näkevät vastaanottajia"
+"Anna osoitteet, joihin lähetetään kopiot viestistä ilman että muut vastaanottajat "
+"näkevät vastaanottajia"
 
 #: ../src/composer/e-composer-header-table.c:840
 msgid "Fr_om:"
@@ -11477,28 +11239,25 @@ msgstr "Avaa osoitekirja tästä"
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../src/composer/e-msg-composer.c:854
+#: ../src/composer/e-msg-composer.c:861
 #, c-format
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+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"
+"Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole asetettu "
+"tälle tilille"
 
-#: ../src/composer/e-msg-composer.c:863
+#: ../src/composer/e-msg-composer.c:870
 #, c-format
 msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+"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"
+"Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle tilille"
 
-#: ../src/composer/e-msg-composer.c:1622 ../src/composer/e-msg-composer.c:2294
+#: ../src/composer/e-msg-composer.c:1639 ../src/composer/e-msg-composer.c:2311
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../src/composer/e-msg-composer.c:4657
+#: ../src/composer/e-msg-composer.c:4696
 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)"
@@ -11509,15 +11268,13 @@ msgstr "Et voi lisätä tiedostoa “{0}” tähän viestiin."
 
 #: ../src/composer/mail-composer.error.xml.h:2
 msgid "The file “{0}” is not a regular file and cannot be sent in a message."
-msgstr ""
-"Tiedosto “{0}” ei ole tavallinen tiedosto, eikä sitä voi lähettää viestissä."
+msgstr "Tiedosto “{0}” ei ole tavallinen tiedosto, eikä sitä voi lähettää viestissä."
 
 #: ../src/composer/mail-composer.error.xml.h:3
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Viestejä ei voi hakea liitettäväksi kohteesta {0}."
 
-#: ../src/composer/mail-composer.error.xml.h:4
-#: ../src/e-util/e-system.error.xml.h:5
+#: ../src/composer/mail-composer.error.xml.h:4 ../src/e-util/e-system.error.xml.h:5
 msgid "Because “{1}”."
 msgstr "Syy: “{1}”."
 
@@ -11527,11 +11284,11 @@ msgstr "Haluatko palauttaa viimeistelemättömät viestit?"
 
 #: ../src/composer/mail-composer.error.xml.h:6
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Evolution quit unexpectedly while you were composing a new message. Recovering the "
+"message will allow you to continue where you left off."
 msgstr ""
-"Evolution suljettiin odottamatta, kun olit muokkaamassa uutta viestiä. "
-"Viestin palautuksen avulla voit jatkaa siitä, mihin jäit."
+"Evolution suljettiin odottamatta, kun olit muokkaamassa uutta viestiä. Viestin "
+"palautuksen avulla voit jatkaa siitä, mihin jäit."
 
 #: ../src/composer/mail-composer.error.xml.h:7
 msgid "_Do not Recover"
@@ -11543,54 +11300,64 @@ 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?"
+
+#: ../src/composer/mail-composer.error.xml.h:10
+msgid ""
+"Recovering the message will allow you to continue where it had been saved the last "
+"time."
+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."
 
-#: ../src/composer/mail-composer.error.xml.h:10
+#: ../src/composer/mail-composer.error.xml.h:12
 #, fuzzy
 #| msgid "Error saving to autosave because &quot;{1}&quot;."
 msgid "Error saving to autosave because “{1}”."
 msgstr "Automaattinen tallennus epäonnistui: &quot;{1}&quot;."
 
-#: ../src/composer/mail-composer.error.xml.h:11
+#: ../src/composer/mail-composer.error.xml.h:13
 #, fuzzy
 #| msgid ""
-#| "Are you sure you want to discard the message, titled '{0}', you are "
-#| "composing?"
+#| "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgid ""
-"Are you sure you want to discard the message, titled “{0}”, you are "
-"composing?"
+"Are you sure you want to discard the message, titled “{0}”, you are composing?"
 msgstr "Haluatko todella hylätä viestin otsikolla '{0}', vaikka muokkaat sitä?"
 
-#: ../src/composer/mail-composer.error.xml.h:12
+#: ../src/composer/mail-composer.error.xml.h:14
 msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+"Closing this composer window will discard the message permanently, unless you "
+"choose to save the message in your Drafts folder. This will allow you to continue "
+"the message at a later date."
 msgstr ""
 "Tämän ikkunan sulkeminen hävittää muokatun viestin pysyvästi, ellet tallenna "
-"viestiä luonnoskansioon. Luonnoskansioon tallennettujen viestien kirjoitusta "
-"voi jatkaa myöhemmin."
+"viestiä luonnoskansioon. Luonnoskansioon tallennettujen viestien kirjoitusta voi "
+"jatkaa myöhemmin."
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../src/composer/mail-composer.error.xml.h:15
+#: ../src/composer/mail-composer.error.xml.h:17
 msgid "_Continue Editing"
 msgstr "_Jatka muokkausta"
 
-#: ../src/composer/mail-composer.error.xml.h:16
+#: ../src/composer/mail-composer.error.xml.h:18
 msgid "_Save Draft"
 msgstr "Tallenna _luonnos"
 
-#: ../src/composer/mail-composer.error.xml.h:17
+#: ../src/composer/mail-composer.error.xml.h:19
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "Haluatko varmasti hylätä kirjoittamasi viestin?"
 
-#: ../src/composer/mail-composer.error.xml.h:18
+#: ../src/composer/mail-composer.error.xml.h:20
 msgid "Could not create message."
 msgstr "Viestiä ei voi luoda."
 
-#: ../src/composer/mail-composer.error.xml.h:19
+#: ../src/composer/mail-composer.error.xml.h:21
 msgid ""
 "You may need to select different mail options.\n"
 "\n"
@@ -11600,184 +11367,178 @@ msgstr ""
 "\n"
 "Tarkka virhe: {0}"
 
-#: ../src/composer/mail-composer.error.xml.h:22
+#: ../src/composer/mail-composer.error.xml.h:24
 #, fuzzy
 #| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Could not read signature file “{0}”."
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
-#: ../src/composer/mail-composer.error.xml.h:23
+#: ../src/composer/mail-composer.error.xml.h:25
 msgid "All accounts have been removed."
 msgstr "Kaikki tilit on poistettu."
 
-#: ../src/composer/mail-composer.error.xml.h:24
+#: ../src/composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
+msgstr "Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
 
-#: ../src/composer/mail-composer.error.xml.h:25
+#: ../src/composer/mail-composer.error.xml.h:27
 #, fuzzy
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Tapahtui virhe tulostettaessa"
 
-#: ../src/composer/mail-composer.error.xml.h:26
+#: ../src/composer/mail-composer.error.xml.h:28
 #, fuzzy
-#| msgid ""
-#| "The reported error was &quot;{0}&quot;. The message has not been sent."
+#| msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgid "The reported error was “{0}”. The message has not been sent."
 msgstr "Ilmoitettu virhe oli &quot;{0}&quot;. Viestiä ei lähetetty."
 
-#: ../src/composer/mail-composer.error.xml.h:27
+#: ../src/composer/mail-composer.error.xml.h:29
 #, fuzzy
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Tapahtui virhe käynnistettäessä %s: %s."
 
-#: ../src/composer/mail-composer.error.xml.h:28
+#: ../src/composer/mail-composer.error.xml.h:30
 #, fuzzy
 #| msgid ""
-#| "The reported error was &quot;{0}&quot;. The message has most likely not "
-#| "been saved."
-msgid ""
-"The reported error was “{0}”. The message has most likely not been saved."
+#| "The reported error was &quot;{0}&quot;. The message has most likely not been "
+#| "saved."
+msgid "The reported error was “{0}”. The message has most likely not been saved."
 msgstr ""
-"Ilmoitettu virhe oli &quot;{0}&quot;. Viestiä ei mitä luultavimmin ole "
-"tallennettu."
+"Ilmoitettu virhe oli &quot;{0}&quot;. Viestiä ei mitä luultavimmin ole tallennettu."
 
-#: ../src/composer/mail-composer.error.xml.h:29
+#: ../src/composer/mail-composer.error.xml.h:31
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Lähettäessä tapahtui virhe. Kuinka haluat jatkaa?"
 
-#: ../src/composer/mail-composer.error.xml.h:30
-#: ../src/mail/mail.error.xml.h:177
+#: ../src/composer/mail-composer.error.xml.h:32 ../src/mail/mail.error.xml.h:177
 msgid "The reported error was “{0}”."
 msgstr "Ilmoitettu virhe oli “{0}”."
 
-#: ../src/composer/mail-composer.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:33
 msgid "_Save to Outbox"
 msgstr "_Tallenna lähteviin"
 
-#: ../src/composer/mail-composer.error.xml.h:32
+#: ../src/composer/mail-composer.error.xml.h:34
+#: ../src/e-util/e-collection-account-wizard.c:440
 msgid "_Try Again"
 msgstr "_Yritä uudelleen"
 
-#: ../src/composer/mail-composer.error.xml.h:33
+#: ../src/composer/mail-composer.error.xml.h:35
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Viestisi lähetettiin, mutta jälkikäsittelyn yhteydessä tapahtui virhe."
 
-#: ../src/composer/mail-composer.error.xml.h:34
+#: ../src/composer/mail-composer.error.xml.h:36
 #, fuzzy
 msgid "Saving message to Outbox."
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../src/composer/mail-composer.error.xml.h:35
+#: ../src/composer/mail-composer.error.xml.h:37
 msgid ""
-"The message will be saved to your local Outbox folder, because the "
-"destination service is currently unavailable. You can send the message by "
-"clicking the Send/Receive button in Evolution’s toolbar."
+"The message will be saved to your local Outbox folder, because the destination "
+"service is currently unavailable. You can send the message by clicking the Send/"
+"Receive button in Evolution’s toolbar."
 msgstr ""
 
-#: ../src/composer/mail-composer.error.xml.h:36
+#: ../src/composer/mail-composer.error.xml.h:38
 msgid "Are you sure you want to send the message?"
 msgstr "Haluatko varmasti lähettää tämän viestin?"
 
-#: ../src/composer/mail-composer.error.xml.h:37
+#: ../src/composer/mail-composer.error.xml.h:39
 msgid ""
-"A keyboard accelerator to send the message has been pressed. Either cancel "
-"sending the message, if it was done by an accident, or send the message."
+"A keyboard accelerator to send the message has been pressed. Either cancel sending "
+"the message, if it was done by an accident, or send the message."
 msgstr ""
 
-#: ../src/composer/mail-composer.error.xml.h:39
+#: ../src/composer/mail-composer.error.xml.h:41
 #, fuzzy
 #| msgid "Are you sure you want to delete this memo?"
 msgid "Are you sure you want to change the composer format?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
 
-#: ../src/composer/mail-composer.error.xml.h:40
+#: ../src/composer/mail-composer.error.xml.h:42
 msgid ""
 "Switching to Plain Text format will cause the text to lose all the HTML "
 "formatting. Do you want to continue?"
 msgstr ""
 
-#: ../src/composer/mail-composer.error.xml.h:41
+#: ../src/composer/mail-composer.error.xml.h:43
 msgid "_Don’t lose formatting"
 msgstr "_Älä menetä muotoilua"
 
-#: ../src/composer/mail-composer.error.xml.h:42
+#: ../src/composer/mail-composer.error.xml.h:44
 msgid "Lose _formatting"
 msgstr "Me_netä muotoilu"
 
-#: ../src/composer/mail-composer.error.xml.h:43
+#: ../src/composer/mail-composer.error.xml.h:45
 #, fuzzy
 msgid "An error occurred while saving to your Templates folder."
 msgstr "Tapahtui virhe käynnistettäessä %s: %s."
 
-#: ../src/composer/mail-composer.error.xml.h:44
+#: ../src/composer/mail-composer.error.xml.h:46
 #, fuzzy
 #| msgid "Are you sure you want to discard the message you are composing?"
 msgid "Are you sure you want to convert the message into a meeting?"
 msgstr "Haluatko varmasti hylätä kirjoittamasi viestin?"
 
-#: ../src/composer/mail-composer.error.xml.h:45
+#: ../src/composer/mail-composer.error.xml.h:47
 msgid ""
-"By converting the message into the meeting the composed message will be "
-"closed and the changes being done discarded."
+"By converting the message into the meeting the composed message will be closed and "
+"the changes being done discarded."
 msgstr ""
 
-#: ../src/composer/mail-composer.error.xml.h:46
-#| msgid "Create a _Meeting"
+#: ../src/composer/mail-composer.error.xml.h:48
 msgid "Convert to _Meeting"
 msgstr "Muunna _kokoukseksi"
 
-#: ../src/composer/mail-composer.error.xml.h:47
+#: ../src/composer/mail-composer.error.xml.h:49
 #, fuzzy
 #| msgid "Are you sure you want to send the message?"
 msgid "Are you sure you want to convert the event into a message?"
 msgstr "Haluatko varmasti lähettää tämän viestin?"
 
-#: ../src/composer/mail-composer.error.xml.h:48
+#: ../src/composer/mail-composer.error.xml.h:50
 msgid ""
-"By converting the event into the message the editing window will be closed "
-"and the changes being done discarded."
+"By converting the event into the message the editing window will be closed and the "
+"changes being done discarded."
 msgstr ""
 
-#: ../src/composer/mail-composer.error.xml.h:49
-#| msgid "Important Messages"
+#: ../src/composer/mail-composer.error.xml.h:51
 msgid "Convert to _Message"
 msgstr "Muunna _viestiksi"
 
-#: ../src/composer/mail-composer.error.xml.h:50
+#: ../src/composer/mail-composer.error.xml.h:52
 #, fuzzy
 #| msgid "Are you sure you want to save the memo without a summary?"
 msgid "Are you sure you want to convert the memo into a message?"
 msgstr "Haluatko varmasti tallentaa muistion ilman yhteenvetoa?"
 
-#: ../src/composer/mail-composer.error.xml.h:51
+#: ../src/composer/mail-composer.error.xml.h:53
 msgid ""
-"By converting the memo into the message the editing window will be closed "
-"and the changes being done discarded."
+"By converting the memo into the message the editing window will be closed and the "
+"changes being done discarded."
 msgstr ""
 
-#: ../src/composer/mail-composer.error.xml.h:52
+#: ../src/composer/mail-composer.error.xml.h:54
 #, fuzzy
 #| msgid "Are you sure you want to save the task without a summary?"
 msgid "Are you sure you want to convert the task into a message?"
 msgstr "Haluatko varmasti tallentaa tehtävän ilman yhteenvetoa?"
 
-#: ../src/composer/mail-composer.error.xml.h:53
+#: ../src/composer/mail-composer.error.xml.h:55
 msgid ""
-"By converting the task into the message the editing window will be closed "
-"and the changes being done discarded."
+"By converting the task into the message the editing window will be closed and the "
+"changes being done discarded."
 msgstr ""
 
-#: ../src/composer/mail-composer.error.xml.h:54
+#: ../src/composer/mail-composer.error.xml.h:56
 msgid "Something has gone wrong when editing the message"
 msgstr "Jokin meni pieleen viestiä muokatessa"
 
-#: ../src/composer/mail-composer.error.xml.h:55
+#: ../src/composer/mail-composer.error.xml.h:57
 msgid ""
-"A WebKitWebProcess crashed when editing the message. You can try again by "
-"closing the composer window and opening a new one. If the issue persists, "
-"please file a bug report in the GNOME bugzilla."
+"A WebKitWebProcess crashed when editing the message. You can try again by closing "
+"the composer window and opening a new one. If the issue persists, please file a "
+"bug report in the GNOME bugzilla."
 msgstr ""
 
 #: ../src/em-format/e-mail-formatter-attachment.c:334
@@ -11793,9 +11554,8 @@ msgid "Play the attachment in embedded audio player"
 msgstr "Toista liite upotetussa äänisoittimessa"
 
 #: ../src/em-format/e-mail-formatter-headers.c:107
-#: ../src/em-format/e-mail-part-headers.c:46
-#: ../src/mail/e-mail-tag-editor.c:203 ../src/mail/message-list.etspec.h:5
-#: ../src/modules/mail/em-mailer-prefs.c:60
+#: ../src/em-format/e-mail-part-headers.c:46 ../src/mail/e-mail-tag-editor.c:203
+#: ../src/mail/message-list.etspec.h:5 ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "Lähettäjä"
 
@@ -11811,11 +11571,11 @@ msgstr "(Ei aihetta)"
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Tämä viesti lähetettiin %s käyttäjän %s puolesta"
 
-#: ../src/em-format/e-mail-formatter-image.c:168
+#: ../src/em-format/e-mail-formatter-image.c:178
 msgid "Regular Image"
 msgstr "Tavallinen kuva"
 
-#: ../src/em-format/e-mail-formatter-image.c:169
+#: ../src/em-format/e-mail-formatter-image.c:179
 #, fuzzy
 #| msgid "Display the next message"
 msgid "Display part as an image"
@@ -11831,8 +11591,7 @@ 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:2352
+#: ../src/em-format/e-mail-formatter-print.c:51 ../src/e-util/e-webdav-browser.c:2352
 #: ../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
@@ -11840,16 +11599,14 @@ msgid "Name"
 msgstr "Nimi"
 
 #: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/e-util/e-attachment-tree-view.c:193
-#: ../src/mail/message-list.etspec.h:10
+#: ../src/e-util/e-attachment-tree-view.c:193 ../src/mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Koko"
 
 #: ../src/em-format/e-mail-formatter-quote-headers.c:178
-#: ../src/em-format/e-mail-part-headers.c:51
-#: ../src/mail/e-mail-tag-editor.c:208 ../src/mail/filtertypes.xml.in.h:16
-#: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
-#: ../src/mail/vfoldertypes.xml.in.h:17
+#: ../src/em-format/e-mail-part-headers.c:51 ../src/mail/e-mail-tag-editor.c:208
+#: ../src/mail/filtertypes.xml.in.h:16 ../src/mail/message-list.etspec.h:6
+#: ../src/mail/searchtypes.xml.in.h:17 ../src/mail/vfoldertypes.xml.in.h:17
 #: ../src/modules/mail/em-mailer-prefs.c:65
 #: ../src/smime/gui/certificate-manager.c:1643
 msgid "Subject"
@@ -11858,7 +11615,7 @@ msgstr "Aihe"
 #. pseudo-header
 #: ../src/em-format/e-mail-formatter-quote-headers.c:197
 #: ../src/em-format/e-mail-formatter-utils.c:341
-#: ../src/modules/mail/em-mailer-prefs.c:1494
+#: ../src/modules/mail/em-mailer-prefs.c:1500
 msgid "Mailer"
 msgstr "Postittaja"
 
@@ -11902,11 +11659,10 @@ msgstr "Allekirjoittamaton"
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:47
 msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+"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."
+"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
 msgid "Valid signature"
@@ -11921,8 +11677,8 @@ msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
-"Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
-"todennäköisesti aito."
+"Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin todennäköisesti "
+"aito."
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
@@ -11930,8 +11686,8 @@ msgstr "Hylätty allekirjoitus"
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:55
 msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+"The signature of this message cannot be verified, it may have been altered in "
+"transit."
 msgstr ""
 "Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
 "aikana."
@@ -11945,26 +11701,26 @@ msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
-"Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
-"viestin lähettäjää ei voi varmistaa."
+"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."
+#| "This message is signed with a signature, but there is no corresponding public "
+#| "key."
 msgid "This message is signed, but the public key is not in your keyring"
 msgstr ""
-"Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
-"viestin lähettäjän julkista avainta ei löydy."
+"Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta viestin "
+"lähettäjän julkista avainta ei löydy."
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:63
 msgid ""
-"This message was digitally signed, but the corresponding public key is not "
-"present in your keyring. If you want to be able to verify the authenticity "
-"of messages from this person, you should obtain the public key through a "
-"trusted method and add it to your keyring. Until then, there is no guarantee "
-"that this message truly came from that person and that it arrived unaltered."
+"This message was digitally signed, but the corresponding public key is not present "
+"in your keyring. If you want to be able to verify the authenticity of messages "
+"from this person, you should obtain the public key through a trusted method and "
+"add it to your keyring. Until then, there is no guarantee that this message truly "
+"came from that person and that it arrived unaltered."
 msgstr ""
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:72
@@ -11973,11 +11729,11 @@ msgstr "Salaamaton"
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:72
 msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+"This message is not encrypted. Its content may be viewed in transit across the "
+"Internet."
 msgstr ""
-"Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
-"Internetin läpi."
+"Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa Internetin "
+"läpi."
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:73
 msgid "Encrypted, weak"
@@ -11986,12 +11742,12 @@ msgstr "Heikosti salattu"
 #: ../src/em-format/e-mail-formatter-secure-button.c:73
 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 in a practical amount of time."
+"difficult, but not impossible for an outsider to view the content of this message "
+"in a practical amount of time."
 msgstr ""
-"Viesti on salattu heikolla salausalgoritmilla. On vaikeaa, mutta ei "
-"mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
-"melko lyhyessä ajassa."
+"Viesti on salattu heikolla salausalgoritmilla. On vaikeaa, mutta ei mahdotonta, "
+"että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön melko lyhyessä "
+"ajassa."
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid "Encrypted"
@@ -11999,11 +11755,10 @@ msgstr "Salattu"
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+"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."
+"Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö luettavakseen."
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:75
 msgid "Encrypted, strong"
@@ -12011,13 +11766,12 @@ msgstr "Salattu vahvalla algoritmilla"
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:75
 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 amount of time."
+"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 "
+"amount of time."
 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."
+"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-source.c:119
 msgid "Display source of a MIME part"
@@ -12025,24 +11779,21 @@ msgstr ""
 
 #: ../src/em-format/e-mail-formatter-utils.c:200
 #: ../src/em-format/e-mail-formatter-utils.c:217
-#: ../src/em-format/e-mail-part-headers.c:48
-#: ../src/mail/message-list.etspec.h:9 ../src/mail/searchtypes.xml.in.h:11
-#: ../src/mail/vfoldertypes.xml.in.h:11
+#: ../src/em-format/e-mail-part-headers.c:48 ../src/mail/message-list.etspec.h:9
+#: ../src/mail/searchtypes.xml.in.h:11 ../src/mail/vfoldertypes.xml.in.h:11
 #: ../src/modules/mail/em-mailer-prefs.c:62
 msgid "To"
 msgstr "Vastaanottaja"
 
 #: ../src/em-format/e-mail-formatter-utils.c:201
 #: ../src/em-format/e-mail-formatter-utils.c:218
-#: ../src/em-format/e-mail-part-headers.c:49
-#: ../src/modules/mail/em-mailer-prefs.c:63
+#: ../src/em-format/e-mail-part-headers.c:49 ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Kopiot"
 
 #: ../src/em-format/e-mail-formatter-utils.c:202
 #: ../src/em-format/e-mail-formatter-utils.c:219
-#: ../src/em-format/e-mail-part-headers.c:50
-#: ../src/modules/mail/em-mailer-prefs.c:64
+#: ../src/em-format/e-mail-part-headers.c:50 ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Piilokopiot"
 
@@ -12069,7 +11820,7 @@ msgstr "S/MIME-salattu"
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: ../src/em-format/e-mail-parser-application-mbox.c:85
+#: ../src/em-format/e-mail-parser-application-mbox.c:125
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr ""
@@ -12121,8 +11872,7 @@ msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 #, fuzzy, c-format
 #| msgid "Pointer to unknown external data (\"%s\" type)"
 msgid "Pointer to unknown external data (“%s” type)"
-msgstr ""
-"Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
+msgstr "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
 
 #: ../src/em-format/e-mail-parser-multipart-encrypted.c:64
 #: ../src/em-format/e-mail-parser-multipart-signed.c:81
@@ -12142,8 +11892,7 @@ msgstr "PGP/MIME-viestin jäsennys epäonnistui: %s"
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../src/em-format/e-mail-part-headers.c:47
-#: ../src/modules/mail/em-mailer-prefs.c:61
+#: ../src/em-format/e-mail-part-headers.c:47 ../src/modules/mail/em-mailer-prefs.c:61
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
@@ -12153,13 +11902,11 @@ msgstr "Vastausosoite"
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../src/em-format/e-mail-part-headers.c:53
-#: ../src/modules/mail/em-mailer-prefs.c:67
+#: ../src/em-format/e-mail-part-headers.c:53 ../src/modules/mail/em-mailer-prefs.c:67
 msgid "Newsgroups"
 msgstr "Uutisryhmät"
 
-#: ../src/em-format/e-mail-part-headers.c:54
-#: ../src/modules/mail/em-mailer-prefs.c:68
+#: ../src/em-format/e-mail-part-headers.c:54 ../src/modules/mail/em-mailer-prefs.c:68
 #: ../src/plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Kasvokuva"
@@ -12169,16 +11916,14 @@ msgstr "Kasvokuva"
 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
+#: ../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
-#, fuzzy
-#| msgid "Imported Certificate"
 msgid "_Import Certificate"
-msgstr "Tuotu varmenne"
+msgstr "_Tuo varmenne"
 
 #: ../src/em-format/e-mail-part-secure-button.c:207
 msgid "This certificate is not viewable"
@@ -12202,76 +11947,78 @@ msgstr "Kalenteri väliltä %s - %s"
 msgid "evolution calendar item"
 msgstr "evolutionin kalenterin kohta"
 
-#: ../src/e-util/e-accounts-window.c:509 ../src/e-util/e-accounts-window.c:624
-#: ../src/e-util/e-accounts-window.c:827
-#: ../src/modules/mail/e-mail-shell-backend.c:840
+#: ../src/e-util/e-accounts-window.c:523 ../src/e-util/e-accounts-window.c:640
+#: ../src/e-util/e-accounts-window.c:860
+#: ../src/modules/mail/e-mail-shell-backend.c:852
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: ../src/e-util/e-accounts-window.c:516 ../src/e-util/e-accounts-window.c:653
-#: ../src/e-util/e-accounts-window.c:841
+#: ../src/e-util/e-accounts-window.c:530 ../src/e-util/e-accounts-window.c:669
+#: ../src/e-util/e-accounts-window.c:874
 msgid "Address Books"
 msgstr "Osoitekirjat"
 
-#: ../src/e-util/e-accounts-window.c:522 ../src/e-util/e-accounts-window.c:654
-#: ../src/e-util/e-accounts-window.c:842
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#: ../src/e-util/e-accounts-window.c:536 ../src/e-util/e-accounts-window.c:670
+#: ../src/e-util/e-accounts-window.c:875
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "Calendars"
 msgstr "Kalenterit"
 
-#: ../src/e-util/e-accounts-window.c:528 ../src/e-util/e-accounts-window.c:655
-#: ../src/e-util/e-accounts-window.c:843
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
+#: ../src/e-util/e-accounts-window.c:542 ../src/e-util/e-accounts-window.c:671
+#: ../src/e-util/e-accounts-window.c:876
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "Memo Lists"
 msgstr "Muistilappulistat"
 
-#: ../src/e-util/e-accounts-window.c:534 ../src/e-util/e-accounts-window.c:656
-#: ../src/e-util/e-accounts-window.c:844
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#: ../src/e-util/e-accounts-window.c:548 ../src/e-util/e-accounts-window.c:672
+#: ../src/e-util/e-accounts-window.c:877
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
 msgid "Task Lists"
 msgstr "Tehtävälistat"
 
-#: ../src/e-util/e-accounts-window.c:1326
+#: ../src/e-util/e-accounts-window.c:1363 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-tree-view.c:84
 #: ../src/modules/mail/em-composer-prefs.c:1305
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
-#: ../src/plugins/publish-calendar/publish-calendar.c:853
+#: ../src/plugins/publish-calendar/publish-calendar.c:854
 msgid "Enabled"
 msgstr "käytössä"
 
-#: ../src/e-util/e-accounts-window.c:1342
-#: ../src/mail/e-mail-account-tree-view.c:108
+#: ../src/e-util/e-accounts-window.c:1379 ../src/mail/e-mail-account-tree-view.c:108
 msgid "Account Name"
 msgstr "Tilin nimi"
 
-#. { "collection",     N_("Collection _Account"),      "evolution" },
-#: ../src/e-util/e-accounts-window.c:1463
+#: ../src/e-util/e-accounts-window.c:1446
 #, fuzzy
-#| msgid "Mail Accounts"
+#| msgid "Evolution Accounts"
+msgid "Collection _Account"
+msgstr "Evolution-tilit"
+
+#: ../src/e-util/e-accounts-window.c:1447
 msgid "_Mail Account"
-msgstr "Sähköpostitilit"
+msgstr "S_ähköpostitili"
 
-#: ../src/e-util/e-accounts-window.c:1464
+#: ../src/e-util/e-accounts-window.c:1448
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../src/e-util/e-accounts-window.c:1465
+#: ../src/e-util/e-accounts-window.c:1449
 msgid "_Calendar"
 msgstr "_Kalenteri"
 
-#: ../src/e-util/e-accounts-window.c:1466
+#: ../src/e-util/e-accounts-window.c:1450
 #, fuzzy
 #| msgid "Memo Lists"
 msgid "M_emo List"
 msgstr "Muistilappulistat"
 
-#: ../src/e-util/e-accounts-window.c:1467
+#: ../src/e-util/e-accounts-window.c:1451
 #, fuzzy
 #| msgid "Task List"
 msgid "_Task List"
 msgstr "Tehtävälista"
 
-#: ../src/e-util/e-accounts-window.c:1659
+#: ../src/e-util/e-accounts-window.c:1646
 msgid "Evolution Accounts"
 msgstr "Evolution-tilit"
 
@@ -12315,7 +12062,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1849
 msgid "Cancel"
 msgstr "Peru"
 
@@ -12384,8 +12131,7 @@ msgstr "Liitettä ei voitu tallentaa"
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
-#: ../src/e-util/e-attachment-dialog.c:337
-#: ../src/e-util/e-import-assistant.c:276
+#: ../src/e-util/e-attachment-dialog.c:337 ../src/e-util/e-import-assistant.c:276
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
@@ -12400,8 +12146,7 @@ msgstr "K_uvaus:"
 msgid "MIME Type:"
 msgstr "MIME-tyyppi:"
 
-#: ../src/e-util/e-attachment-dialog.c:380
-#: ../src/e-util/e-attachment-store.c:694
+#: ../src/e-util/e-attachment-dialog.c:380 ../src/e-util/e-attachment-store.c:694
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
@@ -12427,8 +12172,7 @@ msgstr "Tallennetaan"
 msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../src/e-util/e-attachment-paned.c:105
-#: ../src/e-util/e-attachment-paned.c:741
+#: ../src/e-util/e-attachment-paned.c:105 ../src/e-util/e-attachment-paned.c:741
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
@@ -12436,8 +12180,7 @@ msgstr "Näytä _liitepalkki"
 msgid "Add Attachment"
 msgstr "Lisää liite"
 
-#: ../src/e-util/e-attachment-store.c:666
-#: ../src/e-util/e-attachment-store.c:668
+#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-attachment-store.c:668
 msgid "A_ttach"
 msgstr "Lii_tä"
 
@@ -12491,8 +12234,8 @@ msgstr "_Lisää liite..."
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1316
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:605
 #: ../src/modules/calendar/e-task-shell-view-actions.c:731
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1643
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1714
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
@@ -12523,40 +12266,40 @@ msgstr "Kopioi kirjan sisältö paikallisesti yhteydettömään käyttöön"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-napsauta avataksesi linkin"
 
-#: ../src/e-util/e-calendar.c:272
+#: ../src/e-util/e-calendar.c:267
 msgid "Previous month"
 msgstr "Edellinen kuukausi"
 
-#: ../src/e-util/e-calendar.c:291
+#: ../src/e-util/e-calendar.c:286
 msgid "Next month"
 msgstr "Seuraava kuukausi"
 
-#: ../src/e-util/e-calendar.c:311
+#: ../src/e-util/e-calendar.c:306
 msgid "Previous year"
 msgstr "Edellinen vuosi"
 
-#: ../src/e-util/e-calendar.c:330
+#: ../src/e-util/e-calendar.c:325
 msgid "Next year"
 msgstr "Seuraava vuosi"
 
-#: ../src/e-util/e-calendar.c:354
+#: ../src/e-util/e-calendar.c:349
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2221
+#: ../src/e-util/e-calendar-item.c:1333 ../src/e-util/e-calendar-item.c:2216
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1340
+#: ../src/e-util/e-calendar-item.c:1335
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1377
+#: ../src/e-util/e-calendar-item.c:1372
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -12650,11 +12393,9 @@ msgstr "Luokan ominaisuudet"
 #: ../src/e-util/e-category-editor.c:275
 #, fuzzy, c-format
 #| msgid ""
-#| "There is already a category '%s' in the configuration. Please use another "
-#| "name"
+#| "There is already a category '%s' in the configuration. Please use another name"
 msgid ""
-"There is already a category “%s” in the configuration. Please use another "
-"name"
+"There is already a category “%s” in the configuration. Please use another name"
 msgstr "Asetuksista löytyy jo luokka nimeltä \"%s\". Valitse toinen nimi"
 
 #: ../src/e-util/e-cell-combo.c:183
@@ -12662,7 +12403,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:2067
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2109
 msgid "?"
 msgstr "?"
 
@@ -12785,6 +12526,133 @@ msgstr "Muut..."
 msgid "Cannot create a client object from extension name “%s”"
 msgstr ""
 
+#: ../src/e-util/e-collection-account-wizard.c:214
+msgid "Looking up details, please wait…"
+msgstr ""
+
+#. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
+#: ../src/e-util/e-collection-account-wizard.c:271
+#, fuzzy, c-format
+#| msgid "Enter Google password for user '%s'."
+msgid "Requires password to continue. %s."
+msgstr "Anna käyttäjän '%s' Google-salasana."
+
+#: ../src/e-util/e-collection-account-wizard.c:284
+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:288
+#, c-format
+msgctxt "collection-account-wizard"
+msgid "%s %s."
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:326
+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:328
+#, c-format
+msgid "Found one candidate"
+msgid_plural "Found %d candidates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/e-util/e-collection-account-wizard.c:423
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../src/smime/gui/certificate-manager.c:785
+msgid "_Password:"
+msgstr "_Salasana:"
+
+#: ../src/e-util/e-collection-account-wizard.c:434
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "_Remember password"
+msgstr "_Muista salasana"
+
+#: ../src/e-util/e-collection-account-wizard.c:555
+#: ../src/e-util/e-webdav-browser.c:473
+msgid "Collection"
+msgstr "Kokoelma"
+
+#: ../src/e-util/e-collection-account-wizard.c:556
+#, fuzzy
+#| msgid "Mail Receipt"
+msgid "Mail Receive"
+msgstr "Sähköpostin vastaanotto"
+
+#: ../src/e-util/e-collection-account-wizard.c:557
+#, fuzzy
+#| msgid "Mailer"
+msgid "Mail Send"
+msgstr "Postittaja"
+
+#: ../src/e-util/e-collection-account-wizard.c:558
+#: ../src/e-util/e-name-selector-dialog.c:445
+#: ../src/mail/importers/pine-importer.c:430
+msgid "Address Book"
+msgstr "Osoitekirja"
+
+#: ../src/e-util/e-collection-account-wizard.c:560
+#, fuzzy
+#| msgid "Memo Lists"
+msgid "Memo List"
+msgstr "Muistilappulistat"
+
+#: ../src/e-util/e-collection-account-wizard.c:561
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+msgid "Task List"
+msgstr "Tehtävälista"
+
+#: ../src/e-util/e-collection-account-wizard.c:896
+msgid "Looking up LDAP server’s search base…"
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:1193
+msgid "Saving account settings, please wait…"
+msgstr "Tallennetaan tilin asetuksia, odota hetki…"
+
+#: ../src/e-util/e-collection-account-wizard.c:1337
+msgid "User details"
+msgstr "Käyttäjän tiedot"
+
+#: ../src/e-util/e-collection-account-wizard.c:1350
+msgid "_Email Address or User name:"
+msgstr "S_ähköpostiosoite tai käyttäjätunnus:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1380
+msgid "_Advanced Options"
+msgstr "_Lähetysasetukset"
+
+#: ../src/e-util/e-collection-account-wizard.c:1385
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_Server:"
+msgstr "_Palvelin:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1403
+msgid ""
+"Semicolon (“;”) separated list of servers to look up information for, in addition "
+"to the domain of the e-mail address."
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:1595
+#, fuzzy
+#| msgid "Level beyond which the message should be logged."
+msgid "Select which parts should be configured:"
+msgstr "Taso, jonka jälkeen viesti kirjoitetaan lokiin."
+
+#: ../src/e-util/e-collection-account-wizard.c:1719
+#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/mail/e-mail-config-summary-page.c:323
+msgid "Account Information"
+msgstr "Tilitiedot"
+
 #: ../src/e-util/e-color-chooser-widget.c:122
 msgid "Choose custom color"
 msgstr "Käytä omavalintainen väri"
@@ -12957,11 +12825,17 @@ msgstr "valkoinen"
 
 #: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
 #: ../src/mail/e-mail-config-security-page.c:404
-#: ../src/mail/e-mail-config-security-page.c:568
-#: ../src/mail/e-mail-reader.c:4043 ../src/mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-config-security-page.c:568 ../src/mail/e-mail-reader.c:4138
+#: ../src/mail/mail-config.ui.h:76
 msgid "Default"
 msgstr "Oletukset"
 
+#: ../src/e-util/e-config-lookup.c:817
+#, fuzzy
+#| msgid "Loading…"
+msgid "Running…"
+msgstr "Ladataan…"
+
 #: ../src/e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "Päiväys ja aika"
@@ -13083,32 +12957,24 @@ msgstr "Muoto:"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
 #: ../src/e-util/e-dialog-widgets.c:181
-#, fuzzy
-#| msgid "days"
 msgctxt "time-unit"
 msgid "days"
-msgstr "päivä"
+msgstr "päivää"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
 #: ../src/e-util/e-dialog-widgets.c:183
-#, fuzzy
-#| msgid "weeks"
 msgctxt "time-unit"
 msgid "weeks"
 msgstr "viikkoa"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
 #: ../src/e-util/e-dialog-widgets.c:185
-#, fuzzy
-#| msgid "months"
 msgctxt "time-unit"
 msgid "months"
 msgstr "kuukautta"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
 #: ../src/e-util/e-dialog-widgets.c:187
-#, fuzzy
-#| msgid "years"
 msgctxt "time-unit"
 msgid "years"
 msgstr "vuotta"
@@ -13368,23 +13234,23 @@ msgstr "Valitse aika johon verrataan"
 msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../src/e-util/e-filter-rule.c:763
+#: ../src/e-util/e-filter-rule.c:978
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../src/e-util/e-filter-rule.c:813
+#: ../src/e-util/e-filter-rule.c:1034
 msgid "all the following conditions"
 msgstr "kaikkia seuraavia ehtoja"
 
-#: ../src/e-util/e-filter-rule.c:814
+#: ../src/e-util/e-filter-rule.c:1035
 msgid "any of the following conditions"
 msgstr "mitä tahansa seuraavista ehdoista"
 
-#: ../src/e-util/e-filter-rule.c:820
+#: ../src/e-util/e-filter-rule.c:1041
 msgid "_Find items which match:"
 msgstr "_Etsi kohteet, jotka vastaavat:"
 
-#: ../src/e-util/e-filter-rule.c:843
+#: ../src/e-util/e-filter-rule.c:1064
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
@@ -13392,48 +13258,47 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:858
-#: ../src/e-util/e-html-editor-page-dialog.c:59
+#: ../src/e-util/e-filter-rule.c:1079 ../src/e-util/e-html-editor-page-dialog.c:59
 #: ../src/e-util/e-mail-identity-combo-box.c:694
 #: ../src/e-util/e-mail-signature-combo-box.c:422
-#: ../src/libemail-engine/camel-null-store.c:29
-#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:658
 #: ../src/mail/e-mail-config-summary-page.c:141
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:680
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../src/e-util/e-filter-rule.c:859
+#: ../src/e-util/e-filter-rule.c:1080
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../src/e-util/e-filter-rule.c:860 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1081 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../src/e-util/e-filter-rule.c:861
+#: ../src/e-util/e-filter-rule.c:1082
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../src/e-util/e-filter-rule.c:862
+#: ../src/e-util/e-filter-rule.c:1083
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../src/e-util/e-filter-rule.c:865
+#: ../src/e-util/e-filter-rule.c:1086
 #, fuzzy
 msgid "I_nclude threads:"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../src/e-util/e-filter-rule.c:944
+#: ../src/e-util/e-filter-rule.c:1164
 msgid "A_dd Condition"
 msgstr "Lisää _ehto"
 
-#: ../src/e-util/e-filter-rule.c:1258 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-utils.c:166
+#: ../src/e-util/e-filter-rule.c:1478 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:1043 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-utils.c:167
+#: ../src/e-util/e-filter-rule.c:1478 ../src/mail/em-filter-rule.c:1044
+#: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Lähtevät"
 
@@ -13644,7 +13509,6 @@ msgid "A_ddress"
 msgstr "_Osoite"
 
 #: ../src/e-util/e-html-editor-actions.c:1158
-#| msgid "D_elete Memo List"
 msgid "_Bulleted List"
 msgstr "_Merkitty luettelo"
 
@@ -13667,7 +13531,6 @@ msgstr "_Kuva..."
 
 #. Translators: This is an action tooltip
 #: ../src/e-util/e-html-editor-actions.c:1198
-#| msgid "Inline Image"
 msgid "Insert Image"
 msgstr "Sisällytä kuva"
 
@@ -13739,7 +13602,6 @@ msgid "Italic"
 msgstr "Kursivoitu"
 
 #: ../src/e-util/e-html-editor-actions.c:1312
-#| msgid "Plain Text"
 msgid "_Plain Text"
 msgstr "_Raakateksti"
 
@@ -13754,12 +13616,10 @@ msgstr "Yliviivattu"
 
 #: ../src/e-util/e-html-editor-actions.c:1328
 #: ../src/e-util/e-html-editor-text-dialog.c:223
-#| msgid "Undefined"
 msgid "_Underline"
 msgstr "_Alleviivattu"
 
 #: ../src/e-util/e-html-editor-actions.c:1330
-#| msgid "Undefined"
 msgid "Underline"
 msgstr "Alleviivattu"
 
@@ -13799,12 +13659,10 @@ msgid "+4"
 msgstr "+4"
 
 #: ../src/e-util/e-html-editor-actions.c:1407
-#| msgid "_Contents"
 msgid "Cell Contents"
 msgstr "Solun sisältö"
 
 #: ../src/e-util/e-html-editor-actions.c:1414
-#| msgid "Add a Column"
 msgid "Column"
 msgstr "Sarake"
 
@@ -13818,13 +13676,11 @@ msgstr "Taulukko"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
 #: ../src/e-util/e-html-editor-actions.c:1438
-#| msgid "Table Cell"
 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:1446
-#| msgid "Table Cell"
 msgid "Table Insert"
 msgstr "Taulukon lisäys"
 
@@ -13921,7 +13777,6 @@ msgid "_Emoticon"
 msgstr "_Hymiö"
 
 #: ../src/e-util/e-html-editor-actions.c:1807
-#| msgid "Restart Evolution"
 msgid "Insert Emoticon"
 msgstr "Lisää hymiö"
 
@@ -13947,19 +13802,19 @@ msgstr "_Viiva"
 msgid "_Table"
 msgstr "_Taulukko"
 
-#: ../src/e-util/e-html-editor.c:732
+#: ../src/e-util/e-html-editor.c:727
 msgid "Paragraph Style"
 msgstr "Kappaleen tyyli"
 
-#: ../src/e-util/e-html-editor.c:746
+#: ../src/e-util/e-html-editor.c:741
 msgid "Editing Mode"
 msgstr "Muokkaustila"
 
-#: ../src/e-util/e-html-editor.c:758
+#: ../src/e-util/e-html-editor.c:753
 msgid "Font Color"
 msgstr "Fontin väri"
 
-#: ../src/e-util/e-html-editor.c:768
+#: ../src/e-util/e-html-editor.c:763
 msgid "Font Size"
 msgstr "Fontin koko"
 
@@ -14235,9 +14090,8 @@ msgstr ""
 msgid "Midnight"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-page-dialog.c:122
-#: ../src/mail/filtertypes.xml.in.h:38 ../src/mail/searchtypes.xml.in.h:41
-#: ../src/mail/vfoldertypes.xml.in.h:41
+#: ../src/e-util/e-html-editor-page-dialog.c:122 ../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"
 
@@ -14270,8 +14124,7 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Taustakuva</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
-#| msgid "Template:"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "_Template:"
 msgstr "_Malli:"
 
@@ -14281,7 +14134,6 @@ msgid "Select a file"
 msgstr "Valitse tiedosto"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:488
-#| msgid "_Custom"
 msgid "_Custom:"
 msgstr "_Oma:"
 
@@ -14401,7 +14253,6 @@ msgid "_Rows:"
 msgstr "_Rivejä:"
 
 #: ../src/e-util/e-html-editor-table-dialog.c:554
-#| msgid "_Table column:"
 msgid "C_olumns:"
 msgstr "_Sarakkeita:"
 
@@ -14439,18 +14290,15 @@ msgstr "Tekstin ominaisuudet"
 
 #: ../src/e-util/e-import-assistant.c:259
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Valitse Evolutioniin tuotavat tiedosto ja valitse listasta tiedoston tyyppi."
+"Choose the file that you want to import into Evolution, and select what type of "
+"file it is from the list."
+msgstr "Valitse Evolutioniin tuotavat tiedosto ja valitse listasta tiedoston tyyppi."
 
-#: ../src/e-util/e-import-assistant.c:300
-#: ../src/e-util/e-import-assistant.c:475
+#: ../src/e-util/e-import-assistant.c:300 ../src/e-util/e-import-assistant.c:475
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../src/e-util/e-import-assistant.c:343
-#: ../src/e-util/e-import-assistant.c:923
+#: ../src/e-util/e-import-assistant.c:343 ../src/e-util/e-import-assistant.c:948
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
@@ -14474,17 +14322,17 @@ msgstr "Valitse tieto jota haluaisit tuoda:"
 #: ../src/e-util/e-import-assistant.c:536
 #, fuzzy
 #| msgid ""
-#| "Evolution checked for settings to import from the following applications: "
-#| "Pine, Netscape, Elm, iCalendar. No importable settings found. If you "
-#| "would like to try again, please click the \"Back\" button."
+#| "Evolution checked for settings to import from the following applications: Pine, "
+#| "Netscape, Elm, iCalendar. No importable settings found. If you would like to "
+#| "try again, please click the \"Back\" button."
 msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
-"would like to try again, please click the “Back” button."
+"Evolution checked for settings to import from the following applications: Pine, "
+"Netscape, Elm, iCalendar, KMail. No importable settings found. If you would like "
+"to try again, please click the “Back” button."
 msgstr ""
-"Evolution etsi tuotavia asetuksia seuraavista ohjelmista: Pine, Netscape, "
-"Elm, iCalendar. Mitään tuotavia asetuksia ei löytynyt. Jos haluat kokeilla "
-"uudestaan, napsauta ”Takaisin”-painiketta."
+"Evolution etsi tuotavia asetuksia seuraavista ohjelmista: Pine, Netscape, Elm, "
+"iCalendar. Mitään tuotavia asetuksia ei löytynyt. Jos haluat kokeilla uudestaan, "
+"napsauta ”Takaisin”-painiketta."
 
 #: ../src/e-util/e-import-assistant.c:562
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
@@ -14493,59 +14341,55 @@ msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:781
+#: ../src/e-util/e-import-assistant.c:808
 msgid "_Cancel Import"
 msgstr "_Peru tuonti"
 
-#: ../src/e-util/e-import-assistant.c:922
+#: ../src/e-util/e-import-assistant.c:947
 msgid "Preview data to be imported"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../src/e-util/e-import-assistant.c:928
-#: ../src/e-util/e-import-assistant.c:941
-#: ../src/e-util/e-import-assistant.c:1294
-#: ../src/e-util/e-import-assistant.c:1370
-#: ../src/e-util/e-import-assistant.c:1379
+#: ../src/e-util/e-import-assistant.c:953 ../src/e-util/e-import-assistant.c:966
+#: ../src/e-util/e-import-assistant.c:1319 ../src/e-util/e-import-assistant.c:1395
+#: ../src/e-util/e-import-assistant.c:1404
 msgid "Import Data"
 msgstr "Tuo tiedot"
 
-#: ../src/e-util/e-import-assistant.c:936
+#: ../src/e-util/e-import-assistant.c:961
 msgid "Select what type of file you want to import from the list."
 msgstr "Valitse luettelosta minkä tyyppisen tiedoston haluat tuoda."
 
-#: ../src/e-util/e-import-assistant.c:1284
-#: ../src/e-util/e-import-assistant.c:1319
+#: ../src/e-util/e-import-assistant.c:1309 ../src/e-util/e-import-assistant.c:1344
 msgid "Evolution Import Assistant"
 msgstr "Evolutionin tuontiapulainen"
 
-#: ../src/e-util/e-import-assistant.c:1301
-#: ../src/e-util/e-import-assistant.c:1357
+#: ../src/e-util/e-import-assistant.c:1326 ../src/e-util/e-import-assistant.c:1382
 msgid "Import Location"
 msgstr "Tuo sijainti"
 
-#: ../src/e-util/e-import-assistant.c:1312
+#: ../src/e-util/e-import-assistant.c:1337
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
+"With this assistant you will be guided through the process of importing external "
+"files into Evolution."
 msgstr ""
 "Tervetuloa Evolutionin tuontiapulaiseen.\n"
-"Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
-"Evolutionin käyttöön."
+"Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista Evolutionin "
+"käyttöön."
 
-#: ../src/e-util/e-import-assistant.c:1329
+#: ../src/e-util/e-import-assistant.c:1354
 msgid "Importer Type"
 msgstr "Tuojan tyyppi"
 
-#: ../src/e-util/e-import-assistant.c:1339
+#: ../src/e-util/e-import-assistant.c:1364
 msgid "Select Information to Import"
 msgstr "Valitse tuotavat tiedot"
 
-#: ../src/e-util/e-import-assistant.c:1348
+#: ../src/e-util/e-import-assistant.c:1373
 msgid "Select a File"
 msgstr "Valitse tiedosto"
 
-#: ../src/e-util/e-import-assistant.c:1365
+#: ../src/e-util/e-import-assistant.c:1390
 #, fuzzy
 #| msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgid "Click “Apply” to begin importing the file into Evolution."
@@ -14611,45 +14455,95 @@ msgstr "Maailmankartta"
 
 #: ../src/e-util/e-map.c:889
 msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
+"Mouse-based interactive map widget for selecting timezone. Keyboard users should "
+"instead select the timezone from the drop-down combination box below."
 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:253
+#: ../src/e-util/e-misc-utils.c:260
 msgid "Could not open the link."
 msgstr "Linkkiä ei voitu avata."
 
-#: ../src/e-util/e-misc-utils.c:336
+#: ../src/e-util/e-misc-utils.c:343
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
-#: ../src/e-util/e-misc-utils.c:2501
+#: ../src/e-util/e-misc-utils.c:2508
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Avataan kalenteria “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2504
+#: ../src/e-util/e-misc-utils.c:2511
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Avataan muistilappuluetteloa “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2507
+#: ../src/e-util/e-misc-utils.c:2514
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Avataan tehtävälistaa “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2510
+#: ../src/e-util/e-misc-utils.c:2517
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Avataan osoitekirja “%s”"
 
-#: ../src/e-util/e-misc-utils.c:3290
+#: ../src/e-util/e-misc-utils.c:3297
 #: ../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:4123
+msgid ""
+"This address book server might be unreachable or the server name may be misspelled "
+"or your network connection could be down."
+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:4135
+#, c-format
+msgid "Failed to set protocol version to LDAPv3 (%d): %s"
+msgstr ""
+
+#: ../src/e-util/e-misc-utils.c:4147
+#, 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:4161
+#, fuzzy, c-format
+#| 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 "
+#| "search bases."
+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 "
+"search bases.\n"
+"\n"
+"Detailed error (%d): %s"
+msgstr ""
+"Tämä LDAP-palvelin saattaa käyttää vanhempaa versiota LDAP:ista, joka ei tue tätä "
+"toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
+"ovat tuetut hakupohjat."
+
+#: ../src/e-util/e-misc-utils.c:4172
+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 "
+"search bases."
+msgstr ""
+"Tämä LDAP-palvelin saattaa käyttää vanhempaa versiota LDAP:ista, joka ei tue tätä "
+"toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
+"ovat tuetut hakupohjat."
+
+#: ../src/e-util/e-misc-utils.c:4205
+msgid "Evolution had not been compiled with LDAP support"
+msgstr ""
+
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "Näytä yhteystiedot"
@@ -14684,35 +14578,30 @@ msgstr "_Yhteystiedot"
 msgid "Search"
 msgstr "Etsi"
 
-#: ../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-name-selector-dialog.c:573
 msgid "Select Contacts from Address Book"
 msgstr "Valitse yhteystiedot osoitekirjasta"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3222
+#: ../src/e-util/e-name-selector-entry.c:3237
 #, fuzzy, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Laajenna kaikki"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3238
+#: ../src/e-util/e-name-selector-entry.c:3253
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopioi %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3249
+#: ../src/e-util/e-name-selector-entry.c:3264
 #, c-format
 msgid "C_ut %s"
 msgstr "_Leikkaa %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3267
+#: ../src/e-util/e-name-selector-entry.c:3282
 #, c-format
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
@@ -14771,8 +14660,7 @@ msgid "The printing system reported the following details about the error:"
 msgstr "Tulostusjärjestelmä kertoi seuraavat yksityiskohdat virheestä:"
 
 #: ../src/e-util/e-print.c:177
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "Tulostusjärjestelmä ei kertonut tarkempia tietoja virheestä."
 
 #: ../src/e-util/e-proxy-editor.c:326
@@ -14839,8 +14727,8 @@ msgstr "Sovella omavalintaisia välityspalvelimen asetuksia näille tileille:"
 
 #: ../src/e-util/e-proxy-preferences.c:562
 msgid ""
-"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
-"and apply them to specific accounts"
+"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies and "
+"apply them to specific accounts"
 msgstr ""
 
 #: ../src/e-util/e-proxy-selector.c:86
@@ -14855,11 +14743,11 @@ msgstr "Luo uusi välityspalvelinprofiili"
 msgid "Delete the selected proxy profile"
 msgstr "Poista valittu välityspalvelinprofiili"
 
-#: ../src/e-util/e-rule-editor.c:182
+#: ../src/e-util/e-rule-editor.c:191
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
-#: ../src/e-util/e-rule-editor.c:284
+#: ../src/e-util/e-rule-editor.c:302
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
@@ -14881,6 +14769,7 @@ msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
 #: ../src/e-util/e-search-bar.c:653
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:73
 msgid "_Previous"
 msgstr "_Edellinen"
 
@@ -14889,6 +14778,8 @@ msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
 #: ../src/e-util/e-search-bar.c:665
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:224
 msgid "_Next"
 msgstr "_Seuraava"
 
@@ -15071,23 +14962,23 @@ 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:1314
+#: ../src/e-util/e-source-config.c:1359
 msgid "Refresh every"
 msgstr "Päivitysväli"
 
-#: ../src/e-util/e-source-config.c:1344 ../src/e-util/e-source-config.c:1414
+#: ../src/e-util/e-source-config.c:1389 ../src/e-util/e-source-config.c:1459
 msgid "Use a secure connection"
 msgstr "Käytä salattua yhteyttä:"
 
-#: ../src/e-util/e-source-config.c:1440
+#: ../src/e-util/e-source-config.c:1485
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Tuotu varmenne"
 
-#: ../src/e-util/e-source-config.c:1476
-msgid "User"
-msgstr "Käyttäjä"
+#: ../src/e-util/e-source-config.c:1521
+msgid "User:"
+msgstr "Käyttäjä:"
 
 #: ../src/e-util/e-source-selector.c:3212
 msgid "Show"
@@ -15097,12 +14988,11 @@ msgstr "Näytä"
 msgid "Group name"
 msgstr "Ryhmän nimi"
 
-#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:796
+#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:793
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../src/e-util/e-source-selector.c:3374
-#: ../src/e-util/e-source-selector.c:3473
+#: ../src/e-util/e-source-selector.c:3374 ../src/e-util/e-source-selector.c:3473
 msgid "_Show"
 msgstr "_Näytä"
 
@@ -15131,8 +15021,7 @@ msgstr "Tuntematon (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-spell-dictionary.c:279
-#: ../src/e-util/e-spell-dictionary.c:284
+#: ../src/e-util/e-spell-dictionary.c:279 ../src/e-util/e-spell-dictionary.c:284
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -15169,11 +15058,9 @@ msgid "A file named “{0}” already exists. Do you want to replace it?"
 msgstr "Tiedosto “{0}” on jo olemassa. Korvataanko se?"
 
 #: ../src/e-util/e-system.error.xml.h:2
-msgid ""
-"The file already exists in “{0}”. Replacing it will overwrite its contents."
+msgid "The file already exists in “{0}”. Replacing it will overwrite its contents."
 msgstr ""
-"Tiedosto on jo olemassa kohteessa “{0}”. Uusi tiedosto korvaa vanhan "
-"sisällön."
+"Tiedosto on jo olemassa kohteessa “{0}”. Uusi tiedosto korvaa vanhan sisällön."
 
 #: ../src/e-util/e-system.error.xml.h:4
 msgid "Cannot save file “{0}”."
@@ -15212,8 +15099,7 @@ msgid "The address book backend servicing “{0}” has quit unexpectedly."
 msgstr "Evolutionin osoitekirja sulkeutui odottamatta."
 
 #: ../src/e-util/e-system.error.xml.h:12
-msgid ""
-"Some of your contacts may not be available until Evolution is restarted."
+msgid "Some of your contacts may not be available until Evolution is restarted."
 msgstr ""
 "Joitain yhteystietoja ei välttämättä voi käyttää, ennen kuin Evolution on "
 "käynnistetty uudelleen."
@@ -15227,11 +15113,9 @@ msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 #: ../src/e-util/e-system.error.xml.h:14
 #, fuzzy
 #| msgid "Your memos will not be available until Evolution is restarted."
-msgid ""
-"Some of your appointments may not be available until Evolution is restarted."
+msgid "Some of your appointments may not be available until Evolution is restarted."
 msgstr ""
-"Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
-"uudestaan."
+"Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty uudestaan."
 
 #: ../src/e-util/e-system.error.xml.h:15
 #, fuzzy
@@ -15244,8 +15128,7 @@ msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 #| msgid "Your memos will not be available until Evolution is restarted."
 msgid "Some of your memos may not be available until Evolution is restarted."
 msgstr ""
-"Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
-"uudestaan."
+"Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty uudestaan."
 
 #: ../src/e-util/e-system.error.xml.h:17
 #, fuzzy
@@ -15258,8 +15141,7 @@ msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 #| msgid "Your tasks will not be available until Evolution is restarted."
 msgid "Some of your tasks may not be available until Evolution is restarted."
 msgstr ""
-"Tehtävät eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
-"uudestaan."
+"Tehtävät eivät ole käytettävissä ennen kuin Evolution on käynnistetty uudestaan."
 
 #: ../src/e-util/e-system.error.xml.h:19
 #, fuzzy
@@ -15292,8 +15174,8 @@ msgstr "Jokin meni pieleen"
 #: ../src/e-util/e-system.error.xml.h:24
 msgid ""
 "A WebKitWebProcess crashed when displaying the content. You can try again by "
-"reopening the window. If the issue persists, please file a bug report in the "
-"GNOME bugzilla."
+"reopening the window. If the issue persists, please file a bug report in the GNOME "
+"bugzilla."
 msgstr ""
 
 #: ../src/e-util/e-system.error.xml.h:25
@@ -15303,14 +15185,13 @@ msgstr "Haluatko varmasti poistaa etäkokoelman “{0}”?"
 #: ../src/e-util/e-system.error.xml.h:26
 #, fuzzy
 #| msgid ""
-#| "This will permanently remove the calendar '{0}' from the server. Are you "
-#| "sure you want to proceed?"
+#| "This will permanently remove the calendar '{0}' from the server. Are you sure "
+#| "you want to proceed?"
 msgid ""
-"This will permanently remove the collection “{0}” from the server. Are you "
-"sure you want to proceed?"
+"This will permanently remove the collection “{0}” from the server. Are you sure "
+"you want to proceed?"
 msgstr ""
-"Etäkalenteri \"{0}\" poistetaan pysyvästi palvelimelta. Haluatko varmasti "
-"jatkaa?"
+"Etäkalenteri \"{0}\" poistetaan pysyvästi palvelimelta. Haluatko varmasti jatkaa?"
 
 #: ../src/e-util/e-table-click-to-add.c:687
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
@@ -15380,11 +15261,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:1783
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1779
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1783
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1779
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -15523,20 +15404,20 @@ msgstr "Muotoile _sarakkeet..."
 msgid "Custo_mize Current View..."
 msgstr "_Mukauta nykyistä näkymää..."
 
-#: ../src/e-util/e-table-header-item.c:1733
+#: ../src/e-util/e-table-header-item.c:1729
 msgid "_Sort By"
 msgstr "_Järjestystapa"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1756
+#: ../src/e-util/e-table-header-item.c:1752
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../src/e-util/e-text.c:2135
+#: ../src/e-util/e-text.c:2105
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../src/e-util/e-text.c:2148
+#: ../src/e-util/e-text.c:2118
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
@@ -15582,7 +15463,6 @@ msgid "Enter a URL here"
 msgstr "Kirjoita verkko-osoite tähän"
 
 #: ../src/e-util/evolution-source-viewer.c:638
-#| msgid "Evolution Pine importer"
 msgid "Evolution Source Viewer"
 msgstr "Evolutionin lähdekatselin"
 
@@ -15612,14 +15492,7 @@ msgstr "Osoitekirja"
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: ../src/e-util/e-webdav-browser.c:473
-#, fuzzy
-#| msgid "_Selection"
-msgid "Collection"
-msgstr "_Valinta"
-
 #: ../src/e-util/e-webdav-browser.c:514
-#| msgid "Loading"
 msgid "Loading…"
 msgstr "Ladataan…"
 
@@ -15656,21 +15529,17 @@ msgid "Saving changes…"
 msgstr "Tallennetaan muutoksia…"
 
 #: ../src/e-util/e-webdav-browser.c:1813
-#| msgid "Could not save attachments"
 msgid "Failed to save changes"
 msgstr "Muutoksia ei voitu tallentaa"
 
 #: ../src/e-util/e-webdav-browser.c:1815
-#, fuzzy
 #| msgid "Creating a memo"
 msgid "Creating new book…"
-msgstr "Luodaan muistilappu"
+msgstr "Luodaan uutta kirjaa…"
 
 #: ../src/e-util/e-webdav-browser.c:1816
-#, fuzzy
-#| msgid "Failed to mark messages as read."
 msgid "Failed to create new book"
-msgstr "Viestien merkitseminen luetuiksi epäonnistui."
+msgstr "Uuden kirjan luominen epäonnistui"
 
 #: ../src/e-util/e-webdav-browser.c:1818
 msgid "Creating new calendar…"
@@ -15681,16 +15550,13 @@ msgid "Failed to create new calendar"
 msgstr "Uuden kalenterin luominen epäonnistui"
 
 #: ../src/e-util/e-webdav-browser.c:1821
-#, fuzzy
 #| msgid "Create a new contact"
 msgid "Creating new collection…"
-msgstr "Luo uusi yhteystieto"
+msgstr "Luodaan uutta kokoelmaa…"
 
 #: ../src/e-util/e-webdav-browser.c:1822
-#, fuzzy
-#| msgid "Failed to mark messages as read."
 msgid "Failed to create new collection"
-msgstr "Viestien merkitseminen luetuiksi epäonnistui."
+msgstr "Uuden kokoelman luominen epäonnistui"
 
 #: ../src/e-util/e-webdav-browser.c:1961
 msgid "It is not allowed to create book under another book or calendar"
@@ -15702,16 +15568,13 @@ msgid "It is not allowed to create calendar under another book or calendar"
 msgstr ""
 
 #: ../src/e-util/e-webdav-browser.c:2189
-#, fuzzy
 #| msgid "Delete Memo"
 msgid "Deleting book…"
-msgstr "Poista muistilappu"
+msgstr "Poistetaan kirjaa…"
 
 #: ../src/e-util/e-webdav-browser.c:2190
-#, fuzzy
-#| msgid "Failed to delete contact"
 msgid "Failed to delete book"
-msgstr "Yhteystiedon poisto epäonnistui"
+msgstr "Kirjan poistaminen epäonnistui"
 
 #: ../src/e-util/e-webdav-browser.c:2193
 msgid "Deleting calendar…"
@@ -15722,16 +15585,13 @@ msgid "Failed to delete calendar"
 msgstr "Kalenterin poisto epäonnistui"
 
 #: ../src/e-util/e-webdav-browser.c:2197
-#, fuzzy
 #| msgid "Delete the selection"
 msgid "Deleting collection…"
-msgstr "Poista valinta"
+msgstr "Poistetaan kokoelmaa…"
 
 #: ../src/e-util/e-webdav-browser.c:2198
-#, fuzzy
-#| msgid "Failed to delete contact"
 msgid "Failed to delete collection"
-msgstr "Yhteystiedon poisto epäonnistui"
+msgstr "Kokoelman poistaminen epäonnistui"
 
 #: ../src/e-util/e-webdav-browser.c:2429
 msgid "For Components:"
@@ -15746,123 +15606,118 @@ msgid "WebDAV server:"
 msgstr "WebDAV-palvelin:"
 
 #: ../src/e-util/e-webdav-browser.c:2660
-#, fuzzy
-#| msgid "Create a Mem_o"
 msgid "Create _Book"
-msgstr "Luo _muistilappu"
+msgstr "Luo ki_rja"
 
 #: ../src/e-util/e-webdav-browser.c:2667
 msgid "Create _Calendar"
 msgstr "_Luo kalenteri"
 
 #: ../src/e-util/e-webdav-browser.c:2674
-#, fuzzy
-#| msgid "Create Folder"
 msgid "Create Collectio_n"
-msgstr "Luo kansio"
+msgstr "Luo _kokoelma"
 
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-webdav-browser.c:2699
-#: ../src/mail/em-subscription-editor.c:1976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+#: ../src/e-util/e-webdav-browser.c:2699 ../src/mail/em-subscription-editor.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1721
 msgid "_Refresh"
 msgstr "_Päivitä"
 
-#: ../src/e-util/e-web-view.c:346
+#: ../src/e-util/e-web-view.c:348
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../src/e-util/e-web-view.c:348
+#: ../src/e-util/e-web-view.c:350
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:356
+#: ../src/e-util/e-web-view.c:358
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../src/e-util/e-web-view.c:358
+#: ../src/e-util/e-web-view.c:360
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../src/e-util/e-web-view.c:366
+#: ../src/e-util/e-web-view.c:368
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../src/e-util/e-web-view.c:373
+#: ../src/e-util/e-web-view.c:375
 #, fuzzy
 #| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
-#: ../src/e-util/e-web-view.c:375
+#: ../src/e-util/e-web-view.c:377
 #, fuzzy
 #| msgid "Copy the email address to the clipboard"
 msgid "Copy the raw email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:390
+#: ../src/e-util/e-web-view.c:392
 msgid "_Copy Image"
 msgstr "K_opioi kuva"
 
-#: ../src/e-util/e-web-view.c:392
+#: ../src/e-util/e-web-view.c:394
 msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:397
+#: ../src/e-util/e-web-view.c:399
 msgid "Save _Image..."
 msgstr "Tal_lenna kuva..."
 
-#: ../src/e-util/e-web-view.c:399
+#: ../src/e-util/e-web-view.c:401
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1999
+#: ../src/e-util/e-web-view.c:421 ../src/e-util/e-web-view.c:2025
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../src/e-util/e-web-view.c:1354
+#: ../src/e-util/e-web-view.c:1379
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../src/e-util/e-web-view.c:1356
+#: ../src/e-util/e-web-view.c:1381
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../src/e-util/e-web-view.c:1367
+#: ../src/e-util/e-web-view.c:1392
 #, 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:1369
+#: ../src/e-util/e-web-view.c:1394
 #, 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:1373
+#: ../src/e-util/e-web-view.c:1398
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../src/e-util/e-web-view.c:3906
+#: ../src/e-util/e-web-view.c:3928
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:4094
+#: ../src/e-util/e-web-view.c:4116
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/e-util/e-web-view.c:4135
+#: ../src/e-util/e-web-view.c:4157
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Tallennetaan kuva kohteeseen “%s”"
 
-#: ../src/e-util/e-web-view.c:4230
+#: ../src/e-util/e-web-view.c:4252
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -15970,12 +15825,12 @@ msgid "seconds"
 msgstr "sekuntia"
 
 #: ../src/e-util/filter.ui.h:9
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "weeks"
 msgstr "viikkoa"
 
 #: ../src/e-util/filter.ui.h:10
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "months"
 msgstr "kuukautta"
 
@@ -16014,7 +15869,7 @@ msgstr ""
 #| "12:00am of the date specified."
 msgid ""
 "The message’s date will be compared against\n"
-"12:00am of the date specified."
+"the beginning of the specified day."
 msgstr ""
 "Viestin päiväystä verrataan määritellyn päivän\n"
 " keskipäivään (klo 12:00)."
@@ -16039,6 +15894,10 @@ msgstr "Sähköpostin näytön suodattimet:"
 msgid "_Filter Rules"
 msgstr "_Suodatinsäännöt"
 
+#: ../src/e-util/filter.ui.h:24
+msgid "Rule Name"
+msgstr "Säännön nimi"
+
 #: ../src/e-util/gal-a11y-e-cell.c:128
 msgid "Table Cell"
 msgstr "Taulukon solu"
@@ -16124,24 +15983,6 @@ msgstr "Allekirjoitusta ei voi ladata."
 msgid "Could not save signature."
 msgstr "Allekirjoitusta ei voi tallentaa."
 
-#: ../src/libemail-engine/camel-sasl-oauth2-google.c:27
-msgid "OAuth2 Google"
-msgstr "OAuth2 Google"
-
-#: ../src/libemail-engine/camel-sasl-oauth2-google.c:28
-msgid ""
-"This option will use an OAuth 2.0 access token to connect to the Google "
-"server"
-msgstr ""
-
-#: ../src/libemail-engine/camel-sasl-xoauth2.c:27
-msgid "OAuth2"
-msgstr "OAuth2"
-
-#: ../src/libemail-engine/camel-sasl-xoauth2.c:28
-msgid "This option will use an OAuth 2.0 access token to connect to the server"
-msgstr ""
-
 #: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
 msgid "Saving message to folder “%s”"
@@ -16194,71 +16035,69 @@ msgid "Invalid folder URI “%s”"
 msgstr "Virheellinen kansio: ”%s”"
 
 #. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:125
-#: ../src/mail/em-folder-properties.c:1150
-#: ../src/mail/em-folder-tree-model.c:1237
+#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/mail/em-folder-properties.c:1150 ../src/mail/em-folder-tree-model.c:1237
 #: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1026
-#: ../src/modules/mail/e-mail-shell-view-private.c:1037
+#: ../src/modules/mail/e-mail-shell-view-private.c:1035
+#: ../src/modules/mail/e-mail-shell-view-private.c:1046
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:126
-#: ../src/mail/em-folder-tree-model.c:1230
-#: ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1024
+#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/mail/em-folder-tree-model.c:1230 ../src/mail/importers/kmail-libs.c:145
+#: ../src/modules/mail/e-mail-shell-view-private.c:1033
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:127
-#: ../src/mail/em-folder-tree-model.c:1241
-#: ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1028
+#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/mail/em-folder-tree-model.c:1241 ../src/mail/importers/kmail-libs.c:141
+#: ../src/modules/mail/e-mail-shell-view-private.c:1037
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:128
-#: ../src/mail/em-folder-tree-model.c:1245
-#: ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1030
+#: ../src/libemail-engine/e-mail-session.c:124
+#: ../src/mail/em-folder-tree-model.c:1245 ../src/mail/importers/kmail-libs.c:143
+#: ../src/modules/mail/e-mail-shell-view-private.c:1039
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:129
-#: ../src/mail/em-folder-tree-model.c:1233
-#: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/libemail-engine/e-mail-session.c:125
+#: ../src/mail/em-folder-tree-model.c:1233 ../src/mail/importers/kmail-libs.c:147
+#: ../src/modules/mail/e-mail-shell-view-private.c:1041
 #: ../src/plugins/templates/e-templates-store.c:2212
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../src/libemail-engine/e-mail-session.c:1332
+#: ../src/libemail-engine/e-mail-session.c:1297
 #, c-format
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../src/libemail-engine/e-mail-session.c:1389
+#: ../src/libemail-engine/e-mail-session.c:1354
 #, fuzzy, c-format
 #| msgid ""
-#| "No destination address provided, forward of the message has been "
-#| "cancelled."
+#| "No destination address provided, forward of the message has been cancelled."
 msgid ""
-"No destination address provided, forwarding of the message has been "
-"cancelled."
+"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:1402
+#: ../src/libemail-engine/e-mail-session.c:1367
 #, 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:2444
+#: ../src/libemail-engine/e-mail-session.c:1519
+#, c-format
+msgid "Corresponding source for service with UID “%s” not found"
+msgstr ""
+
+#: ../src/libemail-engine/e-mail-session.c:2460
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Waiting for “%s”"
@@ -16271,28 +16110,28 @@ msgid "No mail transport service available"
 msgstr "HTML-virtaa ei ole saatavilla"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:616
-#: ../src/libemail-engine/mail-ops.c:706
+#: ../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:653
-#: ../src/libemail-engine/mail-ops.c:742
+#: ../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:686
 #: ../src/libemail-engine/e-mail-session-utils.c:721
-#: ../src/libemail-engine/mail-ops.c:770 ../src/libemail-engine/mail-ops.c:805
+#: ../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:710
-#: ../src/libemail-engine/mail-ops.c:794
+#: ../src/libemail-engine/mail-ops.c:796
 #, fuzzy, c-format
 #| msgid ""
 #| "Failed to append to %s: %s\n"
@@ -16305,14 +16144,15 @@ msgstr ""
 "Lisätään paikalliseen ”Lähetetyt”-kansioon."
 
 #: ../src/libemail-engine/e-mail-session-utils.c:740
-#: ../src/libemail-engine/mail-ops.c:822
+#: ../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:928
-#: ../src/libemail-engine/mail-ops.c:983 ../src/libemail-engine/mail-ops.c:1085
+#: ../src/libemail-engine/mail-ops.c:985 ../src/libemail-engine/mail-ops.c:1098
+#: ../src/mail/mail-send-recv.c:636
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
@@ -16341,9 +16181,9 @@ msgstr "Suodatetaan valittuja viestejä"
 #: ../src/libemail-engine/mail-ops.c:146
 #, c-format
 msgid ""
-"Failed to filter selected messages. One reason can be that folder location "
-"set in one or more filters is invalid. Please check your filters in "
-"Edit→Message Filters.\n"
+"Failed to filter selected messages. One reason can be that folder location set in "
+"one or more filters is invalid. Please check your filters in Edit→Message "
+"Filters.\n"
 "Original error was: %s"
 msgstr ""
 
@@ -16353,16 +16193,16 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "Noudetaan viestejä kohteesta '%s'"
 
-#: ../src/libemail-engine/mail-ops.c:736
+#: ../src/libemail-engine/mail-ops.c:738
 #, c-format
 msgid ""
-"Failed to apply outgoing filters. One reason can be that folder location set "
-"in one or more filters is invalid. Please check your filters in Edit→Message "
+"Failed to apply outgoing filters. One reason can be that folder location set in "
+"one or more filters is invalid. Please check your filters in Edit→Message "
 "Filters.\n"
 "Original error was: %s"
 msgstr ""
 
-#: ../src/libemail-engine/mail-ops.c:994
+#: ../src/libemail-engine/mail-ops.c:996
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
@@ -16370,94 +16210,92 @@ 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:1046
+#: ../src/libemail-engine/mail-ops.c:1054
 #, 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:1052
+#: ../src/libemail-engine/mail-ops.c:1060
 msgid "Cancelled."
 msgstr "Peruttu."
 
-#: ../src/libemail-engine/mail-ops.c:1054
+#: ../src/libemail-engine/mail-ops.c:1062
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../src/libemail-engine/mail-ops.c:1169
+#: ../src/libemail-engine/mail-ops.c:1184
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
 msgid "Moving messages to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1170
+#: ../src/libemail-engine/mail-ops.c:1185
 #, fuzzy, c-format
 #| msgid "Copying messages to '%s'"
 msgid "Copying messages to “%s”"
 msgstr "Kopioidaan viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1289
+#: ../src/libemail-engine/mail-ops.c:1304
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Storing folder “%s”"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../src/libemail-engine/mail-ops.c:1417
+#: ../src/libemail-engine/mail-ops.c:1432
 #, 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:1418
+#: ../src/libemail-engine/mail-ops.c:1433
 #, fuzzy, c-format
 #| msgid "Storing account '%s'"
 msgid "Storing account “%s”"
 msgstr "Tallennetaan tiliä ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1493
+#: ../src/libemail-engine/mail-ops.c:1508
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Emptying trash in “%s”"
 msgstr "Tyhjennetään roskakoria ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1585
+#: ../src/libemail-engine/mail-ops.c:1600
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Processing folder changes in “%s”"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../src/libemail-engine/mail-tools.c:68
+#: ../src/libemail-engine/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory “%s”: %s"
 msgstr ""
 
-#: ../src/libemail-engine/mail-tools.c:108
+#: ../src/libemail-engine/mail-tools.c:109
 #, c-format
 msgid "Trying to movemail a non-mbox source “%s”"
 msgstr ""
 
 #. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the 
original message.
-#: ../src/libemail-engine/mail-tools.c:193
+#: ../src/libemail-engine/mail-tools.c:198
 #, c-format
 msgid "[Fwd: %s]"
 msgstr ""
 
 #. Translators: This is a subject attribution for forwarded messages, used when there could not be used any 
subject.
 #. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
-#: ../src/libemail-engine/mail-tools.c:196
-#, fuzzy
-#| msgid "(No Subject)"
+#: ../src/libemail-engine/mail-tools.c:208
 msgid "No Subject"
-msgstr "(Ei aihetta)"
+msgstr "Ei aihetta"
 
-#: ../src/libemail-engine/mail-tools.c:271
+#: ../src/libemail-engine/mail-tools.c:283
 #, fuzzy, c-format
 #| msgid "Forwarded message - %s"
 msgid "Forwarded message — %s"
 msgstr "Välitetty viesti - %s"
 
-#: ../src/libemail-engine/mail-tools.c:273
+#: ../src/libemail-engine/mail-tools.c:285
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
@@ -16480,8 +16318,7 @@ msgstr "Päivitetään hakukansioita - '%s' - %s"
 #: ../src/libemail-engine/mail-vfolder.c:666
 #, fuzzy, c-format
 #| msgid ""
-#| "The Search Folder \"%s\" has been modified to account for the deleted "
-#| "folder\n"
+#| "The Search Folder \"%s\" has been modified to account for the deleted folder\n"
 #| "\"%s\"."
 #| msgid_plural ""
 #| "The following Search Folders\n"
@@ -16502,13 +16339,11 @@ msgstr[1] ""
 "%s on muokattu ottamaan huomioon poistettu kansio \n"
 "”%s”."
 
-#: ../src/mail/e-mail-account-manager.c:118
-#: ../src/mail/e-mail-account-manager.c:205
+#: ../src/mail/e-mail-account-manager.c:118 ../src/mail/e-mail-account-manager.c:205
 msgid "Open _Online Accounts"
 msgstr "Avaa _verkkotilit"
 
-#: ../src/mail/e-mail-account-manager.c:144
-#: ../src/mail/e-mail-account-manager.c:231
+#: ../src/mail/e-mail-account-manager.c:144 ../src/mail/e-mail-account-manager.c:231
 msgid "This account was created through the Online Accounts service."
 msgstr "Tämä tili luotiin verkkotilipalvelun kautta."
 
@@ -16519,77 +16354,74 @@ msgstr "_Palauta järjestys"
 #: ../src/mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr ""
-"Voit vetää ja tippuuttaa tilinimiä määrittääksesi niiden järjestyksen "
-"uudelleen."
+"Voit vetää ja tippuuttaa tilinimiä määrittääksesi niiden järjestyksen uudelleen."
 
 #: ../src/mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "_Oletustili"
 
-#: ../src/mail/e-mail-autoconfig.c:634
+#: ../src/mail/e-mail-autoconfig.c:648
 #, c-format
 msgid "Host: %s:%d"
 msgstr ""
 
-#: ../src/mail/e-mail-autoconfig.c:638
+#: ../src/mail/e-mail-autoconfig.c:652
 #, c-format
 msgid "User: %s"
 msgstr "Käyttäjä: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:642
+#: ../src/mail/e-mail-autoconfig.c:656
 #, fuzzy, c-format
 #| msgid "Security:"
 msgid "Security method: %s"
 msgstr "Salaus:"
 
-#: ../src/mail/e-mail-autoconfig.c:643
-#: ../src/mail/e-mail-config-summary-page.c:144
+#: ../src/mail/e-mail-autoconfig.c:657 ../src/mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:644
-#: ../src/mail/e-mail-config-summary-page.c:147
+#: ../src/mail/e-mail-autoconfig.c:658 ../src/mail/e-mail-config-summary-page.c:147
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:648
+#: ../src/mail/e-mail-autoconfig.c:662
 #, fuzzy, c-format
 #| msgid "Authentication"
 msgid "Authentication mechanism: %s"
 msgstr "Kirjautuminen"
 
-#: ../src/mail/e-mail-autoconfig.c:783
+#: ../src/mail/e-mail-autoconfig.c:821
 msgid "No email address provided"
 msgstr "Sähköpostiosoitetta ei annettu."
 
-#: ../src/mail/e-mail-autoconfig.c:792
+#: ../src/mail/e-mail-autoconfig.c:830
 msgid "Missing domain in email address"
 msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
-#: ../src/mail/e-mail-autoconfig.c:1097
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:78
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:79
+#: ../src/mail/e-mail-autoconfig.c:1167
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
 msgid "IMAP server"
 msgstr "IMAP-palvelin"
 
-#: ../src/mail/e-mail-autoconfig.c:1104
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:80
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:81
+#: ../src/mail/e-mail-autoconfig.c:1174
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
 msgid "POP3 server"
 msgstr "POP3-palvelin"
 
-#: ../src/mail/e-mail-autoconfig.c:1111
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+#: ../src/mail/e-mail-autoconfig.c:1181
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "SMTP server"
 msgstr "SMTP-palvelin"
 
-#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:812
+#: ../src/mail/e-mail-browser.c:130 ../src/shell/e-shell-window-actions.c:812
 #: ../src/shell/e-shell-window-actions.c:819
 #: ../src/shell/e-shell-window-actions.c:826
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../src/mail/e-mail-browser.c:287
+#: ../src/mail/e-mail-browser.c:288
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
@@ -16599,25 +16431,25 @@ msgid "Go _Back"
 msgstr "Siirr_y takaisin"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../src/mail/e-mail-config-assistant.c:123
+#: ../src/mail/e-mail-config-assistant.c:130
 msgid "_Skip Lookup"
 msgstr "_Ohita haku"
 
-#: ../src/mail/e-mail-config-assistant.c:718
+#: ../src/mail/e-mail-config-assistant.c:725
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: ../src/mail/e-mail-config-assistant.c:1025
+#: ../src/mail/e-mail-config-assistant.c:1032
 msgid "_Revise Details"
 msgstr "_Tarkista tiedot"
 
-#: ../src/mail/e-mail-config-auth-check.c:178
+#: ../src/mail/e-mail-config-auth-check.c:180
 #, fuzzy
 #| msgid "%s authentication failed"
 msgid "Querying authentication types..."
 msgstr "%s-tunnistautuminen epäonnistui"
 
-#: ../src/mail/e-mail-config-auth-check.c:341
+#: ../src/mail/e-mail-config-auth-check.c:393
 msgid "Check for Supported Types"
 msgstr "Tarkista tuetut tyypit"
 
@@ -16628,26 +16460,22 @@ msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Käytä oletusaikavyöhykettä"
 
-#: ../src/mail/e-mail-config-composing-page.c:118
-#: ../src/mail/mail-config.ui.h:27
+#: ../src/mail/e-mail-config-composing-page.c:118 ../src/mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../src/mail/e-mail-config-composing-page.c:120
-#: ../src/mail/mail-config.ui.h:28
+#: ../src/mail/e-mail-config-composing-page.c:120 ../src/mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Sisennetty (Outlookin tapaan)"
 
-#: ../src/mail/e-mail-config-composing-page.c:122
-#: ../src/mail/mail-config.ui.h:29
+#: ../src/mail/e-mail-config-composing-page.c:122 ../src/mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: ../src/mail/e-mail-config-composing-page.c:124
-#: ../src/mail/mail-config.ui.h:30
+#: ../src/mail/e-mail-config-composing-page.c:124 ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Älä lainaa"
@@ -16671,15 +16499,13 @@ msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 msgid "Re_ply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../src/mail/e-mail-config-composing-page.c:488
-#: ../src/mail/mail-config.ui.h:20
+#: ../src/mail/e-mail-config-composing-page.c:488 ../src/mail/mail-config.ui.h:20
 #, fuzzy
 #| msgid "Start _typing at the bottom on replying"
 msgid "Start _typing at the bottom"
 msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
-#: ../src/mail/e-mail-config-composing-page.c:495
-#: ../src/mail/mail-config.ui.h:21
+#: ../src/mail/e-mail-config-composing-page.c:495 ../src/mail/mail-config.ui.h:21
 #, fuzzy
 #| msgid "_Keep signature above the original message on replying"
 msgid "_Keep signature above the original message"
@@ -16756,7 +16582,7 @@ msgid "Archi_ve Folder:"
 msgstr "A_rkistointikansio:"
 
 #: ../src/mail/e-mail-config-defaults-page.c:785
-#: ../src/modules/mail/em-mailer-prefs.c:1407
+#: ../src/modules/mail/em-mailer-prefs.c:1413
 msgid "Choose a folder to archive messages to."
 msgstr "Valitse kansio johon viesti arkistoidaan."
 
@@ -16806,18 +16632,13 @@ msgstr "Oletusasetukset"
 
 #: ../src/mail/e-mail-config-identity-page.c:513
 msgid ""
-"Please enter your name and email address below. The “optional” fields below "
-"do not need to be filled in, unless you wish to include this information in "
-"email you send."
+"Please enter your name and email address below. The “optional” fields below do not "
+"need to be filled in, unless you wish to include this information in email you "
+"send."
 msgstr ""
-"Syötä nimesi ja sähköpostiosoitteesi alla oleviin kenttiin. Valinnaiset "
-"tiedot eivät ole pakollisia, mutta täyttämällä kyseiset kentät voit lisätä "
-"tiedot lähettämiisi sähköpostiviesteihin."
-
-#: ../src/mail/e-mail-config-identity-page.c:541
-#: ../src/mail/e-mail-config-summary-page.c:323
-msgid "Account Information"
-msgstr "Tilitiedot"
+"Syötä nimesi ja sähköpostiosoitteesi alla oleviin kenttiin. Valinnaiset tiedot "
+"eivät ole pakollisia, mutta täyttämällä kyseiset kentät voit lisätä tiedot "
+"lähettämiisi sähköpostiviesteihin."
 
 #: ../src/mail/e-mail-config-identity-page.c:579
 #: ../src/mail/e-mail-config-summary-page.c:353
@@ -16845,7 +16666,7 @@ msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
 #: ../src/mail/e-mail-config-identity-page.c:683
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
@@ -16927,10 +16748,10 @@ msgstr "%s — %s"
 #: ../src/mail/e-mail-config-security-page.c:318
 #: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:32
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:644
+#: ../src/modules/calendar/e-calendar-preferences.c:642
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:737
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../src/modules/mail/e-mail-shell-backend.c:753
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "Yleiset"
 
@@ -16951,26 +16772,22 @@ msgid "Si_gning algorithm:"
 msgstr "_Allekirjoitusalgoritmi:"
 
 #: ../src/mail/e-mail-config-security-page.c:407
-#: ../src/mail/e-mail-config-security-page.c:571
-#: ../src/mail/mail-config.ui.h:77
+#: ../src/mail/e-mail-config-security-page.c:571 ../src/mail/mail-config.ui.h:77
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../src/mail/e-mail-config-security-page.c:410
-#: ../src/mail/e-mail-config-security-page.c:574
-#: ../src/mail/mail-config.ui.h:78
+#: ../src/mail/e-mail-config-security-page.c:574 ../src/mail/mail-config.ui.h:78
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../src/mail/e-mail-config-security-page.c:413
-#: ../src/mail/e-mail-config-security-page.c:577
-#: ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:577 ../src/mail/mail-config.ui.h:79
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../src/mail/e-mail-config-security-page.c:416
-#: ../src/mail/e-mail-config-security-page.c:580
-#: ../src/mail/mail-config.ui.h:80
+#: ../src/mail/e-mail-config-security-page.c:580 ../src/mail/mail-config.ui.h:80
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -17008,8 +16825,8 @@ msgid "Select"
 msgstr "Valitse"
 
 #: ../src/mail/e-mail-config-security-page.c:546
-#: ../src/mail/e-mail-config-security-page.c:644
-#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:915
+#: ../src/mail/e-mail-config-security-page.c:644 ../src/mail/mail-dialogs.ui.h:16
+#: ../src/shell/e-shell-window-actions.c:915
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
@@ -17044,11 +16861,9 @@ msgid "Server _Type:"
 msgstr "_Palvelintyyppi:"
 
 #: ../src/mail/e-mail-config-summary-page.c:306
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
+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."
+"Alla on yhteenveto asetuksista, joiden avulla otetaan yhteys sähköpostitiliisi."
 
 #: ../src/mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
@@ -17075,12 +16890,12 @@ msgid "Server Type:"
 msgstr "Palvelintyyppi:"
 
 #: ../src/mail/e-mail-config-summary-page.c:452
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:657
 msgid "Server:"
 msgstr "Palvelin:"
 
 #: ../src/mail/e-mail-config-summary-page.c:473
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
@@ -17115,57 +16930,57 @@ msgstr "Tervetuloa"
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../src/mail/e-mail-display.c:128
+#: ../src/mail/e-mail-display.c:126
 msgid "_Add to Address Book..."
 msgstr "_Lisää osoitekirjaan..."
 
-#: ../src/mail/e-mail-display.c:135
+#: ../src/mail/e-mail-display.c:133
 msgid "_To This Address"
 msgstr "_Tähän osoitteeseen"
 
-#: ../src/mail/e-mail-display.c:142
+#: ../src/mail/e-mail-display.c:140
 msgid "_From This Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../src/mail/e-mail-display.c:149
+#: ../src/mail/e-mail-display.c:147
 msgid "Send _Reply To..."
 msgstr "Lähetä _vastaus osoitteeseen..."
 
-#: ../src/mail/e-mail-display.c:151
+#: ../src/mail/e-mail-display.c:149
 msgid "Send a reply message to this address"
 msgstr "Lähetä vastausviesti tähän osoitteeseen"
 
-#: ../src/mail/e-mail-display.c:158
+#: ../src/mail/e-mail-display.c:156
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
-#: ../src/mail/e-mail-display.c:803
+#: ../src/mail/e-mail-display.c:800
 msgid "Hid_e All"
 msgstr "_Piilota kaikki"
 
-#: ../src/mail/e-mail-display.c:810
+#: ../src/mail/e-mail-display.c:807
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../src/mail/e-mail-display.c:817
+#: ../src/mail/e-mail-display.c:814
 msgid "Vie_w All Inline"
 msgstr "_Näytä kaikki sisäkkäisesti"
 
-#: ../src/mail/e-mail-display.c:824
+#: ../src/mail/e-mail-display.c:821
 msgid "_Zoom to 100%"
 msgstr "_Zoomaa kokoon 100 %"
 
-#: ../src/mail/e-mail-display.c:826
+#: ../src/mail/e-mail-display.c:823
 msgid "Zoom the image to its natural size"
 msgstr "Palauta kuva alkuperäiseen kokoon"
 
-#: ../src/mail/e-mail-display.c:831
+#: ../src/mail/e-mail-display.c:828
 #, fuzzy
 #| msgid "Close this window"
 msgid "_Zoom to window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../src/mail/e-mail-display.c:833
+#: ../src/mail/e-mail-display.c:830
 msgid "Zoom large images to not be wider than the window width"
 msgstr ""
 
@@ -17265,14 +17080,12 @@ msgstr "Te_htävää"
 msgid "_Later"
 msgstr "_Myöhemmin"
 
-#: ../src/mail/e-mail-label-manager.c:169
-#: ../src/mail/em-folder-properties.c:842
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1245
+#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/em-folder-properties.c:842
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1243
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
-#: ../src/mail/e-mail-label-manager.c:220
-#: ../src/mail/em-folder-properties.c:869
+#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:869
 msgid "Edit Label"
 msgstr "Muokkaa merkintää"
 
@@ -17350,7 +17163,7 @@ msgstr "Otsakkeen nimi"
 msgid "Header Value"
 msgstr "Otsakkeen arvo"
 
-#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:127
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:128
 msgid "Headers"
 msgstr "Otsakkeet"
 
@@ -17359,648 +17172,648 @@ msgstr "Otsakkeet"
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../src/mail/e-mail-reader.c:479
+#: ../src/mail/e-mail-reader.c:529
 msgid "Deleting message note..."
 msgstr "Poistetaan viestin huomautus..."
 
-#: ../src/mail/e-mail-reader.c:1301 ../src/mail/e-mail-reader.c:1513
-#: ../src/mail/e-mail-reader.c:1553
+#: ../src/mail/e-mail-reader.c:1386 ../src/mail/e-mail-reader.c:1598
+#: ../src/mail/e-mail-reader.c:1638
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../src/mail/e-mail-reader.c:1559
+#: ../src/mail/e-mail-reader.c:1644
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../src/mail/e-mail-reader.c:1762
+#: ../src/mail/e-mail-reader.c:1847
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../src/mail/e-mail-reader.c:1807 ../src/mail/e-mail-reader.c:3166
+#: ../src/mail/e-mail-reader.c:1892 ../src/mail/e-mail-reader.c:3251
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Noudetaan viestiä “%s”"
 
-#: ../src/mail/e-mail-reader.c:1995
+#: ../src/mail/e-mail-reader.c:2080
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:1997
+#: ../src/mail/e-mail-reader.c:2082
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2002
+#: ../src/mail/e-mail-reader.c:2087
 msgid "_Archive..."
 msgstr "_Arkistoi..."
 
-#: ../src/mail/e-mail-reader.c:2004
+#: ../src/mail/e-mail-reader.c:2089
 #, 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:2009
+#: ../src/mail/e-mail-reader.c:2094
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2011
+#: ../src/mail/e-mail-reader.c:2096
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2016
+#: ../src/mail/e-mail-reader.c:2101
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../src/mail/e-mail-reader.c:2018
+#: ../src/mail/e-mail-reader.c:2103
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2023
+#: ../src/mail/e-mail-reader.c:2108
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../src/mail/e-mail-reader.c:2025
+#: ../src/mail/e-mail-reader.c:2110
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../src/mail/e-mail-reader.c:2030
+#: ../src/mail/e-mail-reader.c:2115
 msgid "_Add note..."
 msgstr "_Lisää huomautus..."
 
-#: ../src/mail/e-mail-reader.c:2032
+#: ../src/mail/e-mail-reader.c:2117
 #, 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:2037
+#: ../src/mail/e-mail-reader.c:2122
 msgid "Delete no_te"
 msgstr "Poista _huomautus"
 
-#: ../src/mail/e-mail-reader.c:2039
+#: ../src/mail/e-mail-reader.c:2124
 #, 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:2044
+#: ../src/mail/e-mail-reader.c:2129
 msgid "_Edit note..."
 msgstr "_Muokkaa huomautusta..."
 
-#: ../src/mail/e-mail-reader.c:2046
+#: ../src/mail/e-mail-reader.c:2131
 #, 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:2051
+#: ../src/mail/e-mail-reader.c:2136
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2053
+#: ../src/mail/e-mail-reader.c:2138
 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:2058
+#: ../src/mail/e-mail-reader.c:2143
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2060
+#: ../src/mail/e-mail-reader.c:2145
 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:2065
+#: ../src/mail/e-mail-reader.c:2150
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2067
+#: ../src/mail/e-mail-reader.c:2152
 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:2072
+#: ../src/mail/e-mail-reader.c:2157
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2074
+#: ../src/mail/e-mail-reader.c:2159
 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:2079
+#: ../src/mail/e-mail-reader.c:2164
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../src/mail/e-mail-reader.c:2081
+#: ../src/mail/e-mail-reader.c:2166
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../src/mail/e-mail-reader.c:2086
+#: ../src/mail/e-mail-reader.c:2171
 msgid "_Find in Message..."
 msgstr "_Etsi viestistä..."
 
-#: ../src/mail/e-mail-reader.c:2088
+#: ../src/mail/e-mail-reader.c:2173
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../src/mail/e-mail-reader.c:2093
+#: ../src/mail/e-mail-reader.c:2178
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../src/mail/e-mail-reader.c:2095
+#: ../src/mail/e-mail-reader.c:2180
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../src/mail/e-mail-reader.c:2100
+#: ../src/mail/e-mail-reader.c:2185
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2102
+#: ../src/mail/e-mail-reader.c:2187
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2107
+#: ../src/mail/e-mail-reader.c:2192
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../src/mail/e-mail-reader.c:2109
+#: ../src/mail/e-mail-reader.c:2194
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../src/mail/e-mail-reader.c:2114
-#: ../src/modules/mail/e-mail-attachment-handler.c:430
+#: ../src/mail/e-mail-reader.c:2199
+#: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../src/mail/e-mail-reader.c:2116 ../src/mail/e-mail-reader.c:2123
-#: ../src/modules/mail/e-mail-attachment-handler.c:432
+#: ../src/mail/e-mail-reader.c:2201 ../src/mail/e-mail-reader.c:2208
+#: ../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:2121
+#: ../src/mail/e-mail-reader.c:2206
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../src/mail/e-mail-reader.c:2128
-#: ../src/modules/mail/e-mail-attachment-handler.c:437
+#: ../src/mail/e-mail-reader.c:2213
+#: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../src/mail/e-mail-reader.c:2130 ../src/mail/e-mail-reader.c:2137
-#: ../src/modules/mail/e-mail-attachment-handler.c:439
+#: ../src/mail/e-mail-reader.c:2215 ../src/mail/e-mail-reader.c:2222
+#: ../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:2135
+#: ../src/mail/e-mail-reader.c:2220
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../src/mail/e-mail-reader.c:2142
-#: ../src/modules/mail/e-mail-attachment-handler.c:444
+#: ../src/mail/e-mail-reader.c:2227
+#: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2144 ../src/mail/e-mail-reader.c:2151
-#: ../src/modules/mail/e-mail-attachment-handler.c:446
+#: ../src/mail/e-mail-reader.c:2229 ../src/mail/e-mail-reader.c:2236
+#: ../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:2149
+#: ../src/mail/e-mail-reader.c:2234
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2156
+#: ../src/mail/e-mail-reader.c:2241
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../src/mail/e-mail-reader.c:2158
+#: ../src/mail/e-mail-reader.c:2243
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../src/mail/e-mail-reader.c:2163 ../src/mail/e-mail-reader.c:2553
+#: ../src/mail/e-mail-reader.c:2248 ../src/mail/e-mail-reader.c:2638
 msgid "_Ignore Subthread"
 msgstr "_Jätä huomiotta aliketju"
 
-#: ../src/mail/e-mail-reader.c:2165
+#: ../src/mail/e-mail-reader.c:2250
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2170 ../src/mail/e-mail-reader.c:2557
+#: ../src/mail/e-mail-reader.c:2255 ../src/mail/e-mail-reader.c:2642
 msgid "_Ignore Thread"
 msgstr "_Jätä huomiotta ketju"
 
-#: ../src/mail/e-mail-reader.c:2172
+#: ../src/mail/e-mail-reader.c:2257
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2177
+#: ../src/mail/e-mail-reader.c:2262
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../src/mail/e-mail-reader.c:2179
+#: ../src/mail/e-mail-reader.c:2264
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../src/mail/e-mail-reader.c:2184
+#: ../src/mail/e-mail-reader.c:2269
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2186
+#: ../src/mail/e-mail-reader.c:2271
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2191
+#: ../src/mail/e-mail-reader.c:2276
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2193
+#: ../src/mail/e-mail-reader.c:2278
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2198
+#: ../src/mail/e-mail-reader.c:2283
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../src/mail/e-mail-reader.c:2200
+#: ../src/mail/e-mail-reader.c:2285
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../src/mail/e-mail-reader.c:2205 ../src/mail/e-mail-reader.c:2577
+#: ../src/mail/e-mail-reader.c:2290 ../src/mail/e-mail-reader.c:2662
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../src/mail/e-mail-reader.c:2207
+#: ../src/mail/e-mail-reader.c:2292
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2212 ../src/mail/e-mail-reader.c:2581
+#: ../src/mail/e-mail-reader.c:2297 ../src/mail/e-mail-reader.c:2666
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2214
+#: ../src/mail/e-mail-reader.c:2299
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2219
+#: ../src/mail/e-mail-reader.c:2304
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../src/mail/e-mail-reader.c:2221
+#: ../src/mail/e-mail-reader.c:2306
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../src/mail/e-mail-reader.c:2226
+#: ../src/mail/e-mail-reader.c:2311
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../src/mail/e-mail-reader.c:2228
+#: ../src/mail/e-mail-reader.c:2313
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../src/mail/e-mail-reader.c:2233
-#: ../src/modules/mail/e-mail-attachment-handler.c:416
+#: ../src/mail/e-mail-reader.c:2318
+#: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../src/mail/e-mail-reader.c:2235
-#: ../src/modules/mail/e-mail-attachment-handler.c:418
+#: ../src/mail/e-mail-reader.c:2320
+#: ../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:2240
+#: ../src/mail/e-mail-reader.c:2325
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../src/mail/e-mail-reader.c:2242
+#: ../src/mail/e-mail-reader.c:2327
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../src/mail/e-mail-reader.c:2247
+#: ../src/mail/e-mail-reader.c:2332
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2249
+#: ../src/mail/e-mail-reader.c:2334
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2254
+#: ../src/mail/e-mail-reader.c:2339
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../src/mail/e-mail-reader.c:2256
+#: ../src/mail/e-mail-reader.c:2341
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2261
+#: ../src/mail/e-mail-reader.c:2346
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2263
+#: ../src/mail/e-mail-reader.c:2348
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2268
+#: ../src/mail/e-mail-reader.c:2353
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2270
+#: ../src/mail/e-mail-reader.c:2355
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2275
+#: ../src/mail/e-mail-reader.c:2360
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../src/mail/e-mail-reader.c:2277
+#: ../src/mail/e-mail-reader.c:2362
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../src/mail/e-mail-reader.c:2282
+#: ../src/mail/e-mail-reader.c:2367
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2284
+#: ../src/mail/e-mail-reader.c:2369
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2289
+#: ../src/mail/e-mail-reader.c:2374
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2291
+#: ../src/mail/e-mail-reader.c:2376
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2296
+#: ../src/mail/e-mail-reader.c:2381
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2298
+#: ../src/mail/e-mail-reader.c:2383
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2303
+#: ../src/mail/e-mail-reader.c:2388
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2305
+#: ../src/mail/e-mail-reader.c:2390
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2310
+#: ../src/mail/e-mail-reader.c:2395
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2312
+#: ../src/mail/e-mail-reader.c:2397
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2319
+#: ../src/mail/e-mail-reader.c:2404
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../src/mail/e-mail-reader.c:2326
+#: ../src/mail/e-mail-reader.c:2411
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../src/mail/e-mail-reader.c:2331
-#: ../src/modules/mail/e-mail-attachment-handler.c:451
+#: ../src/mail/e-mail-reader.c:2416
+#: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../src/mail/e-mail-reader.c:2333
-#: ../src/modules/mail/e-mail-attachment-handler.c:453
+#: ../src/mail/e-mail-reader.c:2418
+#: ../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:2338
+#: ../src/mail/e-mail-reader.c:2423
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../src/mail/e-mail-reader.c:2340
+#: ../src/mail/e-mail-reader.c:2425
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../src/mail/e-mail-reader.c:2345
+#: ../src/mail/e-mail-reader.c:2430
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../src/mail/e-mail-reader.c:2347
+#: ../src/mail/e-mail-reader.c:2432
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../src/mail/e-mail-reader.c:2352 ../src/mail/mail.error.xml.h:28
+#: ../src/mail/e-mail-reader.c:2437 ../src/mail/mail.error.xml.h:28
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
-#: ../src/modules/mail/e-mail-attachment-handler.c:395
+#: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../src/mail/e-mail-reader.c:2354
-#: ../src/modules/mail/e-mail-attachment-handler.c:397
+#: ../src/mail/e-mail-reader.c:2439
+#: ../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:2359 ../src/mail/mail.error.xml.h:26
-#: ../src/modules/mail/e-mail-attachment-handler.c:402
+#: ../src/mail/e-mail-reader.c:2444 ../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:2361
-#: ../src/modules/mail/e-mail-attachment-handler.c:404
+#: ../src/mail/e-mail-reader.c:2446
+#: ../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:2366
-#: ../src/modules/mail/e-mail-attachment-handler.c:409
+#: ../src/mail/e-mail-reader.c:2451
+#: ../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:2368
-#: ../src/modules/mail/e-mail-attachment-handler.c:411
+#: ../src/mail/e-mail-reader.c:2453
+#: ../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:2373
+#: ../src/mail/e-mail-reader.c:2458
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../src/mail/e-mail-reader.c:2375
+#: ../src/mail/e-mail-reader.c:2460
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../src/mail/e-mail-reader.c:2380
+#: ../src/mail/e-mail-reader.c:2465
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2382
+#: ../src/mail/e-mail-reader.c:2467
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2394
+#: ../src/mail/e-mail-reader.c:2479
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../src/mail/e-mail-reader.c:2396
+#: ../src/mail/e-mail-reader.c:2481
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2401
+#: ../src/mail/e-mail-reader.c:2486
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../src/mail/e-mail-reader.c:2403
+#: ../src/mail/e-mail-reader.c:2488
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../src/mail/e-mail-reader.c:2408
+#: ../src/mail/e-mail-reader.c:2493
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../src/mail/e-mail-reader.c:2410
+#: ../src/mail/e-mail-reader.c:2495
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2417
+#: ../src/mail/e-mail-reader.c:2502
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2424
+#: ../src/mail/e-mail-reader.c:2509
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../src/mail/e-mail-reader.c:2431
+#: ../src/mail/e-mail-reader.c:2516
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../src/mail/e-mail-reader.c:2438
-#: ../src/modules/mail/e-mail-attachment-handler.c:423
+#: ../src/mail/e-mail-reader.c:2523
+#: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../src/mail/e-mail-reader.c:2445
+#: ../src/mail/e-mail-reader.c:2530
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:2452
+#: ../src/mail/e-mail-reader.c:2537
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../src/mail/e-mail-reader.c:2459
+#: ../src/mail/e-mail-reader.c:2544
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../src/mail/e-mail-reader.c:2466
+#: ../src/mail/e-mail-reader.c:2551
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../src/mail/e-mail-reader.c:2473
+#: ../src/mail/e-mail-reader.c:2558
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../src/mail/e-mail-reader.c:2483
+#: ../src/mail/e-mail-reader.c:2568
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../src/mail/e-mail-reader.c:2485
+#: ../src/mail/e-mail-reader.c:2570
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../src/mail/e-mail-reader.c:2490
+#: ../src/mail/e-mail-reader.c:2575
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../src/mail/e-mail-reader.c:2492
+#: ../src/mail/e-mail-reader.c:2577
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../src/mail/e-mail-reader.c:2497
+#: ../src/mail/e-mail-reader.c:2582
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../src/mail/e-mail-reader.c:2499
+#: ../src/mail/e-mail-reader.c:2584
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../src/mail/e-mail-reader.c:2504
+#: ../src/mail/e-mail-reader.c:2589
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../src/mail/e-mail-reader.c:2506
+#: ../src/mail/e-mail-reader.c:2591
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../src/mail/e-mail-reader.c:2545
+#: ../src/mail/e-mail-reader.c:2630
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../src/mail/e-mail-reader.c:2561
+#: ../src/mail/e-mail-reader.c:2646
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../src/mail/e-mail-reader.c:2565
+#: ../src/mail/e-mail-reader.c:2650
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2569
+#: ../src/mail/e-mail-reader.c:2654
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2573
+#: ../src/mail/e-mail-reader.c:2658
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../src/mail/e-mail-reader.c:2585
+#: ../src/mail/e-mail-reader.c:2670
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../src/mail/e-mail-reader.c:2589
+#: ../src/mail/e-mail-reader.c:2674
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../src/mail/e-mail-reader.c:2633
+#: ../src/mail/e-mail-reader.c:2718
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../src/mail/e-mail-reader.c:2635
+#: ../src/mail/e-mail-reader.c:2720
 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:2641
+#: ../src/mail/e-mail-reader.c:2726
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../src/mail/e-mail-reader.c:2643
+#: ../src/mail/e-mail-reader.c:2728
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../src/mail/e-mail-reader.c:3172
+#: ../src/mail/e-mail-reader.c:3257
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../src/mail/e-mail-reader.c:4222
-#: ../src/modules/mail/e-mail-attachment-handler.c:388
+#: ../src/mail/e-mail-reader.c:4327
+#: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../src/mail/e-mail-reader.c:4223
-#: ../src/modules/mail/e-mail-attachment-handler.c:390
+#: ../src/mail/e-mail-reader.c:4328
+#: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
 
@@ -18008,52 +17821,52 @@ msgstr "Välitä edelleen valitut viestit jollekulle"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:4242
+#: ../src/mail/e-mail-reader.c:4347
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:4243
+#: ../src/mail/e-mail-reader.c:4348
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:4309 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:4414 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/mail/e-mail-reader.c:4321
+#: ../src/mail/e-mail-reader.c:4426
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../src/mail/e-mail-reader.c:4325
+#: ../src/mail/e-mail-reader.c:4430
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../src/mail/e-mail-reader.c:4334 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:4439 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../src/mail/e-mail-reader.c:5407
+#: ../src/mail/e-mail-reader.c:5502
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:5409
+#: ../src/mail/e-mail-reader.c:5504
 #, c-format
 msgid "Allow remote content for %s"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:5426
+#: ../src/mail/e-mail-reader.c:5521
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Salli etäsisältö lähettäjältä %s"
 
-#: ../src/mail/e-mail-reader.c:5443
+#: ../src/mail/e-mail-reader.c:5538
 msgid "Do not show this message again"
 msgstr "Älä näytä tätä viestiä uudestaan"
 
-#: ../src/mail/e-mail-reader.c:5491
+#: ../src/mail/e-mail-reader.c:5590
 msgid "Load remote content"
 msgstr "Lataa etäsisältö"
 
@@ -18099,23 +17912,18 @@ msgstr "Tulostetaan"
 #: ../src/mail/e-mail-reader-utils.c:1836
 #, fuzzy, c-format
 #| msgid ""
-#| "Folder '%s' contains %u duplicate message. Are you sure you want to "
-#| "delete it?"
+#| "Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
 #| msgid_plural ""
-#| "Folder '%s' contains %u duplicate messages. Are you sure you want to "
-#| "delete them?"
+#| "Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+#| "them?"
 msgid ""
-"Folder “%s” contains %u duplicate message. Are you sure you want to delete "
-"it?"
+"Folder “%s” contains %u duplicate message. Are you sure you want to delete it?"
 msgid_plural ""
-"Folder “%s” contains %u duplicate messages. Are you sure you want to delete "
-"them?"
+"Folder “%s” contains %u duplicate messages. Are you sure you want to delete them?"
 msgstr[0] ""
-"Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa "
-"sen?"
+"Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa sen?"
 msgstr[1] ""
-"Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa "
-"sen?"
+"Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa sen?"
 
 #: ../src/mail/e-mail-reader-utils.c:2854
 msgid "Save Message"
@@ -18134,7 +17942,7 @@ msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../src/mail/e-mail-reader-utils.c:3248
+#: ../src/mail/e-mail-reader-utils.c:3271
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
@@ -18146,12 +17954,12 @@ msgstr "Viestissä ei ole tekstisisältöä."
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
 
-#: ../src/mail/e-mail-ui-session.c:821
+#: ../src/mail/e-mail-ui-session.c:820
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s-tunnistautuminen epäonnistui"
 
-#: ../src/mail/e-mail-ui-session.c:871
+#: ../src/mail/e-mail-ui-session.c:870
 #, c-format
 msgid "No data source found for UID “%s”"
 msgstr ""
@@ -18161,30 +17969,25 @@ msgstr ""
 #, fuzzy, c-format
 #| msgid "Are you sure you want to send a message with only BCC recipients?"
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
-msgid_plural ""
-"Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural "Are you sure you want to send a message with %d To and CC recipients?"
 msgstr[0] ""
-"Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
-"(Bcc)?"
+"Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia (Bcc)?"
 msgstr[1] ""
-"Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
-"(Bcc)?"
+"Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia (Bcc)?"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
 #: ../src/mail/em-composer-utils.c:394
 #, c-format
 msgid ""
-"You are trying to send a message to %d recipients in To and CC fields. This "
-"would result in all recipients seeing the email addresses of each other. In "
-"some cases this behaviour is undesired, especially if they do not know each "
-"other or if privacy is a concern. Consider adding recipients to the BCC "
-"field instead."
+"You are trying to send a message to %d recipients in To and CC fields. This would "
+"result in all recipients seeing the email addresses of each other. In some cases "
+"this behaviour is undesired, especially if they do not know each other or if "
+"privacy is a concern. Consider adding recipients to the BCC field instead."
 msgid_plural ""
-"You are trying to send a message to %d recipients in To and CC fields. This "
-"would result in all recipients seeing the email addresses of each other. In "
-"some cases this behaviour is undesired, especially if they do not know each "
-"other or if privacy is a concern. Consider adding recipients to the BCC "
-"field instead."
+"You are trying to send a message to %d recipients in To and CC fields. This would "
+"result in all recipients seeing the email addresses of each other. In some cases "
+"this behaviour is undesired, especially if they do not know each other or if "
+"privacy is a concern. Consider adding recipients to the BCC field instead."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -18198,7 +18001,7 @@ msgstr "Odotetaan liitteiden latautumista..."
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:1845
+#: ../src/mail/em-composer-utils.c:1991
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -18206,31 +18009,32 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../src/mail/em-composer-utils.c:1851
+#: ../src/mail/em-composer-utils.c:1997
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../src/mail/em-composer-utils.c:1856
+#: ../src/mail/em-composer-utils.c:2002
 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.
-#: ../src/mail/em-composer-utils.c:2562
+#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
+#: ../src/mail/em-composer-utils.c:2711
 #, fuzzy, c-format
 #| msgid "URL: %s"
+msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "URL: %s"
 
-#: ../src/mail/em-composer-utils.c:3103
+#: ../src/mail/em-composer-utils.c:3257
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3581
+#: ../src/mail/em-composer-utils.c:3741
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../src/mail/em-composer-utils.c:3586
+#: ../src/mail/em-composer-utils.c:3746
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
@@ -18238,12 +18042,28 @@ msgstr "Valitse kansio johon viesti postitetaan:"
 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
+#, fuzzy
+#| msgid "A_ngry"
+msgctxt "mail-filter-rule"
+msgid "Any"
+msgstr "_Vihainen"
+
+#: ../src/mail/em-filter-rule.c:1038
+msgid "Rul_e type:"
+msgstr "Säänn_ön tyyppi:"
+
+#: ../src/mail/em-filter-rule.c:1056
+msgid "_For Account:"
+msgstr "_Tili:"
+
 #. and now for the action area
-#: ../src/mail/em-filter-rule.c:595
+#: ../src/mail/em-filter-rule.c:1068
 msgid "Then"
 msgstr "sitten"
 
-#: ../src/mail/em-filter-rule.c:660
+#: ../src/mail/em-filter-rule.c:1141
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
@@ -18340,7 +18160,7 @@ msgstr "Merkintä"
 msgid "AutoArchive"
 msgstr "Automaattinen arkistointi"
 
-#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:120
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:121
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Merkinnät"
@@ -18361,7 +18181,7 @@ msgstr "<Valitse kansio tästä>"
 msgid "Create a new folder"
 msgstr "Luo uusi kansio"
 
-#: ../src/mail/em-folder-tree.c:683
+#: ../src/mail/em-folder-tree.c:682
 msgid "Folder names cannot contain “/”"
 msgstr "Kansion nimi ei voi sisältää merkkiä “/”"
 
@@ -18383,157 +18203,181 @@ 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:877
+#: ../src/mail/em-folder-tree.c:876
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1742
+#: ../src/mail/em-folder-tree.c:1731
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/em-folder-utils.c:83
+#: ../src/mail/em-folder-tree.c:2279
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85
+#: ../src/mail/em-folder-tree.c:2282
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2509
+#: ../src/mail/em-folder-tree.c:2289 ../src/mail/message-list.c:2595
 #, 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:2511
+#: ../src/mail/em-folder-tree.c:2293 ../src/mail/message-list.c:2597
 #, 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:2312
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 
 #. UNMATCHED is always last.
-#: ../src/mail/em-folder-tree-model.c:445
-#: ../src/mail/em-folder-tree-model.c:447
+#: ../src/mail/em-folder-tree-model.c:445 ../src/mail/em-folder-tree-model.c:447
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../src/mail/em-folder-tree-model.c:1326
-#: ../src/mail/em-folder-tree-model.c:1702
+#: ../src/mail/em-folder-tree-model.c:1326 ../src/mail/em-folder-tree-model.c:1703
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../src/mail/em-folder-utils.c:502
+#: ../src/mail/em-folder-utils.c:111
+#, c-format
+#| msgid "Removing folder “%s”"
+msgid "Moving folder “%s”"
+msgstr "Siirretään kansio “%s”"
+
+#: ../src/mail/em-folder-utils.c:113
+#, c-format
+#| msgid "Storing folder '%s'"
+msgid "Copying folder “%s”"
+msgstr "Kopioidaan kansio “%s”"
+
+#: ../src/mail/em-folder-utils.c:252
+#, c-format
+#| msgid "Removing folder “%s”"
+msgid "Moving folder “%s” (%d/%d)"
+msgstr "Siirretään kansio “%s” (%d/%d)"
+
+#: ../src/mail/em-folder-utils.c:252
+#, c-format
+#| msgid "Storing folder '%s'"
+msgid "Copying folder “%s” (%d/%d)"
+msgstr "Kopioidaan kansio “%s” (%d/%d)"
+
+#: ../src/mail/em-folder-utils.c:569
 msgid "Move Folder To"
 msgstr "Siirrä kansio kohteeseen"
 
-#: ../src/mail/em-folder-utils.c:502
+#: ../src/mail/em-folder-utils.c:569
 msgid "Copy Folder To"
 msgstr "Kopioi kansio kohteeseen"
 
-#: ../src/mail/em-subscription-editor.c:855
+#: ../src/mail/em-subscription-editor.c:813
 msgid "_Subscribe"
 msgstr "_Tilaa"
 
-#: ../src/mail/em-subscription-editor.c:864
+#: ../src/mail/em-subscription-editor.c:822
 msgid "Su_bscribe To Shown"
 msgstr "_Tilaa näytetyt"
 
-#: ../src/mail/em-subscription-editor.c:872
+#: ../src/mail/em-subscription-editor.c:830
 msgid "Subscribe To _All"
 msgstr "Tilaa kaikk_i"
 
-#: ../src/mail/em-subscription-editor.c:970
-#: ../src/mail/em-subscription-editor.c:1914 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/mail/em-subscription-editor.c:935 ../src/mail/em-subscription-editor.c:1886
+#: ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../src/mail/em-subscription-editor.c:979
+#: ../src/mail/em-subscription-editor.c:944
 #, fuzzy
 msgid "Unsu_bscribe From Hidden"
 msgstr "Peru kansioiden tilauksia"
 
-#: ../src/mail/em-subscription-editor.c:987
+#: ../src/mail/em-subscription-editor.c:952
 msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
-#: ../src/mail/em-subscription-editor.c:1339
-#: ../src/modules/mail/e-mail-shell-view-private.c:1003
+#: ../src/mail/em-subscription-editor.c:1311
+#: ../src/modules/mail/e-mail-shell-view-private.c:936
+#: ../src/modules/mail/e-mail-shell-view-private.c:968
+#: ../src/modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../src/mail/em-subscription-editor.c:1343
-#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/mail/em-subscription-editor.c:1315
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../src/mail/em-subscription-editor.c:1755
+#: ../src/mail/em-subscription-editor.c:1727
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1790
+#: ../src/mail/em-subscription-editor.c:1762
 msgid "_Account:"
 msgstr "_Tili:"
 
-#: ../src/mail/em-subscription-editor.c:1803
+#: ../src/mail/em-subscription-editor.c:1775
 msgid "Clear Search"
 msgstr "Tyhjennä haku"
 
-#: ../src/mail/em-subscription-editor.c:1820
+#: ../src/mail/em-subscription-editor.c:1792
 msgid "Sho_w items that contain:"
 msgstr "_Näytä kohteet, jotka sisältävät:"
 
-#: ../src/mail/em-subscription-editor.c:1867
+#: ../src/mail/em-subscription-editor.c:1839
 msgid "Subscribe to the selected folder"
 msgstr "Tilaa valittu kansio"
 
-#: ../src/mail/em-subscription-editor.c:1868
+#: ../src/mail/em-subscription-editor.c:1840
 msgid "Su_bscribe"
 msgstr "Tila_a"
 
-#: ../src/mail/em-subscription-editor.c:1913
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
+#: ../src/mail/em-subscription-editor.c:1885
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
-#: ../src/mail/em-subscription-editor.c:1953
+#: ../src/mail/em-subscription-editor.c:1925
 msgid "Collapse all folders"
 msgstr "Pienennä kaikki kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1954
+#: ../src/mail/em-subscription-editor.c:1926
 msgid "C_ollapse All"
 msgstr "Pienennä kaikki"
 
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1936
 msgid "Expand all folders"
 msgstr "Laajenna kaikki kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1965
+#: ../src/mail/em-subscription-editor.c:1937
 msgid "E_xpand All"
 msgstr "_Laajenna kaikki"
 
-#: ../src/mail/em-subscription-editor.c:1975
+#: ../src/mail/em-subscription-editor.c:1947
 msgid "Refresh the folder list"
 msgstr "Päivitä kansioluettelo"
 
-#: ../src/mail/em-subscription-editor.c:1987
+#: ../src/mail/em-subscription-editor.c:1959
 msgid "Stop the current operation"
 msgstr "Keskeytä nykyinen operaatio"
 
-#: ../src/mail/em-subscription-editor.c:1988
+#: ../src/mail/em-subscription-editor.c:1960
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
 msgid "_Stop"
 msgstr "_Pysäytä"
@@ -18553,12 +18397,26 @@ msgstr[1] "Haluatko varmasti avata %d viestiä kerralla?"
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../src/mail/em-utils.c:950
+#: ../src/mail/em-utils.c:1004
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
-#: ../src/mail/em-utils.c:1764
+#. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 
'reply-attribution' translation context should translate into the same string.
+#: ../src/mail/em-utils.c:1557
+#, fuzzy
+#| msgid "Redo"
+msgctxt "reply-attribution"
+msgid "Re"
+msgstr "Tee uudelleen"
+
+#. Translators: This is a reply attribution separator in the message reply subject. This should match the 
':' in 'Re: %s' in the 'reply-attribution' translation context.
+#: ../src/mail/em-utils.c:1560
+msgctxt "reply-attribution"
+msgid ":"
+msgstr ""
+
+#: ../src/mail/em-utils.c:1846
 msgid "Deleting old messages"
 msgstr "Poistetaan vanhoja viestejä"
 
@@ -18751,7 +18609,7 @@ msgstr "Tärkeä"
 msgid "Read"
 msgstr "Luettu"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:134
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:135
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Roskaposti"
@@ -18963,7 +18821,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Tuo sähköpostit ja yhteystiedot KMailista."
 
 #: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1034
+#: ../src/modules/mail/e-mail-shell-view-private.c:1043
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -19030,11 +18888,10 @@ msgstr "Lisää suodatussääntö"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../src/mail/mail-autofilter.c:509
+#: ../src/mail/mail-autofilter.c:551
 #, fuzzy, c-format
 #| msgid ""
-#| "The filter rule \"%s\" has been modified to account for the deleted "
-#| "folder\n"
+#| "The filter rule \"%s\" has been modified to account for the deleted folder\n"
 #| "\"%s\"."
 #| msgid_plural ""
 #| "The following filter rules\n"
@@ -19055,6 +18912,12 @@ msgstr[1] ""
 "%s on muokattu ottamaan huomioon poistettu kansio\n"
 "”%s”."
 
+#: ../src/mail/mail-autofilter.c:559
+#, fuzzy
+#| msgid "Message Filters"
+msgid "Open Message Filters"
+msgstr "Viestisuodattimet"
+
 #: ../src/mail/mail-config.ui.h:1
 #, fuzzy
 msgid "Set custom junk header"
@@ -19137,8 +19000,8 @@ msgstr "Ryhmävastaus menee vain sä_hköpostilistalle, jos mahdollista"
 #: ../src/mail/mail-config.ui.h:25
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
-"Allekirjoita viestit _digitaalisesti alkuperäisen viestin ollessa "
-"allekirjoitettu (PGP tai S/MIME)"
+"Allekirjoita viestit _digitaalisesti alkuperäisen viestin ollessa allekirjoitettu "
+"(PGP tai S/MIME)"
 
 #: ../src/mail/mail-config.ui.h:26
 msgid "_Wrap quoted text in replies"
@@ -19170,8 +19033,8 @@ msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
-"kielille sinulla on sanastoja asennettuna."
+"Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille kielille "
+"sinulla on sanastoja asennettuna."
 
 #: ../src/mail/mail-config.ui.h:39
 msgid "Check spelling while I _type"
@@ -19179,11 +19042,11 @@ msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
 #: ../src/mail/mail-config.ui.h:41
 msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
+"To help avoid email accidents and embarrassments, ask for confirmation before "
+"taking the following checkmarked actions:"
 msgstr ""
-"Välttääksesi vahinkoja ja noloja tilanteita, kysy vahvistus ennen "
-"seuraavissa tilanteissa etenemistä:"
+"Välttääksesi vahinkoja ja noloja tilanteita, kysy vahvistus ennen seuraavissa "
+"tilanteissa etenemistä:"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../src/mail/mail-config.ui.h:43
@@ -19217,8 +19080,7 @@ msgstr "Lähettäessä vastausta suurelle määrälle _vastaanottajia"
 #, fuzzy
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
-"Kysy vahvistus, kun sähköpostilista ohjaa yksityisen vastauksen takaisin "
-"listalle"
+"Kysy vahvistus, kun sähköpostilista ohjaa yksityisen vastauksen takaisin listalle"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../src/mail/mail-config.ui.h:55
@@ -19264,15 +19126,15 @@ msgstr "Lähetystilin ohitukset"
 
 #: ../src/mail/mail-config.ui.h:73
 msgid ""
-"Assign which account should be used as a send account for respective folders "
-"or recipients, an override for usual send account detection. List of "
-"recipients can contain partial addresses or names. The name and the address "
-"parts are compared separately."
+"Assign which account should be used as a send account for respective folders or "
+"recipients, an override for usual send account detection. List of recipients can "
+"contain partial addresses or names. The name and the address parts are compared "
+"separately."
 msgstr ""
 "Määritä, mitä tiliä käytetään lähettämiseen tiettyjen kansioiden tai "
 "vastaanottajien suhteen. Tämä asetus ohittaa tavallisen lähetystilin "
-"havaitsemisen. Vastaanottajaluettelo voi sisältää vaillinaisia osoitteita "
-"tai nimiä. Nimi- ja osoitekohtia vertaillaan erikseen."
+"havaitsemisen. Vastaanottajaluettelo voi sisältää vaillinaisia osoitteita tai "
+"nimiä. Nimi- ja osoitekohtia vertaillaan erikseen."
 
 #: ../src/mail/mail-config.ui.h:74
 msgid "_Folder override has precedence over Recipient override"
@@ -19335,7 +19197,7 @@ msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen käytetty väri"
 
 #: ../src/mail/mail-config.ui.h:95
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Pick a color"
 msgstr "Valitse väri"
 
@@ -19374,127 +19236,133 @@ msgid "Confirm when emptying a _Junk folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
 #: ../src/mail/mail-config.ui.h:104
+#, 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:105
 msgid "Archive Mail"
 msgstr "Arkistoi viestit"
 
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:106
 msgid "Archive folder to use for On This Computer messages"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:107
 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:108
+#: ../src/mail/mail-config.ui.h:109
 msgid "_Show animated images"
 msgstr "N_äytä animoidut kuvat"
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:110
 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:110
+#: ../src/mail/mail-config.ui.h:111
 msgid "Loading Remote Content"
 msgstr "Etäsisällön lataaminen"
 
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:112
 msgid "_Never load remote content from the Internet"
 msgstr "_Älä koskaan lataa etäsisältöä verkosta"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:113
 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:113
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Always load remote content from the Internet"
 msgstr "Lataa _aina etäsisältö verkosta"
 
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:115
 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:115
+#: ../src/mail/mail-config.ui.h:116
 msgid "Add"
 msgstr "Lisää"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:117
 msgid "Remove"
 msgstr "Poista"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:118
 msgid "Allow for sites:"
 msgstr "Salli sivustoille:"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:119
 msgid "Allow for senders:"
 msgstr "Salli lähettäjille:"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:120
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:122
 msgid "Sender Photograph"
 msgstr "Lähettäjän valokuva"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:123
 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:123
+#: ../src/mail/mail-config.ui.h:124
 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:124
+#: ../src/mail/mail-config.ui.h:125
 msgid "Displayed Message Headers"
 msgstr "Näytettävät viestin otsakkeet"
 
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:126
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:127
 #: ../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:128
+#: ../src/mail/mail-config.ui.h:129
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:130
 msgid "_Delete junk messages"
 msgstr "Poista roskapostivi_estit"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:131
 msgid "Junk Test Options"
 msgstr "Roskapostitestaus"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:132
 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:132
+#: ../src/mail/mail-config.ui.h:133
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:134
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:136
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
 msgid "No encryption"
 msgstr "Ei salausta"
 
-#: ../src/mail/mail-config.ui.h:136
+#: ../src/mail/mail-config.ui.h:137
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
-#: ../src/mail/mail-config.ui.h:137
+#: ../src/mail/mail-config.ui.h:138
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
@@ -19588,8 +19456,8 @@ msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
-"Palvelin ei tue tämän tyyppistä tunnistautumista eikä välttämättä tue "
-"lainkaan tunnistautumista."
+"Palvelin ei tue tämän tyyppistä tunnistautumista eikä välttämättä tue lainkaan "
+"tunnistautumista."
 
 #: ../src/mail/mail.error.xml.h:3
 msgid "Your login to your server “{0}” as “{0}” failed."
@@ -19600,9 +19468,8 @@ msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"Tarkista, että salasanasi on kirjoitettu oikein. Muista että monissa "
-"salasanoissa isot ja pienet kirjaimet ovat eri asia. Tarkista myös ettei "
-"CapsLock ole päällä."
+"Tarkista, että salasanasi on kirjoitettu oikein. Muista että monissa salasanoissa "
+"isot ja pienet kirjaimet ovat eri asia. Tarkista myös ettei CapsLock ole päällä."
 
 #: ../src/mail/mail.error.xml.h:5
 msgid "Are you sure you want to send a message in HTML format?"
@@ -19610,8 +19477,8 @@ msgstr "Haluatko varmasti lähettää viestin HTML-muodossa?"
 
 #: ../src/mail/mail.error.xml.h:6
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML "
+"email:\n"
 "{0}"
 msgstr ""
 "Varmista, että seuraavat vastaanottajat haluavat vastaanottaa HTML-muotoista "
@@ -19624,8 +19491,8 @@ msgstr "Haluatko varmasti lähettää ilman aihetta?"
 
 #: ../src/mail/mail.error.xml.h:10
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"Adding a meaningful Subject line to your messages will give your recipients an "
+"idea of what your mail is about."
 msgstr ""
 "Merkityksellisen aihe-kentän lisääminen viesteihisi helpottaa vastaanottajaa "
 "ymmärtämään, mistä viestissä on kyse."
@@ -19633,17 +19500,15 @@ msgstr ""
 #: ../src/mail/mail.error.xml.h:11
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
-"Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
-"(Bcc)?"
+"Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia (Bcc)?"
 
 #: ../src/mail/mail.error.xml.h:12
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC "
+"recipients. This header, if added, will list all of your recipients in your "
+"message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 "Luettelo yhteystiedoista, jolle olet lähettämässä viestiä, on asetettu "
 "piilottamaan vastaanottajat.\n"
@@ -19655,10 +19520,9 @@ msgstr ""
 
 #: ../src/mail/mail.error.xml.h:15
 msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+"Many email systems add an Apparently-To header to messages that only have BCC "
+"recipients. This header, if added, will list all of your recipients to your "
+"message anyway. To avoid this, you should add at least one To: or CC: recipient."
 msgstr ""
 "Monet sähköpostijärjestelmän lisäävät viesteihin 'Apparently-To' otsakkeen "
 "viesteihin, joissa on vain BCC vastaanottajia. Jos tämä otsake lisätään, se "
@@ -19674,8 +19538,7 @@ msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
-"Seuraavaa vastaanottajaa ei tunnistettu kelvolliseksi "
-"sähköpostiosoitteeksi:\n"
+"Seuraavaa vastaanottajaa ei tunnistettu kelvolliseksi sähköpostiosoitteeksi:\n"
 "{0}"
 
 #: ../src/mail/mail.error.xml.h:20
@@ -19687,8 +19550,7 @@ msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
-"Seuraavia vastaanottajia ei tunnistettu kelvollisiksi "
-"sähköpostiosoitteiksi:\n"
+"Seuraavia vastaanottajia ei tunnistettu kelvollisiksi sähköpostiosoitteiksi:\n"
 "{0}"
 
 #: ../src/mail/mail.error.xml.h:23
@@ -19697,13 +19559,12 @@ msgstr "Lähetetäänkö yksityinen vastaus?"
 
 #: ../src/mail/mail.error.xml.h:24
 msgid ""
-"You are replying privately to a message which arrived via a mailing list, "
-"but the list is trying to redirect your reply to go back to the list. Are "
-"you sure you want to proceed?"
+"You are replying privately to a message which arrived via a mailing list, but the "
+"list is trying to redirect your reply to go back to the list. Are you sure you "
+"want to proceed?"
 msgstr ""
 "Olet vastaamassa yksityisesti viestiin, joka saapui sähköpostilistalta. "
-"Sähköpostilista yrittää ohjata vastaustasi takaisin listalle. Haluatko "
-"jatkaa?"
+"Sähköpostilista yrittää ohjata vastaustasi takaisin listalle. Haluatko jatkaa?"
 
 #: ../src/mail/mail.error.xml.h:25
 msgid "Reply _Privately"
@@ -19715,9 +19576,8 @@ msgid ""
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 msgstr ""
-"Olet vastaamassa viestiin, joka saapui sähköpostilistalta, mutta olet "
-"vastaamassa yksityisesti lähettäjälle etkä sähköpostilistalle. Haluatko "
-"jatkaa?"
+"Olet vastaamassa viestiin, joka saapui sähköpostilistalta, mutta olet vastaamassa "
+"yksityisesti lähettäjälle etkä sähköpostilistalle. Haluatko jatkaa?"
 
 #: ../src/mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
@@ -19725,25 +19585,23 @@ msgstr "Lähetetäänkö vastaus kaikille vastaanottajille?"
 
 #: ../src/mail/mail.error.xml.h:30
 msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
+"You are replying to a message which was sent to many recipients. Are you sure you "
+"want to reply to ALL of them?"
 msgstr ""
-"Olet vastaamassa viestiin, joka lähetettiin useille vastaanottajille. "
-"Haluatko vastata kaikille heille?"
+"Olet vastaamassa viestiin, joka lähetettiin useille vastaanottajille. Haluatko "
+"vastata kaikille heille?"
 
 #: ../src/mail/mail.error.xml.h:31
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Viestiä ei voi lähettää, koska et ole määritellyt vastaanottajia"
 
 #: ../src/mail/mail.error.xml.h:32
 msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+"Please enter a valid email address in the To: field. You can search for email "
+"addresses by clicking on the To: button next to the entry box."
 msgstr ""
 "Syötä kelvollinen sähköpostiosoite Vastaanottaja: kenttään. Voit etsiä "
-"sähköpostiosoitteita napsauttamalla Vastaanottaja: -painiketta kentän "
-"vieressä."
+"sähköpostiosoitteita napsauttamalla Vastaanottaja: -painiketta kentän vieressä."
 
 #: ../src/mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
@@ -19752,16 +19610,16 @@ msgstr "Käytä oletuskansiota luonnoksille?"
 #: ../src/mail/mail.error.xml.h:34
 #, fuzzy
 #| msgid ""
-#| "Unable to open the drafts folder for this account. Use the system drafts "
-#| "folder instead?"
+#| "Unable to open the drafts folder for this account. Use the system drafts folder "
+#| "instead?"
 msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?\n"
+"Unable to open the drafts folder for this account. Use the system drafts folder "
+"instead?\n"
 "\n"
 "The reported error was “{0}”."
 msgstr ""
-"Tämän sähköpostitilin luonnoskansiota ei voi avata. Haluatko käyttää "
-"luonnosten oletuskansiota sen sijaan?"
+"Tämän sähköpostitilin luonnoskansiota ei voi avata. Haluatko käyttää luonnosten "
+"oletuskansiota sen sijaan?"
 
 #: ../src/mail/mail.error.xml.h:37
 msgid "Use _Default"
@@ -19769,8 +19627,8 @@ msgstr "Käytä _oletuksia"
 
 #: ../src/mail/mail.error.xml.h:38
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder “{0}”?"
+"Are you sure you want to permanently remove all the deleted messages in folder "
+"“{0}”?"
 msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kansiosta “{0}”?"
 
 #: ../src/mail/mail.error.xml.h:39
@@ -19785,11 +19643,10 @@ msgstr "_Poista pysyvästi"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr ""
-"Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
+msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1629
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -19803,13 +19660,11 @@ msgstr "_Avaa viestit"
 
 #: ../src/mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
-"Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
+msgstr "Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
 
 #: ../src/mail/mail.error.xml.h:46
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+"If you quit, these messages will not be sent until Evolution is started again."
 msgstr ""
 "Jos suljet, näitä viestejä ei lähetetä ennen kuin Evolution on käynnistetty "
 "uudestaan."
@@ -19867,11 +19722,11 @@ msgstr "Järjestelmäkansiota “{0}” ei voi poistaa."
 
 #: ../src/mail/mail.error.xml.h:62
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot be "
+"renamed, moved, or deleted."
 msgstr ""
-"Järjestelmäkansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
-"voi nimetä uudestaan, siirtää tai poistaa."
+"Järjestelmäkansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä voi "
+"nimetä uudestaan, siirtää tai poistaa."
 
 #: ../src/mail/mail.error.xml.h:63
 #, fuzzy
@@ -19893,8 +19748,8 @@ msgstr "Poistetaanko todella kansio “{0}” ja kaikki sen alikansiot?"
 
 #: ../src/mail/mail.error.xml.h:68
 msgid ""
-"If you delete the folder, all of its contents and its subfolders’ contents "
-"will be deleted permanently."
+"If you delete the folder, all of its contents and its subfolders’ contents will be "
+"deleted permanently."
 msgstr ""
 "Jos poistat kansion, kaikki sen sisältö ja alikansiot sisältöineen poistuvat "
 "pysyvästi."
@@ -19907,8 +19762,8 @@ msgstr "Haluatko varmasti poistaa kansion ”{0}”?"
 
 #: ../src/mail/mail.error.xml.h:71
 msgid ""
-"If you unsubscribe the folder, it might not be visible in the Evolution, "
-"while still being available on the server. You can re-subscribe in "
+"If you unsubscribe the folder, it might not be visible in the Evolution, while "
+"still being available on the server. You can re-subscribe in "
 "Folder→Subscriptions... menu."
 msgstr ""
 
@@ -19921,8 +19776,7 @@ msgid "Really delete folder “{0}”?"
 msgstr "Haluatko varmasti poistaa kansion “{0}”?"
 
 #: ../src/mail/mail.error.xml.h:75
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
+msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Jos poistat kansion, kaikki sen sisältö menetetään pysyvästi."
 
 #: ../src/mail/mail.error.xml.h:76
@@ -19933,11 +19787,11 @@ msgstr "Nämä viestit eivät ole kopioita."
 #, fuzzy
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
-"Folder will delete the actual messages from the folder or folders in which "
-"they physically reside. Do you really want to delete these messages?"
+"Folder will delete the actual messages from the folder or folders in which they "
+"physically reside. Do you really want to delete these messages?"
 msgstr ""
-"Varoitus: viestin poisto hakunäkymästä poistaa varsinaisen viestin "
-"alkuperäisestä kansiosta, ei vain hakutuloksista.\n"
+"Varoitus: viestin poisto hakunäkymästä poistaa varsinaisen viestin alkuperäisestä "
+"kansiosta, ei vain hakutuloksista.\n"
 "Haluatko varmasti poistaa viestin?"
 
 #: ../src/mail/mail.error.xml.h:78
@@ -20005,15 +19859,13 @@ msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
-"Jos jatkat, tilin tiedot ja kaikki siihen liittyvä välimuistitieto "
-"poistetaan pysyvästi."
+"Jos jatkat, tilin tiedot ja kaikki siihen liittyvä välimuistitieto poistetaan "
+"pysyvästi."
 
 #: ../src/mail/mail.error.xml.h:94
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
-"Haluatko varmasti poistaa tämän tilin käytöstä ja poistaa kaikki sen "
-"välimuistit?"
+"Haluatko varmasti poistaa tämän tilin käytöstä ja poistaa kaikki sen välimuistit?"
 
 #: ../src/mail/mail.error.xml.h:95
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -20078,8 +19930,8 @@ msgid ""
 "folders, all remote folders, or both."
 msgstr ""
 "Ainakin yksi lähdekansio täytyy olla valittuna.\n"
-"Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai "
-"kaikki etä- ja paikalliset kansiot."
+"Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai kaikki "
+"etä- ja paikalliset kansiot."
 
 #: ../src/mail/mail.error.xml.h:112
 msgid "Problem migrating old mail folder “{0}”."
@@ -20090,13 +19942,11 @@ msgstr "Virhe muunnettaessa vanhaa sähköpostikansiota “{0}”."
 #| msgid ""
 #| "A non-empty folder at \"{1}\" already exists.\n"
 #| "\n"
-#| "You can choose to ignore this folder, overwrite or append its contents, "
-#| "or quit."
+#| "You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgid ""
 "A non-empty folder at “{1}” already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "Kansio \"{1}\" on jo olemassa ja sisältää tietoja.\n"
 "\n"
@@ -20116,13 +19966,13 @@ msgstr ""
 
 #: ../src/mail/mail.error.xml.h:120
 msgid ""
-"Evolution’s local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
+"Evolution’s local mail format has changed from mbox to Maildir. Your local mail "
+"must be migrated to the new format before Evolution can proceed. Do you want to "
+"migrate now?\n"
 "\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+"An mbox account will be created to preserve the old mbox folders. You can delete "
+"the account after ensuring the data is safely migrated. Please make sure there is "
+"enough disk space if you choose to migrate now."
 msgstr ""
 
 #: ../src/mail/mail.error.xml.h:123
@@ -20141,14 +19991,14 @@ msgstr "Lisenssitiedostoa ei voi avata."
 #: ../src/mail/mail.error.xml.h:126
 #, fuzzy
 #| msgid ""
-#| "Cannot read the license file \"{0}\", due to an installation problem. You "
-#| "will not be able to use this provider until you can accept its license."
+#| "Cannot read the license file \"{0}\", due to an installation problem. You will "
+#| "not be able to use this provider until you can accept its license."
 msgid ""
-"Cannot read the license file “{0}”, due to an installation problem. You will "
-"not be able to use this provider until you can accept its license."
+"Cannot read the license file “{0}”, due to an installation problem. You will not "
+"be able to use this provider until you can accept its license."
 msgstr ""
-"Lisenssitiedostoa \"{0}\" ei voi lukea asennusongelman takia. Et voi käyttää "
-"tätä lähdettä ennen kuin voit hyväksyä lisenssin."
+"Lisenssitiedostoa \"{0}\" ei voi lukea asennusongelman takia. Et voi käyttää tätä "
+"lähdettä ennen kuin voit hyväksyä lisenssin."
 
 #: ../src/mail/mail.error.xml.h:127
 msgid "Please wait."
@@ -20159,8 +20009,7 @@ msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
 #: ../src/mail/mail.error.xml.h:129
-msgid ""
-"Failed to query server for a list of supported authentication mechanisms."
+msgid "Failed to query server for a list of supported authentication mechanisms."
 msgstr "Tuettujen tunnistautumistapojen kysely palvelimelta epäonnistui."
 
 #: ../src/mail/mail.error.xml.h:130
@@ -20175,8 +20024,7 @@ msgstr "Synkronoidaanko kansiot levylle verkkoyhteydetöntä käyttöä varten?"
 
 #: ../src/mail/mail.error.xml.h:132
 msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+"Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr ""
 "Haluatko synkronoida paikallisesti kansiot, jotka on merkitty yhteydettömään "
 "käyttöön?"
@@ -20203,11 +20051,11 @@ msgstr "Merkitse viestit myös alikansioissa?"
 
 #: ../src/mail/mail.error.xml.h:138
 msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
+"Do you want to mark messages as read in the current folder only, or in the current "
+"folder as well as all subfolders?"
 msgstr ""
-"Haluatko merkitä viestit luetuksi vain nykyisessä kansiossa vai myös "
-"kaikissa sen alikansioissa?"
+"Haluatko merkitä viestit luetuksi vain nykyisessä kansiossa vai myös kaikissa sen "
+"alikansioissa?"
 
 #: ../src/mail/mail.error.xml.h:139
 msgid "In Current Folder and _Subfolders"
@@ -20276,11 +20124,10 @@ msgstr "_Älä siirrä koskaan"
 
 #: ../src/mail/mail.error.xml.h:156
 msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+"This message cannot be sent because the account you chose to send with is not "
+"enabled"
 msgstr ""
-"Viestiä ei voi lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
-"käytössä"
+"Viestiä ei voi lähettää, koska viestin lähetykseen valitsemasi tili ei ole käytössä"
 
 #: ../src/mail/mail.error.xml.h:157
 msgid "Please enable the account or send using another account."
@@ -20288,15 +20135,14 @@ msgstr "Ota tili käyttöön tai lähetä käyttäen toista tiliä."
 
 #: ../src/mail/mail.error.xml.h:158
 #, fuzzy
-#| msgid ""
-#| "This message cannot be sent because you have not specified any recipients"
+#| msgid "This message cannot be sent because you have not specified any recipients"
 msgid "This message cannot be sent because there is no mail account configured"
 msgstr "Viestiä ei voi lähettää, koska et ole määritellyt vastaanottajia"
 
 #: ../src/mail/mail.error.xml.h:159
 msgid ""
-"There had not been found any active mail account to send the message. Create "
-"or enable one first, please."
+"There had not been found any active mail account to send the message. Create or "
+"enable one first, please."
 msgstr ""
 
 #: ../src/mail/mail.error.xml.h:160
@@ -20341,10 +20187,9 @@ msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "Kansio '{0}' ei sisällä viestien kaksoiskappaleita."
 
 #: ../src/mail/mail.error.xml.h:169
-#, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Failed to connect account “{0}”."
-msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
+msgstr "Yhteys tiliin “{0}” epäonnistui."
 
 #: ../src/mail/mail.error.xml.h:170
 #, fuzzy
@@ -20372,10 +20217,10 @@ msgstr "Viesti ei ole saatavilla yhteydettömässä tilassa."
 #: ../src/mail/mail.error.xml.h:175
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
-"account, can be marked for offline synchronization. Then, once the account "
-"is online again, use File→Download Messages for Offline Usage, when this "
-"folder is selected, to make sure that all the messages in the folder will be "
-"available in offline mode."
+"account, can be marked for offline synchronization. Then, once the account is "
+"online again, use File→Download Messages for Offline Usage, when this folder is "
+"selected, to make sure that all the messages in the folder will be available in "
+"offline mode."
 msgstr ""
 
 #: ../src/mail/mail.error.xml.h:176
@@ -20413,11 +20258,11 @@ msgstr "Piilotiedosto on liitetty."
 
 #: ../src/mail/mail.error.xml.h:185
 msgid ""
-"The attachment named {0} is a hidden file and may contain sensitive data. "
-"Please review it before sending."
+"The attachment named {0} is a hidden file and may contain sensitive data. Please "
+"review it before sending."
 msgstr ""
-"Liite nimeltä {0} on piilotiedosto, ja se saattaa sisältää arkaluontoista "
-"tietoa. Varmista tiedoston sisältö ennen lähettämistä."
+"Liite nimeltä {0} on piilotiedosto, ja se saattaa sisältää arkaluontoista tietoa. "
+"Varmista tiedoston sisältö ennen lähettämistä."
 
 #: ../src/mail/mail.error.xml.h:186
 msgid "Printing failed."
@@ -20473,11 +20318,11 @@ msgstr "Etäsisällön lataaminen on estetty tämän viestin kohdalla."
 
 #: ../src/mail/mail.error.xml.h:196
 msgid ""
-"You can download remote content manually, or set to remember to download "
-"remote content for this sender or used sites."
+"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."
+"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:198
@@ -20535,24 +20380,23 @@ msgstr ""
 
 #: ../src/mail/mail.error.xml.h:213
 msgid ""
-"A WebKitWebProcess crashed when displaying the signature. You can try again "
-"by moving to another signature and back. If the issue persists, please file "
-"a bug report in the GNOME bugzilla."
+"A WebKitWebProcess crashed when displaying the signature. You can try again by "
+"moving to another signature and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
 msgstr ""
 
 #: ../src/mail/mail.error.xml.h:214
 #, fuzzy
 #| msgid ""
-#| "Are you sure you want to permanently remove all the deleted messages in "
-#| "all folders?"
+#| "Are you sure you want to permanently remove all the deleted messages in all "
+#| "folders?"
 msgid "Are you sure you want to delete all the messages in the Junk folder?"
-msgstr ""
-"Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
+msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
 #: ../src/mail/mail.error.xml.h:215
 msgid ""
-"These messages will be shown in the Trash folder, where they can be "
-"permanently deleted later."
+"These messages will be shown in the Trash folder, where they can be permanently "
+"deleted later."
 msgstr ""
 
 #: ../src/mail/mail.error.xml.h:216
@@ -20567,44 +20411,54 @@ msgstr "_Ei roskapostia"
 msgid "Failed to empty Junk folder “{0}”"
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
-#: ../src/mail/mail-send-recv.c:192
+#: ../src/mail/mail-send-recv.c:193
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../src/mail/mail-send-recv.c:640
+#: ../src/mail/mail-send-recv.c:581
+msgid "Edit Message"
+msgstr "Muokkaa viestiä"
+
+#: ../src/mail/mail-send-recv.c:586
+#, fuzzy
+#| msgid "Move to Folder"
+msgid "Open Outbox Folder"
+msgstr "Siirrä kansioon"
+
+#: ../src/mail/mail-send-recv.c:760
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../src/mail/mail-send-recv.c:654
+#: ../src/mail/mail-send-recv.c:774
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:1262
+#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:1396
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:826
+#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:946
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../src/mail/mail-send-recv.c:1228
+#: ../src/mail/mail-send-recv.c:1362
 #, 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:1455
+#: ../src/mail/mail-send-recv.c:1589
 #, c-format
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr ""
 
-#: ../src/mail/mail-send-recv.c:1457
+#: ../src/mail/mail-send-recv.c:1591
 #, fuzzy, c-format
 #| msgid "Reconnecting to '%s'"
 msgid "Deleting junk at “%s”"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../src/mail/mail-send-recv.c:1459
+#: ../src/mail/mail-send-recv.c:1593
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Expunging trash at “%s”"
@@ -20622,96 +20476,94 @@ msgstr "Muokkaa hakunäkymää"
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../src/mail/message-list.c:301
+#: ../src/mail/message-list.c:305
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../src/mail/message-list.c:302
+#: ../src/mail/message-list.c:306
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../src/mail/message-list.c:303
+#: ../src/mail/message-list.c:307
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../src/mail/message-list.c:304
+#: ../src/mail/message-list.c:308
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../src/mail/message-list.c:305
+#: ../src/mail/message-list.c:309
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../src/mail/message-list.c:306
+#: ../src/mail/message-list.c:310
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../src/mail/message-list.c:319
+#: ../src/mail/message-list.c:323
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../src/mail/message-list.c:320
+#: ../src/mail/message-list.c:324
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:328
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../src/mail/message-list.c:325
+#: ../src/mail/message-list.c:329
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../src/mail/message-list.c:471 ../src/mail/message-list.c:6304
+#: ../src/mail/message-list.c:478 ../src/mail/message-list.c:6508
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2075
-#: ../src/modules/itip-formatter/itip-view.c:267
+#: ../src/mail/message-list.c:2117 ../src/modules/itip-formatter/itip-view.c:268
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../src/mail/message-list.c:2084
+#: ../src/mail/message-list.c:2126
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../src/mail/message-list.c:2096
+#: ../src/mail/message-list.c:2138
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../src/mail/message-list.c:2104
+#: ../src/mail/message-list.c:2146
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../src/mail/message-list.c:2106
+#: ../src/mail/message-list.c:2148
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/mail/message-list.c:3063
+#: ../src/mail/message-list.c:3178
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../src/mail/message-list.c:3782 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3923 ../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:5214
+#: ../src/mail/message-list.c:5387
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../src/mail/message-list.c:6243
+#: ../src/mail/message-list.c:6447
 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."
+"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:6251
+#: ../src/mail/message-list.c:6455
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -20747,11 +20599,22 @@ msgstr "Viestit"
 msgid "Subject — Trimmed"
 msgstr "Otsikko - rajattu"
 
-#: ../src/mail/message-list.etspec.h:21
-#: ../src/plugins/save-calendar/csv-format.c:372
+#: ../src/mail/message-list.etspec.h:21 ../src/plugins/save-calendar/csv-format.c:372
 msgid "UID"
 msgstr "UID"
 
+#: ../src/mail/message-list.etspec.h:22
+#, fuzzy
+#| msgid "Sender"
+msgid "Sender Mail"
+msgstr "Lähettäjä"
+
+#: ../src/mail/message-list.etspec.h:23
+#, fuzzy
+#| msgid "Recipients"
+msgid "Recipients Mail"
+msgstr "Vastaanottajat"
+
 #: ../src/mail/searchtypes.xml.in.h:23 ../src/mail/vfoldertypes.xml.in.h:23
 msgid "Any header"
 msgstr "Mikä tahansa otsake"
@@ -20761,32 +20624,32 @@ msgid "Subject or Addresses contains"
 msgstr "Aihe tai lähettäjät sisältävät"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2177
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2170
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2191
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2184
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
@@ -20813,43 +20676,49 @@ msgstr "_Sähköposti"
 msgid "C_alendar"
 msgstr "K_alenteri"
 
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:428
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:476
 #: ../src/modules/addressbook/e-book-shell-backend.c:262
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:137
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:436
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:484
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:284
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:178
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:480
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:532
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:210
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:484
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:536
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:283
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:540
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:250
 msgid "Memo List Properties"
 msgstr "Muistilappulistan ominaisuudet"
 
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:492
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:544
 #: ../src/modules/calendar/e-task-shell-view-actions.c:274
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:75
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:209
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:174
-#, fuzzy
-#| msgid "Go Back"
 msgid "_Back"
-msgstr "Siirry takaisin"
+msgstr "_Takaisin"
+
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
+#, fuzzy
+#| msgid "_Find"
+msgid "_Finish"
+msgstr "_Etsi"
 
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:195
 msgid "_Browse"
@@ -20857,13 +20726,13 @@ msgstr "_Selaa"
 
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:197
 msgid ""
-"Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
-"address books, calendars, memo lists or task lists there"
+"Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete address "
+"books, calendars, memo lists or task lists there"
 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:1562
+#: ../src/modules/mail/em-mailer-prefs.c:1568
 msgid "_Table column:"
 msgstr "_Taulukon sarake:"
 
@@ -20873,7 +20742,6 @@ msgstr "_Muotoile osoite sen kohdemaan standardien mukaisesti"
 
 #. Translators: This is part of a sentence "Open maps with OpenStreetMap" and "Open maps with Google"
 #: ../src/modules/addressbook/autocompletion-config.c:143
-#| msgid "Open map"
 msgctxt "OpenMap"
 msgid "Open _maps with"
 msgstr "Avaa _kartat palvelulla"
@@ -20886,8 +20754,6 @@ msgstr "OpenStreetMap"
 
 #. Translators: This is part of "Open maps with Google"
 #: ../src/modules/addressbook/autocompletion-config.c:153
-#| msgctxt "addressbook-label"
-#| msgid "Google Talk"
 msgctxt "OpenMap"
 msgid "Google"
 msgstr "Google"
@@ -21025,7 +20891,7 @@ msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1337
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:619
 #: ../src/modules/calendar/e-task-shell-view-actions.c:745
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
@@ -21106,7 +20972,7 @@ msgstr "T_oiminnot"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1084
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 #: ../src/modules/calendar/e-task-shell-view-actions.c:817
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1900
 msgid "_Preview"
 msgstr "_Esikatselu"
 
@@ -21141,7 +21007,7 @@ msgstr "Näytä yhteystiedon esikatseluruutu"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1170
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:741
 #: ../src/modules/calendar/e-task-shell-view-actions.c:907
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2060
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
@@ -21152,7 +21018,7 @@ msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:748
 #: ../src/modules/calendar/e-task-shell-view-actions.c:914
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
@@ -21171,7 +21037,7 @@ msgstr "Täsmäämättömät"
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 #: ../src/modules/calendar/e-task-shell-view-actions.c:976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2151
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
 #: ../src/shell/e-shell-content.c:637
 msgid "Advanced Search"
 msgstr "Oma haku"
@@ -21252,40 +21118,40 @@ msgstr "Valitse palautettava varmuuskopiotiedosto"
 msgid "Restore from Backup"
 msgstr "Palauta varmuuskopiosta"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:285
+#: ../src/modules/backup-restore/evolution-backup-restore.c:304
 msgid "Select name of the Evolution backup file"
 msgstr "Valitse Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:318
+#: ../src/modules/backup-restore/evolution-backup-restore.c:349
 msgid "_Restart Evolution after backup"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:353
+#: ../src/modules/backup-restore/evolution-backup-restore.c:384
 msgid "Re_start Evolution after restore"
 msgstr "Käynnistä Evolution _uudestaan palautuksen jälkeen"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:395
+#: ../src/modules/backup-restore/evolution-backup-restore.c:426
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:404
+#: ../src/modules/backup-restore/evolution-backup-restore.c:435
 #, c-format
 msgid "Checking content of backup file “%s”, please wait..."
 msgstr "Tarkistetaan varmuuskopiotiedoston “%s” sisältöä, odota hetki..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:425
+#: ../src/modules/backup-restore/evolution-backup-restore.c:456
 msgid "_Back up Evolution Data..."
 msgstr "_Varmuuskopioi Evolutionin tiedot..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:427
+#: ../src/modules/backup-restore/evolution-backup-restore.c:458
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Varmuuskopioi Evolutionin tiedot ja asetukset arkistotiedostoon"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:432
+#: ../src/modules/backup-restore/evolution-backup-restore.c:463
 msgid "R_estore Evolution Data..."
 msgstr "Palauta _Evolutionin tiedot..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:434
+#: ../src/modules/backup-restore/evolution-backup-restore.c:465
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Palauta Evolutionin tietoja ja asetuksia arkistotiedostosta"
 
@@ -21322,8 +21188,8 @@ msgstr "Varmuuskopioidaan Evolutionin tilejä ja asetuksia"
 #: ../src/modules/backup-restore/evolution-backup-tool.c:320
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
-"Varmuuskopioidaan Evolutionin tietoja (viestejä, yhteystietoja, "
-"kalentereita, tehtäviä ja muistioita)"
+"Varmuuskopioidaan Evolutionin tietoja (viestejä, yhteystietoja, kalentereita, "
+"tehtäviä ja muistioita)"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:336
 msgid "Back up complete"
@@ -21354,44 +21220,43 @@ msgstr "Poistetaan varmuuskopioinnin väliaikaistiedostoja"
 msgid "Reloading registry service"
 msgstr "Ladataan uudelleen rekisteripalvelua"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:899
+#: ../src/modules/backup-restore/evolution-backup-tool.c:903
 msgid "Evolution Back Up"
 msgstr "Evolutionin varmuuskopiointi"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:900
+#: ../src/modules/backup-restore/evolution-backup-tool.c:904
 #, c-format
 msgid "Backing up to the file %s"
 msgstr "Varmuuskopioidaan tiedostoon %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:904
+#: ../src/modules/backup-restore/evolution-backup-tool.c:908
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:905
+#: ../src/modules/backup-restore/evolution-backup-tool.c:909
 #, c-format
 msgid "Restoring from the file %s"
 msgstr "Palautetaan tiedostosta %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:974
+#: ../src/modules/backup-restore/evolution-backup-tool.c:978
 msgid "Backing up Evolution Data"
 msgstr "Varmuuskopioidaan Evolutionin tietoja"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:975
+#: ../src/modules/backup-restore/evolution-backup-tool.c:979
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Odota, että Evolution ottaa varmuuskopion tiedoistasi."
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:977
+#: ../src/modules/backup-restore/evolution-backup-tool.c:981
 msgid "Restoring Evolution Data"
 msgstr "Palautetaan Evolutionin tietoja"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:978
+#: ../src/modules/backup-restore/evolution-backup-tool.c:982
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Odota, että Evolution palauttaa tietosi."
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:1000
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1004
 msgid "This may take a while depending on the amount of data in your account."
-msgstr ""
-"Tämä saattaa kestää hetken, riippuen tililläsi olevien tietojen määrästä."
+msgstr "Tämä saattaa kestää hetken, riippuen tililläsi olevien tietojen määrästä."
 
 #: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Invalid Evolution backup file"
@@ -21407,8 +21272,8 @@ msgstr "Haluatko varmasti sulkea Evolutionin?"
 
 #: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
+"To back up your data and settings, you must first close Evolution. Please make "
+"sure that you save any unsaved data before proceeding."
 msgstr ""
 "Tietojen ja asetusten varmuuskopioimiseksi Evolution on suljettava. Tallenna "
 "kaikki tallentamattomat tiedot ennen jatkamista."
@@ -21418,21 +21283,18 @@ msgid "Close and _Back up Evolution"
 msgstr "Sulje ja _varmuuskopioi Evolution"
 
 #: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Haluatko varmasti palauttaa Evolutionin valitusta varmuuskopiotiedostosta?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Haluatko varmasti palauttaa Evolutionin valitusta varmuuskopiotiedostosta?"
 
 #: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid ""
-"To restore your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
+"To restore your data and settings, you must first close Evolution. Please make "
+"sure that you save any unsaved data before proceeding. This will delete all your "
+"current Evolution data and settings and restore them from your backup."
 msgstr ""
-"Tietojen ja asetusten palauttamiseksi Evolution on suljettava. Tallenna "
-"kaikki tallentamattomat tiedot ennen jatkamista. Tämä poistaa kaikki "
-"nykyiset Evolutionin tiedot ja asetukset ja palauttaa varmuuskopion."
+"Tietojen ja asetusten palauttamiseksi Evolution on suljettava. Tallenna kaikki "
+"tallentamattomat tiedot ennen jatkamista. Tämä poistaa kaikki nykyiset Evolutionin "
+"tiedot ja asetukset ja palauttaa varmuuskopion."
 
 #: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "Close and _Restore Evolution"
@@ -21468,16 +21330,16 @@ msgid "Convert message text to _Unicode"
 msgstr "Muunna viestin teksti _Unicode-muotoon"
 
 #: ../src/modules/bogofilter/evolution-bogofilter.c:537
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:2
 msgid "Junk filter using Bogofilter"
 msgstr ""
 
 #: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:994
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1045
 #: ../src/modules/cal-config-google/e-cal-config-google.c:190
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
@@ -21485,158 +21347,159 @@ msgstr ""
 msgid "User name cannot be empty"
 msgstr "Käyttäjätunnus ei voi olla tyhjä"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:443
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:418
+msgid "Looking up server search bases, please wait…"
+msgstr ""
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
 msgid "Standard LDAP Port"
 msgstr "Standardi LDAP_portti"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:449
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:632
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP SSL/TLS:n yli (vanhennettu)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:455
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalog"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:461
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "Microsoft Global Catalog SSL/TLS:n yli"
 
 #. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:568
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "Connecting to LDAP"
 msgstr "LDAP:iin yhdistäminen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:585
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:612
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:663
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:671
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
 msgid "Port number is not valid"
 msgstr "Portin numero ei ole kelvollinen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:635
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (suositeltu)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:688
 msgid "Encryption:"
 msgstr "Salaus:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:735
 msgid "Anonymous"
 msgstr "Anonyymisti"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:741
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:743
 msgid "Method:"
 msgstr "Menetelmä:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
 #, fuzzy
 #| msgid ""
-#| "This is the method Evolution will use to authenticate you.  Note that "
-#| "setting this to \"Email Address\" requires anonymous access to your LDAP "
-#| "server."
+#| "This is the method Evolution will use to authenticate you.  Note that setting "
+#| "this to \"Email Address\" requires anonymous access to your LDAP server."
 msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to “Using email address” requires anonymous access to your LDAP "
-"server."
+"This is the method Evolution will use to authenticate you.  Note that setting this "
+"to “Using email address” requires anonymous access to your LDAP server."
 msgstr ""
 "Tämä on menetelmä, jota Evolution käyttää tunnistamiseesi. Huomaa, että "
 "asettaminen arvoon \"Sähköpostiosoite\" vaatii anonyymiä pääsyä LDAP-"
 "palvelimellesi."
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "Using LDAP"
 msgstr "LDAP:in käyttäminen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:729
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:780
 #: ../src/modules/mail/e-mail-shell-view.c:118
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:751
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:802
 msgid "Search Base:"
 msgstr "Hakupohja:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:806
 #, fuzzy
 #| msgid "_Find Possible Search Bases"
 msgid "Find Possible Search Bases"
 msgstr "_Etsi mahdolliset hakupohjat"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
 msgid "One Level"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Subtree"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:781
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:832
 msgid "Search Scope:"
 msgstr "Hakualue:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:837
 #, fuzzy
 #| msgid ""
-#| "The search scope defines how deep you would like the search to extend "
-#| "down the directory tree. A search scope of \"sub\" will include all "
-#| "entries below your search base. A search scope of \"one\" will only "
-#| "include the entries one level beneath your base."
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree.  A search scope of “Subtree” will include all entries "
-"below your search base.  A search scope of “One Level” will only include the "
-"entries one level beneath your search base."
-msgstr ""
-"Haun kattavuus määrittelee, kuinka syvälle hakemistopuuhun haluat hakusi "
-"menevän. Kattavuus \"Ali\" kattaa kaikki kentät hakupohjasi alla ja sen "
-"alipuissa, kun taas kattavuus \"Yksi\" kattaa kentät yhden tason "
-"hakupohjastasi alaspäin."
-
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:795
+#| "The search scope defines how deep you would like the search to extend down the "
+#| "directory tree. A search scope of \"sub\" will include all entries below your "
+#| "search base. A search scope of \"one\" will only include the entries one level "
+#| "beneath your base."
+msgid ""
+"The search scope defines how deep you would like the search to extend down the "
+"directory tree.  A search scope of “Subtree” will include all entries below your "
+"search base.  A search scope of “One Level” will only include the entries one "
+"level beneath your search base."
+msgstr ""
+"Haun kattavuus määrittelee, kuinka syvälle hakemistopuuhun haluat hakusi menevän. "
+"Kattavuus \"Ali\" kattaa kaikki kentät hakupohjasi alla ja sen alipuissa, kun taas "
+"kattavuus \"Yksi\" kattaa kentät yhden tason hakupohjastasi alaspäin."
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:846
 msgid "Search Filter:"
 msgstr "Hakusuodatin:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:807
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
 msgid "Limit:"
 msgstr "Raja:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:839
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:890
 msgid "contacts"
 msgstr "yhteystietoa"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:844
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:895
 msgid "Browse until limit is reached"
 msgstr "Selaa kunnes raja tulee vastaan"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:979
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1030
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
 msgid "Server address cannot be empty"
@@ -21667,17 +21530,17 @@ msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
 
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:225
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:226
 msgid "Choose a Calendar"
 msgstr "Valitse kalenteri"
 
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:229
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:230
 msgid "Choose a Memo List"
 msgstr "Valitse muistilappulista"
 
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:233
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:234
 msgid "Choose a Task List"
 msgstr "Valitse tehtävälista"
 
@@ -21717,7 +21580,7 @@ msgstr "Käytä syntymä- ja vuosipäiväkalenterissa"
 msgid "Enable Calendars to synchronize"
 msgstr ""
 
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:144
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
 msgstr "Käyttäjän oletuskalenteri"
 
@@ -21880,43 +21743,43 @@ msgstr "Muistilappuluetteloiden valitsin"
 msgid "Task List Selector"
 msgstr "Tehtävienluetteloiden valitsin"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:525
+#: ../src/modules/calendar/e-calendar-preferences.c:523
 #, fuzzy
 #| msgid "Select the calendars for reminder notification"
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "Valitse kalenterit, joiden muistutuksista ilmoitetaan"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:532
+#: ../src/modules/calendar/e-calendar-preferences.c:530
 msgid "Selected Memo Lists for Notifications of Reminders"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.c:539
+#: ../src/modules/calendar/e-calendar-preferences.c:537
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.c:635
+#: ../src/modules/calendar/e-calendar-preferences.c:633
 msgid "Meeting Invitations"
 msgstr "Kokouskutsut"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:661
+#: ../src/modules/calendar/e-calendar-preferences.c:659
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:675
-#: ../src/modules/calendar/e-calendar-preferences.c:706
+#: ../src/modules/calendar/e-calendar-preferences.c:673
+#: ../src/modules/calendar/e-calendar-preferences.c:704
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:690
+#: ../src/modules/calendar/e-calendar-preferences.c:688
 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:1102
+#: ../src/modules/calendar/e-calendar-preferences.c:1114
 msgid "Ti_me and date:"
 msgstr "_Päiväys ja aika:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1103
+#: ../src/modules/calendar/e-calendar-preferences.c:1115
 msgid "_Date only:"
 msgstr "_Vain päiväys:"
 
@@ -22095,99 +21958,108 @@ msgstr "Näytä viikko_numerot"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr ""
-"N_äytä toistuvat tapahtumat kursivoituna vasemman alareunan kalenterissa"
+msgstr "N_äytä toistuvat tapahtumat kursivoituna vasemman alareunan kalenterissa"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:56
 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 ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Alerts"
 msgstr "Hälytykset"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Display"
 msgstr "Näytä"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
-msgid "Task List"
-msgstr "Tehtävälista"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 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:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Highlight _overdue tasks"
 msgstr "Korosta _eräpäivän ylittäneet tehtävät"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#, fuzzy
+#| msgid "_To Do"
+msgid "To Do bar"
+msgstr "Te_htävää"
+
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+msgid "Show Tasks without _Due date"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Display reminders in _notification area only"
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
 #, 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:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Display reminders for completed _tasks"
 msgstr "Poista muistutukset _valmistuneista tehtävistä"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 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:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 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:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
 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:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 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:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
 msgid "before every anniversary/birthday"
 msgstr "ennen joka vuosipäivää ja syntymäpäivää"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
 msgid "Default _snooze time (in minutes)"
 msgstr "Oletus_torkkuaika (minuuteissa)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
 #, 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:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Default Free/Busy Server"
 msgstr "Oletus-vapaa/varattu-palvelin"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 #, 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:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
 msgid "Publishing Information"
 msgstr "Julkaisutiedot"
 
@@ -22239,12 +22111,11 @@ msgstr "Tulosta"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:312
 msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+"This operation will permanently erase all events older than the selected amount of "
+"time. If you continue, you will not be able to recover these events."
 msgstr ""
-"Tämä toimenpide poistaa kaikki tapahtumat, jotka ovat vanhempia kuin valittu "
-"aika. Jos jatkat, et voi palauttaa näitä tapahtumia."
+"Tämä toimenpide poistaa kaikki tapahtumat, jotka ovat vanhempia kuin valittu aika. "
+"Jos jatkat, et voi palauttaa näitä tapahtumia."
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
@@ -22845,8 +22716,8 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Tämä toimenpide poistaa kaikki tehtävät, jotka on merkitty tehdyiksi. Jos "
-"jatkat, et voi myöhemmin palauttaa näitä tehtäviä.\n"
+"Tämä toimenpide poistaa kaikki tehtävät, jotka on merkitty tehdyiksi. Jos jatkat, "
+"et voi myöhemmin palauttaa näitä tehtäviä.\n"
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
@@ -22967,13 +22838,13 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:324
 #, fuzzy
 #| msgid "Create a _Meeting"
 msgid "Convert to M_eeting"
 msgstr "Luo _kokous"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
 #, fuzzy
 #| msgid "Create a new meeting request"
 msgid "Convert the message to a meeting request"
@@ -22991,21 +22862,87 @@ msgstr "Tärkeät viestit"
 msgid "Convert to the mail message"
 msgstr "Kirjoita uusi viesti"
 
+#: ../src/modules/config-lookup/e-gnome-config-lookup.c:67
+msgid "Look up e-mail domain on the GNOME server"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#| msgid "IMAP server"
+msgid "Looking up IMAP server…"
+msgstr "Etsitään IMAP-palvelinta…"
+
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#| msgid "POP3 server"
+msgid "Looking up POP3 server…"
+msgstr "Etsitään POP3-palvelinta…"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#| msgid "SMTP server"
+msgid "Looking up SMTP server…"
+msgstr "Etsitään SMTP-palvelinta…"
+
+#: ../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-webdav-config-lookup.c:118
 msgid "CalDAV server"
 msgstr "CalDAV-palvelin"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#| msgid "CalDAV server"
+msgid "Looking up CalDAV server…"
+msgstr "Etsitään CalDAV-palvelinta…"
+
+#: ../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-webdav-config-lookup.c:118
 msgid "CardDAV server"
 msgstr "CardDAV-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:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#| msgid "CardDAV server"
+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
 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
+#| msgid "LDAP server"
+msgid "Looking up LDAP server…"
+msgstr "Etsitään LDAP-palvelinta…"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:234
+msgid "Look up in SRV records"
+msgstr "Etsitään SRV-tietueita"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:104
+#, c-format
+#| msgid "CalDAV server"
+msgid "CalDAV: %s"
+msgstr "CalDAV: %s"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:111
+#, c-format
+#| msgid "CardDAV server"
+msgid "CardDAV: %s"
+msgstr "CardDAV: %s"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:117
+#| msgid "CardDAV server"
+msgid "CalDAV and CardDAV server"
+msgstr "CalDAV- ja CardDAV-palvelin"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:209
+msgid "Look up for a CalDAV/CardDAV server"
+msgstr "Etsi CalDAV-/CardDAV-palvelinta"
+
 #: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
 msgid "ITIP"
 msgstr "ITIP"
@@ -23016,650 +22953,643 @@ msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:258
+#: ../src/modules/itip-formatter/itip-view.c:259
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:262
+#: ../src/modules/itip-formatter/itip-view.c:263
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:271
+#: ../src/modules/itip-formatter/itip-view.c:272
 msgid "Today %l:%M:%S %p"
 msgstr "Tänään %l.%M.%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:286
+#: ../src/modules/itip-formatter/itip-view.c:287
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:290
+#: ../src/modules/itip-formatter/itip-view.c:291
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:295
+#: ../src/modules/itip-formatter/itip-view.c:296
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:299
+#: ../src/modules/itip-formatter/itip-view.c:300
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:318
+#: ../src/modules/itip-formatter/itip-view.c:319
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:323
+#: ../src/modules/itip-formatter/itip-view.c:324
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:327
+#: ../src/modules/itip-formatter/itip-view.c:328
 msgid "%A %H:%M:%S"
 msgstr "%Ana klo %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:332
+#: ../src/modules/itip-formatter/itip-view.c:333
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:336
+#: ../src/modules/itip-formatter/itip-view.c:337
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:345
+#: ../src/modules/itip-formatter/itip-view.c:346
 msgid "%A, %B %e"
 msgstr "+%Ana %e. %Bn %Y"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:351
+#: ../src/modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e %H:%M"
 msgstr "+%Ana %e. %Bn klo %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:355
+#: ../src/modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e %H:%M:%S"
 msgstr "+%Ana %e. %Bn klo %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:360
+#: ../src/modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e %l:%M %p"
 msgstr "+%Ana %e. %Bn klo %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:364
+#: ../src/modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "+%Ana %e. %Bn klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:370
+#: ../src/modules/itip-formatter/itip-view.c:371
 msgid "%A, %B %e, %Y"
 msgstr "%Ana %e. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:375
+#: ../src/modules/itip-formatter/itip-view.c:376
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Ana %e. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:379
+#: ../src/modules/itip-formatter/itip-view.c:380
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Ana %e. %Bta %Y klo %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:384
+#: ../src/modules/itip-formatter/itip-view.c:385
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:388
+#: ../src/modules/itip-formatter/itip-view.c:389
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M.%S %p"
 
-#: ../src/modules/itip-formatter/itip-view.c:426
 #: ../src/modules/itip-formatter/itip-view.c:427
-#: ../src/modules/itip-formatter/itip-view.c:516
+#: ../src/modules/itip-formatter/itip-view.c:428
 #: ../src/modules/itip-formatter/itip-view.c:517
-#: ../src/modules/itip-formatter/itip-view.c:606
+#: ../src/modules/itip-formatter/itip-view.c:518
+#: ../src/modules/itip-formatter/itip-view.c:607
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
-#: ../src/modules/itip-formatter/itip-view.c:431
-#: ../src/modules/itip-formatter/itip-view.c:521
-#: ../src/modules/itip-formatter/itip-view.c:610
+#: ../src/modules/itip-formatter/itip-view.c:432
+#: ../src/modules/itip-formatter/itip-view.c:522
+#: ../src/modules/itip-formatter/itip-view.c:611
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vastaa henkilön %s puolesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:433
-#: ../src/modules/itip-formatter/itip-view.c:523
-#: ../src/modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:434
+#: ../src/modules/itip-formatter/itip-view.c:524
+#: ../src/modules/itip-formatter/itip-view.c:613
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Vastaanotettu henkilön %s puolesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:438
+#: ../src/modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot:"
 
-#: ../src/modules/itip-formatter/itip-view.c:445
+#: ../src/modules/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegoi seuraavan kokouksen sinulle:"
 
-#: ../src/modules/itip-formatter/itip-view.c:448
+#: ../src/modules/itip-formatter/itip-view.c:449
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../src/modules/itip-formatter/itip-view.c:456
+#: ../src/modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystänsä olemassa olevaan kokoukseen %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystään olemassa olevaan kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:462
+#: ../src/modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
+"%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:464
+#: ../src/modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:468
+#: ../src/modules/itip-formatter/itip-view.c:469
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:474
+#: ../src/modules/itip-formatter/itip-view.c:475
 #, fuzzy, c-format
 #| msgid "%s through %s has canceled the following meeting:"
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s perui seuraavan kokouksen %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:476
+#: ../src/modules/itip-formatter/itip-view.c:477
 #, fuzzy, c-format
 #| msgid "%s has canceled the following meeting:"
 msgid "%s has cancelled the following meeting:"
 msgstr "%s on perunut seuraavan tapaamisen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:480
+#: ../src/modules/itip-formatter/itip-view.c:481
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../src/modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ehdottaa seuraavia muutoksia kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:486
+#: ../src/modules/itip-formatter/itip-view.c:487
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:488
+#: ../src/modules/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s kieltäytyi seuraavista kokousmuutoksista:"
 
-#: ../src/modules/itip-formatter/itip-view.c:528
+#: ../src/modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s julkaisi seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:535
+#: ../src/modules/itip-formatter/itip-view.c:536
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:538
+#: ../src/modules/itip-formatter/itip-view.c:539
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän:"
 
-#: ../src/modules/itip-formatter/itip-view.c:546
+#: ../src/modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään:"
 
-#: ../src/modules/itip-formatter/itip-view.c:552
+#: ../src/modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"%s %s kautta toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
+"%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:554
+#: ../src/modules/itip-formatter/itip-view.c:555
 #, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
+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:558
+#: ../src/modules/itip-formatter/itip-view.c:559
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin %s kautta seuraavan annetun tehtävän vastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:561
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:564
+#: ../src/modules/itip-formatter/itip-view.c:565
 #, fuzzy, c-format
 #| msgid "%s through %s has canceled the following assigned task:"
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:566
+#: ../src/modules/itip-formatter/itip-view.c:567
 #, fuzzy, c-format
 #| msgid "%s has canceled the following assigned task:"
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän:"
 
-#: ../src/modules/itip-formatter/itip-view.c:570
+#: ../src/modules/itip-formatter/itip-view.c:571
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../src/modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../src/modules/itip-formatter/itip-view.c:576
+#: ../src/modules/itip-formatter/itip-view.c:577
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:578
+#: ../src/modules/itip-formatter/itip-view.c:579
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:617
+#: ../src/modules/itip-formatter/itip-view.c:618
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:619
+#: ../src/modules/itip-formatter/itip-view.c:620
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s julkaisi seuraavan muistilapun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:624
+#: ../src/modules/itip-formatter/itip-view.c:625
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:627
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:630
+#: ../src/modules/itip-formatter/itip-view.c:631
 #, fuzzy, c-format
 #| msgid "%s through %s has canceled the following shared memo:"
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s perui seuraavan jaetun muistilapun %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:632
+#: ../src/modules/itip-formatter/itip-view.c:633
 #, fuzzy, c-format
 #| msgid "%s has canceled the following shared memo:"
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s on perunut seuraavan jaetun muistilapun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:857
+#: ../src/modules/itip-formatter/itip-view.c:858
 msgid "All day:"
 msgstr "Koko päivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:864
 msgid "Start day:"
 msgstr "Aloituspäivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:863
-#: ../src/modules/itip-formatter/itip-view.c:1679
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1682
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
-#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:873
 msgid "End day:"
 msgstr "Päättymispäivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:872
-#: ../src/modules/itip-formatter/itip-view.c:1680
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1683
 msgid "End time:"
 msgstr "Loppumisaika:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1210
+#: ../src/modules/itip-formatter/itip-view.c:1213
 msgid "Ope_n Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:1213
+#: ../src/modules/itip-formatter/itip-view.c:1216
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1216
+#: ../src/modules/itip-formatter/itip-view.c:1219
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../src/modules/itip-formatter/itip-view.c:1219
+#: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1222
+#: ../src/modules/itip-formatter/itip-view.c:1225
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1225
+#: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt all"
 msgstr "_Hyväksy kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1228
+#: ../src/modules/itip-formatter/itip-view.c:1231
 msgid "Acce_pt"
 msgstr "H_yväksy"
 
-#: ../src/modules/itip-formatter/itip-view.c:1231
+#: ../src/modules/itip-formatter/itip-view.c:1234
 msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
-#: ../src/modules/itip-formatter/itip-view.c:1234
+#: ../src/modules/itip-formatter/itip-view.c:1237
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/modules/itip-formatter/itip-view.c:1240
 #: ../src/smime/gui/certificate-manager.c:1677
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../src/modules/itip-formatter/itip-view.c:1682
-#: ../src/modules/itip-formatter/itip-view.c:1730
-#: ../src/modules/itip-formatter/itip-view.c:1801
+#: ../src/modules/itip-formatter/itip-view.c:1685
+#: ../src/modules/itip-formatter/itip-view.c:1733
+#: ../src/modules/itip-formatter/itip-view.c:1804
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1718
+#: ../src/modules/itip-formatter/itip-view.c:1721
 msgid "Send reply to sender"
 msgstr "Vastaa lähettäjälle"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1733
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1736
+#: ../src/modules/itip-formatter/itip-view.c:1739
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1740
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../src/modules/itip-formatter/itip-view.c:1738
+#: ../src/modules/itip-formatter/itip-view.c:1741
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:1739
+#: ../src/modules/itip-formatter/itip-view.c:1742
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:2048
+#: ../src/modules/itip-formatter/itip-view.c:2051
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2051
+#: ../src/modules/itip-formatter/itip-view.c:2054
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2964
+#: ../src/modules/itip-formatter/itip-view.c:3111
 msgid "Sa_ve"
 msgstr "_Tallenna"
 
-#: ../src/modules/itip-formatter/itip-view.c:3486
-#: ../src/modules/itip-formatter/itip-view.c:5015
+#: ../src/modules/itip-formatter/itip-view.c:3633
+#: ../src/modules/itip-formatter/itip-view.c:5189
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:3701
+#: ../src/modules/itip-formatter/itip-view.c:3848
 #, 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"
+msgstr "Tapaaminen “%s” kalenterissa “%s” on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3707
+#: ../src/modules/itip-formatter/itip-view.c:3854
 #, 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"
+msgid "The calendar “%s” contains an appointment which conflicts with this meeting"
 msgid_plural ""
 "The calendar “%s” contains %d appointments which conflict with this meeting"
 msgstr[0] ""
-"Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
-"kanssa"
+"Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 msgstr[1] ""
-"Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
-"kanssa"
+"Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3740
+#: ../src/modules/itip-formatter/itip-view.c:3887
 #, 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:3749
+#: ../src/modules/itip-formatter/itip-view.c:3896
 #, 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:3891
+#: ../src/modules/itip-formatter/itip-view.c:4038
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../src/modules/itip-formatter/itip-view.c:3899
+#: ../src/modules/itip-formatter/itip-view.c:4046
 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:3904
+#: ../src/modules/itip-formatter/itip-view.c:4051
 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:3909
+#: ../src/modules/itip-formatter/itip-view.c:4056
 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:4250
+#: ../src/modules/itip-formatter/itip-view.c:4397
 msgid "Opening the calendar. Please wait..."
 msgstr "Avataan kalenteria, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:4255
+#: ../src/modules/itip-formatter/itip-view.c:4402
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4654
+#: ../src/modules/itip-formatter/itip-view.c:4801
 #, 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:4669
+#: ../src/modules/itip-formatter/itip-view.c:4816
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as accepted"
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4674
+#: ../src/modules/itip-formatter/itip-view.c:4821
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as tentative"
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../src/modules/itip-formatter/itip-view.c:4680
+#: ../src/modules/itip-formatter/itip-view.c:4827
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as declined"
 msgid "Sent to calendar “%s” as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4686
+#: ../src/modules/itip-formatter/itip-view.c:4833
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as canceled"
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:4706
-#: ../src/modules/itip-formatter/itip-view.c:5152
-#: ../src/modules/itip-formatter/itip-view.c:5255
+#: ../src/modules/itip-formatter/itip-view.c:4869
+#: ../src/modules/itip-formatter/itip-view.c:5326
+#: ../src/modules/itip-formatter/itip-view.c:5429
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:4747
+#: ../src/modules/itip-formatter/itip-view.c:4921
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../src/modules/itip-formatter/itip-view.c:4939
+#: ../src/modules/itip-formatter/itip-view.c:5113
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:4956
+#: ../src/modules/itip-formatter/itip-view.c:5130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:4960
+#: ../src/modules/itip-formatter/itip-view.c:5134
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5007
+#: ../src/modules/itip-formatter/itip-view.c:5181
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5042
+#: ../src/modules/itip-formatter/itip-view.c:5216
 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:5117
+#: ../src/modules/itip-formatter/itip-view.c:5291
 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:5188
-#: ../src/modules/itip-formatter/itip-view.c:5226
+#: ../src/modules/itip-formatter/itip-view.c:5362
+#: ../src/modules/itip-formatter/itip-view.c:5400
 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:5287
+#: ../src/modules/itip-formatter/itip-view.c:5461
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5292
+#: ../src/modules/itip-formatter/itip-view.c:5466
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5297
+#: ../src/modules/itip-formatter/itip-view.c:5471
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5308
+#: ../src/modules/itip-formatter/itip-view.c:5482
 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:5313
+#: ../src/modules/itip-formatter/itip-view.c:5487
 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:5318
+#: ../src/modules/itip-formatter/itip-view.c:5492
 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:5383
+#: ../src/modules/itip-formatter/itip-view.c:5557
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5388
+#: ../src/modules/itip-formatter/itip-view.c:5562
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:5436
-#: ../src/modules/itip-formatter/itip-view.c:5449
+#: ../src/modules/itip-formatter/itip-view.c:5611
+#: ../src/modules/itip-formatter/itip-view.c:5624
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5437
-#: ../src/modules/itip-formatter/itip-view.c:5450
+#: ../src/modules/itip-formatter/itip-view.c:5612
+#: ../src/modules/itip-formatter/itip-view.c:5625
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -23667,60 +23597,57 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../src/modules/itip-formatter/itip-view.c:5492
-#: ../src/modules/itip-formatter/itip-view.c:5522
-#: ../src/modules/itip-formatter/itip-view.c:5625
+#: ../src/modules/itip-formatter/itip-view.c:5667
+#: ../src/modules/itip-formatter/itip-view.c:5748
+#: ../src/modules/itip-formatter/itip-view.c:5844
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5493
-#: ../src/modules/itip-formatter/itip-view.c:5523
-#: ../src/modules/itip-formatter/itip-view.c:5626
+#: ../src/modules/itip-formatter/itip-view.c:5668
+#: ../src/modules/itip-formatter/itip-view.c:5749
+#: ../src/modules/itip-formatter/itip-view.c:5845
 msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
+"The message does contain a calendar, but the calendar contains no events, tasks or "
+"free/busy information"
 msgstr ""
-"Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
-"tai vapaa/varattu-tietoja."
+"Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä tai "
+"vapaa/varattu-tietoja."
 
-#: ../src/modules/itip-formatter/itip-view.c:5538
+#: ../src/modules/itip-formatter/itip-view.c:5758
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../src/modules/itip-formatter/itip-view.c:5539
+#: ../src/modules/itip-formatter/itip-view.c:5759
 msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+"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:6057
+#: ../src/modules/itip-formatter/itip-view.c:6276
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/modules/itip-formatter/itip-view.c:6073
+#: ../src/modules/itip-formatter/itip-view.c:6292
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../src/modules/itip-formatter/itip-view.c:6239
+#: ../src/modules/itip-formatter/itip-view.c:6460
 msgid "This meeting recurs"
 msgstr "Tapaaminen on toistuva"
 
-#: ../src/modules/itip-formatter/itip-view.c:6242
+#: ../src/modules/itip-formatter/itip-view.c:6463
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../src/modules/itip-formatter/itip-view.c:6245
+#: ../src/modules/itip-formatter/itip-view.c:6466
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
 #: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"Vastaus ei ole olemassa olevalta läsnäolijalta. Lisätäänkö läsnäolijaksi?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Vastaus ei ole olemassa olevalta läsnäolijalta. Lisätäänkö läsnäolijaksi?"
 
 #: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
@@ -23733,35 +23660,35 @@ msgstr ""
 "&quot;{0}&quot; on antanut kokouksen järjestettäväksi. Haluatko lisätä "
 "osallistujan &quot;{1}&quot;?"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:283
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
 msgid "Google Features"
 msgstr "Google-ominaisuudet"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:292
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:310
 msgid "Add Google Ca_lendar to this account"
 msgstr "Lisää _Google-kalenteri tähän tiliin"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:319
 msgid "Add Google Con_tacts to this account"
 msgstr "Lisää Google-_yhteystiedot tähän tiliin"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:312
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:330
 msgctxt "GoggleSummary"
 msgid "IMAP access"
 msgstr "IMAP-käyttö"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:333
 msgctxt "GoggleSummary"
 msgid "Calendars to synchronize"
 msgstr "Synkronoitavat kalenterit"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:318
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:336
 #, fuzzy, c-format
 #| msgid "You may need to enable IMAP access"
 msgctxt "GoggleSummary"
@@ -23856,12 +23783,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "_Palvelin:"
-
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
 msgid "_Port:"
@@ -23953,93 +23874,93 @@ msgstr "Yahoo!-ominaisuudet"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Lisää Yahoo!-kalenteri ja -tehtävät tälle tilille"
 
-#: ../src/modules/mail/e-mail-attachment-handler.c:671
+#: ../src/modules/mail/e-mail-attachment-handler.c:644
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:383
+#: ../src/modules/mail/e-mail-shell-backend.c:399
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Sähköpostiviesti"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:385
+#: ../src/modules/mail/e-mail-shell-backend.c:401
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:393
+#: ../src/modules/mail/e-mail-shell-backend.c:409
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "_Sähköpostitili"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:395
+#: ../src/modules/mail/e-mail-shell-backend.c:411
 msgid "Create a new mail account"
 msgstr "Luo uusi sähköpostitili"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:400
+#: ../src/modules/mail/e-mail-shell-backend.c:416
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Sähköposti_kansio"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:402
+#: ../src/modules/mail/e-mail-shell-backend.c:418
 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:717
+#: ../src/modules/mail/e-mail-shell-backend.c:733
 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:720
+#: ../src/modules/mail/e-mail-shell-backend.c:736
 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:723
+#: ../src/modules/mail/e-mail-shell-backend.c:739
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:757
+#: ../src/modules/mail/e-mail-shell-backend.c:769
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Yhteydellisen tilan _havaintatapa:"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:766
+#: ../src/modules/mail/e-mail-shell-backend.c:778
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Oletus"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:780
+#: ../src/modules/mail/e-mail-shell-backend.c:792
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Aina yhteydessä"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:849
+#: ../src/modules/mail/e-mail-shell-backend.c:861
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:858
+#: ../src/modules/mail/e-mail-shell-backend.c:870
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:867
+#: ../src/modules/mail/e-mail-shell-backend.c:879
 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:1220
+#: ../src/modules/mail/e-mail-shell-backend.c:1240
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
@@ -24056,376 +23977,374 @@ msgstr "Siirry kansioon"
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1622
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1626
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1633
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 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:1638
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1636
 #, fuzzy
 #| msgid "_Junk"
 msgid "Empty _Junk"
 msgstr "_Roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1640
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
 #, fuzzy
 #| msgid "Permanently remove all the deleted messages from all folders"
 msgid "Delete all Junk messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1647
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1654
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Refresh list of folders of this account"
 msgstr "Päivitä tämän tilin kansioiden luettelo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1657
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1661
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Lataa yhteydettömään käyttöön merkittyjen tilien ja kansioiden viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1675
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1682
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1689
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1696
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1703
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1707
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1725
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1732
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1739
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Valitse kaikki viestit, jotka ovat samassa säikeessä kuin nyt valittu viesti"
+msgstr "Valitse kaikki viestit, jotka ovat samassa säikeessä kuin nyt valittu viesti"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Poista pysyvästi kaikki poistetut viestit kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
 msgid "Go to _Folder"
 msgstr "Siirry ka_nsioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
 #, fuzzy
 #| msgid "Click here to select folders to post to"
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1770
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1779
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1793
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1881
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Receive new items from all accounts"
 msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1825
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
 #, fuzzy
 msgid "Send queued items in all accounts"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1856
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1860
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1863
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1867
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1874
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
 msgid "Create or edit rules for filtering new mail"
 msgstr "Luo tai muokkaa sääntöjä uuden sähköpostin suodatukseen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
 msgid "_Subscriptions..."
 msgstr "_Tilaukset..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1895
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1917
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1962
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2002
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid ""
-"Show Attachment Bar below the message preview pane when the message has "
-"attachments"
+"Show Attachment Bar below the message preview pane when the message has attachments"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
 msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Show _Junk Messages"
 msgstr "Näytä _roskapostiviestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2018
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 #, fuzzy
 #| msgid "Show deleted messages with a line through them"
 msgid "Show junk messages with a red line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2022
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
 #, fuzzy
 #| msgid "Show _Tool Bar"
 msgid "Show To _Do Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2034
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
 msgid "Show To Do bar with appointments and tasks"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2038
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2042
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2062
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2060
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2075
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2082
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2089
 #, fuzzy
 #| msgid "Last 5 Days' Messages"
 msgid "Last 5 Days’ Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
 #, fuzzy
 #| msgid "Messages with Attachments"
 msgid "Messages with Notes"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2124
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2131
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2138
 msgid "Message Thread"
 msgstr "Viestinketju"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2198
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2210
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2208
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2215
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2222
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
@@ -24437,58 +24356,58 @@ msgstr "Etsi kaikilta tileiltä"
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:931
+#: ../src/modules/mail/e-mail-shell-view-private.c:929
 #, 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:940
-#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:944
+#: ../src/modules/mail/e-mail-shell-view-private.c:961
 #, 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:966
-#: ../src/modules/mail/e-mail-shell-view-private.c:972
+#: ../src/modules/mail/e-mail-shell-view-private.c:975
+#: ../src/modules/mail/e-mail-shell-view-private.c:981
 #, 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:979
+#: ../src/modules/mail/e-mail-shell-view-private.c:988
 #, 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:985
+#: ../src/modules/mail/e-mail-shell-view-private.c:994
 #, 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:991
+#: ../src/modules/mail/e-mail-shell-view-private.c:1000
 #, 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:1008
+#: ../src/modules/mail/e-mail-shell-view-private.c:1017
 #, 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:1526
+#: ../src/modules/mail/e-mail-shell-view-private.c:1535
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
@@ -24550,21 +24469,19 @@ 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:1564
+#: ../src/modules/mail/em-mailer-prefs.c:1570
 msgid "_Date header:"
 msgstr "_Päiväysotsake:"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1565
+#: ../src/modules/mail/em-mailer-prefs.c:1571
 msgid "Show _original header value"
 msgstr "Näytä _alkuperäinen otsakkeen arvo"
 
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
-#| msgid "Do not warn me again"
 msgid "Do _not change settings"
 msgstr "_Älä muuta asetuksia"
 
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
-#| msgid "Mark as default memo list"
 msgid "_Set as default email client"
 msgstr "_Aseta oletussovellukseksi sähköpostille"
 
@@ -24614,13 +24531,11 @@ msgstr ""
 
 #: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
-msgstr ""
-"Evolution on yhteydettömässä tilassa, koska verkko ei ole käytettävissä."
+msgstr "Evolution on yhteydettömässä tilassa, koska verkko ei ole käytettävissä."
 
 #: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
-"Evolution will return to online mode once a network connection is "
-"established."
+"Evolution will return to online mode once a network connection is established."
 msgstr "Evolution palaa yhdistettyyn tilaan, kun verkko on taas käytettävissä."
 
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:65
@@ -24633,8 +24548,7 @@ msgstr "Lisäosien hallinta"
 
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:266
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
-"Huomio: jotkut muutokset eivät astu voimaan ennen uudelleenkäynnistystä"
+msgstr "Huomio: jotkut muutokset eivät astu voimaan ennen uudelleenkäynnistystä"
 
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:294
 msgid "Overview"
@@ -24689,11 +24603,11 @@ msgstr "Näytä raakatekstinä, jos mahdollista"
 #: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../src/modules/prefer-plain/plugin/config-ui.c:40
 msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
+"Show plain text part, if present, otherwise let Evolution choose the best part to "
+"show."
 msgstr ""
-"Näytä raakatekstiosa, jos se on saatavilla, muussa tapauksessa anna "
-"Evolutionin valita näytettäväksi paras osa."
+"Näytä raakatekstiosa, jos se on saatavilla, muussa tapauksessa anna Evolutionin "
+"valita näytettäväksi paras osa."
 
 #: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:86
 #: ../src/modules/prefer-plain/plugin/config-ui.c:44
@@ -24704,12 +24618,12 @@ msgstr "Näytä raakatekstinä jos käytettävissä, tai HTML-lähdekoodi"
 #: ../src/modules/prefer-plain/plugin/config-ui.c:45
 #, fuzzy
 #| msgid ""
-#| "Show plain text part, if present, otherwise let Evolution choose the best "
-#| "part to show."
+#| "Show plain text part, if present, otherwise let Evolution choose the best part "
+#| "to show."
 msgid "Show plain text part, if present, otherwise the HTML part source."
 msgstr ""
-"Näytä raakatekstiosa, jos se on saatavilla, muussa tapauksessa anna "
-"Evolutionin valita näytettäväksi paras osa."
+"Näytä raakatekstiosa, jos se on saatavilla, muussa tapauksessa anna Evolutionin "
+"valita näytettäväksi paras osa."
 
 #: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:91
 #: ../src/modules/prefer-plain/plugin/config-ui.c:49
@@ -24719,11 +24633,9 @@ msgstr "Näytä aina raakatekstinä"
 #: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:92
 #: ../src/modules/prefer-plain/plugin/config-ui.c:50
 msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
+"Always show plain text part and make attachments from other parts, if requested."
 msgstr ""
-"Näytä aina raakatekstinä ja tee muista osista liitetiedostoja, jos niin "
-"pyydetään."
+"Näytä aina raakatekstinä ja tee muista osista liitetiedostoja, jos niin pyydetään."
 
 #: ../src/modules/prefer-plain/plugin/config-ui.c:101
 msgid "Show s_uppressed HTML parts as attachments"
@@ -24782,11 +24694,11 @@ msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Tämä tekee SpamAssassinista luotettavamman, mutta hitaamman."
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:740
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:2
 msgid "Junk filter using SpamAssassin"
 msgstr "Roskapostisuodatus SpamAssassinia käyttäen"
 
@@ -24809,8 +24721,8 @@ msgstr "Tuonti valmistui."
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
-"The next few screens will allow Evolution to connect to your email accounts, "
-"and to import files from other applications."
+"The next few screens will allow Evolution to connect to your email accounts, and "
+"to import files from other applications."
 msgstr ""
 "Tervetuloa Evolutioniin.\n"
 "\n"
@@ -24818,7 +24730,6 @@ msgstr ""
 "sähköpostitileihisi ja tuo tarvittavia tietoja muista sovelluksista."
 
 #: ../src/modules/startup-wizard/e-startup-assistant.c:165
-#| msgid "Do not show this message again"
 msgid "Do not _show this wizard again"
 msgstr "Älä näytä tätä avustajaa uu_destaan"
 
@@ -25077,9 +24988,8 @@ msgstr[0] "Löytyi %d muu yhteystieto."
 msgstr[1] "Löytyi %d muuta yhteystietoa."
 
 #: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:218
-#, fuzzy
 msgid "Addressbook Contact"
-msgstr "Osoitekirjan ominaisuudet"
+msgstr "Osoitekirjan yhteystieto"
 
 #: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:219
 msgid "Display the part as an addressbook contact"
@@ -25100,11 +25010,11 @@ msgstr "Viestissä ei ole liitteitä"
 
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
+"Evolution has found some keywords that suggest that this message should contain an "
+"attachment, but cannot find one."
 msgstr ""
-"Evolution löysi joitain avainsanoja, joista ohjelma päätteli että tämän "
-"viestin pitäisi sisältää liitetiedosto, mutta liitettä ei ole lisätty."
+"Evolution löysi joitain avainsanoja, joista ohjelma päätteli että tämän viestin "
+"pitäisi sisältää liitetiedosto, mutta liitettä ei ole lisätty."
 
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
@@ -25162,14 +25072,13 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
+"Automatically fills your address book with names and email addresses as you reply "
+"to messages.  Also fills in IM contact information from your buddy lists."
 msgstr ""
 "Huolehtii tylsistä osoitekirjan hallintatehtävistä.\n"
 "\n"
-"Lisää nimet ja sähköpostiosoitteet automaattisesti osoitekirjaan, kun "
-"vastaat viesteihin. Liittää myös IM-yhteystiedot tuttavalistoiltasi."
+"Lisää nimet ja sähköpostiosoitteet automaattisesti osoitekirjaan, kun vastaat "
+"viesteihin. Liittää myös IM-yhteystiedot tuttavalistoiltasi."
 
 #: ../src/plugins/dbx-import/dbx-importer.c:274
 msgid "Importing Outlook Express data"
@@ -25303,11 +25212,11 @@ msgstr "Muokkainta ei voi käynnistää"
 
 #: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
+"The external editor set in your plugin preferences cannot be launched. Try setting "
+"a different editor."
 msgstr ""
-"Lisäosien asetuksissa määriteltyä ulkoista muokkainta ei voi käynnistää. "
-"Yritä käyttää muuta komentoa."
+"Lisäosien asetuksissa määriteltyä ulkoista muokkainta ei voi käynnistää. Yritä "
+"käyttää muuta komentoa."
 
 #: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid "Cannot create Temporary File"
@@ -25315,8 +25224,7 @@ msgstr "Väliaikaista tiedostoa ei voi luoda"
 
 #: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
+"Evolution is unable to create a temporary file to save your mail. Retry later."
 msgstr ""
 "Evolution ei voinut luoda väliaikaistiedostoa viestin tallentamiseksi. Yritä "
 "myöhemmin uudestaan."
@@ -25327,11 +25235,11 @@ msgstr "Ulkoinen muokkain on edelleen käynnissä"
 
 #: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
+"The external editor is still running. The mail composer window cannot be closed as "
+"long as the editor is active."
 msgstr ""
-"Ulkoinen muokkain on vielä käynnissä. Viestin lähetysikkunaa ei voi sulkea "
-"ennen kuin ulkoinen muokkain on käynnissä."
+"Ulkoinen muokkain on vielä käynnissä. Viestin lähetysikkunaa ei voi sulkea ennen "
+"kuin ulkoinen muokkain on käynnissä."
 
 #: ../src/plugins/face/face.c:292
 msgid "Select a Face Picture"
@@ -25379,10 +25287,9 @@ msgstr "Virheellinen kuvakoko"
 #| "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
 #| "exceed 723 bytes."
 msgid ""
-"Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t "
-"exceed 723 bytes."
-msgstr ""
-"Valitse PNG-kuva kokoa 48 * 48 pikseliä, jonka koko ei ylitä 723 tavua."
+"Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t exceed "
+"723 bytes."
+msgstr "Valitse PNG-kuva kokoa 48 * 48 pikseliä, jonka koko ei ylitä 723 tavua."
 
 #: ../src/plugins/face/org-gnome-face.error.xml.h:5
 msgid "Incorrect Face Image Byte Size"
@@ -25394,11 +25301,10 @@ msgstr ""
 #| "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
 #| "exceed 723 bytes."
 msgid ""
-"The Face image size is {0} bytes, while it should not be more than 723 "
-"bytes. Please select a PNG image of size 48 × 48 pixels, whose file size "
-"doesn’t exceed 723 bytes."
-msgstr ""
-"Valitse PNG-kuva kokoa 48 * 48 pikseliä, jonka koko ei ylitä 723 tavua."
+"The Face image size is {0} bytes, while it should not be more than 723 bytes. "
+"Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t exceed "
+"723 bytes."
+msgstr "Valitse PNG-kuva kokoa 48 * 48 pikseliä, jonka koko ei ylitä 723 tavua."
 
 #: ../src/plugins/face/org-gnome-face.error.xml.h:7
 msgid "Not an image"
@@ -25408,67 +25314,67 @@ msgstr "Tiedosto ei ole kuvatiedosto"
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "Valittu tiedosto ei näytä kelvolliselta png-kuvalta. Virhe: {0}"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:413
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:417
 msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:415
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:419
 msgid "Get an archive of the list this message belongs to"
 msgstr "Nouda arkisto viestin sisältämästä postituslistasta"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:420
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:424
 #, fuzzy
 #| msgid "_Message Source"
 msgid "Copy _Message Archive URL"
 msgstr "_Viestin lähdekoodi"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:422
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:426
 #, fuzzy
 #| msgid "Redirect (bounce) the selected message to someone"
 msgid "Copy direct URL for the selected message in its archive"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:427
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:431
 msgid "Get List _Usage Information"
 msgstr "Näytä tietoja listan _käytöstä"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:429
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:433
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Nouda tietoja viestin sisältämän postituslistan käytöstä"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:434
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:438
 msgid "Contact List _Owner"
 msgstr "Ota yhteyttä listan _omistajaan"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:436
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:440
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Ota yhteyttä viestin sisältämän sähköpostilistan omistajaan"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:441
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:445
 msgid "_Post Message to List"
 msgstr "_Lähetä viesti listalle"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:443
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:447
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Kirjoita vastaus viestin sisältämälle sähköpostilistalle"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:448
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:452
 msgid "_Subscribe to List"
 msgstr "_Tilaa lista"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:450
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:454
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Tilaa viestin sisältämä postituslista"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:455
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:459
 msgid "_Unsubscribe from List"
 msgstr "Per_u listan tilaus"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:457
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:461
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Peru viestin sisältämän postituslistan tilaus"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:464
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:468
 msgid "Mailing _List"
 msgstr "Postitus_lista"
 
@@ -25486,10 +25392,8 @@ msgstr "Toiminto ei käytettävissä"
 
 #: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"This message does not contain the header information required for this "
-"action."
-msgstr ""
-"Tämä viesti ei sisällä otsaketietoja, jotka vaaditaan tähän toimenpiteeseen."
+"This message does not contain the header information required for this action."
+msgstr "Tämä viesti ei sisällä otsaketietoja, jotka vaaditaan tähän toimenpiteeseen."
 
 #: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 msgid "Posting not allowed"
@@ -25497,8 +25401,8 @@ msgstr "Postitus ei ole sallittu"
 
 #: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
 msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
+"Posting to this mailing list is not allowed. Possibly, this is a read-only mailing "
+"list. Contact the list owner for details."
 msgstr ""
 "Tälle sähköpostilistalle lähetys ei ole sallittu. Voi olla että tämä on vain "
 "luettavissa oleva sähköpostilista. Kysy lisätietoja listan omistajalta."
@@ -25510,23 +25414,22 @@ msgstr "Lähetä sähköpostiviesti listalle?"
 #: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 #, fuzzy
 #| msgid ""
-#| "An e-mail message will be sent to the URL \"{0}\". You can either send "
-#| "the message automatically, or see and change it first.\n"
+#| "An e-mail message will be sent to the URL \"{0}\". You can either send the "
+#| "message automatically, or see and change it first.\n"
 #| "\n"
-#| "You should receive an answer from the mailing list shortly after the "
-#| "message has been sent."
+#| "You should receive an answer from the mailing list shortly after the message "
+#| "has been sent."
 msgid ""
-"An e-mail message will be sent to the URL “{0}”. You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL “{0}”. You can either send the message "
+"automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has "
+"been sent."
 msgstr ""
 "Sähköpostiviesti lähetetään URLiin \"{0}\". Voit joko lähettää viestin "
 "automaattisesti tai katsoa ja muuttaa sitä ensin.\n"
 "\n"
-"saat vastauksen sähköpostilistalta vähän sen jälkeen kun viestisi on "
-"lähetetty."
+"saat vastauksen sähköpostilistalta vähän sen jälkeen kun viestisi on lähetetty."
 
 #: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "_Send message"
@@ -25556,13 +25459,13 @@ msgstr "Ei sähköpostitoimintoa"
 
 #: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain any "
+"action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Tätä toimintoa ei voitu suorittaa. Otsake toimenpiteelle ei sisältänyt "
-"mitään toimintoa, joka voidaan käsitellä.\n"
+"Tätä toimintoa ei voitu suorittaa. Otsake toimenpiteelle ei sisältänyt mitään "
+"toimintoa, joka voidaan käsitellä.\n"
 "\n"
 "Otsake: {0}"
 
@@ -25637,125 +25540,123 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Huomauttaa uusien viestien saapumisesta."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../src/plugins/mail-to-task/mail-to-task.c:194
+#: ../src/plugins/mail-to-task/mail-to-task.c:200
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Luotu sähköpostiviestistä, jonka lähetti %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:576
+#: ../src/plugins/mail-to-task/mail-to-task.c:605
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Peru"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:578
+#: ../src/plugins/mail-to-task/mail-to-task.c:607
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:580
+#: ../src/plugins/mail-to-task/mail-to-task.c:609
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:598
+#: ../src/plugins/mail-to-task/mail-to-task.c:627
 #, fuzzy, c-format
 #| msgid ""
-#| "Selected calendar contains event '%s' already. Would you like to edit the "
-#| "old event?"
+#| "Selected calendar contains event '%s' already. Would you like to edit the old "
+#| "event?"
 msgid ""
-"Selected calendar contains event “%s” already. Would you like to edit the "
-"old event?"
+"Selected calendar contains event “%s” already. Would you like to edit the old "
+"event?"
 msgstr ""
-"Valittu kalenteri sisältää jo tapahtuman \"%s\". Haluatko muokata aiemmin "
-"lisättyä tapahtumaa?"
+"Valittu kalenteri sisältää jo tapahtuman \"%s\". Haluatko muokata aiemmin lisättyä "
+"tapahtumaa?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:601
+#: ../src/plugins/mail-to-task/mail-to-task.c:630
 #, fuzzy, c-format
 #| msgid ""
-#| "Selected task list contains task '%s' already. Would you like to edit the "
-#| "old task?"
+#| "Selected task list contains task '%s' already. Would you like to edit the old "
+#| "task?"
 msgid ""
-"Selected task list contains task “%s” already. Would you like to edit the "
-"old task?"
+"Selected task list contains task “%s” already. Would you like to edit the old task?"
 msgstr ""
 "Valittu tehtävälista sisältää jo tehtävän \"%s\". Haluatko muokata aiemmin "
 "lisättyä tehtävää?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:604
+#: ../src/plugins/mail-to-task/mail-to-task.c:633
 #, fuzzy, c-format
 #| msgid ""
-#| "Selected memo list contains memo '%s' already. Would you like to edit the "
-#| "old memo?"
+#| "Selected memo list contains memo '%s' already. Would you like to edit the old "
+#| "memo?"
 msgid ""
-"Selected memo list contains memo “%s” already. Would you like to edit the "
-"old memo?"
+"Selected memo list contains memo “%s” already. Would you like to edit the old memo?"
 msgstr ""
-"Valittu muistilappulista sisältää jo muistilapun \"%s\". Haluatko muokata "
-"aiemmin lisättyä muistilappua?"
+"Valittu muistilappulista sisältää jo muistilapun \"%s\". Haluatko muokata aiemmin "
+"lisättyä muistilappua?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:624
+#: ../src/plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
-"You have selected %d mails to be converted to events. Do you really want to "
-"add them all?"
+"You have selected %d mails to be converted to events. Do you really want to add "
+"them all?"
 msgid_plural ""
-"You have selected %d mails to be converted to events. Do you really want to "
-"add them all?"
+"You have selected %d mails to be converted to events. Do you really want to add "
+"them all?"
 msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:631
+#: ../src/plugins/mail-to-task/mail-to-task.c:660
 #, c-format
 msgid ""
-"You have selected %d mails to be converted to tasks. Do you really want to "
-"add them all?"
+"You have selected %d mails to be converted to tasks. Do you really want to add "
+"them all?"
 msgid_plural ""
-"You have selected %d mails to be converted to tasks. Do you really want to "
-"add them all?"
+"You have selected %d mails to be converted to tasks. Do you really want to add "
+"them all?"
 msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:638
+#: ../src/plugins/mail-to-task/mail-to-task.c:667
 #, c-format
 msgid ""
-"You have selected %d mails to be converted to memos. Do you really want to "
-"add them all?"
+"You have selected %d mails to be converted to memos. Do you really want to add "
+"them all?"
 msgid_plural ""
-"You have selected %d mails to be converted to memos. Do you really want to "
-"add them all?"
+"You have selected %d mails to be converted to memos. Do you really want to add "
+"them all?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:659
+#: ../src/plugins/mail-to-task/mail-to-task.c:688
 #, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Haluatko ylikirjoittaa?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:735
+#: ../src/plugins/mail-to-task/mail-to-task.c:764
 msgid "[No Summary]"
 msgstr "[Ei yhteenvetoa]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:748
+#: ../src/plugins/mail-to-task/mail-to-task.c:777
 msgid "Invalid object returned from a server"
 msgstr "Palvelin palautti virheellisen olion"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:802
+#: ../src/plugins/mail-to-task/mail-to-task.c:831
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Tapahtui virhe käsiteltäessä: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:838
+#: ../src/plugins/mail-to-task/mail-to-task.c:869
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:842
+#: ../src/plugins/mail-to-task/mail-to-task.c:873
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -25763,59 +25664,59 @@ 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:845
+#: ../src/plugins/mail-to-task/mail-to-task.c:876
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create task there. Select other "
 #| "source, please."
 msgid ""
-"Selected task list is read only, thus cannot create task there. Select other "
-"task list, please."
+"Selected task list is read only, thus cannot create task there. Select other task "
+"list, please."
 msgstr ""
-"Valittu lähde on vain luettavissa, joten et voi luoda siihen tehtäviä. "
-"Valitse joku toinen lähde."
+"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:848
+#: ../src/plugins/mail-to-task/mail-to-task.c:879
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create memo there. Select other "
 #| "source, please."
 msgid ""
-"Selected memo list is read only, thus cannot create memo there. Select other "
-"memo list, please."
+"Selected memo list is read only, thus cannot create memo there. Select other memo "
+"list, please."
 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:1252
+#: ../src/plugins/mail-to-task/mail-to-task.c:1301
 msgid "Create an _Appointment"
 msgstr "Luo _tapaaminen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1254
+#: ../src/plugins/mail-to-task/mail-to-task.c:1303
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1259
+#: ../src/plugins/mail-to-task/mail-to-task.c:1308
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1261
+#: ../src/plugins/mail-to-task/mail-to-task.c:1310
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1266
+#: ../src/plugins/mail-to-task/mail-to-task.c:1315
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1268
+#: ../src/plugins/mail-to-task/mail-to-task.c:1317
 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:1276
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1278
+#: ../src/plugins/mail-to-task/mail-to-task.c:1327
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
@@ -25823,12 +25724,12 @@ msgstr "Luo uusi kokous valitusta viestistä"
 msgid "Convert a mail message to a task."
 msgstr "Muunna valittu viesti tehtäväksi."
 
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:1
 #: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlookin PST-tuoja"
 
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:2
 #: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "Tuo Outlook-viestejä PST-tiedostosta"
@@ -25872,38 +25773,38 @@ msgid "Publish calendars to the web."
 msgstr "Julkaise kalenterit verkossa."
 
 #: ../src/plugins/publish-calendar/publish-calendar.c:215
-#: ../src/plugins/publish-calendar/publish-calendar.c:482
+#: ../src/plugins/publish-calendar/publish-calendar.c:483
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ei voitu avata %s:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:234
+#: ../src/plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Virhe julkaistaessa kohteeseen %s:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:240
+#: ../src/plugins/publish-calendar/publish-calendar.c:241
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Julkaisu kohteeseen %s onnistui"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:288
+#: ../src/plugins/publish-calendar/publish-calendar.c:289
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Kohteen %s liittäminen epäonnistui:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:787
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
 msgid "Are you sure you want to remove this location?"
 msgstr "Haluatko varmasti poistaa tämän sijainnin?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../src/plugins/publish-calendar/publish-calendar.c:1097
+#: ../src/plugins/publish-calendar/publish-calendar.c:1098
 msgid "Could not create publish thread."
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:1107
+#: ../src/plugins/publish-calendar/publish-calendar.c:1108
 msgid "_Publish Calendar Information"
 msgstr "_Julkaise kalenteritietoja"
 
@@ -25912,91 +25813,88 @@ msgid "iCal"
 msgstr "iCal"
 
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:3
+#, fuzzy
+#| msgid "Free/Busy information"
+msgid "Free/Busy with Details"
+msgstr "Vapaa/varattu-tiedot"
+
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "Daily"
 msgstr "Päivittäin"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Weekly"
 msgstr "Viikoittain"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Manual (via Actions menu)"
 msgstr "Käsin (Toiminnot-valikon kautta)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Secure FTP (SFTP)"
 msgstr "Salattu FTP (SFTP)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "Public FTP"
 msgstr "Julkinen FTP"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "FTP (with login)"
 msgstr "FTP (sisäänkirjautumisen vaativa)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Windows share"
 msgstr "Windows-jako"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Salattu WebDAV (HTTPS)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Custom Location"
 msgstr "Mukautettu sijainti"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "_Publish as:"
 msgstr "_Julkaise muodossa:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Publishing _Frequency:"
 msgstr "Julkaisu_tiheys:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
 msgid "Time _duration:"
 msgstr "_Kesto:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Sources"
 msgstr "Lähteet"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "Service _type:"
 msgstr "Palvelun _tyyppi:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_File:"
 msgstr "_Tiedosto:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "P_ort:"
 msgstr "P_ortti:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
+#: ../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:29
-#: ../src/smime/gui/certificate-manager.c:785
-msgid "_Password:"
-msgstr "_Salasana:"
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "_Remember password"
-msgstr "_Muista salasana"
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "Publishing Location"
 msgstr "Julkaisupaikka"
 
-#: ../src/plugins/publish-calendar/publish-format-fb.c:82
+#: ../src/plugins/publish-calendar/publish-format-fb.c:83
 #: ../src/plugins/publish-calendar/publish-format-ical.c:102
 #, fuzzy, c-format
 msgid "Invalid source UID “%s”"
@@ -26085,8 +25983,7 @@ msgstr "_Kapsuloi arvot käyttäen:"
 msgid "Comma separated values (.csv)"
 msgstr "Pilkuin erotetut arvot (.csv)"
 
-#: ../src/plugins/save-calendar/ical-format.c:181
-#: ../src/shell/e-shell-utils.c:182
+#: ../src/plugins/save-calendar/ical-format.c:181 ../src/shell/e-shell-utils.c:182
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -26142,8 +26039,8 @@ msgstr "Ei otsikkoa"
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an email you are replying to."
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from an "
+"email you are replying to."
 msgstr ""
 
 #: ../src/plugins/templates/templates.c:1299
@@ -26559,13 +26456,13 @@ msgid "New"
 msgstr "Uusi"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:721
+#: ../src/shell/e-shell-window-private.c:756
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s — Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../src/shell/main.c:195
+#: ../src/shell/main.c:192
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26601,7 +26498,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../src/shell/main.c:219
+#: ../src/shell/main.c:216
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -26609,71 +26506,71 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../src/shell/main.c:225
+#: ../src/shell/main.c:222
 msgid "Do not tell me again"
 msgstr "Älä kerro tätä uudestaan"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:314
+#: ../src/shell/main.c:311
 #, fuzzy
 #| msgid ""
-#| "Start Evolution showing the specified component. Available options are "
-#| "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+#| "Start Evolution showing the specified component. Available options are 'mail', "
+#| "'calendar', 'contacts', 'tasks', and 'memos'"
 msgid ""
-"Start Evolution showing the specified component. Available options are "
-"“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
+"Start Evolution showing the specified component. Available options are “mail”, "
+"“calendar”, “contacts”, “tasks”, and “memos”"
 msgstr ""
-"Käynnistä Evolution näyttäen tiettyä näkymää. Käytettävissä olevat valinnat "
-"ovat 'mail', 'calendar', 'contacts', 'tasks' ja 'memos'"
+"Käynnistä Evolution näyttäen tiettyä näkymää. Käytettävissä olevat valinnat ovat "
+"'mail', 'calendar', 'contacts', 'tasks' ja 'memos'"
 
-#: ../src/shell/main.c:318
+#: ../src/shell/main.c:315
 msgid "Apply the given geometry to the main window"
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../src/shell/main.c:322
+#: ../src/shell/main.c:319
 msgid "Start in online mode"
 msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../src/shell/main.c:324
+#: ../src/shell/main.c:321
 msgid "Ignore network availability"
 msgstr "Älä kiinnitä huomiota, onko verkko käytettävissä vai ei"
 
-#: ../src/shell/main.c:327
+#: ../src/shell/main.c:324
 msgid "Forcibly shut down Evolution"
 msgstr "Sammuta Evolution väkisin"
 
-#: ../src/shell/main.c:330
+#: ../src/shell/main.c:327
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään lisäosia."
 
-#: ../src/shell/main.c:332
+#: ../src/shell/main.c:329
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
 
-#: ../src/shell/main.c:336
+#: ../src/shell/main.c:333
 #, fuzzy
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Tuo argumentteina annettavat URI-osoitteet tai tiedostot."
 
-#: ../src/shell/main.c:338
+#: ../src/shell/main.c:335
 msgid "Request a running Evolution process to quit"
 msgstr "Pyydä käynnissä olevaa Evolution-prosessia lopettamaan"
 
-#: ../src/shell/main.c:415
+#: ../src/shell/main.c:417
 #, c-format
 msgid ""
-"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
-"System error: %s"
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. System "
+"error: %s"
 msgstr ""
-"Evolutionin käynnistäminen epäonnistui. Toinen Evolution-istunto saattaa "
-"olla reagoimaton. Järjestelmävirhe: %s"
+"Evolutionin käynnistäminen epäonnistui. Toinen Evolution-istunto saattaa olla "
+"reagoimaton. Järjestelmävirhe: %s"
 
-#: ../src/shell/main.c:466 ../src/shell/main.c:471
+#: ../src/shell/main.c:473 ../src/shell/main.c:478
 msgid "— The Evolution PIM and Email Client"
 msgstr "— Evolution, henkilökohtaisten tietojen hallinta sekä sähköposti"
 
-#: ../src/shell/main.c:533
+#: ../src/shell/main.c:540
 #, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26682,7 +26579,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:539
+#: ../src/shell/main.c:546
 #, fuzzy, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -26699,8 +26596,7 @@ msgstr "Päivitys edellisestä versiosta epäonnistui:"
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{0}\n"
 "\n"
@@ -26720,12 +26616,12 @@ msgstr "Versiosta {0} ei voi päivittää suoraan"
 
 #: ../src/shell/shell.error.xml.h:10
 msgid ""
-"Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
+"Evolution no longer supports upgrading directly from version {0}. However as a "
+"workaround you might try first upgrading to Evolution 2, and then upgrading to "
+"Evolution 3."
 msgstr ""
-"Evolution ei enää tue päivittämistä suoraan versiosta {0}. Kiertokeinona "
-"voit kokeilla päivittää ensin Evolutionin versioon 2 ja sitten versioon 3."
+"Evolution ei enää tue päivittämistä suoraan versiosta {0}. Kiertokeinona voit "
+"kokeilla päivittää ensin Evolutionin versioon 2 ja sitten versioon 3."
 
 #: ../src/shell/shell.error.xml.h:11
 #, fuzzy
@@ -26735,9 +26631,9 @@ msgstr "Tuntematon taustatoiminto"
 
 #: ../src/shell/shell.error.xml.h:12
 msgid ""
-"Evolution is taking a long time to shut down, possibly due to network "
-"connectivity issues. Would you like to cancel all pending operations and "
-"close immediately, or keep waiting?"
+"Evolution is taking a long time to shut down, possibly due to network connectivity "
+"issues. Would you like to cancel all pending operations and close immediately, or "
+"keep waiting?"
 msgstr ""
 
 #: ../src/shell/shell.error.xml.h:13
@@ -26770,22 +26666,18 @@ msgid "_Reconnect"
 msgstr "_Yhdistä uudelleen"
 
 #: ../src/shell/shell.error.xml.h:19
-#, fuzzy
-#| msgid "Unable to open address book '{0}'"
 msgid "Failed to connect address book “{0}”"
-msgstr "Osoitekirjan '{0}' avaaminen epäonnistui"
+msgstr "Yhteys osoitekirjaan “{0}” epäonnistui"
 
 #: ../src/shell/shell.error.xml.h:20
-#, fuzzy
 #| msgid "Failed to load the calendar '%s' (%s)"
 msgid "Failed to connect calendar “{0}”"
-msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+msgstr "Yhteys kalenteriin “{0}” epäonnistui"
 
 #: ../src/shell/shell.error.xml.h:21
-#, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Failed to connect mail account “{0}”"
-msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
+msgstr "Yhteys sähköpostitiliin “{0}” epäonnistui"
 
 #: ../src/shell/shell.error.xml.h:22
 #, fuzzy
@@ -26962,8 +26854,8 @@ msgstr ""
 #. To Translators: this text was copied from Firefox
 #: ../src/smime/gui/certificate-manager.c:780
 msgid ""
-"The certificate backup password you set here protects the backup file that "
-"you are about to create.\n"
+"The certificate backup password you set here protects the backup file that you are "
+"about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
 
@@ -26979,8 +26871,8 @@ msgstr "Salasanat eivät täsmää"
 #: ../src/smime/gui/certificate-manager.c:826
 msgid ""
 "Important:\n"
-"If you forget your certificate backup password, you will not be able to "
-"restore this backup later.\n"
+"If you forget your certificate backup password, you will not be able to restore "
+"this backup later.\n"
 "Please record it in a safe location."
 msgstr ""
 
@@ -27078,11 +26970,11 @@ msgstr "V_astausta pyydetty"
 #: ../src/smime/gui/certificate-manager.c:1391
 #, fuzzy
 #| msgid ""
-#| "Before trusting this CA for any purpose, you should examine its "
-#| "certificate and its policy and procedures (if available)."
+#| "Before trusting this CA for any purpose, you should examine its certificate and "
+#| "its policy and procedures (if available)."
 msgid ""
-"Before trusting this site, you should examine its certificate and its policy "
-"and procedures (if available)."
+"Before trusting this site, you should examine its certificate and its policy and "
+"procedures (if available)."
 msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
@@ -27133,21 +27025,20 @@ msgstr "Kaikki CA-varmenteiden tiedostot"
 
 #: ../src/smime/gui/cert-trust-dialog.c:150
 msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
+"Because you trust the certificate authority that issued this certificate, then you "
+"trust the authenticity of this certificate unless otherwise indicated here"
 msgstr ""
 "Koska luotat varmentajaan, joka myönsi tämän varmenteen, luotat myös tämän "
 "varmenteen oikeellisuuteen, jollei tässä muuten mainita"
 
 #: ../src/smime/gui/cert-trust-dialog.c:155
 msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
+"Because you do not trust the certificate authority that issued this certificate, "
+"then you do not trust the authenticity of this certificate unless otherwise "
+"indicated here"
 msgstr ""
-"Koska et luota varmentajaan, joka myönsi tämän varmenteen, et "
-"automaattisesti luota tähän varmenteeseen, jollei tässä muuten mainita"
+"Koska et luota varmentajaan, joka myönsi tämän varmenteen, et automaattisesti "
+"luota tähän varmenteeseen, jollei tässä muuten mainita"
 
 #: ../src/smime/gui/component.c:53
 #, fuzzy, c-format
@@ -27204,8 +27095,7 @@ msgid "Contact Certificates"
 msgstr "Tuttavien varmenteet"
 
 #: ../src/smime/gui/smime-ui.ui.h:13
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "Seuraavat varmentajat voidaan tunnistaa tallentamistasi varmenteista:"
 
 #: ../src/smime/gui/smime-ui.ui.h:14
@@ -27233,8 +27123,8 @@ msgstr "Luota tähän CA:han ohjelmistokehittäjien tunnistamisessa."
 
 #: ../src/smime/gui/smime-ui.ui.h:22
 msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
+"Before trusting this CA for any purpose, you should examine its certificate and "
+"its policy and procedures (if available)."
 msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
@@ -27317,6 +27207,114 @@ msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 msgid "Imported Certificate"
 msgstr "Tuotu varmenne"
 
+#~ msgid ""
+#~ "Check to make sure your password is spelled correctly and that you are using a "
+#~ "supported login method. Remember that many passwords are case sensitive; your "
+#~ "caps lock might be on."
+#~ msgstr ""
+#~ "Tarkista, että salasanasi on kirjoitettu oikein ja käytät palvelimen tukemaa "
+#~ "kirjautumistapaa. Muista että monissa salasanoissa isot ja pienet kirjaimet "
+#~ "ovat eri asia. Tarkista myös ettei Caps Lock ole päällä."
+
+#~ msgid "1st"
+#~ msgstr "1."
+
+#~ msgid "2nd"
+#~ msgstr "2."
+
+#~ msgid "3rd"
+#~ msgstr "3."
+
+#~ msgid "4th"
+#~ msgstr "4."
+
+#~ msgid "5th"
+#~ msgstr "5."
+
+#~ msgid "6th"
+#~ msgstr "6."
+
+#~ msgid "7th"
+#~ msgstr "7."
+
+#~ msgid "8th"
+#~ msgstr "8."
+
+#~ msgid "9th"
+#~ msgstr "9."
+
+#~ msgid "10th"
+#~ msgstr "10."
+
+#~ msgid "11th"
+#~ msgstr "11."
+
+#~ msgid "12th"
+#~ msgstr "12."
+
+#~ msgid "13th"
+#~ msgstr "13."
+
+#~ msgid "14th"
+#~ msgstr "14."
+
+#~ msgid "15th"
+#~ msgstr "15."
+
+#~ msgid "16th"
+#~ msgstr "16."
+
+#~ msgid "17th"
+#~ msgstr "17."
+
+#~ msgid "18th"
+#~ msgstr "18."
+
+#~ msgid "19th"
+#~ msgstr "19."
+
+#~ msgid "20th"
+#~ msgstr "20."
+
+#~ msgid "21st"
+#~ msgstr "21."
+
+#~ msgid "22nd"
+#~ msgstr "22."
+
+#~ msgid "23rd"
+#~ msgstr "23."
+
+#~ msgid "24th"
+#~ msgstr "24."
+
+#~ msgid "25th"
+#~ msgstr "25."
+
+#~ msgid "26th"
+#~ msgstr "26."
+
+#~ msgid "27th"
+#~ msgstr "27."
+
+#~ msgid "28th"
+#~ msgstr "28."
+
+#~ msgid "29th"
+#~ msgstr "29."
+
+#~ msgid "30th"
+#~ msgstr "30."
+
+#~ msgid "31st"
+#~ msgstr "31."
+
+#~ msgid "OAuth2 Google"
+#~ msgstr "OAuth2 Google"
+
+#~ msgid "OAuth2"
+#~ msgstr "OAuth2"
+
 #~ msgid "Logfile to log filter actions."
 #~ msgstr "Lokitiedosto suodattimien toimenpiteille."
 
@@ -27387,11 +27385,9 @@ msgstr "Tuotu varmenne"
 #~ msgid "[vcard|csv]"
 #~ msgstr "[vcard|cvs]"
 
-#~ msgid ""
-#~ "Command line arguments error, please use --help option to see the usage."
+#~ msgid "Command line arguments error, please use --help option to see the usage."
 #~ msgstr ""
-#~ "Virhe komentoriviparametreissa, käytä optiota --help nähdäksesi "
-#~ "käyttöohjeet."
+#~ "Virhe komentoriviparametreissa, käytä optiota --help nähdäksesi käyttöohjeet."
 
 #~ msgid "Only support csv or vcard format."
 #~ msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
@@ -27478,8 +27474,7 @@ msgstr "Tuotu varmenne"
 #~ msgid "This memo has been deleted."
 #~ msgstr "Muistilappu on poistettu."
 
-#~ msgid ""
-#~ "%s  You have made changes. Forget those changes and close the editor?"
+#~ msgid "%s  You have made changes. Forget those changes and close the editor?"
 #~ msgstr "%s olet tehnyt muutoksia. Unohda nämä muutokset ja sulje muokkain?"
 
 #~ msgid "%s  You have made no changes, close the editor?"
@@ -27494,10 +27489,8 @@ msgstr "Tuotu varmenne"
 #~ msgid "This memo has been changed."
 #~ msgstr "Muistilappua on muutettu."
 
-#~ msgid ""
-#~ "%s  You have made changes. Forget those changes and update the editor?"
-#~ msgstr ""
-#~ "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?"
+#~ msgid "%s  You have made changes. Forget those changes and update the editor?"
+#~ msgstr "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?"
 
 #~ msgid "%s  You have made no changes, update the editor?"
 #~ msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
@@ -27622,18 +27615,14 @@ msgstr "Tuotu varmenne"
 #~ msgid "until"
 #~ msgstr "kunnes"
 
-#~ msgid "_Send Options"
-#~ msgstr "_Lähetysasetukset"
-
 #~ msgid "Print this task"
 #~ msgstr "Tulosta tämä tehtävä"
 
 #, fuzzy
 #~ msgid ""
-#~ "Task cannot be edited, because the selected task list does not support "
-#~ "assigned tasks"
-#~ msgstr ""
-#~ "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
+#~ "Task cannot be edited, because the selected task list does not support assigned "
+#~ "tasks"
+#~ msgstr "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
 #~ msgid "Due date is wrong"
 #~ msgstr "Eräpäivä on virheellinen"
@@ -27654,11 +27643,11 @@ msgstr "Tuotu varmenne"
 #~ msgstr "Tietojen haku kesken. Haluatko lähettää viestin?"
 
 #~ msgid ""
-#~ " There are few attachments getting downloaded. Sending the mail will "
-#~ "cause the mail to be sent without those pending attachments "
+#~ " There are few attachments getting downloaded. Sending the mail will cause the "
+#~ "mail to be sent without those pending attachments "
 #~ msgstr ""
-#~ " Joidenkin liitteiden lataus on vielä kesken. Viestin lähettäminen "
-#~ "aiheuttaa viestin lähetyksen ilman näitä keskeneräisiä liitteitä "
+#~ " Joidenkin liitteiden lataus on vielä kesken. Viestin lähettäminen aiheuttaa "
+#~ "viestin lähetyksen ilman näitä keskeneräisiä liitteitä "
 
 #~ msgid "SSL"
 #~ msgstr "SSL"
@@ -27728,25 +27717,23 @@ msgstr "Tuotu varmenne"
 
 #~ msgid "Underline color for misspelled words when using inline spelling."
 #~ msgstr ""
-#~ "Väärinkirjoitettujen sanojen alleviivauksen väri käytettäessä "
-#~ "kirjoituksen aikaista oikolukua."
+#~ "Väärinkirjoitettujen sanojen alleviivauksen väri käytettäessä kirjoituksen "
+#~ "aikaista oikolukua."
 
 #, fuzzy
 #~ msgid ""
-#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
-#~ "\" lines in the \"Messages\" column in vertical view"
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+#~ "lines in the \"Messages\" column in vertical view"
 #~ msgstr ""
-#~ "Määrittää käytetäänkö samaa fonttia sekä \"Lähettäjä\"- että "
-#~ "\"Vastaanottaja\"-riveillä \"Viestit\"-sarakkeessa käytettäessä "
-#~ "pystynäkymää."
+#~ "Määrittää käytetäänkö samaa fonttia sekä \"Lähettäjä\"- että \"Vastaanottaja\"-"
+#~ "riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
 
 #~ msgid ""
-#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
-#~ "\" lines in the \"Messages\" column in vertical view."
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+#~ "lines in the \"Messages\" column in vertical view."
 #~ msgstr ""
-#~ "Määrittää käytetäänkö samaa fonttia sekä \"Lähettäjä\"- että "
-#~ "\"Vastaanottaja\"-riveillä \"Viestit\"-sarakkeessa käytettäessä "
-#~ "pystynäkymää."
+#~ "Määrittää käytetäänkö samaa fonttia sekä \"Lähettäjä\"- että \"Vastaanottaja\"-"
+#~ "riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
 
 #, fuzzy
 #~| msgid "Invalid authentication"
@@ -27767,8 +27754,7 @@ msgstr "Tuotu varmenne"
 
 #~ msgid "Option is ignored if a match for custom junk headers is found."
 #~ msgstr ""
-#~ "Valitsin ohitetaan, jos täsmäävä oma sähköpostin roskapostiotsake "
-#~ "löydetään."
+#~ "Valitsin ohitetaan, jos täsmäävä oma sähköpostin roskapostiotsake löydetään."
 
 #~ msgid "Please select a valid backup file to restore."
 #~ msgstr "Valitse palautettavaksi kelvollinen Evolutionin varmuuskopio"
@@ -27792,9 +27778,6 @@ msgstr "Tuotu varmenne"
 #~ msgid "Path"
 #~ msgstr "Polku"
 
-#~ msgid "Enter Google password for user '%s'."
-#~ msgstr "Anna käyttäjän '%s' Google-salasana."
-
 #~ msgid "User declined to provide a password"
 #~ msgstr "Käyttäjä kieltäytyi antamasta salasanaa"
 



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