[evolution] Update Finnish translation



commit 2e3d6cc958fdc325fd06af29974e19d777460073
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Fri Feb 26 11:05:19 2021 +0000

    Update Finnish translation

 po/fi.po | 5820 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 3083 insertions(+), 2737 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index faf71ea7a3..fe2a39d3d1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2020-07-03 07:10+0000\n"
-"PO-Revision-Date: 2020-08-28 21:23+0300\n"
+"POT-Creation-Date: 2021-02-15 10:22+0000\n"
+"PO-Revision-Date: 2021-02-26 13:04+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -30,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2010-09-13 15:08+0000\n"
 "X-POT-Import-Date: 2012-03-05 15:05:59+0000\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -1066,10 +1066,10 @@ msgid "Default charset in which to compose messages"
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-#, fuzzy
-#| msgid "Default charset in which to compose messages."
 msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
-msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö."
+msgstr ""
+"Viestien kirjoittamisessa oletuksena käytetty merkistö. Jos ei asetettu, käytetään "
+"UTF-8."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
 #, fuzzy
@@ -1501,60 +1501,70 @@ msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-msgid "Convert UTC time in reply credits to local time"
+msgid "Paste plain text as preformatted"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid ""
+"When set, paste a plain text into the composer body as Preformatted paragraph. "
+"When not set, paste it as Normal paragraph."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+msgid "Convert UTC time in reply credits to local time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+msgid ""
 "Whether the time in reply credits should be converted to local time when it’s in "
 "UTC in the message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 #, fuzzy
 #| msgid "Failed to mark messages as read."
 msgid "Mark replied to messages as read"
 msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid ""
 "When replying to a message and marking it as being replied to, then whether also "
 "mark it as read."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Whether start Plain Text composer with Preformatted paragraph mode"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "When set to true, new Plain Text messages will have preselected Preformatted "
 "paragraph mode. The Normal paragraph mode will be used when set to false."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Set to “false” to block automatic display of attachments with Content-Disposition: "
 "inline."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Save file format for drag-and-drop operation"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Voi olla joko “mbox” tai “pdf”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images annoying and "
 "prefer to see a static image instead."
@@ -1562,21 +1572,21 @@ msgstr ""
 "Näytä animoidut kuvat HTML-viesteissä. Monista käyttäjistä animoidut kuvat ovat "
 "ärsyttäviä ja he haluavat nähdä kuvat ilman animaatioita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Enable or disable type ahead search feature"
 msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder names."
 msgstr ""
 "Ota sivupalkin hakutoiminto käyttöön etsiäksesi kansionimiä interaktiivisesti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 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:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list and "
 "folders."
@@ -1584,201 +1594,201 @@ 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:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 #, 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:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 #, 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:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 #, 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:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 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:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 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:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 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:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 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:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show notification about missing remote content"
 msgstr "Näytä ilmoitus puuttuvasta etäsisällöstä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then show a "
 "notification about it on top of the preview panel."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Show all message headers"
 msgstr "Näytä kaikki otsakkeet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 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:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 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:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean indicating "
 "whether the header is enabled. Disabled headers are not shown when viewing a "
 "message, but are still listed in Preferences."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Näytä lähettäjän kuva viesti-ikkunan lukupaneelissa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 #, fuzzy
 #| msgid "Search gravatar.com for photo of the sender"
 msgid "Search libravatar.org for photo of the sender"
 msgstr "Näytä lähettäjän valokuvaa gravatar.comista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 #, fuzzy
 #| msgid "Allow searching also at gravatar.com for photo of the sender."
 msgid "Allow searching also at libravatar.org for photo of the sender."
 msgstr "Salli lähettäjän kuvan etsiminen myös gravatar.com-palvelusta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 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:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 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:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 #, 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:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout also "
 "after the folder change."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 #, fuzzy
 msgid "Timeout for marking messages as seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 #, 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:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Show Attachment Bar"
 msgstr "Näytä liitepalkki"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 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:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Show the email-address of the sender in a separate column in the message list."
 msgstr "Näytä lähettäjän sähköpostiosoite viestiluettelossa erillisessä sarakkeessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 #, 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:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 #, 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:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 #, 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:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if Search "
 "Folders are disabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 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:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 #, fuzzy
 #| msgid ""
 #| "This key is read only once and reset to \"false\" after read. This unselects "
@@ -1790,66 +1800,66 @@ msgstr ""
 "Tämä avain luetaan kerran, ja nollataan arvoksi \"false\" lukemisen jälkeen.  Tämä "
 "peruu sähköpostin valinnan luettelosta ja poistaa esikatselun kansiolta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Layout style"
 msgstr "Asettelutyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid ""
 "The layout style determines where to place the preview pane in relation to the "
 "message list. “0” (Classic View) places the preview pane below the message list. "
 "“1” (Vertical View) places the preview pane next to the message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 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:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Terminal font"
 msgstr "Päätteen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "The terminal font for mail display."
 msgstr "Päätefontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Use custom fonts"
 msgstr "Käytä omia fontteja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -1857,11 +1867,11 @@ msgstr ""
 "Rajaa To-, Cc- ja Bcc-kentissä näytettävien osoitteiden lukumäärä avaimessa "
 "address_count määrättyyn arvoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 #, fuzzy
 #| msgid ""
 #| "This sets the number of addresses to show in default message list view, beyond "
@@ -1873,24 +1883,24 @@ msgstr ""
 "Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin lukumäärän, "
 "jonka jälkeen näytetään '...'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid "Show mails in headers part of the message preview when name is available"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "When set to false, the mail addresses which contain both the name and the email "
 "parts in headers like To/Cc/Bcc will be shown only with the name part, without the "
 "actual email, with the name made clickable."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do not "
 "contain In-Reply-To or References headers."
@@ -1898,11 +1908,11 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid ""
 "This setting specifies whether the threads should be in expanded or collapsed "
 "state by default. Evolution requires a restart."
@@ -1910,11 +1920,11 @@ msgstr ""
 "Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. Muutos "
 "vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 #, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on latest "
@@ -1928,11 +1938,11 @@ msgstr ""
 "Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin mukaan "
 "viestin päiväyksen sijasta. Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Whether sort thread children always ascending"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 #, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on latest "
@@ -1945,115 +1955,126 @@ msgstr ""
 "Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin mukaan "
 "viestin päiväyksen sijasta. Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#, fuzzy
+msgid "Whether to compress thread level"
+msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymistä."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+msgid ""
+"Set to true to compress thread levels for flat conversations, to make the level "
+"not so deep."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to true "
 "accounts are sorted alphabetically, with an exception of On This Computer and "
 "Search folders, otherwise accounts are sorted based on an order given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead to a "
 "file."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen only "
 "when there was used any “Forward to” filter action and approximately one minute "
 "after the last action invocation."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Forward and reply attribution language tag, like en_US. Empty string means to use "
 "the same language as the user interface."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgid ""
 "Prompt the user when he or she tries to send a message with a key accelerator."
 msgstr "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when emptying the trash"
 msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 #, 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to expunge a folder."
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
 msgstr "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 #, fuzzy
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Seuraavia vastaanottajia ei tunnistettu kelvollisiksi sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send a "
@@ -2062,20 +2083,20 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-kenttiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 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:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -2083,11 +2104,11 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka eivät "
 "sellaista halua vastaanottaa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if they "
 "really want to do it."
@@ -2095,19 +2116,19 @@ msgstr ""
 "Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko todella "
 "tehdä sen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../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 whilst marking multiple messages."
 msgstr "Näytetäänkö kehto merkittäessä useita viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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 "
@@ -2116,34 +2137,34 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "Possible values are: “never” — do not allow copy with drag &amp; drop of folders "
 "in folder tree, “always” — allow copy with drag &amp; drop of folders in folder "
 "tree without asking, or “ask” — (or any other value) will ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "Possible values are: “never” — do not allow move with drag &amp; drop of folders "
 "in folder tree, “always” — allow move with drag &amp; drop of folders in folder "
 "tree without asking, or “ask” — (or any other value) will ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 #, 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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a private "
@@ -2152,24 +2173,24 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 #, 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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending a "
 "private reply to a message which arrived via a mailing list, but the list sets a "
 "Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 #, fuzzy
 msgid "Prompt when replying to many recipients"
 msgstr "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a reply to "
@@ -2178,7 +2199,7 @@ msgstr ""
 "Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko synkronointia "
 "yhteydettömään tilaan siirryttäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 #, fuzzy
 msgid ""
 "Prompt when switching composer format and the content needs to lose its formatting"
@@ -2186,7 +2207,7 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching composer "
@@ -2195,57 +2216,57 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 #, fuzzy
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "Policy for automatically closing the message browser window when forwarding or "
 "replying to the displayed message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Last time Empty Trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 #, fuzzy
 msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 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:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 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:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 #, fuzzy
 #| msgid ""
 #| "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
@@ -2257,24 +2278,24 @@ msgstr ""
 "Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), \"1\" (varoitukset) "
 "tai \"2\" (vianetsintäviestit)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 #, 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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid ""
 "Show the original “Date” header (with a local time only if the time zone differs). "
 "Otherwise always show “Date” header value in a user preferred format and local "
 "time zone."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 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:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 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."
@@ -2282,45 +2303,45 @@ msgstr ""
 "Evolutionin sähköpostiosan tuntemat etiketit. Luettelo sisältää nimi:väri pareja, "
 "joissa väri on määritelty HTML-värien heksadesimaalisessa muodossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 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:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo päivinä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 #, fuzzy
 msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskapostien poistokerran unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletuslisäosa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 #, fuzzy
 #| msgid ""
 #| "This is the default junk plugin, even though there are multiple plugins "
@@ -2334,11 +2355,11 @@ msgstr ""
 "Tämä on roskapostin käsittelyn oletuslisäosa, vaikka useita olisi käytössä. Jos "
 "oletuslisäosa ei ole käytössä, ei palata käyttämään muita käytössä olevia lisäosia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 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:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 #, fuzzy
 #| msgid ""
 #| "Determines whether to lookup the sender email in address book. If found, it "
@@ -2354,7 +2375,7 @@ msgstr ""
 "valittu automaattista täydennystä varten. Tämä haku voi olla hidas, jos osoitteita "
 "täydennetään esimerkiksi LDAP-osoitekirjoista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address book "
 "only"
@@ -2362,7 +2383,7 @@ msgstr ""
 "Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta varten "
 "vain paikallisista osoitekirjoista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 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 "
@@ -2372,11 +2393,11 @@ msgstr ""
 "etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, joille ei tehdä "
 "roskapostisuodatusta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 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."
@@ -2384,11 +2405,11 @@ msgstr ""
 "Määrittää käytetäänkö omia roskapostiotsakkeita. Jos tämä valinta on käytössä ja "
 "otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin tunnistamista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 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:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 #, fuzzy
 #| msgid ""
 #| "Custom headers to use while checking for junk. The list elements are string in "
@@ -2400,52 +2421,52 @@ msgstr ""
 "Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon kohdat "
 "ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 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:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 msgid "Check for new messages on start"
 msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 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:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the account "
 "“Check for new messages every X minutes” option when Evolution is started. This "
 "option is used only together with “send_recv_on_start” option."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2453,13 +2474,13 @@ msgstr ""
 "Määrittää kuinka usein paikalliset muutokset synkronoidaan postipalvelimelle. "
 "Aikavälin täytyy olla vähintään 30 sekuntia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 #, 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:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 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 "
@@ -2467,199 +2488,199 @@ msgid ""
 "belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 msgid ""
 "When enabled the theme colors for background, text and links are sent in resulting "
 "HTML formatted message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 msgid "An Archive folder for On This Computer folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 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:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 #, 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:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 #, 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:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 #, 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:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 #, 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:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 msgid "Width of the To Do bar in a sub-window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 #, 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:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 #, 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:269
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 #, 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:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 msgid "Show start up wizard"
 msgstr "Näytä käynnistyksen avustaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
 msgid "Whether go to the previous message after message deletion"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
 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:274
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
 msgid "Show Subject above Sender in Messages column"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
 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:276
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
 msgid "Visually wrap long lines in composer"
 msgstr "Rivitä visuaalisesti pitkät rivit lähetysikkunassa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
 #: ../src/composer/e-composer-actions.c:556
 msgid "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
 #, fuzzy
 #| msgid "Default reply style"
 msgid "Alternative reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
 msgid "Format message in HTML"
 msgstr "Muotoile viesti HTML:nä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 #, fuzzy
 #| msgid "Put the cursor at the bottom of replies"
 msgid "Put the cursor at the bottom of alternative replies"
 msgstr "Aseta osoitin viestin loppuun vastattaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 msgid ""
 "This determines whether the cursor is placed at the top of the message or the "
 "bottom when using Alternative Reply."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 #, fuzzy
 #| msgid "Put personalized signatures at the top of replies"
 msgid "Put the signature at the top of the message"
 msgstr "Lisää oma allekirjoitus vastauksen alkuun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 msgid ""
 "This determines whether the signature is placed at the top of the message or the "
 "bottom when using Alternative Reply."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 msgid "Apply chosen template when using Alternative Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 msgid "Last chosen template’s folder URI for Alternative Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 msgid "Last chosen template’s message UID for Alternative Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
 msgid ""
 "Whether preserve original message subject when applying template for Alternative "
 "Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
 msgid ""
 "Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
 "“false”, then Normal paragraph style will be used."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 msgid ""
 "Close the message browser window when the selected message is deleted or marked as "
 "Junk."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
 msgid ""
 "Collapse archive folders in Move/Copy message to Folder and Go to Folder selectors."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "The “off” value completely disables certificate lookup; the “autocompleted” value "
 "provides certificates only for auto-completed contacts; the “books” value uses "
@@ -2667,94 +2688,105 @@ msgid ""
 "completion."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 #, fuzzy
 msgid "Whether Send/Receive should also download of messages for offline."
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "If enabled, whenever Send/Receive is run it also runs synchronization of messages "
 "for offline use. The option is disabled by default."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 #, fuzzy
 #| msgid "Display reminders in _notification area only"
 msgid "Whether display delivery notification parts inline."
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "If enabled, the message/delivery-status and message/disposition-notification parts "
 "are shown automatically inline."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 msgid "Whether unset colors provided in HTML mails."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "If enabled, unset colors in HTML messages, forcing use of desktop theme colors "
 "instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
+msgid ""
+"Whether to preserve expand state of the folders when calling Copy/Move to Folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
+msgid ""
+"If enabled, the Copy/Move to Folder dialog will preserve the expand state of the "
+"folders in the dialog, otherwise all the folders will be expanded."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
 #, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “forward-"
 "style-name” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “reply-"
 "style-name” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:309
 #, 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:304
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:310
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “show-"
 "headers” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:311
 #, 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:306
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:312
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “image-"
 "loading-policy” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:313
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards or "
 "replies to the message shown in the window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:314
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “browser-"
 "close-on-reply-policy” instead."
@@ -3038,6 +3070,21 @@ msgid ""
 "specifies an XML with setup for publishing to one destination."
 msgstr ""
 
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:1
+msgid "[]"
+msgstr "[]"
+
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:2
+msgid "List of assignments for recipient and the address to be used with it"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:3
+msgid ""
+"The list is of format 'recipient&lt;tab&gt;sender', where the recipient can be "
+"part of the address only and the sender is a full email address, which should "
+"match the From address precisely."
+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 "
@@ -3237,6 +3284,17 @@ msgid ""
 "page layouts. Negative values are treated as 0."
 msgstr ""
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:42
+msgid "Set of additional illegal characters in the filename"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:43
+msgid ""
+"When generating file names from custom strings some non-printable or reserved "
+"characters are replaced with an underscore. Here's a set of additional characters "
+"to be replaced."
+msgstr ""
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia."
@@ -3281,7 +3339,7 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
-#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1291
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1293
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
 #: ../src/shell/e-shell-window-private.c:241
 msgid "Evolution"
@@ -3346,27 +3404,27 @@ msgid "Contacts"
 msgstr "Yhteystiedot"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
-#: ../src/e-util/e-collection-account-wizard.c:839 ../src/e-util/e-send-options.c:544
-#: ../src/e-util/e-webdav-browser.c:470
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../src/e-util/e-collection-account-wizard.c:855 ../src/e-util/e-send-options.c:544
+#: ../src/e-util/e-webdav-browser.c:532
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
-#: ../src/modules/calendar/e-cal-shell-view.c:599
+#: ../src/modules/calendar/e-cal-shell-view.c:620
 #: ../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/kmail-importer.c:249
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1624
-#: ../src/smime/gui/certificate-manager.c:1666
+#: ../src/modules/mail/e-mail-shell-view.c:1608
+#: ../src/smime/gui/certificate-manager.c:1661
 msgid "Mail"
 msgstr "Sähköposti"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-cal-shell-content.c:1773
+#: ../src/calendar/gui/e-memo-table.c:446 ../src/e-util/e-webdav-browser.c:522
+#: ../src/modules/calendar/e-cal-shell-content.c:1887
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 #: ../src/modules/calendar/e-memo-shell-view.c:335
@@ -3374,15 +3432,15 @@ msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2442
+#: ../src/calendar/gui/e-task-table.c:618 ../src/calendar/gui/print.c:2442
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1141
-#: ../src/e-util/e-webdav-browser.c:461
+#: ../src/calendar/importers/icalendar-importer.c:1148
+#: ../src/e-util/e-webdav-browser.c:523
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-#: ../src/modules/calendar/e-cal-shell-content.c:1733
+#: ../src/modules/calendar/e-cal-shell-content.c:1847
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
-#: ../src/modules/calendar/e-task-shell-view.c:515
+#: ../src/modules/calendar/e-task-shell-view.c:530
 msgid "Tasks"
 msgstr "Tehtävät"
 
@@ -3686,11 +3744,11 @@ msgstr "Le_veälle näkymälle"
 msgid "As Sent Folder for Wi_de View"
 msgstr "Lähetetyt-kansion mukaan _leveässä näkymässä"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2429
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2592
 msgid "_Memos"
 msgstr "_Muistilaput"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2433
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2596
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Tehtävät"
@@ -3844,18 +3902,19 @@ msgstr ""
 #: ../src/addressbook/addressbook.error.xml.h:32
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:757
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1491
 #: ../src/e-util/e-accounts-window.c:1563
-#: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-account-manager.c:721 ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1330 ../src/mail/em-vfolder-editor-rule.c:408
-#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
-#: ../src/modules/mail/em-composer-prefs.c:423
+#: ../src/e-util/e-mail-signature-manager.c:324
+#: ../src/e-util/e-name-selector-dialog.c:1026 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-account-manager.c:721 ../src/mail/e-mail-label-manager.c:355
+#: ../src/mail/em-folder-properties.c:1359 ../src/mail/em-vfolder-editor-rule.c:405
+#: ../src/mail/em-vfolder-editor-rule.c:634 ../src/mail/mail-config.ui.h:63
+#: ../src/modules/mail/em-composer-prefs.c:420
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:544
-#: ../src/plugins/email-custom-header/email-custom-header.c:839
+#: ../src/plugins/email-custom-header/email-custom-header.c:826
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:464
+#: ../src/plugins/sender-validation/sender-validation.c:498
+#: ../src/plugins/templates/templates.c:470
 msgid "_Add"
 msgstr "_Lisää"
 
@@ -3892,7 +3951,7 @@ msgstr ""
 "silti?"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1242
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
@@ -4020,106 +4079,106 @@ msgstr "Näytä varmenteet"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3111
 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:2379
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/em-format/e-mail-formatter-attachment.c:277 ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Asetukset"
 
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3274
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4336
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:212
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:516
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1327
 #: ../src/calendar/gui/e-cal-dialogs.c:690
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../src/composer/e-composer-actions.c:242 ../src/e-util/e-activity-bar.c:370
-#: ../src/e-util/e-attachment-dialog.c:309 ../src/e-util/e-attachment-store.c:658
+#: ../src/e-util/e-attachment-dialog.c:289 ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668 ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
 #: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:238
-#: ../src/e-util/e-collection-account-wizard.c:1868
-#: ../src/e-util/e-collection-account-wizard.c:2109
+#: ../src/e-util/e-collection-account-wizard.c:240
+#: ../src/e-util/e-collection-account-wizard.c:1887
+#: ../src/e-util/e-collection-account-wizard.c:2134
 #: ../src/e-util/e-color-chooser-widget.c:125 ../src/e-util/e-filter-datespec.c:300
 #: ../src/e-util/e-html-editor-actions.c:342
 #: ../src/e-util/e-html-editor-actions.c:386
 #: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:179
-#: ../src/e-util/e-mail-signature-script-dialog.c:366 ../src/e-util/e-passwords.c:468
-#: ../src/e-util/e-rule-context.c:816 ../src/e-util/e-rule-editor.c:187
-#: ../src/e-util/e-rule-editor.c:298 ../src/e-util/e-rule-editor.c:933
-#: ../src/e-util/e-send-options.ui.h:16 ../src/e-util/e-source-config-dialog.c:360
-#: ../src/e-util/e-source-selector-dialog.c:325 ../src/e-util/e-table-config.c:548
+#: ../src/e-util/e-mail-signature-script-dialog.c:358 ../src/e-util/e-passwords.c:468
+#: ../src/e-util/e-rule-context.c:816 ../src/e-util/e-rule-editor.c:184
+#: ../src/e-util/e-rule-editor.c:295 ../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:356
+#: ../src/e-util/e-source-selector-dialog.c:325 ../src/e-util/e-table-config.c:540
 #: ../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:3932
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:267
-#: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4050
+#: ../src/e-util/evolution-source-viewer.c:829 ../src/e-util/e-web-view.c:3981
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:265
+#: ../src/mail/e-mail-config-window.c:310 ../src/mail/e-mail-label-dialog.c:186
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4031
 #: ../src/mail/em-folder-selector.c:333 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
 #: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
 #: ../src/mail/mail-vfolder-ui.c:271
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
-#: ../src/modules/backup-restore/evolution-backup-tool.c:936
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
+#: ../src/modules/backup-restore/evolution-backup-tool.c:989
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:406
 #: ../src/modules/calendar/e-cal-attachment-handler.c:281
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:298
-#: ../src/plugins/publish-calendar/publish-calendar.c:789
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:417
+#: ../src/plugins/save-calendar/save-calendar.c:184
 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
 #: ../src/shell/e-shell-utils.c:69 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:723
-#: ../src/smime/gui/certificate-manager.c:951
-#: ../src/smime/gui/certificate-manager.c:1332 ../src/smime/gui/e-cert-selector.c:235
+#: ../src/smime/gui/certificate-manager.c:650
+#: ../src/smime/gui/certificate-manager.c:718
+#: ../src/smime/gui/certificate-manager.c:946
+#: ../src/smime/gui/certificate-manager.c:1327 ../src/smime/gui/e-cert-selector.c:235
 #: ../src/smime/gui/smime-ui.ui.h:17
 msgid "_Cancel"
 msgstr "_Peru"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:755
-#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2158
+#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2235
 #: ../src/composer/e-composer-actions.c:242 ../src/composer/e-composer-actions.c:354
 #: ../src/e-util/e-attachment-store.c:848 ../src/e-util/e-attachment-store.c:855
-#: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2457 ../src/e-util/e-web-view.c:3932
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
+#: ../src/e-util/e-mail-signature-script-dialog.c:362
+#: ../src/e-util/e-webdav-browser.c:2620 ../src/e-util/e-web-view.c:3981
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:266
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:724
+#: ../src/smime/gui/certificate-manager.c:650
+#: ../src/smime/gui/certificate-manager.c:719
 msgid "_Save"
 msgstr "_Tallenna"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2055 ../src/calendar/gui/e-comp-editor.c:2127
-#: ../src/e-util/e-preferences-window.c:390 ../src/e-util/e-send-options.ui.h:15
+#: ../src/calendar/gui/e-comp-editor.c:2132 ../src/calendar/gui/e-comp-editor.c:2204
+#: ../src/e-util/e-preferences-window.c:387 ../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-window-actions.c:1066
+#: ../src/shell/e-shell-window-actions.c:1117
 msgid "_Help"
 msgstr "O_hje"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3574
+#: ../src/e-util/e-misc-utils.c:3585
 msgid "Image"
 msgstr "Kuva"
 
@@ -4145,8 +4204,8 @@ msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1345
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:918
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1331
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "Sähköposti"
@@ -4177,8 +4236,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:877
-#: ../src/modules/itip-formatter/itip-view.c:1972
+#: ../src/calendar/gui/e-comp-editor-event.c:871
+#: ../src/modules/itip-formatter/itip-view.c:1978
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -4195,7 +4254,7 @@ msgid "Home Page:"
 msgstr "Kotisivu:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
-#: ../src/modules/cal-config-google/e-cal-config-google.c:97
+#: ../src/modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "Kalenteri:"
 
@@ -4266,16 +4325,16 @@ msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1055
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1048
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2098
+#: ../src/calendar/gui/e-calendar-view.c:2205
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1054
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1047
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2097
+#: ../src/calendar/gui/e-calendar-view.c:2204
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -4324,7 +4383,7 @@ msgstr "Koti"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1023
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1016
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Työ"
@@ -4332,8 +4391,8 @@ msgstr "Työ"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1089
-#: ../src/calendar/gui/e-cal-model.c:3792
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1082
+#: ../src/calendar/gui/e-cal-model.c:3793
 msgid "Other"
 msgstr "Muut"
 
@@ -4357,19 +4416,20 @@ 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:1541
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1507
 #: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
-#: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.error.xml.h:18
+#: ../src/e-util/e-mail-signature-manager.c:364
+#: ../src/e-util/e-name-selector-dialog.c:1030 ../src/e-util/filter.error.xml.h:18
 #: ../src/e-util/filter.ui.h:27 ../src/mail/e-mail-config-identity-page.c:872
-#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1336 ../src/mail/em-vfolder-editor-rule.c:642
+#: ../src/mail/e-mail-label-manager.c:373 ../src/mail/em-filter-rule.c:678
+#: ../src/mail/em-folder-properties.c:1365 ../src/mail/em-vfolder-editor-rule.c:639
 #: ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
-#: ../src/plugins/email-custom-header/email-custom-header.c:849
-#: ../src/plugins/publish-calendar/publish-calendar.c:790
+#: ../src/plugins/email-custom-header/email-custom-header.c:836
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
-#: ../src/plugins/templates/templates.c:474
+#: ../src/plugins/sender-validation/sender-validation.c:508
+#: ../src/plugins/templates/templates.c:480
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -4387,25 +4447,25 @@ msgid "Certificates"
 msgstr "Varmenteet"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2090
-#: ../src/e-util/e-html-editor-actions.c:1107
+#: ../src/calendar/gui/e-comp-editor.c:2167
+#: ../src/e-util/e-html-editor-actions.c:1109
 msgid "_Undo"
 msgstr "_Kumoa"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:147
+#: ../src/calendar/gui/e-comp-editor.c:2169 ../src/e-util/e-focus-tracker.c:147
 #: ../src/e-util/e-focus-tracker.c:150
 msgid "Undo"
 msgstr "Kumoa"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2097
-#: ../src/e-util/e-html-editor-actions.c:1093
+#: ../src/calendar/gui/e-comp-editor.c:2174
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:163
+#: ../src/calendar/gui/e-comp-editor.c:2176 ../src/e-util/e-focus-tracker.c:163
 #: ../src/e-util/e-focus-tracker.c:166
 msgid "Redo"
 msgstr "Tee uudelleen"
@@ -4424,90 +4484,90 @@ msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3105
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "Yhteystietojen muokkain — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3241
 msgid "X.509 certificates"
 msgstr "X.509-varmenteet"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3246
 msgid "PGP keys"
 msgstr "PGP-avaimet"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3252
 #: ../src/e-util/e-html-editor-actions.c:395
 #: ../src/e-util/e-image-chooser-dialog.c:193
-#: ../src/smime/gui/certificate-manager.c:672
-#: ../src/smime/gui/certificate-manager.c:961
+#: ../src/smime/gui/certificate-manager.c:671
+#: ../src/smime/gui/certificate-manager.c:956
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
 msgid "Open PGP key"
 msgstr "Avaa PGP-avain"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
 msgid "Open X.509 certificate"
 msgstr "Avaa X.509-varmenne"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3274
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4336
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
 #: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
 #: ../src/e-util/e-html-editor-actions.c:342
 #: ../src/e-util/e-html-editor-actions.c:386
 #: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
-#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
+#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:946
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3517
 msgid "Chosen file is not a local file."
 msgstr "Valittu tiedosto ei ole paikallinen tiedosto."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Varmenteen lataaminen epäonnistui: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save PGP key"
 msgstr "Tallenna PGP-avain"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save X.509 certificate"
 msgstr "Tallenna X.509-varmenne"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3529
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Varmenteen tallentaminen epäonnistui: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4333
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4339
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4344
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4711
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4707
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4515,53 +4575,53 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4717
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4713
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s” sisältää virheellisen muotoilun"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "“%s” cannot be a future date"
 msgstr "“%s” ei voi olla tuleva päivä"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4733
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4729
 #, c-format
 msgid "%s“%s” has an invalid format"
 msgstr "%s“%s” sisältää virheellisen muotoilun"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4746
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4760
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4742
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4756
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s” on tyhjä"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4775
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4771
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:213
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
-#: ../src/e-util/e-attachment-dialog.c:311 ../src/e-util/e-categories-dialog.c:81
+#: ../src/e-util/e-attachment-dialog.c:291 ../src/e-util/e-categories-dialog.c:81
 #: ../src/e-util/e-category-editor.c:258 ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126 ../src/e-util/e-filter-datespec.c:301
 #: ../src/e-util/e-html-editor-link-dialog.c:240 ../src/e-util/e-passwords.c:469
-#: ../src/e-util/e-rule-context.c:817 ../src/e-util/e-rule-editor.c:188
-#: ../src/e-util/e-rule-editor.c:299 ../src/e-util/e-rule-editor.c:934
-#: ../src/e-util/e-send-options.ui.h:17 ../src/e-util/e-source-config-dialog.c:361
-#: ../src/e-util/e-source-selector-dialog.c:326 ../src/e-util/e-table-config.c:549
+#: ../src/e-util/e-rule-context.c:817 ../src/e-util/e-rule-editor.c:185
+#: ../src/e-util/e-rule-editor.c:296 ../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:357
+#: ../src/e-util/e-source-selector-dialog.c:326 ../src/e-util/e-table-config.c:541
 #: ../src/e-util/e-table-config.ui.h:4 ../src/e-util/e-timezone-dialog.ui.h:3
-#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:162
+#: ../src/mail/e-mail-config-window.c:311 ../src/mail/e-mail-tag-editor.c:162
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
 #: ../src/mail/mail-vfolder-ui.c:150 ../src/mail/mail-vfolder-ui.c:272
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:420
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:418
 #: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
-#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1333
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1328
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "_OK"
@@ -4699,12 +4759,12 @@ msgid "_Top"
 msgstr "Ylimm_äiseksi"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3492 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3673 ../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:3493 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3674 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "_Alas"
 
@@ -4717,19 +4777,19 @@ msgstr "Ali_mmaiseksi"
 msgid "Contact List Members"
 msgstr "Ota yhteyttä listan jäseniin"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1506
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
 msgid "_Members"
 msgstr "_Jäsenet"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1686
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
@@ -4744,12 +4804,12 @@ msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../src/calendar/gui/caltypes.xml.in.h:26 ../src/calendar/gui/memotypes.xml.in.h:19
-#: ../src/calendar/gui/tasktypes.xml.in.h:30
+#: ../src/calendar/gui/caltypes.xml.in.h:27 ../src/calendar/gui/memotypes.xml.in.h:20
+#: ../src/calendar/gui/tasktypes.xml.in.h:38
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:807
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1036
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
@@ -4764,27 +4824,27 @@ 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:429
+#: ../src/e-util/e-web-view.c:428
 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:441
+#: ../src/e-util/e-web-view.c:440
 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:443
+#: ../src/e-util/e-web-view.c:442
 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-misc-utils.c:4546
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:317
+#: ../src/e-util/e-misc-utils.c:4550
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy, c-format
 #| msgid "Click to open %s"
 msgid "Click to open map for %s"
@@ -4798,141 +4858,141 @@ msgstr "Avaa kartta"
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "List Members:"
 msgstr "Luettelon jäsenet:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:784
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:777
 msgid "Fax"
 msgstr "Fax"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:786
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:779
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:923
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:924
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:933
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:926
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:934
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:935
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:928
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:936
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:929
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:938
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:939
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:994
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Yritys"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
 msgid "Department"
 msgstr "Osasto"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Asema"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1004
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1005
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:998
 msgid "Position"
 msgstr "Asema"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:999
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1007
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Apulainen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1008
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1010
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1013
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1053
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1079
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1046
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1072
 msgid "Address"
 msgstr "Osoite"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1042
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1050
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1043
 msgid "Web Log"
 msgstr "Web-loki"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1056
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1066
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1059
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1111
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1104
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1307
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1293
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1330
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1316
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1371
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1357
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1381
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1367
 msgid "Blog"
 msgstr "Blogi"
 
@@ -5112,7 +5172,7 @@ msgstr[1] "%d yhteystietoa"
 msgid "Error getting book view"
 msgstr "Virhe ladattaessa kirjanäkymää"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-model.c:817
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:814
 msgid "Search Interrupted"
 msgstr "Haku keskeytettiin"
 
@@ -5120,69 +5180,73 @@ msgstr "Haku keskeytettiin"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:679
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Cut selected contacts to the clipboard"
 msgstr "Leikkaa valitut yhteystiedot leikepöydälle"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:685
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopioi valitut yhteystiedot leikepöydälle"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:691
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Paste contacts from the clipboard"
 msgstr "Liitä yhteystietoja leikepöydältä"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:697
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:675
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:703
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:681
 msgid "Select all visible contacts"
 msgstr "Valitse kaikki näkyvät yhteystiedot"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1290
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:922
+msgid "Searching for the Contacts…"
+msgstr "Etsitään yhteystietoja…"
+
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Haluatko varmasti poistaa nämä yhteystietolistat?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1294
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1304
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Haluatko varmasti poistaa nämä yhteystiedot?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1308
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1323
-#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-accounts-window.c:1753
-#: ../src/e-util/e-focus-tracker.c:816 ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2678 ../src/mail/e-mail-account-manager.c:739
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../src/calendar/gui/e-comp-editor.c:2125 ../src/e-util/e-accounts-window.c:1753
+#: ../src/e-util/e-focus-tracker.c:816 ../src/e-util/evolution-source-viewer.c:800
+#: ../src/e-util/e-webdav-browser.c:2844 ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1597
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:697
 #: ../src/modules/calendar/e-task-shell-view-actions.c:851
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1628
-#: ../src/shell/e-shell-window-actions.c:917
-#: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1622
+#: ../src/shell/e-shell-window-actions.c:961
+#: ../src/smime/gui/certificate-manager.c:1651 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Poista"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1471
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1476
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -5197,11 +5261,11 @@ msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää nämä kaikki yhteystiedot?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don’t Display"
 msgstr "Ä_lä näytä"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1480
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
@@ -5316,7 +5380,7 @@ msgid "Title"
 msgstr "Titteli"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:663
+#: ../src/calendar/gui/e-meeting-list-view.c:660
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rooli"
@@ -5379,7 +5443,7 @@ msgstr "Lä_hennä"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2861
+#: ../src/mail/e-mail-reader.c:2878
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
@@ -5387,7 +5451,7 @@ msgstr "L_oitonna"
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
 #: ../src/e-util/e-html-editor-actions.c:2206
 #: ../src/e-util/e-html-editor-find-dialog.c:244
-#: ../src/shell/e-shell-window-actions.c:994
+#: ../src/shell/e-shell-window-actions.c:1038
 msgid "_Find"
 msgstr "_Etsi"
 
@@ -5452,9 +5516,9 @@ msgstr ""
 #: ../src/addressbook/importers/evolution-csv-importer.c:796
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:499
-#: ../src/calendar/importers/icalendar-importer.c:1003
-#: ../src/calendar/importers/icalendar-importer.c:1043
+#: ../src/calendar/importers/icalendar-importer.c:506
+#: ../src/calendar/importers/icalendar-importer.c:1010
+#: ../src/calendar/importers/icalendar-importer.c:1050
 msgid "Importing…"
 msgstr "Tuodaan…"
 
@@ -6423,7 +6487,7 @@ msgstr "ei sisällä"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:4 ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
-#: ../src/e-util/e-collection-account-wizard.c:1960
+#: ../src/e-util/e-collection-account-wizard.c:1985
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6450,20 +6514,20 @@ msgstr "on"
 msgid "is not"
 msgstr "ei ole"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:263
-#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
-#: ../src/calendar/gui/e-task-table.c:445 ../src/calendar/gui/memotypes.xml.in.h:10
+#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:293
+#: ../src/calendar/gui/e-cal-model.c:293 ../src/calendar/gui/e-cal-model.c:301
+#: ../src/calendar/gui/e-task-table.c:438 ../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:264
-#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
+#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:294
+#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-task-table.c:439
 #: ../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:265
-#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
+#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:295
+#: ../src/calendar/gui/e-cal-model.c:305 ../src/calendar/gui/e-task-table.c:440
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:116 ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
@@ -6475,7 +6539,7 @@ msgid "Organizer"
 msgstr "Järjestäjä"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:13
-#: ../src/calendar/gui/e-meeting-list-view.c:623
+#: ../src/calendar/gui/e-meeting-list-view.c:620
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
@@ -6484,7 +6548,7 @@ msgstr "Osanottaja"
 #: ../src/calendar/gui/caltypes.xml.in.h:14
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:5
 #: ../src/calendar/gui/e-task-table.etspec.h:13 ../src/mail/message-list.etspec.h:14
-#: ../src/plugins/publish-calendar/publish-calendar.c:861
+#: ../src/plugins/publish-calendar/publish-calendar.c:860
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
@@ -6492,7 +6556,7 @@ msgstr "Sijainti"
 
 #: ../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
+#: ../src/e-util/e-categories-selector.c:324
 msgid "Category"
 msgstr "Luokka"
 
@@ -6518,7 +6582,7 @@ msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2101
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -6539,124 +6603,130 @@ 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/tasktypes.xml.in.h:28
+#: ../src/calendar/gui/tasktypes.xml.in.h:35 ../src/mail/filtertypes.xml.in.h:23
+#: ../src/mail/searchtypes.xml.in.h:25 ../src/mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "Lauseke"
+
+#: ../src/calendar/gui/caltypes.xml.in.h:25 ../src/calendar/gui/memotypes.xml.in.h:18
+#: ../src/calendar/gui/tasktypes.xml.in.h:36
 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/tasktypes.xml.in.h:29
+#: ../src/calendar/gui/caltypes.xml.in.h:26 ../src/calendar/gui/memotypes.xml.in.h:19
+#: ../src/calendar/gui/tasktypes.xml.in.h:37
 msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
-#: ../src/calendar/gui/comp-util.c:1546
-#: ../src/modules/itip-formatter/itip-view.c:2294
+#: ../src/calendar/gui/comp-util.c:1552
+#: ../src/modules/itip-formatter/itip-view.c:2312
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/calendar/gui/comp-util.c:1605
+#: ../src/calendar/gui/comp-util.c:1611
 #, c-format
 msgid "Comments: %s"
 msgstr "Kommentit: %s"
 
-#: ../src/calendar/gui/comp-util.c:1619 ../src/calendar/gui/comp-util.c:1622
+#: ../src/calendar/gui/comp-util.c:1625 ../src/calendar/gui/comp-util.c:1628
 msgctxt "iCalendarStatus"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/calendar/gui/comp-util.c:1620
+#: ../src/calendar/gui/comp-util.c:1626
 msgctxt "iCalendarStatus"
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../src/calendar/gui/comp-util.c:1621
+#: ../src/calendar/gui/comp-util.c:1627
 msgctxt "iCalendarStatus"
 msgid "Confirmed"
 msgstr "Vahvistettu"
 
-#: ../src/calendar/gui/comp-util.c:1623
+#: ../src/calendar/gui/comp-util.c:1629
 msgctxt "iCalendarStatus"
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../src/calendar/gui/comp-util.c:1624
+#: ../src/calendar/gui/comp-util.c:1630
 msgctxt "iCalendarStatus"
 msgid "Final"
 msgstr ""
 
-#: ../src/calendar/gui/comp-util.c:1625
+#: ../src/calendar/gui/comp-util.c:1631
 msgctxt "iCalendarStatus"
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
-#: ../src/calendar/gui/comp-util.c:1626
+#: ../src/calendar/gui/comp-util.c:1632
 msgctxt "iCalendarStatus"
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../src/calendar/gui/comp-util.c:1627
+#: ../src/calendar/gui/comp-util.c:1633
 msgctxt "iCalendarStatus"
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/comp-util.c:1628
+#: ../src/calendar/gui/comp-util.c:1634
 msgctxt "iCalendarStatus"
 msgid "Completed"
 msgstr "Valmis"
 
-#: ../src/calendar/gui/comp-util.c:1629
+#: ../src/calendar/gui/comp-util.c:1635
 msgctxt "iCalendarStatus"
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../src/calendar/gui/ea-cal-view.c:281
+#: ../src/calendar/gui/ea-cal-view.c:277
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../src/calendar/gui/ea-cal-view.c:282
+#: ../src/calendar/gui/ea-cal-view.c:278
 msgid "New All Day Event"
 msgstr "Uusi koko päivän tapahtuma"
 
-#: ../src/calendar/gui/ea-cal-view.c:283
+#: ../src/calendar/gui/ea-cal-view.c:279
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
-#: ../src/calendar/gui/ea-cal-view.c:284
+#: ../src/calendar/gui/ea-cal-view.c:280
 msgid "Go to Today"
 msgstr "Siirry tähän päivään"
 
-#: ../src/calendar/gui/ea-cal-view.c:285
+#: ../src/calendar/gui/ea-cal-view.c:281
 msgid "Go to Date"
 msgstr "Siirry päivään"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:232
+#: ../src/calendar/gui/ea-cal-view-event.c:229
 msgid "It has reminders."
 msgstr "Sisältää muistutuksia."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:235
+#: ../src/calendar/gui/ea-cal-view-event.c:232
 msgid "It has recurrences."
 msgstr "Sisältää toistuvuuksia."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:238
+#: ../src/calendar/gui/ea-cal-view-event.c:235
 msgid "It is a meeting."
 msgstr "Sisältää kokouksen."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:242
+#: ../src/calendar/gui/ea-cal-view-event.c:239
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:246
+#: ../src/calendar/gui/ea-cal-view-event.c:243
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:269
+#: ../src/calendar/gui/ea-cal-view-event.c:266
 msgid "calendar view event"
 msgstr "kalenterinäkymän tapahtuma"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:501
+#: ../src/calendar/gui/ea-cal-view-event.c:498
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
@@ -6832,7 +6902,7 @@ msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:237
-#: ../src/e-util/e-filter-rule.c:1068 ../src/mail/e-mail-config-page.c:124
+#: ../src/e-util/e-filter-rule.c:1015 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Nimetön"
 
@@ -6841,9 +6911,9 @@ msgid "Categories:"
 msgstr "Luokat:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:288
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1700
-#: ../src/modules/itip-formatter/itip-view.c:1811
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:280
+#: ../src/modules/itip-formatter/itip-view.c:1702
+#: ../src/modules/itip-formatter/itip-view.c:1814
 msgid "Location:"
 msgstr "Sijainti:"
 
@@ -6859,79 +6929,75 @@ msgstr "Päättymispäivä:"
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:326
-#, fuzzy
-#| msgid "Recurring"
+#: ../src/calendar/gui/e-cal-component-preview.c:327
 msgid "Recurs:"
-msgstr "Toistuva"
+msgstr "Toistuu:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:338
-#: ../src/modules/itip-formatter/itip-view.c:1703
-#: ../src/modules/itip-formatter/itip-view.c:1820
+#: ../src/calendar/gui/e-cal-component-preview.c:339
+#: ../src/modules/itip-formatter/itip-view.c:1706
+#: ../src/modules/itip-formatter/itip-view.c:1826
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:347
-#: ../src/calendar/gui/e-task-table.c:471 ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:334
+#: ../src/calendar/gui/e-cal-component-preview.c:348
+#: ../src/calendar/gui/e-task-table.c:464 ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:338
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:349
-#: ../src/calendar/gui/e-cal-model.c:1872 ../src/calendar/gui/e-task-table.c:472
+#: ../src/calendar/gui/e-cal-component-preview.c:350
+#: ../src/calendar/gui/e-cal-model.c:1873 ../src/calendar/gui/e-task-table.c:465
 #: ../src/calendar/gui/tasktypes.xml.in.h:20 ../src/e-util/e-send-options.ui.h:5
-#: ../src/mail/message-list.c:333
+#: ../src/mail/message-list.c:337
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:351
-#: ../src/calendar/gui/e-task-table.c:473 ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:332
+#: ../src/calendar/gui/e-cal-component-preview.c:352
+#: ../src/calendar/gui/e-task-table.c:466 ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:336
 msgid "Low"
 msgstr "Matala"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:353
+#: ../src/calendar/gui/e-cal-component-preview.c:354
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:365
+#: ../src/calendar/gui/e-cal-component-preview.c:366
 msgid "Organizer:"
 msgstr "Järjestäjä:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:406
-#, fuzzy
-#| msgid "Attendees: "
+#: ../src/calendar/gui/e-cal-component-preview.c:407
 msgid "Attendees:"
-msgstr "Osanottajat: "
+msgstr "Osanottajat:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:453
-#: ../src/mail/e-mail-config-service-page.c:533
+#: ../src/calendar/gui/e-cal-component-preview.c:454
+#: ../src/mail/e-mail-config-service-page.c:522
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:507
+#: ../src/calendar/gui/e-cal-component-preview.c:508
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1753
+#: ../src/calendar/gui/e-cal-data-model.c:1733
 #, fuzzy, c-format
 #| msgid "Opening calendar '%s'"
 msgid "Creating view for calendar “%s”"
 msgstr "Avataan kalenteria %s"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1757
+#: ../src/calendar/gui/e-cal-data-model.c:1737
 #, fuzzy, c-format
 #| msgid "Opening task list '%s'"
 msgid "Creating view for task list “%s”"
 msgstr "Avataan tehtävälistaa '%s'"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1761
+#: ../src/calendar/gui/e-cal-data-model.c:1741
 #, fuzzy, c-format
 #| msgid "Opening memo list '%s'"
 msgid "Creating view for memo list “%s”"
 msgstr "Avataan muistilappuluetteloa '%s'"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1991
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1994
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
@@ -6965,7 +7031,7 @@ msgid "Select Date"
 msgstr "Valitse päivämäärä"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:689
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Select _Today"
 msgstr "Valitse _tämä päivä"
 
@@ -7062,55 +7128,95 @@ msgstr "Lähetä hälytys tälle tapahtumalle"
 msgid "Notify new attendees _only"
 msgstr "Muistuta uusia osallistuja _vain"
 
-#: ../src/calendar/gui/e-calendar-view.c:478
+#: ../src/calendar/gui/e-calendar-view.c:472
 msgid "Cut selected events to the clipboard"
 msgstr "Leikkaa valitut tapahtumat leikepöydälle"
 
-#: ../src/calendar/gui/e-calendar-view.c:484
+#: ../src/calendar/gui/e-calendar-view.c:478
 msgid "Copy selected events to the clipboard"
 msgstr "Kopioi valitut tapahtumat leikepöydälle"
 
-#: ../src/calendar/gui/e-calendar-view.c:490
+#: ../src/calendar/gui/e-calendar-view.c:484
 msgid "Paste events from the clipboard"
 msgstr "Liitä tapahtumat leikepöydältä"
 
-#: ../src/calendar/gui/e-calendar-view.c:496
+#: ../src/calendar/gui/e-calendar-view.c:490
 msgid "Delete selected events"
 msgstr "Poista valitut tapahtumat"
 
-#: ../src/calendar/gui/e-calendar-view.c:906
+#: ../src/calendar/gui/e-calendar-view.c:901
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "Liitetty teksti ei sisällä kelvollista iCalendar-tietoa"
 
-#: ../src/calendar/gui/e-calendar-view.c:917 ../src/calendar/gui/e-cal-ops.c:1582
+#: ../src/calendar/gui/e-calendar-view.c:912 ../src/calendar/gui/e-cal-ops.c:1585
 msgid "Default calendar not found"
 msgstr "Oletuskalenteria ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:922 ../src/calendar/gui/e-cal-ops.c:1585
+#: ../src/calendar/gui/e-calendar-view.c:917 ../src/calendar/gui/e-cal-ops.c:1588
 #, fuzzy
 #| msgid "Mark as default memo list"
 msgid "Default memo list not found"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../src/calendar/gui/e-calendar-view.c:927 ../src/calendar/gui/e-cal-ops.c:1588
+#: ../src/calendar/gui/e-calendar-view.c:922 ../src/calendar/gui/e-cal-ops.c:1591
 msgid "Default task list not found"
 msgstr "Oletustehtävälistaa ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:1019
+#: ../src/calendar/gui/e-calendar-view.c:1014
 msgid "No suitable component found"
 msgstr "Soveltuvaa komponenttia ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:1089
+#: ../src/calendar/gui/e-calendar-view.c:1084
 msgid "Pasting iCalendar data"
 msgstr "Liitetään iCalendar-tietoja"
 
+#: ../src/calendar/gui/e-calendar-view.c:1145
+#: ../src/calendar/gui/e-calendar-view.c:1148
+#: ../src/calendar/gui/e-calendar-view.c:1151
+#: ../src/calendar/gui/e-calendar-view.c:1152
+msgid "%d %b %Y"
+msgstr "%e. %Bta %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. 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:1147 ../src/calendar/gui/e-day-view.c:3059
+#: ../src/calendar/gui/e-day-view-top-item.c:854
+#: ../src/calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%e. %b"
+
+#: ../src/calendar/gui/e-calendar-view.c:1158
+msgid "%A %d %b %Y"
+msgstr "%A %e. %Bta %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %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:1160 ../src/calendar/gui/e-day-view.c:3043
+#: ../src/calendar/gui/e-day-view-top-item.c:850
+#: ../src/calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%a %e. %bta"
+
+#: ../src/calendar/gui/e-calendar-view.c:1161
+#: ../src/calendar/gui/e-calendar-view.c:1163
+#: ../src/calendar/gui/e-calendar-view.c:1164
+msgid "%a %d %b %Y"
+msgstr "%a %e. %b %Y"
+
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1889 ../src/calendar/gui/e-memo-table.c:572
-#: ../src/calendar/gui/e-task-table.c:736
+#: ../src/calendar/gui/e-calendar-view.c:1956 ../src/calendar/gui/e-memo-table.c:561
+#: ../src/calendar/gui/e-task-table.c:730
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
@@ -7118,17 +7224,17 @@ msgstr "Järjestäjä: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1892 ../src/calendar/gui/e-memo-table.c:577
-#: ../src/calendar/gui/e-task-table.c:740
+#: ../src/calendar/gui/e-calendar-view.c:1959 ../src/calendar/gui/e-memo-table.c:566
+#: ../src/calendar/gui/e-task-table.c:734
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1911
+#: ../src/calendar/gui/e-calendar-view.c:1978
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:758 ../src/calendar/gui/e-to-do-pane.c:377
+#: ../src/calendar/gui/e-task-table.c:752 ../src/calendar/gui/e-to-do-pane.c:377
 #: ../src/calendar/gui/print.c:3627
 #, c-format
 msgid "Location: %s"
@@ -7136,60 +7242,43 @@ 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:1970 ../src/calendar/gui/e-to-do-pane.c:480
+#: ../src/calendar/gui/e-calendar-view.c:2037 ../src/calendar/gui/e-to-do-pane.c:480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
+#: ../src/calendar/gui/e-calendar-view.c:2106 ../src/calendar/gui/e-memo-table.c:660
+#: ../src/calendar/gui/e-task-table.c:882 ../src/calendar/gui/e-to-do-pane.c:590
+#: ../src/e-util/e-misc-utils.c:4614 ../src/e-util/e-text.c:566
+#: ../src/e-util/e-web-view.c:4162
+#| msgid "Cell…"
+msgid "…"
+msgstr "…"
+
 #. Translators: the '%s' stands for a component summary, the '%d' for the years.
 #. The string is used for Birthday & Anniversary events where the first year is
 #. know, constructing a summary which also shows how many years the birthday or
 #. anniversary is for. Example: "Birthday: John Doe (13)"
-#: ../src/calendar/gui/e-calendar-view.c:2117
+#: ../src/calendar/gui/e-calendar-view.c:2224
 #, c-format
 msgctxt "BirthdaySummary"
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: ../src/calendar/gui/e-calendar-view.c:2318
-#: ../src/calendar/gui/e-calendar-view.c:2321
-#: ../src/calendar/gui/e-calendar-view.c:2324
-#: ../src/calendar/gui/e-calendar-view.c:2325
-msgid "%d %b %Y"
-msgstr "%e. %Bta %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. 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:2320 ../src/calendar/gui/e-day-view.c:3079
-#: ../src/calendar/gui/e-day-view-top-item.c:858
-#: ../src/calendar/gui/e-week-view-main-item.c:228
-msgid "%d %b"
-msgstr "%e. %b"
-
-#: ../src/calendar/gui/e-calendar-view.c:2331
-msgid "%A %d %b %Y"
-msgstr "%A %e. %Bta %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %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:2333 ../src/calendar/gui/e-day-view.c:3063
-#: ../src/calendar/gui/e-day-view-top-item.c:854
-#: ../src/calendar/gui/e-week-view-main-item.c:214
-msgid "%a %d %b"
-msgstr "%a %e. %bta"
+#: ../src/calendar/gui/e-cal-list-view.c:116
+#, fuzzy, c-format
+#| msgid "end of appointment"
+msgid "%d appointment"
+msgid_plural "%d appointments"
+msgstr[0] "tapaamisen päättymistä"
+msgstr[1] "tapaamisen päättymistä"
 
-#: ../src/calendar/gui/e-calendar-view.c:2334
-#: ../src/calendar/gui/e-calendar-view.c:2336
-#: ../src/calendar/gui/e-calendar-view.c:2337
-msgid "%a %d %b %Y"
-msgstr "%a %e. %b %Y"
+#: ../src/calendar/gui/e-cal-list-view.c:120
+#: ../src/modules/calendar/e-memo-shell-view-private.c:365
+#: ../src/modules/calendar/e-task-shell-view-private.c:574
+#, c-format
+msgid "%d selected"
+msgstr ", %d valittu"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:1
 #: ../src/calendar/gui/e-memo-table.etspec.h:5
@@ -7223,8 +7312,8 @@ msgstr "Lähde"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:10
-#: ../src/calendar/gui/e-cal-model.c:3846
-#: ../src/calendar/gui/e-meeting-list-view.c:692
+#: ../src/calendar/gui/e-cal-model.c:3847
+#: ../src/calendar/gui/e-meeting-list-view.c:689
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-memo-table.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -7235,113 +7324,113 @@ msgid "Status"
 msgstr "Tila"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:11
-#: ../src/calendar/gui/e-meeting-list-view.c:649
+#: ../src/calendar/gui/e-meeting-list-view.c:646
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
 #: ../src/calendar/gui/e-task-table.etspec.h:3 ../src/e-util/e-accounts-window.c:1443
 #: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:2001
-#: ../src/e-util/e-webdav-browser.c:2371 ../src/mail/e-mail-account-tree-view.c:158
+#: ../src/e-util/e-collection-account-wizard.c:2026
+#: ../src/e-util/e-webdav-browser.c:2517 ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-meeting-list-view.c:183
-#: ../src/calendar/gui/e-meeting-list-view.c:197
+#: ../src/calendar/gui/e-cal-model.c:307
+#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
 #: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1265
 #: ../src/calendar/gui/print.c:1282 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3460
-#: ../src/modules/itip-formatter/itip-view.c:6505
+#: ../src/modules/itip-formatter/itip-view.c:3443
+#: ../src/modules/itip-formatter/itip-view.c:6404
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:626
-#: ../src/calendar/gui/e-cal-ops.c:1267
+#: ../src/calendar/gui/e-cal-model.c:1366 ../src/calendar/gui/e-cal-ops.c:629
+#: ../src/calendar/gui/e-cal-ops.c:1270
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:391
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:191
-#: ../src/calendar/gui/e-cal-ops.c:1384
+#: ../src/calendar/gui/e-cal-model.c:1477 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-ops.c:1387
 msgid "Creating an event"
 msgstr "Luodaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:195
-#: ../src/calendar/gui/e-cal-ops.c:1388
+#: ../src/calendar/gui/e-cal-model.c:1481 ../src/calendar/gui/e-cal-ops.c:198
+#: ../src/calendar/gui/e-cal-ops.c:1391
 msgid "Creating a memo"
 msgstr "Luodaan muistilappu"
 
-#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:199
-#: ../src/calendar/gui/e-cal-ops.c:1392
+#: ../src/calendar/gui/e-cal-model.c:1485 ../src/calendar/gui/e-cal-ops.c:202
+#: ../src/calendar/gui/e-cal-ops.c:1395
 msgid "Creating a task"
 msgstr "Luodaan tehtävä"
 
-#: ../src/calendar/gui/e-cal-model.c:1874
+#: ../src/calendar/gui/e-cal-model.c:1875
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../src/calendar/gui/e-cal-model.c:1876
+#: ../src/calendar/gui/e-cal-model.c:1877
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "No"
 msgstr "Ei"
 
-#: ../src/calendar/gui/e-cal-model.c:3787
-#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-cal-model.c:3788
+#: ../src/calendar/gui/e-meeting-list-view.c:205
 #: ../src/calendar/gui/e-meeting-store.c:179
 #: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/modules/itip-formatter/itip-view.c:6493
+#: ../src/modules/itip-formatter/itip-view.c:6392
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../src/calendar/gui/e-cal-model.c:3788
-#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-cal-model.c:3789
+#: ../src/calendar/gui/e-meeting-list-view.c:206
 #: ../src/calendar/gui/e-meeting-store.c:181
 #: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/modules/itip-formatter/itip-view.c:6499
+#: ../src/modules/itip-formatter/itip-view.c:6398
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../src/calendar/gui/e-cal-model.c:3789
-#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-cal-model.c:3790
+#: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:183
 #: ../src/calendar/gui/e-meeting-store.c:206
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../src/calendar/gui/e-cal-model.c:3790
-#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-cal-model.c:3791
+#: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:185
 #: ../src/calendar/gui/e-meeting-store.c:208
-#: ../src/modules/itip-formatter/itip-view.c:6502
+#: ../src/modules/itip-formatter/itip-view.c:6401
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../src/calendar/gui/e-cal-model.c:3791
+#: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:91
-#: ../src/calendar/gui/e-task-table.c:529
+#: ../src/calendar/gui/e-task-table.c:523
 msgid "Free"
 msgstr "Vapaa"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:94
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
-#: ../src/calendar/gui/e-task-table.c:530
+#: ../src/calendar/gui/e-task-table.c:524
 msgid "Busy"
 msgstr "Varattu"
 
@@ -7359,35 +7448,35 @@ msgstr ""
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/e-cal-ops.c:314
+#: ../src/calendar/gui/e-cal-ops.c:317
 msgid "Modifying an event"
 msgstr "Muokataan tapahtumaa"
 
-#: ../src/calendar/gui/e-cal-ops.c:318
+#: ../src/calendar/gui/e-cal-ops.c:321
 #, fuzzy
 #| msgid "Missing name."
 msgid "Modifying a memo"
 msgstr "Nimi puuttuu."
 
-#: ../src/calendar/gui/e-cal-ops.c:322
+#: ../src/calendar/gui/e-cal-ops.c:325
 msgid "Modifying a task"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:423 ../src/calendar/gui/e-to-do-pane.c:2074
+#: ../src/calendar/gui/e-cal-ops.c:426 ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "Removing an event"
 msgstr "Poistetaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:427 ../src/calendar/gui/e-to-do-pane.c:2078
+#: ../src/calendar/gui/e-cal-ops.c:430 ../src/calendar/gui/e-to-do-pane.c:2078
 #, fuzzy
 #| msgid "Removing attachments"
 msgid "Removing a memo"
 msgstr "Poistetaan liitteitä"
 
-#: ../src/calendar/gui/e-cal-ops.c:431 ../src/calendar/gui/e-to-do-pane.c:2082
+#: ../src/calendar/gui/e-cal-ops.c:434 ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "Removing a task"
 msgstr "Poistetaan tehtävä"
 
-#: ../src/calendar/gui/e-cal-ops.c:519
+#: ../src/calendar/gui/e-cal-ops.c:522
 #, fuzzy, c-format
 #| msgid "Meeting information sent"
 msgid "Deleting an event"
@@ -7395,7 +7484,7 @@ msgid_plural "Deleting %d events"
 msgstr[0] "Kokouksen tiedot lähetetty"
 msgstr[1] "Kokouksen tiedot lähetetty"
 
-#: ../src/calendar/gui/e-cal-ops.c:523
+#: ../src/calendar/gui/e-cal-ops.c:526
 #, fuzzy, c-format
 #| msgid "Delete Memo"
 msgid "Deleting a memo"
@@ -7403,14 +7492,14 @@ msgid_plural "Deleting %d memos"
 msgstr[0] "Poista muistilappu"
 msgstr[1] "Poista muistilappu"
 
-#: ../src/calendar/gui/e-cal-ops.c:527
+#: ../src/calendar/gui/e-cal-ops.c:530
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Poistetaan tehtävä"
 msgstr[1] "Poistetaan %d tehtävää"
 
-#: ../src/calendar/gui/e-cal-ops.c:738
+#: ../src/calendar/gui/e-cal-ops.c:741
 #, fuzzy, c-format
 #| msgid "Print this event"
 msgid "Pasting an event"
@@ -7418,7 +7507,7 @@ msgid_plural "Pasting %d events"
 msgstr[0] "Tulosta tämä tapahtuma"
 msgstr[1] "Tulosta tämä tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:753
+#: ../src/calendar/gui/e-cal-ops.c:756
 #, fuzzy, c-format
 #| msgid "Print this memo"
 msgid "Pasting a memo"
@@ -7426,7 +7515,7 @@ msgid_plural "Pasting %d memos"
 msgstr[0] "Tulosta tämä muistilappu"
 msgstr[1] "Tulosta tämä muistilappu"
 
-#: ../src/calendar/gui/e-cal-ops.c:768
+#: ../src/calendar/gui/e-cal-ops.c:771
 #, fuzzy, c-format
 #| msgid "Print this task"
 msgid "Pasting a task"
@@ -7434,97 +7523,97 @@ msgid_plural "Pasting %d tasks"
 msgstr[0] "Tulosta tämä tehtävä"
 msgstr[1] "Tulosta tämä tehtävä"
 
-#: ../src/calendar/gui/e-cal-ops.c:868
+#: ../src/calendar/gui/e-cal-ops.c:871
 msgid "Updating an event"
 msgstr "Päivitetään tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:872
+#: ../src/calendar/gui/e-cal-ops.c:875
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a memo"
 msgstr "Päivitetään olioita"
 
-#: ../src/calendar/gui/e-cal-ops.c:876
+#: ../src/calendar/gui/e-cal-ops.c:879
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a task"
 msgstr "Päivitetään olioita"
 
-#: ../src/calendar/gui/e-cal-ops.c:989
+#: ../src/calendar/gui/e-cal-ops.c:992
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../src/calendar/gui/e-cal-ops.c:993
+#: ../src/calendar/gui/e-cal-ops.c:996
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/calendar/gui/e-cal-ops.c:997
+#: ../src/calendar/gui/e-cal-ops.c:1000
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/calendar/gui/e-cal-ops.c:1023
+#: ../src/calendar/gui/e-cal-ops.c:1026
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Purging events in the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../src/calendar/gui/e-cal-ops.c:1027
+#: ../src/calendar/gui/e-cal-ops.c:1030
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Purging memos in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/calendar/gui/e-cal-ops.c:1031
+#: ../src/calendar/gui/e-cal-ops.c:1034
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Purging tasks in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/calendar/gui/e-cal-ops.c:1126
+#: ../src/calendar/gui/e-cal-ops.c:1129
 #, fuzzy
 #| msgid "Purging"
 msgid "Purging events"
 msgstr "Tyhjennetään"
 
-#: ../src/calendar/gui/e-cal-ops.c:1130
+#: ../src/calendar/gui/e-cal-ops.c:1133
 #, fuzzy
 #| msgid "Print Memos"
 msgid "Purging memos"
 msgstr "Tulosta muistilaput"
 
-#: ../src/calendar/gui/e-cal-ops.c:1134
+#: ../src/calendar/gui/e-cal-ops.c:1137
 #, fuzzy
 #| msgid "Print Tasks"
 msgid "Purging tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../src/calendar/gui/e-cal-ops.c:1236
+#: ../src/calendar/gui/e-cal-ops.c:1239
 #, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Expunging completed tasks"
 msgstr "Piilota valmistuneet tehtävät"
 
-#: ../src/calendar/gui/e-cal-ops.c:2084
+#: ../src/calendar/gui/e-cal-ops.c:2087
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/calendar/gui/e-cal-ops.c:2085
+#: ../src/calendar/gui/e-cal-ops.c:2088
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Kopioidaan tapahtuma"
 msgstr[1] "Kopioidaan %d tapahtumaa"
 
-#: ../src/calendar/gui/e-cal-ops.c:2091
+#: ../src/calendar/gui/e-cal-ops.c:2094
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a memo"
@@ -7532,7 +7621,7 @@ msgid_plural "Moving %d memos"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../src/calendar/gui/e-cal-ops.c:2092
+#: ../src/calendar/gui/e-cal-ops.c:2095
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a memo"
@@ -7540,7 +7629,7 @@ msgid_plural "Copying %d memos"
 msgstr[0] "Kopioidaan tiedostoja"
 msgstr[1] "Kopioidaan tiedostoja"
 
-#: ../src/calendar/gui/e-cal-ops.c:2098
+#: ../src/calendar/gui/e-cal-ops.c:2101
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a task"
@@ -7548,7 +7637,7 @@ msgid_plural "Moving %d tasks"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../src/calendar/gui/e-cal-ops.c:2099
+#: ../src/calendar/gui/e-cal-ops.c:2102
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a task"
@@ -7579,36 +7668,40 @@ msgstr ""
 msgid "Event’s time is in the past"
 msgstr "Tapahtuman ajankohta on mennyt"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:210
+#: ../src/calendar/gui/e-comp-editor-event.c:204
 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:212
+#: ../src/calendar/gui/e-comp-editor-event.c:206
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:214
-msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr "Tapahtumaa ei voi muokata täysin, koska et ole sen järjestäjä"
+#: ../src/calendar/gui/e-comp-editor-event.c:208
+#, fuzzy
+#| msgid "Memo cannot be fully edited, because you are not the organizer"
+msgid ""
+"Changes made to the event will not be sent to the attendees, because you are not "
+"the organizer"
+msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:506
-#: ../src/calendar/gui/e-comp-editor-task.c:591
+#: ../src/calendar/gui/e-comp-editor-event.c:500
+#: ../src/calendar/gui/e-comp-editor-task.c:584
 msgid "Start date is not a valid date"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:508
+#: ../src/calendar/gui/e-comp-editor-event.c:502
 msgid "Start time is not a valid time"
 msgstr "Alkamisaika on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:512
-#: ../src/calendar/gui/e-comp-editor-event.c:528
+#: ../src/calendar/gui/e-comp-editor-event.c:506
+#: ../src/calendar/gui/e-comp-editor-event.c:522
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:338 ../src/composer/e-composer-actions.c:180
-#: ../src/em-format/e-mail-part-secure-button.c:97 ../src/e-util/e-misc-utils.c:3992
-#: ../src/e-util/e-misc-utils.c:4004 ../src/e-util/e-misc-utils.c:4018
-#: ../src/mail/e-mail-autoconfig.c:1041 ../src/mail/e-mail-display.c:2444
+#: ../src/calendar/gui/e-comp-editor.c:340 ../src/composer/e-composer-actions.c:180
+#: ../src/em-format/e-mail-part-secure-button.c:97 ../src/e-util/e-misc-utils.c:4003
+#: ../src/e-util/e-misc-utils.c:4015 ../src/e-util/e-misc-utils.c:4029
+#: ../src/mail/e-mail-autoconfig.c:1041 ../src/mail/e-mail-display.c:2449
 #: ../src/mail/e-mail-notes.c:875 ../src/mail/e-mail-reader-utils.c:805
-#: ../src/mail/em-composer-utils.c:3843 ../src/mail/em-composer-utils.c:3874
+#: ../src/mail/em-composer-utils.c:3820 ../src/mail/em-composer-utils.c:3851
 #: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1493
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
@@ -7617,128 +7710,128 @@ msgstr "Alkamisaika on virheellinen"
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:522
+#: ../src/calendar/gui/e-comp-editor-event.c:516
 msgid "End date is not a valid date"
 msgstr "Päättymispäivä ei ole kelvollinen päivä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:524
+#: ../src/calendar/gui/e-comp-editor-event.c:518
 msgid "End time is not a valid time"
 msgstr "Päättymisaika ei ole kelvollinen aika"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:719
-#: ../src/calendar/gui/e-comp-editor-memo.c:256
-#: ../src/calendar/gui/e-comp-editor-task.c:704
+#: ../src/calendar/gui/e-comp-editor-event.c:713
+#: ../src/calendar/gui/e-comp-editor-memo.c:249
+#: ../src/calendar/gui/e-comp-editor-task.c:697
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:721
-#: ../src/calendar/gui/e-comp-editor-memo.c:258
-#: ../src/calendar/gui/e-comp-editor-task.c:706
+#: ../src/calendar/gui/e-comp-editor-event.c:715
+#: ../src/calendar/gui/e-comp-editor-memo.c:251
+#: ../src/calendar/gui/e-comp-editor-task.c:699
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:727
-#: ../src/calendar/gui/e-comp-editor-task.c:712
+#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-task.c:705
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:729
-#: ../src/calendar/gui/e-comp-editor-task.c:714
+#: ../src/calendar/gui/e-comp-editor-event.c:723
+#: ../src/calendar/gui/e-comp-editor-task.c:707
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:735
+#: ../src/calendar/gui/e-comp-editor-event.c:729
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:737
+#: ../src/calendar/gui/e-comp-editor-event.c:731
 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:743
+#: ../src/calendar/gui/e-comp-editor-event.c:737
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:745
+#: ../src/calendar/gui/e-comp-editor-event.c:739
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:754
+#: ../src/calendar/gui/e-comp-editor-event.c:748
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:756
+#: ../src/calendar/gui/e-comp-editor-event.c:750
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:761
+#: ../src/calendar/gui/e-comp-editor-event.c:755
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:763
+#: ../src/calendar/gui/e-comp-editor-event.c:757
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:768
+#: ../src/calendar/gui/e-comp-editor-event.c:762
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:770
+#: ../src/calendar/gui/e-comp-editor-event.c:764
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:888
+#: ../src/calendar/gui/e-comp-editor-event.c:882
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:893
+#: ../src/calendar/gui/e-comp-editor-event.c:887
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:903
+#: ../src/calendar/gui/e-comp-editor-event.c:897
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:971
-#: ../src/calendar/gui/e-comp-editor-memo.c:357
-#: ../src/calendar/gui/e-comp-editor-task.c:882
+#: ../src/calendar/gui/e-comp-editor-event.c:965
+#: ../src/calendar/gui/e-comp-editor-memo.c:350
+#: ../src/calendar/gui/e-comp-editor-task.c:875
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:974
-#: ../src/calendar/gui/e-comp-editor-task.c:905
+#: ../src/calendar/gui/e-comp-editor-event.c:968
+#: ../src/calendar/gui/e-comp-editor-task.c:898
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:977
-#: ../src/calendar/gui/e-comp-editor-task.c:909
+#: ../src/calendar/gui/e-comp-editor-event.c:971
+#: ../src/calendar/gui/e-comp-editor-task.c:902
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:980
-#: ../src/calendar/gui/e-comp-editor-memo.c:360
-#: ../src/calendar/gui/e-comp-editor-task.c:913
+#: ../src/calendar/gui/e-comp-editor-event.c:974
+#: ../src/calendar/gui/e-comp-editor-memo.c:353
+#: ../src/calendar/gui/e-comp-editor-task.c:906
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:990
+#: ../src/calendar/gui/e-comp-editor-event.c:984
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1025
+#: ../src/calendar/gui/e-comp-editor-event.c:1019
 #, c-format
 msgid "Meeting — %s"
 msgstr "Kokous — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1026
+#: ../src/calendar/gui/e-comp-editor-event.c:1020
 #, c-format
 msgid "Appointment — %s"
 msgstr "Tapaaminen — %s"
@@ -7750,40 +7843,44 @@ msgstr "Tapaaminen — %s"
 msgid "New note"
 msgstr "Uusi ikkuna"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:218
+#: ../src/calendar/gui/e-comp-editor-memo.c:211
 #, fuzzy
 #| msgid "Memo cannot be edited, because the selected memo list is read only"
 msgid "Memo cannot be edited, because the selected memo list could not be opened"
 msgstr ""
 "Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain lukutilassa"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:220
+#: ../src/calendar/gui/e-comp-editor-memo.c:213
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain lukutilassa"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:222
-msgid "Memo cannot be fully edited, because you are not the organizer"
+#: ../src/calendar/gui/e-comp-editor-memo.c:215
+#, fuzzy
+#| msgid "Memo cannot be fully edited, because you are not the organizer"
+msgid ""
+"Changes made to the memo will not be sent to the attendees, because you are not "
+"the organizer"
 msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:318
-#: ../src/calendar/gui/e-comp-editor-task.c:813
+#: ../src/calendar/gui/e-comp-editor-memo.c:311
+#: ../src/calendar/gui/e-comp-editor-task.c:806
 msgid "_List:"
 msgstr "_Luettelo:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:325
-#: ../src/calendar/gui/e-comp-editor-task.c:823
+#: ../src/calendar/gui/e-comp-editor-memo.c:318
+#: ../src/calendar/gui/e-comp-editor-task.c:816
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:392
+#: ../src/calendar/gui/e-comp-editor-memo.c:385
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Memo — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:393
+#: ../src/calendar/gui/e-comp-editor-memo.c:386
 #, fuzzy, c-format
 #| msgid "Memo - %s"
 msgid "Memo — %s"
@@ -7791,7 +7888,7 @@ msgstr "Muistilappu - %s"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
-#: ../src/em-format/e-mail-formatter-attachment.c:334
+#: ../src/em-format/e-mail-formatter-attachment.c:336
 #: ../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
@@ -7812,7 +7909,7 @@ msgstr "Ei voitu ladata “%s”"
 msgid "Could not load the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:411
 #, fuzzy
 #| msgid ""
 #| "Some attachments are being downloaded. Saving the task would result in the loss "
@@ -7824,57 +7921,57 @@ msgstr ""
 "Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt aiheuttaa "
 "tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:438
 #, c-format
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:460
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:455
 #, c-format
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:628
 #: ../src/composer/e-composer-actions.c:326
 msgid "_Attachment…"
 msgstr "_Liite…"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:630
 #: ../src/composer/e-composer-actions.c:328 ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:637
 msgid "_Attachments"
 msgstr "_Liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:639
 msgid "Show attachments"
 msgstr "Näytä liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:812
-#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:807
+#: ../src/e-util/e-attachment-bar.c:716 ../src/e-util/e-attachment-paned.c:690
 msgid "Icon View"
 msgstr "Kuvakenäkymä"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:814
-#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:809
+#: ../src/e-util/e-attachment-bar.c:718 ../src/e-util/e-attachment-paned.c:692
 msgid "List View"
 msgstr "Luettelonäkymä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:392
+#: ../src/calendar/gui/e-comp-editor-page-general.c:322
 #, fuzzy, c-format
 #| msgid "Cannot find matching event in the next %d year"
 #| msgid_plural "Cannot find matching event in the next %d years"
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:399
+#: ../src/calendar/gui/e-comp-editor-page-general.c:329
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:429
+#: ../src/calendar/gui/e-comp-editor-page-general.c:359
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete selected attendee"
@@ -7882,98 +7979,99 @@ 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:543
+#: ../src/calendar/gui/e-comp-editor-page-general.c:473
 #, 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:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:686
 msgid "A_ttendees"
 msgstr "_Osanottajat"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:714
+#: ../src/calendar/gui/e-comp-editor-page-general.c:688
 #, 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:723
+#: ../src/calendar/gui/e-comp-editor-page-general.c:697
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:725
+#: ../src/calendar/gui/e-comp-editor-page-general.c:699
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:731
+#: ../src/calendar/gui/e-comp-editor-page-general.c:705
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:733
+#: ../src/calendar/gui/e-comp-editor-page-general.c:707
 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:739
+#: ../src/calendar/gui/e-comp-editor-page-general.c:713
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:741
+#: ../src/calendar/gui/e-comp-editor-page-general.c:715
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:747
+#: ../src/calendar/gui/e-comp-editor-page-general.c:721
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:749
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 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:1064
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1030
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1040
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1182
 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:1340
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1306
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1401
 msgid "Override color of the event. If not set, then color of the calendar is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1403
 msgid "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1405
 msgid "Override color of the task. If not set, then color of the task list is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1416
 msgctxt "ECompEditor"
 msgid "Atte_ndees…"
 msgstr "_Osanottajat…"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1533
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2321
-#: ../src/calendar/gui/e-comp-editor.c:2113 ../src/e-util/e-accounts-window.c:1745
-#: ../src/e-util/e-html-editor-actions.c:1116
-#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2671
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1499
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2316
+#: ../src/calendar/gui/e-comp-editor.c:2190 ../src/e-util/e-accounts-window.c:1745
+#: ../src/e-util/e-html-editor-actions.c:1118
+#: ../src/e-util/e-mail-signature-manager.c:354 ../src/e-util/e-webdav-browser.c:2837
 #: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:730
-#: ../src/mail/e-mail-browser.c:217 ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
+#: ../src/mail/e-mail-browser.c:217 ../src/mail/e-mail-label-manager.c:364
+#: ../src/mail/em-folder-properties.c:1362 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
-#: ../src/plugins/email-custom-header/email-custom-header.c:844
+#: ../src/plugins/email-custom-header/email-custom-header.c:831
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:469
-#: ../src/shell/e-shell-window-actions.c:1052 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/plugins/sender-validation/sender-validation.c:503
+#: ../src/plugins/templates/templates.c:475
+#: ../src/shell/e-shell-window-actions.c:1103 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Muokkaa"
 
@@ -8146,7 +8244,7 @@ msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "seuraavasti:"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1091
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1090
 #, fuzzy
 #| msgid "occurrences"
 msgctxt "ECompEditorPageRecur"
@@ -8154,20 +8252,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:1556
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2113
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1551
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2108
 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:1561
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1556
 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:1566
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1561
 #, fuzzy
 #| msgid "This memo recurs"
 msgctxt "ECompEditorPageRecur"
@@ -8175,104 +8273,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:1571
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1566
 #, 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:1942
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1937
 #, 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:1998
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1993
 #, 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:2041
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2036
 msgid "R_ecurrence"
 msgstr "Toistu_vuus"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2043
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2038
 #, 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:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2140
 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:2180
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2175
 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:2182
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2177
 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:2184
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2179
 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:2186
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2181
 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:2215
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2210
 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:2217
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2212
 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:2219
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2214
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "ikuisesti"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2235
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2230
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2248
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2243
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2313
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2308
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:2168
 #: ../src/mail/e-mail-config-identity-page.c:854 ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "_Lisää"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2329
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2324
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:2176
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "_Poista"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2337
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2332
 msgid "Preview"
 msgstr "Esikatselu"
 
@@ -8324,13 +8422,13 @@ msgstr "Omavalintainen"
 
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1875
 msgid "Set a custom predefined time to"
-msgstr ""
+msgstr "Aseta mukautetuksi esiasetetuksi ajaksi"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1888
 msgctxt "cal-reminders"
 msgid "da_ys"
-msgstr ""
+msgstr "_päivää"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1904
@@ -8499,107 +8597,111 @@ msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Yhteenveto:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:341
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:387
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Sijainti:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:474
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:521
 msgctxt "ECompEditor"
 msgid "_Categories…"
 msgstr "_Luokat…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
 msgid "Edit as text"
 msgstr "_Muokkaa tekstinä"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
+msgid "View as text"
+msgstr "Näytä tekstinä"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
 msgid "View as HTML"
 msgstr "Näytä HTML:nä"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:656
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:711
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "K_uvaus:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:892
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1046
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Verkkosivusto:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1263
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1417
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "_Eräpäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1357
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1511
 #, fuzzy
 #| msgid "Date _completed:"
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Valmistumispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1373
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1527
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1374
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1528
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1375
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1529
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1391
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1545
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "Lu_okittelu:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1454
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1608
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1638
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1485
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1639
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1486
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1640
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1487
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1641
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Matala"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1496
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1650
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Prioriteetti:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1550
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1704
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Prosenttia valmiina:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1631
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1785
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Aika_vyöhyke:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1727
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1881
 #, fuzzy
 #| msgid "Show Time as _Busy"
 msgctxt "ECompEditor"
@@ -8607,7 +8709,7 @@ msgid "Show time as _busy"
 msgstr "Näytä aika _varattuna"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:2148
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2302
 #, fuzzy
 #| msgid "None"
 msgctxt "ECompEditor"
@@ -8626,238 +8728,241 @@ msgstr "Tehtävän aloitusaika on mennyt"
 msgid "Task’s due date is in the past"
 msgstr "Tehtävän aloitusaika on mennyt"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:530
+#: ../src/calendar/gui/e-comp-editor-task.c:523
 #, fuzzy
 #| msgid "Task cannot be edited, because the selected task list is read only"
 msgid "Task cannot be edited, because the selected task list could not be opened"
 msgstr "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:532
+#: ../src/calendar/gui/e-comp-editor-task.c:525
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:534
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "Tehtävää ei voi muokata kokonaan, koska et ole tehtävän järjestäjä"
+#: ../src/calendar/gui/e-comp-editor-task.c:527
+#, fuzzy
+#| msgid "Memo cannot be fully edited, because you are not the organizer"
+msgid ""
+"Changes made to the task will not be sent to the attendees, because you are not "
+"the organizer"
+msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:605
+#: ../src/calendar/gui/e-comp-editor-task.c:598
 msgid "Start date is required for recurring tasks"
 msgstr "Aloituspäivä vaaditaan toistuviin tehtäviin"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:621
+#: ../src/calendar/gui/e-comp-editor-task.c:614
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Due date is not a valid date"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:632
+#: ../src/calendar/gui/e-comp-editor-task.c:625
 #, fuzzy
 #| msgid "Completed date is wrong"
 msgid "Completed date is not a valid date"
 msgstr "Valmistumispäivä on väärin"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:643
+#: ../src/calendar/gui/e-comp-editor-task.c:636
 #, fuzzy
 #| msgid "1 minute in the future"
 #| msgid_plural "%d minutes in the future"
 msgid "Completed date cannot be in the future"
 msgstr "yhden minuutin päässä"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:720
+#: ../src/calendar/gui/e-comp-editor-task.c:713
 #, fuzzy
 #| msgid "All _Day Event"
 msgid "All _Day Task"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:722
+#: ../src/calendar/gui/e-comp-editor-task.c:715
 #, fuzzy
 #| msgid "Toggles whether to have All Day Event"
 msgid "Toggles whether to have All Day Task"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:946
+#: ../src/calendar/gui/e-comp-editor-task.c:939
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Task — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:947
+#: ../src/calendar/gui/e-comp-editor-task.c:940
 #, fuzzy, c-format
 #| msgid "Task - %s"
 msgid "Task — %s"
 msgstr "Tehtävä - %s"
 
-#: ../src/calendar/gui/e-comp-editor.c:253
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:141
+#: ../src/calendar/gui/e-comp-editor.c:255
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:133
 msgid "attachment"
 msgstr "liite"
 
-#: ../src/calendar/gui/e-comp-editor.c:610
-#| msgid "Send _updates to attendees"
+#: ../src/calendar/gui/e-comp-editor.c:613
 msgid "Sending notifications to attendees…"
 msgstr "Lähetetään ilmoitukset osanottajille…"
 
-#: ../src/calendar/gui/e-comp-editor.c:985 ../src/e-util/e-webdav-browser.c:1799
+#: ../src/calendar/gui/e-comp-editor.c:1025 ../src/e-util/e-webdav-browser.c:1923
 msgid "Saving changes…"
 msgstr "Tallennetaan muutoksia…"
 
-#: ../src/calendar/gui/e-comp-editor.c:1245
+#: ../src/calendar/gui/e-comp-editor.c:1296
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:2027 ../src/composer/e-composer-actions.c:333
+#: ../src/calendar/gui/e-comp-editor.c:2104 ../src/composer/e-composer-actions.c:333
 #: ../src/e-util/e-accounts-window.c:1778 ../src/e-util/e-html-editor-dialog.c:194
 #: ../src/e-util/e-mail-signature-editor.c:319
 #: ../src/e-util/e-name-selector-dialog.c:548
-#: ../src/e-util/e-preferences-window.c:399
-#: ../src/e-util/e-table-field-chooser-dialog.c:205 ../src/mail/e-mail-browser.c:166
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:758 ../src/mail/e-mail-notes.c:1015
-#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1458
-#: ../src/mail/em-subscription-editor.c:1741
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
+#: ../src/e-util/e-preferences-window.c:396
+#: ../src/e-util/e-table-field-chooser-dialog.c:197 ../src/mail/e-mail-browser.c:166
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:751 ../src/mail/e-mail-notes.c:1015
+#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1487
+#: ../src/mail/em-subscription-editor.c:1734
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:307
 #: ../src/shell/e-shell-window-actions.c:354
-#: ../src/shell/e-shell-window-actions.c:882
-#: ../src/smime/gui/certificate-manager.c:2196
+#: ../src/shell/e-shell-window-actions.c:926
+#: ../src/smime/gui/certificate-manager.c:2173
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../src/calendar/gui/e-comp-editor.c:2029
+#: ../src/calendar/gui/e-comp-editor.c:2106
 msgid "Close the current window"
 msgstr "Sulje nykyinen ikkuna"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:806
-#: ../src/e-util/e-html-editor-actions.c:1072 ../src/e-util/e-text.c:2080
-#: ../src/e-util/e-web-view.c:468 ../src/mail/e-mail-browser.c:173
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:903
+#: ../src/calendar/gui/e-comp-editor.c:2111 ../src/e-util/e-focus-tracker.c:806
+#: ../src/e-util/e-html-editor-actions.c:1074 ../src/e-util/e-text.c:2065
+#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:173
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:947
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:203
+#: ../src/calendar/gui/e-comp-editor.c:2113 ../src/e-util/e-focus-tracker.c:203
 #: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:312
-#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:470
-#: ../src/e-util/e-web-view.c:1994 ../src/mail/e-mail-browser.c:175
-#: ../src/shell/e-shell-window-actions.c:905
+#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:469
+#: ../src/e-util/e-web-view.c:2042 ../src/mail/e-mail-browser.c:175
+#: ../src/shell/e-shell-window-actions.c:949
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:801
-#: ../src/e-util/e-html-editor-actions.c:1079 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:910
+#: ../src/calendar/gui/e-comp-editor.c:2118 ../src/e-util/e-focus-tracker.c:801
+#: ../src/e-util/e-html-editor-actions.c:1081 ../src/e-util/e-text.c:2051
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:954
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:196
+#: ../src/calendar/gui/e-comp-editor.c:2120 ../src/e-util/e-focus-tracker.c:196
 #: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:306
-#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2003
-#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:912
+#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2051
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:956
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:217
+#: ../src/calendar/gui/e-comp-editor.c:2127 ../src/e-util/e-focus-tracker.c:217
 #: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:817
-#: ../src/shell/e-shell-window-actions.c:919
+#: ../src/shell/e-shell-window-actions.c:963
 msgid "Delete the selection"
 msgstr "Poista valinta"
 
-#: ../src/calendar/gui/e-comp-editor.c:2057
+#: ../src/calendar/gui/e-comp-editor.c:2134
 msgid "View help"
 msgstr "Näytä ohje"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:811
-#: ../src/e-util/e-html-editor-actions.c:1086 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:938
+#: ../src/calendar/gui/e-comp-editor.c:2139 ../src/e-util/e-focus-tracker.c:811
+#: ../src/e-util/e-html-editor-actions.c:1088 ../src/e-util/e-text.c:2077
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:982
 msgid "_Paste"
 msgstr "_Liitä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:210
+#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/e-util/e-focus-tracker.c:210
 #: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:318
-#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2012
-#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:940
+#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2060
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:984
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2069 ../src/composer/e-composer-actions.c:387
-#: ../src/mail/e-mail-reader.c:2749
+#: ../src/calendar/gui/e-comp-editor.c:2146 ../src/composer/e-composer-actions.c:387
+#: ../src/mail/e-mail-reader.c:2759
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 msgid "_Print…"
 msgstr "_Tulosta…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2756
+#: ../src/calendar/gui/e-comp-editor.c:2153 ../src/mail/e-mail-reader.c:2766
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:838
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1067
 msgid "Pre_view…"
 msgstr "_Esikatselu…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:821
-#: ../src/e-util/e-html-editor-actions.c:1100 ../src/e-util/e-web-view.c:485
-#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1015
+#: ../src/calendar/gui/e-comp-editor.c:2160 ../src/e-util/e-focus-tracker.c:821
+#: ../src/e-util/e-html-editor-actions.c:1102 ../src/e-util/e-web-view.c:484
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1059
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:224
+#: ../src/calendar/gui/e-comp-editor.c:2162 ../src/e-util/e-focus-tracker.c:224
 #: ../src/e-util/e-focus-tracker.c:280 ../src/e-util/e-focus-tracker.c:822
-#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1017
+#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1061
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../src/calendar/gui/e-comp-editor.c:2106
+#: ../src/calendar/gui/e-comp-editor.c:2183
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../src/calendar/gui/e-comp-editor.c:2120
-#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/calendar/gui/e-comp-editor.c:2197
+#: ../src/e-util/e-html-editor-actions.c:1125
 #: ../src/e-util/e-mail-signature-editor.c:333 ../src/mail/e-mail-browser.c:210
-#: ../src/mail/e-mail-notes.c:1029 ../src/shell/e-shell-window-actions.c:1059
+#: ../src/mail/e-mail-notes.c:1029 ../src/shell/e-shell-window-actions.c:1110
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../src/calendar/gui/e-comp-editor.c:2134
-#: ../src/e-util/e-html-editor-actions.c:1144
+#: ../src/calendar/gui/e-comp-editor.c:2211
+#: ../src/e-util/e-html-editor-actions.c:1146
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/composer/e-composer-actions.c:377
+#: ../src/calendar/gui/e-comp-editor.c:2218 ../src/composer/e-composer-actions.c:377
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../src/calendar/gui/e-comp-editor.c:2148
-#: ../src/e-util/e-html-editor-actions.c:1165 ../src/mail/e-mail-browser.c:224
-#: ../src/shell/e-shell-window-actions.c:1102
-#: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
+#: ../src/calendar/gui/e-comp-editor.c:2225
+#: ../src/e-util/e-html-editor-actions.c:1167 ../src/mail/e-mail-browser.c:224
+#: ../src/shell/e-shell-window-actions.c:1153
+#: ../src/smime/gui/certificate-manager.c:1641 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2160
+#: ../src/calendar/gui/e-comp-editor.c:2237
 msgid "Save current changes"
 msgstr "Tallenna nykyiset muutokset"
 
-#: ../src/calendar/gui/e-comp-editor.c:2165
+#: ../src/calendar/gui/e-comp-editor.c:2242
 #: ../src/e-util/e-mail-signature-editor.c:328 ../src/mail/e-mail-notes.c:1024
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
-#: ../src/calendar/gui/e-comp-editor.c:2167
+#: ../src/calendar/gui/e-comp-editor.c:2244
 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:2152 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
+#: ../src/calendar/gui/e-day-view.c:2132 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1750 ../src/calendar/gui/print.c:1076
 #: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
 #: ../src/calendar/gui/print.c:2683
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
-#: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
+#: ../src/calendar/gui/e-day-view.c:2135 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1753 ../src/calendar/gui/print.c:1081
 #: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
 #: ../src/calendar/gui/print.c:2685
 msgid "pm"
@@ -8869,14 +8974,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:3046
-#: ../src/calendar/gui/e-day-view-top-item.c:850
-#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2117
+#: ../src/calendar/gui/e-day-view.c:3026
+#: ../src/calendar/gui/e-day-view-top-item.c:846
+#: ../src/calendar/gui/e-week-view-main-item.c:207 ../src/calendar/gui/print.c:2117
 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:3787
+#: ../src/calendar/gui/e-day-view.c:3767
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -8887,17 +8992,17 @@ msgstr "Viikko %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:811
+#: ../src/calendar/gui/e-day-view-time-item.c:817
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuutin välein"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:836
+#: ../src/calendar/gui/e-day-view-time-item.c:842
 msgid "Show the second time zone"
 msgstr "Näytä toinen aikavyöhyke"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:853
+#: ../src/calendar/gui/e-day-view-time-item.c:859
 #: ../src/modules/calendar/e-calendar-preferences.c:310
 #: ../src/modules/calendar/e-calendar-preferences.c:362
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
@@ -8905,7 +9010,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-day-view-time-item.c:893
 #: ../src/calendar/gui/e-timezone-entry.c:346
 #: ../src/modules/calendar/e-calendar-preferences.c:393
 msgid "Select…"
@@ -8927,62 +9032,62 @@ msgstr "Vapaaehtoiset läsnäolijat"
 msgid "Resources"
 msgstr "Resurssit"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:163
+#: ../src/calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:179
+#: ../src/calendar/gui/e-meeting-list-view.c:176
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
 #: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1261
 msgid "Individual"
 msgstr "Henkilö"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:177
 #: ../src/calendar/gui/e-meeting-store.c:112
 #: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:181
+#: ../src/calendar/gui/e-meeting-list-view.c:178
 #: ../src/calendar/gui/e-meeting-store.c:114
 #: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
 msgid "Resource"
 msgstr "Resurssi"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:182
+#: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:116
 #: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
 msgid "Room"
 msgstr "Huone"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:193
+#: ../src/calendar/gui/e-meeting-list-view.c:190
 #: ../src/calendar/gui/e-meeting-store.c:145
 #: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:194
+#: ../src/calendar/gui/e-meeting-list-view.c:191
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
 #: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1279
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:195
+#: ../src/calendar/gui/e-meeting-list-view.c:192
 #: ../src/calendar/gui/e-meeting-store.c:149
 #: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:196
+#: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:151
 #: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-list-view.c:204
 #: ../src/calendar/gui/e-meeting-store.c:177
 #: ../src/calendar/gui/e-meeting-store.c:200
 #: ../src/calendar/gui/e-meeting-store.c:1079
@@ -8990,7 +9095,7 @@ msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:678
+#: ../src/calendar/gui/e-meeting-list-view.c:675
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
@@ -9018,7 +9123,7 @@ msgid "Failure reason: %s"
 msgstr "Epäonnistumisen syy: %s"
 
 #: ../src/calendar/gui/e-meeting-store.c:2018
-#: ../src/e-util/e-collection-account-wizard.c:493
+#: ../src/e-util/e-collection-account-wizard.c:501
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -9126,38 +9231,38 @@ msgstr "Yhteinen nimi"
 msgid "Language"
 msgstr "Kieli"
 
-#: ../src/calendar/gui/e-memo-table.c:535 ../src/calendar/gui/e-task-table.c:700
+#: ../src/calendar/gui/e-memo-table.c:524 ../src/calendar/gui/e-task-table.c:694
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:622 ../src/calendar/gui/e-task-table.c:801
+#: ../src/calendar/gui/e-memo-table.c:611 ../src/calendar/gui/e-task-table.c:795
 msgid "Start: "
 msgstr "Alkaa: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:642 ../src/calendar/gui/e-task-table.c:834
+#: ../src/calendar/gui/e-memo-table.c:631 ../src/calendar/gui/e-task-table.c:828
 msgid "Due: "
 msgstr "Erääntyy: "
 
-#: ../src/calendar/gui/e-memo-table.c:850
+#: ../src/calendar/gui/e-memo-table.c:839
 msgid "Cut selected memos to the clipboard"
 msgstr "Leikkaa valitut muistilaput leikepöydälle"
 
-#: ../src/calendar/gui/e-memo-table.c:856
+#: ../src/calendar/gui/e-memo-table.c:845
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopioi valitut muistilaput leikepöydälle"
 
-#: ../src/calendar/gui/e-memo-table.c:862
+#: ../src/calendar/gui/e-memo-table.c:851
 msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
-#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/calendar/gui/e-memo-table.c:857
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
-#: ../src/calendar/gui/e-memo-table.c:874
+#: ../src/calendar/gui/e-memo-table.c:863
 msgid "Select all visible memos"
 msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 
@@ -9165,7 +9270,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:474 ../src/calendar/gui/tasktypes.xml.in.h:22
+#: ../src/calendar/gui/e-task-table.c:467 ../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"
@@ -9174,29 +9279,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:502
+#: ../src/calendar/gui/e-task-table.c:496
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../src/calendar/gui/e-task-table.c:1072
+#: ../src/calendar/gui/e-task-table.c:1066
 msgid "Cut selected tasks to the clipboard"
 msgstr "Leikkaa valitut tehtävät leikepöydälle"
 
-#: ../src/calendar/gui/e-task-table.c:1078
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopioi valitut tehtävät leikepöydälle"
 
-#: ../src/calendar/gui/e-task-table.c:1084
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
-#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/calendar/gui/e-task-table.c:1084
 #: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1090
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
@@ -9256,21 +9361,20 @@ msgstr "Erääntyy: %s"
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
 #: ../src/calendar/gui/e-to-do-pane.c:442
 #, c-format
-#| msgid "Completed "
 msgid "Completed: %s"
 msgstr "Valmis: %s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:338
 #: ../src/e-util/e-datetime-format.c:207
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
-#: ../src/modules/itip-formatter/itip-view.c:259
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1919
+#: ../src/modules/itip-formatter/itip-view.c:260
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a weekday and a date.
 #: ../src/calendar/gui/e-to-do-pane.c:1578 ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:287
+#: ../src/modules/itip-formatter/itip-view.c:288
 msgid "Tomorrow"
 msgstr "Huomenna"
 
@@ -9281,12 +9385,12 @@ msgid "Tasks without Due date"
 msgstr "_Eräpäivän kanssa"
 
 #: ../src/calendar/gui/e-to-do-pane.c:2165
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1522
 msgid "New _Appointment…"
 msgstr "Uusi t_apaaminen…"
 
 #: ../src/calendar/gui/e-to-do-pane.c:2173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
 msgid "New _Meeting…"
 msgstr "Uusi _kokous…"
 
@@ -9334,7 +9438,7 @@ msgstr "Te_htävää"
 #. Translators: the first '%s' is replaced with a component summary;
 #. the second '%s' is replaced with an event location.
 #. Example: "Meet John Doe (Central Park)"
-#: ../src/calendar/gui/e-week-view.c:3703
+#: ../src/calendar/gui/e-week-view.c:3697
 #, c-format
 msgctxt "SummaryWithLocation"
 msgid "%s (%s)"
@@ -9343,36 +9447,36 @@ msgstr "%s (%s)"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2096
+#: ../src/calendar/gui/e-week-view-main-item.c:224 ../src/calendar/gui/print.c:2096
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
-#: ../src/calendar/gui/itip-utils.c:1010
+#: ../src/calendar/gui/itip-utils.c:842 ../src/calendar/gui/itip-utils.c:908
+#: ../src/calendar/gui/itip-utils.c:1057
 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:898
 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:1108 ../src/calendar/gui/itip-utils.c:1274
+#: ../src/calendar/gui/itip-utils.c:1155 ../src/calendar/gui/itip-utils.c:1321
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
+#: ../src/calendar/gui/itip-utils.c:1158 ../src/calendar/gui/itip-utils.c:1324
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
+#: ../src/calendar/gui/itip-utils.c:1161 ../src/calendar/gui/itip-utils.c:1327
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
+#: ../src/calendar/gui/itip-utils.c:1164 ../src/calendar/gui/itip-utils.c:1345
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1120
+#: ../src/calendar/gui/itip-utils.c:1167
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -9380,7 +9484,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:1160
+#: ../src/calendar/gui/itip-utils.c:1207
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -9389,7 +9493,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:1167
+#: ../src/calendar/gui/itip-utils.c:1214
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -9401,7 +9505,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:1174 ../src/calendar/gui/itip-utils.c:1222
+#: ../src/calendar/gui/itip-utils.c:1221 ../src/calendar/gui/itip-utils.c:1269
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -9410,7 +9514,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:1181
+#: ../src/calendar/gui/itip-utils.c:1228
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -9418,7 +9522,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:1194
+#: ../src/calendar/gui/itip-utils.c:1241
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -9426,7 +9530,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:1201
+#: ../src/calendar/gui/itip-utils.c:1248
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -9434,7 +9538,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:1208
+#: ../src/calendar/gui/itip-utils.c:1255
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -9442,51 +9546,51 @@ 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:1215
+#: ../src/calendar/gui/itip-utils.c:1262
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../src/calendar/gui/itip-utils.c:1295
+#: ../src/calendar/gui/itip-utils.c:1342
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1303
+#: ../src/calendar/gui/itip-utils.c:1350
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1332
+#: ../src/calendar/gui/itip-utils.c:1379
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Resurssia ei voida varata, uusi tehtävä on ristiriidassa aiemman kanssa."
 
-#: ../src/calendar/gui/itip-utils.c:1337
+#: ../src/calendar/gui/itip-utils.c:1384
 msgid "Unable to book a resource, error: "
-msgstr "Resurssin varaaminen ei onnistu, virhe:"
+msgstr "Resurssin varaaminen ei onnistu, virhe: "
 
-#: ../src/calendar/gui/itip-utils.c:1530
+#: ../src/calendar/gui/itip-utils.c:1577
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../src/calendar/gui/itip-utils.c:2312
+#: ../src/calendar/gui/itip-utils.c:2456
 msgid "Sending an event"
 msgstr "Lähetetään tapahtuma"
 
-#: ../src/calendar/gui/itip-utils.c:2316
+#: ../src/calendar/gui/itip-utils.c:2460
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending a memo"
 msgstr "Lähetetään viestiä"
 
-#: ../src/calendar/gui/itip-utils.c:2320
+#: ../src/calendar/gui/itip-utils.c:2464
 #, fuzzy
 #| msgid "Sending Email"
 msgid "Sending a task"
 msgstr "Lähetys"
 
 #. Translator: This is used as a placeholder when an event doesn't have set a location
-#: ../src/calendar/gui/itip-utils.c:2572
+#: ../src/calendar/gui/itip-utils.c:2709
 msgctxt "Location"
 msgid "Unspecified"
 msgstr "Määrittämätön"
@@ -9658,11 +9762,54 @@ msgstr "on suurempi kuin"
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
+#: ../src/calendar/gui/tasktypes.xml.in.h:28
+#, fuzzy
+#| msgid "C_urrent View"
+msgid "Current State"
+msgstr "N_ykyinen näkymä"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:29
+#, fuzzy
+#| msgid "Overdue Tasks"
+msgid "is Overdue"
+msgstr "Vanhentuneet tehtävät"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:30
+#, fuzzy
+#| msgid "_Schedule Meeting..."
+msgid "is Scheduled"
+msgstr "_Järjestä kokous..."
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:31
+#, fuzzy
+#| msgid "is not Flagged"
+msgid "is not Scheduled"
+msgstr "ei ole merkitty"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:32
+#, fuzzy
+#| msgid "Due "
+msgid "Due In"
+msgstr "Erääntyy "
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:33
+#, fuzzy
+#| msgctxt "DateFmt"
+#| msgid "Next Sat"
+msgid "Next Days"
+msgstr "Seuraava la"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:34
+#, fuzzy
+#| msgid "Previous year"
+msgid "Previous Days"
+msgstr "Edellinen vuosi"
+
 #: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../src/calendar/importers/icalendar-importer.c:327
+#: ../src/calendar/importers/icalendar-importer.c:334
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:89
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:280
@@ -9670,200 +9817,200 @@ msgstr "Tapaamiset ja kokoukset"
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: ../src/calendar/importers/icalendar-importer.c:330
+#: ../src/calendar/importers/icalendar-importer.c:337
 #: ../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:204
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
 
-#: ../src/calendar/importers/icalendar-importer.c:372
+#: ../src/calendar/importers/icalendar-importer.c:379
 msgid "Cre_ate new calendar"
 msgstr "_Luo uusi kalenteri"
 
-#: ../src/calendar/importers/icalendar-importer.c:376
+#: ../src/calendar/importers/icalendar-importer.c:383
 msgid "Cre_ate new task list"
 msgstr "Luo _uusi tehtävälista"
 
-#: ../src/calendar/importers/icalendar-importer.c:521
-#: ../src/calendar/importers/icalendar-importer.c:971
+#: ../src/calendar/importers/icalendar-importer.c:528
+#: ../src/calendar/importers/icalendar-importer.c:978
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../src/calendar/importers/icalendar-importer.c:668
+#: ../src/calendar/importers/icalendar-importer.c:675
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:669
+#: ../src/calendar/importers/icalendar-importer.c:676
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:764
+#: ../src/calendar/importers/icalendar-importer.c:771
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../src/calendar/importers/icalendar-importer.c:859
+#: ../src/calendar/importers/icalendar-importer.c:866
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:860
+#: ../src/calendar/importers/icalendar-importer.c:867
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:1134
+#: ../src/calendar/importers/icalendar-importer.c:1141
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../src/calendar/importers/icalendar-importer.c:1177
+#: ../src/calendar/importers/icalendar-importer.c:1184
 msgid "GNOME Calendar"
 msgstr "Gnomen kalenteri"
 
-#: ../src/calendar/importers/icalendar-importer.c:1178
+#: ../src/calendar/importers/icalendar-importer.c:1185
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:1254
-#: ../src/calendar/importers/icalendar-importer.c:1582
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1606
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../src/calendar/importers/icalendar-importer.c:1254
-#: ../src/calendar/importers/icalendar-importer.c:1582
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1606
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/calendar/importers/icalendar-importer.c:1257
-#: ../src/calendar/importers/icalendar-importer.c:1583
+#: ../src/calendar/importers/icalendar-importer.c:1283
+#: ../src/calendar/importers/icalendar-importer.c:1607
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../src/calendar/importers/icalendar-importer.c:1260
-#: ../src/calendar/importers/icalendar-importer.c:1584
+#: ../src/calendar/importers/icalendar-importer.c:1286
+#: ../src/calendar/importers/icalendar-importer.c:1608
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
+#: ../src/calendar/importers/icalendar-importer.c:1295
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "on instanssi"
+
 #. have ? NULL :
-#: ../src/calendar/importers/icalendar-importer.c:1269
+#: ../src/calendar/importers/icalendar-importer.c:1298
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../src/calendar/importers/icalendar-importer.c:1274
-msgctxt "iCalImp"
-msgid "is an instance"
-msgstr "on instanssi"
-
-#: ../src/calendar/importers/icalendar-importer.c:1279
+#: ../src/calendar/importers/icalendar-importer.c:1303
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../src/calendar/importers/icalendar-importer.c:1284
+#: ../src/calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1296
+#: ../src/calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1299
+#: ../src/calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1302
+#: ../src/calendar/importers/icalendar-importer.c:1326
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1306
+#: ../src/calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1311
-#: ../src/calendar/importers/icalendar-importer.c:1627
+#: ../src/calendar/importers/icalendar-importer.c:1335
+#: ../src/calendar/importers/icalendar-importer.c:1651
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1318
+#: ../src/calendar/importers/icalendar-importer.c:1342
 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:1326
-#: ../src/calendar/importers/icalendar-importer.c:1622
+#: ../src/calendar/importers/icalendar-importer.c:1350
+#: ../src/calendar/importers/icalendar-importer.c:1646
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1336
+#: ../src/calendar/importers/icalendar-importer.c:1360
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1347
+#: ../src/calendar/importers/icalendar-importer.c:1371
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1356
+#: ../src/calendar/importers/icalendar-importer.c:1380
 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:1381
+#: ../src/calendar/importers/icalendar-importer.c:1405
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1388
+#: ../src/calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1405
-#: ../src/calendar/importers/icalendar-importer.c:1408
+#: ../src/calendar/importers/icalendar-importer.c:1429
+#: ../src/calendar/importers/icalendar-importer.c:1432
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1437
-#: ../src/calendar/importers/icalendar-importer.c:1440
+#: ../src/calendar/importers/icalendar-importer.c:1461
+#: ../src/calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../src/calendar/importers/icalendar-importer.c:1456
+#: ../src/calendar/importers/icalendar-importer.c:1480
 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:1617
+#: ../src/calendar/importers/icalendar-importer.c:1641
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
@@ -11431,11 +11578,11 @@ msgstr "Uusi _viesti"
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../src/composer/e-composer-actions.c:347 ../src/shell/e-shell-window-actions.c:952
+#: ../src/composer/e-composer-actions.c:347 ../src/shell/e-shell-window-actions.c:996
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../src/composer/e-composer-actions.c:349 ../src/shell/e-shell-window-actions.c:954
+#: ../src/composer/e-composer-actions.c:349 ../src/shell/e-shell-window-actions.c:998
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
@@ -11580,12 +11727,12 @@ msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:2033
-#: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2398
+#: ../src/e-util/e-collection-account-wizard.c:2058
+#: ../src/e-util/e-mail-signature-script-dialog.c:408
+#: ../src/e-util/e-webdav-browser.c:2544
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
 #: ../src/mail/e-mail-config-identity-page.c:551
-#: ../src/mail/e-mail-config-summary-page.c:334
+#: ../src/mail/e-mail-config-summary-page.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_Nimi:"
@@ -11606,44 +11753,44 @@ msgstr ""
 "Anna osoitteet, joihin lähetetään kopiot viestistä ilman että muut vastaanottajat "
 "näkevät vastaanottajia"
 
-#: ../src/composer/e-composer-header-table.c:840
+#: ../src/composer/e-composer-header-table.c:831
 msgid "Fr_om:"
 msgstr "_Lähettäjä:"
 
-#: ../src/composer/e-composer-header-table.c:847
+#: ../src/composer/e-composer-header-table.c:838
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../src/composer/e-composer-header-table.c:852
+#: ../src/composer/e-composer-header-table.c:843
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../src/composer/e-composer-header-table.c:858
+#: ../src/composer/e-composer-header-table.c:849
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../src/composer/e-composer-header-table.c:864
+#: ../src/composer/e-composer-header-table.c:855
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../src/composer/e-composer-header-table.c:869
+#: ../src/composer/e-composer-header-table.c:860
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../src/composer/e-composer-header-table.c:873
+#: ../src/composer/e-composer-header-table.c:864
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: ../src/composer/e-composer-header-table.c:883
+#: ../src/composer/e-composer-header-table.c:874
 #: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../src/composer/e-composer-name-header.c:237
+#: ../src/composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Avaa osoitekirja tästä"
 
-#: ../src/composer/e-composer-post-header.c:180
+#: ../src/composer/e-composer-post-header.c:176
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
@@ -11665,14 +11812,12 @@ msgstr ""
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../src/composer/e-msg-composer.c:4362
+#: ../src/composer/e-msg-composer.c:4381
 #: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:352
-#, fuzzy
-#| msgid "Loading Remote Content"
 msgid "Reading text content…"
-msgstr "Etäsisällön lataaminen"
+msgstr "Luetaan tekstin sisältöä…"
 
-#: ../src/composer/e-msg-composer.c:5172
+#: ../src/composer/e-msg-composer.c:5191
 #, fuzzy
 #| msgid "Remove attachments"
 msgid "Review attachment before sending."
@@ -11680,7 +11825,7 @@ msgid_plural "Review attachments before sending."
 msgstr[0] "Poista liitteet"
 msgstr[1] "Poista liitteet"
 
-#: ../src/composer/e-msg-composer.c:5177
+#: ../src/composer/e-msg-composer.c:5196
 #, c-format
 msgid ""
 "There had been added %d attachment. Make sure it does not contain any sensitive "
@@ -11691,7 +11836,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/composer/e-msg-composer.c:5310
+#: ../src/composer/e-msg-composer.c:5329
 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)"
@@ -11743,7 +11888,6 @@ msgid ""
 msgstr ""
 
 #: ../src/composer/mail-composer.error.xml.h:11
-#| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Could not save to autosave file “{0}”."
 msgstr "Ei voitu tallentaa automaattisesti tiedostoa “{0}”."
 
@@ -11841,7 +11985,7 @@ msgid "_Save to Outbox"
 msgstr "_Tallenna lähteviin"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:694
+#: ../src/e-util/e-collection-account-wizard.c:710
 msgid "_Try Again"
 msgstr "_Yritä uudelleen"
 
@@ -11969,7 +12113,17 @@ msgstr ""
 msgid "An error occurred while creating message composer."
 msgstr "Tapahtui virhe tulostettaessa"
 
-#: ../src/em-format/e-mail-formatter-attachment.c:335
+#: ../src/em-format/e-mail-formatter-attachment.c:272
+#, fuzzy
+#| msgid "_View Inline"
+msgid "Toggle View Inline"
+msgstr "Näytä _sisäkkäisesti"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:272
+msgid "Open in default application"
+msgstr "Avaa oletussovelluksella"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:337
 msgid "Display as attachment"
 msgstr "Näytä liitteenä"
 
@@ -12025,7 +12179,7 @@ msgstr "RFC822-viesti"
 msgid "Format part as an RFC822 message"
 msgstr "Muotoillaan viestiä"
 
-#: ../src/em-format/e-mail-formatter-print.c:50 ../src/e-util/e-webdav-browser.c:2342
+#: ../src/em-format/e-mail-formatter-print.c:50 ../src/e-util/e-webdav-browser.c:2488
 #: ../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
@@ -12037,17 +12191,17 @@ msgstr "Nimi"
 msgid "Size"
 msgstr "Koko"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:181
+#: ../src/em-format/e-mail-formatter-quote-headers.c:184
 #: ../src/em-format/e-mail-part-headers.c:51 ../src/mail/e-mail-tag-editor.c:201
 #: ../src/mail/filtertypes.xml.in.h:16 ../src/mail/message-list.etspec.h:6
 #: ../src/mail/searchtypes.xml.in.h:17 ../src/mail/vfoldertypes.xml.in.h:17
 #: ../src/modules/mail/em-mailer-prefs.c:65
-#: ../src/smime/gui/certificate-manager.c:1627
+#: ../src/smime/gui/certificate-manager.c:1622
 msgid "Subject"
 msgstr "Aihe"
 
 #. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-quote-headers.c:205
 #: ../src/em-format/e-mail-formatter-utils.c:360
 #: ../src/modules/mail/em-mailer-prefs.c:686
 #: ../src/modules/mail/em-mailer-prefs.c:1620
@@ -12076,12 +12230,12 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
-#: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:130
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
 msgid "Plain Text"
 msgstr "Raakateksti"
 
-#: ../src/em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:131
 #: ../src/em-format/e-mail-formatter-text-plain.c:197
 #, fuzzy
 #| msgid "Only ever show plain text"
@@ -12224,7 +12378,7 @@ msgstr "Digitaalinen allekirjoitus"
 msgid "Signer:"
 msgid_plural "Signers:"
 msgstr[0] "Allekirjoittaja:"
-msgstr[1] "Allekirjoita"
+msgstr[1] "Allekirjoittajat:"
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:429
 msgid "Encryption"
@@ -12291,7 +12445,7 @@ msgid "partially S/MIME encrypted"
 msgstr "osittain S/MIME-salattu"
 
 #: ../src/em-format/e-mail-formatter-utils.c:693
-#: ../src/mail/e-mail-config-security-page.c:856
+#: ../src/mail/e-mail-config-security-page.c:852
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
 msgid "Security"
@@ -12373,8 +12527,8 @@ msgstr "Allekirjoituksen muoto ei ole tuettu"
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:559
-#: ../src/e-util/e-dateedit.c:582 ../src/mail/message-list.etspec.h:7
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:581 ../src/mail/message-list.etspec.h:7
 #: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "Päiväys"
@@ -12413,7 +12567,7 @@ msgstr "evolutionin kalenterin kohta"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:914
+#: ../src/modules/mail/e-mail-shell-backend.c:1109
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
@@ -12441,15 +12595,15 @@ msgstr "Tehtävälistat"
 
 #: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1306
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:407
-#: ../src/plugins/mail-notification/mail-notification.c:1124
-#: ../src/plugins/publish-calendar/publish-calendar.c:854
+#: ../src/modules/mail/em-composer-prefs.c:1303
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:408
+#: ../src/plugins/mail-notification/mail-notification.c:1175
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
 msgid "Enabled"
-msgstr "käytössä"
+msgstr "Käytössä"
 
 #: ../src/e-util/e-accounts-window.c:1415 ../src/mail/e-mail-account-tree-view.c:108
-#: ../src/plugins/mail-notification/mail-notification.c:1140
+#: ../src/plugins/mail-notification/mail-notification.c:1191
 msgid "Account Name"
 msgstr "Tilin nimi"
 
@@ -12488,10 +12642,10 @@ msgstr "Evolution-tilit"
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2689
-#: ../src/mail/em-subscription-editor.c:1952
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2855
+#: ../src/mail/em-subscription-editor.c:1945
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1594
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1672
 msgid "_Refresh"
 msgstr "_Päivitä"
 
@@ -12500,31 +12654,31 @@ msgid "Initiates refresh of account sources"
 msgstr ""
 
 #. Translators: This is a cancelled activity.
-#: ../src/e-util/e-activity.c:256
+#: ../src/e-util/e-activity.c:252
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (peruttu)"
 
 #. Translators: This is a completed activity.
-#: ../src/e-util/e-activity.c:259
+#: ../src/e-util/e-activity.c:255
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (valmis)"
 
 #. Translators: This is an activity waiting to run.
-#: ../src/e-util/e-activity.c:262
+#: ../src/e-util/e-activity.c:258
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (odottaa)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../src/e-util/e-activity.c:266
+#: ../src/e-util/e-activity.c:262
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (perutaan)"
 
-#: ../src/e-util/e-activity.c:268
+#: ../src/e-util/e-activity.c:264
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -12532,7 +12686,7 @@ msgstr "%s"
 #. Translators: This is a running activity whose
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
-#: ../src/e-util/e-activity.c:273
+#: ../src/e-util/e-activity.c:269
 #: ../src/modules/addressbook/e-book-shell-view-private.c:334
 #: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
@@ -12540,7 +12694,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:1790
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1784
 msgid "Cancel"
 msgstr "Peru"
 
@@ -12567,21 +12721,21 @@ msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 msgid "Attached message"
 msgstr "Liitetty viesti"
 
-#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3146
+#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3130
 msgid "Operation was cancelled"
 msgstr "Toiminto peruttiin"
 
 #. Translators: Default attachment filename.
-#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
-#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:914
+#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2974
+#: ../src/e-util/e-attachment.c:3426 ../src/e-util/e-attachment-store.c:914
 msgid "attachment.dat"
 msgstr "liite.dat"
 
-#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3502
+#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3486
 msgid "A load operation is already in progress"
 msgstr "Lataus on jo käynnissä"
 
-#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3510
+#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3494
 msgid "A save operation is already in progress"
 msgstr "Tallennus on jo käynnissä"
 
@@ -12595,40 +12749,40 @@ msgstr "Ei voitu avata “%s”"
 msgid "Could not open the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../src/e-util/e-attachment.c:3519
+#: ../src/e-util/e-attachment.c:3503
 msgid "Attachment contents not loaded"
 msgstr "Liitteen sisältöä ei ladattu"
 
-#: ../src/e-util/e-attachment.c:3610
+#: ../src/e-util/e-attachment.c:3594
 #, c-format
 msgid "Could not save “%s”"
 msgstr "Ei voitu tallentaa “%s”"
 
-#: ../src/e-util/e-attachment.c:3613
+#: ../src/e-util/e-attachment.c:3597
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Liitettä ei voitu tallentaa"
 
-#: ../src/e-util/e-attachment-dialog.c:315
+#: ../src/e-util/e-attachment-dialog.c:295
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
-#: ../src/e-util/e-attachment-dialog.c:337 ../src/e-util/e-import-assistant.c:277
+#: ../src/e-util/e-attachment-dialog.c:317 ../src/e-util/e-import-assistant.c:303
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
-#: ../src/e-util/e-attachment-dialog.c:354
-#: ../src/e-util/e-html-editor-image-dialog.c:513
+#: ../src/e-util/e-attachment-dialog.c:334
+#: ../src/e-util/e-html-editor-image-dialog.c:602
 #: ../src/e-util/e-html-editor-link-dialog.c:226
-#: ../src/e-util/e-webdav-browser.c:2437
+#: ../src/e-util/e-webdav-browser.c:2600
 msgid "_Description:"
 msgstr "K_uvaus:"
 
-#: ../src/e-util/e-attachment-dialog.c:372
+#: ../src/e-util/e-attachment-dialog.c:352
 msgid "MIME Type:"
 msgstr "MIME-tyyppi:"
 
-#: ../src/e-util/e-attachment-dialog.c:380 ../src/e-util/e-attachment-store.c:700
+#: ../src/e-util/e-attachment-dialog.c:360 ../src/e-util/e-attachment-store.c:700
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
@@ -12654,7 +12808,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:706
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
@@ -12702,9 +12856,9 @@ msgid "Sa_ve As"
 msgstr "_Tallenna nimellä"
 
 #: ../src/e-util/e-attachment-view.c:331
-#: ../src/plugins/save-calendar/save-calendar.c:348
-#: ../src/plugins/save-calendar/save-calendar.c:387
-#: ../src/plugins/save-calendar/save-calendar.c:426
+#: ../src/plugins/save-calendar/save-calendar.c:345
+#: ../src/plugins/save-calendar/save-calendar.c:384
+#: ../src/plugins/save-calendar/save-calendar.c:423
 msgid "Save _As"
 msgstr "Tallenna _nimellä"
 
@@ -12714,41 +12868,41 @@ msgstr "_Lisää liite…"
 
 #: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:619
 #: ../src/modules/calendar/e-task-shell-view-actions.c:745
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1587
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1665
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
-#: ../src/e-util/e-attachment-view.c:786
+#: ../src/e-util/e-attachment-view.c:784
 #, c-format
 msgid "Open With “%s”"
 msgstr "Avaa sovelluksella “%s”"
 
-#: ../src/e-util/e-attachment-view.c:787
+#: ../src/e-util/e-attachment-view.c:785
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Avaa tämä liite ohjelmalla %s"
 
-#: ../src/e-util/e-attachment-view.c:789
+#: ../src/e-util/e-attachment-view.c:787
 msgid "Open With Default Application"
 msgstr "Avaa oletussovelluksella"
 
-#: ../src/e-util/e-attachment-view.c:790
+#: ../src/e-util/e-attachment-view.c:788
 msgid "Open this attachment in default application"
 msgstr "Avaa tämä liite oletussovelluksella"
 
-#: ../src/e-util/e-book-source-config.c:98
+#: ../src/e-util/e-book-source-config.c:90
 msgid "Mark as default address book"
 msgstr "Merkitse oletusosoitekirjaksi"
 
-#: ../src/e-util/e-book-source-config.c:103
+#: ../src/e-util/e-book-source-config.c:95
 msgid "Autocomplete with this address book"
 msgstr "Täydennä automaattisesti tästä osoitekirjasta"
 
-#: ../src/e-util/e-book-source-config.c:277
+#: ../src/e-util/e-book-source-config.c:269
 msgid "Copy book content locally for offline operation"
 msgstr "Kopioi kirjan sisältö paikallisesti yhteydettömään käyttöön"
 
@@ -12773,52 +12927,52 @@ msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1357 ../src/e-util/e-calendar-item.c:2240
+#: ../src/e-util/e-calendar-item.c:1368 ../src/e-util/e-calendar-item.c:2261
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1359
+#: ../src/e-util/e-calendar-item.c:1370
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1396
+#: ../src/e-util/e-calendar-item.c:1407
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/e-util/e-cal-source-config.c:169
+#: ../src/e-util/e-cal-source-config.c:161
 msgid "Mark as default calendar"
 msgstr "Merkitse oletuskalenteriksi"
 
-#: ../src/e-util/e-cal-source-config.c:172
+#: ../src/e-util/e-cal-source-config.c:164
 msgid "Mark as default task list"
 msgstr "Merkitse oletustehtävälistaksi"
 
-#: ../src/e-util/e-cal-source-config.c:175
+#: ../src/e-util/e-cal-source-config.c:167
 msgid "Mark as default memo list"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../src/e-util/e-cal-source-config.c:200
+#: ../src/e-util/e-cal-source-config.c:192
 msgid "Color:"
 msgstr "Väri:"
 
-#: ../src/e-util/e-cal-source-config.c:428
+#: ../src/e-util/e-cal-source-config.c:420
 #, fuzzy
 #| msgid "Cop_y calendar contents locally for offline operation"
 msgid "Copy calendar contents locally for offline operation"
 msgstr "_Kopioi kalenterin sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../src/e-util/e-cal-source-config.c:432
+#: ../src/e-util/e-cal-source-config.c:424
 #, fuzzy
 #| msgid "Cop_y task list contents locally for offline operation"
 msgid "Copy task list contents locally for offline operation"
 msgstr "_Kopioi tehtävälistan sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../src/e-util/e-cal-source-config.c:436
+#: ../src/e-util/e-cal-source-config.c:428
 #, fuzzy
 #| msgid "Cop_y memo list contents locally for offline operation"
 msgid "Copy memo list contents locally for offline operation"
@@ -12847,7 +13001,7 @@ msgctxt "category"
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../src/e-util/e-categories-selector.c:323
+#: ../src/e-util/e-categories-selector.c:319
 msgid "Icon"
 msgstr "Kuvake"
 
@@ -12890,31 +13044,31 @@ msgid ""
 "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
+#: ../src/e-util/e-cell-combo.c:186
 msgid "popup list"
 msgstr "ponnahduslista"
 
-#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
+#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:138
+#: ../src/e-util/e-cell-date.c:158 ../src/mail/message-list.c:2146
 msgid "?"
 msgstr "?"
 
-#: ../src/e-util/e-cell-date-edit.c:320
+#: ../src/e-util/e-cell-date-edit.c:330
 msgid "Now"
 msgstr "Nyt"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../src/e-util/e-cell-date-edit.c:338
+#: ../src/e-util/e-cell-date-edit.c:348
 msgctxt "table-date"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/e-util/e-cell-date-edit.c:346 ../src/mail/e-mail-label-dialog.c:198
+#: ../src/e-util/e-cell-date-edit.c:356 ../src/mail/e-mail-label-dialog.c:190
 msgid "OK"
 msgstr "OK"
 
-#: ../src/e-util/e-cell-date-edit.c:901
+#: ../src/e-util/e-cell-date-edit.c:908
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
@@ -13009,15 +13163,41 @@ msgstr "Merkistön koodaus"
 msgid "Enter the character set to use"
 msgstr "Syötä käytettävä merkistö"
 
-#: ../src/e-util/e-charset-combo-box.c:364
+#: ../src/e-util/e-charset-combo-box.c:356
 msgid "Other…"
 msgstr "Muu…"
 
-#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
+#: ../src/e-util/e-client-cache.c:1146 ../src/e-util/e-client-cache.c:1277
 #, c-format
 msgid "Cannot create a client object from extension name “%s”"
 msgstr ""
 
+#: ../src/e-util/e-client-selector.c:190 ../src/mail/em-folder-tree.c:1035
+#, fuzzy
+#| msgid "_Work Offline"
+msgctxt "Status"
+msgid "Offline"
+msgstr "_Katkaise verkkoyhteydet"
+
+#: ../src/e-util/e-client-selector.c:193 ../src/mail/em-folder-tree.c:1038
+#, fuzzy
+#| msgctxt "ReplyForward"
+#| msgid "Inline"
+msgctxt "Status"
+msgid "Online"
+msgstr "Sisennettynä"
+
+#: ../src/e-util/e-client-selector.c:196 ../src/mail/em-folder-tree.c:1041
+msgctxt "Status"
+msgid "Unreachable"
+msgstr ""
+
+#: ../src/e-util/e-client-selector.c:199 ../src/mail/em-folder-tree.c:1044
+#, fuzzy
+msgctxt "Status"
+msgid "Failed to connect"
+msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+
 #: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
 msgid "_Finish"
@@ -13030,7 +13210,7 @@ msgid "_Look Up"
 msgstr "_Ohita haku"
 
 #: ../src/e-util/e-collection-account-wizard.c:112
-#: ../src/e-util/e-collection-account-wizard.c:273 ../src/e-util/e-search-bar.c:680
+#: ../src/e-util/e-collection-account-wizard.c:275 ../src/e-util/e-search-bar.c:653
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
@@ -13040,143 +13220,143 @@ msgstr "_Seuraava"
 msgid "New Collection Account"
 msgstr "Uusi kokoelmatili"
 
-#: ../src/e-util/e-collection-account-wizard.c:258 ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-collection-account-wizard.c:260 ../src/e-util/e-search-bar.c:641
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: ../src/e-util/e-collection-account-wizard.c:439
+#: ../src/e-util/e-collection-account-wizard.c:447
 msgid "Looking up details, please wait…"
 msgstr "Etsitään tietoja, odota hetki…"
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:496
+#: ../src/e-util/e-collection-account-wizard.c:511
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "Salasana vaaditaan jatkamiseksi. %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:509
+#: ../src/e-util/e-collection-account-wizard.c:525
 msgid "View certificate"
 msgstr "Näytä varmenne"
 
-#: ../src/e-util/e-collection-account-wizard.c:550
+#: ../src/e-util/e-collection-account-wizard.c:566
 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:552
+#: ../src/e-util/e-collection-account-wizard.c:568
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/e-util/e-collection-account-wizard.c:663
+#: ../src/e-util/e-collection-account-wizard.c:679
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../src/e-util/e-collection-account-wizard.c:675
+#: ../src/e-util/e-collection-account-wizard.c:691
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../src/smime/gui/certificate-manager.c:766
+#: ../src/smime/gui/certificate-manager.c:761
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/e-util/e-collection-account-wizard.c:688
+#: ../src/e-util/e-collection-account-wizard.c:704
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../src/e-util/e-collection-account-wizard.c:835
-#: ../src/e-util/e-webdav-browser.c:474
+#: ../src/e-util/e-collection-account-wizard.c:851
+#: ../src/e-util/e-webdav-browser.c:536
 msgid "Collection"
 msgstr "Kokoelma"
 
-#: ../src/e-util/e-collection-account-wizard.c:836
+#: ../src/e-util/e-collection-account-wizard.c:852
 #, fuzzy
 #| msgid "Mail Receipt"
 msgid "Mail Receive"
 msgstr "Sähköpostin vastaanotto"
 
-#: ../src/e-util/e-collection-account-wizard.c:837
+#: ../src/e-util/e-collection-account-wizard.c:853
 #, fuzzy
 #| msgid "Mailer"
 msgid "Mail Send"
 msgstr "Postittaja"
 
-#: ../src/e-util/e-collection-account-wizard.c:838
+#: ../src/e-util/e-collection-account-wizard.c:854
 #: ../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:840
+#: ../src/e-util/e-collection-account-wizard.c:856
 #, fuzzy
 #| msgid "Memo Lists"
 msgid "Memo List"
 msgstr "Muistilappulistat"
 
-#: ../src/e-util/e-collection-account-wizard.c:841
+#: ../src/e-util/e-collection-account-wizard.c:857
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Task List"
 msgstr "Tehtävälista"
 
-#: ../src/e-util/e-collection-account-wizard.c:1177
+#: ../src/e-util/e-collection-account-wizard.c:1193
 msgid "Looking up LDAP server’s search base…"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1310
+#: ../src/e-util/e-collection-account-wizard.c:1326
 #, fuzzy
 #| msgid "Failed to mark messages as read."
 msgid "Failed to store password: "
 msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 
-#: ../src/e-util/e-collection-account-wizard.c:1320
+#: ../src/e-util/e-collection-account-wizard.c:1336
 #, fuzzy
 #| msgid "Failed to mark messages as read."
 msgid "Failed to create sources: "
 msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 
-#: ../src/e-util/e-collection-account-wizard.c:1487
+#: ../src/e-util/e-collection-account-wizard.c:1503
 msgid "Saving account settings, please wait…"
 msgstr "Tallennetaan tilin asetuksia, odota hetki…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1639
+#: ../src/e-util/e-collection-account-wizard.c:1655
 msgid "User details"
 msgstr "Käyttäjän tiedot"
 
-#: ../src/e-util/e-collection-account-wizard.c:1652
+#: ../src/e-util/e-collection-account-wizard.c:1668
 msgid "_Email Address or User name:"
 msgstr "S_ähköpostiosoite tai käyttäjätunnus:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1683
+#: ../src/e-util/e-collection-account-wizard.c:1699
 msgid "_Advanced Options"
 msgstr "_Lähetysasetukset"
 
-#: ../src/e-util/e-collection-account-wizard.c:1688
+#: ../src/e-util/e-collection-account-wizard.c:1704
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1707
+#: ../src/e-util/e-collection-account-wizard.c:1723
 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:1900
+#: ../src/e-util/e-collection-account-wizard.c:1925
 #, 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:2024
+#: ../src/e-util/e-collection-account-wizard.c:2049
 #: ../src/mail/e-mail-config-identity-page.c:542
-#: ../src/mail/e-mail-config-summary-page.c:325
+#: ../src/mail/e-mail-config-summary-page.c:318
 msgid "Account Information"
 msgstr "Tilitiedot"
 
@@ -13184,177 +13364,177 @@ msgstr "Tilitiedot"
 msgid "Choose custom color"
 msgstr "Käytä omavalintainen väri"
 
-#: ../src/e-util/e-color-combo.c:488 ../src/e-util/e-html-editor.c:127
+#: ../src/e-util/e-color-combo.c:476 ../src/e-util/e-html-editor.c:128
 #: ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:544
-#: ../src/mail/e-mail-config-security-page.c:708 ../src/mail/e-mail-reader.c:4870
+#: ../src/mail/e-mail-config-security-page.c:540
+#: ../src/mail/e-mail-config-security-page.c:704 ../src/mail/e-mail-reader.c:4891
 #: ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../src/e-util/e-color-combo.c:576
+#: ../src/e-util/e-color-combo.c:564
 msgid "black"
 msgstr "musta"
 
-#: ../src/e-util/e-color-combo.c:577
+#: ../src/e-util/e-color-combo.c:565
 msgid "light brown"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:578
+#: ../src/e-util/e-color-combo.c:566
 msgid "brown gold"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:579
+#: ../src/e-util/e-color-combo.c:567
 msgid "dark green #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:580
+#: ../src/e-util/e-color-combo.c:568
 msgid "navy"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:581
+#: ../src/e-util/e-color-combo.c:569
 msgid "dark blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:582
+#: ../src/e-util/e-color-combo.c:570
 msgid "purple #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:583
+#: ../src/e-util/e-color-combo.c:571
 msgid "very dark gray"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:585
+#: ../src/e-util/e-color-combo.c:573
 #, fuzzy
 #| msgid "Mark as _Unread"
 msgid "dark red"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../src/e-util/e-color-combo.c:586
+#: ../src/e-util/e-color-combo.c:574
 msgid "red-orange"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:587
+#: ../src/e-util/e-color-combo.c:575
 msgid "gold"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:588
+#: ../src/e-util/e-color-combo.c:576
 msgid "dark green"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:589
+#: ../src/e-util/e-color-combo.c:577
 msgid "dull blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:590
+#: ../src/e-util/e-color-combo.c:578
 msgid "blue"
 msgstr "sininen"
 
-#: ../src/e-util/e-color-combo.c:591
+#: ../src/e-util/e-color-combo.c:579
 msgid "dull purple"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:592
+#: ../src/e-util/e-color-combo.c:580
 msgid "dark grey"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:594
+#: ../src/e-util/e-color-combo.c:582
 msgid "red"
 msgstr "punainen"
 
-#: ../src/e-util/e-color-combo.c:595
+#: ../src/e-util/e-color-combo.c:583
 msgid "orange"
 msgstr "oranssi"
 
-#: ../src/e-util/e-color-combo.c:596
+#: ../src/e-util/e-color-combo.c:584
 msgid "lime"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:597
+#: ../src/e-util/e-color-combo.c:585
 msgid "dull green"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:598
+#: ../src/e-util/e-color-combo.c:586
 msgid "dull blue #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:599
+#: ../src/e-util/e-color-combo.c:587
 msgid "sky blue #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:600
+#: ../src/e-util/e-color-combo.c:588
 msgid "purple"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:601
+#: ../src/e-util/e-color-combo.c:589
 msgid "gray"
 msgstr "harmaa"
 
-#: ../src/e-util/e-color-combo.c:603
+#: ../src/e-util/e-color-combo.c:591
 #, fuzzy
 #| msgid "Image"
 msgid "magenta"
 msgstr "Kuva"
 
-#: ../src/e-util/e-color-combo.c:604
+#: ../src/e-util/e-color-combo.c:592
 msgid "bright orange"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:605
+#: ../src/e-util/e-color-combo.c:593
 msgid "yellow"
 msgstr "keltainen"
 
-#: ../src/e-util/e-color-combo.c:606
+#: ../src/e-util/e-color-combo.c:594
 msgid "green"
 msgstr "vihreä"
 
-#: ../src/e-util/e-color-combo.c:607
+#: ../src/e-util/e-color-combo.c:595
 msgid "cyan"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:608
+#: ../src/e-util/e-color-combo.c:596
 msgid "bright blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:609
+#: ../src/e-util/e-color-combo.c:597
 #, fuzzy
 #| msgid "_Required people"
 msgid "red purple"
 msgstr "_Vaaditut henkilöt"
 
-#: ../src/e-util/e-color-combo.c:610
+#: ../src/e-util/e-color-combo.c:598
 msgid "light grey"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:612
+#: ../src/e-util/e-color-combo.c:600
 msgid "pink"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:613
+#: ../src/e-util/e-color-combo.c:601
 msgid "light orange"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:614
+#: ../src/e-util/e-color-combo.c:602
 msgid "light yellow"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:615
+#: ../src/e-util/e-color-combo.c:603
 msgid "light green"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:616
+#: ../src/e-util/e-color-combo.c:604
 msgid "light cyan"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:617
+#: ../src/e-util/e-color-combo.c:605
 msgid "light blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:618
+#: ../src/e-util/e-color-combo.c:606
 msgid "light purple"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:619
+#: ../src/e-util/e-color-combo.c:607
 msgid "white"
 msgstr "valkoinen"
 
@@ -13362,53 +13542,53 @@ msgstr "valkoinen"
 msgid "Running…"
 msgstr "Suoritetaan…"
 
-#: ../src/e-util/e-dateedit.c:526
+#: ../src/e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Päiväys ja aika"
 
-#: ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:557
 msgid "Text entry to input date"
 msgstr "Tekstikenttä päiväyksen syöttöön"
 
-#: ../src/e-util/e-dateedit.c:581
+#: ../src/e-util/e-dateedit.c:580
 msgid "Click this button to show a calendar"
 msgstr "Paina tästä näyttääksesi kalenterin"
 
-#: ../src/e-util/e-dateedit.c:636
+#: ../src/e-util/e-dateedit.c:640
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../src/e-util/e-dateedit.c:637
+#: ../src/e-util/e-dateedit.c:641
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Aika"
 
-#: ../src/e-util/e-dateedit.c:714
+#: ../src/e-util/e-dateedit.c:718
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../src/e-util/e-dateedit.c:721
+#: ../src/e-util/e-dateedit.c:725
 msgid "_Today"
 msgstr "_Tänään"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:730 ../src/mail/em-folder-selector.c:334
+#: ../src/e-util/e-dateedit.c:734 ../src/mail/em-folder-selector.c:334
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1889 ../src/e-util/e-dateedit.c:2140
+#: ../src/e-util/e-dateedit.c:1893 ../src/e-util/e-dateedit.c:2146
 msgctxt "date"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/e-util/e-dateedit.c:2025 ../src/e-util/e-dateedit.c:2494
+#: ../src/e-util/e-dateedit.c:2029 ../src/e-util/e-dateedit.c:2500
 msgid "Invalid Date Value"
 msgstr "Virheellinen päivämäärä"
 
-#: ../src/e-util/e-dateedit.c:2063 ../src/e-util/e-dateedit.c:2551
+#: ../src/e-util/e-dateedit.c:2069 ../src/e-util/e-dateedit.c:2557
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
@@ -13472,8 +13652,8 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Seuraava su"
 
-#: ../src/e-util/e-datetime-format.c:367 ../src/e-util/e-datetime-format.c:377
-#: ../src/e-util/e-datetime-format.c:386
+#: ../src/e-util/e-datetime-format.c:368 ../src/e-util/e-datetime-format.c:378
+#: ../src/e-util/e-datetime-format.c:387
 msgid "Use locale default"
 msgstr "Käytä oletusaikavyöhykettä"
 
@@ -13768,23 +13948,23 @@ msgstr "Valitse aika johon verrataan"
 msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../src/e-util/e-filter-rule.c:1061
+#: ../src/e-util/e-filter-rule.c:1008
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../src/e-util/e-filter-rule.c:1117
+#: ../src/e-util/e-filter-rule.c:1064
 msgid "all the following conditions"
 msgstr "kaikkia seuraavia ehtoja"
 
-#: ../src/e-util/e-filter-rule.c:1118
+#: ../src/e-util/e-filter-rule.c:1065
 msgid "any of the following conditions"
 msgstr "mitä tahansa seuraavista ehdoista"
 
-#: ../src/e-util/e-filter-rule.c:1124
+#: ../src/e-util/e-filter-rule.c:1071
 msgid "_Find items which match:"
 msgstr "_Etsi kohteet, jotka vastaavat:"
 
-#: ../src/e-util/e-filter-rule.c:1147
+#: ../src/e-util/e-filter-rule.c:1094
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
@@ -13792,46 +13972,46 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:1162 ../src/e-util/e-html-editor-page-dialog.c:62
+#: ../src/e-util/e-filter-rule.c:1109 ../src/e-util/e-html-editor-page-dialog.c:62
 #: ../src/e-util/e-mail-identity-combo-box.c:694
 #: ../src/e-util/e-mail-signature-combo-box.c:422
 #: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:778
 #: ../src/mail/e-mail-config-summary-page.c:143
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:681
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../src/e-util/e-filter-rule.c:1163
+#: ../src/e-util/e-filter-rule.c:1110
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../src/e-util/e-filter-rule.c:1164 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1111 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../src/e-util/e-filter-rule.c:1165
+#: ../src/e-util/e-filter-rule.c:1112
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../src/e-util/e-filter-rule.c:1166
+#: ../src/e-util/e-filter-rule.c:1113
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../src/e-util/e-filter-rule.c:1169
+#: ../src/e-util/e-filter-rule.c:1116
 #, fuzzy
 msgid "I_nclude threads:"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../src/e-util/e-filter-rule.c:1247
+#: ../src/e-util/e-filter-rule.c:1194
 msgid "A_dd Condition"
 msgstr "Lisää _ehto"
 
-#: ../src/e-util/e-filter-rule.c:1567 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-filter-rule.c:1042 ../src/mail/em-utils.c:166
+#: ../src/e-util/e-filter-rule.c:1514 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:981 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../src/e-util/e-filter-rule.c:1567 ../src/mail/em-filter-rule.c:1043
+#: ../src/e-util/e-filter-rule.c:1514 ../src/mail/em-filter-rule.c:982
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Lähtevät"
@@ -13932,487 +14112,485 @@ msgstr "Sisällytä tekstitiedosto"
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
-#: ../src/e-util/e-html-editor-actions.c:1074
+#: ../src/e-util/e-html-editor-actions.c:1076
 msgid "Copy selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
-#: ../src/e-util/e-html-editor-actions.c:1081
+#: ../src/e-util/e-html-editor-actions.c:1083
 msgid "Cut selected text to the clipboard"
 msgstr "Leikkaa valittu teksti leikepöydälle"
 
-#: ../src/e-util/e-html-editor-actions.c:1088
+#: ../src/e-util/e-html-editor-actions.c:1090
 msgid "Paste text from the clipboard"
 msgstr "Liitä teksti leikepöydältä"
 
-#: ../src/e-util/e-html-editor-actions.c:1095
+#: ../src/e-util/e-html-editor-actions.c:1097
 msgid "Redo the last undone action"
 msgstr "Tee uudelleen viimeisin kumottu toiminto"
 
-#: ../src/e-util/e-html-editor-actions.c:1109
+#: ../src/e-util/e-html-editor-actions.c:1111
 msgid "Undo the last action"
 msgstr "Kumoa viimeisin toiminto"
 
-#: ../src/e-util/e-html-editor-actions.c:1130
+#: ../src/e-util/e-html-editor-actions.c:1132
 msgid "For_mat"
 msgstr "_Muotoilu"
 
-#: ../src/e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1139
 msgid "_Paragraph Style"
 msgstr "_Kappaleen tyyli"
 
-#: ../src/e-util/e-html-editor-actions.c:1151
-#: ../src/e-util/e-html-editor-image-dialog.c:590
+#: ../src/e-util/e-html-editor-actions.c:1153
+#: ../src/e-util/e-html-editor-image-dialog.c:678
 msgid "_Alignment"
 msgstr "_Tasaus"
 
-#: ../src/e-util/e-html-editor-actions.c:1158
+#: ../src/e-util/e-html-editor-actions.c:1160
 msgid "Current _Languages"
 msgstr "_Nykyiset kielet"
 
-#: ../src/e-util/e-html-editor-actions.c:1175
+#: ../src/e-util/e-html-editor-actions.c:1177
 msgid "_Increase Indent"
 msgstr "_Lisää sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1177
+#: ../src/e-util/e-html-editor-actions.c:1179
 msgid "Increase Indent"
 msgstr "Lisää sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1182
+#: ../src/e-util/e-html-editor-actions.c:1184
 #: ../src/e-util/e-html-editor-actions.c:2212
 msgid "E_moji"
 msgstr "E_moji"
 
-#: ../src/e-util/e-html-editor-actions.c:1184
-#: ../src/e-util/e-html-editor-actions.c:1191
-#| msgid "Insert Emoticon"
+#: ../src/e-util/e-html-editor-actions.c:1186
+#: ../src/e-util/e-html-editor-actions.c:1193
 msgid "Insert Emoji"
 msgstr "Lisää emoji"
 
-#: ../src/e-util/e-html-editor-actions.c:1189
-#| msgid "Insert Emoticon"
+#: ../src/e-util/e-html-editor-actions.c:1191
 msgid "Insert E_moji"
 msgstr "Lisää e_moji"
 
-#: ../src/e-util/e-html-editor-actions.c:1196
+#: ../src/e-util/e-html-editor-actions.c:1198
 msgid "_HTML File…"
 msgstr "_HTML-tiedosto…"
 
-#: ../src/e-util/e-html-editor-actions.c:1203
+#: ../src/e-util/e-html-editor-actions.c:1205
 msgid "Te_xt File…"
 msgstr "Te_kstitiedosto…"
 
-#: ../src/e-util/e-html-editor-actions.c:1210
+#: ../src/e-util/e-html-editor-actions.c:1212
 msgid "Paste _Quotation"
 msgstr "_Liitä lainaus"
 
-#: ../src/e-util/e-html-editor-actions.c:1217
+#: ../src/e-util/e-html-editor-actions.c:1219
 msgid "_Find…"
 msgstr "_Etsi…"
 
-#: ../src/e-util/e-html-editor-actions.c:1219
+#: ../src/e-util/e-html-editor-actions.c:1221
 msgid "Search for text"
 msgstr "Etsi tekstiä"
 
-#: ../src/e-util/e-html-editor-actions.c:1224
+#: ../src/e-util/e-html-editor-actions.c:1226
 msgid "Find A_gain"
 msgstr "Etsi _uudelleen"
 
-#: ../src/e-util/e-html-editor-actions.c:1231
+#: ../src/e-util/e-html-editor-actions.c:1233
 msgid "Re_place…"
 msgstr "_Korvaa…"
 
-#: ../src/e-util/e-html-editor-actions.c:1233
+#: ../src/e-util/e-html-editor-actions.c:1235
 msgid "Search for and replace text"
 msgstr "Etsi ja korvaa tekstiä"
 
-#: ../src/e-util/e-html-editor-actions.c:1238
+#: ../src/e-util/e-html-editor-actions.c:1240
 msgid "Check _Spelling…"
 msgstr "_Oikolue…"
 
-#: ../src/e-util/e-html-editor-actions.c:1245
+#: ../src/e-util/e-html-editor-actions.c:1247
 msgid "_Decrease Indent"
 msgstr "_Vähennä sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1247
+#: ../src/e-util/e-html-editor-actions.c:1249
 msgid "Decrease Indent"
 msgstr "Vähennä sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1252
+#: ../src/e-util/e-html-editor-actions.c:1254
 msgid "_Wrap Lines"
 msgstr "_Rivitä teksti"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1262
+#: ../src/e-util/e-html-editor-actions.c:1264
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:109
 msgid "_Center"
 msgstr "_Keskelle"
 
-#: ../src/e-util/e-html-editor-actions.c:1264
+#: ../src/e-util/e-html-editor-actions.c:1266
 msgid "Center Alignment"
 msgstr "Tasaus keskelle"
 
 #. Justified
-#: ../src/e-util/e-html-editor-actions.c:1269
+#: ../src/e-util/e-html-editor-actions.c:1271
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:127
 #, fuzzy
 #| msgid "Last modified"
 msgid "_Justified"
 msgstr "Viimeksi muokattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1271
+#: ../src/e-util/e-html-editor-actions.c:1273
 msgid "Align Justified"
 msgstr ""
 
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1276
+#: ../src/e-util/e-html-editor-actions.c:1278
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:100
 msgid "_Left"
 msgstr "_Vasemmalle"
 
-#: ../src/e-util/e-html-editor-actions.c:1278
+#: ../src/e-util/e-html-editor-actions.c:1280
 msgid "Left Alignment"
 msgstr "Tasaus vasemmalle"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1283
+#: ../src/e-util/e-html-editor-actions.c:1285
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:118
 msgid "_Right"
 msgstr "_Oikealle"
 
-#: ../src/e-util/e-html-editor-actions.c:1285
+#: ../src/e-util/e-html-editor-actions.c:1287
 msgid "Right Alignment"
 msgstr "Tasaus oikealle"
 
-#: ../src/e-util/e-html-editor-actions.c:1293
+#: ../src/e-util/e-html-editor-actions.c:1295
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1295
+#: ../src/e-util/e-html-editor-actions.c:1297
 msgid "HTML editing mode"
 msgstr "HTML-muokkaustila"
 
-#: ../src/e-util/e-html-editor-actions.c:1300
+#: ../src/e-util/e-html-editor-actions.c:1302
 msgid "Plain _Text"
 msgstr "Raaka_teksti"
 
-#: ../src/e-util/e-html-editor-actions.c:1302
+#: ../src/e-util/e-html-editor-actions.c:1304
 msgid "Plain text editing mode"
 msgstr "Raakatekstin muokkaustila"
 
-#: ../src/e-util/e-html-editor-actions.c:1310
+#: ../src/e-util/e-html-editor-actions.c:1312
 msgid "_Normal"
 msgstr "_Tavallinen"
 
-#: ../src/e-util/e-html-editor-actions.c:1317
+#: ../src/e-util/e-html-editor-actions.c:1319
 msgid "Heading _1"
 msgstr "Otsake _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1324
+#: ../src/e-util/e-html-editor-actions.c:1326
 msgid "Heading _2"
 msgstr "Otsake _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1331
+#: ../src/e-util/e-html-editor-actions.c:1333
 msgid "Heading _3"
 msgstr "Otsake _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1338
+#: ../src/e-util/e-html-editor-actions.c:1340
 msgid "Heading _4"
 msgstr "Otsake _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1345
+#: ../src/e-util/e-html-editor-actions.c:1347
 msgid "Heading _5"
 msgstr "Otsake _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1352
+#: ../src/e-util/e-html-editor-actions.c:1354
 msgid "Heading _6"
 msgstr "Otsake _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1359
+#: ../src/e-util/e-html-editor-actions.c:1361
 msgid "_Preformatted"
 msgstr "_Esimuotoiltu"
 
-#: ../src/e-util/e-html-editor-actions.c:1366
+#: ../src/e-util/e-html-editor-actions.c:1368
 msgid "A_ddress"
 msgstr "_Osoite"
 
-#: ../src/e-util/e-html-editor-actions.c:1373
+#: ../src/e-util/e-html-editor-actions.c:1375
 msgid "_Bulleted List"
 msgstr "_Merkitty luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1380
+#: ../src/e-util/e-html-editor-actions.c:1382
 msgid "_Roman Numeral List"
 msgstr "_Roomalaisnumeerinen luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1387
+#: ../src/e-util/e-html-editor-actions.c:1389
 msgid "Numbered _List"
 msgstr "Numeerinen _luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1394
+#: ../src/e-util/e-html-editor-actions.c:1396
 msgid "_Alphabetical List"
 msgstr "_Aakkosellinen luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1410
-#: ../src/e-util/e-html-editor-actions.c:1448
+#: ../src/e-util/e-html-editor-actions.c:1412
+#: ../src/e-util/e-html-editor-actions.c:1450
 msgid "_Image…"
 msgstr "_Kuva…"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1413
+#: ../src/e-util/e-html-editor-actions.c:1415
 msgid "Insert Image"
 msgstr "Sisällytä kuva"
 
-#: ../src/e-util/e-html-editor-actions.c:1418
-#: ../src/e-util/e-html-editor-actions.c:1455
+#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1457
 msgid "_Link…"
 msgstr "_Linkki…"
 
-#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1422
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1426
-#: ../src/e-util/e-html-editor-actions.c:1470
+#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1472
 msgid "_Rule…"
 msgstr "_Viiva…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1429
+#: ../src/e-util/e-html-editor-actions.c:1431
 msgid "Insert Rule"
 msgstr "Lisää viiva"
 
-#: ../src/e-util/e-html-editor-actions.c:1434
-#: ../src/e-util/e-html-editor-actions.c:1477
+#: ../src/e-util/e-html-editor-actions.c:1436
+#: ../src/e-util/e-html-editor-actions.c:1479
 msgid "_Table…"
 msgstr "_Taulukko…"
 
-#: ../src/e-util/e-html-editor-actions.c:1436
+#: ../src/e-util/e-html-editor-actions.c:1438
 msgid "Insert Table"
 msgstr "Lisää taulukko"
 
-#: ../src/e-util/e-html-editor-actions.c:1441
+#: ../src/e-util/e-html-editor-actions.c:1443
 msgid "_Cell…"
 msgstr "_Solu…"
 
-#: ../src/e-util/e-html-editor-actions.c:1462
+#: ../src/e-util/e-html-editor-actions.c:1464
 msgid "Pa_ge…"
 msgstr "Si_vu…"
 
-#: ../src/e-util/e-html-editor-actions.c:1486
+#: ../src/e-util/e-html-editor-actions.c:1488
 msgid "Font _Size"
 msgstr "Fontin _koko"
 
-#: ../src/e-util/e-html-editor-actions.c:1493
+#: ../src/e-util/e-html-editor-actions.c:1495
 msgid "_Font Style"
 msgstr "_Fontin tyyli"
 
-#: ../src/e-util/e-html-editor-actions.c:1500
+#: ../src/e-util/e-html-editor-actions.c:1502
 msgid "Paste As _Text"
 msgstr "Liitä _tekstinä"
 
-#: ../src/e-util/e-html-editor-actions.c:1511
+#: ../src/e-util/e-html-editor-actions.c:1513
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Lihavoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1513
+#: ../src/e-util/e-html-editor-actions.c:1515
 msgid "Bold"
 msgstr "Lihavoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1519
+#: ../src/e-util/e-html-editor-actions.c:1521
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Kursivoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1521
+#: ../src/e-util/e-html-editor-actions.c:1523
 msgid "Italic"
 msgstr "Kursivoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1527
+#: ../src/e-util/e-html-editor-actions.c:1529
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "_Yliviivattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1529
+#: ../src/e-util/e-html-editor-actions.c:1531
 msgid "Strikethrough"
 msgstr "Yliviivattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1535
+#: ../src/e-util/e-html-editor-actions.c:1537
 #, fuzzy
 #| msgid "S_cript:"
 msgid "Subs_cript"
 msgstr "_Skripti:"
 
-#: ../src/e-util/e-html-editor-actions.c:1537
+#: ../src/e-util/e-html-editor-actions.c:1539
 #, fuzzy
 #| msgid "_Subscribe"
 msgid "Subscript"
 msgstr "_Tilaa"
 
-#: ../src/e-util/e-html-editor-actions.c:1543
+#: ../src/e-util/e-html-editor-actions.c:1545
 #, fuzzy
 #| msgid "S_cript:"
 msgid "Su_perscript"
 msgstr "_Skripti:"
 
-#: ../src/e-util/e-html-editor-actions.c:1545
+#: ../src/e-util/e-html-editor-actions.c:1547
 #, fuzzy
 #| msgid "Description"
 msgid "Superscript"
 msgstr "Kuvaus"
 
-#: ../src/e-util/e-html-editor-actions.c:1551
+#: ../src/e-util/e-html-editor-actions.c:1553
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "_Alleviivattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1553
+#: ../src/e-util/e-html-editor-actions.c:1555
 msgid "Underline"
 msgstr "Alleviivattu"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1563
+#: ../src/e-util/e-html-editor-actions.c:1565
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1571
+#: ../src/e-util/e-html-editor-actions.c:1573
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1579
+#: ../src/e-util/e-html-editor-actions.c:1581
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1587
+#: ../src/e-util/e-html-editor-actions.c:1589
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1595
+#: ../src/e-util/e-html-editor-actions.c:1597
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1603
+#: ../src/e-util/e-html-editor-actions.c:1605
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1611
+#: ../src/e-util/e-html-editor-actions.c:1613
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1630
+#: ../src/e-util/e-html-editor-actions.c:1632
 msgid "Cell Contents"
 msgstr "Solun sisältö"
 
-#: ../src/e-util/e-html-editor-actions.c:1637
+#: ../src/e-util/e-html-editor-actions.c:1639
 msgid "Column"
 msgstr "Sarake"
 
-#: ../src/e-util/e-html-editor-actions.c:1644
+#: ../src/e-util/e-html-editor-actions.c:1646
 msgid "Row"
 msgstr "Rivi"
 
-#: ../src/e-util/e-html-editor-actions.c:1651
+#: ../src/e-util/e-html-editor-actions.c:1653
 msgid "Table"
 msgstr "Taulukko"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1661
+#: ../src/e-util/e-html-editor-actions.c:1663
 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:1669
+#: ../src/e-util/e-html-editor-actions.c:1671
 msgid "Table Insert"
 msgstr "Taulukon lisäys"
 
-#: ../src/e-util/e-html-editor-actions.c:1676
+#: ../src/e-util/e-html-editor-actions.c:1678
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: ../src/e-util/e-html-editor-actions.c:1694
+#: ../src/e-util/e-html-editor-actions.c:1696
 msgid "Column After"
 msgstr "Sarake ennen"
 
-#: ../src/e-util/e-html-editor-actions.c:1701
+#: ../src/e-util/e-html-editor-actions.c:1703
 msgid "Column Before"
 msgstr "Sarake jälkeen"
 
-#: ../src/e-util/e-html-editor-actions.c:1708
+#: ../src/e-util/e-html-editor-actions.c:1710
 msgid "Insert _Link"
 msgstr "L_isää linkki"
 
-#: ../src/e-util/e-html-editor-actions.c:1715
+#: ../src/e-util/e-html-editor-actions.c:1717
 msgid "Row Above"
 msgstr "Rivi ylös"
 
-#: ../src/e-util/e-html-editor-actions.c:1722
+#: ../src/e-util/e-html-editor-actions.c:1724
 msgid "Row Below"
 msgstr "Rivi alas"
 
-#: ../src/e-util/e-html-editor-actions.c:1729
+#: ../src/e-util/e-html-editor-actions.c:1731
 msgid "Cell…"
 msgstr "Solu…"
 
-#: ../src/e-util/e-html-editor-actions.c:1736
+#: ../src/e-util/e-html-editor-actions.c:1738
 msgid "Image…"
 msgstr "Kuva…"
 
-#: ../src/e-util/e-html-editor-actions.c:1743
+#: ../src/e-util/e-html-editor-actions.c:1745
 msgid "Link…"
 msgstr "Linkki…"
 
-#: ../src/e-util/e-html-editor-actions.c:1750
+#: ../src/e-util/e-html-editor-actions.c:1752
 msgid "Page…"
 msgstr "Sivu…"
 
-#: ../src/e-util/e-html-editor-actions.c:1757
+#: ../src/e-util/e-html-editor-actions.c:1759
 msgid "Paragraph…"
 msgstr "Kappale…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1765
+#: ../src/e-util/e-html-editor-actions.c:1767
 msgid "Rule…"
 msgstr "Viiva…"
 
-#: ../src/e-util/e-html-editor-actions.c:1772
+#: ../src/e-util/e-html-editor-actions.c:1774
 msgid "Table…"
 msgstr "Taulukko…"
 
-#: ../src/e-util/e-html-editor-actions.c:1779
+#: ../src/e-util/e-html-editor-actions.c:1781
 msgid "Text…"
 msgstr "Teksti…"
 
-#: ../src/e-util/e-html-editor-actions.c:1786
+#: ../src/e-util/e-html-editor-actions.c:1788
 msgid "Remove Link"
 msgstr "Poista linkki"
 
-#: ../src/e-util/e-html-editor-actions.c:1803
+#: ../src/e-util/e-html-editor-actions.c:1805
 msgid "Add Word to Dictionary"
 msgstr "Lisää sana sanastoon"
 
-#: ../src/e-util/e-html-editor-actions.c:1810
+#: ../src/e-util/e-html-editor-actions.c:1812
 msgid "Ignore Misspelled Word"
 msgstr "Ohita väärinkirjoitettu sana"
 
-#: ../src/e-util/e-html-editor-actions.c:1817
+#: ../src/e-util/e-html-editor-actions.c:1819
 msgid "Add Word To"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1826
+#: ../src/e-util/e-html-editor-actions.c:1828
 msgid "More Suggestions"
 msgstr "Lisää ehdotuksia"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../src/e-util/e-html-editor-actions.c:2061
+#: ../src/e-util/e-html-editor-actions.c:2063
 #, fuzzy, c-format
 #| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
@@ -14448,31 +14626,31 @@ msgstr "_Viiva"
 msgid "_Table"
 msgstr "_Taulukko"
 
-#: ../src/e-util/e-html-editor.c:863
+#: ../src/e-util/e-html-editor.c:897
 msgid "Paragraph Style"
 msgstr "Kappaleen tyyli"
 
-#: ../src/e-util/e-html-editor.c:877
+#: ../src/e-util/e-html-editor.c:911
 msgid "Editing Mode"
 msgstr "Muokkaustila"
 
-#: ../src/e-util/e-html-editor.c:889
+#: ../src/e-util/e-html-editor.c:923
 msgid "Font Color"
 msgstr "Fontin väri"
 
-#: ../src/e-util/e-html-editor.c:900
+#: ../src/e-util/e-html-editor.c:934
 msgid "Background Color"
 msgstr "Taustaväri"
 
-#: ../src/e-util/e-html-editor.c:910
+#: ../src/e-util/e-html-editor.c:944
 msgid "Font Size"
 msgstr "Fontin koko"
 
-#: ../src/e-util/e-html-editor.c:919
+#: ../src/e-util/e-html-editor.c:953
 msgid "Font Name"
 msgstr "Fontin nimi"
 
-#: ../src/e-util/e-html-editor.c:1523
+#: ../src/e-util/e-html-editor.c:1577
 #, fuzzy
 #| msgid "Failed to insert text file."
 msgid "Failed to obtain content of editor"
@@ -14521,21 +14699,21 @@ msgid "_Horizontal:"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:502
-#: ../src/e-util/e-html-editor-image-dialog.c:580
+#: ../src/e-util/e-html-editor-image-dialog.c:668
 #, fuzzy
 #| msgid "_Top"
 msgid "Top"
 msgstr "Ylimm_äiseksi"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:503
-#: ../src/e-util/e-html-editor-image-dialog.c:581
+#: ../src/e-util/e-html-editor-image-dialog.c:669
 #, fuzzy
 #| msgid "_Middle:"
 msgid "Middle"
 msgstr "_Toinen nimi:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:504
-#: ../src/e-util/e-html-editor-image-dialog.c:582
+#: ../src/e-util/e-html-editor-image-dialog.c:670
 #, fuzzy
 #| msgid "_Bottom"
 msgid "Bottom"
@@ -14558,7 +14736,7 @@ msgid "_Header Style"
 msgstr "_Otsaketyyli"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:540
-#: ../src/e-util/e-html-editor-image-dialog.c:520
+#: ../src/e-util/e-html-editor-image-dialog.c:609
 #: ../src/e-util/e-html-editor-table-dialog.c:551
 msgid "<b>Layout</b>"
 msgstr "<b>Asettelu</b>"
@@ -14591,15 +14769,15 @@ msgid "C_olor:"
 msgstr "V_äri:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:640
-#: ../src/e-util/e-html-editor-image-dialog.c:476
+#: ../src/e-util/e-html-editor-image-dialog.c:565
 #: ../src/e-util/e-html-editor-table-dialog.c:683
 msgid "Images"
 msgstr "Kuvat"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:645
 #: ../src/e-util/e-html-editor-cell-dialog.c:648
-#: ../src/e-util/e-html-editor-image-dialog.c:481
-#: ../src/e-util/e-html-editor-image-dialog.c:484
+#: ../src/e-util/e-html-editor-image-dialog.c:570
+#: ../src/e-util/e-html-editor-image-dialog.c:573
 #: ../src/e-util/e-html-editor-table-dialog.c:688
 #: ../src/e-util/e-html-editor-table-dialog.c:693
 msgid "Choose Background Image"
@@ -14649,7 +14827,7 @@ msgstr "<b>Koko</b>"
 
 #. Width
 #: ../src/e-util/e-html-editor-hrule-dialog.c:261
-#: ../src/e-util/e-html-editor-image-dialog.c:538
+#: ../src/e-util/e-html-editor-image-dialog.c:627
 #: ../src/e-util/e-html-editor-table-dialog.c:562
 msgid "_Width:"
 msgstr "_Leveys:"
@@ -14678,47 +14856,51 @@ msgstr ""
 msgid "Rule properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:465
+#: ../src/e-util/e-html-editor-image-dialog.c:554
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:65
 #: ../src/e-util/e-html-editor-table-dialog.c:505
 msgid "<b>General</b>"
 msgstr "<b>Yleiset</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:499
+#: ../src/e-util/e-html-editor-image-dialog.c:588
 msgid "_Source:"
 msgstr "_Lähde:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:562
+#: ../src/e-util/e-html-editor-image-dialog.c:640
 msgid "_Height:"
 msgstr "_Korkeus:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:603
+#: ../src/e-util/e-html-editor-image-dialog.c:659
+msgid "Preserve aspect ratio"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-image-dialog.c:691
 msgid "_X-Padding:"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-image-dialog.c:619
+#: ../src/e-util/e-html-editor-image-dialog.c:707
 msgid "_Y-Padding:"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-image-dialog.c:635
+#: ../src/e-util/e-html-editor-image-dialog.c:723
 #: ../src/e-util/e-html-editor-table-dialog.c:629
 msgid "_Border:"
 msgstr "_Reunus:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:645
+#: ../src/e-util/e-html-editor-image-dialog.c:733
 msgid "<b>Link</b>"
 msgstr "<b>Linkki</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-image-dialog.c:751
 #: ../src/e-util/e-html-editor-link-dialog.c:210
 msgid "_URL:"
 msgstr "_Osoite:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:668
+#: ../src/e-util/e-html-editor-image-dialog.c:756
 msgid "_Test URL…"
 msgstr "_Testaa osoite…"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:685
+#: ../src/e-util/e-html-editor-image-dialog.c:773
 msgid "Image Properties"
 msgstr "Kuvan ominaisuudet"
 
@@ -14800,7 +14982,7 @@ msgid "_Template:"
 msgstr "_Malli:"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:531
-#: ../src/e-util/e-import-assistant.c:287
+#: ../src/e-util/e-import-assistant.c:313
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
@@ -14937,7 +15119,7 @@ msgstr "Ladataan"
 
 #: ../src/e-util/e-html-editor-table-dialog.c:676
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2408
+#: ../src/e-util/e-webdav-browser.c:2554
 msgid "_Color:"
 msgstr "_Väri:"
 
@@ -14957,38 +15139,44 @@ msgstr "_Koko:"
 msgid "Text Properties"
 msgstr "Tekstin ominaisuudet"
 
-#: ../src/e-util/e-import-assistant.c:259
+#: ../src/e-util/e-import-assistant.c:285
 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."
 
-#: ../src/e-util/e-import-assistant.c:301 ../src/e-util/e-import-assistant.c:480
+#: ../src/e-util/e-import-assistant.c:327 ../src/e-util/e-import-assistant.c:526
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../src/e-util/e-import-assistant.c:344 ../src/e-util/e-import-assistant.c:962
+#: ../src/e-util/e-import-assistant.c:355
+#, fuzzy
+#| msgid "Preview"
+msgid "Pre_view:"
+msgstr "Esikatselu"
+
+#: ../src/e-util/e-import-assistant.c:390 ../src/e-util/e-import-assistant.c:1008
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
-#: ../src/e-util/e-import-assistant.c:370
+#: ../src/e-util/e-import-assistant.c:416
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../src/e-util/e-import-assistant.c:379
+#: ../src/e-util/e-import-assistant.c:425
 msgid "Import data and settings from _older programs"
 msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: ../src/e-util/e-import-assistant.c:387
+#: ../src/e-util/e-import-assistant.c:433
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: ../src/e-util/e-import-assistant.c:409
+#: ../src/e-util/e-import-assistant.c:455
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
-#: ../src/e-util/e-import-assistant.c:541
+#: ../src/e-util/e-import-assistant.c:587
 #, fuzzy
 #| msgid ""
 #| "Evolution checked for settings to import from the following applications: Pine, "
@@ -15003,40 +15191,40 @@ msgstr ""
 "iCalendar. Mitään tuotavia asetuksia ei löytynyt. Jos haluat kokeilla uudestaan, "
 "napsauta ”Takaisin”-painiketta."
 
-#: ../src/e-util/e-import-assistant.c:568
+#: ../src/e-util/e-import-assistant.c:614
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:814
+#: ../src/e-util/e-import-assistant.c:860
 msgid "_Cancel Import"
 msgstr "_Peru tuonti"
 
-#: ../src/e-util/e-import-assistant.c:961
+#: ../src/e-util/e-import-assistant.c:1007
 msgid "Preview data to be imported"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../src/e-util/e-import-assistant.c:967 ../src/e-util/e-import-assistant.c:980
-#: ../src/e-util/e-import-assistant.c:1333 ../src/e-util/e-import-assistant.c:1410
-#: ../src/e-util/e-import-assistant.c:1419
+#: ../src/e-util/e-import-assistant.c:1013 ../src/e-util/e-import-assistant.c:1026
+#: ../src/e-util/e-import-assistant.c:1399 ../src/e-util/e-import-assistant.c:1476
+#: ../src/e-util/e-import-assistant.c:1485
 msgid "Import Data"
 msgstr "Tuo tiedot"
 
-#: ../src/e-util/e-import-assistant.c:975
+#: ../src/e-util/e-import-assistant.c:1021
 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:1323 ../src/e-util/e-import-assistant.c:1359
+#: ../src/e-util/e-import-assistant.c:1389 ../src/e-util/e-import-assistant.c:1425
 msgid "Evolution Import Assistant"
 msgstr "Evolutionin tuontiapulainen"
 
-#: ../src/e-util/e-import-assistant.c:1340 ../src/e-util/e-import-assistant.c:1397
+#: ../src/e-util/e-import-assistant.c:1406 ../src/e-util/e-import-assistant.c:1463
 msgid "Import Location"
 msgstr "Tuo sijainti"
 
-#: ../src/e-util/e-import-assistant.c:1352
+#: ../src/e-util/e-import-assistant.c:1418
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing external "
@@ -15046,19 +15234,19 @@ msgstr ""
 "Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista Evolutionin "
 "käyttöön."
 
-#: ../src/e-util/e-import-assistant.c:1369
+#: ../src/e-util/e-import-assistant.c:1435
 msgid "Importer Type"
 msgstr "Tuojan tyyppi"
 
-#: ../src/e-util/e-import-assistant.c:1379
+#: ../src/e-util/e-import-assistant.c:1445
 msgid "Select Information to Import"
 msgstr "Valitse tuotavat tiedot"
 
-#: ../src/e-util/e-import-assistant.c:1388
+#: ../src/e-util/e-import-assistant.c:1454
 msgid "Select a File"
 msgstr "Valitse tiedosto"
 
-#: ../src/e-util/e-import-assistant.c:1405
+#: ../src/e-util/e-import-assistant.c:1471
 #, fuzzy
 #| msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgid "Click “Apply” to begin importing the file into Evolution."
@@ -15093,31 +15281,31 @@ msgstr "Sulje"
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../src/e-util/e-mail-signature-editor.c:568
+#: ../src/e-util/e-mail-signature-editor.c:549
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../src/e-util/e-mail-signature-editor.c:601
+#: ../src/e-util/e-mail-signature-editor.c:582
 msgid "_Signature Name:"
 msgstr "Allekirjoituk_sen nimi:"
 
-#: ../src/e-util/e-mail-signature-editor.c:637
+#: ../src/e-util/e-mail-signature-editor.c:618
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: ../src/e-util/e-mail-signature-manager.c:338
+#: ../src/e-util/e-mail-signature-manager.c:334
 msgid "Add _Script"
 msgstr "Lisää _skripti"
 
-#: ../src/e-util/e-mail-signature-manager.c:444
+#: ../src/e-util/e-mail-signature-manager.c:440
 msgid "Add Signature Script"
 msgstr "Lisää allekirjoitus-skripti"
 
-#: ../src/e-util/e-mail-signature-manager.c:538
+#: ../src/e-util/e-mail-signature-manager.c:534
 msgid "Edit Signature Script"
 msgstr "Muokkaa allekirjoitus-skriptiä"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:394
+#: ../src/e-util/e-mail-signature-script-dialog.c:386
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15127,19 +15315,19 @@ msgstr ""
 "Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:445
+#: ../src/e-util/e-mail-signature-script-dialog.c:437
 msgid "S_cript:"
 msgstr "_Skripti:"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:476
+#: ../src/e-util/e-mail-signature-script-dialog.c:468
 msgid "Script file must be executable."
 msgstr "Skriptitiedoston tulee olla suoritettavissa."
 
-#: ../src/e-util/e-map.c:886
+#: ../src/e-util/e-map.c:883
 msgid "World Map"
 msgstr "Maailmankartta"
 
-#: ../src/e-util/e-map.c:889
+#: ../src/e-util/e-map.c:886
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users should "
 "instead select the timezone from the drop-down combination box below."
@@ -15175,12 +15363,12 @@ msgstr "Avataan tehtävälistaa “%s”"
 msgid "Opening address book “%s”"
 msgstr "Avataan osoitekirja “%s”"
 
-#: ../src/e-util/e-misc-utils.c:3351
+#: ../src/e-util/e-misc-utils.c:3348
 #: ../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:3979
+#: ../src/e-util/e-misc-utils.c:3990
 msgid ""
 "This address book server might be unreachable or the server name may be misspelled "
 "or your network connection could be down."
@@ -15188,18 +15376,18 @@ msgstr ""
 "Tämä osoitekirjapalvelin voi olla saavuttamattomissa, palvelimen nimi väärin "
 "kirjoitettu tai verkkoyhteytesi ei ehkä ole käytettävissä."
 
-#: ../src/e-util/e-misc-utils.c:3991
+#: ../src/e-util/e-misc-utils.c:4002
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr "Yhteyskäytännön asettaminen versioon LDAPv3 (%d) epäonnistui: %s"
 
-#: ../src/e-util/e-misc-utils.c:4003
+#: ../src/e-util/e-misc-utils.c:4014
 #, 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:4017
+#: ../src/e-util/e-misc-utils.c:4028
 #, fuzzy, c-format
 #| msgid ""
 #| "This LDAP server may use an older version of LDAP, which does not support this "
@@ -15216,7 +15404,7 @@ msgstr ""
 "toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
 "ovat tuetut hakupohjat."
 
-#: ../src/e-util/e-misc-utils.c:4028
+#: ../src/e-util/e-misc-utils.c:4039
 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 "
@@ -15226,12 +15414,12 @@ msgstr ""
 "toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
 "ovat tuetut hakupohjat."
 
-#: ../src/e-util/e-misc-utils.c:4061
+#: ../src/e-util/e-misc-utils.c:4072
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolutionia ei ole koostettu LDAP-tuen kera"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4384
+#: ../src/e-util/e-misc-utils.c:4395
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -15239,34 +15427,34 @@ msgstr "Tuntematon (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4393
+#: ../src/e-util/e-misc-utils.c:4404
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/e-util/e-misc-utils.c:4551
+#: ../src/e-util/e-misc-utils.c:4555
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../src/e-util/e-misc-utils.c:4553
+#: ../src/e-util/e-misc-utils.c:4557
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../src/e-util/e-misc-utils.c:4566
+#: ../src/e-util/e-misc-utils.c:4570
 #, fuzzy, c-format
 #| msgid "Enter the recipients of the message"
 msgid "Go to the section %s of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../src/e-util/e-misc-utils.c:4568
+#: ../src/e-util/e-misc-utils.c:4572
 #, fuzzy
 #| msgid "Enter the recipients of the message"
 msgid "Go to the beginning of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../src/e-util/e-misc-utils.c:4574
+#: ../src/e-util/e-misc-utils.c:4578
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
@@ -15288,9 +15476,9 @@ msgid "_Search:"
 msgstr "Et_si:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1325
+#: ../src/e-util/e-name-selector-dialog.c:1322
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1752
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:783
 #: ../src/modules/calendar/e-task-shell-view-actions.c:956
 msgid "Any Category"
@@ -15310,25 +15498,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Valitse yhteystiedot osoitekirjasta"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3234
+#: ../src/e-util/e-name-selector-entry.c:3222
 #, fuzzy, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Laajenna kaikki"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3250
+#: ../src/e-util/e-name-selector-entry.c:3238
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopioi %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3261
+#: ../src/e-util/e-name-selector-entry.c:3249
 #, c-format
 msgid "C_ut %s"
 msgstr "_Leikkaa %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3279
+#: ../src/e-util/e-name-selector-entry.c:3267
 #, c-format
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
@@ -15374,7 +15562,7 @@ msgstr "_Muista salasana"
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: ../src/e-util/e-preferences-window.c:329
+#: ../src/e-util/e-preferences-window.c:326
 msgid "Evolution Preferences"
 msgstr "Evolutionin asetukset"
 
@@ -15470,11 +15658,11 @@ msgstr "Luo uusi välityspalvelinprofiili"
 msgid "Delete the selected proxy profile"
 msgstr "Poista valittu välityspalvelinprofiili"
 
-#: ../src/e-util/e-rule-editor.c:191
+#: ../src/e-util/e-rule-editor.c:188
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
-#: ../src/e-util/e-rule-editor.c:302
+#: ../src/e-util/e-rule-editor.c:299
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
@@ -15483,35 +15671,35 @@ msgstr "Muokkaa sääntöä"
 msgid "Matches: %u"
 msgstr "Osumia: %u"
 
-#: ../src/e-util/e-search-bar.c:624
+#: ../src/e-util/e-search-bar.c:597
 msgid "Close the find bar"
 msgstr "Sulje hakupalkki"
 
-#: ../src/e-util/e-search-bar.c:632
+#: ../src/e-util/e-search-bar.c:605
 msgid "Fin_d:"
 msgstr "Et_si:"
 
-#: ../src/e-util/e-search-bar.c:644
+#: ../src/e-util/e-search-bar.c:617
 msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
-#: ../src/e-util/e-search-bar.c:671
+#: ../src/e-util/e-search-bar.c:644
 msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../src/e-util/e-search-bar.c:683
+#: ../src/e-util/e-search-bar.c:656
 msgid "Find the next occurrence of the phrase"
 msgstr "Etsi lauseen seuraava esiintymä"
 
-#: ../src/e-util/e-search-bar.c:692
+#: ../src/e-util/e-search-bar.c:665
 msgid "Mat_ch case"
 msgstr "Huomioi _kirjainkoko"
 
-#: ../src/e-util/e-search-bar.c:720
+#: ../src/e-util/e-search-bar.c:693
 msgid "Reached bottom of page, continued from top"
 msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 
-#: ../src/e-util/e-search-bar.c:742
+#: ../src/e-util/e-search-bar.c:715
 msgid "Reached top of page, continued from bottom"
 msgstr "Saavutettiin sivun alku, jatketaan lopusta"
 
@@ -15664,59 +15852,59 @@ msgstr ""
 msgid "Sta_tus Tracking"
 msgstr "_Tilan seuranta"
 
-#: ../src/e-util/e-source-config.c:725 ../src/e-util/e-source-config.c:729
+#: ../src/e-util/e-source-config.c:689 ../src/e-util/e-source-config.c:693
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../src/e-util/e-source-config.c:739 ../src/e-util/e-source-config.c:743
+#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1733
+#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1856
 msgid "Name cannot be empty"
 msgstr "Nimi ei voi olla tyhjä"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1417
+#: ../src/e-util/e-source-config.c:1381
 msgid "Refresh every"
 msgstr "Päivitysväli"
 
-#: ../src/e-util/e-source-config.c:1447 ../src/e-util/e-source-config.c:1521
+#: ../src/e-util/e-source-config.c:1411 ../src/e-util/e-source-config.c:1485
 msgid "Use a secure connection"
 msgstr "Käytä salattua yhteyttä"
 
-#: ../src/e-util/e-source-config.c:1548
+#: ../src/e-util/e-source-config.c:1512
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Tuotu varmenne"
 
-#: ../src/e-util/e-source-config.c:1584
+#: ../src/e-util/e-source-config.c:1548
 msgid "User:"
 msgstr "Käyttäjä:"
 
-#: ../src/e-util/e-source-selector.c:3236
+#: ../src/e-util/e-source-selector.c:3417
 msgid "Show"
 msgstr "Näytä"
 
-#: ../src/e-util/e-source-selector.c:3242
+#: ../src/e-util/e-source-selector.c:3423
 msgid "Group name"
 msgstr "Ryhmän nimi"
 
-#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:717
+#: ../src/e-util/e-source-selector.c:3578 ../src/mail/e-mail-display.c:717
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../src/e-util/e-source-selector.c:3397 ../src/e-util/e-source-selector.c:3495
+#: ../src/e-util/e-source-selector.c:3578 ../src/e-util/e-source-selector.c:3676
 msgid "_Show"
 msgstr "_Näytä"
 
-#: ../src/e-util/e-source-selector.c:3449
+#: ../src/e-util/e-source-selector.c:3630
 msgid "Manage Groups"
 msgstr "Hallitse ryhmiä"
 
-#: ../src/e-util/e-source-selector.c:3461
+#: ../src/e-util/e-source-selector.c:3642
 msgid "Available Groups:"
 msgstr "Käytettävissä olevat ryhmät:"
 
@@ -15894,7 +16082,7 @@ msgstr ""
 msgid "Failed to refresh list of account sources"
 msgstr ""
 
-#: ../src/e-util/e-table-click-to-add.c:688
+#: ../src/e-util/e-table-click-to-add.c:686
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
@@ -15928,27 +16116,27 @@ msgstr "Siirrä valitut viestit toiseen kansioon"
 msgid "Select all column names"
 msgstr "Valitse kaikki sarakenimet"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Ascending)"
 msgstr "(nouseva)"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Descending)"
 msgstr "(laskeva)"
 
-#: ../src/e-util/e-table-config.c:395
+#: ../src/e-util/e-table-config.c:387
 msgid "Not sorted"
 msgstr "Ei järjestetty"
 
-#: ../src/e-util/e-table-config.c:440
+#: ../src/e-util/e-table-config.c:432
 msgid "No grouping"
 msgstr "Ei ryhmitystä"
 
-#: ../src/e-util/e-table-config.c:545
+#: ../src/e-util/e-table-config.c:537
 msgid "Show Fields"
 msgstr "Näytä kentät"
 
-#: ../src/e-util/e-table-config.c:559
+#: ../src/e-util/e-table-config.c:551
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose the order of information to appear in the message list."
@@ -15962,11 +16150,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:1792
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1778
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1792
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1778
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -16026,7 +16214,7 @@ msgstr ""
 "Lisää sarake taulukkoon raahaamalla se kohtaan,\n"
 "johon haluat sen ilmestyvän."
 
-#: ../src/e-util/e-table-field-chooser-dialog.c:224
+#: ../src/e-util/e-table-field-chooser-dialog.c:216
 msgid "Add a Column"
 msgstr "Lisää sarake"
 
@@ -16037,7 +16225,7 @@ msgstr "Lisää sarake"
 #. * Finally the %d is replaced with count of items in this group.
 #. * Example: "Family name: Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:366
+#: ../src/e-util/e-table-group-container.c:355
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -16050,83 +16238,83 @@ msgstr[1] "%s: %s (%d kohtaa)"
 #. * The %d is replaced with count of items in this group.
 #. * Example: "Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:380
+#: ../src/e-util/e-table-group-container.c:369
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../src/e-util/e-table-header-item.c:1610
+#: ../src/e-util/e-table-header-item.c:1596
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../src/e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1628
 msgid "Sort _Ascending"
-msgstr "järjestä _nousevasti"
+msgstr "Järjestä _nousevasti"
 
-#: ../src/e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1631
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../src/e-util/e-table-header-item.c:1648
+#: ../src/e-util/e-table-header-item.c:1634
 msgid "_Reset sort"
 msgstr "_Palauta järjestys"
 
-#: ../src/e-util/e-table-header-item.c:1651
+#: ../src/e-util/e-table-header-item.c:1637
 msgid "Group By This _Field"
 msgstr "Ryhmittele tämän _kentän mukaan"
 
-#: ../src/e-util/e-table-header-item.c:1654
+#: ../src/e-util/e-table-header-item.c:1640
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../src/e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1644
 msgid "Remove This _Column"
 msgstr "Poista tämä sa_rake"
 
-#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/e-util/e-table-header-item.c:1647
 msgid "Add a C_olumn…"
 msgstr "Lisää _sarake…"
 
-#: ../src/e-util/e-table-header-item.c:1665
+#: ../src/e-util/e-table-header-item.c:1651
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../src/e-util/e-table-header-item.c:1668
+#: ../src/e-util/e-table-header-item.c:1654
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../src/e-util/e-table-header-item.c:1671
+#: ../src/e-util/e-table-header-item.c:1657
 msgid "Format Column_s…"
 msgstr "Muotoile _sarakkeet…"
 
-#: ../src/e-util/e-table-header-item.c:1675
-#: ../src/shell/e-shell-window-actions.c:1239
+#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/shell/e-shell-window-actions.c:1290
 msgid "Custo_mize Current View…"
 msgstr "_Muokkaa nykyistä näkymää…"
 
-#: ../src/e-util/e-table-header-item.c:1742
+#: ../src/e-util/e-table-header-item.c:1728
 msgid "_Sort By"
 msgstr "_Järjestystapa"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1765
+#: ../src/e-util/e-table-header-item.c:1751
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../src/e-util/e-text.c:2105
+#: ../src/e-util/e-text.c:2090
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../src/e-util/e-text.c:2118
+#: ../src/e-util/e-text.c:2103
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
-#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
-#: ../src/e-util/e-timezone-dialog.c:1015
+#: ../src/e-util/e-timezone-dialog.c:270 ../src/e-util/e-timezone-dialog.c:510
+#: ../src/e-util/e-timezone-dialog.c:514 ../src/e-util/e-timezone-dialog.c:518
+#: ../src/e-util/e-timezone-dialog.c:1005
 msgid "UTC"
 msgstr "UTC"
 
@@ -16156,234 +16344,245 @@ msgstr "_Valinta"
 msgid "Timezone drop-down combination box"
 msgstr "Aikavyöhykkeen valinnan pudotusvalikko"
 
-#: ../src/e-util/e-url-entry.c:102
+#: ../src/e-util/e-url-entry.c:155
 msgid "Click here to open the URL"
 msgstr "Napsauta tästä avataksesi verkko-osoitteen"
 
-#: ../src/e-util/e-url-entry.c:104
+#: ../src/e-util/e-url-entry.c:192
 msgid "Enter a URL here"
 msgstr "Kirjoita verkko-osoite tähän"
 
-#: ../src/e-util/evolution-source-viewer.c:638
+#: ../src/e-util/evolution-source-viewer.c:632
 msgid "Evolution Source Viewer"
 msgstr "Evolutionin lähdekatselin"
 
 #. Translators: The name that is displayed in the user interface
-#: ../src/e-util/evolution-source-viewer.c:668
+#: ../src/e-util/evolution-source-viewer.c:662
 msgid "Display Name"
 msgstr "Näyttönimi"
 
-#: ../src/e-util/evolution-source-viewer.c:677
+#: ../src/e-util/evolution-source-viewer.c:671
 #, fuzzy
 #| msgid "_Flag:"
 msgid "Flags"
 msgstr "_Merkki:"
 
-#: ../src/e-util/evolution-source-viewer.c:729
+#: ../src/e-util/evolution-source-viewer.c:723
 #: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../src/e-util/e-webdav-browser.c:448
+#: ../src/e-util/e-webdav-browser.c:510
 msgid "Address book"
 msgstr "Osoitekirja"
 
-#: ../src/e-util/e-webdav-browser.c:459
+#: ../src/e-util/e-webdav-browser.c:521
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1555
-#: ../src/mail/em-folder-tree-model.c:1936
+#: ../src/e-util/e-webdav-browser.c:594 ../src/mail/em-folder-tree-model.c:1587
+#: ../src/mail/em-folder-tree-model.c:1975
 msgid "Loading…"
 msgstr "Ladataan…"
 
-#: ../src/e-util/e-webdav-browser.c:1368
+#: ../src/e-util/e-webdav-browser.c:1447
 msgid "Searching collection children…"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1370
+#: ../src/e-util/e-webdav-browser.c:1449
 msgid "Failed to search for collection children"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1404
+#: ../src/e-util/e-webdav-browser.c:1483
 msgid "Searching for user home, please wait…"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1406
+#: ../src/e-util/e-webdav-browser.c:1485
 #, fuzzy
 #| msgid "Unable to perform search."
 msgid "Failed to search for user home"
 msgstr "Hakua ei voi suorittaa."
 
-#: ../src/e-util/e-webdav-browser.c:1749
+#: ../src/e-util/e-webdav-browser.c:1872
 msgid "At least one component type should be set"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1768
+#: ../src/e-util/e-webdav-browser.c:1891
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to get selected collection HREF"
 msgstr "Yhteystiedon poisto epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1800
+#: ../src/e-util/e-webdav-browser.c:1924
 msgid "Failed to save changes"
 msgstr "Muutoksia ei voitu tallentaa"
 
-#: ../src/e-util/e-webdav-browser.c:1802
+#: ../src/e-util/e-webdav-browser.c:1926
 msgid "Creating new book…"
 msgstr "Luodaan uutta kirjaa…"
 
-#: ../src/e-util/e-webdav-browser.c:1803
+#: ../src/e-util/e-webdav-browser.c:1927
 msgid "Failed to create new book"
 msgstr "Uuden kirjan luominen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1805
+#: ../src/e-util/e-webdav-browser.c:1929
 msgid "Creating new calendar…"
 msgstr "Luodaan uutta kalenteria…"
 
-#: ../src/e-util/e-webdav-browser.c:1806
+#: ../src/e-util/e-webdav-browser.c:1930
 msgid "Failed to create new calendar"
 msgstr "Uuden kalenterin luominen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1808
+#: ../src/e-util/e-webdav-browser.c:1932
 msgid "Creating new collection…"
 msgstr "Luodaan uutta kokoelmaa…"
 
-#: ../src/e-util/e-webdav-browser.c:1809
+#: ../src/e-util/e-webdav-browser.c:1933
 msgid "Failed to create new collection"
 msgstr "Uuden kokoelman luominen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1948
+#: ../src/e-util/e-webdav-browser.c:2074
 msgid "It is not allowed to create book under another book or calendar"
 msgstr ""
 
 #. if (button == webdav_browser->priv->create_calendar_button)
-#: ../src/e-util/e-webdav-browser.c:1950
+#: ../src/e-util/e-webdav-browser.c:2076
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:2179
+#: ../src/e-util/e-webdav-browser.c:2323
 msgid "Deleting book…"
 msgstr "Poistetaan kirjaa…"
 
-#: ../src/e-util/e-webdav-browser.c:2180
+#: ../src/e-util/e-webdav-browser.c:2324
 msgid "Failed to delete book"
 msgstr "Kirjan poistaminen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:2183
+#: ../src/e-util/e-webdav-browser.c:2327
 msgid "Deleting calendar…"
 msgstr "Poistetaan kalenteri…"
 
-#: ../src/e-util/e-webdav-browser.c:2184
+#: ../src/e-util/e-webdav-browser.c:2328
 msgid "Failed to delete calendar"
 msgstr "Kalenterin poisto epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:2187
+#: ../src/e-util/e-webdav-browser.c:2331
 msgid "Deleting collection…"
 msgstr "Poistetaan kokoelmaa…"
 
-#: ../src/e-util/e-webdav-browser.c:2188
+#: ../src/e-util/e-webdav-browser.c:2332
 msgid "Failed to delete collection"
 msgstr "Kokoelman poistaminen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:2419
+#. Translators: It's 'order' as 'sorting order'
+#: ../src/e-util/e-webdav-browser.c:2566
+#, fuzzy
+#| msgid "_Border:"
+msgid "_Order:"
+msgstr "_Reunus:"
+
+#: ../src/e-util/e-webdav-browser.c:2576
+msgid "Use -1 to not set the sort order"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:2582
 msgid "For Components:"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:2425
+#: ../src/e-util/e-webdav-browser.c:2588
 msgid "_Events"
 msgstr "_Tapahtumat"
 
-#: ../src/e-util/e-webdav-browser.c:2615
+#: ../src/e-util/e-webdav-browser.c:2781
 msgid "WebDAV server:"
 msgstr "WebDAV-palvelin:"
 
-#: ../src/e-util/e-webdav-browser.c:2650
+#: ../src/e-util/e-webdav-browser.c:2816
 msgid "Create _Book"
 msgstr "Luo ki_rja"
 
-#: ../src/e-util/e-webdav-browser.c:2657
+#: ../src/e-util/e-webdav-browser.c:2823
 msgid "Create _Calendar"
 msgstr "_Luo kalenteri"
 
-#: ../src/e-util/e-webdav-browser.c:2664
+#: ../src/e-util/e-webdav-browser.c:2830
 msgid "Create Collectio_n"
 msgstr "Luo _kokoelma"
 
-#: ../src/e-util/e-web-view.c:407
+#: ../src/e-util/e-web-view.c:406
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../src/e-util/e-web-view.c:409
+#: ../src/e-util/e-web-view.c:408
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:417
+#: ../src/e-util/e-web-view.c:416
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../src/e-util/e-web-view.c:419
+#: ../src/e-util/e-web-view.c:418
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../src/e-util/e-web-view.c:427
+#: ../src/e-util/e-web-view.c:426
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../src/e-util/e-web-view.c:434
+#: ../src/e-util/e-web-view.c:433
 msgid "Copy _Raw Email Address"
 msgstr "Kopioi _raakasähköpostiosoite"
 
-#: ../src/e-util/e-web-view.c:436
+#: ../src/e-util/e-web-view.c:435
 msgid "Copy the raw email address to the clipboard"
 msgstr "Kopioi raakasähköpostiosoite leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:451
+#: ../src/e-util/e-web-view.c:450
 msgid "_Copy Image"
 msgstr "K_opioi kuva"
 
-#: ../src/e-util/e-web-view.c:453
+#: ../src/e-util/e-web-view.c:452
 msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:458
+#: ../src/e-util/e-web-view.c:457
 msgid "Save _Image…"
 msgstr "Tallenna _kuva…"
 
-#: ../src/e-util/e-web-view.c:460
+#: ../src/e-util/e-web-view.c:459
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../src/e-util/e-web-view.c:475 ../src/mail/e-mail-browser.c:201
-#: ../src/mail/e-mail-reader.c:2819
+#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:201
+#: ../src/mail/e-mail-reader.c:2836
 msgid "Search _Web…"
 msgstr "Etsi _verkosta…"
 
-#: ../src/e-util/e-web-view.c:477 ../src/mail/e-mail-browser.c:203
-#: ../src/mail/e-mail-reader.c:2821
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:203
+#: ../src/mail/e-mail-reader.c:2838
 #, fuzzy
 #| msgid "Send a message to the selected contacts"
 msgid "Search the Web with the selected text"
 msgstr "Lähetä viesti valituille henkilöille"
 
-#: ../src/e-util/e-web-view.c:487 ../src/e-util/e-web-view.c:2016
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2064
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../src/e-util/e-web-view.c:3742
+#: ../src/e-util/e-web-view.c:3791
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:3930
+#: ../src/e-util/e-web-view.c:3979
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/e-util/e-web-view.c:3967
+#: ../src/e-util/e-web-view.c:4016
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Tallennetaan kuva kohteeseen “%s”"
 
-#: ../src/e-util/e-web-view.c:4114
+#: ../src/e-util/e-web-view.c:4166
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -16564,7 +16763,7 @@ msgstr "_Suodatinsäännöt"
 msgid "Rule Name"
 msgstr "Säännön nimi"
 
-#: ../src/e-util/gal-a11y-e-cell.c:128
+#: ../src/e-util/gal-a11y-e-cell.c:125
 msgid "Table Cell"
 msgstr "Taulukon solu"
 
@@ -16597,11 +16796,11 @@ msgstr "piilota tämän solun sisältävä ETreen rivi"
 msgid "click"
 msgstr "napsauta"
 
-#: ../src/e-util/gal-a11y-e-table-column-header.c:161
+#: ../src/e-util/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "järjestä"
 
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:293
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:291
 msgid "Save Current View"
 msgstr "Tallenna nykyinen näkymä"
 
@@ -16630,7 +16829,9 @@ msgid "Blank Signature"
 msgstr "Tyhjä allekirjoitus"
 
 #: ../src/e-util/widgets.error.xml.h:5
-msgid "Please provide an unique name to identify this signature."
+#, fuzzy
+#| msgid "Please provide an unique name to identify this signature."
+msgid "Please provide a unique name to identify this signature."
 msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
 
 #: ../src/e-util/widgets.error.xml.h:6
@@ -16708,49 +16909,50 @@ msgstr "Virheellinen kansio: ”%s”"
 
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-properties.c:1444 ../src/mail/em-folder-tree-model.c:1503
-#: ../src/mail/importers/kmail-libs.c:138
-#: ../src/modules/mail/e-mail-shell-view-private.c:1011
-#: ../src/modules/mail/e-mail-shell-view-private.c:1022
+#: ../src/mail/em-folder-properties.c:1473 ../src/mail/em-folder-tree-model.c:1509
+#: ../src/mail/em-folder-tree-model.c:1533 ../src/mail/importers/kmail-libs.c:138
+#: ../src/modules/mail/e-mail-shell-view-private.c:1024
+#: ../src/modules/mail/e-mail-shell-view-private.c:1035
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/em-folder-tree-model.c:1497 ../src/mail/importers/kmail-libs.c:144
-#: ../src/modules/mail/e-mail-shell-view-private.c:1009
+#: ../src/mail/em-folder-tree-model.c:1503 ../src/mail/em-folder-tree-model.c:1537
+#: ../src/mail/importers/kmail-libs.c:144
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:122
-#: ../src/mail/em-folder-tree-model.c:1507 ../src/mail/importers/kmail-libs.c:140
-#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/mail/em-folder-tree-model.c:1513 ../src/mail/importers/kmail-libs.c:140
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:123
-#: ../src/mail/em-folder-tree-model.c:1511 ../src/mail/importers/kmail-libs.c:142
-#: ../src/modules/mail/e-mail-shell-view-private.c:1015
+#: ../src/mail/em-folder-tree-model.c:1516 ../src/mail/em-folder-tree-model.c:1536
+#: ../src/mail/importers/kmail-libs.c:142
+#: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../src/libemail-engine/e-mail-session.c:124
-#: ../src/mail/e-mail-templates-store.c:2211 ../src/mail/em-folder-tree-model.c:1499
-#: ../src/mail/importers/kmail-libs.c:146
-#: ../src/modules/mail/e-mail-shell-view-private.c:1017
+#: ../src/mail/em-folder-tree-model.c:1505 ../src/mail/importers/kmail-libs.c:146
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../src/libemail-engine/e-mail-session.c:1514
+#: ../src/libemail-engine/e-mail-session.c:1504
 #, c-format
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../src/libemail-engine/e-mail-session.c:1575
+#: ../src/libemail-engine/e-mail-session.c:1565
 #, fuzzy, c-format
 #| msgid ""
 #| "No destination address provided, forward of the message has been cancelled."
@@ -16758,60 +16960,60 @@ msgid ""
 "No destination address provided, forwarding of the message has been cancelled."
 msgstr "Kohdeosoitetta ei annettu, viestin edelleenlähetys on peruttu."
 
-#: ../src/libemail-engine/e-mail-session.c:1588
+#: ../src/libemail-engine/e-mail-session.c:1578
 #, 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:1789
+#: ../src/libemail-engine/e-mail-session.c:1779
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1909
+#: ../src/libemail-engine/e-mail-session.c:1899
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1911
+#: ../src/libemail-engine/e-mail-session.c:1901
 msgid "Looking up recipient PGP keys in address books…"
 msgstr "Etsitään vastaanottajan PGP-avaimia osoitekirjoissa…"
 
-#: ../src/libemail-engine/e-mail-session.c:2958
+#: ../src/libemail-engine/e-mail-session.c:2948
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Waiting for “%s”"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:526
+#: ../src/libemail-engine/e-mail-session-utils.c:527
 #, fuzzy
 #| msgid "No HTML stream available"
 msgid "No mail transport service available"
 msgstr "HTML-virtaa ei ole saatavilla"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:613
-#: ../src/libemail-engine/mail-ops.c:708
+#: ../src/libemail-engine/e-mail-session-utils.c:618
+#: ../src/libemail-engine/mail-ops.c:705
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
 msgid "Posting message to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:650
-#: ../src/libemail-engine/mail-ops.c:744
+#: ../src/libemail-engine/e-mail-session-utils.c:656
+#: ../src/libemail-engine/mail-ops.c:741
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:683
-#: ../src/libemail-engine/e-mail-session-utils.c:718
-#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
+#: ../src/libemail-engine/e-mail-session-utils.c:689
+#: ../src/libemail-engine/e-mail-session-utils.c:724
+#: ../src/libemail-engine/mail-ops.c:769 ../src/libemail-engine/mail-ops.c:804
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
 msgid "Storing sent message to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:707
-#: ../src/libemail-engine/mail-ops.c:796
+#: ../src/libemail-engine/e-mail-session-utils.c:713
+#: ../src/libemail-engine/mail-ops.c:793
 #, fuzzy, c-format
 #| msgid ""
 #| "Failed to append to %s: %s\n"
@@ -16823,15 +17025,15 @@ msgstr ""
 "Kansioon %s lisääminen epäonnistui: %s\n"
 "Lisätään paikalliseen ”Lähetetyt”-kansioon."
 
-#: ../src/libemail-engine/e-mail-session-utils.c:737
-#: ../src/libemail-engine/mail-ops.c:824
+#: ../src/libemail-engine/e-mail-session-utils.c:743
+#: ../src/libemail-engine/mail-ops.c:821
 #, 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:930
-#: ../src/libemail-engine/mail-ops.c:1020 ../src/libemail-engine/mail-ops.c:1135
+#: ../src/libemail-engine/e-mail-session-utils.c:936
+#: ../src/libemail-engine/mail-ops.c:1017 ../src/libemail-engine/mail-ops.c:1129
 #: ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
@@ -16841,7 +17043,7 @@ msgstr "Lähetetään viestiä"
 msgid "Disconnecting from “%s”"
 msgstr "Katkaistaan yhteys kohteeseen “%s”"
 
-#: ../src/libemail-engine/e-mail-store-utils.c:264 ../src/mail/e-mail-backend.c:1048
+#: ../src/libemail-engine/e-mail-store-utils.c:264 ../src/mail/e-mail-backend.c:1055
 #, c-format
 msgid "Reconnecting to “%s”"
 msgstr "Yhdistetään uudelleen kohteeseen “%s”"
@@ -16869,7 +17071,7 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "Noudetaan viestejä kohteesta “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:738
+#: ../src/libemail-engine/mail-ops.c:735
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set in "
@@ -16878,7 +17080,7 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../src/libemail-engine/mail-ops.c:1031
+#: ../src/libemail-engine/mail-ops.c:1028
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
@@ -16886,54 +17088,54 @@ msgstr "Lähetetään viestiä %d / %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1089
+#: ../src/libemail-engine/mail-ops.c:1086
 #, 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:1095
+#: ../src/libemail-engine/mail-ops.c:1092
 msgid "Cancelled."
 msgstr "Peruttu."
 
-#: ../src/libemail-engine/mail-ops.c:1097
+#: ../src/libemail-engine/mail-ops.c:1094
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../src/libemail-engine/mail-ops.c:1221
+#: ../src/libemail-engine/mail-ops.c:1215
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "Siirretään viestejä kansioon “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1222
+#: ../src/libemail-engine/mail-ops.c:1216
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "Kopioidaan viestejä kansioon “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1341
+#: ../src/libemail-engine/mail-ops.c:1335
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "Tallennetaan kansiota “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1469
+#: ../src/libemail-engine/mail-ops.c:1463
 #, 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:1470
+#: ../src/libemail-engine/mail-ops.c:1464
 #, c-format
 msgid "Storing account “%s”"
 msgstr "Tallennetaan tiliä “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1545
+#: ../src/libemail-engine/mail-ops.c:1539
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Emptying trash in “%s”"
 msgstr "Tyhjennetään roskakoria ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1644
+#: ../src/libemail-engine/mail-ops.c:1638
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Processing folder changes in “%s”"
@@ -17091,9 +17293,9 @@ msgstr "POP3-palvelin"
 msgid "SMTP server"
 msgstr "SMTP-palvelin"
 
-#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:877
-#: ../src/shell/e-shell-window-actions.c:884
-#: ../src/shell/e-shell-window-actions.c:891
+#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:921
+#: ../src/shell/e-shell-window-actions.c:928
+#: ../src/shell/e-shell-window-actions.c:935
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
@@ -17111,11 +17313,11 @@ msgstr "Siirr_y takaisin"
 msgid "_Skip Lookup"
 msgstr "_Ohita haku"
 
-#: ../src/mail/e-mail-config-assistant.c:725
+#: ../src/mail/e-mail-config-assistant.c:710
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: ../src/mail/e-mail-config-assistant.c:1032
+#: ../src/mail/e-mail-config-assistant.c:1021
 msgid "_Revise Details"
 msgstr "_Tarkista tiedot"
 
@@ -17187,12 +17389,12 @@ msgid "Language for Reply and Forward attribution text"
 msgstr ""
 
 #: ../src/mail/e-mail-config-composing-page.c:524
-#: ../src/mail/em-composer-utils.c:4148 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4129 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
 msgstr "Aloita _kirjoittaminen lopusta"
 
 #: ../src/mail/e-mail-config-composing-page.c:531
-#: ../src/mail/em-composer-utils.c:4151 ../src/mail/mail-config.ui.h:23
+#: ../src/mail/em-composer-utils.c:4132 ../src/mail/mail-config.ui.h:23
 msgid "_Keep signature above the original message"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä"
 
@@ -17322,7 +17524,7 @@ msgstr ""
 "lähettämiisi sähköpostiviesteihin."
 
 #: ../src/mail/e-mail-config-identity-page.c:580
-#: ../src/mail/e-mail-config-summary-page.c:355
+#: ../src/mail/e-mail-config-summary-page.c:348
 #, fuzzy
 #| msgid ""
 #| "The above name will be used to identify this account.\n"
@@ -17394,7 +17596,7 @@ msgid "Reply To is not a valid email"
 msgstr "Vastausosoite ei ole kelvollinen osoite"
 
 #: ../src/mail/e-mail-config-identity-page.c:970
-#: ../src/mail/e-mail-config-summary-page.c:637
+#: ../src/mail/e-mail-config-summary-page.c:630
 msgid "Account Name cannot be empty"
 msgstr "Tilin nimi ei voi olla tyhjä"
 
@@ -17410,7 +17612,7 @@ msgstr "Tarkistetaan uusia viestejä"
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../src/mail/e-mail-config-provider-page.c:767
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr "Vastaanottoasetukset"
 
@@ -17420,114 +17622,114 @@ msgstr "Vastaanotto"
 
 #. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../src/mail/e-mail-config-security-page.c:379
+#: ../src/mail/e-mail-config-security-page.c:375
 #, c-format
 msgctxt "PGPKeyDescription"
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
+#: ../src/mail/e-mail-config-security-page.c:456
+#: ../src/mail/em-folder-properties.c:1396 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
 #: ../src/modules/calendar/e-calendar-preferences.c:621
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:806
+#: ../src/modules/mail/e-mail-shell-backend.c:1001
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/mail/e-mail-config-security-page.c:469
+#: ../src/mail/e-mail-config-security-page.c:465
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../src/mail/e-mail-config-security-page.c:491
+#: ../src/mail/e-mail-config-security-page.c:487
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP) -salaus"
 
-#: ../src/mail/e-mail-config-security-page.c:500
+#: ../src/mail/e-mail-config-security-page.c:496
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP_-avaimen ID:"
 
-#: ../src/mail/e-mail-config-security-page.c:531
+#: ../src/mail/e-mail-config-security-page.c:527
 msgid "Si_gning algorithm:"
 msgstr "_Allekirjoitusalgoritmi:"
 
-#: ../src/mail/e-mail-config-security-page.c:547
-#: ../src/mail/e-mail-config-security-page.c:711 ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:543
+#: ../src/mail/e-mail-config-security-page.c:707 ../src/mail/mail-config.ui.h:79
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../src/mail/e-mail-config-security-page.c:550
-#: ../src/mail/e-mail-config-security-page.c:714 ../src/mail/mail-config.ui.h:80
+#: ../src/mail/e-mail-config-security-page.c:546
+#: ../src/mail/e-mail-config-security-page.c:710 ../src/mail/mail-config.ui.h:80
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../src/mail/e-mail-config-security-page.c:553
-#: ../src/mail/e-mail-config-security-page.c:717 ../src/mail/mail-config.ui.h:81
+#: ../src/mail/e-mail-config-security-page.c:549
+#: ../src/mail/e-mail-config-security-page.c:713 ../src/mail/mail-config.ui.h:81
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../src/mail/e-mail-config-security-page.c:556
-#: ../src/mail/e-mail-config-security-page.c:720 ../src/mail/mail-config.ui.h:82
+#: ../src/mail/e-mail-config-security-page.c:552
+#: ../src/mail/e-mail-config-security-page.c:716 ../src/mail/mail-config.ui.h:82
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:572
+#: ../src/mail/e-mail-config-security-page.c:568
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
 
-#: ../src/mail/e-mail-config-security-page.c:584
+#: ../src/mail/e-mail-config-security-page.c:580
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "Salaa aina lä_htevät viestit käytettäessä tätä tiliä"
 
-#: ../src/mail/e-mail-config-security-page.c:596
+#: ../src/mail/e-mail-config-security-page.c:592
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 
-#: ../src/mail/e-mail-config-security-page.c:608
+#: ../src/mail/e-mail-config-security-page.c:604
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../src/mail/e-mail-config-security-page.c:620
+#: ../src/mail/e-mail-config-security-page.c:616
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr ""
 
-#: ../src/mail/e-mail-config-security-page.c:644
+#: ../src/mail/e-mail-config-security-page.c:640
 msgid "Secure MIME (S/MIME)"
 msgstr "Suojattu MIME (S/MIME)"
 
-#: ../src/mail/e-mail-config-security-page.c:653
+#: ../src/mail/e-mail-config-security-page.c:649
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../src/mail/e-mail-config-security-page.c:677
-#: ../src/mail/e-mail-config-security-page.c:775
+#: ../src/mail/e-mail-config-security-page.c:673
+#: ../src/mail/e-mail-config-security-page.c:771
 msgid "Select"
 msgstr "Valitse"
 
-#: ../src/mail/e-mail-config-security-page.c:686
-#: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:980
+#: ../src/mail/e-mail-config-security-page.c:682
+#: ../src/mail/e-mail-config-security-page.c:780
+#: ../src/shell/e-shell-window-actions.c:1024
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../src/mail/e-mail-config-security-page.c:695
+#: ../src/mail/e-mail-config-security-page.c:691
 msgid "Signing _algorithm:"
 msgstr "Allekirjoitus_algoritmi:"
 
-#: ../src/mail/e-mail-config-security-page.c:736
+#: ../src/mail/e-mail-config-security-page.c:732
 msgid "Always sign outgoing messages when using this account"
 msgstr "Allekirjoita aina lähtevät viestit käytettäessä tätä tiliä"
 
-#: ../src/mail/e-mail-config-security-page.c:751
+#: ../src/mail/e-mail-config-security-page.c:747
 msgid "Encryption certificate:"
 msgstr "Salausvarmenne:"
 
-#: ../src/mail/e-mail-config-security-page.c:793
+#: ../src/mail/e-mail-config-security-page.c:789
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Salaa aina lähtevät viestit käytettäessä tätä tiliä"
 
-#: ../src/mail/e-mail-config-security-page.c:805
+#: ../src/mail/e-mail-config-security-page.c:801
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Salaa aina myös itselle lähetettäessä salattu viesti"
 
@@ -17535,58 +17737,58 @@ msgstr "Salaa aina myös itselle lähetettäessä salattu viesti"
 msgid "Sending Email"
 msgstr "Lähetys"
 
-#: ../src/mail/e-mail-config-service-page.c:501
+#: ../src/mail/e-mail-config-service-page.c:490
 msgid "Server _Type:"
 msgstr "_Palvelintyyppi:"
 
-#: ../src/mail/e-mail-config-summary-page.c:308
+#: ../src/mail/e-mail-config-summary-page.c:301
 msgid "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Alla on yhteenveto asetuksista, joiden avulla otetaan yhteys sähköpostitiliisi."
 
-#: ../src/mail/e-mail-config-summary-page.c:372
+#: ../src/mail/e-mail-config-summary-page.c:365
 msgid "Personal Details"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../src/mail/e-mail-config-summary-page.c:381
+#: ../src/mail/e-mail-config-summary-page.c:374
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
-#: ../src/mail/e-mail-config-summary-page.c:395
+#: ../src/mail/e-mail-config-summary-page.c:388
 msgid "Email Address:"
 msgstr "Sähköpostiosoite:"
 
-#: ../src/mail/e-mail-config-summary-page.c:409
+#: ../src/mail/e-mail-config-summary-page.c:402
 msgid "Receiving"
 msgstr "Vastaanotto"
 
-#: ../src/mail/e-mail-config-summary-page.c:421
+#: ../src/mail/e-mail-config-summary-page.c:414
 msgid "Sending"
 msgstr "Lähetys"
 
-#: ../src/mail/e-mail-config-summary-page.c:433
+#: ../src/mail/e-mail-config-summary-page.c:426
 msgid "Server Type:"
 msgstr "Palvelintyyppi:"
 
-#: ../src/mail/e-mail-config-summary-page.c:454
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/mail/e-mail-config-summary-page.c:447
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:658
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: ../src/mail/e-mail-config-summary-page.c:475
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/mail/e-mail-config-summary-page.c:468
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: ../src/mail/e-mail-config-summary-page.c:496
+#: ../src/mail/e-mail-config-summary-page.c:489
 msgid "Security:"
 msgstr "Salaus:"
 
-#: ../src/mail/e-mail-config-summary-page.c:650
+#: ../src/mail/e-mail-config-summary-page.c:643
 msgid "Cannot have both receiving and sending parts set to None"
 msgstr ""
 
-#: ../src/mail/e-mail-config-summary-page.c:806
+#: ../src/mail/e-mail-config-summary-page.c:799
 msgid "Account Summary"
 msgstr "Tilin yhteenveto"
 
@@ -17601,11 +17803,11 @@ msgstr ""
 "Aloita napsauttamalla “Jatka”."
 
 #: ../src/mail/e-mail-config-welcome-page.c:172
-#: ../src/modules/startup-wizard/e-startup-assistant.c:182
+#: ../src/modules/startup-wizard/e-startup-assistant.c:170
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../src/mail/e-mail-config-window.c:329
+#: ../src/mail/e-mail-config-window.c:305
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
@@ -17622,10 +17824,8 @@ msgid "_From This Address"
 msgstr "_Tästä osoitteesta"
 
 #: ../src/mail/e-mail-display.c:162
-#, fuzzy
-#| msgid "Send _Reply To..."
 msgid "Send _Reply To…"
-msgstr "Lähetä _vastaus osoitteeseen..."
+msgstr "Lähetä _vastaus osoitteeseen…"
 
 #: ../src/mail/e-mail-display.c:164
 msgid "Send a reply message to this address"
@@ -17681,85 +17881,92 @@ msgstr "_Luo"
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:687
 #, fuzzy
 #| msgid "Folder Properties"
 msgid "Folder Sort Order"
 msgstr "Kansion ominaisuudet"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:728
 #, fuzzy
 #| msgid "Close the current file"
 msgid "Reset c_urrent level"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:729
 msgid "Reset sort order in the current level to the defaults"
 msgstr ""
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:746
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:739
 #, fuzzy
 #| msgid "Select all headers"
 msgid "Reset _all levels"
 msgstr "Valitse kaikki otsakkeet"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:740
 msgid "Reset sort order in all levels to their defaults"
 msgstr ""
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../src/mail/e-mail-free-form-exp.c:231
+#: ../src/mail/e-mail-free-form-exp.c:233
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../src/mail/e-mail-free-form-exp.c:232
+#: ../src/mail/e-mail-free-form-exp.c:234
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../src/mail/e-mail-free-form-exp.c:233
+#: ../src/mail/e-mail-free-form-exp.c:235
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../src/mail/e-mail-free-form-exp.c:234
+#: ../src/mail/e-mail-free-form-exp.c:236
 #, fuzzy
 #| msgid "Flagged"
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Merkitty"
 
-#: ../src/mail/e-mail-free-form-exp.c:235
+#: ../src/mail/e-mail-free-form-exp.c:237
 #, fuzzy
 #| msgid "Seen"
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../src/mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:238
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../src/mail/e-mail-free-form-exp.c:489
+#: ../src/mail/e-mail-free-form-exp.c:488
 #, fuzzy
 #| msgid "now"
 msgctxt "ffe"
 msgid "no"
 msgstr "nyt"
 
+#: ../src/mail/e-mail-free-form-exp.c:489
+#, fuzzy
+#| msgid "now"
+msgctxt "ffe"
+msgid "not"
+msgstr "nyt"
+
 #: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr ""
 
-#: ../src/mail/e-mail-junk-options.c:296
+#: ../src/mail/e-mail-junk-options.c:289
 msgid "Junk filtering software:"
 msgstr ""
 
-#: ../src/mail/e-mail-label-dialog.c:222
+#: ../src/mail/e-mail-label-dialog.c:214
 msgid "_Label name:"
 msgstr "_Otsakkeen nimi:"
 
@@ -17787,16 +17994,16 @@ msgstr "Te_htävää"
 msgid "_Later"
 msgstr "_Myöhemmin"
 
-#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:905
-#: ../src/mail/em-folder-properties.c:1141
+#: ../src/mail/e-mail-label-manager.c:153 ../src/mail/e-mail-reader.c:914
+#: ../src/mail/em-folder-properties.c:1170
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
-#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:1168
+#: ../src/mail/e-mail-label-manager.c:204 ../src/mail/em-folder-properties.c:1197
 msgid "Edit Label"
 msgstr "Muokkaa merkintää"
 
-#: ../src/mail/e-mail-label-manager.c:352
+#: ../src/mail/e-mail-label-manager.c:336
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -17885,721 +18092,721 @@ msgstr "Otsakkeet"
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../src/mail/e-mail-reader.c:609
-#, fuzzy
-#| msgid "Deleting message note..."
+#: ../src/mail/e-mail-reader.c:618
 msgid "Deleting message note…"
-msgstr "Poistetaan viestin huomautus..."
+msgstr "Poistetaan viestin huomautus…"
 
-#: ../src/mail/e-mail-reader.c:1609 ../src/mail/e-mail-reader.c:1900
-#: ../src/mail/e-mail-reader.c:1940
+#: ../src/mail/e-mail-reader.c:1618 ../src/mail/e-mail-reader.c:1910
+#: ../src/mail/e-mail-reader.c:1950
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../src/mail/e-mail-reader.c:1946
+#: ../src/mail/e-mail-reader.c:1956
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../src/mail/e-mail-reader.c:2150
+#: ../src/mail/e-mail-reader.c:2160
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../src/mail/e-mail-reader.c:2196 ../src/mail/e-mail-reader.c:3686
+#: ../src/mail/e-mail-reader.c:2206 ../src/mail/e-mail-reader.c:3707
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Noudetaan viestiä “%s”"
 
-#: ../src/mail/e-mail-reader.c:2397
+#: ../src/mail/e-mail-reader.c:2407
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2399
+#: ../src/mail/e-mail-reader.c:2409
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2404
+#: ../src/mail/e-mail-reader.c:2414
 msgid "_Archive…"
 msgstr "_Arkistoi…"
 
-#: ../src/mail/e-mail-reader.c:2406
+#: ../src/mail/e-mail-reader.c:2416
 #, 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:2411
+#: ../src/mail/e-mail-reader.c:2421
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2413
+#: ../src/mail/e-mail-reader.c:2423
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2418
+#: ../src/mail/e-mail-reader.c:2428
 msgid "Assign C_olor…"
 msgstr "Aseta _väri…"
 
-#: ../src/mail/e-mail-reader.c:2420
+#: ../src/mail/e-mail-reader.c:2430
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Assign color for the selected messages"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/mail/e-mail-reader.c:2425
+#: ../src/mail/e-mail-reader.c:2435
 #, fuzzy
 #| msgid "Unset Color"
 msgid "Unse_t Color"
 msgstr "Poista värin asetus"
 
-#: ../src/mail/e-mail-reader.c:2427
+#: ../src/mail/e-mail-reader.c:2437
 #, fuzzy
 #| msgid "Undelete the selected messages"
 msgid "Unset color for the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2432
+#: ../src/mail/e-mail-reader.c:2442
 msgid "_Copy to Folder…"
 msgstr "K_opioi kansioon…"
 
-#: ../src/mail/e-mail-reader.c:2434
+#: ../src/mail/e-mail-reader.c:2444
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2439
+#: ../src/mail/e-mail-reader.c:2449
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../src/mail/e-mail-reader.c:2441
+#: ../src/mail/e-mail-reader.c:2451
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../src/mail/e-mail-reader.c:2446
-#, fuzzy
-#| msgid "_Add note..."
+#: ../src/mail/e-mail-reader.c:2456
 msgid "_Add note…"
-msgstr "_Lisää huomautus..."
+msgstr "_Lisää huomautus…"
 
-#: ../src/mail/e-mail-reader.c:2448
+#: ../src/mail/e-mail-reader.c:2458
 #, 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:2453
+#: ../src/mail/e-mail-reader.c:2463
 msgid "Delete no_te"
 msgstr "Poista _huomautus"
 
-#: ../src/mail/e-mail-reader.c:2455
+#: ../src/mail/e-mail-reader.c:2465
 #, 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:2460
-#, fuzzy
-#| msgid "_Edit note..."
+#: ../src/mail/e-mail-reader.c:2470
 msgid "_Edit note…"
-msgstr "_Muokkaa huomautusta..."
+msgstr "_Muokkaa huomautusta…"
 
-#: ../src/mail/e-mail-reader.c:2462
+#: ../src/mail/e-mail-reader.c:2472
 #, 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:2467
+#: ../src/mail/e-mail-reader.c:2477
 #, fuzzy
 #| msgid "Create a Filter Rule for Mailing _List..."
 msgid "Create a Filter Rule for Mailing _List…"
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2469
+#: ../src/mail/e-mail-reader.c:2479
 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:2474
+#: ../src/mail/e-mail-reader.c:2484
 #, fuzzy
 #| msgid "Create a Filter Rule for _Recipients..."
 msgid "Create a Filter Rule for _Recipients…"
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2476
+#: ../src/mail/e-mail-reader.c:2486
 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:2481
+#: ../src/mail/e-mail-reader.c:2491
 #, fuzzy
 #| msgid "Create a Filter Rule for Se_nder..."
 msgid "Create a Filter Rule for Se_nder…"
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2483
+#: ../src/mail/e-mail-reader.c:2493
 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:2488
+#: ../src/mail/e-mail-reader.c:2498
 #, fuzzy
 #| msgid "Create a Filter Rule for _Subject..."
 msgid "Create a Filter Rule for _Subject…"
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2490
+#: ../src/mail/e-mail-reader.c:2500
 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:2495
+#: ../src/mail/e-mail-reader.c:2505
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../src/mail/e-mail-reader.c:2497
+#: ../src/mail/e-mail-reader.c:2507
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../src/mail/e-mail-reader.c:2502
+#: ../src/mail/e-mail-reader.c:2512
 msgid "_Find in Message…"
 msgstr "_Etsi viestistä…"
 
-#: ../src/mail/e-mail-reader.c:2504
+#: ../src/mail/e-mail-reader.c:2514
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../src/mail/e-mail-reader.c:2509
+#: ../src/mail/e-mail-reader.c:2519
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../src/mail/e-mail-reader.c:2511
+#: ../src/mail/e-mail-reader.c:2521
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../src/mail/e-mail-reader.c:2516
+#: ../src/mail/e-mail-reader.c:2526
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2518
+#: ../src/mail/e-mail-reader.c:2528
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2523
+#: ../src/mail/e-mail-reader.c:2533
 #, fuzzy
 #| msgid "Follow Up"
 msgid "Follow _Up…"
 msgstr "Lähetä edelleen"
 
-#: ../src/mail/e-mail-reader.c:2525
+#: ../src/mail/e-mail-reader.c:2535
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../src/mail/e-mail-reader.c:2530
+#: ../src/mail/e-mail-reader.c:2540
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../src/mail/e-mail-reader.c:2532 ../src/mail/e-mail-reader.c:2539
+#: ../src/mail/e-mail-reader.c:2542 ../src/mail/e-mail-reader.c:2549
 #: ../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:2537
+#: ../src/mail/e-mail-reader.c:2547
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../src/mail/e-mail-reader.c:2544
+#: ../src/mail/e-mail-reader.c:2554
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../src/mail/e-mail-reader.c:2546 ../src/mail/e-mail-reader.c:2553
+#: ../src/mail/e-mail-reader.c:2556 ../src/mail/e-mail-reader.c:2563
 #: ../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:2551
+#: ../src/mail/e-mail-reader.c:2561
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2568
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2560 ../src/mail/e-mail-reader.c:2567
+#: ../src/mail/e-mail-reader.c:2570 ../src/mail/e-mail-reader.c:2577
 #: ../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:2565
+#: ../src/mail/e-mail-reader.c:2575
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2572
+#: ../src/mail/e-mail-reader.c:2582
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2581
+#: ../src/mail/e-mail-reader.c:2591
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../src/mail/e-mail-reader.c:2588
+#: ../src/mail/e-mail-reader.c:2598
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../src/mail/e-mail-reader.c:2590
+#: ../src/mail/e-mail-reader.c:2600
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../src/mail/e-mail-reader.c:2595 ../src/mail/e-mail-reader.c:3014
+#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3031
 msgid "_Ignore Subthread"
 msgstr "_Jätä huomiotta aliketju"
 
-#: ../src/mail/e-mail-reader.c:2597
+#: ../src/mail/e-mail-reader.c:2607
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2602 ../src/mail/e-mail-reader.c:3018
+#: ../src/mail/e-mail-reader.c:2612 ../src/mail/e-mail-reader.c:3035
 msgid "_Ignore Thread"
 msgstr "_Jätä huomiotta ketju"
 
-#: ../src/mail/e-mail-reader.c:2604
+#: ../src/mail/e-mail-reader.c:2614
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2609
+#: ../src/mail/e-mail-reader.c:2619
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../src/mail/e-mail-reader.c:2611
+#: ../src/mail/e-mail-reader.c:2621
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../src/mail/e-mail-reader.c:2616
+#: ../src/mail/e-mail-reader.c:2626
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2618
+#: ../src/mail/e-mail-reader.c:2628
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2623
+#: ../src/mail/e-mail-reader.c:2633
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2625
+#: ../src/mail/e-mail-reader.c:2635
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2630
+#: ../src/mail/e-mail-reader.c:2640
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../src/mail/e-mail-reader.c:2632
+#: ../src/mail/e-mail-reader.c:2642
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../src/mail/e-mail-reader.c:2637 ../src/mail/e-mail-reader.c:3038
+#: ../src/mail/e-mail-reader.c:2647 ../src/mail/e-mail-reader.c:3055
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../src/mail/e-mail-reader.c:2639
+#: ../src/mail/e-mail-reader.c:2649
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2644 ../src/mail/e-mail-reader.c:3042
+#: ../src/mail/e-mail-reader.c:2654 ../src/mail/e-mail-reader.c:3059
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2646
+#: ../src/mail/e-mail-reader.c:2656
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2651
+#: ../src/mail/e-mail-reader.c:2661
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../src/mail/e-mail-reader.c:2653
+#: ../src/mail/e-mail-reader.c:2663
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../src/mail/e-mail-reader.c:2658
+#: ../src/mail/e-mail-reader.c:2668
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../src/mail/e-mail-reader.c:2660
+#: ../src/mail/e-mail-reader.c:2670
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../src/mail/e-mail-reader.c:2665
+#: ../src/mail/e-mail-reader.c:2675
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message…"
 msgstr "_Muokkaa uutena viestinä…"
 
-#: ../src/mail/e-mail-reader.c:2667
+#: ../src/mail/e-mail-reader.c:2677
 #: ../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:2672
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../src/mail/e-mail-reader.c:2674
+#: ../src/mail/e-mail-reader.c:2684
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../src/mail/e-mail-reader.c:2679
+#: ../src/mail/e-mail-reader.c:2689
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2681
+#: ../src/mail/e-mail-reader.c:2691
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2686
+#: ../src/mail/e-mail-reader.c:2696
 msgid "_Move to Folder…"
 msgstr "_Siirrä kansioon…"
 
-#: ../src/mail/e-mail-reader.c:2688
+#: ../src/mail/e-mail-reader.c:2698
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2693
+#: ../src/mail/e-mail-reader.c:2703
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2695
+#: ../src/mail/e-mail-reader.c:2705
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2700
+#: ../src/mail/e-mail-reader.c:2710
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2702
+#: ../src/mail/e-mail-reader.c:2712
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2707
+#: ../src/mail/e-mail-reader.c:2717
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../src/mail/e-mail-reader.c:2709
+#: ../src/mail/e-mail-reader.c:2719
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../src/mail/e-mail-reader.c:2714
+#: ../src/mail/e-mail-reader.c:2724
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2716
+#: ../src/mail/e-mail-reader.c:2726
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2721
+#: ../src/mail/e-mail-reader.c:2731
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2723
+#: ../src/mail/e-mail-reader.c:2733
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2728
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2730
+#: ../src/mail/e-mail-reader.c:2740
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2735
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2737
+#: ../src/mail/e-mail-reader.c:2747
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2742
+#: ../src/mail/e-mail-reader.c:2752
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2744
+#: ../src/mail/e-mail-reader.c:2754
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2751
+#: ../src/mail/e-mail-reader.c:2761
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../src/mail/e-mail-reader.c:2758
+#: ../src/mail/e-mail-reader.c:2768
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../src/mail/e-mail-reader.c:2763
+#: ../src/mail/e-mail-reader.c:2773
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../src/mail/e-mail-reader.c:2765
+#: ../src/mail/e-mail-reader.c:2775
 #: ../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:2770
+#: ../src/mail/e-mail-reader.c:2780
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../src/mail/e-mail-reader.c:2772
+#: ../src/mail/e-mail-reader.c:2782
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../src/mail/e-mail-reader.c:2777
+#: ../src/mail/e-mail-reader.c:2787
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../src/mail/e-mail-reader.c:2779
+#: ../src/mail/e-mail-reader.c:2789
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../src/mail/e-mail-reader.c:2784 ../src/mail/em-composer-utils.c:4102
+#: ../src/mail/e-mail-reader.c:2794 ../src/mail/em-composer-utils.c:4083
 #: ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1550
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../src/mail/e-mail-reader.c:2786
+#: ../src/mail/e-mail-reader.c:2796
 #: ../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:2791
+#: ../src/mail/e-mail-reader.c:2801
 msgid "Al_ternative Reply…"
-msgstr ""
+msgstr "_Vaihtoehtoinen vastaus…"
 
-#: ../src/mail/e-mail-reader.c:2793
+#: ../src/mail/e-mail-reader.c:2803
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Choose reply options for the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../src/mail/e-mail-reader.c:2798 ../src/mail/em-composer-utils.c:4097
+#: ../src/mail/e-mail-reader.c:2808 ../src/mail/em-composer-utils.c:4078
 #: ../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:2800
+#: ../src/mail/e-mail-reader.c:2810
 #: ../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:2805
+#: ../src/mail/e-mail-reader.c:2815
 #: ../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:2807
+#: ../src/mail/e-mail-reader.c:2817
 #: ../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:2812
+#: ../src/mail/e-mail-reader.c:2822
+#, fuzzy
+#| msgid "_Template:"
+msgid "Repl_y with Template"
+msgstr "_Malli:"
+
+#: ../src/mail/e-mail-reader.c:2829
 msgid "_Save as mbox…"
 msgstr "_Tallenna mbox-muodossa…"
 
-#: ../src/mail/e-mail-reader.c:2814
+#: ../src/mail/e-mail-reader.c:2831
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../src/mail/e-mail-reader.c:2826
+#: ../src/mail/e-mail-reader.c:2843
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2828
+#: ../src/mail/e-mail-reader.c:2845
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2840
+#: ../src/mail/e-mail-reader.c:2857
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../src/mail/e-mail-reader.c:2842
+#: ../src/mail/e-mail-reader.c:2859
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2847
+#: ../src/mail/e-mail-reader.c:2864
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../src/mail/e-mail-reader.c:2849
+#: ../src/mail/e-mail-reader.c:2866
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../src/mail/e-mail-reader.c:2854
+#: ../src/mail/e-mail-reader.c:2871
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../src/mail/e-mail-reader.c:2856
+#: ../src/mail/e-mail-reader.c:2873
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2863
+#: ../src/mail/e-mail-reader.c:2880
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2870
+#: ../src/mail/e-mail-reader.c:2887
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../src/mail/e-mail-reader.c:2877
+#: ../src/mail/e-mail-reader.c:2894
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../src/mail/e-mail-reader.c:2884
+#: ../src/mail/e-mail-reader.c:2901
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../src/mail/e-mail-reader.c:2891
+#: ../src/mail/e-mail-reader.c:2908
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../src/mail/e-mail-reader.c:2898
+#: ../src/mail/e-mail-reader.c:2915
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:2905
+#: ../src/mail/e-mail-reader.c:2922
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../src/mail/e-mail-reader.c:2912
+#: ../src/mail/e-mail-reader.c:2929
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../src/mail/e-mail-reader.c:2919
+#: ../src/mail/e-mail-reader.c:2936
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../src/mail/e-mail-reader.c:2926
+#: ../src/mail/e-mail-reader.c:2943
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../src/mail/e-mail-reader.c:2936
+#: ../src/mail/e-mail-reader.c:2953
 #, fuzzy
 #| msgid "Create a Search Folder from Mailing _List..."
 msgid "Create a Search Folder from Mailing _List…"
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../src/mail/e-mail-reader.c:2938
+#: ../src/mail/e-mail-reader.c:2955
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../src/mail/e-mail-reader.c:2943
+#: ../src/mail/e-mail-reader.c:2960
 #, fuzzy
 #| msgid "Create a Search Folder from Recipien_ts..."
 msgid "Create a Search Folder from Recipien_ts…"
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../src/mail/e-mail-reader.c:2945
+#: ../src/mail/e-mail-reader.c:2962
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../src/mail/e-mail-reader.c:2950
+#: ../src/mail/e-mail-reader.c:2967
 #, fuzzy
 #| msgid "Create a Search Folder from Sen_der..."
 msgid "Create a Search Folder from Sen_der…"
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../src/mail/e-mail-reader.c:2952
+#: ../src/mail/e-mail-reader.c:2969
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../src/mail/e-mail-reader.c:2957
+#: ../src/mail/e-mail-reader.c:2974
 #, fuzzy
 #| msgid "Create a Search Folder from S_ubject..."
 msgid "Create a Search Folder from S_ubject…"
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../src/mail/e-mail-reader.c:2959
+#: ../src/mail/e-mail-reader.c:2976
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../src/mail/e-mail-reader.c:3006
+#: ../src/mail/e-mail-reader.c:3023
 #, fuzzy
 #| msgid "Mark for Follo_w Up..."
 msgid "Mark for Follo_w Up…"
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../src/mail/e-mail-reader.c:3022
+#: ../src/mail/e-mail-reader.c:3039
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../src/mail/e-mail-reader.c:3026
+#: ../src/mail/e-mail-reader.c:3043
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:3030
+#: ../src/mail/e-mail-reader.c:3047
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:3034
+#: ../src/mail/e-mail-reader.c:3051
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../src/mail/e-mail-reader.c:3046
+#: ../src/mail/e-mail-reader.c:3063
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../src/mail/e-mail-reader.c:3050
+#: ../src/mail/e-mail-reader.c:3067
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../src/mail/e-mail-reader.c:3098
+#: ../src/mail/e-mail-reader.c:3119
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../src/mail/e-mail-reader.c:3100
+#: ../src/mail/e-mail-reader.c:3121
 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:3106
+#: ../src/mail/e-mail-reader.c:3127
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../src/mail/e-mail-reader.c:3108
+#: ../src/mail/e-mail-reader.c:3129
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../src/mail/e-mail-reader.c:3692
+#: ../src/mail/e-mail-reader.c:3713
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../src/mail/e-mail-reader.c:5062
+#: ../src/mail/e-mail-reader.c:5083
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../src/mail/e-mail-reader.c:5063
+#: ../src/mail/e-mail-reader.c:5084
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
@@ -18608,29 +18815,29 @@ 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:5082
+#: ../src/mail/e-mail-reader.c:5103
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:5083
+#: ../src/mail/e-mail-reader.c:5104
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:5149 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5170 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/mail/e-mail-reader.c:5161
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../src/mail/e-mail-reader.c:5182
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../src/mail/e-mail-reader.c:5165
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
+#: ../src/mail/e-mail-reader.c:5186
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../src/mail/e-mail-reader.c:5174 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5195 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Vastaa"
 
@@ -18689,7 +18896,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa sen?"
 
-#: ../src/mail/e-mail-reader-utils.c:3023
+#: ../src/mail/e-mail-reader-utils.c:2989
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -18700,13 +18907,13 @@ msgstr[1] "Tallenna viestit"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../src/mail/e-mail-reader-utils.c:3044
+#: ../src/mail/e-mail-reader-utils.c:3010
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../src/mail/e-mail-reader-utils.c:3458
+#: ../src/mail/e-mail-reader-utils.c:3424
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
@@ -18741,7 +18948,7 @@ msgstr ""
 "Voit ladata etäsisällön itse, tai asettaa etäsisällön latautumisen automaattiseksi "
 "tämän lähettäjän tai sivustoston perusteella."
 
-#: ../src/mail/e-mail-request.c:288
+#: ../src/mail/e-mail-request.c:289
 msgid "The message has no text content."
 msgstr "Viestissä ei ole tekstisisältöä."
 
@@ -18757,12 +18964,12 @@ msgstr "_Tyhjennä"
 msgid "No Title"
 msgstr "Ei otsikkoa"
 
-#: ../src/mail/e-mail-ui-session.c:820
+#: ../src/mail/e-mail-ui-session.c:841
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s-tunnistautuminen epäonnistui"
 
-#: ../src/mail/e-mail-ui-session.c:870
+#: ../src/mail/e-mail-ui-session.c:891
 #, c-format
 msgid "No data source found for UID “%s”"
 msgstr ""
@@ -18796,7 +19003,7 @@ msgstr[1] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../src/mail/em-composer-utils.c:829
+#: ../src/mail/em-composer-utils.c:830
 msgid "Waiting for attachments to load…"
 msgstr "Odotetaan liitteiden latautumista…"
 
@@ -18804,7 +19011,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:2032
+#: ../src/mail/em-composer-utils.c:2005
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -18812,84 +19019,84 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../src/mail/em-composer-utils.c:2038
+#: ../src/mail/em-composer-utils.c:2011
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../src/mail/em-composer-utils.c:2043
+#: ../src/mail/em-composer-utils.c:2016
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
 #. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
-#: ../src/mail/em-composer-utils.c:2804
+#: ../src/mail/em-composer-utils.c:2777
 #, fuzzy, c-format
 #| msgid "URL: %s"
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "URL: %s"
 
-#: ../src/mail/em-composer-utils.c:3422
+#: ../src/mail/em-composer-utils.c:3395
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
-#: ../src/mail/em-composer-utils.c:4048
+#: ../src/mail/em-composer-utils.c:4029
 msgid "Alternative Reply"
-msgstr ""
+msgstr "Vaihtoehtoinen vastaus"
 
-#: ../src/mail/em-composer-utils.c:4051
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../src/mail/em-composer-utils.c:4032
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1543
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../src/mail/em-composer-utils.c:4064
+#: ../src/mail/em-composer-utils.c:4045
 msgid "Recipients:"
 msgstr "Vastaanottajat:"
 
-#: ../src/mail/em-composer-utils.c:4092
+#: ../src/mail/em-composer-utils.c:4073
 msgid "Reply to _Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../src/mail/em-composer-utils.c:4114
+#: ../src/mail/em-composer-utils.c:4095
 msgid "Reply style:"
 msgstr "Vastaustyyli:"
 
-#: ../src/mail/em-composer-utils.c:4122
+#: ../src/mail/em-composer-utils.c:4103
 msgid "_Default"
 msgstr "Oletu_s"
 
-#: ../src/mail/em-composer-utils.c:4126
+#: ../src/mail/em-composer-utils.c:4107
 msgid "Attach_ment"
 msgstr "Liit_e"
 
-#: ../src/mail/em-composer-utils.c:4130
+#: ../src/mail/em-composer-utils.c:4111
 msgid "Inline (_Outlook style)"
 msgstr "Sisennetty (_Outlookin tapaan)"
 
-#: ../src/mail/em-composer-utils.c:4134
+#: ../src/mail/em-composer-utils.c:4115
 msgid "_Quote"
 msgstr "_Lainaa"
 
-#: ../src/mail/em-composer-utils.c:4138
+#: ../src/mail/em-composer-utils.c:4119
 msgid "Do _Not Quote"
 msgstr "_Älä lainaa"
 
-#: ../src/mail/em-composer-utils.c:4145
+#: ../src/mail/em-composer-utils.c:4126
 msgid "_Format message in HTML"
 msgstr "Muotoile viesti _HTML:nä"
 
-#: ../src/mail/em-composer-utils.c:4158
+#: ../src/mail/em-composer-utils.c:4139
 #, fuzzy
 #| msgid "_Template:"
 msgid "Apply t_emplate"
 msgstr "_Malli:"
 
-#: ../src/mail/em-composer-utils.c:4170
+#: ../src/mail/em-composer-utils.c:4151
 #, fuzzy
 #| msgid "Original message"
 msgid "Preserve original message S_ubject"
 msgstr "Alkuperäinen viesti"
 
-#: ../src/mail/em-composer-utils.c:4236
+#: ../src/mail/em-composer-utils.c:4217
 #, fuzzy, c-format
 #| msgid "Sender or Recipients"
 msgid "one recipient"
@@ -18898,11 +19105,11 @@ msgstr[0] "Lähettäjä tai vastaanottajat"
 msgstr[1] "Lähettäjä tai vastaanottajat"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4669
+#: ../src/mail/em-composer-utils.c:4658
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../src/mail/em-composer-utils.c:4674
+#: ../src/mail/em-composer-utils.c:4663
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
@@ -18916,7 +19123,7 @@ msgstr "Suodattimien kuvaus"
 #: ../src/mail/em-filter-editor.c:167
 #, c-format
 msgid "%s (%s, for account %s)"
-msgstr ""
+msgstr "%s (%s, tilille %s)"
 
 #: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
 msgid "enabled"
@@ -18931,7 +19138,7 @@ msgstr "ei käytössä"
 #: ../src/mail/em-filter-editor.c:171
 #, c-format
 msgid "%s (%s, for any account)"
-msgstr ""
+msgstr "%s (%s, mille tahansa tilille)"
 
 #: ../src/mail/em-filter-editor.c:183
 #, fuzzy
@@ -18946,7 +19153,7 @@ msgid "If any of the following conditions are met"
 msgstr "mitä tahansa seuraavista ehdoista"
 
 #. and now for the action area
-#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1067
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1006
 msgid "Then"
 msgstr "sitten"
 
@@ -18954,27 +19161,27 @@ msgstr "sitten"
 msgid "De_scribe Filters…"
 msgstr "_Kuvaile suodattimet…"
 
-#: ../src/mail/em-filter-editor-folder-element.c:154
+#: ../src/mail/em-filter-editor-folder-element.c:151
 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:940
+#: ../src/mail/em-filter-rule.c:879
 #, fuzzy
 #| msgid "A_ngry"
 msgctxt "mail-filter-rule"
 msgid "Any"
 msgstr "_Vihainen"
 
-#: ../src/mail/em-filter-rule.c:1037
+#: ../src/mail/em-filter-rule.c:976
 msgid "Rul_e type:"
 msgstr "Säänn_ön tyyppi:"
 
-#: ../src/mail/em-filter-rule.c:1055
+#: ../src/mail/em-filter-rule.c:994
 msgid "_For Account:"
 msgstr "_Tili:"
 
-#: ../src/mail/em-filter-rule.c:1140
+#: ../src/mail/em-filter-rule.c:1079
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
@@ -18983,7 +19190,6 @@ msgid "Select Custom Icon"
 msgstr "Valitse omavalintainen kuvake"
 
 #: ../src/mail/em-folder-properties.c:219
-#| msgid "Use custom fonts"
 msgid "_Use custom icon"
 msgstr "_Käytä omavalintaista kuivaketta"
 
@@ -18993,40 +19199,44 @@ msgstr "_Käytä omavalintaista kuivaketta"
 msgid "Use te_xt color"
 msgstr "Poista värin asetus"
 
-#: ../src/mail/em-folder-properties.c:494
+#: ../src/mail/em-folder-properties.c:517
+msgid "Path:"
+msgstr "Polku:"
+
+#: ../src/mail/em-folder-properties.c:526
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lukemattomia viestejä:"
 msgstr[1] "Lukemattomia viestejä:"
 
-#: ../src/mail/em-folder-properties.c:505
+#: ../src/mail/em-folder-properties.c:537
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Viestejä kaikkiaan:"
 msgstr[1] "Viestejä kaikkiaan:"
 
-#: ../src/mail/em-folder-properties.c:526
+#: ../src/mail/em-folder-properties.c:558
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Levytilan käyttö (%s):"
 
-#: ../src/mail/em-folder-properties.c:528
+#: ../src/mail/em-folder-properties.c:560
 #, c-format
 msgid "Quota usage"
 msgstr "Levytilan käyttö"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:701
 msgid "_Send Account Override:"
 msgstr "_Lähetystilin ohitus:"
 
-#: ../src/mail/em-folder-properties.c:912
+#: ../src/mail/em-folder-properties.c:941
 msgid "Archive this folder using these settings:"
 msgstr "Arkistoi tämä kansio käyttäen seuraavia asetuksia:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:924
+#: ../src/mail/em-folder-properties.c:953
 #, fuzzy
 #| msgctxt "autoarchive"
 #| msgid "_Cleanup messages older than"
@@ -19035,83 +19245,83 @@ msgid "Auto-_cleanup messages older than"
 msgstr "_Siivoa vanhemmat viestit kuin"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:937
+#: ../src/mail/em-folder-properties.c:966
 msgctxt "autoarchive"
 msgid "days"
 msgstr "päivää"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:939
+#: ../src/mail/em-folder-properties.c:968
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "viikkoa"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:941
+#: ../src/mail/em-folder-properties.c:970
 msgctxt "autoarchive"
 msgid "months"
 msgstr "kuukautta"
 
-#: ../src/mail/em-folder-properties.c:947
+#: ../src/mail/em-folder-properties.c:976
 #, fuzzy
 #| msgid "Move old messages to the default archive _folder"
 msgid "Move messages to the default archive _folder"
 msgstr "Siirrä valitut viestit _oletusarkistokansioon"
 
-#: ../src/mail/em-folder-properties.c:954
+#: ../src/mail/em-folder-properties.c:983
 #, fuzzy
 #| msgid "_Move old messages to:"
 msgid "_Move messages to:"
 msgstr "Siirrä va_nhat viestit kansioon:"
 
-#: ../src/mail/em-folder-properties.c:958
+#: ../src/mail/em-folder-properties.c:987
 #, fuzzy
 #| msgid "AutoArchive folder"
 msgid "Archive folder"
 msgstr "Automaattisen arkistoinnin kansio"
 
-#: ../src/mail/em-folder-properties.c:958
+#: ../src/mail/em-folder-properties.c:987
 #, fuzzy
 #| msgid "Select folder to import into"
 msgid "Select folder to use for Archive"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../src/mail/em-folder-properties.c:962
+#: ../src/mail/em-folder-properties.c:991
 msgid "_Delete messages"
 msgstr "Poista _viestit"
 
-#: ../src/mail/em-folder-properties.c:1317
+#: ../src/mail/em-folder-properties.c:1346
 #, fuzzy
 #| msgid "Server Type:"
 msgid "Server Tag"
 msgstr "Palvelintyyppi:"
 
-#: ../src/mail/em-folder-properties.c:1321 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1350 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Merkintä"
 
-#: ../src/mail/em-folder-properties.c:1370
+#: ../src/mail/em-folder-properties.c:1399
 msgid "Appearance"
 msgstr "Ulkoasu"
 
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1374
+#: ../src/mail/em-folder-properties.c:1403
 #, fuzzy
 #| msgid "_Archive..."
 msgid "Archive"
 msgstr "_Arkistoi..."
 
-#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:126
+#: ../src/mail/em-folder-properties.c:1406 ../src/mail/mail-config.ui.h:126
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Merkinnät"
 
-#: ../src/mail/em-folder-properties.c:1455
+#: ../src/mail/em-folder-properties.c:1484
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../src/mail/em-folder-properties.c:1694
+#: ../src/mail/em-folder-properties.c:1723
 msgid "Gathering folder properties"
 msgstr "Kerätään kansion ominaisuuksia"
 
@@ -19123,7 +19333,7 @@ msgstr "<Valitse kansio tästä>"
 msgid "Create a new folder"
 msgstr "Luo uusi kansio"
 
-#: ../src/mail/em-folder-tree.c:684
+#: ../src/mail/em-folder-tree.c:685
 msgid "Folder names cannot contain “/”"
 msgstr "Kansion nimi ei voi sisältää merkkiä “/”"
 
@@ -19145,37 +19355,37 @@ msgstr "Kansion nimi ei voi sisältää merkkiä “/”"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:878
+#: ../src/mail/em-folder-tree.c:887
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1740
+#: ../src/mail/em-folder-tree.c:1822
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../src/mail/em-folder-tree.c:2289
+#: ../src/mail/em-folder-tree.c:2371
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2292
+#: ../src/mail/em-folder-tree.c:2374
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2299 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2381 ../src/mail/message-list.c:2632
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../src/mail/em-folder-tree.c:2303 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2385 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../src/mail/em-folder-tree.c:2322
+#: ../src/mail/em-folder-tree.c:2404
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
@@ -19185,6 +19395,16 @@ msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
+#: ../src/mail/em-folder-tree-model.c:1534 ../src/mail/importers/kmail-libs.c:149
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+msgid "Trash"
+msgstr "Roskakori"
+
+#: ../src/mail/em-folder-tree-model.c:1535 ../src/mail/filtertypes.xml.in.h:41
+#: ../src/mail/mail-config.ui.h:142 ../src/mail/vfoldertypes.xml.in.h:44
+msgid "Junk"
+msgstr "Roskaposti"
+
 #: ../src/mail/em-folder-utils.c:111
 #, c-format
 msgid "Moving folder “%s”"
@@ -19225,9 +19445,9 @@ msgstr "_Tilaa näytetyt"
 msgid "Subscribe To _All"
 msgstr "Tilaa kaikk_i"
 
-#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1890
+#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1883
 #: ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1700
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
@@ -19241,9 +19461,9 @@ msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
 #: ../src/mail/em-subscription-editor.c:1315
-#: ../src/modules/mail/e-mail-shell-view-private.c:912
-#: ../src/modules/mail/e-mail-shell-view-private.c:944
-#: ../src/modules/mail/e-mail-shell-view-private.c:988
+#: ../src/modules/mail/e-mail-shell-view-private.c:925
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -19251,67 +19471,67 @@ msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
 #: ../src/mail/em-subscription-editor.c:1319
-#: ../src/modules/mail/e-mail-shell-view-private.c:998
+#: ../src/modules/mail/e-mail-shell-view-private.c:1011
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../src/mail/em-subscription-editor.c:1731
+#: ../src/mail/em-subscription-editor.c:1724
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1766
+#: ../src/mail/em-subscription-editor.c:1759
 msgid "_Account:"
 msgstr "_Tili:"
 
-#: ../src/mail/em-subscription-editor.c:1779
+#: ../src/mail/em-subscription-editor.c:1772
 msgid "Clear Search"
 msgstr "Tyhjennä haku"
 
-#: ../src/mail/em-subscription-editor.c:1796
+#: ../src/mail/em-subscription-editor.c:1789
 msgid "Sho_w items that contain:"
 msgstr "_Näytä kohteet, jotka sisältävät:"
 
-#: ../src/mail/em-subscription-editor.c:1843
+#: ../src/mail/em-subscription-editor.c:1836
 msgid "Subscribe to the selected folder"
 msgstr "Tilaa valittu kansio"
 
-#: ../src/mail/em-subscription-editor.c:1844
+#: ../src/mail/em-subscription-editor.c:1837
 msgid "Su_bscribe"
 msgstr "Tila_a"
 
-#: ../src/mail/em-subscription-editor.c:1889
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
+#: ../src/mail/em-subscription-editor.c:1882
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
-#: ../src/mail/em-subscription-editor.c:1929
+#: ../src/mail/em-subscription-editor.c:1922
 msgid "Collapse all folders"
 msgstr "Pienennä kaikki kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1930
+#: ../src/mail/em-subscription-editor.c:1923
 msgid "C_ollapse All"
 msgstr "Pienennä kaikki"
 
-#: ../src/mail/em-subscription-editor.c:1940
+#: ../src/mail/em-subscription-editor.c:1933
 msgid "Expand all folders"
 msgstr "Laajenna kaikki kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1941
+#: ../src/mail/em-subscription-editor.c:1934
 msgid "E_xpand All"
 msgstr "_Laajenna kaikki"
 
-#: ../src/mail/em-subscription-editor.c:1951
+#: ../src/mail/em-subscription-editor.c:1944
 msgid "Refresh the folder list"
 msgstr "Päivitä kansioluettelo"
 
-#: ../src/mail/em-subscription-editor.c:1963
+#: ../src/mail/em-subscription-editor.c:1956
 msgid "Stop the current operation"
 msgstr "Keskeytä nykyinen operaatio"
 
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1957
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_Pysäytä"
@@ -19331,13 +19551,13 @@ msgstr[1] "Haluatko varmasti avata %d viestiä kerralla?"
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../src/mail/em-utils.c:1014
+#: ../src/mail/em-utils.c:1022
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
 #. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 
'reply-attribution' translation context should translate into the same string.
-#: ../src/mail/em-utils.c:1575
+#: ../src/mail/em-utils.c:1583
 #, fuzzy
 #| msgid "Redo"
 msgctxt "reply-attribution"
@@ -19345,12 +19565,12 @@ msgid "Re"
 msgstr "Tee uudelleen"
 
 #. Translators: This is a reply attribution separator in the message reply subject. This should match the 
':' in 'Re: %s' in the 'reply-attribution' translation context.
-#: ../src/mail/em-utils.c:1578
+#: ../src/mail/em-utils.c:1586
 msgctxt "reply-attribution"
 msgid ":"
 msgstr ":"
 
-#: ../src/mail/em-utils.c:1878
+#: ../src/mail/em-utils.c:1886
 msgid "Deleting old messages"
 msgstr "Poistetaan vanhoja viestejä"
 
@@ -19358,35 +19578,35 @@ msgstr "Poistetaan vanhoja viestejä"
 msgid "Search _Folders"
 msgstr "_Hakukansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:404
+#: ../src/mail/em-vfolder-editor-rule.c:401
 msgid "Add Folder"
 msgstr "Lisää kansio"
 
-#: ../src/mail/em-vfolder-editor-rule.c:533
+#: ../src/mail/em-vfolder-editor-rule.c:530
 msgid "Search Folder Sources"
 msgstr "Hakukansioiden lähteet"
 
-#: ../src/mail/em-vfolder-editor-rule.c:565
+#: ../src/mail/em-vfolder-editor-rule.c:562
 msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../src/mail/em-vfolder-editor-rule.c:577
+#: ../src/mail/em-vfolder-editor-rule.c:574
 msgid "All local folders"
 msgstr "Kaikki paikalliset kansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:578
+#: ../src/mail/em-vfolder-editor-rule.c:575
 msgid "All active remote folders"
 msgstr "Kaikki aktiiviset etäkansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:579
+#: ../src/mail/em-vfolder-editor-rule.c:576
 msgid "All local and active remote folders"
 msgstr "Kaikki paikalliset kansiot ja aktiiviset etäkansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:580
+#: ../src/mail/em-vfolder-editor-rule.c:577
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:618
+#: ../src/mail/em-vfolder-editor-rule.c:615
 msgid "include subfolders"
 msgstr "sisällytä alikansiot"
 
@@ -19475,11 +19695,6 @@ msgstr "ei ole olemassa"
 msgid "Message Body"
 msgstr "Viestin runko"
 
-#: ../src/mail/filtertypes.xml.in.h:23 ../src/mail/searchtypes.xml.in.h:25
-#: ../src/mail/vfoldertypes.xml.in.h:25
-msgid "Expression"
-msgstr "Lauseke"
-
 #: ../src/mail/filtertypes.xml.in.h:24 ../src/mail/searchtypes.xml.in.h:26
 #: ../src/mail/vfoldertypes.xml.in.h:26
 #, fuzzy
@@ -19543,11 +19758,6 @@ msgstr "Tärkeä"
 msgid "Read"
 msgstr "Luettu"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:142
-#: ../src/mail/vfoldertypes.xml.in.h:44
-msgid "Junk"
-msgstr "Roskaposti"
-
 #: ../src/mail/filtertypes.xml.in.h:42 ../src/mail/searchtypes.xml.in.h:44
 #: ../src/mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
@@ -19699,20 +19909,20 @@ msgid "Import mail from Elm."
 msgstr "Tuodaan sähköpostit Elmistä."
 
 #: ../src/mail/importers/evolution-mbox-importer.c:135
-#: ../src/mail/importers/kmail-importer.c:208
+#: ../src/mail/importers/kmail-importer.c:206
 #: ../src/plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "_Kohdekansio:"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:141
-#: ../src/mail/importers/kmail-importer.c:214
+#: ../src/mail/importers/kmail-importer.c:212
 #: ../src/plugins/dbx-import/dbx-importer.c:248
 #: ../src/plugins/pst-import/pst-importer.c:537
 msgid "Select folder"
 msgstr "Valitse kansio"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:142
-#: ../src/mail/importers/kmail-importer.c:215
+#: ../src/mail/importers/kmail-importer.c:213
 #: ../src/plugins/dbx-import/dbx-importer.c:249
 #: ../src/plugins/pst-import/pst-importer.c:538
 msgid "Select folder to import into"
@@ -19739,26 +19949,21 @@ msgstr "Berkeley Mailbox (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
-#: ../src/mail/importers/kmail-importer.c:261
+#: ../src/mail/importers/kmail-importer.c:259
 #, c-format
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] "%d osoite"
 msgstr[1] "%d osoitetta"
 
-#: ../src/mail/importers/kmail-importer.c:352
+#: ../src/mail/importers/kmail-importer.c:350
 msgid "Evolution KMail importer"
 msgstr "Evolution KMail-tuoja"
 
-#: ../src/mail/importers/kmail-importer.c:353
+#: ../src/mail/importers/kmail-importer.c:351
 msgid "Import mail and contacts from KMail."
 msgstr "Tuo sähköpostit ja yhteystiedot KMailista."
 
-#: ../src/mail/importers/kmail-libs.c:149
-#: ../src/modules/mail/e-mail-shell-view-private.c:1019
-msgid "Trash"
-msgstr "Roskakori"
-
 #: ../src/mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
@@ -20052,7 +20257,7 @@ msgid "Use for Recipients"
 msgstr "Käytä vastaanottajille"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:876
+#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:873
 msgid "Account"
 msgstr "Tili"
 
@@ -20589,7 +20794,7 @@ msgid ""
 msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -21406,53 +21611,53 @@ msgstr "Muokkaa hakunäkymää"
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../src/mail/message-list.c:312
+#: ../src/mail/message-list.c:316
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../src/mail/message-list.c:313
+#: ../src/mail/message-list.c:317
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../src/mail/message-list.c:314
+#: ../src/mail/message-list.c:318
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../src/mail/message-list.c:315
+#: ../src/mail/message-list.c:319
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../src/mail/message-list.c:316
+#: ../src/mail/message-list.c:320
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../src/mail/message-list.c:317
+#: ../src/mail/message-list.c:321
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:334
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../src/mail/message-list.c:331
+#: ../src/mail/message-list.c:335
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../src/mail/message-list.c:335
+#: ../src/mail/message-list.c:339
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../src/mail/message-list.c:336
+#: ../src/mail/message-list.c:340
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../src/mail/message-list.c:485
+#: ../src/mail/message-list.c:489
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2154 ../src/modules/itip-formatter/itip-view.c:273
+#: ../src/mail/message-list.c:2154 ../src/modules/itip-formatter/itip-view.c:274
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
@@ -21472,37 +21677,35 @@ msgstr "%b %d %l.%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/mail/message-list.c:3361
+#: ../src/mail/message-list.c:3364
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../src/mail/message-list.c:4135 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4168 ../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:5704
+#: ../src/mail/message-list.c:5749
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../src/mail/message-list.c:6791
+#: ../src/mail/message-list.c:6498 ../src/mail/message-list.c:6935
+msgid "Generating message list…"
+msgstr "Luodaan viestiluetteloa…"
+
+#: ../src/mail/message-list.c:6501
 msgid ""
 "No message satisfies your search criteria. Change search criteria by selecting a "
 "new Show message filter from the drop down list above or by running a new search "
 "either by clearing it with Search→Clear menu item or by changing the query above."
 msgstr ""
 
-#: ../src/mail/message-list.c:6799
+#: ../src/mail/message-list.c:6508
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
-#: ../src/mail/message-list.c:6875
-#, fuzzy
-#| msgid "Generating message list"
-msgid "Generating message list…"
-msgstr "Luodaan viestiluetteloa"
-
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Merkitty"
@@ -21560,32 +21763,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:2111
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
 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:2090
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
@@ -21644,15 +21847,15 @@ msgstr "Tehtävälistan ominaisuudet"
 
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:80
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:229
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:192
 msgid "_Back"
 msgstr "_Takaisin"
 
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:213
 msgid "_Browse"
 msgstr "_Selaa"
 
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:197
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:215
 msgid ""
 "Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete address "
 "books, calendars, memo lists or task lists there"
@@ -21796,7 +21999,7 @@ msgid "Show properties of the selected address book"
 msgstr "Näytä valitun osoitekirjan ominaisuudet"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:626
 #: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Re_fresh"
@@ -21822,10 +22025,10 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:640
 #: ../src/modules/calendar/e-task-shell-view-actions.c:766
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1679
 msgid "_Rename…"
 msgstr "_Nimeä uudelleen…"
 
@@ -21898,7 +22101,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Lähetä viesti valituille henkilöille"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1580
 #: ../src/modules/calendar/e-task-shell-view-actions.c:831
 msgid "_Actions"
 msgstr "T_oiminnot"
@@ -21906,12 +22109,12 @@ msgstr "T_oiminnot"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:684
 #: ../src/modules/calendar/e-task-shell-view-actions.c:838
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
 msgid "_Preview"
 msgstr "_Esikatselu"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:701
 #: ../src/modules/calendar/e-task-shell-view-actions.c:855
 msgid "_Manage groups…"
@@ -21940,7 +22143,7 @@ msgstr "Näytä kartat yhteystiedon esikatseluikkunassa"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:766
 #: ../src/modules/calendar/e-task-shell-view-actions.c:932
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1986
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
@@ -21951,7 +22154,7 @@ msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:773
 #: ../src/modules/calendar/e-task-shell-view-actions.c:939
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1993
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
@@ -21960,17 +22163,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1773
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:790
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1005
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1012
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1783
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:800
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Oma haku"
@@ -22025,7 +22228,7 @@ msgstr "Lähetä _viesti listalle"
 msgid "_Send Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../src/modules/alarm-notify/alarm-notify.c:171
+#: ../src/modules/alarm-notify/alarm-notify.c:163
 #, c-format
 msgid "Failed to launch command “%s”:"
 msgstr "Ei voitu suorittaa komentoa “%s”:"
@@ -22093,106 +22296,106 @@ msgstr "Palauta _Evolutionin tiedot…"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Palauta Evolutionin tietoja ja asetuksia arkistotiedostosta"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:73
+#: ../src/modules/backup-restore/evolution-backup-tool.c:72
 msgid "Back up Evolution directory"
 msgstr "Varmuuskopioi Evolutionin hakemisto"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:75
+#: ../src/modules/backup-restore/evolution-backup-tool.c:74
 msgid "Restore Evolution directory"
 msgstr "Palauta Evolutionin hakemisto"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:77
+#: ../src/modules/backup-restore/evolution-backup-tool.c:76
 msgid "Check Evolution Back up"
 msgstr "Tarkista Evolutionin varmuuskopio"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:79
+#: ../src/modules/backup-restore/evolution-backup-tool.c:78
 msgid "Restart Evolution"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:81
+#: ../src/modules/backup-restore/evolution-backup-tool.c:80
 msgid "With Graphical User Interface"
 msgstr "Graafisen käyttöliittymän kanssa"
 
 #. FIXME Will the versioned setting always work?
-#: ../src/modules/backup-restore/evolution-backup-tool.c:294
-#: ../src/modules/backup-restore/evolution-backup-tool.c:498
+#: ../src/modules/backup-restore/evolution-backup-tool.c:293
+#: ../src/modules/backup-restore/evolution-backup-tool.c:551
 msgid "Shutting down Evolution"
 msgstr "Sammutetaan Evolutionia"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:303
+#: ../src/modules/backup-restore/evolution-backup-tool.c:302
 msgid "Backing Evolution accounts and settings"
 msgstr "Varmuuskopioidaan Evolutionin tilejä ja asetuksia"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:320
+#: ../src/modules/backup-restore/evolution-backup-tool.c:319
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varmuuskopioidaan Evolutionin tietoja (viestejä, yhteystietoja, kalentereita, "
 "tehtäviä ja muistioita)"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:336
+#: ../src/modules/backup-restore/evolution-backup-tool.c:335
 msgid "Back up complete"
 msgstr "Varmuuskopiointi valmistui"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:343
-#: ../src/modules/backup-restore/evolution-backup-tool.c:705
+#: ../src/modules/backup-restore/evolution-backup-tool.c:342
+#: ../src/modules/backup-restore/evolution-backup-tool.c:758
 msgid "Restarting Evolution"
 msgstr "Käynnistetään Evolution uudestaan"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:504
+#: ../src/modules/backup-restore/evolution-backup-tool.c:557
 msgid "Back up current Evolution data"
 msgstr "Varmuuskopioi tämänhetkiset Evolutionin tiedot"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:511
+#: ../src/modules/backup-restore/evolution-backup-tool.c:564
 msgid "Extracting files from back up"
 msgstr "Puretaan tiedostoja varmuuskopiosta"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:606
+#: ../src/modules/backup-restore/evolution-backup-tool.c:659
 msgid "Loading Evolution settings"
 msgstr "Ladataan Evolutionin asetuksia"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:676
+#: ../src/modules/backup-restore/evolution-backup-tool.c:729
 msgid "Removing temporary back up files"
 msgstr "Poistetaan varmuuskopioinnin väliaikaistiedostoja"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:690
+#: ../src/modules/backup-restore/evolution-backup-tool.c:743
 msgid "Reloading registry service"
 msgstr "Ladataan uudelleen rekisteripalvelua"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:903
+#: ../src/modules/backup-restore/evolution-backup-tool.c:956
 msgid "Evolution Back Up"
 msgstr "Evolutionin varmuuskopiointi"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:904
+#: ../src/modules/backup-restore/evolution-backup-tool.c:957
 #, c-format
 msgid "Backing up to the file %s"
 msgstr "Varmuuskopioidaan tiedostoon %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:908
+#: ../src/modules/backup-restore/evolution-backup-tool.c:961
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:909
+#: ../src/modules/backup-restore/evolution-backup-tool.c:962
 #, c-format
 msgid "Restoring from the file %s"
 msgstr "Palautetaan tiedostosta %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:978
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1031
 msgid "Backing up Evolution Data"
 msgstr "Varmuuskopioidaan Evolutionin tietoja"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:979
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1032
 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:981
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1034
 msgid "Restoring Evolution Data"
 msgstr "Palautetaan Evolutionin tietoja"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:982
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1035
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Odota, että Evolution palauttaa tietosi."
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:1004
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1057
 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ä."
 
@@ -22280,161 +22483,163 @@ msgstr ""
 msgid "Choose an Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
-#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:302
-#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:323
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:268
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:281
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:312
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:333
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:144
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:165
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:301
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:322
+#: ../src/modules/itip-formatter/itip-view.c:1703
+#: ../src/modules/itip-formatter/itip-view.c:1817
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:292
 msgid "Find Address Books"
 msgstr "Etsi osoitekirjoja"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:303
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
-#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:401
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:356
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:452
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:230
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:400
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
 
 #: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
-#: ../src/modules/cal-config-google/e-cal-config-google.c:190
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1066
+#: ../src/modules/cal-config-google/e-cal-config-google.c:187
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:444
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:479
 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:418
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:415
 msgid "Looking up server search bases, please wait…"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:491
 msgid "Standard LDAP Port"
 msgstr "Standardi LDAP_portti"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:497
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP SSL/TLS:n yli (vanhennettu)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:503
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalog"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:509
 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:623
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
 msgid "Connecting to LDAP"
 msgstr "LDAP:iin yhdistäminen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:640
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:667
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:664
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:672
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:247
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:202
 msgid "Port number is not valid"
 msgstr "Portin numero ei ole kelvollinen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (suositeltu)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Encryption:"
 msgstr "Salaus:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:713
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:324
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:267
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:745
 msgid "Anonymous"
 msgstr "Anonyymisti"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:746
 msgid "Username can be left empty"
 msgstr "Käyttäjätunnus voi olla tyhjä"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:752
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:756
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:753
 msgid "requires anonymous access to your LDAP server"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:762
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:759
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:760
 msgid "for example: uid=user,dc=example,dc=com"
 msgstr "esimerkki: uid=user,dc=example,dc=com"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Method:"
 msgstr "Menetelmä:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:775
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid "This is the method Evolution will use to authenticate you."
 msgstr ""
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:784
 msgid "Using LDAP"
 msgstr "LDAP:in käyttäminen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:804
-#: ../src/modules/mail/e-mail-shell-view.c:118
-#: ../src/modules/mail/e-mail-shell-view.c:200
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:801
+#: ../src/modules/mail/e-mail-shell-view.c:119
+#: ../src/modules/mail/e-mail-shell-view.c:208
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:823
 msgid "Search Base:"
 msgstr "Hakupohja:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:827
 #, 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:852
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:849
 msgid "One Level"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:854
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:851
 msgid "Subtree"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:856
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:853
 msgid "Search Scope:"
 msgstr "Hakualue:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:861
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
 #, fuzzy
 #| msgid ""
 #| "The search scope defines how deep you would like the search to extend down the "
@@ -22451,27 +22656,27 @@ msgstr ""
 "Kattavuus \"Ali\" kattaa kaikki kentät hakupohjasi alla ja sen alipuissa, kun taas "
 "kattavuus \"Yksi\" kattaa kentät yhden tason hakupohjastasi alaspäin."
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:870
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:867
 msgid "Search Filter:"
 msgstr "Hakusuodatin:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:882
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:903
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:900
 msgid "Limit:"
 msgstr "Raja:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:914
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:911
 msgid "contacts"
 msgstr "yhteystietoa"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:919
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:916
 msgid "Browse until limit is reached"
 msgstr "Selaa kunnes raja tulee vastaan"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1054
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1051
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:425
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:461
 msgid "Server address cannot be empty"
@@ -22492,27 +22697,28 @@ msgstr "Valitse muistilappulista"
 msgid "Choose a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:348
 msgid "Find Calendars"
 msgstr "Etsi kalentereja"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
 #, fuzzy
 #| msgid "Memo List"
 msgid "Find Memo Lists"
 msgstr "Muistilappulista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:354
 #, fuzzy
 #| msgid "Task List"
 msgid "Find Task Lists"
 msgstr "Tehtävälista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:373
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:260
 msgid "Email:"
 msgstr "Sähköposti:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:379
 msgid "Server handles meeting invitations"
 msgstr "Palvelin hallitsee tapaamiskutsuja"
 
@@ -22520,11 +22726,11 @@ msgstr "Palvelin hallitsee tapaamiskutsuja"
 msgid "Choose which address books to use."
 msgstr "Valitse käytettävät osoitekirjat."
 
-#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:204
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:201
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Käytä syntymä- ja vuosipäiväkalenterissa"
 
-#: ../src/modules/cal-config-google/e-cal-config-google.c:101
+#: ../src/modules/cal-config-google/e-cal-config-google.c:98
 msgid "Enable Calendars to synchronize"
 msgstr ""
 
@@ -22532,23 +22738,23 @@ msgstr ""
 msgid "Default User Calendar"
 msgstr "Käyttäjän oletuskalenteri"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:177
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Käytä olemassa olevaa iCalendar (ics) -tiedostoa"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:202
 msgid "iCalendar File"
 msgstr "iCalendar-tiedosto"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Choose an iCalendar file"
 msgstr "Valitse iCalendar-tiedosto"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:217
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:232
 msgid "Allow Evolution to update the file"
 msgstr "Salli Evolutionin päivittää tiedosto"
 
@@ -22558,34 +22764,33 @@ msgstr "Salli Evolutionin päivittää tiedosto"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
-#| msgid "Default"
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:221
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:290
 msgid "Fahrenheit (°F)"
 msgstr "Fahrenheit (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:295
 msgid "Centigrade (°C)"
 msgstr "Celsius (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:299
 msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:301
 msgid "Units:"
 msgstr "Yksiköt:"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:322
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:357
 msgid "Location cannot be empty"
 msgstr "Sijainti ei voi olla tyhjä"
 
@@ -22595,7 +22800,7 @@ msgstr "Sijainti ei voi olla tyhjä"
 msgid "Choose Notes"
 msgstr "Näytä %s"
 
-#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:337
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:336
 #, fuzzy
 #| msgid "_Find Now"
 msgid "Find Notes"
@@ -22654,51 +22859,51 @@ msgstr "_Tuo tehtäviin"
 msgid "I_mport to Task List"
 msgstr "_Tuo tehtäviin"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, fuzzy, c-format
 #| msgid "Copying an event into the calendar %s"
 msgid "Copying an event into the calendar “%s”"
 msgstr "Kopioidaan tapahtumaa kalenteriin %s"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:580
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Moving an event into the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:585
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Copying a memo into the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:586
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Moving a memo into the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:591
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Copying a task into the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:592
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Moving a task into the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:707
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:713
 msgid "Memo List Selector"
 msgstr "Muistilappuluetteloiden valitsin"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:718
 msgid "Task List Selector"
 msgstr "Tehtävienluetteloiden valitsin"
 
@@ -22805,7 +23010,7 @@ msgid "_24 hour"
 msgstr "_24 tuntia"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1735
 msgid "Work Week"
 msgstr "Työviikko"
 
@@ -23048,7 +23253,7 @@ msgid "_Appointment"
 msgstr "_Tapaaminen"
 
 #: ../src/modules/calendar/e-cal-shell-backend.c:120
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
@@ -23076,7 +23281,7 @@ msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
 #: ../src/modules/calendar/e-cal-shell-backend.c:144
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -23102,7 +23307,7 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:968
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Making an occurrence movable"
@@ -23110,11 +23315,11 @@ msgstr "Muuta tämä kerta _siirrettäväksi"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1112
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1161
 msgid "event"
 msgstr "tapahtuma"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1163
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:510
@@ -23122,158 +23327,158 @@ msgstr "tapahtuma"
 msgid "Save as iCalendar"
 msgstr "Tallenna iCalendar-muodossa"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:591
 #: ../src/modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Copy…"
 msgstr "_Kopioi…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "D_elete Calendar"
 msgstr "_Poista kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1286
 msgid "Delete the selected calendar"
 msgstr "Poista valittu kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Go Back"
 msgstr "Siirry takaisin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Forward"
 msgstr "Siirry eteenpäin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Select today"
 msgstr "Valitse tämä päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "_Manage Calendar groups…"
 msgstr "_Hallitse kalenteriryhmiä…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Manage Calendar groups order and visibility"
 msgstr "Hallitse kalenteriryhmien järjestystä ja näkyvyyttä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
 #: ../src/modules/calendar/e-task-shell-view-actions.c:822
 msgid "Purg_e"
 msgstr "_Tyhjennä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
 #, fuzzy
 #| msgid "Refresh the selected calendar"
 msgid "Re_fresh list of account calendars"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Rename the selected calendar"
 msgstr "Nimeä valittu kalenteri uudestaan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Find _Next"
 msgstr "Etsi _seuraava"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Find next occurrence of the current search string"
 msgstr "Etsi hakuehdon seuraava esiintymä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Find _Previous"
 msgstr "Etsi _edellinen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "Find previous occurrence of the current search string"
 msgstr "Etsi hakuehdon edellinen esiintymä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Stop _Running Search"
 msgstr "Pysäytä _meneillään oleva haku"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Stop currently running search"
 msgstr "Pysäytä meneillään oleva haku"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Sho_w All Calendars"
 msgstr "Näytä _kaikki kalenterit"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Show _Only This Calendar"
 msgstr "Näytä _vain tämä kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Cop_y to Calendar…"
 msgstr "_Kopioi kalenteriin…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
 #, fuzzy
 #| msgid "_Delegate Meeting..."
 msgid "_Delegate Meeting…"
 msgstr "_Delegoi kokous..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "_Delete Appointment"
 msgstr "_Poista tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Delete selected appointments"
 msgstr "Poista valitut tapaamiset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Delete This _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Delete All Occ_urrences"
 msgstr "Poista kaikki _esiintymät"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Delete all occurrences"
 msgstr "Poista kaikki esiintymät"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Edit as Ne_w…"
 msgstr "_Muokkaa uutena…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "Edit the current appointment as new"
 msgstr "Muokkaa valittua tapaamista uutena"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "New All Day _Event…"
 msgstr "Uusi koko _päivän tapahtuma…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Create a new all day event"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:584
@@ -23281,134 +23486,209 @@ msgstr "Luo uusi koko päivän tapaaminen"
 msgid "_Forward as iCalendar…"
 msgstr "_Välitä iCalendar-muodossa…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Create a new meeting"
 msgstr "Luo uusi kokous"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+#, fuzzy
+#| msgid "_RSVP"
+msgid "Send _RSVP"
+msgstr "_RSVP"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
+#, fuzzy
+#| msgid "Sending message"
+msgid "Send a meeting response"
+msgstr "Lähetetään viestiä"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
+msgid "_Accept"
+msgstr "H_yväksy"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1475
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Accept meeting request"
+msgstr "Luo uusi kokouskutsu"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1480
+#, fuzzy
+#| msgid "Delete This _Occurrence"
+msgid "A_ccept this instance"
+msgstr "Poista tämä _tapahtumakerta"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+msgid "Accept meeting request for selected instance only"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../src/modules/itip-formatter/itip-view.c:1255
+msgid "_Decline"
+msgstr "_Hylkää"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1489
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Decline meeting request"
+msgstr "Luo uusi kokouskutsu"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1494
+#, fuzzy
+#| msgid "Delete This _Occurrence"
+msgid "D_ecline this instance"
+msgstr "Poista tämä _tapahtumakerta"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1496
+msgid "Decline meeting request for selected instance only"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1501
+#, fuzzy
+#| msgid "Tentatively Accepted"
+msgid "_Tentatively accept"
+msgstr "Alustavasti hyväksytty"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1503
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Tentatively accept meeting request"
+msgstr "Luo uusi kokouskutsu"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1508
+#, fuzzy
+#| msgid "Tentatively Accepted"
+msgid "Te_ntatively accept this instance"
+msgstr "Alustavasti hyväksytty"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1510
+msgid "Tentatively accept meeting request for selected instance only"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1515
 msgid "Mo_ve to Calendar…"
 msgstr "_Siirrä kalenteriin…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1529
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1536
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1538
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1557
 msgid "_Schedule Meeting…"
 msgstr "_Järjestä kokous…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "Converts an appointment to a meeting"
 msgstr "Muuntaa tapaamisen kokoukseksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1564
 msgid "Conv_ert to Appointment…"
 msgstr "_Muunna tapaamiseksi…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Converts a meeting to an appointment"
 msgstr "Muuntaa kokouksen tapaamiseksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1571
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1707
 msgid "Day"
 msgstr "Päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1714
 msgid "List"
 msgstr "Lista"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Show as list"
 msgstr "Näytä luettelona"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1721
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1728
 msgid "Week"
 msgstr "Viikko"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1737
 msgid "Show one work week"
 msgstr "Näytä yksi työviikko"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1745
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Next 7 Days’ Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1766
 msgid "Occurs Less Than 5 Times"
 msgstr "Ilmenee vähemmän kuin viisi kertaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1797
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:814
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1043
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1804
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:821
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1036
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1050
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1814
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1828
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:831
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:845
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1060
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1074
 msgid "Print…"
 msgstr "Tulosta…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1816
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1823
 msgid "Preview the calendar to be printed"
 msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1845
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:862
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1077
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1091
 msgid "_Save as iCalendar…"
 msgstr "_Tallenna iCalendar-muodossa…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1922
 msgid "Go To"
 msgstr "Siirry"
 
@@ -23452,29 +23732,29 @@ msgstr "_Avaa www-sivu"
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1019
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1038
 msgid "Searching next matching event"
 msgstr "Etsitään seuraavaa vastaavaa tapahtumaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1020
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1039
 msgid "Searching previous matching event"
 msgstr "Etsitään edellistä vastaavaa tapahtumaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1041
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1060
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 msgstr[1] "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1045
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1064
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Vastaavaa tapahtumaa ei löydy edellisen %d vuoden ajalta"
 msgstr[1] "Vastaavaa tapahtumaa ei löydy edellisen %d vuoden ajalta"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1068
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1087
 msgid "Cannot search with no active calendar"
 msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 
@@ -23533,7 +23813,7 @@ msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1062
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1076
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
@@ -23663,12 +23943,6 @@ msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../src/modules/calendar/e-memo-shell-view-private.c:365
-#: ../src/modules/calendar/e-task-shell-view-private.c:577
-#, c-format
-msgid "%d selected"
-msgstr ", %d valittu"
-
 #: ../src/modules/calendar/e-task-shell-backend.c:75
 msgctxt "New"
 msgid "_Task"
@@ -23811,34 +24085,58 @@ msgid "Uncompleted Tasks"
 msgstr "Valmistuneet tehtävät"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:984
+#, fuzzy
+#| msgid "Cancelled Tasks"
+msgid "Scheduled Tasks"
+msgstr "Perutut tehtävät"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:986
+#, fuzzy
+#| msgid "_Show Tasks without Due date"
+msgid "Show scheduled tasks, aka those with a Due date"
+msgstr "_Näytä tehtävät ilman eräpäivää"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Next 7 Days’ Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:991
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:998
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1005
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1019
+#, fuzzy
+#| msgid "Print Tasks"
+msgid "Started Tasks"
+msgstr "Tulosta tehtävät"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
+msgid ""
+"Filters for tasks that either do not have a start date or the start date is "
+"earlier than the time the filter is selected at"
+msgstr ""
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1062
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1069
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
 
-#: ../src/modules/calendar/e-task-shell-view.c:353
+#: ../src/modules/calendar/e-task-shell-view.c:368
 msgid "Delete Tasks"
 msgstr "Poista tehtäviä"
 
-#: ../src/modules/calendar/e-task-shell-view.c:355
+#: ../src/modules/calendar/e-task-shell-view.c:370
 msgid "Delete Task"
 msgstr "Poista tehtävä"
 
-#: ../src/modules/calendar/e-task-shell-view-private.c:573
+#: ../src/modules/calendar/e-task-shell-view-private.c:570
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -23934,521 +24232,521 @@ msgstr "CardDAV: %s"
 msgid "CalDAV and CardDAV server"
 msgstr "CalDAV- ja CardDAV-palvelin"
 
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:162
+msgid "Requires password to continue."
+msgstr "Jatkaminen vaatii salasanan."
+
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:213
 msgid "Look up for a CalDAV/CardDAV server"
 msgstr "Etsi CalDAV-/CardDAV-palvelinta"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:164
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:166
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
 msgid "Display part as an invitation"
 msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:264
+#: ../src/modules/itip-formatter/itip-view.c:265
 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:268
+#: ../src/modules/itip-formatter/itip-view.c:269
 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:277
+#: ../src/modules/itip-formatter/itip-view.c:278
 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:292
+#: ../src/modules/itip-formatter/itip-view.c:293
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:296
+#: ../src/modules/itip-formatter/itip-view.c:297
 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:301
+#: ../src/modules/itip-formatter/itip-view.c:302
 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:305
+#: ../src/modules/itip-formatter/itip-view.c:306
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:324
+#: ../src/modules/itip-formatter/itip-view.c:325
 #, 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:329
+#: ../src/modules/itip-formatter/itip-view.c:330
 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:333
+#: ../src/modules/itip-formatter/itip-view.c:334
 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:338
+#: ../src/modules/itip-formatter/itip-view.c:339
 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:342
+#: ../src/modules/itip-formatter/itip-view.c:343
 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:353
+#: ../src/modules/itip-formatter/itip-view.c:354
 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:359
+#: ../src/modules/itip-formatter/itip-view.c:360
 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:363
+#: ../src/modules/itip-formatter/itip-view.c:364
 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:368
+#: ../src/modules/itip-formatter/itip-view.c:369
 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:372
+#: ../src/modules/itip-formatter/itip-view.c:373
 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:380
+#: ../src/modules/itip-formatter/itip-view.c:381
 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:385
+#: ../src/modules/itip-formatter/itip-view.c:386
 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:389
+#: ../src/modules/itip-formatter/itip-view.c:390
 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:394
+#: ../src/modules/itip-formatter/itip-view.c:395
 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:398
+#: ../src/modules/itip-formatter/itip-view.c:399
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M.%S %p"
 
 #. Translators: The first '%s' is replaced with an abbreviated date/time of an appointment start or end, 
like "Tomorrow" or "Tomorrow 10:30";
 #. the second '%s' is replaced with the actual date, to know what the 'Tomorrow' means. What the date looks 
like depends on the user settings.
 #. Example: 'Tomorrow 10:30 (20.2.2020)'
-#: ../src/modules/itip-formatter/itip-view.c:425
+#: ../src/modules/itip-formatter/itip-view.c:426
 #, c-format
 msgctxt "cal-itip"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/modules/itip-formatter/itip-view.c:463
 #: ../src/modules/itip-formatter/itip-view.c:464
-#: ../src/modules/itip-formatter/itip-view.c:553
+#: ../src/modules/itip-formatter/itip-view.c:465
 #: ../src/modules/itip-formatter/itip-view.c:554
-#: ../src/modules/itip-formatter/itip-view.c:643
+#: ../src/modules/itip-formatter/itip-view.c:555
+#: ../src/modules/itip-formatter/itip-view.c:644
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
-#: ../src/modules/itip-formatter/itip-view.c:468
-#: ../src/modules/itip-formatter/itip-view.c:558
-#: ../src/modules/itip-formatter/itip-view.c:647
+#: ../src/modules/itip-formatter/itip-view.c:469
+#: ../src/modules/itip-formatter/itip-view.c:559
+#: ../src/modules/itip-formatter/itip-view.c:648
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vastaa henkilön %s puolesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:470
-#: ../src/modules/itip-formatter/itip-view.c:560
-#: ../src/modules/itip-formatter/itip-view.c:649
+#: ../src/modules/itip-formatter/itip-view.c:471
+#: ../src/modules/itip-formatter/itip-view.c:561
+#: ../src/modules/itip-formatter/itip-view.c:650
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Vastaanotettu henkilön %s puolesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:475
+#: ../src/modules/itip-formatter/itip-view.c:476
 #, 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:477
+#: ../src/modules/itip-formatter/itip-view.c:478
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot:"
 
-#: ../src/modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegoi seuraavan kokouksen sinulle:"
 
-#: ../src/modules/itip-formatter/itip-view.c:485
+#: ../src/modules/itip-formatter/itip-view.c:486
 #, 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:487
+#: ../src/modules/itip-formatter/itip-view.c:488
 #, 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:493
+#: ../src/modules/itip-formatter/itip-view.c:494
 #, 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:495
+#: ../src/modules/itip-formatter/itip-view.c:496
 #, 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:499
+#: ../src/modules/itip-formatter/itip-view.c:500
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr "%s %s kautta pyytää viimeisimpiä tietoja seuraavasta kokouksesta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:501
+#: ../src/modules/itip-formatter/itip-view.c:502
 #, 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:505
+#: ../src/modules/itip-formatter/itip-view.c:506
 #, 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:507
+#: ../src/modules/itip-formatter/itip-view.c:508
 #, 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:511
+#: ../src/modules/itip-formatter/itip-view.c:512
 #, 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:513
+#: ../src/modules/itip-formatter/itip-view.c:514
 #, 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:517
+#: ../src/modules/itip-formatter/itip-view.c:518
 #, 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:519
+#: ../src/modules/itip-formatter/itip-view.c:520
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ehdottaa seuraavia muutoksia kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:523
+#: ../src/modules/itip-formatter/itip-view.c:524
 #, 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:525
+#: ../src/modules/itip-formatter/itip-view.c:526
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s kieltäytyi seuraavista kokousmuutoksista:"
 
-#: ../src/modules/itip-formatter/itip-view.c:565
+#: ../src/modules/itip-formatter/itip-view.c:566
 #, 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:567
+#: ../src/modules/itip-formatter/itip-view.c:568
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s julkaisi seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, 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:575
+#: ../src/modules/itip-formatter/itip-view.c:576
 #, 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:577
+#: ../src/modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän:"
 
-#: ../src/modules/itip-formatter/itip-view.c:583
+#: ../src/modules/itip-formatter/itip-view.c:584
 #, 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:585
+#: ../src/modules/itip-formatter/itip-view.c:586
 #, 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:589
+#: ../src/modules/itip-formatter/itip-view.c:590
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following assigned "
 "task:"
 msgstr "%s %s kautta toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:591
+#: ../src/modules/itip-formatter/itip-view.c:592
 #, c-format
 msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:595
+#: ../src/modules/itip-formatter/itip-view.c:596
 #, 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:597
+#: ../src/modules/itip-formatter/itip-view.c:598
 #, 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:601
+#: ../src/modules/itip-formatter/itip-view.c:602
 #, 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:603
+#: ../src/modules/itip-formatter/itip-view.c:604
 #, 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:607
+#: ../src/modules/itip-formatter/itip-view.c:608
 #, 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:609
+#: ../src/modules/itip-formatter/itip-view.c:610
 #, 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:613
+#: ../src/modules/itip-formatter/itip-view.c:614
 #, 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:615
+#: ../src/modules/itip-formatter/itip-view.c:616
 #, 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:654
+#: ../src/modules/itip-formatter/itip-view.c:655
 #, 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:656
+#: ../src/modules/itip-formatter/itip-view.c:657
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s julkaisi seuraavan muistilapun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:661
+#: ../src/modules/itip-formatter/itip-view.c:662
 #, 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:663
+#: ../src/modules/itip-formatter/itip-view.c:664
 #, 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:667
+#: ../src/modules/itip-formatter/itip-view.c:668
 #, 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:669
+#: ../src/modules/itip-formatter/itip-view.c:670
 #, 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:1701
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1704
 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:1702
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1705
 msgid "End time:"
 msgstr "Loppumisaika:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1248
+#: ../src/modules/itip-formatter/itip-view.c:1249
 msgid "Ope_n Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:1251
+#: ../src/modules/itip-formatter/itip-view.c:1252
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1254
-msgid "_Decline"
-msgstr "_Hylkää"
-
-#: ../src/modules/itip-formatter/itip-view.c:1257
+#: ../src/modules/itip-formatter/itip-view.c:1258
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1260
+#: ../src/modules/itip-formatter/itip-view.c:1261
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1263
+#: ../src/modules/itip-formatter/itip-view.c:1264
 msgid "Acce_pt all"
 msgstr "_Hyväksy kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1266
+#: ../src/modules/itip-formatter/itip-view.c:1267
 msgid "Acce_pt"
 msgstr "H_yväksy"
 
-#: ../src/modules/itip-formatter/itip-view.c:1269
+#: ../src/modules/itip-formatter/itip-view.c:1270
 msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
-#: ../src/modules/itip-formatter/itip-view.c:1272
+#: ../src/modules/itip-formatter/itip-view.c:1273
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../src/modules/itip-formatter/itip-view.c:1275
-#: ../src/smime/gui/certificate-manager.c:1661
+#: ../src/modules/itip-formatter/itip-view.c:1276
+#: ../src/smime/gui/certificate-manager.c:1656
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../src/modules/itip-formatter/itip-view.c:1704
-#: ../src/modules/itip-formatter/itip-view.c:1752
-#: ../src/modules/itip-formatter/itip-view.c:1823
+#: ../src/modules/itip-formatter/itip-view.c:1707
+#: ../src/modules/itip-formatter/itip-view.c:1755
+#: ../src/modules/itip-formatter/itip-view.c:1829
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1740
+#: ../src/modules/itip-formatter/itip-view.c:1743
 msgid "Send reply to sender"
 msgstr "Vastaa lähettäjälle"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1755
+#: ../src/modules/itip-formatter/itip-view.c:1758
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1758
+#: ../src/modules/itip-formatter/itip-view.c:1761
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../src/modules/itip-formatter/itip-view.c:1759
+#: ../src/modules/itip-formatter/itip-view.c:1762
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../src/modules/itip-formatter/itip-view.c:1760
+#: ../src/modules/itip-formatter/itip-view.c:1763
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:1761
+#: ../src/modules/itip-formatter/itip-view.c:1764
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:1975
+#: ../src/modules/itip-formatter/itip-view.c:1981
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1978
+#: ../src/modules/itip-formatter/itip-view.c:1984
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2974
+#: ../src/modules/itip-formatter/itip-view.c:2991
 msgid "Sa_ve"
 msgstr "_Tallenna"
 
-#: ../src/modules/itip-formatter/itip-view.c:3535
-#: ../src/modules/itip-formatter/itip-view.c:5287
+#: ../src/modules/itip-formatter/itip-view.c:3518
+#: ../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:3745
+#: ../src/modules/itip-formatter/itip-view.c:3728
 #, c-format
 msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "Tapaaminen “%s” kalenterissa “%s” on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3752
+#: ../src/modules/itip-formatter/itip-view.c:3735
 #, fuzzy, c-format
 #| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgid "A task “%s” in the task list “%s” conflicts with this task"
 msgstr "Tapaaminen “%s” kalenterissa “%s” on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3759
+#: ../src/modules/itip-formatter/itip-view.c:3742
 #, fuzzy, c-format
 #| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
 msgstr "Tapaaminen “%s” kalenterissa “%s” on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3770
+#: ../src/modules/itip-formatter/itip-view.c:3753
 #, 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"
@@ -24459,7 +24757,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3779
+#: ../src/modules/itip-formatter/itip-view.c:3762
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "The task list “%s” contains a task which conflicts with this task"
@@ -24469,7 +24767,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3788
+#: ../src/modules/itip-formatter/itip-view.c:3771
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "The memo list “%s” contains a memo which conflicts with this memo"
@@ -24479,249 +24777,249 @@ msgstr[0] ""
 msgstr[1] ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3826
+#: ../src/modules/itip-formatter/itip-view.c:3809
 #, 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:3831
+#: ../src/modules/itip-formatter/itip-view.c:3814
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Found the task in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/itip-formatter/itip-view.c:3836
+#: ../src/modules/itip-formatter/itip-view.c:3819
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Found the memo in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/modules/itip-formatter/itip-view.c:3847
+#: ../src/modules/itip-formatter/itip-view.c:3830
 #, 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:3989
+#: ../src/modules/itip-formatter/itip-view.c:3972
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../src/modules/itip-formatter/itip-view.c:3997
+#: ../src/modules/itip-formatter/itip-view.c:3980
 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:4002
+#: ../src/modules/itip-formatter/itip-view.c:3985
 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:4007
+#: ../src/modules/itip-formatter/itip-view.c:3990
 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:4301
+#: ../src/modules/itip-formatter/itip-view.c:4303
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4305
+#: ../src/modules/itip-formatter/itip-view.c:4307
 #, fuzzy
 #| msgid "Searching for an existing version of this appointment"
 msgid "Searching for an existing version of this task"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4309
+#: ../src/modules/itip-formatter/itip-view.c:4311
 #, fuzzy
 #| msgid "Searching for an existing version of this appointment"
 msgid "Searching for an existing version of this memo"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4367
+#: ../src/modules/itip-formatter/itip-view.c:4369
 msgid "Opening the calendar. Please wait…"
 msgstr "Avataan kalenteria, odota hetki…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4783
+#: ../src/modules/itip-formatter/itip-view.c:4715
 #, 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:4791
+#: ../src/modules/itip-formatter/itip-view.c:4723
 #, fuzzy, c-format
 #| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to task list “%s”. %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4799
+#: ../src/modules/itip-formatter/itip-view.c:4731
 #, fuzzy, c-format
 #| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to memo list “%s”. %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4819
+#: ../src/modules/itip-formatter/itip-view.c:4751
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Lähetetty kalenteriin “%s” hyväksyttynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4824
+#: ../src/modules/itip-formatter/itip-view.c:4756
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as accepted"
 msgid "Sent to task list “%s” as accepted"
 msgstr "Lähetetty kalenteriin “%s” hyväksyttynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4829
+#: ../src/modules/itip-formatter/itip-view.c:4761
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as accepted"
 msgid "Sent to memo list “%s” as accepted"
 msgstr "Lähetetty kalenteriin “%s” hyväksyttynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4839
+#: ../src/modules/itip-formatter/itip-view.c:4771
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Lähetetty kalenteriin “%s”alustavana"
 
-#: ../src/modules/itip-formatter/itip-view.c:4844
+#: ../src/modules/itip-formatter/itip-view.c:4776
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as tentative"
 msgid "Sent to task list “%s” as tentative"
 msgstr "Lähetetty kalenteriin “%s”alustavana"
 
-#: ../src/modules/itip-formatter/itip-view.c:4849
+#: ../src/modules/itip-formatter/itip-view.c:4781
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as tentative"
 msgid "Sent to memo list “%s” as tentative"
 msgstr "Lähetetty kalenteriin “%s”alustavana"
 
-#: ../src/modules/itip-formatter/itip-view.c:4859
+#: ../src/modules/itip-formatter/itip-view.c:4791
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Lähetetty kalenteriin “%s” hylättynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4864
+#: ../src/modules/itip-formatter/itip-view.c:4796
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as declined"
 msgid "Sent to task list “%s” as declined"
 msgstr "Lähetetty kalenteriin “%s” hylättynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4869
+#: ../src/modules/itip-formatter/itip-view.c:4801
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as declined"
 msgid "Sent to memo list “%s” as declined"
 msgstr "Lähetetty kalenteriin “%s” hylättynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4879
+#: ../src/modules/itip-formatter/itip-view.c:4811
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Lähetetty kalenteriin “%s” peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:4884
+#: ../src/modules/itip-formatter/itip-view.c:4816
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as cancelled"
 msgid "Sent to task list “%s” as cancelled"
 msgstr "Lähetetty kalenteriin “%s” peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:4889
+#: ../src/modules/itip-formatter/itip-view.c:4821
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as cancelled"
 msgid "Sent to memo list “%s” as cancelled"
 msgstr "Lähetetty kalenteriin “%s” peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:4907
+#: ../src/modules/itip-formatter/itip-view.c:4839
 #, fuzzy
 #| msgid "Saving changes to the calendar. Please wait..."
 msgid "Saving changes to the calendar. Please wait…"
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:4910
+#: ../src/modules/itip-formatter/itip-view.c:4842
 #, fuzzy
 #| msgid "Saving changes to the calendar. Please wait..."
 msgid "Saving changes to the task list. Please wait…"
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:4913
+#: ../src/modules/itip-formatter/itip-view.c:4845
 #, fuzzy
 #| msgid "Saving changes to the calendar. Please wait..."
 msgid "Saving changes to the memo list. Please wait…"
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:5004
+#: ../src/modules/itip-formatter/itip-view.c:4916
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../src/modules/itip-formatter/itip-view.c:5212
+#: ../src/modules/itip-formatter/itip-view.c:5114
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5229
+#: ../src/modules/itip-formatter/itip-view.c:5131
 #, fuzzy
 #| msgid "Sent a cancelation notice to the delegate"
 msgid "Sent a cancellation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5233
+#: ../src/modules/itip-formatter/itip-view.c:5135
 #, fuzzy
 #| msgid "Could not send the cancelation notice to the delegate"
 msgid "Could not send the cancellation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5279
+#: ../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:5312
+#: ../src/modules/itip-formatter/itip-view.c:5214
 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:5397
+#: ../src/modules/itip-formatter/itip-view.c:5299
 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:5472
-#: ../src/modules/itip-formatter/itip-view.c:5510
+#: ../src/modules/itip-formatter/itip-view.c:5374
+#: ../src/modules/itip-formatter/itip-view.c:5412
 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:5571
+#: ../src/modules/itip-formatter/itip-view.c:5473
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5576
+#: ../src/modules/itip-formatter/itip-view.c:5478
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5581
+#: ../src/modules/itip-formatter/itip-view.c:5483
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5592
+#: ../src/modules/itip-formatter/itip-view.c:5494
 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:5597
+#: ../src/modules/itip-formatter/itip-view.c:5499
 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:5602
+#: ../src/modules/itip-formatter/itip-view.c:5504
 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:5647
+#: ../src/modules/itip-formatter/itip-view.c:5549
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5652
+#: ../src/modules/itip-formatter/itip-view.c:5554
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:5700
-#: ../src/modules/itip-formatter/itip-view.c:5713
+#: ../src/modules/itip-formatter/itip-view.c:5602
+#: ../src/modules/itip-formatter/itip-view.c:5615
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5701
-#: ../src/modules/itip-formatter/itip-view.c:5714
+#: ../src/modules/itip-formatter/itip-view.c:5603
+#: ../src/modules/itip-formatter/itip-view.c:5616
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -24729,15 +25027,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../src/modules/itip-formatter/itip-view.c:5796
-#: ../src/modules/itip-formatter/itip-view.c:5880
-#: ../src/modules/itip-formatter/itip-view.c:5984
+#: ../src/modules/itip-formatter/itip-view.c:5698
+#: ../src/modules/itip-formatter/itip-view.c:5782
+#: ../src/modules/itip-formatter/itip-view.c:5886
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5797
-#: ../src/modules/itip-formatter/itip-view.c:5881
-#: ../src/modules/itip-formatter/itip-view.c:5985
+#: ../src/modules/itip-formatter/itip-view.c:5699
+#: ../src/modules/itip-formatter/itip-view.c:5783
+#: ../src/modules/itip-formatter/itip-view.c:5887
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, tasks or "
 "free/busy information"
@@ -24745,23 +25043,23 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä tai "
 "vapaa/varattu-tietoja."
 
-#: ../src/modules/itip-formatter/itip-view.c:5890
+#: ../src/modules/itip-formatter/itip-view.c:5792
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../src/modules/itip-formatter/itip-view.c:5891
+#: ../src/modules/itip-formatter/itip-view.c:5793
 msgid ""
 "To process all of these items, the file should be saved and the calendar imported"
 msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../src/modules/itip-formatter/itip-view.c:6478
+#: ../src/modules/itip-formatter/itip-view.c:6373
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/modules/itip-formatter/itip-view.c:6496
+#: ../src/modules/itip-formatter/itip-view.c:6395
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
@@ -24780,35 +25078,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:301
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:297
 msgid "Google Features"
 msgstr "Google-ominaisuudet"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:310
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:306
 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:319
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
 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:330
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:326
 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:333
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:329
 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:336
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:332
 #, fuzzy, c-format
 #| msgid "You may need to enable IMAP access"
 msgctxt "GoggleSummary"
@@ -24899,8 +25197,8 @@ msgstr ""
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:199
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:155
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:193
-#: ../src/plugins/mail-notification/mail-notification.c:1220
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:194
+#: ../src/plugins/mail-notification/mail-notification.c:1271
 msgid "Configuration"
 msgstr "Asetukset"
 
@@ -24987,11 +25285,11 @@ msgstr "P_alvelin vaati todennuksen"
 msgid "T_ype:"
 msgstr "_Tyyppi:"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:252
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:248
 msgid "Yahoo! Features"
 msgstr "Yahoo!-ominaisuudet"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:261
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:257
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Lisää Yahoo!-kalenteri ja -tehtävät tälle tilille"
 
@@ -25002,93 +25300,93 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:399
+#: ../src/modules/mail/e-mail-shell-backend.c:420
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Sähköpostiviesti"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:401
+#: ../src/modules/mail/e-mail-shell-backend.c:422
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:409
+#: ../src/modules/mail/e-mail-shell-backend.c:430
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "_Sähköpostitili"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:411
+#: ../src/modules/mail/e-mail-shell-backend.c:432
 msgid "Create a new mail account"
 msgstr "Luo uusi sähköpostitili"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:416
+#: ../src/modules/mail/e-mail-shell-backend.c:437
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Sähköposti_kansio"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:418
+#: ../src/modules/mail/e-mail-shell-backend.c:439
 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-friendly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:786
+#: ../src/modules/mail/e-mail-shell-backend.c:981
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr ""
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-friendly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:789
+#: ../src/modules/mail/e-mail-shell-backend.c:984
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr ""
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-friendly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:792
+#: ../src/modules/mail/e-mail-shell-backend.c:987
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:822
+#: ../src/modules/mail/e-mail-shell-backend.c:1017
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Yhteydellisen tilan _havaintatapa:"
 
 #. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
-#: ../src/modules/mail/e-mail-shell-backend.c:833
+#: ../src/modules/mail/e-mail-shell-backend.c:1028
 #, c-format
 msgctxt "NetworkMonitor"
 msgid "Default (%s)"
 msgstr "Oletus (%s)"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:837
+#: ../src/modules/mail/e-mail-shell-backend.c:1032
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Oletus"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:854
+#: ../src/modules/mail/e-mail-shell-backend.c:1049
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Aina yhteydessä"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:923
+#: ../src/modules/mail/e-mail-shell-backend.c:1118
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:932
+#: ../src/modules/mail/e-mail-shell-backend.c:1127
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:941
+#: ../src/modules/mail/e-mail-shell-backend.c:1136
 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:1302
+#: ../src/modules/mail/e-mail-shell-backend.c:1497
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
@@ -25097,478 +25395,476 @@ msgstr "Ei mitään"
 msgid "Marking messages as read…"
 msgstr "Merkitään viestejä luetuiksi…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Go to Folder"
 msgstr "Siirry kansioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1256
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1566
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1580
 msgid "Empty _Junk"
 msgstr "_Tyhjennä roskaposti"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Delete all Junk messages from all folders"
 msgstr "Poista kaikki roskapostiviestit kaikista kansioista"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
 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:1607
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1601
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
 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:1614
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1615
 msgid "_Copy Folder To…"
 msgstr "Kopioi kansio kohteeseen…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Edit Sort _Order…"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 #, fuzzy
 #| msgid "Moving folder %s"
 msgid "Change sort order of the folders in the folder tree"
 msgstr "Siirretään kansiota %s"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1636
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
 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:1649
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1643
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
 msgid "_Move Folder To…"
 msgstr "Siirrä kansio kohteeseen…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
 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:1664
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 msgid "_New…"
 msgstr "_Uusi…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1681
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Valitse kaikki viestit, jotka ovat samassa säikeessä kuin nyt valittu viesti"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
 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:1713
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1707
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 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:1720
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1714
 msgid "Go to _Folder"
 msgstr "Siirry ka_nsioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 #, 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:1734
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
 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:1748
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 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:1755
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Receive new items from all accounts"
 msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 #, 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:1792
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1786
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1793
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
 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:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1812
 msgid "_Subscriptions…"
 msgstr "_Tilaukset…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
-#, fuzzy
-#| msgid "C_reate Search Folder From Search..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1838
 msgid "C_reate Search Folder From Search…"
-msgstr "Luo _hakunäkymä haun perusteella..."
+msgstr "Luo _hakunäkymä haun perusteella…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1845
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1847
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1890
 msgid "_New Folder…"
 msgstr "_Uusi kansio…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has attachments"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1936
 msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Show _Junk Messages"
 msgstr "Näytä _roskapostiviestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1944
 #, 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:1956
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1952
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Show To _Do Bar"
 msgstr "Näytä tehtä_väpalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1960
 msgid "Show To Do bar with appointments and tasks"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1968
 #, 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:1994
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1995
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2003
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
 msgid "Last 5 Days’ Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2038
 #, fuzzy
 #| msgid "Messages with Attachments"
 msgid "Messages with Notes"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2045
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2052
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2059
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2066
 msgid "Message Thread"
 msgstr "Viestinketju"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2136
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Current Folder and Subfolders"
 msgstr "Nykyinen kansio ja alakansiot"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1028
+#: ../src/modules/mail/e-mail-shell-view.c:1039
 #, fuzzy
 #| msgid "In Current Folder and _Subfolders"
 msgid "Current Folder and Subfolders Search"
 msgstr "Nykyisessä kansiossa ja alikan_sioissa"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1150
+#: ../src/modules/mail/e-mail-shell-view.c:1159
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1260
+#: ../src/modules/mail/e-mail-shell-view.c:1267
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:905
+#: ../src/modules/mail/e-mail-shell-view-private.c:918
 #, 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:920
-#: ../src/modules/mail/e-mail-shell-view-private.c:937
+#: ../src/modules/mail/e-mail-shell-view-private.c:933
+#: ../src/modules/mail/e-mail-shell-view-private.c:950
 #, 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:951
-#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:964
+#: ../src/modules/mail/e-mail-shell-view-private.c:970
 #, 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:964
+#: ../src/modules/mail/e-mail-shell-view-private.c:977
 #, 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:970
+#: ../src/modules/mail/e-mail-shell-view-private.c:983
 #, 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:976
+#: ../src/modules/mail/e-mail-shell-view-private.c:989
 #, 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:993
+#: ../src/modules/mail/e-mail-shell-view-private.c:1006
 #, 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:1511
+#: ../src/modules/mail/e-mail-shell-view-private.c:1524
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ../src/modules/mail/em-composer-prefs.c:420
+#: ../src/modules/mail/em-composer-prefs.c:417
 msgid "Select Folder to Add"
 msgstr "Valitse lisättävä kansio"
 
-#: ../src/modules/mail/em-composer-prefs.c:896
+#: ../src/modules/mail/em-composer-prefs.c:893
 msgid "Folder"
 msgstr "Kansio"
 
-#: ../src/modules/mail/em-composer-prefs.c:932
+#: ../src/modules/mail/em-composer-prefs.c:929
 msgid "Recipient"
 msgstr "Vastaanottaja"
 
-#: ../src/modules/mail/em-composer-prefs.c:1223
+#: ../src/modules/mail/em-composer-prefs.c:1220
 #, fuzzy
 msgid "Keep in Outbox"
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../src/modules/mail/em-composer-prefs.c:1224
+#: ../src/modules/mail/em-composer-prefs.c:1221
 msgid "Send immediately"
 msgstr "Lähetä välittömästi"
 
-#: ../src/modules/mail/em-composer-prefs.c:1225
+#: ../src/modules/mail/em-composer-prefs.c:1222
 msgid "Send after 5 minutes"
 msgstr "Lähetä 5 minuutin jälkeen"
 
-#: ../src/modules/mail/em-composer-prefs.c:1310
+#: ../src/modules/mail/em-composer-prefs.c:1307
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: ../src/modules/mail/em-composer-prefs.c:1340
+#: ../src/modules/mail/em-composer-prefs.c:1337
 #, fuzzy
 #| msgid "Saving user interface state"
 msgid "Same as user interface"
@@ -25638,14 +25934,13 @@ msgstr "Osoitteeseen %1$s %3$s lähettämäsi viesti ”%2$s” on luettu."
 #. the user did read (or better displayed) the message).
 #: ../src/modules/mdn/evolution-mdn.c:376
 #, c-format
-#| msgid "URL: %s"
 msgid "Read: %s"
 msgstr "Luettu: %s"
 
 #: ../src/modules/mdn/evolution-mdn.c:542
-#, fuzzy, c-format
+#, c-format
 msgid "Send a read receipt to “%s”"
-msgstr "Läh_etä viestin kuittaus:"
+msgstr "Lähetä lukukuittaus henkilölle “%s”"
 
 #. name doesn't matter
 #: ../src/modules/mdn/evolution-mdn.c:547
@@ -25681,28 +25976,28 @@ msgstr "Evolution palaa yhdistettyyn tilaan, kun verkko on taas käytettävissä
 msgid "Author(s)"
 msgstr "Kirjoittaja(t)"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:303
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:304
 msgid "Plugin Manager"
 msgstr "Lisäosien hallinta"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:318
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:319
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Huomio: jotkut muutokset eivät astu voimaan ennen uudelleenkäynnistystä"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:346
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:347
 msgid "Overview"
 msgstr "Yhteenveto"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:415
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:498
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:416
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:499
 msgid "Plugin"
 msgstr "Lisäosa"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:536
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
 msgid "_Plugins"
 msgstr "_Lisäosat"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:538
 msgid "Enable and disable plugins"
 msgstr "Käytä ja poista käytöstä lisäosia"
 
@@ -25724,22 +26019,22 @@ msgstr "Näytä HTML-versio"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:69
 #: ../src/modules/prefer-plain/plugin/config-ui.c:35
 msgid "Show HTML if present"
 msgstr "Näytä HTML:ää, jos se on saatavilla"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:70
 #: ../src/modules/prefer-plain/plugin/config-ui.c:36
 msgid "Let Evolution choose the best part to show."
 msgstr "Anna Evolutionin valita näytettäväksi paras osa."
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:73
 #: ../src/modules/prefer-plain/plugin/config-ui.c:39
 msgid "Show plain text if present"
 msgstr "Näytä raakatekstinä, jos mahdollista"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:74
 #: ../src/modules/prefer-plain/plugin/config-ui.c:40
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best part to "
@@ -25748,12 +26043,12 @@ msgstr ""
 "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/e-mail-parser-prefer-plain.c:78
 #: ../src/modules/prefer-plain/plugin/config-ui.c:44
 msgid "Show plain text if present, or HTML source"
 msgstr "Näytä raakatekstinä jos käytettävissä, tai HTML-lähdekoodi"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../src/modules/prefer-plain/plugin/config-ui.c:45
 #, fuzzy
 #| msgid ""
@@ -25764,12 +26059,12 @@ msgstr ""
 "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/e-mail-parser-prefer-plain.c:83
 #: ../src/modules/prefer-plain/plugin/config-ui.c:49
 msgid "Only ever show plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:84
 #: ../src/modules/prefer-plain/plugin/config-ui.c:50
 msgid ""
 "Always show plain text part and make attachments from other parts, if requested."
@@ -25844,19 +26139,19 @@ msgstr "Roskapostisuodatus SpamAssassinia käyttäen"
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:271
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:336
 msgid "Importing Files"
 msgstr "Tiedostojen tuonti"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:253
 msgid "Import cancelled."
 msgstr "Tuonti peruttiin."
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:270
 msgid "Import complete."
 msgstr "Tuonti valmistui."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:186
+#: ../src/modules/startup-wizard/e-startup-assistant.c:174
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -25868,18 +26163,18 @@ msgstr ""
 "Seuraavaksi kysyttävien tietojen avulla Evolution ottaa yhteyttä "
 "sähköpostitileihisi ja tuo tarvittavia tietoja muista sovelluksista."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:193
+#: ../src/modules/startup-wizard/e-startup-assistant.c:181
 msgid "Do not _show this wizard again"
 msgstr "Älä näytä tätä avustajaa uu_destaan"
 
 #. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." 
sentence from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:206
+#: ../src/modules/startup-wizard/e-startup-assistant.c:194
 msgctxt "wizard-ca-note"
 msgid "create a collection account"
 msgstr "luoda uuden kokoelmatilin"
 
 #. Translators: The '%s' is replaced with "create a collection account" from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:208
+#: ../src/modules/startup-wizard/e-startup-assistant.c:196
 #, c-format
 msgctxt "wizard-ca-note"
 msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
@@ -26150,7 +26445,7 @@ msgid "_Do not show this message again."
 msgstr "Älä _näytä tätä viestiä uudestaan."
 
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:571
-#: ../src/plugins/templates/templates.c:489
+#: ../src/plugins/templates/templates.c:495
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -26171,6 +26466,7 @@ msgid "_Add Attachment..."
 msgstr "_Lisää liite..."
 
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:3
 msgid "_Edit Message"
 msgstr "_Muokkaa viestiä"
 
@@ -26293,12 +26589,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:538
+#: ../src/plugins/email-custom-header/email-custom-header.c:528
 msgid "_Custom Header"
 msgstr "_Omat otsakkeet"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../src/plugins/email-custom-header/email-custom-header.c:808
+#: ../src/plugins/email-custom-header/email-custom-header.c:795
 #, fuzzy
 #| msgid ""
 #| "The format for specifying a Custom Header key value is:\n"
@@ -26310,12 +26606,12 @@ msgstr ""
 "Omien otsakeavainten määrittelyssä käytetty muoto on seuraava:\n"
 "Omien otsakenimien avainarvot eroteltuna merkillä \";\"."
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:862
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 msgid "Key"
 msgstr "Avaimet"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:879
-#: ../src/plugins/templates/templates.c:498
+#: ../src/plugins/email-custom-header/email-custom-header.c:866
+#: ../src/plugins/templates/templates.c:504
 msgid "Values"
 msgstr "Arvot"
 
@@ -26618,85 +26914,92 @@ msgstr ""
 "Otsake: {0}"
 
 #. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:462
+#: ../src/plugins/mail-notification/mail-notification.c:500
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "%d uusi viesti vastaanotettu."
 msgstr[1] "%d uutta viestiä vastaanotettu."
 
+#. Translators: The '%s' is replaced by the folder name, where a new
+#. * mail message arrived. Example: "Folder: On This Computer : Inbox"
+#: ../src/plugins/mail-notification/mail-notification.c:509
+#, c-format
+msgid "Folder: %s"
+msgstr "Kansio: %s"
+
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../src/plugins/mail-notification/mail-notification.c:471
+#: ../src/plugins/mail-notification/mail-notification.c:517
 #, c-format
 msgid "From: %s"
 msgstr "Lähettäjä: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../src/plugins/mail-notification/mail-notification.c:485
+#: ../src/plugins/mail-notification/mail-notification.c:525
 #, c-format
 msgid "Subject: %s"
 msgstr "Aihe: %s"
 
 #. Translators: %d is the count of mails received in addition
 #. * to the one displayed in this notification.
-#: ../src/plugins/mail-notification/mail-notification.c:501
+#: ../src/plugins/mail-notification/mail-notification.c:536
 #, c-format
 msgid "(and %d more)"
 msgid_plural "(and %d more)"
 msgstr[0] "(ja %d lisää)"
 msgstr[1] "(ja %d lisää)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:513
+#: ../src/plugins/mail-notification/mail-notification.c:542
 msgid "New email in Evolution"
 msgstr "Uusia sähköpostiviestejä Evolutionissa"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../src/plugins/mail-notification/mail-notification.c:553
+#: ../src/plugins/mail-notification/mail-notification.c:583
 #, c-format
 msgid "Show %s"
 msgstr "Näytä %s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:792
+#: ../src/plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when a new message arrives"
 msgstr "_Soita ääni uuden sähköpostin saapuessa"
 
-#: ../src/plugins/mail-notification/mail-notification.c:824
+#: ../src/plugins/mail-notification/mail-notification.c:875
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../src/plugins/mail-notification/mail-notification.c:837
+#: ../src/plugins/mail-notification/mail-notification.c:888
 msgid "Use sound _theme"
 msgstr "Käytä ääni_teemaa"
 
-#: ../src/plugins/mail-notification/mail-notification.c:856
+#: ../src/plugins/mail-notification/mail-notification.c:907
 msgid "Play _file:"
 msgstr "So_ita tiedosto:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:865
+#: ../src/plugins/mail-notification/mail-notification.c:916
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1014
+#: ../src/plugins/mail-notification/mail-notification.c:1065
 msgid "Select _accounts for which enable notifications:"
 msgstr "Valitse _tilit, joiden kohdalla käytetään ilmoituksia:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1176
+#: ../src/plugins/mail-notification/mail-notification.c:1227
 #: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "Huomautus uusista viesteistä"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1190
+#: ../src/plugins/mail-notification/mail-notification.c:1241
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistä _vain saapuvien kansiossa"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1206
+#: ../src/plugins/mail-notification/mail-notification.c:1257
 msgid "Show _notification when a new message arrives"
 msgstr "Näytä ilmoitus uusien _viestien saapuessa"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1224
+#: ../src/plugins/mail-notification/mail-notification.c:1275
 msgid "Accounts"
 msgstr "Tilit"
 
@@ -26711,24 +27014,24 @@ 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:600
+#: ../src/plugins/mail-to-task/mail-to-task.c:598
 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:602
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 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:604
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:622
+#: ../src/plugins/mail-to-task/mail-to-task.c:620
 #, fuzzy, c-format
 #| msgid ""
 #| "Selected calendar contains event '%s' already. Would you like to edit the old "
@@ -26740,7 +27043,7 @@ msgstr ""
 "Valittu kalenteri sisältää jo tapahtuman \"%s\". Haluatko muokata aiemmin lisättyä "
 "tapahtumaa?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:625
+#: ../src/plugins/mail-to-task/mail-to-task.c:623
 #, fuzzy, c-format
 #| msgid ""
 #| "Selected task list contains task '%s' already. Would you like to edit the old "
@@ -26751,7 +27054,7 @@ msgstr ""
 "Valittu tehtävälista sisältää jo tehtävän \"%s\". Haluatko muokata aiemmin "
 "lisättyä tehtävää?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:628
+#: ../src/plugins/mail-to-task/mail-to-task.c:626
 #, fuzzy, c-format
 #| msgid ""
 #| "Selected memo list contains memo '%s' already. Would you like to edit the old "
@@ -26763,7 +27066,7 @@ msgstr ""
 "lisättyä muistilappua?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:648
+#: ../src/plugins/mail-to-task/mail-to-task.c:646
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to add "
@@ -26775,7 +27078,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:655
+#: ../src/plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to add "
@@ -26787,7 +27090,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:662
+#: ../src/plugins/mail-to-task/mail-to-task.c:660
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to add "
@@ -26798,30 +27101,30 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:683
+#: ../src/plugins/mail-to-task/mail-to-task.c:681
 #, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Haluatko ylikirjoittaa?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:759
+#: ../src/plugins/mail-to-task/mail-to-task.c:756
 msgid "[No Summary]"
 msgstr "[Ei yhteenvetoa]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:772
+#: ../src/plugins/mail-to-task/mail-to-task.c:769
 msgid "Invalid object returned from a server"
 msgstr "Palvelin palautti virheellisen olion"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:826
+#: ../src/plugins/mail-to-task/mail-to-task.c:823
 #, 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:877
+#: ../src/plugins/mail-to-task/mail-to-task.c:874
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:881
+#: ../src/plugins/mail-to-task/mail-to-task.c:878
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -26829,7 +27132,7 @@ msgstr ""
 "Valittu kalenteri on vain luettavissa, joten et voi luoda siihen tapahtumia. "
 "Valitse jokin toinen kalenteri."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:884
+#: ../src/plugins/mail-to-task/mail-to-task.c:881
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create task there. Select other "
@@ -26841,7 +27144,7 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen tehtäviä. Valitse "
 "joku toinen lähde."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:887
+#: ../src/plugins/mail-to-task/mail-to-task.c:884
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create memo there. Select other "
@@ -26853,35 +27156,35 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen muistilappuja. "
 "Valitse joku toinen lähde."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1328
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create an _Appointment"
 msgstr "Luo _tapaaminen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1330
+#: ../src/plugins/mail-to-task/mail-to-task.c:1327
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1335
+#: ../src/plugins/mail-to-task/mail-to-task.c:1332
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1337
+#: ../src/plugins/mail-to-task/mail-to-task.c:1334
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1342
+#: ../src/plugins/mail-to-task/mail-to-task.c:1339
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1344
+#: ../src/plugins/mail-to-task/mail-to-task.c:1341
 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:1352
+#: ../src/plugins/mail-to-task/mail-to-task.c:1349
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1354
+#: ../src/plugins/mail-to-task/mail-to-task.c:1351
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
@@ -26964,18 +27267,18 @@ msgstr "Julkaisu kohteeseen %s onnistui"
 msgid "Mount of %s failed:"
 msgstr "Kohteen %s liittäminen epäonnistui:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/publish-calendar.c:787
 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:1098
+#: ../src/plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:1108
+#: ../src/plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Julkaise kalenteritietoja"
 
@@ -27067,11 +27370,11 @@ msgstr "Julkaisupaikka"
 msgid "Invalid source UID “%s”"
 msgstr "Virheellinen kansio: ”%s”"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "Uusi sijainti"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:544
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "Muokkaa sijaintia"
 
@@ -27175,30 +27478,66 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF-tiedostot (.rdf)"
 
-#: ../src/plugins/save-calendar/save-calendar.c:116
+#: ../src/plugins/save-calendar/save-calendar.c:114
 msgid "_Format:"
 msgstr "_Muoto:"
 
-#: ../src/plugins/save-calendar/save-calendar.c:183
+#: ../src/plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/save-calendar/save-calendar.c:184
 msgid "_Save As"
 msgstr "_Tallenna nimellä"
 
-#: ../src/plugins/save-calendar/save-calendar.c:346
+#: ../src/plugins/save-calendar/save-calendar.c:343
 msgid "Save the selected calendar to disk"
 msgstr "Tallenna valittu kalenteri levylle"
 
-#: ../src/plugins/save-calendar/save-calendar.c:385
+#: ../src/plugins/save-calendar/save-calendar.c:382
 msgid "Save the selected memo list to disk"
 msgstr "Tallenna valittu muistilappu levylle"
 
-#: ../src/plugins/save-calendar/save-calendar.c:424
+#: ../src/plugins/save-calendar/save-calendar.c:421
 msgid "Save the selected task list to disk"
 msgstr "Tallenna valittu tehtävälista levylle"
 
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:1
+#, fuzzy
+#| msgid "Sender"
+msgid "Sender Validation"
+msgstr "Lähettäjä"
+
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:2
+msgid ""
+"Validates sender before sending an e-mail against a list of recipients and for "
+"them assigned expected send account."
+msgstr ""
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:1
+msgid "Confirm sender address"
+msgstr "Vahvista lähettäjän osoite"
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:2
+msgid ""
+"The message contains recipient “{0}” for which it is set up to use sender account "
+"“{1}”, but the account “{2}” is used instead."
+msgstr ""
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:4
+msgid "_Send Anyway"
+msgstr "Lähetä _silti"
+
+#: ../src/plugins/sender-validation/sender-validation.c:520
+#, fuzzy
+#| msgid "Recipients contain"
+msgid "Recipient Contains"
+msgstr "Vastaanottajat sisältää"
+
+#: ../src/plugins/sender-validation/sender-validation.c:530
+msgid "Account to Use"
+msgstr "Käytettävä tili"
+
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -27206,15 +27545,15 @@ msgid ""
 "which will be replaced by values from an email you are replying to."
 msgstr ""
 
-#: ../src/plugins/templates/templates.c:878
+#: ../src/plugins/templates/templates.c:887
 msgid "Saving message template"
 msgstr "Tallennetaan viestipohjaa"
 
-#: ../src/plugins/templates/templates.c:899
+#: ../src/plugins/templates/templates.c:908
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../src/plugins/templates/templates.c:901
+#: ../src/plugins/templates/templates.c:910
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
@@ -27254,19 +27593,19 @@ msgstr "Tallenna haku"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../src/shell/e-shell-searchbar.c:925
+#: ../src/shell/e-shell-searchbar.c:924
 msgid "Sho_w:"
 msgstr "Nä_ytä:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:951
+#: ../src/shell/e-shell-searchbar.c:950
 msgid "Sear_ch:"
 msgstr "_Etsi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:1019
+#: ../src/shell/e-shell-searchbar.c:1018
 msgid "i_n"
 msgstr "lä_hteestä"
 
@@ -27284,7 +27623,7 @@ msgstr "Kaikki tiedostot (*)"
 #: ../src/shell/e-shell-utils.c:343
 msgid "translator-credits"
 msgstr ""
-"Jiri Grönroos, 2012-2020\n"
+"Jiri Grönroos, 2012-2021\n"
 "Ilkka Tuohela, 2002-2009\n"
 "Timo Jyrinki, 2008\n"
 "Sami Pesonen, 2001-2003\n"
@@ -27329,292 +27668,302 @@ msgstr "Bug buddya ei ole asennettu."
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../src/shell/e-shell-window-actions.c:851
+#: ../src/shell/e-shell-window-actions.c:895
 msgid "Collect_ion Account"
 msgstr "_Kokoelmatili"
 
-#: ../src/shell/e-shell-window-actions.c:853
+#: ../src/shell/e-shell-window-actions.c:897
 msgid "Create a new collection account"
 msgstr "Luo uusi kokoelmatili"
 
-#: ../src/shell/e-shell-window-actions.c:861
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/shell/e-shell-window-actions.c:863
+#: ../src/shell/e-shell-window-actions.c:907
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../src/shell/e-shell-window-actions.c:868
+#: ../src/shell/e-shell-window-actions.c:912
 msgid "_Accounts"
 msgstr "_Tilit"
 
-#: ../src/shell/e-shell-window-actions.c:870
+#: ../src/shell/e-shell-window-actions.c:914
 msgid "Configure Evolution Accounts"
 msgstr "Määritä Evolution-tilit"
 
-#: ../src/shell/e-shell-window-actions.c:875
-#: ../src/shell/e-shell-window-actions.c:889
+#: ../src/shell/e-shell-window-actions.c:919
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:896
+#: ../src/shell/e-shell-window-actions.c:940
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../src/shell/e-shell-window-actions.c:898
+#: ../src/shell/e-shell-window-actions.c:942
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin käyttäjäopas"
 
-#: ../src/shell/e-shell-window-actions.c:924
+#: ../src/shell/e-shell-window-actions.c:968
 msgid "I_mport…"
 msgstr "_Tuo…"
 
-#: ../src/shell/e-shell-window-actions.c:926
+#: ../src/shell/e-shell-window-actions.c:970
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../src/shell/e-shell-window-actions.c:931
+#: ../src/shell/e-shell-window-actions.c:975
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:933
+#: ../src/shell/e-shell-window-actions.c:977
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tälle näkymälle"
 
-#: ../src/shell/e-shell-window-actions.c:945
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "Available Cate_gories"
 msgstr "Käytettävissä olevat _luokat"
 
-#: ../src/shell/e-shell-window-actions.c:947
+#: ../src/shell/e-shell-window-actions.c:991
 msgid "Manage available categories"
 msgstr "Hallitse käytettävissä olevia luokkia"
 
-#: ../src/shell/e-shell-window-actions.c:959
+#: ../src/shell/e-shell-window-actions.c:1003
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/shell/e-shell-window-actions.c:961
+#: ../src/shell/e-shell-window-actions.c:1005
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../src/shell/e-shell-window-actions.c:966
+#: ../src/shell/e-shell-window-actions.c:1010
 msgid "_Saved Searches"
 msgstr "_Tallennetut haut"
 
-#: ../src/shell/e-shell-window-actions.c:973
+#: ../src/shell/e-shell-window-actions.c:1017
 msgid "_Advanced Search…"
 msgstr "_Edistynyt haku…"
 
-#: ../src/shell/e-shell-window-actions.c:975
+#: ../src/shell/e-shell-window-actions.c:1019
 msgid "Construct a more advanced search"
 msgstr "Luo monimutkaisempi haku"
 
-#: ../src/shell/e-shell-window-actions.c:982
+#: ../src/shell/e-shell-window-actions.c:1026
 msgid "Clear the current search parameters"
 msgstr "Tyhjennä nykyiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:987
+#: ../src/shell/e-shell-window-actions.c:1031
 msgid "_Edit Saved Searches…"
 msgstr "_Muokkaa tallennettuja hakuja…"
 
-#: ../src/shell/e-shell-window-actions.c:989
+#: ../src/shell/e-shell-window-actions.c:1033
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../src/shell/e-shell-window-actions.c:996
+#: ../src/shell/e-shell-window-actions.c:1040
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
 
-#: ../src/shell/e-shell-window-actions.c:1001
+#: ../src/shell/e-shell-window-actions.c:1045
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../src/shell/e-shell-window-actions.c:1003
+#: ../src/shell/e-shell-window-actions.c:1047
 msgid "Execute the current search parameters"
 msgstr "Suorita tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:1008
+#: ../src/shell/e-shell-window-actions.c:1052
 msgid "_Save Search…"
 msgstr "Tallenna _haku…"
 
-#: ../src/shell/e-shell-window-actions.c:1010
+#: ../src/shell/e-shell-window-actions.c:1054
 msgid "Save the current search parameters"
 msgstr "Tallenna tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:1022
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "_Keyboard Shortcuts"
 msgstr "_Pikanäppäimet"
 
-#: ../src/shell/e-shell-window-actions.c:1024
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show keyboard shortcuts"
 msgstr "Näytä pikanäppäimet"
 
-#: ../src/shell/e-shell-window-actions.c:1029
+#: ../src/shell/e-shell-window-actions.c:1073
+#, fuzzy
+#| msgid "Security Information"
+msgid "Show _WebKit GPU information"
+msgstr "Turvatiedot"
+
+#: ../src/shell/e-shell-window-actions.c:1075
+msgid "Show WebKit GPU information page in the preview panel"
+msgstr ""
+
+#: ../src/shell/e-shell-window-actions.c:1080
 msgid "Submit _Bug Report…"
 msgstr "Lähetä _vikailmoitus…"
 
-#: ../src/shell/e-shell-window-actions.c:1031
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../src/shell/e-shell-window-actions.c:1036
+#: ../src/shell/e-shell-window-actions.c:1087
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:1038
+#: ../src/shell/e-shell-window-actions.c:1089
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:1043
+#: ../src/shell/e-shell-window-actions.c:1094
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:1045
+#: ../src/shell/e-shell-window-actions.c:1096
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:1073
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Lay_out"
 msgstr "_Asettelu"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1081
+#: ../src/shell/e-shell-window-actions.c:1132
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/shell/e-shell-window-actions.c:1088
+#: ../src/shell/e-shell-window-actions.c:1139
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../src/shell/e-shell-window-actions.c:1095
+#: ../src/shell/e-shell-window-actions.c:1146
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1109
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:1138
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Show _Menu Bar"
 msgstr "Näytä _valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1140
+#: ../src/shell/e-shell-window-actions.c:1191
 msgid "Show the menu bar"
 msgstr "Näytä valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1146
+#: ../src/shell/e-shell-window-actions.c:1197
 msgid "Show Side _Bar"
 msgstr "Näytä sivu_palkki"
 
-#: ../src/shell/e-shell-window-actions.c:1148
+#: ../src/shell/e-shell-window-actions.c:1199
 msgid "Show the side bar"
 msgstr "Näytä sivupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1154
+#: ../src/shell/e-shell-window-actions.c:1205
 msgid "Show _Buttons"
 msgstr "Näytä _painikkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1156
+#: ../src/shell/e-shell-window-actions.c:1207
 msgid "Show the switcher buttons"
 msgstr "Näytä vaihtimen painikkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1162
+#: ../src/shell/e-shell-window-actions.c:1213
 msgid "Show _Status Bar"
 msgstr "Näytä _tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1164
+#: ../src/shell/e-shell-window-actions.c:1215
 msgid "Show the status bar"
 msgstr "Näytä tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1170
+#: ../src/shell/e-shell-window-actions.c:1221
 msgid "Show _Tool Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1172
+#: ../src/shell/e-shell-window-actions.c:1223
 msgid "Show the tool bar"
 msgstr "Näytä työkalurivi"
 
-#: ../src/shell/e-shell-window-actions.c:1194
+#: ../src/shell/e-shell-window-actions.c:1245
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1196
+#: ../src/shell/e-shell-window-actions.c:1247
 msgid "Display window buttons with icons only"
 msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
 
-#: ../src/shell/e-shell-window-actions.c:1201
+#: ../src/shell/e-shell-window-actions.c:1252
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1203
+#: ../src/shell/e-shell-window-actions.c:1254
 msgid "Display window buttons with text only"
 msgstr "Näytä ikkunan napit ainoastaan tekstinä"
 
-#: ../src/shell/e-shell-window-actions.c:1208
+#: ../src/shell/e-shell-window-actions.c:1259
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1210
+#: ../src/shell/e-shell-window-actions.c:1261
 msgid "Display window buttons with icons and text"
 msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
 
-#: ../src/shell/e-shell-window-actions.c:1215
+#: ../src/shell/e-shell-window-actions.c:1266
 msgid "Tool_bar Style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1217
+#: ../src/shell/e-shell-window-actions.c:1268
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Näytä ikkunan napit työpöydän työkalupalkin asetuksen mukaisesti"
 
-#: ../src/shell/e-shell-window-actions.c:1225
+#: ../src/shell/e-shell-window-actions.c:1276
 msgid "Delete Current View"
 msgstr "Poista nykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1232
+#: ../src/shell/e-shell-window-actions.c:1283
 msgid "Save Custom View…"
 msgstr "Tallenna oma näkymä…"
 
-#: ../src/shell/e-shell-window-actions.c:1234
+#: ../src/shell/e-shell-window-actions.c:1285
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1248
+#: ../src/shell/e-shell-window-actions.c:1299
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1258
+#: ../src/shell/e-shell-window-actions.c:1309
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1260
+#: ../src/shell/e-shell-window-actions.c:1311
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1268
+#: ../src/shell/e-shell-window-actions.c:1319
 msgid "Page Set_up…"
 msgstr "_Sivun asetukset…"
 
-#: ../src/shell/e-shell-window-actions.c:1270
+#: ../src/shell/e-shell-window-actions.c:1321
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../src/shell/e-shell-window-actions.c:1640
+#: ../src/shell/e-shell-window-actions.c:1696
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../src/shell/e-shell-window-actions.c:1764
+#: ../src/shell/e-shell-window-actions.c:1820
 #, c-format
 msgid "Select view: %s"
 msgstr "Valitse näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1781
+#: ../src/shell/e-shell-window-actions.c:1837
 #, c-format
 msgid "Delete view: %s"
 msgstr "Poista näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1896
+#: ../src/shell/e-shell-window-actions.c:1952
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
@@ -28008,7 +28357,7 @@ msgstr "MD5-sormenjälki"
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: ../src/smime/gui/certificate-manager.c:648
+#: ../src/smime/gui/certificate-manager.c:647
 msgid "Select a file to backup your key and certificate…"
 msgstr "Valitse tiedosto varmuuskopioidaksesi avaimesi ja varmenteen…"
 
@@ -28017,47 +28366,47 @@ msgstr "Valitse tiedosto varmuuskopioidaksesi avaimesi ja varmenteen…"
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../src/smime/gui/certificate-manager.c:658
+#: ../src/smime/gui/certificate-manager.c:657
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-varmuuskopio.p12"
 
-#: ../src/smime/gui/certificate-manager.c:721
+#: ../src/smime/gui/certificate-manager.c:716
 msgid "Backup Certificate"
 msgstr "Varmuuskopioi varmenne"
 
 #. filename selection
-#: ../src/smime/gui/certificate-manager.c:736
+#: ../src/smime/gui/certificate-manager.c:731
 msgid "_File name:"
 msgstr "_Tiedostonimi:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../src/smime/gui/certificate-manager.c:741
+#: ../src/smime/gui/certificate-manager.c:736
 msgid "Please select a file…"
 msgstr "Valitse tiedosto…"
 
-#: ../src/smime/gui/certificate-manager.c:755
+#: ../src/smime/gui/certificate-manager.c:750
 msgid "_Include certificate chain in the backup"
 msgstr "_Sisällytä varmenneketju varmuuskopioon"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:761
+#: ../src/smime/gui/certificate-manager.c:756
 msgid ""
 "The certificate backup password you set here protects the backup file that you are "
 "about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:780
+#: ../src/smime/gui/certificate-manager.c:775
 msgid "_Repeat Password:"
 msgstr "_Toista salasana:"
 
-#: ../src/smime/gui/certificate-manager.c:799
+#: ../src/smime/gui/certificate-manager.c:794
 msgid "Passwords do not match"
 msgstr "Salasanat eivät täsmää"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:807
+#: ../src/smime/gui/certificate-manager.c:802
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to restore "
@@ -28065,96 +28414,96 @@ msgid ""
 "Please record it in a safe location."
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:852
+#: ../src/smime/gui/certificate-manager.c:847
 msgid "No file name provided"
 msgstr "Tiedoston nimeä ei annettu"
 
-#: ../src/smime/gui/certificate-manager.c:856
+#: ../src/smime/gui/certificate-manager.c:851
 msgid "Failed to backup key and certificate"
 msgstr "Avaimen ja varmenteen varmuuskopiointi epäonnistui"
 
-#: ../src/smime/gui/certificate-manager.c:948
+#: ../src/smime/gui/certificate-manager.c:943
 msgid "Select a certificate to import…"
 msgstr "Valitse tuotava varmenne…"
 
-#: ../src/smime/gui/certificate-manager.c:997
+#: ../src/smime/gui/certificate-manager.c:992
 msgid "Failed to import certificate"
 msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../src/smime/gui/certificate-manager.c:1114
+#: ../src/smime/gui/certificate-manager.c:1109
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Kysy käytettäessä"
 
-#: ../src/smime/gui/certificate-manager.c:1116
+#: ../src/smime/gui/certificate-manager.c:1111
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../src/smime/gui/certificate-manager.c:1118
+#: ../src/smime/gui/certificate-manager.c:1113
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1120
+#: ../src/smime/gui/certificate-manager.c:1115
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1122
+#: ../src/smime/gui/certificate-manager.c:1117
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1124
+#: ../src/smime/gui/certificate-manager.c:1119
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Väliaikaisesti"
 
-#: ../src/smime/gui/certificate-manager.c:1330
+#: ../src/smime/gui/certificate-manager.c:1325
 msgid "Change certificate trust"
 msgstr "Muuta varmenteen luotettavuutta"
 
-#: ../src/smime/gui/certificate-manager.c:1342
+#: ../src/smime/gui/certificate-manager.c:1337
 #, c-format
 msgid "Change trust for the host “%s”:"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1366
+#: ../src/smime/gui/certificate-manager.c:1361
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "_Kysy käytettäessä"
 
-#: ../src/smime/gui/certificate-manager.c:1367
+#: ../src/smime/gui/certificate-manager.c:1362
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Älä koskaan luota tähän varmenteeseen"
 
-#: ../src/smime/gui/certificate-manager.c:1368
+#: ../src/smime/gui/certificate-manager.c:1363
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "_Luota väliaikaisesti (tämän käyttökerran ajan)"
 
-#: ../src/smime/gui/certificate-manager.c:1369
+#: ../src/smime/gui/certificate-manager.c:1364
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1370
+#: ../src/smime/gui/certificate-manager.c:1365
 #, fuzzy
 #| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "V_astausta pyydetty"
 
-#: ../src/smime/gui/certificate-manager.c:1371
+#: ../src/smime/gui/certificate-manager.c:1366
 #, fuzzy
 #| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "V_astausta pyydetty"
 
-#: ../src/smime/gui/certificate-manager.c:1375
+#: ../src/smime/gui/certificate-manager.c:1370
 #, fuzzy
 #| msgid ""
 #| "Before trusting this CA for any purpose, you should examine its certificate and "
@@ -28166,45 +28515,45 @@ msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../src/smime/gui/certificate-manager.c:1390
+#: ../src/smime/gui/certificate-manager.c:1385
 msgid "_Display certificate"
 msgstr "_Näytä varmenne"
 
-#: ../src/smime/gui/certificate-manager.c:1595
+#: ../src/smime/gui/certificate-manager.c:1590
 #, fuzzy
 #| msgid "You have certificates on file that identify these people:"
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../src/smime/gui/certificate-manager.c:1626
+#: ../src/smime/gui/certificate-manager.c:1621
 msgid "Host name"
 msgstr "Palvelimen nimi"
 
-#: ../src/smime/gui/certificate-manager.c:1628
+#: ../src/smime/gui/certificate-manager.c:1623
 msgid "Issuer"
 msgstr "Myöntäjä"
 
-#: ../src/smime/gui/certificate-manager.c:1629
+#: ../src/smime/gui/certificate-manager.c:1624
 msgid "Fingerprint"
 msgstr "Sormenjälki"
 
-#: ../src/smime/gui/certificate-manager.c:1630
+#: ../src/smime/gui/certificate-manager.c:1625
 msgid "Trust"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1651
+#: ../src/smime/gui/certificate-manager.c:1646
 msgid "_Edit Trust"
 msgstr "_Muokkaa luottamusta"
 
-#: ../src/smime/gui/certificate-manager.c:2105
+#: ../src/smime/gui/certificate-manager.c:2082
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
-#: ../src/smime/gui/certificate-manager.c:2122
+#: ../src/smime/gui/certificate-manager.c:2099
 msgid "All email certificate files"
 msgstr "Kaikki sähköpostivarmennetiedostot"
 
-#: ../src/smime/gui/certificate-manager.c:2139
+#: ../src/smime/gui/certificate-manager.c:2116
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
@@ -28226,16 +28575,16 @@ msgstr ""
 "luota tähän varmenteeseen, jollei tässä muuten mainita"
 
 #: ../src/smime/gui/component.c:53
-#, fuzzy, c-format
+#, c-format
 #| msgid "Enter Google password for user '%s'."
 msgid "Enter the password for “%s”, token “%s”"
-msgstr "Anna käyttäjän '%s' Google-salasana."
+msgstr "Anna salasana tilille “%s”, poletti “%s”"
 
 #: ../src/smime/gui/component.c:55
-#, fuzzy, c-format
+#, c-format
 #| msgid "Enter Google password for user '%s'."
 msgid "Enter the password for “%s”"
-msgstr "Anna käyttäjän '%s' Google-salasana."
+msgstr "Anna salasana tilille “%s”"
 
 #. we're setting the password initially
 #: ../src/smime/gui/component.c:83
@@ -28385,6 +28734,12 @@ msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 msgid "Imported Certificate"
 msgstr "Tuotu varmenne"
 
+#~ msgid "Event cannot be fully edited, because you are not the organizer"
+#~ msgstr "Tapahtumaa ei voi muokata täysin, koska et ole sen järjestäjä"
+
+#~ msgid "Task cannot be fully edited, because you are not the organizer"
+#~ msgstr "Tehtävää ei voi muokata kokonaan, koska et ole tehtävän järjestäjä"
+
 #~ msgid "Attendee                          "
 #~ msgstr "Osallistuja                          "
 
@@ -28413,9 +28768,6 @@ msgstr "Tuotu varmenne"
 #~ msgid "_Destination"
 #~ msgstr "_Kohde"
 
-#~ msgid "Security Information"
-#~ msgstr "Turvatiedot"
-
 #, fuzzy
 #~ msgid "Delivery Notification for “%s”"
 #~ msgstr "Toimituskuittaus viestille: ”%s”"
@@ -29036,9 +29388,6 @@ msgstr "Tuotu varmenne"
 #~ msgid "start of appointment"
 #~ msgstr "tapaamisen alkua"
 
-#~ msgid "end of appointment"
-#~ msgstr "tapaamisen päättymistä"
-
 #~ msgid "Add Reminder"
 #~ msgstr "Lisää muistutus"
 
@@ -29364,9 +29713,6 @@ msgstr "Tuotu varmenne"
 #~ msgid "Could not locate user's calendars"
 #~ msgstr "Käyttäjän kalenterien paikallistaminen epäonnistui"
 
-#~ msgid "Path"
-#~ msgstr "Polku"
-
 #~ 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]