[evolution] Update Finnish translation

[Damned-Lies <translations src gnome org>]

commit 5089ea3ada2bffe24de7965d20a4310255006c28
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Thu Feb 16 09:06:41 2017 +0000

    Update Finnish translation

 po/fi.po |19750 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 10397 insertions(+), 9353 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 23e648c..089b138 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,16 +13,16 @@
 #
 # Ville-Pekka Vainio <vpivaini cs helsinki fi>, 2010.
 # Lasse Liehu <lasse liehu gmail com>, 2014.
-# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013, 2014, 2015, 2016.
+# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013, 2014, 2015, 2016, 2017.
 #
-#: ../shell/main.c:522
+#: ../src/shell/main.c:519
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-09-02 20:32+0000\n"
-"PO-Revision-Date: 2016-09-04 11:35+0300\n"
+"POT-Creation-Date: 2017-02-15 13:45+0000\n"
+"PO-Revision-Date: 2017-02-16 11: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"
@@ -34,11 +34,3143 @@ msgstr ""
 "X-POT-Import-Date: 2012-03-05 15:05:59+0000\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../addressbook/addressbook.error.xml.h:1
+#: ../evolution.appdata.xml.in.h:1 ../data/evolution.desktop.in.in.h:1
+#: ../src/mail/e-mail-browser.c:1098
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
+#: ../src/shell/e-shell-window-private.c:240
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../evolution.appdata.xml.in.h:2 ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Hallitse sähköposteja, yhteystietoja ja ajan käyttöä"
+
+#: ../evolution.appdata.xml.in.h:3
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution on henkilökohtaisen tiedon hallintasovellus, joka tarjoaa "
+"sähköpostin, kalenterin ja osoitekirjan."
+
+#: ../evolution.appdata.xml.in.h:4
+#| msgid ""
+#| "Evolution supports a wide range of industry standard data formats and "
+#| "network protocols for information exchange, with an emphasis on standards "
+#| "compliance and security. Evolution can also integrate smoothly with "
+#| "Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) "
+#| "extension."
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
+msgstr ""
+"Evolution tukee lukuisia standardeja tiedostomuotoja ja verkkoprotokollia "
+"tiedonvaihtoa varten, painoarvoa on asetettu erityisesti standardien "
+"noudattamiseen ja tietoturvaan. Evolution voi myös integroitua Microsoft "
+"Exchange -palvelimeen Exchange Web Services (EWS) -laajennuksen avulla."
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolutionin hälytysilmoitukset"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "Kalenteritapahtumien ilmoitukset"
+
+#: ../data/evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
+msgid "Groupware Suite"
+msgstr "Ryhmätyöohjelmisto"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution-sähköposti ja -kalenteri"
+
+#: ../data/evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr ""
+"email;calendar;contact;addressbook;task;sähköposti;kalenteri;yhteystiedot;"
+"osoitekirja;tehtävä;"
+
+#: ../data/evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "Uusi ikkuna"
+
+#: ../data/evolution.desktop.in.in.h:7
+#| msgid "Compose Message"
+msgid "Compose a Message"
+msgstr "Uusi viesti"
+
+#: ../data/evolution.desktop.in.in.h:8
+#: ../src/e-util/e-name-selector-dialog.c:448
+#: ../src/modules/addressbook/e-book-shell-backend.c:301
+#: ../src/modules/addressbook/e-book-shell-view.c:371
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../data/evolution.desktop.in.in.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:833
+#: ../src/e-util/e-send-options.c:544
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
+#: ../src/modules/calendar/e-cal-shell-view.c:577
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: ../data/evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
+#: ../src/mail/importers/elm-importer.c:330
+#: ../src/mail/importers/kmail-importer.c:251
+#: ../src/mail/importers/pine-importer.c:423
+#: ../src/modules/mail/e-mail-shell-view.c:1240
+#: ../src/smime/gui/certificate-manager.c:1682
+msgid "Mail"
+msgstr "Sähköposti"
+
+#: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368
+#: ../src/modules/calendar/e-cal-shell-content.c:1665
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
+#: ../src/modules/calendar/e-memo-shell-view.c:313
+msgid "Memos"
+msgstr "Muistilaput"
+
+#: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696
+#: ../src/calendar/gui/print.c:2408
+#: ../src/calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:1114
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-cal-shell-content.c:1625
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
+#: ../src/modules/calendar/e-task-shell-view.c:471
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
+msgid "Enable address formatting"
+msgstr "Käytä osoitteen muotoilua"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
+msgid "Autocomplete length"
+msgstr "Automaattisen täydennyksen pituus"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"Kuinka monta merkkiä tulee kirjoittaa ennen kuin Evolution yrittää "
+"automaattista täydennystä."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Näytä automaattitäydennetyt nimet osoitteen kanssa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Pakotetaanko sähköpostiosoitteen näyttäminen nimen lisäksi automaattisesti "
+"täydennetyn yhteystiedon kohdalla kentässä."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr "Viimeksi nimien valinta -ikkunassa valitun kansion URI"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr "Viimeksi nimien valinta -ikkunassa valitun kansion URI."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
+msgid "Contact layout style"
+msgstr "Yhteystiedon asettelutyyli"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. “0” (Classic View) places the preview pane below the "
+"contact list. “1” (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+msgid "Contact preview pane position (horizontal)"
+msgstr "Yhteystietojen esikatselupaneelin sijainti (vaaka)"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+msgid "Contact preview pane position (vertical)"
+msgstr "Yhteystietojen esikatselupaneelin sijainti (pysty)"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
+msgid "Show maps"
+msgstr "Näytä kartat"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
+msgid "Whether to show maps in preview pane"
+msgstr "Näytetäänkö kartat esikatselupaneelissa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
+msgid "Primary address book"
+msgstr "Ensisijainen osoitekirja"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
+msgid ""
+"The UID of the selected (or “primary”) address book in the sidebar of the "
+"“Contacts” view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
+msgid "Show preview pane"
+msgstr "Näytä Esikatselupaneeli"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
+msgid "Whether to show the preview pane."
+msgstr "Näytetäänkö esikatselupaneeli."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+#, fuzzy
+#| msgid "Whether to show timezone field in the event/meeting editor"
+msgid "Whether to show phone numbers in the editor"
+msgstr "Näytetäänkö aikavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show SIP addresses in the editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show IM addresses in the editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Web Addresses in the editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+#, fuzzy
+#| msgid "Whether to show timezone field in the event/meeting editor"
+msgid "Whether to show job information in the editor"
+msgstr "Näytetäänkö aikavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show notes in the editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Certificates tab in the editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Muunna sähköpostiviestit Unicode-muotoon"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Muunna viestin teksti Unicode UTF-8-muotoon, jotta roskapostin tunnistavat "
+"merkinnät eivät eroa merkistöjen välillä."
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
+#, fuzzy
+msgid "Save directory for reminder audio"
+msgstr "Äänihälytysten tiedostojen tallennuskansio"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
+#, fuzzy
+msgid "Directory for saving reminder audio files"
+msgstr "Kansio, johon äänimerkkien tiedostot tallennetaan"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
+#, fuzzy
+msgid "Birthday and anniversary reminder value"
+msgstr "Syntymä- ja vuosipäivät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
+#, fuzzy
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "Kuinka monta yksikköä määrittelee oletusmuistutuksen."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
+#, fuzzy
+msgid "Birthday and anniversary reminder units"
+msgstr "Syntymä- ja vuosipäivät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
+#, fuzzy
+msgid ""
+"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
+msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
+msgid "Compress weekends in month view"
+msgstr "Tiivistä viikonloput kuukausinäkymässä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
+#, fuzzy
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+msgstr ""
+"Pakataanko viikonloput kuukausinäkymässä. Tämä tiivistää lauantain ja "
+"sunnuntain yhden viikonpäivän kokoisiksi."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
+msgid "Ask for confirmation when deleting items"
+msgstr "Pyydä vahvistusta poistettaessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
+#, fuzzy
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr "Kysytäänkö vahvistusta poistettaessa tapaamista tai tehtävää."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
+msgid "Confirm expunge"
+msgstr "Varmista siivottaessa poistetut lopullisesti"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
+#, fuzzy
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr "Kysytäänkö vahvistusta siivottaessa tapaamisia tai tehtäviä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
+msgid "Month view vertical pane position"
+msgstr "Kuukausinäkymän pystypaneelin sijainti"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
+#, fuzzy
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+msgstr ""
+"Vaakapaneelin sijainti pikseleinä , kalenterin listojen ja päivämäärien "
+"selausnäkymän välissä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
+msgid "Workday end hour"
+msgstr "Työpäivän päättymistunti"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
+#, fuzzy
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
+msgid "Workday end minute"
+msgstr "Työpäivän päättymisminuutti"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minuutti, jona työpäivä loppuu, väliltä 0-59."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
+msgid "Workday start hour"
+msgstr "Työpäivän alkamistunti"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "Tunti jona työpäivä alkaa 24-tunnin muodossa, väliltä 0-23."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
+msgid "Workday start minute"
+msgstr "Työpäivän alkamisminuutti"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minuutti, jona työpäivä alkaa, väliltä 0-59."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+msgid "Workday start time for Monday"
+msgstr "Työpäivän alkamisaika maanantaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgid ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"or -1 to use day-start-hour and day-start-minute"
+msgstr "Tunti jona työpäivä alkaa 24-tunnin muodossa, väliltä 0-23."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "Workday end time for Monday"
+msgstr "Työpäivän päättymisaika maanantaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#, fuzzy
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-end-hour and day-end-minute"
+msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Workday start time for Tuesday"
+msgstr "Työpäivän alkamisaika tiistaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#, fuzzy
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-start-hour and day-start-minute"
+msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+msgid "Workday end time for Tuesday"
+msgstr "Työpäivän päättymisaika tiistaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Workday start time for Wednesday"
+msgstr "Työpäivän alkamisaika keskiviikolle"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "Workday end time for Wednesday"
+msgstr "Työpäivän päättymisaika keskiviikolle"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Workday start time for Thursday"
+msgstr "Työpäivän alkamisaika torstaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "Workday end time for Thursday"
+msgstr "Työpäivän päättymisaika torstaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "Workday start time for Friday"
+msgstr "Työpäivän alkamisaika perjantaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "Workday end time for Friday"
+msgstr "Työpäivän päättymisaika perjantaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+msgid "Workday start time for Saturday"
+msgstr "Työpäivän alkamisaika lauantaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+msgid "Workday end time for Saturday"
+msgstr "Työpäivän päättymisaika lauantaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+msgid "Workday start time for Sunday"
+msgstr "Työpäivän alkamisaika sunnuntaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Workday end time for Sunday"
+msgstr "Työpäivän päättymisaika sunnuntaille"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+msgid "The second timezone for a Day View"
+msgstr "Päivänäkymän toissijainen aikavyöhyke"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#, fuzzy
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a “timezone” key"
+msgstr ""
+"Näyttää toissijaisen aikavyöhykkeen aikanäkymässä, jos asetettu. Arvo on "
+"samanlainen kuin avaimessa \"timezone\"."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+msgid "Recently used second time zones in a Day View"
+msgstr "Päivänäkymässä äskettäin käytetyt toissijaiset aikavyöhykkeet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+#, fuzzy
+msgid "List of recently used second time zones in a Day View"
+msgstr "Luettelo äskettäin valituista toissijaisista aikavyöhykkeistä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+#, fuzzy
+msgid "Maximum number of recently used timezones to remember"
+msgstr "Kuinka monta äskettäin valittua aikavyöhykettä muistetaan."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#, fuzzy
+msgid ""
+"Maximum number of recently used timezones to remember in a “day-second-"
+"zones” list"
+msgstr ""
+"Enimmäismäärä äskettäin valittuja toissijaisia aikavyöhykkeitä avaimen "
+"\"day_second_zones\" luettelossa."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+msgid "Default reminder value"
+msgstr "Muistutuksen oletusarvo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#, fuzzy
+msgid "Number of units for determining a default reminder"
+msgstr "Kuinka monta yksikköä määrittelee oletusmuistutuksen."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+msgid "Default reminder units"
+msgstr "Muistutusten oletusyksikkö"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#, fuzzy
+msgid "Units for a default reminder, “minutes”, “hours” or “days”"
+msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#, fuzzy
+#| msgid "Default reminder value"
+msgid "Default reminder snooze interval, in minutes"
+msgstr "Muistutuksen oletusarvo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Näytä luokkakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Näytä roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+"Näytetäänkö roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Näytä RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Näytetäänkö RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Näytä tilakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "Näytetäänkö tilakenttä tapahtuman, tehtävät tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Näytä aikavyöhyke tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Näytetäänkö aikavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Näytä tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+"Näytetäänkö tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+msgid "Hide completed tasks"
+msgstr "Piilota valmistuneet tehtävät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#, fuzzy
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymistä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+msgid "Hide task units"
+msgstr "Piilota tehtävien yksiköt"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#, fuzzy
+msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
+msgstr ""
+"Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot \"minutes"
+"\", \"hours\" tai \"days\"."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+msgid "Hide task value"
+msgstr "Piilota tehtävän arvo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#, fuzzy
+msgid "Number of units for determining when to hide tasks"
+msgstr "Kuinka monta yksikköä tarvitaan, jotta tehtävät piilotetaan."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+msgid "Horizontal pane position"
+msgstr "Vaakapaneelin sijainti"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#, fuzzy
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
+msgstr ""
+"Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
+"välissä jos ei olla kuukausinäkymässä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#, fuzzy
+msgid "Last reminder time"
+msgstr "Viimeisen hälytyksen aika"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#, fuzzy
+msgid "Time the last reminder ran, in time_t"
+msgstr "Viimeisimmän hälytyksen suoritusaika, time_t-yksikkönä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#, fuzzy
+#| msgctxt "iCalImp"
+#| msgid "has reminders"
+msgid "Allow past reminders"
+msgstr "sisältää muistutuksia"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+msgid ""
+"Whether can show reminders for events/tasks/memos which already happened"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#, fuzzy
+#| msgid "Marcus Bains Line Color - Day View"
+msgid "Marcus Bains Line Color — Day View"
+msgstr "Marcus Bains -viivan väri - päivänäkymä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#, fuzzy
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr "Marcus Bains -viivan väri päivänäkymässä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#, fuzzy
+#| msgid "Marcus Bains Line Color - Time bar"
+msgid "Marcus Bains Line Color — Time bar"
+msgstr "Marcus Bains -viivan väri - aikajana"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#, fuzzy
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgstr ""
+"Väri, jolla Marcus Bains -viiva piirretään aikajanassa (tyhjä oletuksena)."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains -viiva"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#, fuzzy
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr "Piirretäänkö Marcus Bains -viiva (viiva nykyhetkessä) kalenteriin."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+msgid "Memo preview pane position (horizontal)"
+msgstr "Muistilappujen esikatselupaneelin sijainti (vaaka)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#, fuzzy
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr "Paneelin sijainti sen ollessa vaaka-asennossa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+msgid "Memo layout style"
+msgstr "Muistilappujen asettelutyyli"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. “0” (Classic View) places the preview pane below the memo "
+"list. “1” (Vertical View) places the preview pane next to the memo list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+msgid "Memo preview pane position (vertical)"
+msgstr "Muistilappujen esikatselupaneelin sijainti (pysty)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#, fuzzy
+msgid "Position of the memo preview pane when oriented vertically"
+msgstr "Paneelin sijainti sen ollessa pystyasennossa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "Month view horizontal pane position"
+msgstr "Kuukausinäkymän vaakapaneelin sijainti"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#, fuzzy
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+msgstr ""
+"Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
+"välissä käytettäessä kuukausinäkymää."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#, fuzzy
+msgid "Scroll Month View by a week, not by a month"
+msgstr "Siirrytäänkö kuukausinäkymässä viikoittain, eikä kuukausittain."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#, fuzzy
+msgid "Whether to scroll a Month View by a week, not by a month"
+msgstr "Siirrytäänkö kuukausinäkymässä viikoittain, eikä kuukausittain."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+msgid "Reminder programs"
+msgstr "Muistutusohjelmat"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#, fuzzy
+msgid "Programs that are allowed to be run by reminders"
+msgstr "Ohjelmat, joita voidaan suorittaa hälytyksistä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#, fuzzy
+msgid "Show display reminders in notification tray"
+msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#, fuzzy
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr "Käytetäänkö ilmoitusaluetta hälytysten näyttämiseen."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#, fuzzy
+msgid "Show reminder notification dialog always on top"
+msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+msgid ""
+"Whether or not to show reminder notification dialog always on top. Note this "
+"works only as a hint for the window manager, which may or may not obey it."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+msgid "Preferred New button item"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+msgid "Name of the preferred New toolbar button item"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+msgid "Primary calendar"
+msgstr "Ensisijainen kalenteri"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+msgid ""
+"The UID of the selected (or “primary”) calendar in the sidebar of the "
+"“Calendar” view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+msgid "Primary memo list"
+msgstr "Ensisijainen muistilappulista"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+msgid ""
+"The UID of the selected (or “primary”) memo list in the sidebar of the "
+"“Memos” view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+msgid "Primary task list"
+msgstr "Ensisijainen tehtävälista"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+msgid ""
+"The UID of the selected (or “primary”) task list in the sidebar of the "
+"“Tasks” view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+msgid "Free/busy template URL"
+msgstr "Vapaa/varattu-mallin osoite"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#, fuzzy, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain"
+msgstr ""
+"URL-malli, jota käytetään vapaa/varattu-tiedon varaosoitteena. %u korvataan "
+"sähköpostiosoitteen käyttäjäosalla ja %d aluenimellä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+msgid "Recurrent Events in Italic"
+msgstr "Toistuvat tapahtumat kursivoituna"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+msgid "Show days with recurrent events in italic font in bottom left calendar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+msgid "Search range for time-based searching in years"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+msgid "Show appointment end times in week and month views"
+msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#, fuzzy
+msgid "Whether to display the end time of events in the week and month views"
+msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#, fuzzy
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment icons in the month view"
+msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#, fuzzy
+msgid "Whether to show icons of events in the month view"
+msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+msgid "Show the memo preview pane"
+msgstr "Näytä muistilappujen esikatselupaneeli"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#, fuzzy
+msgid "If “true”, show the memo preview pane in the main window"
+msgstr "Näytä muistilappujen esikatselupaneeli"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+msgid "Show the task preview pane"
+msgstr "Näytä tehtävien esikatselupaneeli"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#, fuzzy
+msgid "If “true”, show the task preview pane in the main window"
+msgstr "Näytä tehtävien esikatselupaneeli"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#, fuzzy
+msgid "Whether to show week numbers in various places in the Calendar"
+msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#, fuzzy
+msgid "Vertical position for the tag pane"
+msgstr "Pystysijainti"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+msgid "Highlight tasks due today"
+msgstr "Korosta tänään erääntyvät tehtävät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+msgid "Tasks due today color"
+msgstr "Tänään erääntyvien tehtävien väri"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#, fuzzy
+msgid ""
+"Background color of tasks that are due today, in “#rrggbb” format. Used "
+"together with task-due-today-highlight"
+msgstr "Tänään erääntyvien tehtävien väri, \"#rrggbb\"-muodossa."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Task preview pane position (horizontal)"
+msgstr "Tehtävien esikatselupaneelin sijainti (vaaka)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Task layout style"
+msgstr "Tehtävien asettelutapa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. “0” (Classic View) places the preview pane below the task "
+"list. “1” (Vertical View) places the preview pane next to the task list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Task preview pane position (vertical)"
+msgstr "Tehtävien esikatselupaneelin sijainti (pysty)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#, fuzzy
+msgid "Position of the task preview pane when oriented vertically"
+msgstr "Paneelin sijainti sen ollessa pystyasennossa"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#, fuzzy
+#| msgid "Hide completed tasks"
+msgid "Show reminders for completed tasks"
+msgstr "Piilota valmistuneet tehtävät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid ""
+"Whether to show reminders for completed tasks. When set to false, reminders "
+"for completed tasks are suppressed."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+msgid "Highlight overdue tasks"
+msgstr "Korosta eräpäivän ylittäneet tehtävät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+msgid "Overdue tasks color"
+msgstr "Eräpäivän ylittäneiden tehtävien väri"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#, fuzzy
+msgid ""
+"Background color of tasks that are overdue, in “#rrggbb” format. Used "
+"together with task-overdue-highlight."
+msgstr "Eräpäivän ylittäneiden tehtävien väri, \"#rrggbb\"-muodossa."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+msgid "Time divisions"
+msgstr "Aikajaot"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#, fuzzy
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr "Päivä- ja viikkonäkymissä näytettävät aikavälit minuutteina."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+msgid "Timezone"
+msgstr "Aikavyöhyke"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#, fuzzy
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like “America/New York”"
+msgstr ""
+"Oletusaikavyöhyke käytettävissä päivämäärissä ja kalenterissa, muodossa "
+"kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/"
+"Helsinki\"."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+msgid "Twenty four hour time format"
+msgstr "24 tunnin kello"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#, fuzzy
+msgid "Whether to show times in twenty four hour format instead of using am/pm"
+msgstr "Näytetäänkö kello 24 tunnin vai am/pm-muodossa."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+msgid "Birthday and anniversary reminder"
+msgstr "Syntymä- ja vuosipäivämuistutus"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#, fuzzy
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "Asetetaanko tapaamisille oletusmuistutus."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+msgid "Default appointment reminder"
+msgstr "Tapaamisen oletusmuistutus"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#, fuzzy
+msgid "Whether to set a default reminder for appointments"
+msgstr "Asetetaanko tapaamisille oletusmuistutus."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+msgid "Use system timezone"
+msgstr "Käytä järjestelmän aikavyöhykettä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr "Käytä järjestelmän aikavyöhykettä Evolutionista valitun sijasta"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+msgid "First day of the week"
+msgstr "Viikon ensimmäinen päivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+msgid "Monday is a work day"
+msgstr "Maanantai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+msgid "Tuesday is a work day"
+msgstr "Tiistai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+msgid "Wednesday is a work day"
+msgstr "Keskiviikko on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "Thursday is a work day"
+msgstr "Torstai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+msgid "Friday is a work day"
+msgstr "Perjantai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+msgid "Saturday is a work day"
+msgstr "Lauantai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+msgid "Sunday is a work day"
+msgstr "Sunnuntai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+msgid "Create events, memos and tasks as Private by default"
+msgstr "Luo tapahtumat, muistiinpanot ja tehtävät yksityisenä oletuksena"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+#, fuzzy
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“week-start-day-name” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+msgid "(Deprecated) Work days"
+msgstr "(Vanhennettu) Työpäivät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
+msgid ""
+"Days on which the start and end of work hours should be indicated. (This key "
+"was deprecated in version 3.10 and should no longer be used. Use the “work-"
+"day-monday”, “work-day-tuesday”, etc. keys instead.)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:1
+msgid "Previous Evolution version"
+msgstr "Evolutionin edellinen versio"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:2
+msgid ""
+"The most recently used version of Evolution, expressed as “major.minor."
+"micro”. This is used for data and settings migration from older to newer "
+"versions."
+msgstr ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+msgid "List of disabled plugins"
+msgstr "Luettelo käytöstä poistetuista lisäosista"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+msgid "The list of disabled plugins in Evolution"
+msgstr "Luettelo Evolutionin käytöstä poistetuista lisäosista"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+#| msgid "The window's X coordinate"
+msgid "The window’s X coordinate"
+msgstr "Ikkunan X-koordinaatti"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+#| msgid "The window's Y coordinate"
+msgid "The window’s Y coordinate"
+msgstr "Ikkunan Y-koordinaatti"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+#| msgid "The window's width in pixels"
+msgid "The window’s width in pixels"
+msgstr "Ikkunan leveys pikseleissä"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
+#| msgid "The window's height in pixels"
+msgid "The window’s height in pixels"
+msgstr "Ikkunan korkeus pikseleissä"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+msgid "Whether the window is maximized"
+msgstr "Onko ikkuna suurennettu"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
+#| msgid "Gnome Calendar's calendar import done"
+msgid "GNOME Calendar’s calendar import done"
+msgstr "Gnome-kalenterin kalenterituonti valmis"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
+msgid "Whether calendar from GNOME Calendar has been imported or not"
+msgstr ""
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+#, fuzzy
+#| msgid "Gnome Calendar's calendar import done"
+msgid "GNOME Calendar’s tasks import done"
+msgstr "Gnome-kalenterin kalenterituonti valmis"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
+msgid "Whether tasks from GNOME Calendar have been imported or not"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Tarkista onko Evolution sähköpostin oletusohjelma"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Tarkista aina Evolutionin käynnistyessä onko se sähköpostin oletusohjelma."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
+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ö."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+#, fuzzy
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Name of the editor to prefer in the message composer"
+msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"If the name doesn’t correspond to any known editor, then the built-in WebKit "
+"editor is used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+msgid "Path where picture gallery should search for its content"
+msgstr "Polku, josta kuvagallerian tulisi etsiä sisältöä"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+msgid ""
+"This value can be an empty string, which means it’ll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+msgid "Spell check inline"
+msgstr "Oikolue kirjoitettaessa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+msgid "Draw spelling error indicators on words as you type."
+msgstr "Näytä oikoluvun kirjoitusvirhemerkit sanoissa kirjoituksen aikana."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+msgid "Automatic link recognition"
+msgstr "Havaitse linkit automaattisesti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+msgid "Recognize links in text and replace them."
+msgstr "Tunnista linkit tekstissä ja korvaa ne linkillä."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Automatic emoticon recognition"
+msgstr "Tunnista hymiöt automaattisesti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#, fuzzy
+#| msgid "Recognize emoticons in text and replace them with images."
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr "Tunnista hymiöt tekstissä ja korvaa ne kuvilla."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#, fuzzy
+#| msgid "Unicode"
+msgid "Unicode emoticons"
+msgstr "Unicode"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#, fuzzy
+#| msgid "Use Unicode characters for smileys."
+msgid "Use Unicode characters for emoticons."
+msgstr "Käytä Unicode-merkkejä hymiöitä varten."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#, fuzzy
+msgid "Attribute message"
+msgstr "Liitetty viesti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+msgid "Forward message"
+msgstr "Välitetty viesti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+msgid "Original message"
+msgstr "Alkuperäinen viesti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+msgid "Group Reply replies to list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+msgid ""
+"Instead of the normal “Reply to All” behaviour, this option will make the "
+"“Group Reply” toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you’re "
+"replying."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+msgid "Put the cursor at the bottom of replies"
+msgstr "Aseta osoitin viestin loppuun vastattaessa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"Käyttäjät ovat välillä hyvin tarkkoja siitä, mihin kohdistimen tulisi mennä "
+"vastattaessa viestiin. Tämä asetus määrittää, viedäänkö kursori viestin "
+"alkuun vai loppuun."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+msgid "Always request read receipt"
+msgstr "Pyydä aina kuittaus lukemisesta"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr "Lisätäänkö kaikkiin viesteihin oletuksena kuittauspyyntö."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+msgid "Send HTML mail by default"
+msgstr "Lähetä oletuksena HTML-sähköpostia"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+msgid "Send HTML mail by default."
+msgstr "Lähetä HTML-postia oletuksena."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+msgid "Spell checking languages"
+msgstr "Oikoluvun kielet"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+msgid "List of dictionary language codes used for spell checking."
+msgstr "Luettelo oikoluvun käyttämistä sanaston kielikoodeista."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#, fuzzy
+#| msgid "Show \"Bcc\" field when sending a mail message"
+msgid "Show “Bcc” field when sending a mail message"
+msgstr "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#, fuzzy
+#| msgid ""
+#| "Show the \"Bcc\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Bcc” field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
+"valikosta, kun sähköpostitili on valittu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#, fuzzy
+#| msgid "Show \"Cc\" field when sending a mail message"
+msgid "Show “Cc” field when sending a mail message"
+msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#, fuzzy
+#| msgid ""
+#| "Show the \"Cc\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Cc” field when sending a mail message. This is controlled from the "
+"View menu when a mail account is chosen."
+msgstr ""
+"Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
+"valikosta, kun sähköpostitili on valittu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#, fuzzy
+#| msgid "Show \"Cc\" field when sending a mail message"
+msgid "Show “From” override field when sending a mail message"
+msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#, fuzzy
+#| msgid ""
+#| "Show the \"Cc\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
+msgid ""
+"Show the “From” override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+msgstr ""
+"Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
+"valikosta, kun sähköpostitili on valittu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#, fuzzy
+#| msgid "Show \"Reply To\" field when sending a mail message"
+msgid "Show “Reply To” field when sending a mail message"
+msgstr "Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#, fuzzy
+#| msgid ""
+#| "Show the \"Reply To\" field when sending a mail message. This is "
+#| "controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Reply To” field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan "
+"Näytä-valikosta, kun sähköpostitili on valittu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#, fuzzy
+#| msgid "Show \"From\" field when posting to a newsgroup"
+msgid "Show “From” field when posting to a newsgroup"
+msgstr "Näytä \"From\"-kenttä lähetettäessä uutisryhmään"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#, fuzzy
+#| msgid ""
+#| "Show the \"From\" field when posting to a newsgroup. This is controlled "
+#| "from the View menu when a news account is chosen."
+msgid ""
+"Show the “From” field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Näytä \"From\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
+"Näytä-valikosta, kun sähköpostitili on valittu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#, fuzzy
+#| msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgid "Show “Reply To” field when posting to a newsgroup"
+msgstr "Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#, fuzzy
+#| msgid ""
+#| "Show the \"Reply To\" field when posting to a newsgroup. This is "
+#| "controlled from the View menu when a news account is chosen."
+msgid ""
+"Show the “Reply To” field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
+"Näytä-valikosta, kun sähköpostitili on valittu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+msgid "Digitally sign replies when the original message is signed"
+msgstr ""
+"Allekirjoita digitaalisesti vastaukset, kun alkuperäinen viesti on "
+"allekirjoitettu"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#, fuzzy
+msgid "Encode filenames in an Outlook/GMail way"
+msgstr "Muotoile tiedostonimet Outlookin ja GMailin tapaan."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#, fuzzy
+msgid ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+"Koodaa tiedostonimet postiotsakkeissa samalla tavalla kuin Outlook ja Gmail, "
+"jotta ne pystyvät tunnistamaan Evolution lähettämät tiedostonimet, joissa on "
+"UTF-8 merkistön merkkejä. Nämä ohjelmat eivät noudata standardia RFC 2231, "
+"vaan käyttävät virheellistä standardia RFC 2047."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#, fuzzy
+msgid "Send messages through Outbox folder"
+msgstr "Tallennetaan viestiä kansioon"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "Put personalized signatures at the top of replies"
+msgstr "Lisää oma allekirjoitus vastauksen alkuun"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"Käyttäjät ovat välillä hyvin tarkkoja siitä, mihin allekirjoitus tulisi "
+"lisätä vastattaessa viestiin. Tämä asetus määrittää, lisätäänkö se viestin "
+"alkuun vai loppuun."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+msgid "Do not add signature delimiter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Ignore list Reply-To:"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the “Reply to List” action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "List of localized “Re”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+msgid ""
+"Comma-separated list of localized “Re” abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard “Re” prefix. "
+"An example is “SV,AV”."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+msgid "List of localized “Re” separators"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+msgid ""
+"A list of localized “Re” separators, used to skip in a subject text when "
+"replying to a message, as an addition to the standard “:” and the Unicode "
+"“︰” separators."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid "Number of characters for wrapping"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid "Will autowrap lines after given number of characters."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid ""
+"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid ""
+"If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer’s toolbar. Otherwise they are shown only when "
+"being used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+msgid "Wrap quoted text in replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid "If set to “true” quoted text in replies will be wrapped."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+msgid ""
+"Set to “false” to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+msgid "Save file format for drag-and-drop operation"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#| msgid "Can be either 'mbox' or 'pdf'."
+msgid "Can be either “mbox” or “pdf”."
+msgstr "Voi olla joko “mbox” tai “pdf”."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+msgid "Show image animations"
+msgstr "Näytä kuvien animaatiot"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"Näytä animoidut kuvat HTML-viesteissä. Monista käyttäjistä animoidut kuvat "
+"ovat ärsyttäviä ja he haluavat nähdä kuvat ilman animaatioita."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+msgid "Enable or disable type ahead search feature"
+msgstr "Käytetäänkö kirjoituksenaikaista hakua"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+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:77
+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:78
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
+"esikatselussa, viestiluettelossa ja kansioluettelossa."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#, 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:81
+#, 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:82
+#, 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:83
+msgid "Citation highlight color"
+msgstr "Lainauksen korostusväri"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+msgid "Citation highlight color."
+msgstr "Lainauksen korostukseen käytetty väri."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+msgid "Enable/disable caret mode"
+msgstr "Kytke/poista caret-tila"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+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:87
+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:88
+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:89
+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:90
+msgid "Show notification about missing remote content"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+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:92
+msgid "Show Animations"
+msgstr "Näytä animaatiot"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+msgid "Show animated images as animations."
+msgstr "Näytä animoidut kuvat animaatioina."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+msgid "Show all message headers"
+msgstr "Näytä kaikki otsakkeet"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+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:96
+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:97
+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:98
+msgid "Show photo of the sender"
+msgstr "Näytä lähettäjän valokuva"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+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:100
+msgid "Search gravatar.com for photo of the sender"
+msgstr "Näytä lähettäjän valokuvaa gravatar.comista"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+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:103
+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:104
+#, 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:105
+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:106
+#, fuzzy
+msgid "Timeout for marking messages as seen"
+msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#, 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:108
+#| msgid "Show Attachment _Bar"
+msgid "Show Attachment Bar"
+msgstr "Näytä liitepalkki"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+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:111
+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:112
+msgid "Show deleted messages in the message-list"
+msgstr "Näytä poistetut viestit viestiluettelossa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+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:114
+#, 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:115
+#, 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:116
+#, 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:117
+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:118
+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:119
+#, fuzzy
+#| msgid ""
+#| "This key is read only once and reset to \"false\" after read. This "
+#| "unselects the mail in the list and removes the preview for that folder."
+msgid ""
+"This key is read only once and reset to “false” after read. This unselects "
+"the mail in the list and removes the preview for that folder."
+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:120
+msgid "Height of the message-list pane"
+msgstr "Viestiluettelon korkeus"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+msgid "Height of the message-list pane."
+msgstr "Viestiluettelopaneelin korkeus."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+msgid "Whether message headers are collapsed in the user interface"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+msgid "Width of the message-list pane"
+msgstr "Viestiluettelopaneelin leveys"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+msgid "Width of the message-list pane."
+msgstr "Viestiluettelopaneelin leveys."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+msgid "Layout style"
+msgstr "Asettelutyyli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+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:127
+msgid "Variable width font"
+msgstr "Vaihtuvanlevyinen fontti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+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:129
+msgid "Terminal font"
+msgstr "Päätteen fontti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+msgid "The terminal font for mail display."
+msgstr "Päätefontti viestejä näytettäessä."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+msgid "Use custom fonts"
+msgstr "Käytä omia fontteja"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+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:133
+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:134
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+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:135
+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:136
+#, fuzzy
+#| msgid ""
+#| "This sets the number of addresses to show in default message list view, "
+#| "beyond which a '...' is shown."
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a “...” is shown."
+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:137
+msgid "Thread the message-list based on Subject"
+msgstr "Säikeistä viestiluettelo aiheen perusteella"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
+"sisällä In-Reply-To tai References-otsakkeita."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+msgid "Default value for thread expand state"
+msgstr "Säikeen laajennuksen tilan oletusarvo"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. "
+"Muutos vaatii Evolutionin uudelleenkäynnistyksen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+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:142
+#, fuzzy
+#| msgid ""
+#| "This setting specifies whether the threads should be sorted based on "
+#| "latest message in each thread, rather than by message's date. Evolution "
+#| "requires a restart."
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message’s date. Evolution requires a "
+"restart."
+msgstr ""
+"Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin "
+"mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
+"uudelleenkäynnistyksen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+msgid "Whether sort thread children always ascending"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#, fuzzy
+#| msgid ""
+#| "This setting specifies whether the threads should be sorted based on "
+#| "latest message in each thread, rather than by message's date. Evolution "
+#| "requires a restart."
+msgid ""
+"This setting specifies whether the thread children should be sorted always "
+"ascending, rather than using the same sort order as in the thread root level."
+msgstr ""
+"Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin "
+"mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
+"uudelleenkäynnistyksen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+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:147
+msgid "Log filter actions"
+msgstr "Kirjaa suodatintoimenpiteet"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+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:149
+msgid "Logfile to log filter actions"
+msgstr "Lokitiedosto suodattimien toimenpiteille"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+msgid "Logfile to log filter actions."
+msgstr "Lokitiedosto suodattimien toimenpiteille."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+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:153
+msgid "Default forward style"
+msgstr "Välityksen oletustyyli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+msgid "Default reply style"
+msgstr "Vastauksen oletustyyli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#, 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:157
+msgid "Prompt on empty subject"
+msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+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:159
+msgid "Prompt when emptying the trash"
+msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+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:161
+msgid "Prompt when user expunges"
+msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+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:163
+#, 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:164
+#, fuzzy
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+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:165
+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:166
+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:167
+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:168
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
+"eivät sellaista halua vastaanottaa."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+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:170
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+"Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko "
+"todella tehdä sen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+msgid "Prompt while marking multiple messages"
+msgstr "Kysy vahvistus merkittäessä useita viestejä"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+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:173
+msgid "Prompt when deleting messages in search folder"
+msgstr "Kysy poistettaessa viestejä hakukansiosta"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+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:175
+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:176
+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:177
+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:178
+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:179
+#, 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:180
+#, fuzzy
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+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:181
+#, 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:182
+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:183
+#, 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:184
+#, fuzzy
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko "
+"synkronointia yhteydettömään tilaan siirryttäessä."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#, fuzzy
+msgid ""
+"Prompt when switching composer format and the content needs to lose its "
+"formatting"
+msgstr ""
+"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
+"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#, fuzzy
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer format and the content needs to lose its formatting."
+msgstr ""
+"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
+"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#, 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:188
+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:189
+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:190
+msgid "Empty Trash folders on exit"
+msgstr "Tyhjennä roskakorit lopetettaessa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+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:193
+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:194
+msgid "Last time Empty Trash was run"
+msgstr "Roskakori tyhjennettiin viimeksi"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#, 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:196
+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:197
+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:198
+#, fuzzy
+#| msgid ""
+#| "This can have three possible values. \"0\" for errors. \"1\" for "
+#| "warnings. \"2\" for debug messages."
+msgid ""
+"This can have three possible values. “0” for errors. “1” for warnings. “2” "
+"for debug messages."
+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:199
+#, 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:200
+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:201
+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:202
+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."
+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:203
+msgid "Check incoming mail being junk"
+msgstr "Etsi roskapostia saapuvista sähköposteista"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid "Run junk test on incoming mail."
+msgstr "Suorita roskapostitarkistus saapuvalle postille."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+msgid "Empty Junk folders on exit"
+msgstr "Tyhjennä roskapostikansiot lopetettaessa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+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:208
+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:209
+#, fuzzy
+msgid "Last time Empty Junk was run"
+msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#, 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:211
+msgid "The default plugin for Junk hook"
+msgstr "Roskapostikäsittelijän oletuslisäosa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#, fuzzy
+#| msgid ""
+#| "This is the default junk plugin, even though there are multiple plugins "
+#| "enabled. If the default listed plugin is disabled, then it won't fall "
+#| "back to the other available plugins."
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won’t fall back "
+"to the other available plugins."
+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:213
+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:214
+#, fuzzy
+#| msgid ""
+#| "Determines whether to lookup the sender email in address book. If found, "
+#| "it shouldn't be a spam. It looks up in the books marked for "
+#| "autocompletion. It can be slow, if remote address books (like LDAP) are "
+#| "marked for autocompletion."
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn’t be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"Määrittää etsitäänkö lähettäjän osoitetta osoitekirjasta. Jos lähettäjä "
+"löytyy, ei viestiä tulkita roskapostiksi. Lähettäjää etsitään "
+"osoitekirjoista, jotka on valittu automaattista täydennystä varten. Tämä "
+"haku voi olla hidas, jos osoitteita täydennetään esimerkiksi LDAP-"
+"osoitekirjoista."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta "
+"varten vain paikallisista osoitekirjoista"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"Tämä valinta liittyy avaimeen lookup_addressbook ja sitä käytetään "
+"määrittämään, etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, "
+"joille ei tehdä roskapostisuodatusta."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+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:218
+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."
+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:219
+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:220
+#, fuzzy
+#| msgid ""
+#| "Custom headers to use while checking for junk. The list elements are "
+#| "string in the format \"headername=value\"."
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format “headername=value”."
+msgstr ""
+"Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
+"kohdat ovat muodossa \"otsakenimi=arvo\"."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+msgid "UID string of the default account."
+msgstr "Oletustilin UID-merkkijono."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+msgid "Save directory"
+msgstr "Tallenna kansio"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+msgid "Directory for saving mail component files."
+msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+msgid "Composer load/attach directory"
+msgstr "Viesti-ikkunan lataus- ja liitekansio"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+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:226
+msgid "Check for new messages on start"
+msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+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:228
+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:229
+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:230
+msgid "Server synchronization interval"
+msgstr "Palvelimen synkronoinnin aikaväli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Määrittää kuinka usein paikalliset muutokset synkronoidaan "
+"postipalvelimelle. Aikavälin täytyy olla vähintään 30 sekuntia."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#, 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:233
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder→Expunge will "
+"be callable in virtual folders, while the expunge itself will be done in all "
+"folders for all deleted messages within the virtual folder, not only for "
+"deleted messages belonging to the virtual folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../src/mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML format"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+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:236
+msgid "An Archive folder for On This Computer folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+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:238
+#, fuzzy
+#| msgid "Default forward style"
+msgid "(Deprecated) Default forward style"
+msgstr "Välityksen oletustyyli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+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:240
+#, fuzzy
+#| msgid "Default reply style"
+msgid "(Deprecated) Default reply style"
+msgstr "Vastauksen oletustyyli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+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:242
+#, 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:243
+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:244
+#, 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:245
+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:246
+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:247
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“browser-close-on-reply-policy” instead."
+msgstr ""
+
+#. Translators: This is the a list of words for the attach reminder plugin to look
+#. for in a message body. Please use any number of words here in your language that might
+#. indicate that an attachment should have been attached to the message.
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
+msgid "['attachment','attaching','attached','enclosed']"
+msgstr "['attachment','attaching','attached','enclosed,'liite','liitteenä','liitän']"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
+msgid "Address book source"
+msgstr "Osoitekirjan lähde"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
+#, fuzzy
+msgid "Address book to use for storing automatically synced contacts."
+msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
+msgid "Auto sync Pidgin contacts"
+msgstr "Synkronoi Pidginin yhteystiedot automaattisesti"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
+#, fuzzy
+msgid "Enable autocontacts"
+msgstr "Valitse kaikki yhteystiedot"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+msgid ""
+"Whether contacts should be automatically added to the user’s address book."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+msgid "Pidgin address book source"
+msgstr "Pidginin osoitekirjan lähde"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+#, fuzzy
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+msgid "Pidgin check interval"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+msgid "Pidgin last sync MD5"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+msgid "Pidgin last sync MD5."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
+msgid "List of Custom Headers"
+msgstr "Luettelo omista otsakkeista"
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
+#, fuzzy
+#| msgid ""
+#| "The key specifies the list of custom headers that you can add to an "
+#| "outgoing message. The format for specifying a Header and Header value is: "
+#| "Name of the custom header followed by \"=\" and the values separated by "
+#| "\";\""
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by “=” and the values separated by “;”"
+msgstr ""
+"Avain määrittää luettelon omista otsakkeita, joita voit lisätä lähteviin "
+"viesteihin. Muoto otsakkeiden määrittelyksi avaimessa on seuraava: Otsakkeen "
+"nimi, \"=\"-merkki ja otsakkeen sisältö, eroteltuna \";\"-merkeillä."
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
+msgid "Default External Editor"
+msgstr "Ulkoisen muokkaimen oletuskomento"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "Oletuskomento, jota käytetään ulkoisena muokkaimena."
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
+msgid "Automatically launch when a new mail is edited"
+msgstr "Käynnistä automaattisesti uutta viestiä muokattaessa"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
+#, fuzzy
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr ""
+"Käynnistä muokkain automaattisesti, kun nappia painetaan viestin muokkaimessa"
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
+msgid "Insert Face picture by default"
+msgstr "Lisää kasvokuva oletuksena"
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"Lisätäänkö kasvokuva lähteviin viestiin automaattisesti. Kuva on asetettava "
+"ennen tämän valintaa, muuten mitään ei tapahdu."
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
+msgid "Delete processed"
+msgstr "Poista käsitellyt"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
+msgid "Whether to delete processed iTip objects"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
+msgid "Notify new messages for Inbox only."
+msgstr "Huomauta uusista viesteistä vain saapuvien kansiossa."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "Huomautetaanko uusista viesteistä vain saapuvien kansiossa."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "Ota käyttöön D-Bus-viestit."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Luo D-BUS-viestin, kun uusia sähköpostiviestejä saapuu."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
+msgid "Enable icon in notification area."
+msgstr "Ota käyttöön kuvake ilmoitusalueella."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Näytä sähköpostikuvake ilmoitusalueella, kun uusia viestejä saapuu."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
+msgid "Popup message together with the icon."
+msgstr "Ponnahdusikkuna kuvakkeen kanssa."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "Näytetäänkö viesti kuvakkeen päällä uuden sähköpostin saapuessa."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
+#, fuzzy
+#| msgid "Show new mail icon in notification area when new messages arrive."
+msgid "Enable audible notifications when new messages arrive."
+msgstr "Näytä sähköpostikuvake ilmoitusalueella, kun uusia viestejä saapuu."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If “false”, "
+"the “notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and "
+"“notify-sound-use-theme” keys are disregarded."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
+#, fuzzy
+#| msgid "Whether to show the preview pane."
+msgid "Whether to emit a beep."
+msgstr "Näytetäänkö esikatselupaneeli."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
+#, fuzzy
+#| msgid "Whether play sound or beep when new messages arrive."
+msgid "Whether to emit a beep when new messages arrive."
+msgstr "Soitetaanko äänitiedosto vai piipataanko uuden sähköpostin saapuessa."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
+#, fuzzy
+msgid "Sound filename to be played."
+msgstr "Soitettavan äänitiedoston nimi."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+#, fuzzy
+#| msgid ""
+#| "Sound file to be played when new messages arrive, if not in beep mode."
+msgid ""
+"Sound file to be played when new messages arrive, if “notify-sound-play-"
+"file” is “true”."
+msgstr ""
+"Soitettava äänitiedosto, kun uusia viestejä saapuu (jos ei piippaustilassa)."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
+msgid "Whether to play a sound file."
+msgstr "Toistetaanko äänitiedosto."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the “notify-sound-file” key."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
+msgid "Use sound theme"
+msgstr "Käytä ääniteemaa"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+"Soita teeman äänitiedosto viestin saapuessa, jos ei olla piippaustilassa."
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
+#, fuzzy
+msgid "Mode to use when displaying mails"
+msgstr "Käytä omia fontteja näytettäessä viestejä."
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+msgid ""
+"The mode to use for displaying mails. “normal” makes Evolution choose the "
+"best part to show, “prefer_plain” makes it use the text part, if present, "
+"“prefer_source” makes it use the text part, if present, otherwise shows HTML "
+"source, and “only_plain” forces Evolution to only show plain text"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+#, fuzzy
+msgid "Whether to show suppressed HTML output"
+msgstr "Näytetäänkö esikatselupaneeli."
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+#, fuzzy
+#| msgid "List of server URLs for free/busy publishing."
+msgid "List of Destinations for publishing"
+msgstr "Luettelo osoitteista, joissa julkaistaan vapaa/varattu tietoja."
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Luettelo avainsana- ja arvopareista, joita pohjat-lisäosa käyttää viestin "
+"rungon osien korvaamiseen."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
+msgid "Skip development warning dialog"
+msgstr "Ohita kehitysversiovaroitus"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Piilotetaanko varoitusikkuna Evolutionin kehitysversion käytöstä vai ei."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
+msgid "Initial attachment view"
+msgstr "Liitenäkymän oletusarvo"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
+#, fuzzy
+#| msgid ""
+#| "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is "
+#| "List View."
+msgid ""
+"Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
+msgstr ""
+"Liitepalkin elementtien oletusnäkymä. \"0\" on kuvakenäkymä, \"1\" "
+"luettelonäkymä."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
+msgid "Initial file chooser folder"
+msgstr "Tiedostovalitsimen oletuskansio"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser-ikkunoiden oletuskansio."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+msgid "Compression format used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid ""
+"Compression format used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Compression filter used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"Compression filter used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#: ../src/shell/main.c:320
+msgid "Start in offline mode"
+msgstr "Aloita yhteydettömässä tilassa"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr "Käynnistetäänkö Evolution verkkoyhteyksillä vai ilman."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+#, fuzzy
+msgid "Offline folder paths"
+msgstr "Avataan kansiota %s"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#, fuzzy
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage."
+msgstr ""
+"Luettelo poluista kansioihin, jotka synkronisoidaan kovalevylle "
+"yhteydettömään käyttöön"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+msgid "Enable express mode"
+msgstr "Ota pikatila käyttöön"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+msgid "Flag that enables a much simplified user interface."
+msgstr "Ottaa käyttöön paljon yksinkertaistetun käyttöliittymän."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+msgid "List of button names to hide in the window switcher"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+msgid ""
+"Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. "
+"Change of this requires restart of the application."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+msgid "Window buttons are visible"
+msgstr "Ikkunan napit näytetään"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+msgid "Whether the window buttons should be visible."
+msgstr "Näytetäänkö ikkunan napit."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+msgid "Window button style"
+msgstr "Ikkunan painikkeiden tyyli"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#, fuzzy
+#| msgid ""
+#| "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+#| "\"toolbar\". If \"toolbar\" is set, the style of the buttons is "
+#| "determined by the GNOME toolbar setting."
+msgid ""
+"The style of the window buttons. Can be “text”, “icons”, “both”, “toolbar”. "
+"If “toolbar” is set, the style of the buttons is determined by the GNOME "
+"toolbar setting."
+msgstr ""
+"Näytettävien painikkeiden tyyli. Voi olla \"text\", \"icons\", \"both\" tai "
+"\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen "
+"asetusta."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#| msgid "Sidebar is visible"
+msgid "Menubar is visible"
+msgstr "Valikkopalkki on näkyvissä"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Whether the sidebar should be visible."
+msgid "Whether the menubar should be visible."
+msgstr "Näytetäänkö sivupaneeli."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+msgid "Toolbar is visible"
+msgstr "Työkalupalkki on näkyvissä"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
+msgid "Whether the toolbar should be visible."
+msgstr "Näytetäänkö työkalupalkki."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
+msgid "Sidebar is visible"
+msgstr "Sivupaneeli on näkyvissä"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
+msgid "Whether the sidebar should be visible."
+msgstr "Näytetäänkö sivupaneeli."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
+msgid "Statusbar is visible"
+msgstr "Tilarivi on näkyvissä"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
+msgid "Whether the status bar should be visible."
+msgstr "Näytetäänkö tilarivi."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "ID tai alias käynnistyksessä oletuksena näytettävälle komponentille."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:32
+msgid "Default sidebar width"
+msgstr "Sivupaneelin oletusleveys"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:33
+msgid "The default width for the sidebar, in pixels."
+msgstr "Sivupaneelin oletusleveys pikseleinä."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:34
+msgid "Enable special WebKit developer features"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:35
+msgid "Any change of this option requires restart of Evolution."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
+msgid "Use only local spam tests."
+msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia."
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:ää)."
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+
+#: ../data/views/addressbook/galview.xml.h:1
+msgid "_Address Cards"
+msgstr "_Osoitekortit"
+
+#: ../data/views/addressbook/galview.xml.h:2
+#: ../data/views/calendar/galview.xml.h:5
+msgid "_List View"
+msgstr "_Luettelonäkymä"
+
+#: ../data/views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "_Yrityksen mukaan"
+
+#: ../data/views/calendar/galview.xml.h:1
+msgid "_Day View"
+msgstr "_Päivänäkymä"
+
+#: ../data/views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "Työviikk_onäkymä"
+
+#: ../data/views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "_Viikkonäkymä"
+
+#: ../data/views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "_Kuukausinäkymä"
+
+#: ../data/views/mail/galview.xml.h:1
+msgid "_Messages"
+msgstr "_Viestit"
+
+#: ../data/views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "_Lähetetyt-kansion mukaan"
+
+#: ../data/views/mail/galview.xml.h:3
+msgid "By Su_bject"
+msgstr "_Aiheen mukaan"
+
+#: ../data/views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "_Lähettäjän mukaan"
+
+#: ../data/views/mail/galview.xml.h:5
+msgid "By S_tatus"
+msgstr "_Tilan mukaan"
+
+#: ../data/views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "_Vastaus viestiin -lipun mukaan"
+
+#: ../data/views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "Le_veälle näkymälle"
+
+#: ../data/views/mail/galview.xml.h:8
+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
+msgid "_Memos"
+msgstr "_Muistilaput"
+
+#: ../data/views/tasks/galview.xml.h:1
+#: ../src/plugins/pst-import/pst-importer.c:571
+msgid "_Tasks"
+msgstr "_Tehtävät"
+
+#: ../data/views/tasks/galview.xml.h:2
+msgid "With _Due Date"
+msgstr "_Eräpäivän kanssa"
+
+#: ../data/views/tasks/galview.xml.h:3
+msgid "With _Status"
+msgstr "_Tilan kanssa"
+
+#: ../src/addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
 msgstr "Tätä osoitekirjaa ei voi avata."
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../src/addressbook/addressbook.error.xml.h:2
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -46,11 +3178,11 @@ msgstr ""
 "Tämä osoitekirjapalvelin voi olla saavuttamattomissa, palvelimen nimi väärin "
 "kirjoitettu tai verkkoyhteytesi ei ehkä ole käytettävissä."
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../src/addressbook/addressbook.error.xml.h:3
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP-palvelimelle tunnistautuminen epäonnistui."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../src/addressbook/addressbook.error.xml.h:4
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -60,11 +3192,11 @@ msgstr ""
 "kirjautumistapaa. Muista että monissa salasanoissa isot ja pienet kirjaimet "
 "ovat eri asia. Tarkista myös ettei Caps Lock ole päällä."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../src/addressbook/addressbook.error.xml.h:5
 msgid "This address book server does not have any suggested search bases."
 msgstr "Tällä osoitekirjapalvelimella ei ole tuettuja hakupohjia."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../src/addressbook/addressbook.error.xml.h:6
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -74,88 +3206,93 @@ msgstr ""
 "tätä toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy "
 "ylläpidoltasi mitkä ovat tuetut hakupohjat."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../src/addressbook/addressbook.error.xml.h:7
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Tämä palvelin ei tue LDAPv3-skeematietoja."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../src/addressbook/addressbook.error.xml.h:8
 msgid "Could not get schema information for LDAP server."
 msgstr "Skeematietoja ei voi hakea LDAP-palvelimelta."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../src/addressbook/addressbook.error.xml.h:9
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-palvelin ei vastannut kelvollisella skeematiedolla."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../src/addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
 msgstr "Osoitekirjaa ei voitu poistaa."
 
-#: ../addressbook/addressbook.error.xml.h:11
-msgid "Delete address book '{0}'?"
-msgstr "Poistetaanko osoitekirja \"{0}\"?"
+#: ../src/addressbook/addressbook.error.xml.h:11
+#| msgid "Delete address book '{0}'?"
+msgid "Delete address book “{0}”?"
+msgstr "Poistetaanko osoitekirja “{0}”?"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../src/addressbook/addressbook.error.xml.h:12
 msgid "This address book will be removed permanently."
 msgstr "Tämä osoitekirja poistetaan pysyvästi."
 
-#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
-#: ../mail/mail.error.xml.h:69
+#: ../src/addressbook/addressbook.error.xml.h:13
+#: ../src/calendar/calendar.error.xml.h:7 ../src/mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "_Älä poista"
 
-#: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete remote address book &quot;{0}&quot;?"
-msgstr "Poistetaanko etäosoitekirja &quot;{0}&quot;?"
+#: ../src/addressbook/addressbook.error.xml.h:14
+#| msgid "Delete remote address book &quot;{0}&quot;?"
+msgid "Delete remote address book “{0}”?"
+msgstr "Poistetaanko etäosoitekirja “{0}”?"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../src/addressbook/addressbook.error.xml.h:15
+#| msgid ""
+#| "This will permanently remove the address book &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the address book &quot;{0}&quot; from the "
-"server. Are you sure you want to proceed?"
-msgstr ""
-"Osoitekirja &quot;{0}&quot; poistetaan palvelimelta pysyvästi. Haluatko "
-"jatkaa?"
+"This will permanently remove the address book “{0}” from the server. Are you "
+"sure you want to proceed?"
+msgstr "Osoitekirja “{0}” poistetaan palvelimelta pysyvästi. Haluatko jatkaa?"
 
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:65
+#: ../src/addressbook/addressbook.error.xml.h:16
+#: ../src/calendar/calendar.error.xml.h:65
 msgid "_Delete From Server"
 msgstr "_Poista palvelimelta"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../src/addressbook/addressbook.error.xml.h:17
 msgid "Category editor not available."
 msgstr "Luokkien muokkain ei ole käytettävissä."
 
-#: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book '{0}'"
-msgstr "Osoitekirjan '{0}' avaaminen epäonnistui"
+#: ../src/addressbook/addressbook.error.xml.h:18
+#| msgid "Unable to open address book '{0}'"
+msgid "Unable to open address book “{0}”"
+msgstr "Osoitekirjan “{0}” avaaminen epäonnistui"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../src/addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
 msgstr "Hakua ei voi suorittaa."
 
-#: ../addressbook/addressbook.error.xml.h:20
-msgid "Failed to refresh address book '{0}'"
-msgstr "Osoitekirjan '{0}' päivittäminen epäonnistui"
+#: ../src/addressbook/addressbook.error.xml.h:20
+#| msgid "Failed to refresh address book '{0}'"
+msgid "Failed to refresh address book “{0}”"
+msgstr "Osoitekirjan “{0}” päivittäminen epäonnistui"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../src/addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../src/addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "Olet tehnyt muutoksia tähän yhteystietoon. Haluatko tallentaa muutoksesi?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../src/addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "_Hylkää"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../src/addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "Yhteystietoa ei voi siirtää."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -163,37 +3300,38 @@ msgstr ""
 "Yrität siirtää yhteystietoa osoitekirjasta toiseen, mutta sitä ei voi "
 "poistaa lähteestä. Haluatko sen sijaan tallentaa kopion?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Valitsemasi kuva on suuri. Haluatko muuttaa kuvan kokoa ja tallentaa sen?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Muuta kokoa"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "Käytä _sellaisenaan"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "Ä_lä tallenna"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "{0} ei voi tallentaa."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Virhe tallennettaessa {0} kohteeseen {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:32
-msgid "Address '{0}' already exists."
-msgstr "Osoite \"{0}\" on jo olemassa."
+#: ../src/addressbook/addressbook.error.xml.h:32
+#| msgid "Address '{0}' already exists."
+msgid "Address “{0}” already exists."
+msgstr "Osoite “{0}” on jo olemassa."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -201,27 +3339,30 @@ msgstr ""
 "Tälle osoitteelle on jo yhteystieto. Haluatko lisätä uuden yhteystiedon "
 "samalla osoitteella?"
 
-#: ../addressbook/addressbook.error.xml.h:34
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:723
-#: ../calendar/gui/e-comp-editor-page-general.c:1357
-#: ../e-util/e-mail-signature-manager.c:328
-#: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
-#: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
-#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:416
-#: ../plugins/attachment-reminder/attachment-reminder.c:457
-#: ../plugins/email-custom-header/email-custom-header.c:839
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../plugins/templates/templates.c:465
+#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1355
+#: ../src/e-util/e-mail-signature-manager.c:328
+#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:23
+#: ../src/mail/e-mail-account-manager.c:719
+#: ../src/mail/e-mail-label-manager.c:371
+#: ../src/mail/em-folder-properties.c:1031
+#: ../src/mail/em-vfolder-editor-rule.c:397
+#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:60
+#: ../src/modules/mail/em-composer-prefs.c:422
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:543
+#: ../src/plugins/email-custom-header/email-custom-header.c:837
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../src/plugins/templates/templates.c:463
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "Jotkin osoitteet ovat jo olemassa tässä yhteystietoluettelossa."
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -229,584 +3370,623 @@ msgstr ""
 "Olet lisäämässä osoitteita, jotka ovat jo tässä luettelossa. Haluatko lisätä "
 "ne silti?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Ohita kaksoiskappaleet"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../src/addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Lisää kaksoiskappaleineen"
 
-#: ../addressbook/addressbook.error.xml.h:39
-msgid "List '{0}' is already in this contact list."
-msgstr "Luettelo '{0}' on jo tässä yhteystietoluettelossa."
+#: ../src/addressbook/addressbook.error.xml.h:39
+#| msgid "List '{0}' is already in this contact list."
+msgid "List “{0}” is already in this contact list."
+msgstr "Luettelo “{0}” on jo tässä yhteystietoluettelossa."
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:40
+#| msgid ""
+#| "A contact list named '{0}' is already in this contact list. Would you "
+#| "like to add it anyway?"
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
+"A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
 msgstr ""
-"Yhteystieto nimellä '{0}' on jo tässä yhteystietoluettelossa. Haluatko "
+"Yhteystieto nimellä “{0}” on jo tässä yhteystietoluettelossa. Haluatko "
 "lisätä sen silti?"
 
-#: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
+#: ../src/addressbook/addressbook.error.xml.h:41
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "Oikeutesi eivät riitä yhteystietojen poistamiseen tästä osoitekirjasta."
 
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "Uutta yhteystietoa ei voi lisätä"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:45
+#, fuzzy
+#| msgid ""
+#| "'{0}' is a read-only address book and cannot be modified. Please select a "
+#| "different address book from the side bar in the Contacts view."
 msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
+"“{0}” is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 msgstr ""
 "\"{0}\" on vain luettavissa oleva osoitekirja eikä sitä voi muokata. Valitse "
 "yhteystietonäkymän sivupalkista toinen osoitekirja."
 
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Yhteystiedon tallennus ei onnistu, osoitekirja avautuu edelleen"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:48
+#, fuzzy
+#| msgid ""
+#| "Cannot save a contact to the address book '{0}', because it is still "
+#| "opening. Either wait till it's opened, or select a different address book."
 msgid ""
-"Cannot save a contact to the address book '{0}', because it is still "
-"opening. Either wait till it's opened, or select a different address book."
+"Cannot save a contact to the address book “{0}”, because it is still "
+"opening. Either wait till it’s opened, or select a different address book."
 msgstr ""
 "Yhteystiedon tallennus osoitekirjaan '{0}' ei onnistu, koska osoitekirja "
 "avautuu edelleen. Odota sen avautumista, tai valitse toinen osoitekirja."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:727
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:749
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+#: ../src/addressbook/addressbook.error.xml.h:49
+#, fuzzy
+#| msgid "Search for text in the displayed contact"
+msgid "Something has gone wrong when displaying the contact"
+msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
+
+#: ../src/addressbook/addressbook.error.xml.h:50
+msgid ""
+"A WebKitWebProcess crashed when displaying the contact. You can try again by "
+"moving to another contact and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
+msgid "Show Telephone"
+msgstr "Näytä puhelin"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:2
+msgid "Show SIP Address"
+msgstr "Näytä SIP-osoite"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Show Instant Messaging"
+msgstr "Näytä pikaviestin"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Show Web Addresses"
+msgstr "Näytä verkko-osoitteet"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:5
+#, fuzzy
+#| msgid "Show the second time zone"
+msgid "Show Job section"
+msgstr "Näytä toinen aikavyöhyke"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:6
+#, fuzzy
+#| msgid "Miscellaneous"
+msgid "Show Miscellaneous"
+msgstr "Sekalaiset"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:7
+#, fuzzy
+#| msgid "Mailing Address"
+msgid "Show Home Mailing Address"
+msgstr "Postitusosoite"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:8
+#, fuzzy
+#| msgid "Mailing Address"
+msgid "Show Work Mailing Address"
+msgstr "Postitusosoite"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:9
+#, fuzzy
+#| msgid "Mailing Address"
+msgid "Show Other Mailing Address"
+msgstr "Postitusosoite"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:10
+#, fuzzy
+#| msgid "Show %s"
+msgid "Show Notes"
+msgstr "Näytä %s"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Show Certificates"
+msgstr "Näytä varmenteet"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:747
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3108
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1996
+#: ../src/mail/mail-config.ui.h:37
+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:3271
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4319
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:472
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:716
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:316
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
+#: ../src/calendar/gui/e-cal-dialogs.c:694
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
+#: ../src/composer/e-composer-actions.c:227 ../src/e-util/e-activity-bar.c:357
+#: ../src/e-util/e-attachment-dialog.c:309
+#: ../src/e-util/e-attachment-store.c:664
+#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:301
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:137
+#: ../src/e-util/e-category-editor.c:207 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-color-chooser-widget.c:125
+#: ../src/e-util/e-filter-datespec.c:289
+#: ../src/e-util/e-html-editor-actions.c:321
+#: ../src/e-util/e-html-editor-actions.c:415
+#: ../src/e-util/e-image-chooser-dialog.c:169
+#: ../src/e-util/e-mail-signature-script-dialog.c:366
+#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
+#: ../src/e-util/e-rule-editor.c:178 ../src/e-util/e-rule-editor.c:280
+#: ../src/e-util/e-rule-editor.c:789 ../src/e-util/e-send-options.ui.h:16
+#: ../src/e-util/e-source-config-dialog.c:377
+#: ../src/e-util/e-source-selector-dialog.c:370
+#: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
+#: ../src/e-util/e-timezone-dialog.ui.h:2
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4065
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:267
+#: ../src/mail/e-mail-config-window.c:331 ../src/mail/e-mail-label-dialog.c:194
+#: ../src/mail/e-mail-tag-editor.c:168 ../src/mail/em-folder-selector.c:318
+#: ../src/mail/mail-config.ui.h:2 ../src/mail/mail.error.xml.h:16
+#: ../src/mail/mail-send-recv.c:747 ../src/mail/mail-send-recv.c:829
+#: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
+#: ../src/modules/backup-restore/evolution-backup-tool.c:932
+#: ../src/modules/calendar/e-cal-attachment-handler.c:283
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
+#: ../src/plugins/face/face.c:295
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
+#: ../src/plugins/save-calendar/save-calendar.c:185
+#: ../src/shell/e-shell-content.c:657 ../src/shell/e-shell-content.c:764
+#: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
+#: ../src/smime/gui/certificate-manager.c:665
+#: ../src/smime/gui/certificate-manager.c:742
+#: ../src/smime/gui/certificate-manager.c:966
+#: ../src/smime/gui/certificate-manager.c:1348
+#: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
+#: ../src/calendar/calendar.error.xml.h:47
+#: ../src/calendar/gui/e-comp-editor.c:2107
+#: ../src/composer/e-composer-actions.c:228
+#: ../src/composer/e-composer-actions.c:348
+#: ../src/e-util/e-attachment-store.c:833
+#: ../src/e-util/e-mail-signature-script-dialog.c:370
+#: ../src/e-util/e-web-view.c:4066
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
+#: ../src/shell/e-shell-content.c:658 ../src/shell/e-shell-utils.c:140
+#: ../src/smime/gui/certificate-manager.c:666
+#: ../src/smime/gui/certificate-manager.c:743
+msgid "_Save"
+msgstr "_Tallenna"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../src/calendar/gui/e-comp-editor.c:2004
+#: ../src/calendar/gui/e-comp-editor.c:2076
+#: ../src/e-util/e-preferences-window.c:380
+#: ../src/e-util/e-send-options.ui.h:15
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
+#: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:964
+msgid "_Help"
+msgstr "O_hje"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Image"
 msgstr "Kuva"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Nic_kname:"
 msgstr "_Lempinimi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "_File under:"
 msgstr "_Näytä nimellä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
 msgid "_Where:"
 msgstr "_Missä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Ca_tegories..."
 msgstr "Ry_hmät..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:750
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1169
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "Sähköposti"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "_Wants to receive HTML mail"
 msgstr "Haluaa sähköpostit _HTML-muodossa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "SIP Address"
 msgstr "SIP-osoite"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:983
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../src/addressbook/importers/evolution-vcard-importer.c:981
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Home Page:"
 msgstr "K_otisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/e-comp-editor-event.c:729
-#: ../modules/itip-formatter/itip-view.c:2033
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../src/calendar/gui/e-comp-editor-event.c:727
+#: ../src/modules/itip-formatter/itip-view.c:2045
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Free/Busy:"
 msgstr "_Vapaa/varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Video Chat:"
 msgstr "_Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Home Page:"
 msgstr "Kotisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:94
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../src/modules/cal-config-google/e-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "Free/Busy:"
 msgstr "Vapaa/Varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "Video Chat:"
 msgstr "Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Blog:"
 msgstr "_Blog:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "Blog:"
 msgstr "Blog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "Web Addresses"
 msgstr "Web-osoitteet"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgctxt "Job"
 msgid "_Title:"
 msgstr "_Titteli:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Company:"
 msgstr "_Yritys:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Office:"
 msgstr "_Toimisto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Manager:"
 msgstr "_Esimies:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Assistant:"
 msgstr "_Apulainen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "Job"
 msgstr "Työ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Spouse:"
 msgstr "_Puoliso:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Birthday:"
 msgstr "_Syntymäpäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2044
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../src/calendar/gui/e-calendar-view.c:2045
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2043
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../src/calendar/gui/e-calendar-view.c:2044
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:55
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:56
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:57
 msgid "_Zip/Postal Code:"
 msgstr "_Postinumero:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:58
 msgid "_State/Province:"
 msgstr "_Osavaltio/lääni:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:59
 msgid "_Country:"
 msgstr "_Maa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:60
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-#: ../composer/e-composer-from-header.c:123
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../src/composer/e-composer-from-header.c:122
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../addressbook/gui/widgets/e-contact-map.c:369
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../src/addressbook/gui/widgets/e-contact-map.c:367
 msgid "Home"
 msgstr "Koti"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
-#: ../addressbook/gui/widgets/e-contact-map.c:382
+#: ../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:848
+#: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Työ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
-#: ../calendar/gui/e-cal-model.c:3825
+#: ../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:513
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:915
+#: ../src/calendar/gui/e-cal-model.c:3823
 msgid "Other"
 msgstr "Muut"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Mailing Address"
 msgstr "Postitusosoite"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:66
+#: ../src/mail/filtertypes.xml.in.h:50 ../src/mail/searchtypes.xml.in.h:52
+#: ../src/mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "Muistilaput"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:67
 msgid "Add _PGP"
 msgstr "Lisää _PGP"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:68
 msgid "Add _X.509"
 msgstr "Lisää _X.509"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../calendar/gui/e-comp-editor-page-general.c:1373
-#: ../e-util/e-attachment-view.c:357 ../e-util/e-filter-rule.c:225
-#: ../e-util/e-mail-signature-manager.c:368
-#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.error.xml.h:18
-#: ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391
-#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
-#: ../mail/mail-config.ui.h:59
-#: ../plugins/attachment-reminder/attachment-reminder.c:467
-#: ../plugins/email-custom-header/email-custom-header.c:849
-#: ../plugins/publish-calendar/publish-calendar.c:791
-#: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:475
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1371
+#: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:223
+#: ../src/e-util/e-mail-signature-manager.c:368
+#: ../src/e-util/e-name-selector-dialog.c:1037
+#: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
+#: ../src/mail/em-folder-properties.c:1037
+#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:61
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:553
+#: ../src/plugins/email-custom-header/email-custom-header.c:847
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/templates/templates.c:473
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:70
 msgid "Load P_GP"
 msgstr "Lataa P_GP"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:71
 msgid "_Load X.509"
 msgstr "_Lataa X.509"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2107
-#: ../composer/e-composer-actions.c:230 ../composer/e-composer-actions.c:347
-#: ../e-util/e-attachment-store.c:831
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3863
-#: ../e-util/gal-view-instance-save-as-dialog.c:270
-#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
-#: ../smime/gui/certificate-manager.c:668
-#: ../smime/gui/certificate-manager.c:745
-msgid "_Save"
-msgstr "_Tallenna"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
-#: ../modules/addressbook/e-book-shell-backend.c:314
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
+#: ../src/modules/addressbook/e-book-shell-backend.c:312
 msgid "Certificates"
 msgstr "Varmenteet"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/e-comp-editor.c:2004 ../calendar/gui/e-comp-editor.c:2076
-#: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:955
-msgid "_Help"
-msgstr "O_hje"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1998
-#: ../mail/mail-config.ui.h:37
-msgid "Options"
-msgstr "Asetukset"
-
-#. This is only shown if the EActivity has a GCancellable.
-#. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3506
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4321
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../addressbook/gui/widgets/eab-contact-merging.c:474
-#: ../addressbook/gui/widgets/eab-contact-merging.c:718
-#: ../addressbook/gui/widgets/eab-gui-util.c:318
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1365
-#: ../calendar/gui/e-cal-dialogs.c:689
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
-#: ../composer/e-composer-actions.c:229 ../e-util/e-activity-bar.c:359
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:666
-#: ../e-util/e-attachment-store.c:830 ../e-util/e-attachment-view.c:303
-#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
-#: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
-#: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:323 ../e-util/e-html-editor-actions.c:414
-#: ../e-util/e-image-chooser-dialog.c:171
-#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
-#: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
-#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:791
-#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
-#: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3862
-#: ../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
-#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:16
-#: ../mail/mail-send-recv.c:746 ../mail/mail-send-recv.c:828
-#: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:899
-#: ../modules/calendar/e-cal-attachment-handler.c:285
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:297
-#: ../plugins/publish-calendar/publish-calendar.c:790
-#: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
-#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
-#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:667
-#: ../smime/gui/certificate-manager.c:744
-#: ../smime/gui/certificate-manager.c:968
-#: ../smime/gui/certificate-manager.c:1350 ../smime/gui/e-cert-selector.c:237
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "_Cancel"
-msgstr "_Peru"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
-msgid "Show Telephone"
-msgstr "Näytä puhelin"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
-msgid "Show SIP Address"
-msgstr "Näytä SIP-osoite"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
-msgid "Show Instant Messaging"
-msgstr "Näytä pikaviestin"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
-msgid "Show Web Addresses"
-msgstr "Näytä verkko-osoitteet"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
-#, fuzzy
-#| msgid "Show the second time zone"
-msgid "Show Job section"
-msgstr "Näytä toinen aikavyöhyke"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
-#, fuzzy
-#| msgid "Miscellaneous"
-msgid "Show Miscellaneous"
-msgstr "Sekalaiset"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
-#, fuzzy
-#| msgid "Mailing Address"
-msgid "Show Home Mailing Address"
-msgstr "Postitusosoite"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
-#, fuzzy
-#| msgid "Mailing Address"
-msgid "Show Work Mailing Address"
-msgstr "Postitusosoite"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
-#, fuzzy
-#| msgid "Mailing Address"
-msgid "Show Other Mailing Address"
-msgstr "Postitusosoite"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
-#, fuzzy
-#| msgid "Show %s"
-msgid "Show Notes"
-msgstr "Näytä %s"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
-msgid "Show Certificates"
-msgstr "Näytä varmenteet"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/e-comp-editor.c:2039 ../e-util/e-html-editor-actions.c:899
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
+#: ../src/calendar/gui/e-comp-editor.c:2039
+#: ../src/e-util/e-html-editor-actions.c:913
 msgid "_Undo"
 msgstr "_Kumoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/e-comp-editor.c:2041 ../e-util/e-focus-tracker.c:122
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Kumoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/e-comp-editor.c:2046 ../e-util/e-html-editor-actions.c:885
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
+#: ../src/calendar/gui/e-comp-editor.c:2046
+#: ../src/e-util/e-html-editor-actions.c:899
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/e-comp-editor.c:2048 ../e-util/e-focus-tracker.c:138
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-#: ../addressbook/gui/widgets/eab-gui-util.c:503
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:501
 msgid "Error adding contact"
 msgstr "Virhe lisättäessä yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:321
 msgid "Error modifying contact"
 msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:341
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:743
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
 #, c-format
-msgid "Contact Editor - %s"
-msgstr "Yhteystietojen muokkain - %s"
+#| msgid "Contact Editor - %s"
+msgid "Contact Editor — %s"
+msgstr "Yhteystietojen muokkain — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3238
 msgid "X.509 certificates"
 msgstr "X.509-varmenteet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3243
 msgid "PGP keys"
 msgstr "PGP-avaimet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
-#: ../smime/gui/certificate-manager.c:691
-#: ../smime/gui/certificate-manager.c:980
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3249
+#: ../src/smime/gui/certificate-manager.c:689
+#: ../src/smime/gui/certificate-manager.c:978
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
 msgid "Open PGP key"
 msgstr "Avaa PGP-avain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
 msgid "Open X.509 certificate"
 msgstr "Avaa X.509-varmenne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../e-util/e-attachment-store.c:664 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:324 ../e-util/e-html-editor-actions.c:415
-#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
-#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:969
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4320
+#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:145
+#: ../src/e-util/e-html-editor-actions.c:322
+#: ../src/e-util/e-html-editor-actions.c:416
+#: ../src/e-util/e-image-chooser-dialog.c:172 ../src/plugins/face/face.c:296
+#: ../src/shell/e-shell-utils.c:71 ../src/smime/gui/certificate-manager.c:967
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3520
 msgid "Chosen file is not a local file."
 msgstr "Valittu tiedosto ei ole paikallinen tiedosto."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Varmenteen lataaminen epäonnistui: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save PGP key"
 msgstr "Tallenna PGP-avain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save X.509 certificate"
 msgstr "Tallenna X.509-varmenne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3532
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Varmenteen tallentaminen epäonnistui: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4316
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4672
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4670
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -814,460 +3994,461 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4678
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
 #, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' sisältää virheellisen muotoilun"
+#| msgid "'%s' has an invalid format"
+msgid "“%s” has an invalid format"
+msgstr "“%s” sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4686
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
 #, c-format
-msgid "'%s' cannot be a future date"
-msgstr "'%s' ei voi olla tuleva päivä"
+#| msgid "'%s' cannot be a future date"
+msgid "“%s” cannot be a future date"
+msgstr "“%s” ei voi olla tuleva päivä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4694
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4692
 #, c-format
-msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' sisältää virheellisen muotoilun"
+#| msgid "%s'%s' has an invalid format"
+msgid "%s“%s” has an invalid format"
+msgstr "%s“%s” sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4707
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4721
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4705
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4719
 #, c-format
-msgid "%s'%s' is empty"
-msgstr "%s'%s' on tyhjä"
+#| msgid "%s'%s' is empty"
+msgid "%s“%s” is empty"
+msgstr "%s“%s” on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4734
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:304
-#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
-#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
-#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:257 ../e-util/e-passwords.c:471
-#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
-#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:792
-#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
-#: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
-#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
-#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
-#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
-#: ../mail/mail-vfolder-ui.c:271
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
-#: ../plugins/publish-calendar/url-editor-dialog.c:422
-#: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1351
-#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:317
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../src/e-util/e-attachment-dialog.c:311
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:208
+#: ../src/e-util/e-charset-combo-box.c:100
+#: ../src/e-util/e-color-chooser-widget.c:126
+#: ../src/e-util/e-filter-datespec.c:290
+#: ../src/e-util/e-html-editor-link-dialog.c:255
+#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
+#: ../src/e-util/e-rule-editor.c:179 ../src/e-util/e-rule-editor.c:281
+#: ../src/e-util/e-rule-editor.c:790 ../src/e-util/e-send-options.ui.h:17
+#: ../src/e-util/e-source-config-dialog.c:378
+#: ../src/e-util/e-source-selector-dialog.c:371
+#: ../src/e-util/e-table-config.c:549 ../src/e-util/e-table-config.ui.h:4
+#: ../src/e-util/e-timezone-dialog.ui.h:3
+#: ../src/mail/e-mail-config-window.c:332 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
+#: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
+#: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:420
+#: ../src/shell/e-shell-content.c:659 ../src/shell/e-shell-content.c:765
+#: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349
+#: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "_OK"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:449
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisäys"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:503
 msgid "_Full name"
 msgstr "_Koko nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:516
 msgid "E_mail"
 msgstr "Sähkö_posti"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:529
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Mr."
 msgstr "Hra."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Mrs."
 msgstr "Rva."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:3
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:3
 msgid "Ms."
 msgstr "Nti."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "Miss"
 msgstr "Neiti"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:5
 msgid "Dr."
 msgstr "Tr."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:6
 msgid "Sr."
 msgstr "Hr."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:8
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:9
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:10
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:12
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:12
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "_Etunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "_Titteli:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "_Toinen nimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:18
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "_Sukunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:19
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:19
 msgid "_Suffix:"
 msgstr "_Pääte:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:815
 msgid "Contact List Editor"
 msgstr "Yhteystietolistojen muokkain"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "_Listan nimi:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "Members"
 msgstr "Jäsenet"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Syötä sähköpostiosoite tai raahaa yhteystieto alla olevaa listaan:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Piilota osoitteet lähetettäessä sähköpostia tälle listalle"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 msgid "Add an email to the List"
 msgstr "Lisää sähköpostiosoite luetteloon"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "Remove an email address from the List"
 msgstr "Poista sähköpostiosoite luettelosta"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-msgid "Insert email addresses from Address Book"
-msgstr "Lisää sähköpostiosoitteita osoitekirjasta"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
 msgid "_Select..."
 msgstr "_Valitse..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
-#: ../e-util/filter.ui.h:19
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
+msgid "Insert email addresses from Address Book"
+msgstr "Lisää sähköpostiosoitteita osoitekirjasta"
+
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../src/e-util/filter.ui.h:26
 msgid "_Top"
 msgstr "Ylimm_äiseksi"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/e-source-selector.c:3471 ../e-util/filter.ui.h:20
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:27
 msgid "_Up"
 msgstr "_Ylös"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/e-source-selector.c:3472 ../e-util/filter.ui.h:21
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:28
 msgid "_Down"
 msgstr "_Alas"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../e-util/filter.ui.h:22
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../src/e-util/filter.ui.h:29
 msgid "_Bottom"
 msgstr "Ali_mmaiseksi"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:940
 msgid "Contact List Members"
 msgstr "Ota yhteyttä listan jäseniin"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1485
 msgid "_Members"
 msgstr "_Jäsenet"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1625
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1645
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1665
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1219
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1212
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
-#: ../modules/calendar/e-cal-shell-view-actions.c:1664
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
-#: ../modules/calendar/e-task-shell-view-actions.c:985
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../src/calendar/gui/caltypes.xml.in.h:26
+#: ../src/calendar/gui/memotypes.xml.in.h:19
+#: ../src/calendar/gui/tasktypes.xml.in.h:30
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1662
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:983
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:225
+#: ../src/addressbook/gui/widgets/ea-addressbook-view.c:92
+#: ../src/addressbook/gui/widgets/ea-addressbook-view.c:101
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:223
 msgid "evolution address book"
 msgstr "evolutionin osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:149
 msgid "Copy _Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:359
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:151
+#: ../src/e-util/e-web-view.c:368
 msgid "Copy the email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:371
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:156
+#: ../src/e-util/e-web-view.c:380
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:373
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:158
+#: ../src/e-util/e-web-view.c:382
 msgid "Send a mail message to this address"
 msgstr "Lähetä sähköpostiviesti tähän osoitteeseen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1279
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:290
+#: ../src/e-util/e-web-view.c:1317
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:142
 msgid "Open map"
 msgstr "Avaa kartta"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:438
 msgid "SIP"
 msgstr "SIP"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:682
 msgid "List Members:"
 msgstr "Luettelon jäsenet:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:754
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:755
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:756
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:757
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:758
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:759
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:760
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:761
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:763
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Yritys"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:826
 msgid "Department"
 msgstr "Osasto"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Asema"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:828
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:829
 msgid "Position"
 msgstr "Asema"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:830
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:831
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Apulainen"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:832
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
-#: ../data/evolution.desktop.in.in.h:9 ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:199
-#: ../modules/calendar/e-cal-shell-view.c:579
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Kalenteri"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:834
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:836
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:905
 msgid "Address"
 msgstr "Osoite"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:874
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
 msgid "Web Log"
 msgstr "Web-loki"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1133
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1154
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1195
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1205
 msgid "Blog"
 msgstr "Blogi"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/mail-send-recv.c:967
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
+#: ../src/calendar/gui/e-cal-component-preview.c:308
+#: ../src/calendar/gui/e-cal-model-tasks.c:314
+#: ../src/calendar/gui/e-cal-model-tasks.c:556
+#: ../src/calendar/gui/e-task-table.c:209
+#: ../src/calendar/gui/e-task-table.c:224
+#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3586
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:457
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
 msgid "Merge Contact"
 msgstr "Yhdistä yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:475
-#: ../addressbook/gui/widgets/eab-contact-merging.c:724
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
 msgid "_Merge"
 msgstr "_Yhdistä"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:713
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
 msgid "Duplicate Contact Detected"
 msgstr "Päällekkäisiä yhteystietoja havaittu"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:771
-#, fuzzy
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
 #| msgid ""
 #| "The name or email of this contact already exists in this folder. Would "
 #| "you like to save the changes anyway?"
@@ -1275,11 +4456,10 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
 msgstr ""
-"Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa. Haluatko "
-"tallentaa muutokset joka tapauksessa?"
+"Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
+"Haluatko tallentaa muutokset joka tapauksessa?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:774
-#, fuzzy
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:772
 #| msgid ""
 #| "The name or email address of this contact already exists\n"
 #| "in this folder.  Would you like to add it anyway?"
@@ -1290,23 +4470,23 @@ msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
 "Haluatko lisätä joka tapauksessa?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:789
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:787
 msgid "Changed Contact:"
 msgstr "Muutettu yhteystieto:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:791
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "New Contact:"
 msgstr "Uusi yhteystieto:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
 msgid "Conflicting Contact:"
 msgstr "Ristiriitainen yhteystieto:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:832
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Old Contact:"
 msgstr "Vanha yhteystieto:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1316,7 +4496,7 @@ msgstr ""
 "verkottomaan käyttöön tai sitä ei ole vielä ladattu yhteydettömään tilaan. "
 "Nouda osoitekirjan sisältö ollessasi verkottomassa tilassa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:138
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1325,7 +4505,7 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Tarkista että polku %s on olemassa ja että "
 "sinulla on oikeudet käyttää sitä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:151
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1333,7 +4513,7 @@ msgstr ""
 "Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
 "tuen evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:160
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1341,11 +4521,11 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Osoitekirjan URI voi olla virheellinen tai "
 "palvelinta ei voi tavoittaa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "Yksityiskohtainen virheviesti:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:209
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1357,7 +4537,7 @@ msgstr ""
 "Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:216
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1369,13 +4549,13 @@ msgstr ""
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:224
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "Tämän osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:229
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
@@ -1383,126 +4563,127 @@ msgstr ""
 "%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:235
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:241
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Kyselyä ei voitu suorittaa onnistuneesti. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "kortti.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:314
 msgid "Select Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:396
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:585
 msgid "Move contact to"
 msgstr "Siirrä yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:587
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:590
 msgid "Move contacts to"
 msgstr "Siirrä yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:592
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:160
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:164
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d yhteystieto"
 msgstr[1] "%d yhteystietoa"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:372
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "Virhe ladattaessa kirjanäkymää"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:819
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:817
 msgid "Search Interrupted"
 msgstr "Haku keskeytettiin"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
+#: ../src/addressbook/gui/widgets/e-addressbook-table-adapter.c:219
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:682
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Cut selected contacts to the clipboard"
 msgstr "Leikkaa valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:688
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopioi valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:694
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
 msgid "Paste contacts from the clipboard"
 msgstr "Liitä yhteystietoja leikepöydältä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:700
-#: ../modules/addressbook/e-book-shell-view-actions.c:1017
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:706
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Select all visible contacts"
 msgstr "Valitse kaikki näkyvät yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Haluatko varmasti poistaa nämä yhteystietolistat?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1337
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1341
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1347
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Haluatko varmasti poistaa nämä yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
 msgid "Are you sure you want to delete this contact?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1355
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1366
-#: ../calendar/gui/e-comp-editor.c:1997 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
-#: ../modules/addressbook/e-book-shell-view-actions.c:1089
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
-#: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
-#: ../shell/e-shell-window-actions.c:813
-#: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
+#: ../src/calendar/gui/e-comp-editor.c:1997 ../src/e-util/e-focus-tracker.c:783
+#: ../src/e-util/evolution-source-viewer.c:806
+#: ../src/mail/e-mail-account-manager.c:737
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1087
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:676
+#: ../src/modules/calendar/e-task-shell-view-actions.c:830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
+#: ../src/shell/e-shell-window-actions.c:822
+#: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Poista"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1508
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1517,99 +4698,100 @@ msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää nämä kaikki yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1521
-msgid "_Don't Display"
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
+#| msgid "_Don't Display"
+msgid "_Don’t Display"
 msgstr "Ä_lä näytä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1522
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "File As"
 msgstr "Kirjaa nimellä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "Sähköposti 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 msgid "Email 3"
 msgstr "Sähköposti 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Assistant Phone"
 msgstr "Apulaisen puhelinnumero"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Business Phone"
 msgstr "Työpuhelin"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Business Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Business Fax"
 msgstr "Faksi työhön"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Callback Phone"
 msgstr "Takaisinsoiton puhelinnumero"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Faksi kotiin"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "ISDN Phone"
 msgstr "ISDN-numero"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "Hakulaite"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Telex"
 msgstr "Telex"
 
@@ -1619,94 +4801,95 @@ msgstr "Telex"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTYTTD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titteli"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:660
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../src/calendar/gui/e-meeting-list-view.c:658
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rooli"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Journal"
 msgstr "Päiväkirja"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4
-#: ../calendar/gui/e-task-table.etspec.h:12 ../e-util/e-categories-dialog.c:87
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:6
+#: ../src/calendar/gui/e-memo-table.etspec.h:4
+#: ../src/calendar/gui/e-task-table.etspec.h:12
+#: ../src/e-util/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "Ryhmät"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:33
+#: ../src/addressbook/gui/widgets/ea-minicard.c:31
 msgid "Open"
 msgstr "Avaa"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:159
+#: ../src/addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact List: "
 msgstr "Yhteystietoluettelo: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:160
+#: ../src/addressbook/gui/widgets/ea-minicard.c:158
 msgid "Contact: "
 msgstr "Yhteystiedot: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:182
+#: ../src/addressbook/gui/widgets/ea-minicard.c:180
 msgid "evolution minicard"
 msgstr "Evolutionin minikortti"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:33
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:34
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:208
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:206
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "Valitussa osoitekirjassa %s on %d kortti"
 msgstr[1] "Valitussa osoitekirjassa %s on %d korttia"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:377
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:374
 msgid "Contacts Map"
 msgstr "Yhteystietokartta"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:412
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:409
 msgid "Zoom _In"
 msgstr "Lä_hennä"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2424
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
+#: ../src/mail/e-mail-reader.c:2421
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:1858
-#: ../e-util/e-html-editor-find-dialog.c:252
-#: ../shell/e-shell-window-actions.c:890
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
+#: ../src/e-util/e-html-editor-actions.c:1872
+#: ../src/e-util/e-html-editor-find-dialog.c:250
+#: ../src/shell/e-shell-window-actions.c:899
 msgid "_Find"
 msgstr "_Etsi"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1716,7 +4899,7 @@ msgstr ""
 "\n"
 "Etsitään yhteystietoja..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1730,7 +4913,7 @@ msgstr ""
 "\n"
 "tai luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1744,7 +4927,7 @@ msgstr ""
 "\n"
 "Luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1754,7 +4937,7 @@ msgstr ""
 "\n"
 "Etsi yhteystietoja."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1764,168 +4947,161 @@ msgstr ""
 "\n"
 "Näkymässä ei ole mitään näytettävää."
 
-#: ../addressbook/importers/evolution-csv-importer.c:747
-#: ../addressbook/importers/evolution-ldif-importer.c:549
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:481
-#: ../calendar/importers/icalendar-importer.c:978
-#: ../calendar/importers/icalendar-importer.c:1018 ../shell/shell.error.xml.h:1
+#: ../src/addressbook/importers/evolution-csv-importer.c:745
+#: ../src/addressbook/importers/evolution-ldif-importer.c:547
+#: ../src/addressbook/importers/evolution-vcard-importer.c:247
+#: ../src/calendar/importers/icalendar-importer.c:479
+#: ../src/calendar/importers/icalendar-importer.c:976
+#: ../src/calendar/importers/icalendar-importer.c:1016
+#: ../src/shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:929
-#, fuzzy
+#: ../src/addressbook/importers/evolution-csv-importer.c:927
 #| msgid "Can not open file"
-msgid "Can't open .csv file"
-msgstr "Tiedostoa ei voi avata"
+msgid "Can’t open .csv file"
+msgstr ".csv-tiedostoa ei voi avata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../src/addressbook/importers/evolution-csv-importer.c:1096
 #, fuzzy
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../src/addressbook/importers/evolution-csv-importer.c:1097
 #, fuzzy
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1107
+#: ../src/addressbook/importers/evolution-csv-importer.c:1105
 #, fuzzy
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1108
+#: ../src/addressbook/importers/evolution-csv-importer.c:1106
 #, fuzzy
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1116
+#: ../src/addressbook/importers/evolution-csv-importer.c:1114
 #, fuzzy
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1117
+#: ../src/addressbook/importers/evolution-csv-importer.c:1115
 #, fuzzy
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:719
-#, fuzzy
+#: ../src/addressbook/importers/evolution-ldif-importer.c:717
 #| msgid "Can not open file"
-msgid "Can't open .ldif file"
-msgstr "Tiedostoa ei voi avata"
+msgid "Can’t open .ldif file"
+msgstr ".ldif-tiedostoa ei voi avata"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:821
+#: ../src/addressbook/importers/evolution-ldif-importer.c:819
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:822
+#: ../src/addressbook/importers/evolution-ldif-importer.c:820
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:646
+#: ../src/addressbook/importers/evolution-vcard-importer.c:644
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:647
+#: ../src/addressbook/importers/evolution-vcard-importer.c:645
 msgid "Evolution vCard Importer"
 msgstr "Evolutionin vCard-tuoja"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:874
+#: ../src/addressbook/printing/e-contact-print.c:872
 #, c-format
 msgid "Page %d"
 msgstr "Sivu %d"
 
-#: ../addressbook/util/eab-book-util.c:36
-#, fuzzy
+#: ../src/addressbook/util/eab-book-util.c:34
 #| msgid "Work Email"
 msgctxt "addressbook-label"
 msgid "Work Email"
 msgstr "Työsähköposti"
 
-#: ../addressbook/util/eab-book-util.c:37
-#, fuzzy
+#: ../src/addressbook/util/eab-book-util.c:35
 #| msgid "Home Email"
 msgctxt "addressbook-label"
 msgid "Home Email"
 msgstr "Henkilökohtainen sähköposti"
 
-#: ../addressbook/util/eab-book-util.c:38
-#, fuzzy
+#: ../src/addressbook/util/eab-book-util.c:36
 #| msgid "Other Email"
 msgctxt "addressbook-label"
 msgid "Other Email"
 msgstr "Muu sähköposti"
 
-#: ../addressbook/util/eab-book-util.c:44
-#, fuzzy
+#: ../src/addressbook/util/eab-book-util.c:42
 #| msgid "Work"
 msgctxt "addressbook-label"
 msgid "Work SIP"
-msgstr "Työ"
+msgstr "Työ SIP"
 
-#: ../addressbook/util/eab-book-util.c:45
-#, fuzzy
+#: ../src/addressbook/util/eab-book-util.c:43
 #| msgid "Home Page"
 msgctxt "addressbook-label"
 msgid "Home SIP"
-msgstr "Kotisivu"
+msgstr "Koti SIP"
 
-#: ../addressbook/util/eab-book-util.c:46
-#, fuzzy
+#: ../src/addressbook/util/eab-book-util.c:44
 #| msgid "Other"
 msgctxt "addressbook-label"
 msgid "Other SIP"
-msgstr "Muut"
+msgstr "Muu SIP"
 
-#: ../addressbook/util/eab-book-util.c:74
+#: ../src/addressbook/util/eab-book-util.c:72
 msgctxt "addressbook-label"
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/util/eab-book-util.c:75
+#: ../src/addressbook/util/eab-book-util.c:73
 msgctxt "addressbook-label"
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/util/eab-book-util.c:76
+#: ../src/addressbook/util/eab-book-util.c:74
 msgctxt "addressbook-label"
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/util/eab-book-util.c:77
+#: ../src/addressbook/util/eab-book-util.c:75
 msgctxt "addressbook-label"
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/util/eab-book-util.c:78
+#: ../src/addressbook/util/eab-book-util.c:76
 msgctxt "addressbook-label"
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/util/eab-book-util.c:79
+#: ../src/addressbook/util/eab-book-util.c:77
 msgctxt "addressbook-label"
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/util/eab-book-util.c:80
+#: ../src/addressbook/util/eab-book-util.c:78
 msgctxt "addressbook-label"
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/util/eab-book-util.c:81
+#: ../src/addressbook/util/eab-book-util.c:79
 msgctxt "addressbook-label"
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/util/eab-book-util.c:82
+#: ../src/addressbook/util/eab-book-util.c:80
 msgctxt "addressbook-label"
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/util/eab-book-util.c:83
+#: ../src/addressbook/util/eab-book-util.c:81
 msgctxt "addressbook-label"
 msgid "Google Talk"
 msgstr "Google Talk"
@@ -1934,7 +5110,7 @@ msgstr "Google Talk"
 #. * if an email address type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../addressbook/util/eab-book-util.c:126
+#: ../src/addressbook/util/eab-book-util.c:124
 msgctxt "addressbook-label"
 msgid "Email"
 msgstr "Sähköposti"
@@ -1944,7 +5120,7 @@ msgstr "Sähköposti"
 #. * this generic label is used instead of one of the predefined labels.
 #. * SIP=Session Initiation Protocol, used for voice over IP
 #.
-#: ../addressbook/util/eab-book-util.c:173
+#: ../src/addressbook/util/eab-book-util.c:171
 msgctxt "addressbook-label"
 msgid "SIP"
 msgstr "SIP"
@@ -1954,7 +5130,7 @@ msgstr "SIP"
 #. * this generic label is used instead of one of the predefined labels.
 #. * IM=Instant Messaging
 #.
-#: ../addressbook/util/eab-book-util.c:216
+#: ../src/addressbook/util/eab-book-util.c:214
 msgctxt "addressbook-label"
 msgid "IM"
 msgstr "Pikaviestin"
@@ -1963,148 +5139,152 @@ msgstr "Pikaviestin"
 #. * if a phone number type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../addressbook/util/eab-book-util.c:271
+#: ../src/addressbook/util/eab-book-util.c:269
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:103
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:129
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivä"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:357
 msgid "Start time"
 msgstr "Alkamisaika"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1947
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../src/calendar/alarm-notify/alarm-queue.c:1988
 msgid "Appointments"
 msgstr "Tapaamiset"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "Hylkää _kaikki"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
 msgstr "_Torku"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../calendar/gui/e-comp-editor-page-general.c:1365
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2241
-#: ../calendar/gui/e-comp-editor.c:2062 ../e-util/e-html-editor-actions.c:908
-#: ../e-util/e-mail-signature-manager.c:358 ../e-util/filter.ui.h:17
-#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
-#: ../plugins/attachment-reminder/attachment-reminder.c:462
-#: ../plugins/email-custom-header/email-custom-header.c:844
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:470 ../shell/e-shell-window-actions.c:941
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1363
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
+#: ../src/calendar/gui/e-comp-editor.c:2062
+#: ../src/e-util/e-html-editor-actions.c:922
+#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/filter.ui.h:24
+#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
+#: ../src/mail/e-mail-label-manager.c:380
+#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:65
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
+#: ../src/plugins/email-custom-header/email-custom-header.c:842
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../src/plugins/templates/templates.c:468
+#: ../src/shell/e-shell-window-actions.c:950 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:5
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../src/e-util/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "_Hylkää"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1914
-#: ../calendar/alarm-notify/alarm-queue.c:1924
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
-#: ../modules/itip-formatter/itip-view.c:1666
-#: ../modules/itip-formatter/itip-view.c:1777
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../src/calendar/alarm-notify/alarm-queue.c:1955
+#: ../src/calendar/alarm-notify/alarm-queue.c:1965
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../src/modules/itip-formatter/itip-view.c:1678
+#: ../src/modules/itip-formatter/itip-view.c:1789
 msgid "Location:"
 msgstr "Sijainti:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:9
 msgid "Snooze _time:"
 msgstr "Torkkumis_aika:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:344
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:342
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "päivä"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:11
+#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
 msgid "hours"
 msgstr "tuntia"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:12
-#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
-#: ../mail/e-mail-config-provider-page.c:526
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
+#: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
+#: ../src/mail/e-mail-config-provider-page.c:571
 msgid "minutes"
 msgstr "minuutti"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1715
-#: ../calendar/alarm-notify/alarm-queue.c:1895
+#: ../src/calendar/alarm-notify/alarm-queue.c:1756
+#: ../src/calendar/alarm-notify/alarm-queue.c:1936
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1724
-#: ../calendar/alarm-notify/alarm-queue.c:1726
+#: ../src/calendar/alarm-notify/alarm-queue.c:1765
+#: ../src/calendar/alarm-notify/alarm-queue.c:1767
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1734
+#: ../src/calendar/alarm-notify/alarm-queue.c:1775
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1739
-#: ../calendar/alarm-notify/alarm-queue.c:1886
-#: ../calendar/alarm-notify/alarm-queue.c:2237
+#: ../src/calendar/alarm-notify/alarm-queue.c:1780
+#: ../src/calendar/alarm-notify/alarm-queue.c:1927
+#: ../src/calendar/alarm-notify/alarm-queue.c:2278
 msgid "Evolution Reminders"
 msgstr "Evolution-muistuttajat"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1782
+#: ../src/calendar/alarm-notify/alarm-queue.c:1823
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Sinulla on %d muistutus"
 msgstr[1] "Sinulla on %d muistutusta"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2055
+#: ../src/calendar/alarm-notify/alarm-queue.c:2096
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
-#: ../modules/mailto-handler/evolution-mailto-handler.c:114
+#: ../src/calendar/alarm-notify/alarm-queue.c:2097
+#: ../src/mail/mail-dialogs.ui.h:20
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
 msgid "_No"
 msgstr "_Ei"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2057
-#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+#: ../src/calendar/alarm-notify/alarm-queue.c:2098
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2061
+#: ../src/calendar/alarm-notify/alarm-queue.c:2102
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2121,17 +5301,17 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2076
+#: ../src/calendar/alarm-notify/alarm-queue.c:2117
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan."
 
-#: ../calendar/alarm-notify/util.c:67
+#: ../src/calendar/alarm-notify/util.c:65
 msgid "invalid time"
 msgstr "epäkelpo aika"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../calendar/alarm-notify/util.c:93 ../calendar/gui/e-alarm-list.c:370
-#: ../calendar/gui/misc.c:97
+#: ../src/calendar/alarm-notify/util.c:91
+#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -2139,8 +5319,8 @@ msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../calendar/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
-#: ../calendar/gui/misc.c:103
+#: ../src/calendar/alarm-notify/util.c:97
+#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2148,8 +5328,8 @@ msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../calendar/alarm-notify/util.c:105 ../calendar/gui/e-alarm-list.c:388
-#: ../calendar/gui/misc.c:109
+#: ../src/calendar/alarm-notify/util.c:103
+#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2159,19 +5339,19 @@ msgstr[1] "%d minuuttia"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
-#: ../calendar/gui/misc.c:113
+#: ../src/calendar/alarm-notify/util.c:107
+#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../calendar/calendar.error.xml.h:1
+#: ../src/calendar/calendar.error.xml.h:1
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Haluatko lähettää perumisilmoituksen kaikille osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:2
+#: ../src/calendar/calendar.error.xml.h:2
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2179,25 +5359,26 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "kokous on peruttu."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../src/calendar/calendar.error.xml.h:3
 msgid "Do _not Send"
 msgstr "Älä läh_etä"
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../src/calendar/calendar.error.xml.h:4
 msgid "_Send Notice"
 msgstr "_Lähetä huomautus"
 
-#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/e-cal-dialogs.c:502
+#: ../src/calendar/calendar.error.xml.h:5
+#: ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../src/calendar/calendar.error.xml.h:6
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "Kaikki tiedot tästä kokouksesta poistetaan eikä niitä voi palauttaa."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../src/calendar/calendar.error.xml.h:8
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2205,20 +5386,21 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "tehtävä on peruttu."
 
-#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/e-cal-dialogs.c:505
+#: ../src/calendar/calendar.error.xml.h:9
+#: ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Haluatko varmasti poistaa tämän tehtävän?"
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../src/calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "Kaikki tiedot tästä tehtävästä poistetaan eikä niitä voi palauttaa."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../src/calendar/calendar.error.xml.h:11
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Haluatko lähettää perumisilmoituksen tälle muistilapulle?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../src/calendar/calendar.error.xml.h:12
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2226,132 +5408,138 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "muistilappu on poistettu."
 
-#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/e-cal-dialogs.c:508
+#: ../src/calendar/calendar.error.xml.h:13
+#: ../src/calendar/gui/e-cal-dialogs.c:513
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../src/calendar/calendar.error.xml.h:14
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "Kaikki tämän muistilapun tiedot poistetaan eikä niitä voi palauttaa."
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Haluatko varmasti poistaa tapaamisen '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:15
+#| msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgid "Are you sure you want to delete the meeting titled “{0}”?"
+msgstr "Haluatko varmasti poistaa tapaamisen “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:16
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Haluatko varmasti poistaa tapaamisen nimeltään \"{0}\"?"
+#: ../src/calendar/calendar.error.xml.h:16
+#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgid "Are you sure you want to delete the appointment titled “{0}”?"
+msgstr "Haluatko varmasti poistaa tapaamisen nimeltään “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../src/calendar/calendar.error.xml.h:17
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr "Kaikki tiedot tästä tapaamisesta poistetaan eikä niitä voi palauttaa."
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../src/calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
-#: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Haluatko varmasti poistaa tehtävän \"{0}\"?"
+#: ../src/calendar/calendar.error.xml.h:19
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to delete the “{0}” task?"
+msgstr "Haluatko varmasti poistaa tehtävän “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:20
-msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "Haluatko varmasti poistaa muistilapun \"{0}\"?"
+#: ../src/calendar/calendar.error.xml.h:20
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete the memo “{0}”?"
+msgstr "Haluatko varmasti poistaa muistilapun “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../src/calendar/calendar.error.xml.h:21
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr "Kaikki tiedot tässä muistilapussa poistetaan eikä niitä voi palauttaa."
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../src/calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Haluatko varmasti poistaa nämä {0} tapaamista?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../src/calendar/calendar.error.xml.h:23
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "Kaikki tiedot näistä tapaamisista poistetaan eikä niitä voi palauttaa."
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../src/calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Haluatko varmasti poistaa nämä {0} tehtävää?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../src/calendar/calendar.error.xml.h:25
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Kaikki tiedot näistä tehtävistä poistetaan eikä niitä voi palauttaa."
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../src/calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Haluatko varmasti poistaa nämä {0} muistilappua?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../src/calendar/calendar.error.xml.h:27
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "Kaikki tiedot näissä muistilapuissa poistetaan eikä niitä voi palauttaa."
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../src/calendar/calendar.error.xml.h:28
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Haluatko tallentaa muutokset tähän tapaamiseen?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../src/calendar/calendar.error.xml.h:29
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Olet tehnyt tallentamattomia muutoksia tähän tapaamiseen."
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../src/calendar/calendar.error.xml.h:30
 msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
-#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:13
+#: ../src/calendar/calendar.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../src/calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Haluatko tallentaa muutokset tähän tapaamiseen?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../src/calendar/calendar.error.xml.h:33
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Olet muuttanut tätä tapaamista, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../src/calendar/calendar.error.xml.h:34
 msgid "Would you like to save your changes to this task?"
 msgstr "Haluatko tallentaa muutoksesi tähän tehtävään?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../src/calendar/calendar.error.xml.h:35
 msgid "You have changed this task, but not yet saved it."
 msgstr "Olet muuttanut tätä tehtävää, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../src/calendar/calendar.error.xml.h:36
 msgid "Would you like to save your changes to this memo?"
 msgstr "Haluatko tallentaa muutoksesi tähän muistioon?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../src/calendar/calendar.error.xml.h:37
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Olet muuttanut tätä muistiota, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../src/calendar/calendar.error.xml.h:38
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Haluatko lähettää kokouskutsuja osallistujille?"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../src/calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Kutsu lähetetään kaikille osanottajille ja he voivat kuitata osanottonsa."
 
-#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:36
-#: ../mail/mail.error.xml.h:8
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../src/calendar/calendar.error.xml.h:40
+#: ../src/composer/mail-composer.error.xml.h:38 ../src/mail/mail.error.xml.h:8
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../src/calendar/calendar.error.xml.h:41
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Haluatko lähettää päivitetyt kokouksen tiedot osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../src/calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2359,22 +5547,22 @@ msgstr ""
 "Päivitettyjen tietojen lähettäminen antaa muille mahdollisuuden pitää "
 "kalenterinsa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../src/calendar/calendar.error.xml.h:43
 msgid "Would you like to send this task to participants?"
 msgstr "Haluatko lähettää tämän tehtävän osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../src/calendar/calendar.error.xml.h:44
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
 "Kutsu lähetetään kaikille osanottajille ja he voivat hyväksyä tämän tehtävän."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../src/calendar/calendar.error.xml.h:45
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Tietojen haku on kesken. Haluatko tallentaa tehtävän?"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../src/calendar/calendar.error.xml.h:46
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2382,11 +5570,11 @@ msgstr ""
 "Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt "
 "aiheuttaa tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../src/calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Tietojen haku kesken. Haluatko varmasti tallentaa tämän tapaamisen?"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../src/calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2394,11 +5582,11 @@ msgstr ""
 "Joidenkin liitteiden lataus on vielä kesken. Tapaamisen tallentaminen nyt "
 "aiheuttaa tapaamisen tallentamisen ilman näitä hakemattomia liitteitä."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../src/calendar/calendar.error.xml.h:50
 msgid "Would you like to send updated task information to participants?"
 msgstr "Halutako lähettää päivitetyn tehtävätiedon osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../src/calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2406,13 +5594,13 @@ msgstr ""
 "Päivitettyjen tehtävätietojen lähettäminen antaa muille mahdollisuuden pitää "
 "tehtävälistansa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../src/calendar/calendar.error.xml.h:52
 #, fuzzy
 #| msgid "Would you like to send this task to participants?"
 msgid "Would you like to send this memo to participants?"
 msgstr "Haluatko lähettää tämän tehtävän osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../src/calendar/calendar.error.xml.h:53
 #, fuzzy
 #| msgid ""
 #| "Email invitations will be sent to all participants and allow them to "
@@ -2423,13 +5611,13 @@ msgid ""
 msgstr ""
 "Kutsu lähetetään kaikille osanottajille ja he voivat hyväksyä tämän tehtävän."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../src/calendar/calendar.error.xml.h:54
 #, fuzzy
 #| msgid "Would you like to send updated meeting information to participants?"
 msgid "Would you like to send updated memo information to participants?"
 msgstr "Haluatko lähettää päivitetyt kokouksen tiedot osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../src/calendar/calendar.error.xml.h:55
 #, fuzzy
 #| msgid ""
 #| "Sending updated information allows other participants to keep their task "
@@ -2441,75 +5629,93 @@ msgstr ""
 "Päivitettyjen tehtävätietojen lähettäminen antaa muille mahdollisuuden pitää "
 "tehtävälistansa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../src/calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "Muokkainta ei voi avata."
 
-#: ../calendar/calendar.error.xml.h:57
-msgid "Delete calendar '{0}'?"
-msgstr "Poistetaanko kalenteri \"{0}\"?"
+#: ../src/calendar/calendar.error.xml.h:57
+#| msgid "Delete calendar '{0}'?"
+msgid "Delete calendar “{0}”?"
+msgstr "Poistetaanko kalenteri “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../src/calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Tämä kalenteri poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:59
-msgid "Delete task list '{0}'?"
-msgstr "Poistetaanko tehtävälista \"{0}\"?"
+#: ../src/calendar/calendar.error.xml.h:59
+#| msgid "Delete task list '{0}'?"
+msgid "Delete task list “{0}”?"
+msgstr "Poistetaanko tehtävälista “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../src/calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Tämä tehtävälista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:61
-msgid "Delete memo list '{0}'?"
-msgstr "Poistetaanko muistilappulista \"{0}\"?"
+#: ../src/calendar/calendar.error.xml.h:61
+#| msgid "Delete memo list '{0}'?"
+msgid "Delete memo list “{0}”?"
+msgstr "Poistetaanko muistilappulista “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../src/calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "Tämä muistilappulista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:63
-msgid "Delete remote calendar '{0}'?"
-msgstr "Poistetaanko etäkalenteri \"{0}\"?"
+#: ../src/calendar/calendar.error.xml.h:63
+#| msgid "Delete remote calendar '{0}'?"
+msgid "Delete remote calendar “{0}”?"
+msgstr "Poistetaanko etäkalenteri “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../src/calendar/calendar.error.xml.h:64
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the calendar '{0}' from the server. Are you "
+#| "sure you want to proceed?"
 msgid ""
-"This will permanently remove the calendar '{0}' from the server. Are you "
+"This will permanently remove the calendar “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
 "Etäkalenteri \"{0}\" poistetaan pysyvästi palvelimelta. Haluatko varmasti "
 "jatkaa?"
 
-#: ../calendar/calendar.error.xml.h:66
-msgid "Delete remote task list '{0}'?"
-msgstr "Poistetaanko etätehtävälista \"{0}\"?"
+#: ../src/calendar/calendar.error.xml.h:66
+#| msgid "Delete remote task list '{0}'?"
+msgid "Delete remote task list “{0}”?"
+msgstr "Poistetaanko etätehtävälista “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../src/calendar/calendar.error.xml.h:67
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the task list '{0}' from the server. Are you "
+#| "sure you want to proceed?"
 msgid ""
-"This will permanently remove the task list '{0}' from the server. Are you "
+"This will permanently remove the task list “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
 "Etätehtävälista \"{0}\" poistetaan palvelimelta pysyvästi. Haluatko varmasti "
 "jatkaa?"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Delete remote memo list '{0}'?"
-msgstr "Poistetaanko etämuistiolista \"{0}\"?"
+#: ../src/calendar/calendar.error.xml.h:68
+#| msgid "Delete remote memo list '{0}'?"
+msgid "Delete remote memo list “{0}”?"
+msgstr "Poistetaanko etämuistilappulista “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../src/calendar/calendar.error.xml.h:69
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the memo list '{0}' from the server. Are you "
+#| "sure you want to proceed?"
 msgid ""
-"This will permanently remove the memo list '{0}' from the server. Are you "
+"This will permanently remove the memo list “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
 "Etämuistiolista \"{0}\" poistetaan palvelimelta pysyvästi. Haluatko varmasti "
 "jatkaa?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../src/calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Haluatko varmasti tallentaa tapaamisen ilman yhteenvetoa?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../src/calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2517,11 +5723,11 @@ msgstr ""
 "Merkityksellisen yhteenvedon lisääminen helpottaa ymmärtämään, mistä "
 "tapaamisessa on kyse."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../src/calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Haluatko varmasti tallentaa tehtävän ilman yhteenvetoa?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../src/calendar/calendar.error.xml.h:73
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2529,544 +5735,620 @@ msgstr ""
 "Merkityksellisen yhteenvedon lisääminen tehtävään helpottaa ymmärtämään, "
 "mistä tehtävässä on kyse."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../src/calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Haluatko varmasti tallentaa muistion ilman yhteenvetoa?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:76
-msgid "Error loading calendar '{0}'"
-msgstr "Virhe ladatessa kalenteria \"{0}\""
+#: ../src/calendar/calendar.error.xml.h:76
+#| msgid "Error loading calendar '{0}'"
+msgid "Error loading calendar “{0}”"
+msgstr "Virhe ladatessa kalenteria “{0}”"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../src/calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenteri ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../src/calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "Tapahtumaa ei voi tallentaa"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:80
+#: ../src/calendar/calendar.error.xml.h:80
+#, fuzzy
+#| msgid ""
+#| "'{0}' is a read-only calendar and cannot be modified. Please select a "
+#| "different calendar that can accept appointments."
 msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"“{0}” is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
 "\"{0}\" on vain luettavissa oleva kalenteri eikä sitä voi muokata. Valitse "
 "toinen kalenteri, johon tapaamisia voidaan lisätä."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../src/calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "Tehtävää ei voi tallentaa"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:83
+#: ../src/calendar/calendar.error.xml.h:83
 msgid ""
-"'{0}' does not support assigned tasks, please select a different task list."
+"“{0}” does not support assigned tasks, please select a different task list."
 msgstr ""
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:85
+#: ../src/calendar/calendar.error.xml.h:85
 #, fuzzy
 #| msgid "Error loading task list"
-msgid "Error loading task list '{0}'"
+msgid "Error loading task list “{0}”"
 msgstr "Virhe ladattaessa tehtävälistaa"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../src/calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
 msgstr "Tehtävälista ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:88
+#: ../src/calendar/calendar.error.xml.h:88
 #, fuzzy
 #| msgid "Error loading memo list"
-msgid "Error loading memo list '{0}'"
+msgid "Error loading memo list “{0}”"
 msgstr "Virhe ladattaessa muistilappulistaa"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../src/calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
 msgstr ""
 "Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
 #. Translators: {0} is the name of the calendar/memo list/task list.
-#: ../calendar/calendar.error.xml.h:91
-#, fuzzy
-msgid "Failed to add timezone to '{0}'"
-msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+#: ../src/calendar/calendar.error.xml.h:91
+msgid "Failed to add timezone to “{0}”"
+msgstr "Aikavyöhykkeen “{0}” lisääminen epäonnistui"
 
 #. The {0} is a calendar/memo list/task list name, which is useless here
-#: ../calendar/calendar.error.xml.h:93
+#: ../src/calendar/calendar.error.xml.h:93
 #, fuzzy
 #| msgid "Could not save attachments"
 msgid "Failed to save attachments"
 msgstr "Liitteitä ei voitu tallentaa"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:95
-#, fuzzy
+#: ../src/calendar/calendar.error.xml.h:95
 #| msgid "Failed to load the calendar '%s' (%s)"
-msgid "Failed to open calendar '{0}'"
-msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+msgid "Failed to open calendar “{0}”"
+msgstr "Kalenterin “{0}” avaus epäonnistui"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../src/calendar/calendar.error.xml.h:97
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to open memo list '{0}'"
+msgid "Failed to open memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:99
+#: ../src/calendar/calendar.error.xml.h:99
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to open task list '{0}'"
+msgid "Failed to open task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:101
+#: ../src/calendar/calendar.error.xml.h:101
 #, fuzzy
 #| msgid "Failed to load the calendar '%s' (%s)"
-msgid "Failed to create an event in the calendar '{0}'"
+msgid "Failed to create an event in the calendar “{0}”"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../src/calendar/calendar.error.xml.h:103
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to create a memo in the memo list '{0}'"
+msgid "Failed to create a memo in the memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:105
+#: ../src/calendar/calendar.error.xml.h:105
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to create a task in the task list '{0}'"
+msgid "Failed to create a task in the task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:107
+#: ../src/calendar/calendar.error.xml.h:107
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to modify an event in the calendar '{0}'"
+msgid "Failed to modify an event in the calendar “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../src/calendar/calendar.error.xml.h:109
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to modify a memo in the memo list '{0}'"
+msgid "Failed to modify a memo in the memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:111
+#: ../src/calendar/calendar.error.xml.h:111
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to modify a task in the task list '{0}'"
+msgid "Failed to modify a task in the task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:113
+#: ../src/calendar/calendar.error.xml.h:113
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to delete an event in the calendar '{0}'"
+msgid "Failed to delete an event in the calendar “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:115
+#: ../src/calendar/calendar.error.xml.h:115
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to delete a memo in the memo list '{0}'"
+msgid "Failed to delete a memo in the memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:117
+#: ../src/calendar/calendar.error.xml.h:117
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to delete a task in the task list '{0}'"
+msgid "Failed to delete a task in the task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:119
+#: ../src/calendar/calendar.error.xml.h:119
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to update an event in the calendar '{0}'"
+msgid "Failed to update an event in the calendar “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:121
+#: ../src/calendar/calendar.error.xml.h:121
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to update a memo in the memo list '{0}'"
+msgid "Failed to update a memo in the memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:123
+#: ../src/calendar/calendar.error.xml.h:123
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to update a task in the task list '{0}'"
+msgid "Failed to update a task in the task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:125
+#: ../src/calendar/calendar.error.xml.h:125
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to send an event to the calendar '{0}'"
+msgid "Failed to send an event to the calendar “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:127
+#: ../src/calendar/calendar.error.xml.h:127
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to send a memo to the memo list '{0}'"
+msgid "Failed to send a memo to the memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:129
+#: ../src/calendar/calendar.error.xml.h:129
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to send a task to the task list '{0}'"
+msgid "Failed to send a task to the task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:131
+#: ../src/calendar/calendar.error.xml.h:131
 #, fuzzy
 #| msgid "Error loading calendar '{0}'"
-msgid "Error creating view for the calendar '{0}'"
+msgid "Error creating view for the calendar “{0}”"
 msgstr "Virhe ladatessa kalenteria \"{0}\""
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:133
+#: ../src/calendar/calendar.error.xml.h:133
 #, fuzzy
 #| msgid "Error loading task list"
-msgid "Error creating view for the task list '{0}'"
+msgid "Error creating view for the task list “{0}”"
 msgstr "Virhe ladattaessa tehtävälistaa"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:135
+#: ../src/calendar/calendar.error.xml.h:135
 #, fuzzy
 #| msgid "Error loading memo list"
-msgid "Error creating view for the memo list '{0}'"
+msgid "Error creating view for the memo list “{0}”"
 msgstr "Virhe ladattaessa muistilappulistaa"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:137
+#: ../src/calendar/calendar.error.xml.h:137
 #, fuzzy
 #| msgid "Failed to load the calendar '%s' (%s)"
-msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to copy an event into the calendar “{0}”"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:139
+#: ../src/calendar/calendar.error.xml.h:139
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to copy a task into the task list '{0}'"
+msgid "Failed to copy a task into the task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:141
+#: ../src/calendar/calendar.error.xml.h:141
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to copy a memo into the memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:143
+#: ../src/calendar/calendar.error.xml.h:143
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to move an event into the calendar “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:145
+#: ../src/calendar/calendar.error.xml.h:145
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to move a task into the task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:147
+#: ../src/calendar/calendar.error.xml.h:147
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to move a memo into the memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:149
+#: ../src/calendar/calendar.error.xml.h:149
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to get an event from the calendar '{0}'"
+msgid "Failed to get an event from the calendar “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:151
+#: ../src/calendar/calendar.error.xml.h:151
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to get a task from the task list '{0}'"
+msgid "Failed to get a task from the task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:153
+#: ../src/calendar/calendar.error.xml.h:153
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to get a memo from the memo list '{0}'"
+msgid "Failed to get a memo from the memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:155
-msgid "Copying an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:155
+#, fuzzy
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying an event into the calendar “{0}”"
 msgstr "Kopioidaan tapahtumaa kalenteriin '{0}'"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:157
+#: ../src/calendar/calendar.error.xml.h:157
 #, fuzzy
 #| msgid "Show task preview below the task list"
-msgid "Copying a task into the task list '{0}'"
+msgid "Copying a task into the task list “{0}”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:159
+#: ../src/calendar/calendar.error.xml.h:159
 #, fuzzy
 #| msgid "Delete memo list '{0}'?"
-msgid "Copying a memo into the memo list '{0}'"
+msgid "Copying a memo into the memo list “{0}”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:161
-msgid "Moving an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:161
+#, fuzzy
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Moving an event into the calendar “{0}”"
 msgstr "Siirretään tapahtumaa kalenteriin '{0}'"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:163
+#: ../src/calendar/calendar.error.xml.h:163
 #, fuzzy
 #| msgid "Show task preview below the task list"
-msgid "Moving a task into the task list '{0}'"
+msgid "Moving a task into the task list “{0}”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:165
+#: ../src/calendar/calendar.error.xml.h:165
 #, fuzzy
 #| msgid "Delete memo list '{0}'?"
-msgid "Moving a memo into the memo list '{0}'"
+msgid "Moving a memo into the memo list “{0}”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:167
+#: ../src/calendar/calendar.error.xml.h:167
 #, fuzzy
 #| msgid "Delete remote calendar '{0}'?"
-msgid "Failed to refresh calendar '{0}'"
+msgid "Failed to refresh calendar “{0}”"
 msgstr "Poistetaanko etäkalenteri \"{0}\"?"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:169
+#: ../src/calendar/calendar.error.xml.h:169
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to refresh task list '{0}'"
+msgid "Failed to refresh task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:171
+#: ../src/calendar/calendar.error.xml.h:171
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to refresh memo list '{0}'"
+msgid "Failed to refresh memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../calendar/calendar.error.xml.h:172
+#: ../src/calendar/calendar.error.xml.h:172
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Failed to make an occurrence movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:2
-#: ../calendar/gui/e-task-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
+#: ../src/calendar/calendar.error.xml.h:173
+#, fuzzy
+#| msgid "Create a new window displaying this view"
+msgid "Something has gone wrong when displaying the event"
+msgstr "Luo uusi ikkuna tälle näkymälle"
+
+#: ../src/calendar/calendar.error.xml.h:174
+msgid ""
+"A WebKitWebProcess crashed when displaying the event. You can try again by "
+"moving to another event and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/calendar/calendar.error.xml.h:175
+#, fuzzy
+#| msgid "Create a new window displaying this view"
+msgid "Something has gone wrong when displaying the memo"
+msgstr "Luo uusi ikkuna tälle näkymälle"
+
+#: ../src/calendar/calendar.error.xml.h:176
+msgid ""
+"A WebKitWebProcess crashed when displaying the memo. You can try again by "
+"moving to another memo and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/calendar/calendar.error.xml.h:177
+#, fuzzy
+msgid "Something has gone wrong when displaying the task"
+msgstr "Käytä omia fontteja näytettäessä viestejä."
+
+#: ../src/calendar/calendar.error.xml.h:178
+msgid ""
+"A WebKitWebProcess crashed when displaying the task. You can try again by "
+"moving to another task and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/calendar/gui/caltypes.xml.in.h:1
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:3
+#: ../src/calendar/gui/e-memo-table.etspec.h:2
+#: ../src/calendar/gui/e-task-table.etspec.h:4
+#: ../src/calendar/gui/memotypes.xml.in.h:1
+#: ../src/calendar/gui/tasktypes.xml.in.h:1
+#: ../src/plugins/save-calendar/csv-format.c:373
 msgid "Summary"
 msgstr "Kuvaus"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
-#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
+#: ../src/calendar/gui/caltypes.xml.in.h:2
+#: ../src/calendar/gui/memotypes.xml.in.h:2
+#: ../src/calendar/gui/tasktypes.xml.in.h:2 ../src/mail/filtertypes.xml.in.h:2
+#: ../src/mail/searchtypes.xml.in.h:2 ../src/mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "sisältää"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
-#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
+#: ../src/calendar/gui/caltypes.xml.in.h:3
+#: ../src/calendar/gui/memotypes.xml.in.h:3
+#: ../src/calendar/gui/tasktypes.xml.in.h:3 ../src/mail/filtertypes.xml.in.h:3
+#: ../src/mail/searchtypes.xml.in.h:3 ../src/mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 msgstr "ei sisällä"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../src/calendar/gui/caltypes.xml.in.h:4
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:4
+#: ../src/calendar/gui/memotypes.xml.in.h:4
+#: ../src/calendar/gui/tasktypes.xml.in.h:4
+#: ../src/e-util/e-attachment-tree-view.c:147
+#: ../src/e-util/e-table-config.ui.h:20
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:5
+#: ../src/calendar/gui/memotypes.xml.in.h:5
+#: ../src/calendar/gui/tasktypes.xml.in.h:7
 msgid "Any Field"
 msgstr "Mikä tahansa kenttä"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:6
+#: ../src/calendar/gui/memotypes.xml.in.h:7
 msgid "Classification"
 msgstr "Luokittelu"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
-#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
+#: ../src/calendar/gui/caltypes.xml.in.h:7
+#: ../src/calendar/gui/memotypes.xml.in.h:8
+#: ../src/calendar/gui/tasktypes.xml.in.h:9 ../src/mail/filtertypes.xml.in.h:4
+#: ../src/mail/searchtypes.xml.in.h:4 ../src/mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "on"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
-#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
+#: ../src/calendar/gui/caltypes.xml.in.h:8
+#: ../src/calendar/gui/memotypes.xml.in.h:9
+#: ../src/calendar/gui/tasktypes.xml.in.h:10 ../src/mail/filtertypes.xml.in.h:5
+#: ../src/mail/searchtypes.xml.in.h:5 ../src/mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "ei ole"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:305 ../calendar/gui/e-cal-model.c:312
-#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:10
+#: ../src/calendar/gui/caltypes.xml.in.h:9
+#: ../src/calendar/gui/e-cal-list-view.c:238
+#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
+#: ../src/calendar/gui/e-task-table.c:522
+#: ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:314 ../calendar/gui/e-task-table.c:499
-#: ../calendar/gui/memotypes.xml.h:11
+#: ../src/calendar/gui/caltypes.xml.in.h:10
+#: ../src/calendar/gui/e-cal-list-view.c:239
+#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:115
-#: ../e-util/e-send-options.ui.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:11
+#: ../src/calendar/gui/e-cal-list-view.c:240
+#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/memotypes.xml.in.h:12
+#: ../src/e-util/e-html-editor-page-dialog.c:113
+#: ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:5
+#: ../src/calendar/gui/caltypes.xml.in.h:12
+#: ../src/calendar/gui/memotypes.xml.in.h:6
+#: ../src/calendar/gui/tasktypes.xml.in.h:5
 msgid "Organizer"
 msgstr "Järjestäjä"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-#: ../calendar/gui/tasktypes.xml.h:6
+#: ../src/calendar/gui/caltypes.xml.in.h:13
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
 msgstr "Osanottaja"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:862
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../src/calendar/gui/caltypes.xml.in.h:14
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:5
+#: ../src/mail/message-list.etspec.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.c:860
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+#: ../src/plugins/save-calendar/csv-format.c:387
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
+#: ../src/calendar/gui/caltypes.xml.in.h:15
+#: ../src/calendar/gui/memotypes.xml.in.h:13
+#: ../src/calendar/gui/tasktypes.xml.in.h:23
+#: ../src/e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Luokka"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:51
-#: ../em-format/e-mail-formatter-print-headers.c:157
-#: ../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
-#: ../mail/vfoldertypes.xml.in.h:50
+#: ../src/calendar/gui/caltypes.xml.in.h:16
+#: ../src/calendar/gui/memotypes.xml.in.h:14
+#: ../src/calendar/gui/tasktypes.xml.in.h:15
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print-headers.c:155
+#: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
+#: ../src/mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:48
-#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
+#: ../src/calendar/gui/caltypes.xml.in.h:17
+#: ../src/calendar/gui/memotypes.xml.in.h:15
+#: ../src/calendar/gui/tasktypes.xml.in.h:16
+#: ../src/mail/filtertypes.xml.in.h:48 ../src/mail/searchtypes.xml.in.h:50
+#: ../src/mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "On olemassa"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:49
-#: ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
+#: ../src/calendar/gui/caltypes.xml.in.h:18
+#: ../src/calendar/gui/memotypes.xml.in.h:16
+#: ../src/calendar/gui/tasktypes.xml.in.h:17
+#: ../src/mail/filtertypes.xml.in.h:49 ../src/mail/searchtypes.xml.in.h:51
+#: ../src/mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2005
+#: ../src/calendar/gui/caltypes.xml.in.h:19
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2003
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../calendar/gui/caltypes.xml.h:20
+#: ../src/calendar/gui/caltypes.xml.in.h:20
 msgid "Occurs"
 msgstr "Ilmenee"
 
-#: ../calendar/gui/caltypes.xml.h:21
+#: ../src/calendar/gui/caltypes.xml.in.h:21
 msgid "Less Than"
 msgstr "Vähemmän kuin"
 
-#: ../calendar/gui/caltypes.xml.h:22
+#: ../src/calendar/gui/caltypes.xml.in.h:22
 msgid "Exactly"
 msgstr "Tasan"
 
-#: ../calendar/gui/caltypes.xml.h:23
+#: ../src/calendar/gui/caltypes.xml.in.h:23
 msgid "More Than"
 msgstr "Enemmän kuin"
 
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:28
+#: ../src/calendar/gui/caltypes.xml.in.h:24
+#: ../src/calendar/gui/memotypes.xml.in.h:17
+#: ../src/calendar/gui/tasktypes.xml.in.h:28
 msgid "Summary Contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:29
+#: ../src/calendar/gui/caltypes.xml.in.h:25
+#: ../src/calendar/gui/memotypes.xml.in.h:18
+#: ../src/calendar/gui/tasktypes.xml.in.h:29
 msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
-#: ../calendar/gui/ea-cal-view.c:283
+#: ../src/calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../src/calendar/gui/ea-cal-view.c:282
 msgid "New All Day Event"
 msgstr "Uusi koko päivän tapahtuma"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../src/calendar/gui/ea-cal-view.c:283
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
-#: ../calendar/gui/ea-cal-view.c:286
+#: ../src/calendar/gui/ea-cal-view.c:284
 msgid "Go to Today"
 msgstr "Siirry tähän päivään"
 
-#: ../calendar/gui/ea-cal-view.c:287
+#: ../src/calendar/gui/ea-cal-view.c:285
 msgid "Go to Date"
 msgstr "Siirry päivään"
 
-#: ../calendar/gui/ea-cal-view-event.c:234
+#: ../src/calendar/gui/ea-cal-view-event.c:232
 msgid "It has reminders."
 msgstr "Sisältää muistutuksia."
 
-#: ../calendar/gui/ea-cal-view-event.c:237
+#: ../src/calendar/gui/ea-cal-view-event.c:235
 msgid "It has recurrences."
 msgstr "Sisältää toistuvuuksia."
 
-#: ../calendar/gui/ea-cal-view-event.c:240
+#: ../src/calendar/gui/ea-cal-view-event.c:238
 msgid "It is a meeting."
 msgstr "Sisältää kokouksen."
 
-#: ../calendar/gui/ea-cal-view-event.c:247
+#: ../src/calendar/gui/ea-cal-view-event.c:245
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:250
+#: ../src/calendar/gui/ea-cal-view-event.c:248
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../calendar/gui/ea-cal-view-event.c:273
+#: ../src/calendar/gui/ea-cal-view-event.c:271
 msgid "calendar view event"
 msgstr "kalenterinäkymän tapahtuma"
 
-#: ../calendar/gui/ea-cal-view-event.c:505
+#: ../src/calendar/gui/ea-cal-view-event.c:503
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
-#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../src/calendar/gui/ea-day-view.c:105 ../src/calendar/gui/ea-week-view.c:105
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3075,43 +6357,49 @@ msgstr[1] "%d tapahtumaa."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
+#: ../src/calendar/gui/ea-day-view.c:112 ../src/calendar/gui/ea-week-view.c:108
 msgid "It has no events."
 msgstr "Ei tapahtumia."
 
-#: ../calendar/gui/ea-day-view.c:121
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../src/calendar/gui/ea-day-view.c:119
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Työviikon näkymä: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:128
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../src/calendar/gui/ea-day-view.c:126
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Päivänäkymä: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:157
+#: ../src/calendar/gui/ea-day-view.c:155
 msgid "calendar view for a work week"
 msgstr "kalenterin näkymä työviikkoon"
 
-#: ../calendar/gui/ea-day-view.c:159
+#: ../src/calendar/gui/ea-day-view.c:157
 msgid "calendar view for one or more days"
 msgstr "Kalenterinäkymä yhdelle tai useammalle päivälle"
 
-#: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:295
+#: ../src/calendar/gui/ea-day-view-main-item.c:264
+#: ../src/calendar/gui/ea-week-view-main-item.c:293
 msgid "a table to view and select the current time range"
 msgstr "taulukko, josta voi nähdä ja valita nykyisen aika-alueen"
 
-#: ../calendar/gui/ea-jump-button.c:150
+#: ../src/calendar/gui/ea-jump-button.c:148
 msgid "Jump button"
 msgstr "Hyppäyspainike"
 
-#: ../calendar/gui/ea-jump-button.c:159
+#: ../src/calendar/gui/ea-jump-button.c:157
 msgid "Click here, you can find more events."
 msgstr "Napsauta tästä, voit löytää lisää tapahtumia."
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start"
-#: ../calendar/gui/e-alarm-list.c:376
+#: ../src/calendar/gui/e-alarm-list.c:374
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3119,45 +6407,49 @@ msgstr[0] "%d viikko"
 msgstr[1] "%d viikkoa"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-alarm-list.c:421
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1829
+#: ../src/calendar/gui/e-alarm-list.c:419
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1827
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Toista ääni"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-alarm-list.c:425
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1827
+#: ../src/calendar/gui/e-alarm-list.c:423
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1825
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Ponnahdusikkuna hälytykselle"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-alarm-list.c:429
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1833
+#: ../src/calendar/gui/e-alarm-list.c:427
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1831
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Lähetä sähköposti"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-alarm-list.c:433
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1831
+#: ../src/calendar/gui/e-alarm-list.c:431
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1829
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Suorita ohjelma"
 
-#: ../calendar/gui/e-alarm-list.c:439
+#: ../src/calendar/gui/e-alarm-list.c:437
 msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
 msgstr "Tuntematon suoritettava tehtävä"
 
-#: ../calendar/gui/e-alarm-list.c:454
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:452
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the start"
 msgstr "%s %s ennen alkua"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:458
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the start"
@@ -3165,20 +6457,24 @@ msgstr "%s %s alun jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:467
+#: ../src/calendar/gui/e-alarm-list.c:465
 #, fuzzy, c-format
 #| msgid "%s attachment"
 msgctxt "cal-reminders"
 msgid "%s at the start"
 msgstr "Liite: %s"
 
-#: ../calendar/gui/e-alarm-list.c:479
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:477
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the end"
 msgstr "%s %s ennen loppumista"
 
-#: ../calendar/gui/e-alarm-list.c:485
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:483
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the end"
@@ -3186,7 +6482,7 @@ msgstr "%s %s päättymisen jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:492
+#: ../src/calendar/gui/e-alarm-list.c:490
 #, fuzzy, c-format
 #| msgid "%s attachment"
 msgctxt "cal-reminders"
@@ -3195,7 +6491,7 @@ msgstr "Liite: %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:516
+#: ../src/calendar/gui/e-alarm-list.c:514
 #, fuzzy, c-format
 #| msgid "%s at %s"
 msgctxt "cal-reminders"
@@ -3204,318 +6500,338 @@ msgstr "%s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:524
+#: ../src/calendar/gui/e-alarm-list.c:522
 #, fuzzy, c-format
 #| msgid "%s for an unknown trigger type"
 msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipaisintyypille"
 
-#: ../calendar/gui/ea-week-view.c:114
+#: ../src/calendar/gui/ea-week-view.c:112
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Kuukausinäkymä: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:119
+#: ../src/calendar/gui/ea-week-view.c:117
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Työviikko: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:148
+#: ../src/calendar/gui/ea-week-view.c:146
 msgid "calendar view for a month"
 msgstr "kalenterin kuukausinäkymä"
 
-#: ../calendar/gui/ea-week-view.c:150
+#: ../src/calendar/gui/ea-week-view.c:148
 msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
-#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:772
-#: ../mail/e-mail-config-page.c:126
+#: ../src/calendar/gui/e-cal-component-preview.c:214
+#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:127
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../src/calendar/gui/e-cal-component-preview.c:222
 msgid "Categories:"
 msgstr "Luokat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../src/calendar/gui/e-cal-component-preview.c:256
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../src/calendar/gui/e-cal-component-preview.c:264
 msgid "Start Date:"
 msgstr "Alkamispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../src/calendar/gui/e-cal-component-preview.c:275
 msgid "End Date:"
 msgstr "Päättymispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:286
+#: ../src/calendar/gui/e-cal-component-preview.c:286
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../modules/itip-formatter/itip-view.c:1669
-#: ../modules/itip-formatter/itip-view.c:1786
+#: ../src/calendar/gui/e-cal-component-preview.c:298
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1798
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../calendar/gui/e-cal-component-preview.c:302
-#: ../calendar/gui/e-cal-model-tasks.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
-#: ../calendar/gui/print.c:3582
+#: ../src/calendar/gui/e-cal-component-preview.c:302
+#: ../src/calendar/gui/e-cal-model-tasks.c:310
+#: ../src/calendar/gui/e-cal-model-tasks.c:552
+#: ../src/calendar/gui/e-cal-model-tasks.c:633
+#: ../src/calendar/gui/e-task-table.c:205
+#: ../src/calendar/gui/e-task-table.c:220
+#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3580
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../calendar/gui/e-cal-component-preview.c:305
-#: ../calendar/gui/e-cal-model-tasks.c:314
-#: ../calendar/gui/e-cal-model-tasks.c:556
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
-#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3585
-#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
+#: ../src/calendar/gui/e-cal-component-preview.c:305
+#: ../src/calendar/gui/e-cal-model-tasks.c:312
+#: ../src/calendar/gui/e-cal-model-tasks.c:554
+#: ../src/calendar/gui/e-meeting-store.c:202
+#: ../src/calendar/gui/e-meeting-store.c:225
+#: ../src/calendar/gui/e-task-table.c:207
+#: ../src/calendar/gui/e-task-table.c:222
+#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3583
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Completed"
 msgstr "Valmis"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
-#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
-#: ../calendar/gui/print.c:3579 ../calendar/gui/tasktypes.xml.h:11
+#: ../src/calendar/gui/e-cal-component-preview.c:312
+#: ../src/calendar/gui/e-cal-model-tasks.c:308
+#: ../src/calendar/gui/e-cal-model-tasks.c:550
+#: ../src/calendar/gui/e-task-table.c:203
+#: ../src/calendar/gui/e-task-table.c:218
+#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3577
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
-#: ../calendar/gui/e-cal-component-preview.c:325
+#: ../src/calendar/gui/e-cal-component-preview.c:325
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
-#: ../calendar/gui/e-cal-component-preview.c:327
-#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:318
+#: ../src/calendar/gui/e-cal-component-preview.c:327
+#: ../src/calendar/gui/e-task-table.c:548
+#: ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:322
 msgid "High"
 msgstr "Korkea"
 
-#: ../calendar/gui/e-cal-component-preview.c:329
-#: ../calendar/gui/e-cal-model.c:1890 ../calendar/gui/e-task-table.c:525
-#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:317
+#: ../src/calendar/gui/e-cal-component-preview.c:329
+#: ../src/calendar/gui/e-cal-model.c:1888
+#: ../src/calendar/gui/e-task-table.c:549
+#: ../src/calendar/gui/tasktypes.xml.in.h:20
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:321
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../calendar/gui/e-cal-component-preview.c:331
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:316
+#: ../src/calendar/gui/e-cal-component-preview.c:331
+#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:320
 msgid "Low"
 msgstr "Matala"
 
-#: ../calendar/gui/e-cal-component-preview.c:350
-#: ../mail/e-mail-config-service-page.c:670
+#: ../src/calendar/gui/e-cal-component-preview.c:350
+#: ../src/mail/e-mail-config-service-page.c:671
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:381
+#: ../src/calendar/gui/e-cal-component-preview.c:381
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: ../calendar/gui/e-cal-data-model.c:1633
+#: ../src/calendar/gui/e-cal-data-model.c:1631
 #, fuzzy, c-format
 #| msgid "Opening calendar '%s'"
-msgid "Creating view for calendar '%s'"
+msgid "Creating view for calendar “%s”"
 msgstr "Avataan kalenteria %s"
 
-#: ../calendar/gui/e-cal-data-model.c:1637
+#: ../src/calendar/gui/e-cal-data-model.c:1635
 #, fuzzy, c-format
 #| msgid "Opening task list '%s'"
-msgid "Creating view for task list '%s'"
+msgid "Creating view for task list “%s”"
 msgstr "Avataan tehtävälistaa '%s'"
 
-#: ../calendar/gui/e-cal-data-model.c:1641
+#: ../src/calendar/gui/e-cal-data-model.c:1639
 #, fuzzy, c-format
 #| msgid "Opening memo list '%s'"
-msgid "Creating view for memo list '%s'"
+msgid "Creating view for memo list “%s”"
 msgstr "Avataan muistilappuluetteloa '%s'"
 
-#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1957
+#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1955
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: ../calendar/gui/e-cal-dialogs.c:294
-#, c-format
-msgid "Copying events to the calendar '%s'"
+#: ../src/calendar/gui/e-cal-dialogs.c:299
+#, fuzzy, c-format
+#| msgid "Copying events to the calendar '%s'"
+msgid "Copying events to the calendar “%s”"
 msgstr "Kopioidaan tapahtumia kalenteriin '%s'"
 
-#: ../calendar/gui/e-cal-dialogs.c:300
+#: ../src/calendar/gui/e-cal-dialogs.c:305
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
-msgid "Copying memos to the memo list '%s'"
+msgid "Copying memos to the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/gui/e-cal-dialogs.c:306
-#, c-format
-msgid "Copying tasks to the task list '%s'"
+#: ../src/calendar/gui/e-cal-dialogs.c:311
+#, fuzzy, c-format
+#| msgid "Copying tasks to the task list '%s'"
+msgid "Copying tasks to the task list “%s”"
 msgstr "Kopioidaan tehtäviä tehtävälistaan '%s'"
 
-#: ../calendar/gui/e-cal-dialogs.c:525
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
+#: ../src/calendar/gui/e-cal-dialogs.c:530
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "_Delete this item from all other recipient’s mailboxes?"
+msgstr "_Poistetaanko tämä tietue kaikkien muiden vastaanottajien kansioista?"
 
-#: ../calendar/gui/e-cal-dialogs.c:528
+#: ../src/calendar/gui/e-cal-dialogs.c:533
 msgid "_Retract comment"
 msgstr "_Poista kommentti"
 
-#: ../calendar/gui/e-cal-dialogs.c:687
+#: ../src/calendar/gui/e-cal-dialogs.c:692
 msgid "Select Date"
 msgstr "Valitse päivämäärä"
 
-#: ../calendar/gui/e-cal-dialogs.c:688
-#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../src/calendar/gui/e-cal-dialogs.c:693
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1248
 msgid "Select _Today"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/e-cal-dialogs.c:707
+#: ../src/calendar/gui/e-cal-dialogs.c:712
 msgid "January"
 msgstr "Tammikuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:708
+#: ../src/calendar/gui/e-cal-dialogs.c:713
 msgid "February"
 msgstr "Helmikuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:709
+#: ../src/calendar/gui/e-cal-dialogs.c:714
 msgid "March"
 msgstr "Maaliskuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:710
+#: ../src/calendar/gui/e-cal-dialogs.c:715
 msgid "April"
 msgstr "Huhtikuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:711
+#: ../src/calendar/gui/e-cal-dialogs.c:716
 msgid "May"
 msgstr "Toukokuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:717
 msgid "June"
 msgstr "Kesäkuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:718
 msgid "July"
 msgstr "Heinäkuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:719
 msgid "August"
 msgstr "Elokuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:720
 msgid "September"
 msgstr "Syyskuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:721
 msgid "October"
 msgstr "Lokakuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:722
 msgid "November"
 msgstr "Marraskuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:723
 msgid "December"
 msgstr "Joulukuu"
 
-#: ../calendar/gui/e-cal-dialogs.c:868
+#: ../src/calendar/gui/e-cal-dialogs.c:873
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa tapahtumaa. Mitä haluat muokata?"
 
-#: ../calendar/gui/e-cal-dialogs.c:870
+#: ../src/calendar/gui/e-cal-dialogs.c:875
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Olet antamassa tehtäväksi toistuvaa tapahtumaa. Mitä haluat delegoida?"
 
-#: ../calendar/gui/e-cal-dialogs.c:874
+#: ../src/calendar/gui/e-cal-dialogs.c:879
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa tehtävää. Mitä haluat muokata?"
 
-#: ../calendar/gui/e-cal-dialogs.c:878
+#: ../src/calendar/gui/e-cal-dialogs.c:883
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa muistilappua. Mitä haluat muokata?"
 
-#: ../calendar/gui/e-cal-dialogs.c:904
+#: ../src/calendar/gui/e-cal-dialogs.c:909
 msgid "This Instance Only"
 msgstr "Vain tätä kertaa"
 
-#: ../calendar/gui/e-cal-dialogs.c:908
+#: ../src/calendar/gui/e-cal-dialogs.c:913
 msgid "This and Prior Instances"
 msgstr "Tätä ja edellisiä kertoja"
 
-#: ../calendar/gui/e-cal-dialogs.c:914
+#: ../src/calendar/gui/e-cal-dialogs.c:919
 msgid "This and Future Instances"
 msgstr "Tätä ja tulevia kertoja"
 
-#: ../calendar/gui/e-cal-dialogs.c:919
+#: ../src/calendar/gui/e-cal-dialogs.c:924
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
-#: ../calendar/gui/e-cal-dialogs.c:1169 ../calendar/gui/e-cal-dialogs.c:1251
+#: ../src/calendar/gui/e-cal-dialogs.c:1174
+#: ../src/calendar/gui/e-cal-dialogs.c:1256
 #, fuzzy
 msgid "Send my reminders with this event"
 msgstr "Lähetä hälytys tälle tapahtumalle"
 
-#: ../calendar/gui/e-cal-dialogs.c:1171 ../calendar/gui/e-cal-dialogs.c:1253
+#: ../src/calendar/gui/e-cal-dialogs.c:1176
+#: ../src/calendar/gui/e-cal-dialogs.c:1258
 msgid "Notify new attendees _only"
 msgstr "Muistuta uusia osallistuja _vain"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../src/calendar/gui/e-calendar-view.c:451
 msgid "Cut selected events to the clipboard"
 msgstr "Leikkaa valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:458
+#: ../src/calendar/gui/e-calendar-view.c:457
 msgid "Copy selected events to the clipboard"
 msgstr "Kopioi valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:464
+#: ../src/calendar/gui/e-calendar-view.c:463
 msgid "Paste events from the clipboard"
 msgstr "Liitä tapahtumat leikepöydältä"
 
-#: ../calendar/gui/e-calendar-view.c:470
+#: ../src/calendar/gui/e-calendar-view.c:469
 msgid "Delete selected events"
 msgstr "Poista valitut tapahtumat"
 
-#: ../calendar/gui/e-calendar-view.c:852
-msgid "Pasted text doesn't contain valid iCalendar data"
+#: ../src/calendar/gui/e-calendar-view.c:853
+msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1554
+#: ../src/calendar/gui/e-calendar-view.c:864
+#: ../src/calendar/gui/e-cal-ops.c:1552
 msgid "Default calendar not found"
 msgstr "Oletuskalenteria ei löytynyt"
 
-#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1557
+#: ../src/calendar/gui/e-calendar-view.c:869
+#: ../src/calendar/gui/e-cal-ops.c:1555
 #, fuzzy
 #| msgid "Mark as default memo list"
 msgid "Default memo list not found"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1560
+#: ../src/calendar/gui/e-calendar-view.c:874
+#: ../src/calendar/gui/e-cal-ops.c:1558
 msgid "Default task list not found"
 msgstr "Oletustehtävälistaa ei löytynyt"
 
-#: ../calendar/gui/e-calendar-view.c:962
+#: ../src/calendar/gui/e-calendar-view.c:963
 msgid "No suitable component found"
-msgstr ""
+msgstr "Soveltuvaa komponenttia ei löytynyt"
 
-#: ../calendar/gui/e-calendar-view.c:1032
+#: ../src/calendar/gui/e-calendar-view.c:1033
 #, fuzzy
 #| msgid "Save as iCalendar"
 msgid "Pasting iCalendar data"
 msgstr "Tallenna iCalendar-muodossa"
 
 #. 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>"
-#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:495
-#: ../calendar/gui/e-task-table.c:794
+#: ../src/calendar/gui/e-calendar-view.c:1831
+#: ../src/calendar/gui/e-memo-table.c:493
+#: ../src/calendar/gui/e-task-table.c:818
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
@@ -3523,29 +6839,31 @@ msgstr "Järjestäjä: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:500
-#: ../calendar/gui/e-task-table.c:798
+#: ../src/calendar/gui/e-calendar-view.c:1835
+#: ../src/calendar/gui/e-memo-table.c:498
+#: ../src/calendar/gui/e-task-table.c:822
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1850
-#: ../calendar/gui/e-meeting-time-sel.c:2727 ../calendar/gui/print.c:3533
+#: ../src/calendar/gui/e-calendar-view.c:1851
+#: ../src/calendar/gui/e-meeting-time-sel.c:2725
+#: ../src/calendar/gui/print.c:3531
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1890
+#: ../src/calendar/gui/e-calendar-view.c:1891
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2276
-#: ../calendar/gui/e-calendar-view.c:2283
-#: ../calendar/gui/e-calendar-view.c:2290
-#: ../calendar/gui/e-calendar-view.c:2293
+#: ../src/calendar/gui/e-calendar-view.c:2277
+#: ../src/calendar/gui/e-calendar-view.c:2284
+#: ../src/calendar/gui/e-calendar-view.c:2291
+#: ../src/calendar/gui/e-calendar-view.c:2294
 msgid "%d %b %Y"
 msgstr "%e. %Bta %Y"
 
@@ -3554,13 +6872,14 @@ msgstr "%e. %Bta %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-day-view.c:3080
-#: ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:230
+#: ../src/calendar/gui/e-calendar-view.c:2282
+#: ../src/calendar/gui/e-day-view.c:3078
+#: ../src/calendar/gui/e-day-view-top-item.c:849
+#: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%e. %b"
 
-#: ../calendar/gui/e-calendar-view.c:2303
+#: ../src/calendar/gui/e-calendar-view.c:2304
 msgid "%A %d %b %Y"
 msgstr "%A %e. %Bta %Y"
 
@@ -3570,152 +6889,168 @@ msgstr "%A %e. %Bta %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2307 ../calendar/gui/e-day-view.c:3064
-#: ../calendar/gui/e-day-view-top-item.c:847
-#: ../calendar/gui/e-week-view-main-item.c:216
+#: ../src/calendar/gui/e-calendar-view.c:2308
+#: ../src/calendar/gui/e-day-view.c:3062
+#: ../src/calendar/gui/e-day-view-top-item.c:845
+#: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a %e. %bta"
 
-#: ../calendar/gui/e-calendar-view.c:2310
-#: ../calendar/gui/e-calendar-view.c:2316
-#: ../calendar/gui/e-calendar-view.c:2319
+#: ../src/calendar/gui/e-calendar-view.c:2311
+#: ../src/calendar/gui/e-calendar-view.c:2317
+#: ../src/calendar/gui/e-calendar-view.c:2320
 msgid "%a %d %b %Y"
 msgstr "%a %e. %b %Y"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:1
+#: ../src/calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Päättymispäivä"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../calendar/gui/e-task-table.etspec.h:13
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:7
+#: ../src/calendar/gui/e-memo-table.etspec.h:6
+#: ../src/calendar/gui/e-task-table.etspec.h:13
+#: ../src/plugins/save-calendar/csv-format.c:378
 msgid "Created"
 msgstr "Luotu"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../calendar/gui/e-task-table.etspec.h:14
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:8
+#: ../src/calendar/gui/e-memo-table.etspec.h:7
+#: ../src/calendar/gui/e-task-table.etspec.h:14
 msgid "Last modified"
 msgstr "Viimeksi muokattu"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:9
-#: ../calendar/gui/e-memo-table.etspec.h:8
-#: ../calendar/gui/e-task-table.etspec.h:15
-#: ../em-format/e-mail-formatter-source.c:120
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:8
+#: ../src/calendar/gui/e-task-table.etspec.h:15
+#: ../src/em-format/e-mail-formatter-source.c:118
 msgid "Source"
 msgstr "Lähde"
 
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
-#: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3318
-#: ../modules/itip-formatter/itip-view.c:5915
-#: ../modules/plugin-manager/evolution-plugin-manager.c:99
+#: ../src/calendar/gui/e-cal-model.c:316
+#: ../src/calendar/gui/e-meeting-list-view.c:183
+#: ../src/calendar/gui/e-meeting-list-view.c:197
+#: ../src/calendar/gui/e-meeting-store.c:132
+#: ../src/calendar/gui/e-meeting-store.c:167
+#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
+#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3412
+#: ../src/modules/itip-formatter/itip-view.c:6022
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:1404 ../calendar/gui/e-cal-ops.c:615
-#: ../calendar/gui/e-cal-ops.c:1251
-#: ../modules/calendar/e-cal-base-shell-backend.c:291
+#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:613
+#: ../src/calendar/gui/e-cal-ops.c:1249
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:289
 #, c-format
-msgid "Source with UID '%s' not found"
+msgid "Source with UID “%s” not found"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:1507 ../calendar/gui/e-cal-ops.c:187
-#: ../calendar/gui/e-cal-ops.c:1368
+#: ../src/calendar/gui/e-cal-model.c:1505 ../src/calendar/gui/e-cal-ops.c:185
+#: ../src/calendar/gui/e-cal-ops.c:1366
 msgid "Creating an event"
 msgstr "Luodaan tapahtuma"
 
-#: ../calendar/gui/e-cal-model.c:1511 ../calendar/gui/e-cal-ops.c:191
-#: ../calendar/gui/e-cal-ops.c:1372
-#, fuzzy
+#: ../src/calendar/gui/e-cal-model.c:1509 ../src/calendar/gui/e-cal-ops.c:189
+#: ../src/calendar/gui/e-cal-ops.c:1370
 #| msgid "Create a Mem_o"
 msgid "Creating a memo"
-msgstr "Luo _muistilappu"
+msgstr "Luodaan muistilappu"
 
-#: ../calendar/gui/e-cal-model.c:1515 ../calendar/gui/e-cal-ops.c:195
-#: ../calendar/gui/e-cal-ops.c:1376
+#: ../src/calendar/gui/e-cal-model.c:1513 ../src/calendar/gui/e-cal-ops.c:193
+#: ../src/calendar/gui/e-cal-ops.c:1374
 msgid "Creating a task"
 msgstr "Luodaan tehtävä"
 
-#: ../calendar/gui/e-cal-model.c:1892
+#: ../src/calendar/gui/e-cal-model.c:1890
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1892
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:1023
+#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:174
+#: ../src/calendar/gui/e-meeting-store.c:184
+#: ../src/calendar/gui/e-meeting-store.c:1021
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:188
+#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-meeting-store.c:186
 msgid "No"
 msgstr "Ei"
 
-#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:5903
+#: ../src/calendar/gui/e-cal-model.c:3818
+#: ../src/calendar/gui/e-meeting-list-view.c:219
+#: ../src/calendar/gui/e-meeting-store.c:194
+#: ../src/calendar/gui/e-meeting-store.c:217
+#: ../src/modules/itip-formatter/itip-view.c:6010
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:5909
+#: ../src/calendar/gui/e-cal-model.c:3819
+#: ../src/calendar/gui/e-meeting-list-view.c:220
+#: ../src/calendar/gui/e-meeting-store.c:196
+#: ../src/calendar/gui/e-meeting-store.c:219
+#: ../src/modules/itip-formatter/itip-view.c:6016
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../src/calendar/gui/e-cal-model.c:3820
+#: ../src/calendar/gui/e-meeting-list-view.c:221
+#: ../src/calendar/gui/e-meeting-store.c:198
+#: ../src/calendar/gui/e-meeting-store.c:221
+#: ../src/calendar/gui/e-meeting-time-sel.c:533
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:5912
+#: ../src/calendar/gui/e-cal-model.c:3821
+#: ../src/calendar/gui/e-meeting-list-view.c:222
+#: ../src/calendar/gui/e-meeting-store.c:200
+#: ../src/calendar/gui/e-meeting-store.c:223
+#: ../src/modules/itip-formatter/itip-view.c:6019
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-cal-model.c:3824
+#: ../src/calendar/gui/e-cal-model.c:3822
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:689
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
-#: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
-#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+#: ../src/calendar/gui/e-cal-model.c:3877
+#: ../src/calendar/gui/e-meeting-list-view.c:687
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:11
+#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
+#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
+#: ../src/mail/vfoldertypes.xml.in.h:38
 msgid "Status"
 msgstr "Tila"
 
-#: ../calendar/gui/e-cal-model-calendar.c:150
-#: ../calendar/gui/e-task-table.c:582
+#: ../src/calendar/gui/e-cal-model-calendar.c:148
+#: ../src/calendar/gui/e-task-table.c:606
 msgid "Free"
 msgstr "Vapaa"
 
-#: ../calendar/gui/e-cal-model-calendar.c:153
-#: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
+#: ../src/calendar/gui/e-cal-model-calendar.c:151
+#: ../src/calendar/gui/e-meeting-time-sel.c:534
+#: ../src/calendar/gui/e-task-table.c:607
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../calendar/gui/e-cal-model-tasks.c:498
+#: ../src/calendar/gui/e-cal-model-tasks.c:496
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3726,40 +7061,40 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:550
+#: ../src/calendar/gui/e-cal-model-tasks.c:548
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../calendar/gui/e-cal-ops.c:306
+#: ../src/calendar/gui/e-cal-ops.c:304
 msgid "Modifying an event"
 msgstr "Muokataan tapahtumaa"
 
-#: ../calendar/gui/e-cal-ops.c:310
+#: ../src/calendar/gui/e-cal-ops.c:308
 #, fuzzy
 #| msgid "Missing name."
 msgid "Modifying a memo"
 msgstr "Nimi puuttuu."
 
-#: ../calendar/gui/e-cal-ops.c:314
+#: ../src/calendar/gui/e-cal-ops.c:312
 msgid "Modifying a task"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:413
+#: ../src/calendar/gui/e-cal-ops.c:411
 msgid "Removing an event"
 msgstr "Poistetaan tapahtuma"
 
-#: ../calendar/gui/e-cal-ops.c:417
+#: ../src/calendar/gui/e-cal-ops.c:415
 #, fuzzy
 #| msgid "Removing attachments"
 msgid "Removing a memo"
 msgstr "Poistetaan liitteitä"
 
-#: ../calendar/gui/e-cal-ops.c:421
+#: ../src/calendar/gui/e-cal-ops.c:419
 msgid "Removing a task"
 msgstr "Poistetaan tehtävä"
 
-#: ../calendar/gui/e-cal-ops.c:512
+#: ../src/calendar/gui/e-cal-ops.c:510
 #, fuzzy, c-format
 #| msgid "Meeting information sent"
 msgid "Deleting an event"
@@ -3767,7 +7102,7 @@ msgid_plural "Deleting %d events"
 msgstr[0] "Kokouksen tiedot lähetetty"
 msgstr[1] "Kokouksen tiedot lähetetty"
 
-#: ../calendar/gui/e-cal-ops.c:516
+#: ../src/calendar/gui/e-cal-ops.c:514
 #, fuzzy, c-format
 #| msgid "Delete Memo"
 msgid "Deleting a memo"
@@ -3775,7 +7110,7 @@ msgid_plural "Deleting %d memos"
 msgstr[0] "Poista muistilappu"
 msgstr[1] "Poista muistilappu"
 
-#: ../calendar/gui/e-cal-ops.c:520
+#: ../src/calendar/gui/e-cal-ops.c:518
 #, fuzzy, c-format
 #| msgid "Delete Task"
 msgid "Deleting a task"
@@ -3783,7 +7118,7 @@ msgid_plural "Deleting %d tasks"
 msgstr[0] "Poista tehtävä"
 msgstr[1] "Poista tehtävä"
 
-#: ../calendar/gui/e-cal-ops.c:723
+#: ../src/calendar/gui/e-cal-ops.c:721
 #, fuzzy, c-format
 #| msgid "Print this event"
 msgid "Pasting an event"
@@ -3791,7 +7126,7 @@ msgid_plural "Pasting %d events"
 msgstr[0] "Tulosta tämä tapahtuma"
 msgstr[1] "Tulosta tämä tapahtuma"
 
-#: ../calendar/gui/e-cal-ops.c:738
+#: ../src/calendar/gui/e-cal-ops.c:736
 #, fuzzy, c-format
 #| msgid "Print this memo"
 msgid "Pasting a memo"
@@ -3799,7 +7134,7 @@ msgid_plural "Pasting %d memos"
 msgstr[0] "Tulosta tämä muistilappu"
 msgstr[1] "Tulosta tämä muistilappu"
 
-#: ../calendar/gui/e-cal-ops.c:753
+#: ../src/calendar/gui/e-cal-ops.c:751
 #, fuzzy, c-format
 #| msgid "Print this task"
 msgid "Pasting a task"
@@ -3807,92 +7142,92 @@ msgid_plural "Pasting %d tasks"
 msgstr[0] "Tulosta tämä tehtävä"
 msgstr[1] "Tulosta tämä tehtävä"
 
-#: ../calendar/gui/e-cal-ops.c:852
+#: ../src/calendar/gui/e-cal-ops.c:850
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating an event"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-cal-ops.c:856
+#: ../src/calendar/gui/e-cal-ops.c:854
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a memo"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-cal-ops.c:860
+#: ../src/calendar/gui/e-cal-ops.c:858
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a task"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-cal-ops.c:968
+#: ../src/calendar/gui/e-cal-ops.c:966
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
-msgid "Getting events to purge in the calendar '%s'"
+msgid "Getting events to purge in the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../calendar/gui/e-cal-ops.c:972
+#: ../src/calendar/gui/e-cal-ops.c:970
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
-msgid "Getting memos to purge in the memo list '%s'"
+msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/gui/e-cal-ops.c:976
+#: ../src/calendar/gui/e-cal-ops.c:974
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
-msgid "Getting tasks to purge in the task list '%s'"
+msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../calendar/gui/e-cal-ops.c:1002
+#: ../src/calendar/gui/e-cal-ops.c:1000
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
-msgid "Purging events in the calendar '%s'"
+msgid "Purging events in the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../calendar/gui/e-cal-ops.c:1006
+#: ../src/calendar/gui/e-cal-ops.c:1004
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
-msgid "Purging memos in the memo list '%s'"
+msgid "Purging memos in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/gui/e-cal-ops.c:1010
+#: ../src/calendar/gui/e-cal-ops.c:1008
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
-msgid "Purging tasks in the task list '%s'"
+msgid "Purging tasks in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../calendar/gui/e-cal-ops.c:1110
+#: ../src/calendar/gui/e-cal-ops.c:1108
 #, fuzzy
 #| msgid "Purging"
 msgid "Purging events"
 msgstr "Tyhjennetään"
 
-#: ../calendar/gui/e-cal-ops.c:1114
+#: ../src/calendar/gui/e-cal-ops.c:1112
 #, fuzzy
 #| msgid "Print Memos"
 msgid "Purging memos"
 msgstr "Tulosta muistilaput"
 
-#: ../calendar/gui/e-cal-ops.c:1118
+#: ../src/calendar/gui/e-cal-ops.c:1116
 #, fuzzy
 #| msgid "Print Tasks"
 msgid "Purging tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../calendar/gui/e-cal-ops.c:1220
+#: ../src/calendar/gui/e-cal-ops.c:1218
 #, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Expunging completed tasks"
 msgstr "Piilota valmistuneet tehtävät"
 
-#: ../calendar/gui/e-cal-ops.c:2051
+#: ../src/calendar/gui/e-cal-ops.c:2049
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:2052
+#: ../src/calendar/gui/e-cal-ops.c:2050
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying an event"
@@ -3900,7 +7235,7 @@ msgid_plural "Copying %d events"
 msgstr[0] "Kopioidaan tiedostoja"
 msgstr[1] "Kopioidaan tiedostoja"
 
-#: ../calendar/gui/e-cal-ops.c:2058
+#: ../src/calendar/gui/e-cal-ops.c:2056
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a memo"
@@ -3908,7 +7243,7 @@ msgid_plural "Moving %d memos"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../calendar/gui/e-cal-ops.c:2059
+#: ../src/calendar/gui/e-cal-ops.c:2057
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a memo"
@@ -3916,7 +7251,7 @@ msgid_plural "Copying %d memos"
 msgstr[0] "Kopioidaan tiedostoja"
 msgstr[1] "Kopioidaan tiedostoja"
 
-#: ../calendar/gui/e-cal-ops.c:2065
+#: ../src/calendar/gui/e-cal-ops.c:2063
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a task"
@@ -3924,7 +7259,7 @@ msgid_plural "Moving %d tasks"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../calendar/gui/e-cal-ops.c:2066
+#: ../src/calendar/gui/e-cal-ops.c:2064
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a task"
@@ -3933,16 +7268,16 @@ msgstr[0] "Kopioidaan tiedostoja"
 msgstr[1] "Kopioidaan tiedostoja"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../src/calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:168
+#: ../src/calendar/gui/e-cell-date-edit-text.c:166
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I.%M.%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:176
+#: ../src/calendar/gui/e-cell-date-edit-text.c:174
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3951,179 +7286,177 @@ msgstr ""
 "Päiväys täytyy antaa seuraavassa muodossa: \n"
 "%s"
 
-#: ../calendar/gui/e-comp-editor-event.c:101
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-event.c:99
 #| msgid "Event's start time is in the past"
-msgid "Event's time is in the past"
-msgstr "Tapahtuman aloitusaika on mennyt"
+msgid "Event’s time is in the past"
+msgstr "Tapahtuman ajankohta on mennyt"
 
-#: ../calendar/gui/e-comp-editor-event.c:202
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-event.c:200
 #| msgid "Event cannot be edited, because the selected calendar is read only"
 msgid ""
 "Event cannot be edited, because the selected calendar could not be opened"
-msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
+msgstr "Tapahtumaa ei voi muokata, koska valittua kalenteria ei voida avata"
 
-#: ../calendar/gui/e-comp-editor-event.c:204
+#: ../src/calendar/gui/e-comp-editor-event.c:202
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
 
-#: ../calendar/gui/e-comp-editor-event.c:206
+#: ../src/calendar/gui/e-comp-editor-event.c:204
 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ä"
 
-#: ../calendar/gui/e-comp-editor-event.c:438
-#: ../calendar/gui/e-comp-editor-task.c:348
+#: ../src/calendar/gui/e-comp-editor-event.c:436
+#: ../src/calendar/gui/e-comp-editor-task.c:522
 msgid "Start date is not a valid date"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../calendar/gui/e-comp-editor-event.c:440
+#: ../src/calendar/gui/e-comp-editor-event.c:438
 msgid "Start time is not a valid time"
 msgstr "Alkamisaika on virheellinen"
 
-#: ../calendar/gui/e-comp-editor-event.c:444
-#: ../calendar/gui/e-comp-editor-event.c:460
-#: ../calendar/gui/e-comp-editor-page-attachments.c:201
-#: ../calendar/gui/e-comp-editor.c:340 ../mail/e-mail-display.c:2021
-#: ../mail/e-mail-reader-utils.c:648 ../mail/mail-send-recv.c:489
-#: ../mail/mail-send-recv.c:1289 ../plugins/face/face.c:176
-#: ../shell/e-shell.c:992 ../shell/e-shell.c:1014
-#: ../smime/gui/certificate-manager.c:359
+#: ../src/calendar/gui/e-comp-editor-event.c:442
+#: ../src/calendar/gui/e-comp-editor-event.c:458
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:199
+#: ../src/calendar/gui/e-comp-editor.c:338 ../src/mail/e-mail-display.c:2116
+#: ../src/mail/e-mail-reader-utils.c:646 ../src/mail/mail-send-recv.c:490
+#: ../src/mail/mail-send-recv.c:1288 ../src/plugins/face/face.c:174
+#: ../src/shell/e-shell.c:1073 ../src/shell/e-shell.c:1097
+#: ../src/smime/gui/certificate-manager.c:357
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../calendar/gui/e-comp-editor-event.c:454
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-event.c:452
 #| msgid "The calendar attached is not valid"
 msgid "End date is not a valid date"
-msgstr "Liitetty kalenteri ei ole kelvollinen"
+msgstr "Päättymispäivä ei ole kelvollinen päivä"
 
-#: ../calendar/gui/e-comp-editor-event.c:456
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-event.c:454
 #| msgid "Chosen file is not a local file."
 msgid "End time is not a valid time"
-msgstr "Valittu tiedosto ei ole paikallinen tiedosto."
+msgstr "Päättymisaika ei ole kelvollinen aika"
 
-#: ../calendar/gui/e-comp-editor-event.c:588
-#: ../calendar/gui/e-comp-editor-memo.c:106
-#: ../calendar/gui/e-comp-editor-task.c:406
+#: ../src/calendar/gui/e-comp-editor-event.c:586
+#: ../src/calendar/gui/e-comp-editor-memo.c:126
+#: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../calendar/gui/e-comp-editor-event.c:590
-#: ../calendar/gui/e-comp-editor-memo.c:108
-#: ../calendar/gui/e-comp-editor-task.c:408
+#: ../src/calendar/gui/e-comp-editor-event.c:588
+#: ../src/calendar/gui/e-comp-editor-memo.c:128
+#: ../src/calendar/gui/e-comp-editor-task.c:593
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../calendar/gui/e-comp-editor-event.c:596
+#: ../src/calendar/gui/e-comp-editor-event.c:594
+#: ../src/calendar/gui/e-comp-editor-task.c:599
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../calendar/gui/e-comp-editor-event.c:598
+#: ../src/calendar/gui/e-comp-editor-event.c:596
+#: ../src/calendar/gui/e-comp-editor-task.c:601
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../calendar/gui/e-comp-editor-event.c:604
+#: ../src/calendar/gui/e-comp-editor-event.c:602
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../calendar/gui/e-comp-editor-event.c:606
+#: ../src/calendar/gui/e-comp-editor-event.c:604
 msgid "Toggles whether to have All Day Event"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../calendar/gui/e-comp-editor-event.c:612
+#: ../src/calendar/gui/e-comp-editor-event.c:610
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../calendar/gui/e-comp-editor-event.c:614
+#: ../src/calendar/gui/e-comp-editor-event.c:612
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../calendar/gui/e-comp-editor-event.c:623
+#: ../src/calendar/gui/e-comp-editor-event.c:621
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/e-comp-editor-event.c:625
+#: ../src/calendar/gui/e-comp-editor-event.c:623
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/e-comp-editor-event.c:630
+#: ../src/calendar/gui/e-comp-editor-event.c:628
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/e-comp-editor-event.c:632
+#: ../src/calendar/gui/e-comp-editor-event.c:630
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/e-comp-editor-event.c:637
+#: ../src/calendar/gui/e-comp-editor-event.c:635
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/e-comp-editor-event.c:639
+#: ../src/calendar/gui/e-comp-editor-event.c:637
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/e-comp-editor-event.c:740
+#: ../src/calendar/gui/e-comp-editor-event.c:738
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-comp-editor-event.c:745
+#: ../src/calendar/gui/e-comp-editor-event.c:743
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../calendar/gui/e-comp-editor-event.c:755
+#: ../src/calendar/gui/e-comp-editor-event.c:753
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../calendar/gui/e-comp-editor-event.c:808
-#: ../calendar/gui/e-comp-editor-memo.c:192
-#: ../calendar/gui/e-comp-editor-task.c:529
+#: ../src/calendar/gui/e-comp-editor-event.c:806
+#: ../src/calendar/gui/e-comp-editor-memo.c:213
+#: ../src/calendar/gui/e-comp-editor-task.c:765
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../calendar/gui/e-comp-editor-event.c:811
-#: ../calendar/gui/e-comp-editor-task.c:535
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-event.c:809
+#: ../src/calendar/gui/e-comp-editor-task.c:782
 #| msgid "Reminders"
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../calendar/gui/e-comp-editor-event.c:814
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-event.c:812
 #| msgid "Recurrence"
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../calendar/gui/e-comp-editor-event.c:817
-#: ../calendar/gui/e-comp-editor-memo.c:195
-#: ../calendar/gui/e-comp-editor-task.c:538
+#: ../src/calendar/gui/e-comp-editor-event.c:815
+#: ../src/calendar/gui/e-comp-editor-memo.c:216
+#: ../src/calendar/gui/e-comp-editor-task.c:785
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: ../calendar/gui/e-comp-editor-event.c:827
+#: ../src/calendar/gui/e-comp-editor-event.c:825
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr ""
 
-#: ../calendar/gui/e-comp-editor-event.c:859
+#: ../src/calendar/gui/e-comp-editor-event.c:857
 #, c-format
-msgid "Meeting - %s"
-msgstr "Kokous - %s"
+#| msgid "Meeting - %s"
+msgid "Meeting — %s"
+msgstr "Kokous — %s"
 
-#: ../calendar/gui/e-comp-editor-event.c:860
+#: ../src/calendar/gui/e-comp-editor-event.c:858
 #, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
+#| msgid "Appointment - %s"
+msgid "Appointment — %s"
+msgstr "Tapaaminen — %s"
 
-#: ../calendar/gui/e-comp-editor-memo.c:68
+#: ../src/calendar/gui/e-comp-editor-memo.c:88
 #, fuzzy
 #| msgid "Memo cannot be edited, because the selected memo list is read only"
 msgid ""
@@ -4132,62 +7465,64 @@ msgstr ""
 "Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain "
 "lukutilassa"
 
-#: ../calendar/gui/e-comp-editor-memo.c:70
+#: ../src/calendar/gui/e-comp-editor-memo.c:90
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain "
 "lukutilassa"
 
-#: ../calendar/gui/e-comp-editor-memo.c:72
+#: ../src/calendar/gui/e-comp-editor-memo.c:92
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 
-#: ../calendar/gui/e-comp-editor-memo.c:168
-#: ../calendar/gui/e-comp-editor-task.c:468
+#: ../src/calendar/gui/e-comp-editor-memo.c:188
+#: ../src/calendar/gui/e-comp-editor-task.c:700
 msgid "_List:"
 msgstr "_Luettelo:"
 
-#: ../calendar/gui/e-comp-editor-memo.c:175
-#: ../calendar/gui/e-comp-editor-task.c:475
+#: ../src/calendar/gui/e-comp-editor-memo.c:195
+#: ../src/calendar/gui/e-comp-editor-task.c:707
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
-#: ../calendar/gui/e-comp-editor-memo.c:223
+#: ../src/calendar/gui/e-comp-editor-memo.c:247
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
-msgid "Assigned Memo - %s"
+msgid "Assigned Memo — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/e-comp-editor-memo.c:224
-#, c-format
-msgid "Memo - %s"
+#: ../src/calendar/gui/e-comp-editor-memo.c:248
+#, fuzzy, c-format
+#| msgid "Memo - %s"
+msgid "Memo — %s"
 msgstr "Muistilappu - %s"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:125
-#: ../calendar/gui/e-comp-editor-page-attachments.c:130
-#: ../em-format/e-mail-formatter-attachment.c:337
-#: ../e-util/e-attachment-bar.c:103 ../e-util/e-attachment-bar.c:108
-#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
-#: ../mail/message-list.etspec.h:4
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
+#: ../src/em-format/e-mail-formatter-attachment.c:333
+#: ../src/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
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:196
-#: ../e-util/e-attachment.c:2424
-#, c-format
-msgid "Could not load '%s'"
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:194
+#: ../src/e-util/e-attachment.c:2419
+#, fuzzy, c-format
+#| msgid "Could not load '%s'"
+msgid "Could not load “%s”"
 msgstr "%s ei voitu ladata"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:198
-#: ../e-util/e-attachment.c:2427
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:196
+#: ../src/e-util/e-attachment.c:2422
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:403
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:401
 #, fuzzy
 #| msgid ""
 #| "Some attachments are being downloaded. Saving the task would result in "
@@ -4199,57 +7534,58 @@ msgstr ""
 "Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt "
 "aiheuttaa tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:430
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:428
 #, c-format
-msgid "Attachment '%s' cannot be found, remove it from the list, please"
+msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr ""
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:447
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:445
 #, c-format
-msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
+msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr ""
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:608
-#: ../composer/e-composer-actions.c:319
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:606
+#: ../src/composer/e-composer-actions.c:320
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:610
-#: ../composer/e-composer-actions.c:321 ../e-util/e-attachment-view.c:345
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:608
+#: ../src/composer/e-composer-actions.c:322
+#: ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:617
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:615
 msgid "_Attachments"
 msgstr "_Liitteet"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:619
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:617
 msgid "Show attachments"
 msgstr "Näytä liitteet"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:772
-#: ../e-util/e-attachment-bar.c:766 ../e-util/e-attachment-paned.c:735
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:770
+#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Kuvakenäkymä"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:774
-#: ../e-util/e-attachment-bar.c:768 ../e-util/e-attachment-paned.c:737
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:772
+#: ../src/e-util/e-attachment-bar.c:768 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "Luettelonäkymä"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:313
+#: ../src/calendar/gui/e-comp-editor-page-general.c:311
 #, 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"
+msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:320
+#: ../src/calendar/gui/e-comp-editor-page-general.c:318
 #, c-format
-msgid "Not enough rights to delete attendee '%s'"
+msgid "Not enough rights to delete attendee “%s”"
 msgstr ""
 
-#: ../calendar/gui/e-comp-editor-page-general.c:350
+#: ../src/calendar/gui/e-comp-editor-page-general.c:348
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete selected attendee"
@@ -4257,77 +7593,77 @@ msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Yhteystiedon poisto epäonnistui"
 msgstr[1] "Yhteystiedon poisto epäonnistui"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:583
+#: ../src/calendar/gui/e-comp-editor-page-general.c:581
 msgid "A_ttendees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:585
+#: ../src/calendar/gui/e-comp-editor-page-general.c:583
 #, 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"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:594
+#: ../src/calendar/gui/e-comp-editor-page-general.c:592
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:596
+#: ../src/calendar/gui/e-comp-editor-page-general.c:594
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:602
+#: ../src/calendar/gui/e-comp-editor-page-general.c:600
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:604
+#: ../src/calendar/gui/e-comp-editor-page-general.c:602
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:610
+#: ../src/calendar/gui/e-comp-editor-page-general.c:608
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:612
+#: ../src/calendar/gui/e-comp-editor-page-general.c:610
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:618
+#: ../src/calendar/gui/e-comp-editor-page-general.c:616
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:620
+#: ../src/calendar/gui/e-comp-editor-page-general.c:618
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:945
+#: ../src/calendar/gui/e-comp-editor-page-general.c:943
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../calendar/gui/e-comp-editor-page-general.c:955
-#: ../calendar/gui/e-comp-editor-page-general.c:1086
+#: ../src/calendar/gui/e-comp-editor-page-general.c:953
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1084
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../calendar/gui/e-comp-editor-page-general.c:1209
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1207
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:1288
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1286
 msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:327
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:365
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:490
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
 msgid "on"
 msgstr "Käytössä"
 
@@ -4335,7 +7671,7 @@ msgstr "Käytössä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:571
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
 #, fuzzy
 #| msgid "first"
 msgctxt "ECompEditorPageRecur"
@@ -4347,7 +7683,7 @@ msgstr "ensimmäinen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:577
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
 #, fuzzy
 #| msgid "second"
 msgctxt "ECompEditorPageRecur"
@@ -4358,7 +7694,7 @@ msgstr "toinen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:582
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
 #, fuzzy
 #| msgid "third"
 msgctxt "ECompEditorPageRecur"
@@ -4369,7 +7705,7 @@ msgstr "kolmas"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:587
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
 #, fuzzy
 #| msgid "fourth"
 msgctxt "ECompEditorPageRecur"
@@ -4380,7 +7716,7 @@ msgstr "neljäs"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:592
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
 #, fuzzy
 #| msgid "fifth"
 msgctxt "ECompEditorPageRecur"
@@ -4391,7 +7727,7 @@ msgstr "viides"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:597
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
 #, fuzzy
 #| msgid "last"
 msgctxt "ECompEditorPageRecur"
@@ -4400,7 +7736,7 @@ msgstr "viimeinen"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:624
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
 #, fuzzy
 #| msgid "Other Date"
 msgctxt "ECompEditorPageRecur"
@@ -4411,7 +7747,7 @@ msgstr "Toinen päiväys"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:630
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
 #, fuzzy
 #| msgid "1st to 10th"
 msgctxt "ECompEditorPageRecur"
@@ -4422,7 +7758,7 @@ msgstr "1. - 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:636
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
 #, fuzzy
 #| msgid "11th to 20th"
 msgctxt "ECompEditorPageRecur"
@@ -4433,7 +7769,7 @@ msgstr "11. - 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:642
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
 #, fuzzy
 #| msgid "21st to 31st"
 msgctxt "ECompEditorPageRecur"
@@ -4443,7 +7779,7 @@ msgstr "21. - 31."
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
 #, fuzzy
 #| msgid "day"
 #| msgid_plural "days"
@@ -4451,50 +7787,43 @@ msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "päivä"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
 #| msgid "Monday"
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
 #| msgid "Tuesday"
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
 #| msgid "Wednesday"
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
 #| msgid "Thursday"
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
 #| msgid "Friday"
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
 #| msgid "Saturday"
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:675
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
 #| msgid "Sunday"
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
@@ -4503,14 +7832,14 @@ msgstr "Sunnuntai"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:804
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
 #, fuzzy
 #| msgid "on the"
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "seuraavasti:"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:994
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
 #, fuzzy
 #| msgid "occurrences"
 msgctxt "ECompEditorPageRecur"
@@ -4518,8 +7847,8 @@ 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1487
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2017
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1485
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2015
 #, fuzzy
 #| msgid "This appointment rec_urs"
 msgctxt "ECompEditorPageRecur"
@@ -4527,7 +7856,7 @@ msgid "This appointment rec_urs"
 msgstr "Tapaaminen on _toistuva"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1492
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1490
 #, fuzzy
 #| msgid "This task recurs"
 msgctxt "ECompEditorPageRecur"
@@ -4535,7 +7864,7 @@ msgid "This task rec_urs"
 msgstr "Tehtävä on toistuva"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1497
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1495
 #, fuzzy
 #| msgid "This memo recurs"
 msgctxt "ECompEditorPageRecur"
@@ -4543,39 +7872,39 @@ 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1502
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1500
 #, fuzzy
 #| msgid "This appointment rec_urs"
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1863
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1861
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Recurrence exception date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1911
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1909
 #, 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"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1954
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1952
 #, fuzzy
 #| msgid "Recurrence"
 msgid "R_ecurrence"
 msgstr "Toistuvuus"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1956
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1954
 #, 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2057
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
 #, fuzzy
 #| msgid "Every"
 msgctxt "ECompEditorPageRecur"
@@ -4583,7 +7912,7 @@ 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
 #, fuzzy
 #| msgid "day(s)"
 msgctxt "ECompEditorPageRecur"
@@ -4591,7 +7920,7 @@ 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2094
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
 #, fuzzy
 #| msgctxt "recurrpage"
 #| msgid "week(s)"
@@ -4600,7 +7929,7 @@ 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2096
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
 #, fuzzy
 #| msgctxt "recurrpage"
 #| msgid "month(s)"
@@ -4609,7 +7938,7 @@ 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2098
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
 #, fuzzy
 #| msgctxt "recurrpage"
 #| msgid "year(s)"
@@ -4618,7 +7947,7 @@ 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2127
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
 #, fuzzy
 #| msgctxt "eventpage"
 #| msgid "for"
@@ -4627,7 +7956,7 @@ 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2129
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
 #, fuzzy
 #| msgctxt "eventpage"
 #| msgid "until"
@@ -4636,7 +7965,7 @@ msgid "until"
 msgstr "saakka"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2131
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
 #, fuzzy
 #| msgctxt "recurrpage"
 #| msgid "forever"
@@ -4644,71 +7973,71 @@ msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "ikuisesti"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2147
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2164
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2162
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2233
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
-#: ../mail/mail-config.ui.h:62
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
+#: ../src/mail/mail-config.ui.h:64
 msgid "A_dd"
 msgstr "_Lisää"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2249
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
-#: ../mail/mail-config.ui.h:64
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
+#: ../src/mail/mail-config.ui.h:66
 msgid "Re_move"
 msgstr "_Poista"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2257
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2255
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:41
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:39
 #, fuzzy
 #| msgid "Send To:"
 msgid "Send To"
 msgstr "Lähetä:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1554
 msgid "_Reminders"
 msgstr "_Muistutukset"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1556
 #, fuzzy
 #| msgid "Set or unset reminders for this event"
 msgid "Set or unset reminders"
 msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1609
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1638
 msgid "_Reminder"
 msgstr "_Muistutus"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1671
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d päivä ennen"
 msgstr[1] "%d päivää ennen"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1678
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d tunti ennen"
 msgstr[1] "%d tuntia ennen"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -4716,31 +8045,31 @@ msgstr[0] "%d minuutti ennen"
 msgstr[1] "%d minuuttia ennen"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1693
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ei mitään"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 minuuttia ennen"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1697
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 tunti ennen"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1699
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 päivä ennen"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1711
 #, fuzzy
 #| msgid "Custom"
 msgctxt "cal-reminders"
@@ -4748,7 +8077,7 @@ msgid "Custom"
 msgstr "Omavalintainen"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
 #, fuzzy
 #| msgid "minute(s)"
 msgctxt "cal-reminders"
@@ -4756,7 +8085,7 @@ msgid "minute(s)"
 msgstr "minuutti(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1864
 #, fuzzy
 #| msgid "hour(s)"
 msgctxt "cal-reminders"
@@ -4764,7 +8093,7 @@ msgid "hour(s)"
 msgstr "tunti(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1866
 #, fuzzy
 #| msgid "day(s)"
 msgctxt "cal-reminders"
@@ -4772,7 +8101,7 @@ msgid "day(s)"
 msgstr "päivä(ä)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1883
 #, fuzzy
 #| msgid "before"
 msgctxt "cal-reminders"
@@ -4780,7 +8109,7 @@ msgid "before"
 msgstr "ennen"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
 #, fuzzy
 #| msgid "after"
 msgctxt "cal-reminders"
@@ -4788,7 +8117,7 @@ msgid "after"
 msgstr "jälkeen"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1901
 #, fuzzy
 #| msgid "Start"
 msgctxt "cal-reminders"
@@ -4796,7 +8125,7 @@ msgid "start"
 msgstr "Alkaa"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1903
 #, fuzzy
 #| msgid "_Send"
 msgctxt "cal-reminders"
@@ -4804,14 +8133,14 @@ msgid "end"
 msgstr "_Lähetä"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1928
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
 #, fuzzy
 #| msgid "_Repeat the reminder"
 msgid "Re_peat the reminder"
 msgstr "_Toista muistutus"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1953
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1951
 #, fuzzy
 #| msgid "extra times every"
 msgctxt "cal-reminders"
@@ -4819,7 +8148,7 @@ msgid "extra times every"
 msgstr "ylimääräistä kertaa joka"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1988
 #, fuzzy
 #| msgid "minutes"
 msgctxt "cal-reminders"
@@ -4827,7 +8156,7 @@ msgid "minutes"
 msgstr "minuutti"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1990
 #, fuzzy
 #| msgid "hours"
 msgctxt "cal-reminders"
@@ -4835,7 +8164,7 @@ msgid "hours"
 msgstr "tuntia"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1992
 #, fuzzy
 #| msgid "days"
 msgctxt "cal-reminders"
@@ -4843,196 +8172,194 @@ msgid "days"
 msgstr "päivä"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2035
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2192
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2033
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
 #| msgid "Custom _message"
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Oma _viesti"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2077
 #| msgid "Custom reminder sound"
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
-msgstr "Oma _hälytysääni muistutukselle"
+msgstr "Oma _hälytysääni muistutukselles"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2088
 msgid "Select a sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2116
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2141
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2173
 #, fuzzy
 #| msgid "Send To:"
 msgid "_Send To:"
 msgstr "Lähetä:"
 
-#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
 #, fuzzy
 #| msgid "_Schedule Meeting..."
 msgid "_Schedule"
 msgstr "_Järjestä kokous..."
 
-#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:81
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:79
 #, fuzzy
 #| msgid "_Summary:"
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Yhteenveto:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:325
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Sijainti:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:458
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
 #, fuzzy
 #| msgid "Ca_tegories..."
 msgctxt "ECompEditor"
 msgid "_Categories..."
 msgstr "Ry_hmät..."
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:555
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "K_uvaus:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:686
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:686
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Verkkosivusto:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1057
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1057
 #, fuzzy
 #| msgid "D_ue date:"
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "_Eräpäivä:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1117
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1117
 #, fuzzy
 #| msgid "Date _completed:"
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Valmistumispäivä:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1133
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1133
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1134
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Yksityinen"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1135
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
 #| msgid "Confidential"
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1151
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1151
 #| msgid "C_lassification:"
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "Lu_okittelu:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1170
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
 msgctxt "ECompEditor"
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
 msgctxt "ECompEditor"
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1172
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
 msgctxt "ECompEditor"
 msgid "Completed"
 msgstr "Valmis"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1173
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
 #| msgid "Cancelled"
 msgctxt "ECompEditor"
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1182
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1212
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1212
 #| msgid "Undefined"
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Korkea"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1214
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1215
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Matala"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1224
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1224
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Prioriteetti:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1278
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1278
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Prosenttia valmiina:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1359
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1359
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Aika_vyöhyke:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1484
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
 #, fuzzy
 #| msgid "Show Time as _Busy"
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../calendar/gui/e-comp-editor-task.c:75
-msgid "Task's start date is in the past"
+#: ../src/calendar/gui/e-comp-editor-task.c:224
+#, fuzzy
+#| msgid "Task's start date is in the past"
+msgid "Task’s start date is in the past"
 msgstr "Tehtävän aloitusaika on mennyt"
 
-#: ../calendar/gui/e-comp-editor-task.c:83
-msgid "Task's due date is in the past"
+#: ../src/calendar/gui/e-comp-editor-task.c:232
+#, fuzzy
+#| msgid "Task's due date is in the past"
+msgid "Task’s due date is in the past"
 msgstr "Tehtävän aloitusaika on mennyt"
 
-#: ../calendar/gui/e-comp-editor-task.c:308
+#: ../src/calendar/gui/e-comp-editor-task.c:461
 #, fuzzy
 #| msgid "Task cannot be edited, because the selected task list is read only"
 msgid ""
@@ -5040,209 +8367,232 @@ msgid ""
 msgstr ""
 "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../calendar/gui/e-comp-editor-task.c:310
+#: ../src/calendar/gui/e-comp-editor-task.c:463
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../calendar/gui/e-comp-editor-task.c:312
+#: ../src/calendar/gui/e-comp-editor-task.c:465
 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ä"
 
-#: ../calendar/gui/e-comp-editor-task.c:359
+#: ../src/calendar/gui/e-comp-editor-task.c:533
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Due date is not a valid date"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../calendar/gui/e-comp-editor-task.c:370
+#: ../src/calendar/gui/e-comp-editor-task.c:544
 #, fuzzy
 #| msgid "Completed date is wrong"
 msgid "Completed date is not a valid date"
 msgstr "Valmistumispäivä on väärin"
 
-#: ../calendar/gui/e-comp-editor-task.c:381
+#: ../src/calendar/gui/e-comp-editor-task.c:555
 #, 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ä"
 
-#: ../calendar/gui/e-comp-editor-task.c:566
-#, c-format
-msgid "Assigned Task - %s"
+#: ../src/calendar/gui/e-comp-editor-task.c:607
+#, fuzzy
+#| msgid "All _Day Event"
+msgid "All _Day Task"
+msgstr "Koko _päivän tapahtuma"
+
+#: ../src/calendar/gui/e-comp-editor-task.c:609
+#, fuzzy
+#| msgid "Toggles whether to have All Day Event"
+msgid "Toggles whether to have All Day Task"
+msgstr "Määrittää onko tämä koko päivän tapahtuma"
+
+#: ../src/calendar/gui/e-comp-editor-task.c:818
+#, fuzzy, c-format
+#| msgid "Assigned Task - %s"
+msgid "Assigned Task — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/e-comp-editor-task.c:567
-#, c-format
-msgid "Task - %s"
+#: ../src/calendar/gui/e-comp-editor-task.c:819
+#, fuzzy, c-format
+#| msgid "Task - %s"
+msgid "Task — %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/e-comp-editor.c:255
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
+#: ../src/calendar/gui/e-comp-editor.c:253
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:125
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/e-comp-editor.c:610
+#: ../src/calendar/gui/e-comp-editor.c:608
 #, fuzzy
 #| msgid "Send _updates to attendees"
 msgid "Sending notifications to attendees..."
 msgstr "Lähetä _päivitykset osallistujille"
 
-#: ../calendar/gui/e-comp-editor.c:995
+#: ../src/calendar/gui/e-comp-editor.c:993
 msgid "Saving changes..."
 msgstr "Tallennetaan muutoksia..."
 
-#: ../calendar/gui/e-comp-editor.c:1251
+#: ../src/calendar/gui/e-comp-editor.c:1249
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
 #. == Button box ==
-#: ../calendar/gui/e-comp-editor.c:1976 ../composer/e-composer-actions.c:326
-#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:308
-#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
-#: ../mail/e-mail-notes.c:931 ../mail/em-folder-properties.c:786
-#: ../mail/em-subscription-editor.c:1765
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2214
+#: ../src/calendar/gui/e-comp-editor.c:1976
+#: ../src/composer/e-composer-actions.c:327
+#: ../src/e-util/e-html-editor-dialog.c:194
+#: ../src/e-util/e-mail-signature-editor.c:309
+#: ../src/e-util/e-name-selector-dialog.c:548
+#: ../src/e-util/e-preferences-window.c:389
+#: ../src/e-util/e-table-field-chooser-dialog.c:205
+#: ../src/mail/e-mail-browser.c:127 ../src/mail/e-mail-notes.c:931
+#: ../src/mail/em-folder-properties.c:1158
+#: ../src/mail/em-subscription-editor.c:1765
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../src/shell/e-shell-window-actions.c:278
+#: ../src/shell/e-shell-window-actions.c:787
+#: ../src/smime/gui/certificate-manager.c:2212
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../calendar/gui/e-comp-editor.c:1978
+#: ../src/calendar/gui/e-comp-editor.c:1978
 msgid "Close the current window"
 msgstr "Sulje nykyinen ikkuna"
 
 #. copy menu item
-#: ../calendar/gui/e-comp-editor.c:1983 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:864 ../e-util/e-text.c:2109
-#: ../e-util/e-web-view.c:398 ../mail/e-mail-browser.c:136
-#: ../mail/mail.error.xml.h:146 ../shell/e-shell-window-actions.c:799
+#: ../src/calendar/gui/e-comp-editor.c:1983 ../src/e-util/e-focus-tracker.c:773
+#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110
+#: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
+#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:808
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../calendar/gui/e-comp-editor.c:1985 ../e-util/e-focus-tracker.c:175
-#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:400
-#: ../e-util/e-web-view.c:1811 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:801
+#: ../src/calendar/gui/e-comp-editor.c:1985 ../src/e-util/e-focus-tracker.c:173
+#: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
+#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409
+#: ../src/e-util/e-web-view.c:1942 ../src/mail/e-mail-browser.c:136
+#: ../src/shell/e-shell-window-actions.c:810
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
 #. cut menu item
-#: ../calendar/gui/e-comp-editor.c:1990 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:871 ../e-util/e-text.c:2095
-#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
+#: ../src/calendar/gui/e-comp-editor.c:1990 ../src/e-util/e-focus-tracker.c:768
+#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2096
+#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:815
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ../calendar/gui/e-comp-editor.c:1992 ../e-util/e-focus-tracker.c:168
-#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1801
-#: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
+#: ../src/calendar/gui/e-comp-editor.c:1992 ../src/e-util/e-focus-tracker.c:166
+#: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1951
+#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:817
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ../calendar/gui/e-comp-editor.c:1999 ../e-util/e-focus-tracker.c:189
-#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
-#: ../shell/e-shell-window-actions.c:815
+#: ../src/calendar/gui/e-comp-editor.c:1999 ../src/e-util/e-focus-tracker.c:187
+#: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
+#: ../src/shell/e-shell-window-actions.c:824
 msgid "Delete the selection"
 msgstr "Poista valinta"
 
-#: ../calendar/gui/e-comp-editor.c:2006
+#: ../src/calendar/gui/e-comp-editor.c:2006
 msgid "View help"
 msgstr "Näytä ohje"
 
 #. paste menu item
-#: ../calendar/gui/e-comp-editor.c:2011 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:878 ../e-util/e-text.c:2121
-#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
+#: ../src/calendar/gui/e-comp-editor.c:2011 ../src/e-util/e-focus-tracker.c:778
+#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2122
+#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:843
 msgid "_Paste"
 msgstr "_Liitä"
 
-#: ../calendar/gui/e-comp-editor.c:2013 ../e-util/e-focus-tracker.c:182
-#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1821
-#: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
+#: ../src/calendar/gui/e-comp-editor.c:2013 ../src/e-util/e-focus-tracker.c:180
+#: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1960
+#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:845
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../calendar/gui/e-comp-editor.c:2018 ../composer/e-composer-actions.c:380
-#: ../mail/e-mail-reader.c:2326
-#: ../modules/addressbook/e-book-shell-view-actions.c:1231
-#: ../modules/addressbook/e-book-shell-view-actions.c:1245
+#: ../src/calendar/gui/e-comp-editor.c:2018
+#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2323
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1229
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1243
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-comp-editor.c:2025 ../mail/e-mail-reader.c:2333
-#: ../modules/addressbook/e-book-shell-view-actions.c:1238
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
-#: ../modules/calendar/e-task-shell-view-actions.c:1016
+#: ../src/calendar/gui/e-comp-editor.c:2025 ../src/mail/e-mail-reader.c:2330
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1236
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1693
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:813
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Pre_view..."
 msgstr "E_sikatselu..."
 
-#: ../calendar/gui/e-comp-editor.c:2032 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:892 ../e-util/e-web-view.c:408
-#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
+#: ../src/calendar/gui/e-comp-editor.c:2032 ../src/e-util/e-focus-tracker.c:788
+#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417
+#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:920
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ../calendar/gui/e-comp-editor.c:2034 ../e-util/e-focus-tracker.c:196
-#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:159 ../shell/e-shell-window-actions.c:913
+#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:194
+#: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
+#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:922
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2055
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../calendar/gui/e-comp-editor.c:2069 ../e-util/e-html-editor-actions.c:915
-#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:166
-#: ../mail/e-mail-notes.c:945 ../shell/e-shell-window-actions.c:948
+#: ../src/calendar/gui/e-comp-editor.c:2069
+#: ../src/e-util/e-html-editor-actions.c:929
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:164
+#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:957
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../calendar/gui/e-comp-editor.c:2083 ../e-util/e-html-editor-actions.c:936
+#: ../src/calendar/gui/e-comp-editor.c:2083
+#: ../src/e-util/e-html-editor-actions.c:950
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../calendar/gui/e-comp-editor.c:2090 ../composer/e-composer-actions.c:370
+#: ../src/calendar/gui/e-comp-editor.c:2090
+#: ../src/composer/e-composer-actions.c:371
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-comp-editor.c:2097 ../e-util/e-html-editor-actions.c:957
-#: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1664 ../smime/gui/smime-ui.ui.h:5
+#: ../src/calendar/gui/e-comp-editor.c:2097
+#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:178
+#: ../src/shell/e-shell-window-actions.c:1000
+#: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../calendar/gui/e-comp-editor.c:2109
+#: ../src/calendar/gui/e-comp-editor.c:2109
 msgid "Save current changes"
 msgstr "Tallenna nykyiset muutokset"
 
-#: ../calendar/gui/e-comp-editor.c:2114 ../e-util/e-mail-signature-editor.c:317
-#: ../mail/e-mail-notes.c:940
+#: ../src/calendar/gui/e-comp-editor.c:2114
+#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
-#: ../calendar/gui/e-comp-editor.c:2116
+#: ../src/calendar/gui/e-comp-editor.c:2116
 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.
-#: ../calendar/gui/e-day-view.c:2132 ../calendar/gui/e-week-view.c:1728
-#: ../calendar/gui/print.c:1072 ../calendar/gui/print.c:1091
-#: ../calendar/gui/print.c:2628 ../calendar/gui/print.c:2648
+#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-week-view.c:1726
+#: ../src/calendar/gui/print.c:1070 ../src/calendar/gui/print.c:1089
+#: ../src/calendar/gui/print.c:2626 ../src/calendar/gui/print.c:2646
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2135 ../calendar/gui/e-week-view.c:1731
-#: ../calendar/gui/print.c:1077 ../calendar/gui/print.c:1093
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2650
+#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-week-view.c:1729
+#: ../src/calendar/gui/print.c:1075 ../src/calendar/gui/print.c:1091
+#: ../src/calendar/gui/print.c:2631 ../src/calendar/gui/print.c:2648
 msgid "pm"
 msgstr "pm"
 
@@ -5252,13 +8602,15 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:3047 ../calendar/gui/e-day-view-top-item.c:843
-#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
+#: ../src/calendar/gui/e-day-view.c:3045
+#: ../src/calendar/gui/e-day-view-top-item.c:841
+#: ../src/calendar/gui/e-week-view-main-item.c:205
+#: ../src/calendar/gui/print.c:2093
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3772
+#: ../src/calendar/gui/e-day-view.c:3770
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -5269,207 +8621,213 @@ msgstr "Viikko %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:806
+#: ../src/calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuutin välein"
 
-#: ../calendar/gui/e-day-view-time-item.c:831
+#: ../src/calendar/gui/e-day-view-time-item.c:829
 msgid "Show the second time zone"
 msgstr "Näytä toinen aikavyöhyke"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:848
-#: ../modules/calendar/e-calendar-preferences.c:303
-#: ../modules/calendar/e-calendar-preferences.c:355
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../src/calendar/gui/e-day-view-time-item.c:846
+#: ../src/modules/calendar/e-calendar-preferences.c:313
+#: ../src/modules/calendar/e-calendar-preferences.c:365
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../calendar/gui/e-day-view-time-item.c:882
-#: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:386
+#: ../src/calendar/gui/e-day-view-time-item.c:880
+#: ../src/calendar/gui/e-timezone-entry.c:322
+#: ../src/modules/calendar/e-calendar-preferences.c:396
 msgid "Select..."
 msgstr "Valitse..."
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../src/calendar/gui/e-meeting-list-view.c:62
 msgid "Chair Persons"
 msgstr "Toimi puheenjohtajana"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../src/calendar/gui/e-meeting-list-view.c:63
 msgid "Required Participants"
 msgstr "Vaaditut läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../src/calendar/gui/e-meeting-list-view.c:64
 msgid "Optional Participants"
 msgstr "Vapaaehtoiset läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../src/calendar/gui/e-meeting-list-view.c:65
 msgid "Resources"
 msgstr "Resurssit"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../src/calendar/gui/e-meeting-list-view.c:163
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
+#: ../src/calendar/gui/e-meeting-list-view.c:179
+#: ../src/calendar/gui/e-meeting-store.c:107
+#: ../src/calendar/gui/e-meeting-store.c:124
+#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1243
 msgid "Individual"
 msgstr "Henkilö"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
+#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-store.c:109
+#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1244
+#: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1247
+#: ../src/calendar/gui/e-meeting-list-view.c:181
+#: ../src/calendar/gui/e-meeting-store.c:111
+#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1245
 msgid "Resource"
 msgstr "Resurssi"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1248
+#: ../src/calendar/gui/e-meeting-list-view.c:182
+#: ../src/calendar/gui/e-meeting-store.c:113
+#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1246
 msgid "Room"
 msgstr "Huone"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1262
+#: ../src/calendar/gui/e-meeting-list-view.c:193
+#: ../src/calendar/gui/e-meeting-store.c:142
+#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1260
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
+#: ../src/calendar/gui/e-meeting-list-view.c:194
+#: ../src/calendar/gui/e-meeting-store.c:144
+#: ../src/calendar/gui/e-meeting-store.c:161
+#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1261
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1264
+#: ../src/calendar/gui/e-meeting-list-view.c:195
+#: ../src/calendar/gui/e-meeting-store.c:146
+#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1262
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1265
+#: ../src/calendar/gui/e-meeting-list-view.c:196
+#: ../src/calendar/gui/e-meeting-store.c:148
+#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1263
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/e-meeting-store.c:1030
+#: ../src/calendar/gui/e-meeting-list-view.c:218
+#: ../src/calendar/gui/e-meeting-store.c:192
+#: ../src/calendar/gui/e-meeting-store.c:215
+#: ../src/calendar/gui/e-meeting-store.c:1028
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../calendar/gui/e-meeting-list-view.c:620
+#: ../src/calendar/gui/e-meeting-list-view.c:618
 msgid "Attendee                          "
 msgstr "Osallistuja                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:646
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../calendar/gui/e-task-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:207
-#: ../mail/e-mail-account-tree-view.c:157
+#: ../src/calendar/gui/e-meeting-list-view.c:644
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../src/calendar/gui/e-memo-table.etspec.h:3
+#: ../src/calendar/gui/e-task-table.etspec.h:3
+#: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../calendar/gui/e-meeting-list-view.c:675
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#. To translators: RSVP means "please reply"
+#: ../src/calendar/gui/e-meeting-list-view.c:673
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../src/calendar/gui/e-meeting-store.c:204
+#: ../src/calendar/gui/e-meeting-store.c:227
 msgid "In Process"
 msgstr "Työn alla"
 
-#: ../calendar/gui/e-meeting-store.c:1881
+#: ../src/calendar/gui/e-meeting-store.c:1899
 #, fuzzy, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Syötä salasana käyttäjälle %s palvelimeen %s"
 
-#: ../calendar/gui/e-meeting-store.c:1891
+#: ../src/calendar/gui/e-meeting-store.c:1909
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Epäonnistumisen syy: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1896
-#: ../plugins/publish-calendar/publish-calendar.c:351
-#: ../smime/gui/component.c:63
+#: ../src/calendar/gui/e-meeting-store.c:1914
+#: ../src/plugins/publish-calendar/publish-calendar.c:349
+#: ../src/smime/gui/component.c:61
 msgid "Enter password"
 msgstr "Syötä salasana"
 
-#: ../calendar/gui/e-meeting-time-sel.c:537
+#: ../src/calendar/gui/e-meeting-time-sel.c:535
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../src/calendar/gui/e-meeting-time-sel.c:537
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../src/calendar/gui/e-meeting-time-sel.c:553
 msgid "Atte_ndees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../src/calendar/gui/e-meeting-time-sel.c:572
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:595
+#: ../src/calendar/gui/e-meeting-time-sel.c:593
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../src/calendar/gui/e-meeting-time-sel.c:606
 msgid "Show _zoomed out"
 msgstr "Näytä _etäämpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:626
+#: ../src/calendar/gui/e-meeting-time-sel.c:624
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:643
+#: ../src/calendar/gui/e-meeting-time-sel.c:641
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:663
+#: ../src/calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:680
+#: ../src/calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:702
+#: ../src/calendar/gui/e-meeting-time-sel.c:700
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:713
+#: ../src/calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../src/calendar/gui/e-meeting-time-sel.c:722
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:734
+#: ../src/calendar/gui/e-meeting-time-sel.c:732
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:773
+#: ../src/calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:802
+#: ../src/calendar/gui/e-meeting-time-sel.c:800
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2723
+#: ../src/calendar/gui/e-meeting-time-sel.c:2721
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5478,84 +8836,81 @@ msgstr ""
 "Yhteenveto: %s\n"
 "Sijainti: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
+#: ../src/calendar/gui/e-meeting-time-sel.c:2723
+#: ../src/calendar/gui/print.c:3520
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Lisää läsnäolija tästä"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Member"
 msgstr "Jäsen"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Delegated To"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr "Valtuuttaja"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:10
 msgid "Common Name"
 msgstr "Yhteinen nimi"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "Kieli"
 
-#: ../calendar/gui/e-memo-table.c:370 ../data/evolution.desktop.in.in.h:11
-#: ../modules/calendar/e-cal-shell-content.c:1667
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view.c:315
-msgid "Memos"
-msgstr "Muistilaput"
-
-#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:757
+#: ../src/calendar/gui/e-memo-table.c:455
+#: ../src/calendar/gui/e-task-table.c:781
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:542 ../calendar/gui/e-task-table.c:839
+#: ../src/calendar/gui/e-memo-table.c:540
+#: ../src/calendar/gui/e-task-table.c:863
 msgid "Start: "
 msgstr "Alkaa: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
+#: ../src/calendar/gui/e-memo-table.c:560
+#: ../src/calendar/gui/e-task-table.c:882
 msgid "Due: "
 msgstr "Erääntyy: "
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../src/calendar/gui/e-memo-table.c:745
 msgid "Cut selected memos to the clipboard"
 msgstr "Leikkaa valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../src/calendar/gui/e-memo-table.c:751
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopioi valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../src/calendar/gui/e-memo-table.c:757
 msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:560
+#: ../src/calendar/gui/e-memo-table.c:763
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:558
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../src/calendar/gui/e-memo-table.c:769
 msgid "Select all visible memos"
 msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 
-#: ../calendar/gui/e-memo-table.etspec.h:1
+#: ../src/calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "Lisää muistilappu tästä"
 
-#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
+#: ../src/calendar/gui/e-task-table.c:551
+#: ../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"
 
@@ -5563,111 +8918,101 @@ 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%
 #.
-#: ../calendar/gui/e-task-table.c:555
+#: ../src/calendar/gui/e-task-table.c:579
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1116
-#: ../data/evolution.desktop.in.in.h:12
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
-#: ../modules/calendar/e-cal-shell-content.c:1627
-#: ../modules/calendar/e-task-shell-view-actions.c:220
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view.c:473
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#: ../calendar/gui/e-task-table.c:1033
+#: ../src/calendar/gui/e-task-table.c:1084
 msgid "Cut selected tasks to the clipboard"
 msgstr "Leikkaa valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../src/calendar/gui/e-task-table.c:1090
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopioi valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
-#: ../calendar/gui/e-task-table.c:1051
-#: ../modules/calendar/e-task-shell-view-actions.c:686
+#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ../calendar/gui/e-task-table.c:1057
+#: ../src/calendar/gui/e-task-table.c:1108
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
-#: ../calendar/gui/e-task-table.etspec.h:1
+#: ../src/calendar/gui/e-task-table.etspec.h:1
 msgid "Click to add a task"
 msgstr "Lisää tehtävä tästä"
 
-#: ../calendar/gui/e-task-table.etspec.h:2
+#: ../src/calendar/gui/e-task-table.etspec.h:2
 msgid "Start date"
 msgstr "Aloituspäivä"
 
-#: ../calendar/gui/e-task-table.etspec.h:5
+#: ../src/calendar/gui/e-task-table.etspec.h:5
 msgid "Completion date"
 msgstr "Valmistumispäivä"
 
-#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:969
+#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:968
 msgid "Complete"
 msgstr "Valmis"
 
-#: ../calendar/gui/e-task-table.etspec.h:7
+#: ../src/calendar/gui/e-task-table.etspec.h:7
 msgid "Due date"
 msgstr "Eräpäivä"
 
-#: ../calendar/gui/e-task-table.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:9
 #, no-c-format
 msgid "% Complete"
 msgstr "% valmiina"
 
-#: ../calendar/gui/e-task-table.etspec.h:10 ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../src/calendar/gui/e-task-table.etspec.h:10
+#: ../src/calendar/gui/tasktypes.xml.in.h:18
+#: ../src/plugins/save-calendar/csv-format.c:384
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: ../calendar/gui/e-timezone-entry.c:335
+#: ../src/calendar/gui/e-timezone-entry.c:333
 msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
 
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2074
+#: ../src/calendar/gui/e-week-view-main-item.c:222
+#: ../src/calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:715
-#: ../calendar/gui/itip-utils.c:849
+#: ../src/calendar/gui/itip-utils.c:789 ../src/calendar/gui/itip-utils.c:851
+#: ../src/calendar/gui/itip-utils.c:985
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:706
+#: ../src/calendar/gui/itip-utils.c:842
 msgid "At least one attendee is necessary"
 msgstr "Vähintään yksi läsnäolija on välttämätön"
 
-#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1098
+#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:940 ../calendar/gui/itip-utils.c:1101
+#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/itip-utils.c:943 ../calendar/gui/itip-utils.c:1104
+#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1240
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:946 ../calendar/gui/itip-utils.c:1122
+#: ../src/calendar/gui/itip-utils.c:1082 ../src/calendar/gui/itip-utils.c:1258
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:949
+#: ../src/calendar/gui/itip-utils.c:1085
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -5675,7 +9020,7 @@ msgstr "Kalenteritiedot"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:986
+#: ../src/calendar/gui/itip-utils.c:1122
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -5684,7 +9029,7 @@ msgstr "Hyväksytty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:993
+#: ../src/calendar/gui/itip-utils.c:1129
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -5696,7 +9041,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".
-#: ../calendar/gui/itip-utils.c:1000 ../calendar/gui/itip-utils.c:1048
+#: ../src/calendar/gui/itip-utils.c:1136 ../src/calendar/gui/itip-utils.c:1184
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -5705,7 +9050,7 @@ msgstr "Hylätty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1007
+#: ../src/calendar/gui/itip-utils.c:1143
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -5713,7 +9058,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".
-#: ../calendar/gui/itip-utils.c:1020
+#: ../src/calendar/gui/itip-utils.c:1156
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -5721,7 +9066,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".
-#: ../calendar/gui/itip-utils.c:1027
+#: ../src/calendar/gui/itip-utils.c:1163
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -5729,7 +9074,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".
-#: ../calendar/gui/itip-utils.c:1034
+#: ../src/calendar/gui/itip-utils.c:1170
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -5737,511 +9082,515 @@ 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".
-#: ../calendar/gui/itip-utils.c:1041
+#: ../src/calendar/gui/itip-utils.c:1177
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../src/calendar/gui/itip-utils.c:1255
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../src/calendar/gui/itip-utils.c:1263
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:1156
+#: ../src/calendar/gui/itip-utils.c:1292
 #, 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."
 
-#: ../calendar/gui/itip-utils.c:1161
+#: ../src/calendar/gui/itip-utils.c:1297
 msgid "Unable to book a resource, error: "
 msgstr "Resurssin varaaminen ei onnistu, virhe:"
 
-#: ../calendar/gui/itip-utils.c:1332
+#: ../src/calendar/gui/itip-utils.c:1468
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/itip-utils.c:1986
+#: ../src/calendar/gui/itip-utils.c:2149
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending an event"
 msgstr "Lähetetään viestiä"
 
-#: ../calendar/gui/itip-utils.c:1990
+#: ../src/calendar/gui/itip-utils.c:2153
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending a memo"
 msgstr "Lähetetään viestiä"
 
-#: ../calendar/gui/itip-utils.c:1994
+#: ../src/calendar/gui/itip-utils.c:2157
 #, fuzzy
 #| msgid "Sending Email"
 msgid "Sending a task"
 msgstr "Lähetys"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:669
+#: ../src/calendar/gui/print.c:667
 msgid "31st"
 msgstr "31."
 
+#. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
-#. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:729
+#: ../src/calendar/gui/print.c:727
 msgid "Mo"
 msgstr "Ma"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:730
+#: ../src/calendar/gui/print.c:728
 msgid "Tu"
 msgstr "Ti"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:729
 msgid "We"
 msgstr "Ke"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:730
 msgid "Th"
 msgstr "To"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:731
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:734
+#: ../src/calendar/gui/print.c:732
 msgid "Sa"
 msgstr "La"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:735
+#: ../src/calendar/gui/print.c:733
 msgid "Su"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3315
+#: ../src/calendar/gui/print.c:3313
 msgid " to "
 msgstr " - "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3325
+#: ../src/calendar/gui/print.c:3323
 msgid " (Completed "
 msgstr " (Valmis "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3331
+#: ../src/calendar/gui/print.c:3329
 msgid "Completed "
 msgstr "Valmis "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3341
+#: ../src/calendar/gui/print.c:3339
 msgid " (Due "
 msgstr " (erääntyy "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3348
+#: ../src/calendar/gui/print.c:3346
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/print.c:3492
+#: ../src/calendar/gui/print.c:3490
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../calendar/gui/print.c:3494 ../e-util/e-send-options.c:553
+#: ../src/calendar/gui/print.c:3492 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/gui/print.c:3496
+#: ../src/calendar/gui/print.c:3494
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/gui/print.c:3552
+#: ../src/calendar/gui/print.c:3550
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../calendar/gui/print.c:3596
+#: ../src/calendar/gui/print.c:3594
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:3612
+#: ../src/calendar/gui/print.c:3610
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:3630
+#: ../src/calendar/gui/print.c:3628
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:3644
+#: ../src/calendar/gui/print.c:3642
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3658
+#: ../src/calendar/gui/print.c:3656
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../calendar/gui/print.c:3669
+#: ../src/calendar/gui/print.c:3667
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
-#: ../calendar/gui/tasktypes.xml.h:12
+#: ../src/calendar/gui/tasktypes.xml.in.h:12
 msgid "In progress"
 msgstr "Kesken"
 
-#: ../calendar/gui/tasktypes.xml.h:25
+#: ../src/calendar/gui/tasktypes.xml.in.h:25
 #, no-c-format
 msgid "% Completed"
 msgstr "% valmiina"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
-#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
+#: ../src/calendar/gui/tasktypes.xml.in.h:26
+#: ../src/mail/filtertypes.xml.in.h:31 ../src/mail/searchtypes.xml.in.h:33
+#: ../src/mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
-#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
+#: ../src/calendar/gui/tasktypes.xml.in.h:27
+#: ../src/mail/filtertypes.xml.in.h:32 ../src/mail/searchtypes.xml.in.h:34
+#: ../src/mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../modules/calendar/e-cal-base-shell-backend.c:183
-#: ../modules/calendar/e-cal-shell-view-actions.c:180
+#: ../src/calendar/importers/icalendar-importer.c:306
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:181
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:178
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../modules/calendar/e-cal-base-shell-backend.c:191
-#: ../modules/calendar/e-task-shell-view-actions.c:204
+#: ../src/calendar/importers/icalendar-importer.c:309
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:189
+#: ../src/modules/calendar/e-task-shell-view-actions.c:202
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
 
-#: ../calendar/importers/icalendar-importer.c:353
+#: ../src/calendar/importers/icalendar-importer.c:351
 msgid "Cre_ate new calendar"
 msgstr "_Luo uusi kalenteri"
 
-#: ../calendar/importers/icalendar-importer.c:357
+#: ../src/calendar/importers/icalendar-importer.c:355
 msgid "Cre_ate new task list"
 msgstr "Luo _uusi tehtävälista"
 
-#: ../calendar/importers/icalendar-importer.c:503
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../src/calendar/importers/icalendar-importer.c:501
+#: ../src/calendar/importers/icalendar-importer.c:944
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:654
+#: ../src/calendar/importers/icalendar-importer.c:652
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:655
+#: ../src/calendar/importers/icalendar-importer.c:653
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:747
+#: ../src/calendar/importers/icalendar-importer.c:745
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../calendar/importers/icalendar-importer.c:832
+#: ../src/calendar/importers/icalendar-importer.c:830
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:833
+#: ../src/calendar/importers/icalendar-importer.c:831
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1109
+#: ../src/calendar/importers/icalendar-importer.c:1107
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:1152
-#, fuzzy
+#: ../src/calendar/importers/icalendar-importer.c:1150
 #| msgid "New Calendar"
 msgid "GNOME Calendar"
-msgstr "Uusi kalenteri"
+msgstr "Gnomen kalenteri"
 
-#: ../calendar/importers/icalendar-importer.c:1153
+#: ../src/calendar/importers/icalendar-importer.c:1151
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1224
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../src/calendar/importers/icalendar-importer.c:1222
+#: ../src/calendar/importers/icalendar-importer.c:1536
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../calendar/importers/icalendar-importer.c:1224
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../src/calendar/importers/icalendar-importer.c:1222
+#: ../src/calendar/importers/icalendar-importer.c:1536
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../calendar/importers/icalendar-importer.c:1227
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../src/calendar/importers/icalendar-importer.c:1225
+#: ../src/calendar/importers/icalendar-importer.c:1537
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/importers/icalendar-importer.c:1230
-#: ../calendar/importers/icalendar-importer.c:1540
+#: ../src/calendar/importers/icalendar-importer.c:1228
+#: ../src/calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/importers/icalendar-importer.c:1239
+#: ../src/calendar/importers/icalendar-importer.c:1237
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../src/calendar/importers/icalendar-importer.c:1242
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "on instanssi"
 
-#: ../calendar/importers/icalendar-importer.c:1249
+#: ../src/calendar/importers/icalendar-importer.c:1247
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1267
+#: ../src/calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1270
+#: ../src/calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1273
+#: ../src/calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1277
+#: ../src/calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1282
-#: ../calendar/importers/icalendar-importer.c:1582
+#. Translators: Column header for a component summary
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1580
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1288
+#: ../src/calendar/importers/icalendar-importer.c:1286
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Sijainti"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1296
-#: ../calendar/importers/icalendar-importer.c:1577
+#. Translators: Column header for a component start date/time
+#: ../src/calendar/importers/icalendar-importer.c:1294
+#: ../src/calendar/importers/icalendar-importer.c:1575
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1307
+#: ../src/calendar/importers/icalendar-importer.c:1305
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1319
+#: ../src/calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1329
+#: ../src/calendar/importers/icalendar-importer.c:1327
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Ryhmät"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../src/calendar/importers/icalendar-importer.c:1351
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1361
+#: ../src/calendar/importers/icalendar-importer.c:1359
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1372
-#: ../calendar/importers/icalendar-importer.c:1375
+#: ../src/calendar/importers/icalendar-importer.c:1370
+#: ../src/calendar/importers/icalendar-importer.c:1373
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1395
-#: ../calendar/importers/icalendar-importer.c:1398
+#: ../src/calendar/importers/icalendar-importer.c:1393
+#: ../src/calendar/importers/icalendar-importer.c:1396
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/importers/icalendar-importer.c:1412
+#: ../src/calendar/importers/icalendar-importer.c:1410
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../calendar/importers/icalendar-importer.c:1572
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../src/calendar/importers/icalendar-importer.c:1570
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
@@ -6269,1670 +9618,1670 @@ msgstr "Tyyppi"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:25
+#: ../src/calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "Afrikka/Abidjan"
 
-#: ../calendar/zones.h:26
+#: ../src/calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "Afrikka/Accra"
 
-#: ../calendar/zones.h:27
+#: ../src/calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "Afrikka/Addis_Abeba"
 
-#: ../calendar/zones.h:28
+#: ../src/calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "Afrikka/Algeria"
 
-#: ../calendar/zones.h:29
+#: ../src/calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "Afrikka/Asmera"
 
-#: ../calendar/zones.h:30
+#: ../src/calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "Afrikka/Bamako"
 
-#: ../calendar/zones.h:31
+#: ../src/calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "Afrikka/Bangui"
 
-#: ../calendar/zones.h:32
+#: ../src/calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "Afrikka/Benjul"
 
-#: ../calendar/zones.h:33
+#: ../src/calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "Afrikka/Bissau"
 
-#: ../calendar/zones.h:34
+#: ../src/calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "Afrikka/Blantyre"
 
-#: ../calendar/zones.h:35
+#: ../src/calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "Afrikka/Brazzaville"
 
-#: ../calendar/zones.h:36
+#: ../src/calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "Afrikka/Bujumbura"
 
-#: ../calendar/zones.h:37
+#: ../src/calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "Afrikka/Kairo"
 
-#: ../calendar/zones.h:38
+#: ../src/calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "Afrikka/Casablanca"
 
-#: ../calendar/zones.h:39
+#: ../src/calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "Afrikka/Ceuta"
 
-#: ../calendar/zones.h:40
+#: ../src/calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "Afrikka/Conakry"
 
-#: ../calendar/zones.h:41
+#: ../src/calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "Afrikka/Dakar"
 
-#: ../calendar/zones.h:42
+#: ../src/calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrikka/Dar_es_Salaam"
 
-#: ../calendar/zones.h:43
+#: ../src/calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "Afrikka/Djibouti"
 
-#: ../calendar/zones.h:44
+#: ../src/calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "Afrikka/Douala"
 
-#: ../calendar/zones.h:45
+#: ../src/calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "Afrikka/El_Aaium"
 
-#: ../calendar/zones.h:46
+#: ../src/calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "Afrikka/Freetown"
 
-#: ../calendar/zones.h:47
+#: ../src/calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "Afrikka/Gaborne"
 
-#: ../calendar/zones.h:48
+#: ../src/calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "Afrikka/Harare"
 
-#: ../calendar/zones.h:49
+#: ../src/calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "Afrikka/Johannesburg"
 
-#: ../calendar/zones.h:50
+#: ../src/calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "Afrikka/Kampala"
 
-#: ../calendar/zones.h:51
+#: ../src/calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "Afrikka/Khartum"
 
-#: ../calendar/zones.h:52
+#: ../src/calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "Afrikka/Kigali"
 
-#: ../calendar/zones.h:53
+#: ../src/calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "Afrikka/Kinshasa"
 
-#: ../calendar/zones.h:54
+#: ../src/calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "Afrikka/Lagos"
 
-#: ../calendar/zones.h:55
+#: ../src/calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "Afrikka/Libreville"
 
-#: ../calendar/zones.h:56
+#: ../src/calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "Afrikka/Lome"
 
-#: ../calendar/zones.h:57
+#: ../src/calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "Afrikka/Luanda"
 
-#: ../calendar/zones.h:58
+#: ../src/calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "Afrikka/Lubumbashi"
 
-#: ../calendar/zones.h:59
+#: ../src/calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "Afrikka/Lusaka"
 
-#: ../calendar/zones.h:60
+#: ../src/calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "Afrikka/Malabo"
 
-#: ../calendar/zones.h:61
+#: ../src/calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "Afrikka/Maputo"
 
-#: ../calendar/zones.h:62
+#: ../src/calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "Afrikka/Maseru"
 
-#: ../calendar/zones.h:63
+#: ../src/calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "Afrikka/Mbabane"
 
-#: ../calendar/zones.h:64
+#: ../src/calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "Afrikka/Mogadishu"
 
-#: ../calendar/zones.h:65
+#: ../src/calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "Afrikka/Monrovia"
 
-#: ../calendar/zones.h:66
+#: ../src/calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "Afrikka/Nairobi"
 
-#: ../calendar/zones.h:67
+#: ../src/calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "Afrikka/Ndjamena"
 
-#: ../calendar/zones.h:68
+#: ../src/calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "Afrikka/Niamey"
 
-#: ../calendar/zones.h:69
+#: ../src/calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "Afrikka/Nouakchott"
 
-#: ../calendar/zones.h:70
+#: ../src/calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "Afrikka/Ouagadougou"
 
-#: ../calendar/zones.h:71
+#: ../src/calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "Afrikka/Porto-Novo"
 
-#: ../calendar/zones.h:72
+#: ../src/calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "Afrikka/Sao_Tome"
 
-#: ../calendar/zones.h:73
+#: ../src/calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "Afrikka/Timbuktu"
 
-#: ../calendar/zones.h:74
+#: ../src/calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "Afrikka/Tripoli"
 
-#: ../calendar/zones.h:75
+#: ../src/calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "Afrikka/Tunis"
 
-#: ../calendar/zones.h:76
+#: ../src/calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "Afrikka/Windhoek"
 
-#: ../calendar/zones.h:77
+#: ../src/calendar/zones.h:77
 msgid "America/Adak"
 msgstr "Amerikka/Adak"
 
-#: ../calendar/zones.h:78
+#: ../src/calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "Amerikka/Anchorage"
 
-#: ../calendar/zones.h:79
+#: ../src/calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "Amerikka/Anguilla"
 
-#: ../calendar/zones.h:80
+#: ../src/calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "Amerikka/Antigua"
 
-#: ../calendar/zones.h:81
+#: ../src/calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "Amerikka/Nicaragua"
 
-#: ../calendar/zones.h:82
+#: ../src/calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "Amerikka/Aruba"
 
-#: ../calendar/zones.h:83
+#: ../src/calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "Amerikka/Asuncion"
 
-#: ../calendar/zones.h:84
+#: ../src/calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "Amerikka/Barbados"
 
-#: ../calendar/zones.h:85
+#: ../src/calendar/zones.h:85
 msgid "America/Belem"
 msgstr "Amerikka/Belem"
 
-#: ../calendar/zones.h:86
+#: ../src/calendar/zones.h:86
 msgid "America/Belize"
 msgstr "Amerikka/Belize"
 
-#: ../calendar/zones.h:87
+#: ../src/calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "Amerikka/Boa_Vista"
 
-#: ../calendar/zones.h:88
+#: ../src/calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "Amerikka/Bogota"
 
-#: ../calendar/zones.h:89
+#: ../src/calendar/zones.h:89
 msgid "America/Boise"
 msgstr "Amerikka/Boise"
 
-#: ../calendar/zones.h:90
+#: ../src/calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "Amerikka/Buenos_Aires"
 
-#: ../calendar/zones.h:91
+#: ../src/calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "Amerikka/Cambridge_Bay"
 
-#: ../calendar/zones.h:92
+#: ../src/calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "Amerikka/Cancun"
 
-#: ../calendar/zones.h:93
+#: ../src/calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "Amerikka/Caracas"
 
-#: ../calendar/zones.h:94
+#: ../src/calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "Amerikka/Catamarca"
 
-#: ../calendar/zones.h:95
+#: ../src/calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "Amerikka/Cayenne"
 
-#: ../calendar/zones.h:96
+#: ../src/calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "Amerikka/Cayman"
 
-#: ../calendar/zones.h:97
+#: ../src/calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "Amerikka/Chicago"
 
-#: ../calendar/zones.h:98
+#: ../src/calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "Amerikka/Chihuahua"
 
-#: ../calendar/zones.h:99
+#: ../src/calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "Amerikka/Cordoba"
 
-#: ../calendar/zones.h:100
+#: ../src/calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "Amerikka/Costa_Rica"
 
-#: ../calendar/zones.h:101
+#: ../src/calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "Amerikka/Cuiaba"
 
-#: ../calendar/zones.h:102
+#: ../src/calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "Amerikka/Curacao"
 
-#: ../calendar/zones.h:103
+#: ../src/calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "Amerikka/Danmarkshavn"
 
-#: ../calendar/zones.h:104
+#: ../src/calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "Amerikka/Dawson"
 
-#: ../calendar/zones.h:105
+#: ../src/calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "Amerikka/Dawson_Creek"
 
-#: ../calendar/zones.h:106
+#: ../src/calendar/zones.h:106
 msgid "America/Denver"
 msgstr "Amerikka/Denver"
 
-#: ../calendar/zones.h:107
+#: ../src/calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "Amerikka/Detroit"
 
-#: ../calendar/zones.h:108
+#: ../src/calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "Amerikka/Dominica"
 
-#: ../calendar/zones.h:109
+#: ../src/calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "Amerikka/Edmonton"
 
-#: ../calendar/zones.h:110
+#: ../src/calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "Amerikka/Eirunepe"
 
-#: ../calendar/zones.h:111
+#: ../src/calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "Amerikka/El_Salvador"
 
-#: ../calendar/zones.h:112
+#: ../src/calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "Amerikka/Fortaleza"
 
-#: ../calendar/zones.h:113
+#: ../src/calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "Amerikka/Glace_Bay"
 
-#: ../calendar/zones.h:114
+#: ../src/calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "Amerikka/Godthab"
 
-#: ../calendar/zones.h:115
+#: ../src/calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "Amerikka/Goose_Bay"
 
-#: ../calendar/zones.h:116
+#: ../src/calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "Amerikka/Grand_Turk"
 
-#: ../calendar/zones.h:117
+#: ../src/calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "Amerikka/Grenada"
 
-#: ../calendar/zones.h:118
+#: ../src/calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "Amerikka/Guadeloupe"
 
-#: ../calendar/zones.h:119
+#: ../src/calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "Amerikka/Guatemala"
 
-#: ../calendar/zones.h:120
+#: ../src/calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "Amerikka/Guayaquil"
 
-#: ../calendar/zones.h:121
+#: ../src/calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "Amerikka/Guyana"
 
-#: ../calendar/zones.h:122
+#: ../src/calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "Amerikka/Halifax"
 
-#: ../calendar/zones.h:123
+#: ../src/calendar/zones.h:123
 msgid "America/Havana"
 msgstr "Amerikka/Havana"
 
-#: ../calendar/zones.h:124
+#: ../src/calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "Amerikka/Hermosillo"
 
-#: ../calendar/zones.h:125
+#: ../src/calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerikka/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:126
+#: ../src/calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "Amerikka/Indiana/Knox"
 
-#: ../calendar/zones.h:127
+#: ../src/calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "Amerikka/Indiana/Marengo"
 
-#: ../calendar/zones.h:128
+#: ../src/calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "Amerikka/Indiana/Vevay"
 
-#: ../calendar/zones.h:129
+#: ../src/calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "Amerikka/Indianapolis"
 
-#: ../calendar/zones.h:130
+#: ../src/calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "Amerikka/Inuvik"
 
-#: ../calendar/zones.h:131
+#: ../src/calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "Amerikka/Iqaluit"
 
-#: ../calendar/zones.h:132
+#: ../src/calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "Amerikka/Jamaika"
 
-#: ../calendar/zones.h:133
+#: ../src/calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "Amerikka/Jujuy"
 
-#: ../calendar/zones.h:134
+#: ../src/calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "Amerikka/Juneau"
 
-#: ../calendar/zones.h:135
+#: ../src/calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "Amerikka/Kentucky/Louisville"
 
-#: ../calendar/zones.h:136
+#: ../src/calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "Amerikka/Kentucky/Monticello"
 
-#: ../calendar/zones.h:137
+#: ../src/calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "Amerikka/La_Paz"
 
-#: ../calendar/zones.h:138
+#: ../src/calendar/zones.h:138
 msgid "America/Lima"
 msgstr "Amerikka/Lima"
 
-#: ../calendar/zones.h:139
+#: ../src/calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "Amerikka/Los_Angeles"
 
-#: ../calendar/zones.h:140
+#: ../src/calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "Amerikka/Louisville"
 
-#: ../calendar/zones.h:141
+#: ../src/calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "Amerikka/Maceio"
 
-#: ../calendar/zones.h:142
+#: ../src/calendar/zones.h:142
 msgid "America/Managua"
 msgstr "Amerikka/Managua"
 
-#: ../calendar/zones.h:143
+#: ../src/calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "Amerikka/Manaus"
 
-#: ../calendar/zones.h:144
+#: ../src/calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "Amerikka/Martinique"
 
-#: ../calendar/zones.h:145
+#: ../src/calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "Amerikka/Mazatlan"
 
-#: ../calendar/zones.h:146
+#: ../src/calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "Amerikka/Mendoza"
 
-#: ../calendar/zones.h:147
+#: ../src/calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "Amerikka/Menominee"
 
-#: ../calendar/zones.h:148
+#: ../src/calendar/zones.h:148
 msgid "America/Merida"
 msgstr "Amerikka/Merida"
 
-#: ../calendar/zones.h:149
+#: ../src/calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "Amerikka/Mexico_City"
 
-#: ../calendar/zones.h:150
+#: ../src/calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "Amerikka/Miquelon"
 
-#: ../calendar/zones.h:151
+#: ../src/calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "Amerikka/Monterrey"
 
-#: ../calendar/zones.h:152
+#: ../src/calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "Amerikka/Montevideo"
 
-#: ../calendar/zones.h:153
+#: ../src/calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "Amerikka/Montreal"
 
-#: ../calendar/zones.h:154
+#: ../src/calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "Amerikka/Montserrat"
 
-#: ../calendar/zones.h:155
+#: ../src/calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "Amerikka/Nassau"
 
-#: ../calendar/zones.h:156
+#: ../src/calendar/zones.h:156
 msgid "America/New_York"
 msgstr "Amerikka/New_York"
 
-#: ../calendar/zones.h:157
+#: ../src/calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "Amerikka/Nipigon"
 
-#: ../calendar/zones.h:158
+#: ../src/calendar/zones.h:158
 msgid "America/Nome"
 msgstr "Amerikka/Nome"
 
-#: ../calendar/zones.h:159
+#: ../src/calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "Amerikka/Noronha"
 
-#: ../calendar/zones.h:160
+#: ../src/calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "Amerikka/North_Dakota/Center"
 
-#: ../calendar/zones.h:161
+#: ../src/calendar/zones.h:161
 msgid "America/Panama"
 msgstr "Amerikka/Panama"
 
-#: ../calendar/zones.h:162
+#: ../src/calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "Amerikka/Pangnirtung"
 
-#: ../calendar/zones.h:163
+#: ../src/calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "Amerikka/Paramaribo"
 
-#: ../calendar/zones.h:164
+#: ../src/calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "Amerikka/Phoenix"
 
-#: ../calendar/zones.h:165
+#: ../src/calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "Amerikka/Port-au-Prince"
 
-#: ../calendar/zones.h:166
+#: ../src/calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "Amerikka/Port_of_Spain"
 
-#: ../calendar/zones.h:167
+#: ../src/calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "Amerikka/Porto_Velho"
 
-#: ../calendar/zones.h:168
+#: ../src/calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "Amerikka/Puerto_Rico"
 
-#: ../calendar/zones.h:169
+#: ../src/calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "Amerikka/Rainy_River"
 
-#: ../calendar/zones.h:170
+#: ../src/calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "Amerikka/Rankin_Inlet"
 
-#: ../calendar/zones.h:171
+#: ../src/calendar/zones.h:171
 msgid "America/Recife"
 msgstr "Amerikka/Recife"
 
-#: ../calendar/zones.h:172
+#: ../src/calendar/zones.h:172
 msgid "America/Regina"
 msgstr "Amerikka/Regina"
 
-#: ../calendar/zones.h:173
+#: ../src/calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "Amerikka/Rio_Branco"
 
-#: ../calendar/zones.h:174
+#: ../src/calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "Amerikka/Rosario"
 
-#: ../calendar/zones.h:175
+#: ../src/calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "Amerikka/Santiago"
 
-#: ../calendar/zones.h:176
+#: ../src/calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "Amerikka/Santo_Domingo"
 
-#: ../calendar/zones.h:177
+#: ../src/calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "Amerikka/Sao_Paulo"
 
-#: ../calendar/zones.h:178
+#: ../src/calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "Amerikka/Scoresbysund"
 
-#: ../calendar/zones.h:179
+#: ../src/calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "Amerikka/Shiprock"
 
-#: ../calendar/zones.h:180
+#: ../src/calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "Amerikka/St_Johns"
 
-#: ../calendar/zones.h:181
+#: ../src/calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "Amerikka/St_Kitts"
 
-#: ../calendar/zones.h:182
+#: ../src/calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "Amerikka/St_Lucia"
 
-#: ../calendar/zones.h:183
+#: ../src/calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "Amerikka/St_Thomas"
 
-#: ../calendar/zones.h:184
+#: ../src/calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "Amerikka/St_Vincent"
 
-#: ../calendar/zones.h:185
+#: ../src/calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "Amerikka/Swift_Current"
 
-#: ../calendar/zones.h:186
+#: ../src/calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "Amerikka/Tegucigalpa"
 
-#: ../calendar/zones.h:187
+#: ../src/calendar/zones.h:187
 msgid "America/Thule"
 msgstr "Amerikka/Thule"
 
-#: ../calendar/zones.h:188
+#: ../src/calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "Amerikka/Thunder_Bay"
 
-#: ../calendar/zones.h:189
+#: ../src/calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "Amerikka/Tijuana"
 
-#: ../calendar/zones.h:190
+#: ../src/calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "Amerikka/Tortola"
 
-#: ../calendar/zones.h:191
+#: ../src/calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "Amerikka/Vancouver"
 
-#: ../calendar/zones.h:192
+#: ../src/calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "Amerikka/Whitehorse"
 
-#: ../calendar/zones.h:193
+#: ../src/calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "Amerikka/Winnipeg"
 
-#: ../calendar/zones.h:194
+#: ../src/calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "Amerikka/Yakutat"
 
-#: ../calendar/zones.h:195
+#: ../src/calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "Amerikka/Yellowknife"
 
-#: ../calendar/zones.h:196
+#: ../src/calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "Etelämanner/Casey"
 
-#: ../calendar/zones.h:197
+#: ../src/calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "Etelämanner/Davis"
 
-#: ../calendar/zones.h:198
+#: ../src/calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "Etelämanner/DumontDUrville"
 
-#: ../calendar/zones.h:199
+#: ../src/calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "Etelämanner/Mawson"
 
-#: ../calendar/zones.h:200
+#: ../src/calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "Etelämanner/McMurdo"
 
-#: ../calendar/zones.h:201
+#: ../src/calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "Etelämanner/Palmer"
 
-#: ../calendar/zones.h:202
+#: ../src/calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "Etelämanner/South_Pole"
 
-#: ../calendar/zones.h:203
+#: ../src/calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "Etelämanner/Syowa"
 
-#: ../calendar/zones.h:204
+#: ../src/calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "Etelämanner/Vostok"
 
-#: ../calendar/zones.h:205
+#: ../src/calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-#: ../calendar/zones.h:206
+#: ../src/calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "Aasia/Aden"
 
-#: ../calendar/zones.h:207
+#: ../src/calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "Aasia/Almaty"
 
-#: ../calendar/zones.h:208
+#: ../src/calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "Aasia/Amman"
 
-#: ../calendar/zones.h:209
+#: ../src/calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "Aasia/Anadyr"
 
-#: ../calendar/zones.h:210
+#: ../src/calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "Aasia/Aqtau"
 
-#: ../calendar/zones.h:211
+#: ../src/calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "Aasia/Aqtobe"
 
-#: ../calendar/zones.h:212
+#: ../src/calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "Aasia/Ashgabat"
 
-#: ../calendar/zones.h:213
+#: ../src/calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "Aasia/Bagdad"
 
-#: ../calendar/zones.h:214
+#: ../src/calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "Aasia/Bahrain"
 
-#: ../calendar/zones.h:215
+#: ../src/calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "Aasia/Baku"
 
-#: ../calendar/zones.h:216
+#: ../src/calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "Aasia/Bangkok"
 
-#: ../calendar/zones.h:217
+#: ../src/calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "Aasia/Beirut"
 
-#: ../calendar/zones.h:218
+#: ../src/calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "Aasia/Bishkek"
 
-#: ../calendar/zones.h:219
+#: ../src/calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "Aasia/Brunei"
 
-#: ../calendar/zones.h:220
+#: ../src/calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "Aasia/Kalkutta"
 
-#: ../calendar/zones.h:221
+#: ../src/calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "Aasia/Choibalsan"
 
-#: ../calendar/zones.h:222
+#: ../src/calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "Aasia/Chongqing"
 
-#: ../calendar/zones.h:223
+#: ../src/calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "Aasia/Colombo"
 
-#: ../calendar/zones.h:224
+#: ../src/calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "Aasia/Damaskos"
 
-#: ../calendar/zones.h:225
+#: ../src/calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "Aasia/Dhaka"
 
-#: ../calendar/zones.h:226
+#: ../src/calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "Aasia/Dili"
 
-#: ../calendar/zones.h:227
+#: ../src/calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "Aasia/Dubai"
 
-#: ../calendar/zones.h:228
+#: ../src/calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "Aasia/Dushanbe"
 
-#: ../calendar/zones.h:229
+#: ../src/calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "Aasia/Gaza"
 
-#: ../calendar/zones.h:230
+#: ../src/calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "Aasia/Harbin"
 
-#: ../calendar/zones.h:231
+#: ../src/calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "Aasia/Hong_Kong"
 
-#: ../calendar/zones.h:232
+#: ../src/calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "Aasia/Hovd"
 
-#: ../calendar/zones.h:233
+#: ../src/calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "Aasia/Irkutsk"
 
-#: ../calendar/zones.h:234
+#: ../src/calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "Aasia/Istanbul"
 
-#: ../calendar/zones.h:235
+#: ../src/calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "Aasia/Jakarta"
 
-#: ../calendar/zones.h:236
+#: ../src/calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "Aasia/Jayapura"
 
-#: ../calendar/zones.h:237
+#: ../src/calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "Aasia/Jerusalem"
 
-#: ../calendar/zones.h:238
+#: ../src/calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "Aasia/Kabul"
 
-#: ../calendar/zones.h:239
+#: ../src/calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "Aasia/Kamchatka"
 
-#: ../calendar/zones.h:240
+#: ../src/calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "Aasia/Karachi"
 
-#: ../calendar/zones.h:241
+#: ../src/calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "Aasia/Kashgar"
 
-#: ../calendar/zones.h:242
-#, fuzzy
+#: ../src/calendar/zones.h:242
 #| msgid "Asia/Katmandu"
 msgid "Asia/Kathmandu"
 msgstr "Aasia/Katmandu"
 
-#: ../calendar/zones.h:243
+#: ../src/calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "Aasia/Krasnoyarsk"
 
-#: ../calendar/zones.h:244
+#: ../src/calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "Aasia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:245
+#: ../src/calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "Aasia/Kuching"
 
-#: ../calendar/zones.h:246
+#: ../src/calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "Aasia/Kuwait"
 
-#: ../calendar/zones.h:247
+#: ../src/calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "Aasia/Macao"
 
-#: ../calendar/zones.h:248
+#: ../src/calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "Aasia/Macau"
 
-#: ../calendar/zones.h:249
+#: ../src/calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "Aasia/Magadan"
 
-#: ../calendar/zones.h:250
+#: ../src/calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "Aasia/Makassar"
 
-#: ../calendar/zones.h:251
+#: ../src/calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "Aasia/Manila"
 
-#: ../calendar/zones.h:252
+#: ../src/calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "Aasia/Muscat"
 
-#: ../calendar/zones.h:253
+#: ../src/calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "Aasia/Nicosia"
 
-#: ../calendar/zones.h:254
+#: ../src/calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "Aasia/Novosibirsk"
 
-#: ../calendar/zones.h:255
+#: ../src/calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "Aasia/Omsk"
 
-#: ../calendar/zones.h:256
+#: ../src/calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "Aasia/Oral"
 
-#: ../calendar/zones.h:257
+#: ../src/calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "Aasia/Phnom_Penh"
 
-#: ../calendar/zones.h:258
+#: ../src/calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "Aasia/Pontianak"
 
-#: ../calendar/zones.h:259
+#: ../src/calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "Aasia/Pyongyang"
 
-#: ../calendar/zones.h:260
+#: ../src/calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "Aasia/Qatar"
 
-#: ../calendar/zones.h:261
+#: ../src/calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "Aasia/Qyzylorda"
 
-#: ../calendar/zones.h:262
+#: ../src/calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "Aasia/Rangoon"
 
-#: ../calendar/zones.h:263
+#: ../src/calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "Aasia/Riyadh"
 
-#: ../calendar/zones.h:264
+#: ../src/calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "Aasia/Saigon"
 
-#: ../calendar/zones.h:265
+#: ../src/calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "Aasia/Sakhalin"
 
-#: ../calendar/zones.h:266
+#: ../src/calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "Aasia/Samarkand"
 
-#: ../calendar/zones.h:267
+#: ../src/calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "Aasia/Seoul"
 
-#: ../calendar/zones.h:268
+#: ../src/calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "Aasia/Shanghai"
 
-#: ../calendar/zones.h:269
+#: ../src/calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "Aasia/Singapore"
 
-#: ../calendar/zones.h:270
+#: ../src/calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "Aasia/Taipei"
 
-#: ../calendar/zones.h:271
+#: ../src/calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "Aasia/Tashkent"
 
-#: ../calendar/zones.h:272
+#: ../src/calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "Aasia/Tbilisi"
 
-#: ../calendar/zones.h:273
+#: ../src/calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "Aasia/Teheran"
 
-#: ../calendar/zones.h:274
+#: ../src/calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "Aasia/Thimphu"
 
-#: ../calendar/zones.h:275
+#: ../src/calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "Aasia/Tokio"
 
-#: ../calendar/zones.h:276
+#: ../src/calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "Aasia/Ujung_Pandang"
 
-#: ../calendar/zones.h:277
+#: ../src/calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "Aasia/Ulaanbaatar"
 
-#: ../calendar/zones.h:278
+#: ../src/calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "Aasia/Urumqi"
 
-#: ../calendar/zones.h:279
+#: ../src/calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "Aasia/Vientiane"
 
-#: ../calendar/zones.h:280
+#: ../src/calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "Aasia/Vladivostok"
 
-#: ../calendar/zones.h:281
+#: ../src/calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "Aasia/Yakutsk"
 
-#: ../calendar/zones.h:282
+#: ../src/calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "Aasia/Yekaterinburg"
 
-#: ../calendar/zones.h:283
+#: ../src/calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "Aasia/Jerevan"
 
-#: ../calendar/zones.h:284
+#: ../src/calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "Atlantin_Valtameri/Azores"
 
-#: ../calendar/zones.h:285
+#: ../src/calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "Atlantin_Valtameri/Bermuda"
 
-#: ../calendar/zones.h:286
+#: ../src/calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "Atlantin_Valtameri/Canary"
 
-#: ../calendar/zones.h:287
+#: ../src/calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantin_Valtameri/Kap_Verde"
 
-#: ../calendar/zones.h:288
+#: ../src/calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "Atlantin_Valtameri/Faeroe"
 
-#: ../calendar/zones.h:289
+#: ../src/calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantin_Valtameri/Jan_Mayen"
 
-#: ../calendar/zones.h:290
+#: ../src/calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "Atlantin_Valtameri/Madeira"
 
-#: ../calendar/zones.h:291
+#: ../src/calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantin_Valtameri/Reykjavik"
 
-#: ../calendar/zones.h:292
+#: ../src/calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantin_Valtameri/Etelä-Georgia"
 
-#: ../calendar/zones.h:293
+#: ../src/calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "Atlantin_Valtameri/Saint_Helena"
 
-#: ../calendar/zones.h:294
+#: ../src/calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "Atlantin_Valtameri/Stanley"
 
-#: ../calendar/zones.h:295
+#: ../src/calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../calendar/zones.h:296
+#: ../src/calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:297
+#: ../src/calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:298
+#: ../src/calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:299
+#: ../src/calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:300
+#: ../src/calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:301
+#: ../src/calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:302
+#: ../src/calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:303
+#: ../src/calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:304
+#: ../src/calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:305
+#: ../src/calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "Eurooppa/Amsterdam"
 
-#: ../calendar/zones.h:306
+#: ../src/calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "Eurooppa/Andorra"
 
-#: ../calendar/zones.h:307
+#: ../src/calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "Eurooppa/Ateena"
 
-#: ../calendar/zones.h:308
+#: ../src/calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "Eurooppa/Belfast"
 
-#: ../calendar/zones.h:309
+#: ../src/calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "Eurooppa/Belgrad"
 
-#: ../calendar/zones.h:310
+#: ../src/calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "Eurooppa/Berliini"
 
-#: ../calendar/zones.h:311
+#: ../src/calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "Eurooppa/Bratislava"
 
-#: ../calendar/zones.h:312
+#: ../src/calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "Eurooppa/Bryssel"
 
-#: ../calendar/zones.h:313
+#: ../src/calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "Eurooppa/Bukarest"
 
-#: ../calendar/zones.h:314
+#: ../src/calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "Eurooppa/Budapest"
 
-#: ../calendar/zones.h:315
+#: ../src/calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "Eurooppa/Chisinau"
 
-#: ../calendar/zones.h:316
+#: ../src/calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "Eurooppa/Kööpenhamina"
 
-#: ../calendar/zones.h:317
+#: ../src/calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "Eurooppa/Dublin"
 
-#: ../calendar/zones.h:318
+#: ../src/calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "Eurooppa/Gibraltar"
 
-#: ../calendar/zones.h:319
+#: ../src/calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "Eurooppa/Helsinki"
 
-#: ../calendar/zones.h:320
+#: ../src/calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "Eurooppa/Istanbul"
 
-#: ../calendar/zones.h:321
+#: ../src/calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "Eurooppa/Kaliningrad"
 
-#: ../calendar/zones.h:322
+#: ../src/calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "Eurooppa/Kiev"
 
-#: ../calendar/zones.h:323
+#: ../src/calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "Eurooppa/Lissabon"
 
-#: ../calendar/zones.h:324
+#: ../src/calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "Eurooppa/Ljubljana"
 
-#: ../calendar/zones.h:325
+#: ../src/calendar/zones.h:325
 msgid "Europe/London"
 msgstr "Eurooppa/London"
 
-#: ../calendar/zones.h:326
+#: ../src/calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "Eurooppa/Luxemburg"
 
-#: ../calendar/zones.h:327
+#: ../src/calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "Eurooppa/Madrid"
 
-#: ../calendar/zones.h:328
+#: ../src/calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "Eurooppa/Malta"
 
-#: ../calendar/zones.h:329
+#: ../src/calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "Eurooppa/Minsk"
 
-#: ../calendar/zones.h:330
+#: ../src/calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "Eurooppa/Monaco"
 
-#: ../calendar/zones.h:331
+#: ../src/calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "Eurooppa/Moskova"
 
-#: ../calendar/zones.h:332
+#: ../src/calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "Eurooppa/Nicosia"
 
-#: ../calendar/zones.h:333
+#: ../src/calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "Eurooppa/Oslo"
 
-#: ../calendar/zones.h:334
+#: ../src/calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "Eurooppa/Pariisi"
 
-#: ../calendar/zones.h:335
+#: ../src/calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "Eurooppa/Praha"
 
-#: ../calendar/zones.h:336
+#: ../src/calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "Eurooppa/Riika"
 
-#: ../calendar/zones.h:337
+#: ../src/calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "Eurooppa/Rooma"
 
-#: ../calendar/zones.h:338
+#: ../src/calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "Eurooppa/Samara"
 
-#: ../calendar/zones.h:339
+#: ../src/calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "Eurooppa/San_Marino"
 
-#: ../calendar/zones.h:340
+#: ../src/calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "Eurooppa/Sarajevo"
 
-#: ../calendar/zones.h:341
+#: ../src/calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "Eurooppa/Simferopol"
 
-#: ../calendar/zones.h:342
+#: ../src/calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "Eurooppa/Skopje"
 
-#: ../calendar/zones.h:343
+#: ../src/calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "Eurooppa/Sofia"
 
-#: ../calendar/zones.h:344
+#: ../src/calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "Eurooppa/Tukholma"
 
-#: ../calendar/zones.h:345
+#: ../src/calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "Eurooppa/Tallinna"
 
-#: ../calendar/zones.h:346
+#: ../src/calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "Eurooppa/Tirane"
 
-#: ../calendar/zones.h:347
+#: ../src/calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "Eurooppa/Uzhgorod"
 
-#: ../calendar/zones.h:348
+#: ../src/calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "Eurooppa/Vaduz"
 
-#: ../calendar/zones.h:349
+#: ../src/calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "Eurooppa/Vatikaani"
 
-#: ../calendar/zones.h:350
+#: ../src/calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "Eurooppa/Wien"
 
-#: ../calendar/zones.h:351
+#: ../src/calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "Eurooppa/Vilna"
 
-#: ../calendar/zones.h:352
+#: ../src/calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "Eurooppa/Varsova"
 
-#: ../calendar/zones.h:353
+#: ../src/calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "Eurooppa/Zagreb"
 
-#: ../calendar/zones.h:354
+#: ../src/calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "Eurooppa/Zaporozhye"
 
-#: ../calendar/zones.h:355
+#: ../src/calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "Eurooppa/Zürich"
 
-#: ../calendar/zones.h:356
+#: ../src/calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "Intian_Valtameri/Antananarivo"
 
-#: ../calendar/zones.h:357
+#: ../src/calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "Intian_Valtameri/Chagos"
 
-#: ../calendar/zones.h:358
+#: ../src/calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "Intian_Valtameri/Joulusaaret"
 
-#: ../calendar/zones.h:359
+#: ../src/calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "Intian_Valtameri/Kookossaraet"
 
-#: ../calendar/zones.h:360
+#: ../src/calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "Intian_Valtameri/Comoro"
 
-#: ../calendar/zones.h:361
+#: ../src/calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "Intian_Valtameri/Kerguelen"
 
-#: ../calendar/zones.h:362
+#: ../src/calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "Intian_Valtameri/Mahe"
 
-#: ../calendar/zones.h:363
+#: ../src/calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "Intian_Valtameri/Malediivit"
 
-#: ../calendar/zones.h:364
+#: ../src/calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "Intian_Valtameri/Mauritius"
 
-#: ../calendar/zones.h:365
+#: ../src/calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "Intian_Valtameri/Mayotte"
 
-#: ../calendar/zones.h:366
+#: ../src/calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "Intian_Valtameri/Reunion"
 
-#: ../calendar/zones.h:367
+#: ../src/calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "Tyyni_Valtameri/Apia"
 
-#: ../calendar/zones.h:368
+#: ../src/calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "Tyyni_Valtameri/Auckland"
 
-#: ../calendar/zones.h:369
+#: ../src/calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "Tyyni_Valtameri/Chatham"
 
-#: ../calendar/zones.h:370
+#: ../src/calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "Tyyni_Valtameri/Easter"
 
-#: ../calendar/zones.h:371
+#: ../src/calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "Tyyni_Valtameri/Efate"
 
-#: ../calendar/zones.h:372
+#: ../src/calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "Tyyni_Valtameri/Enderbury"
 
-#: ../calendar/zones.h:373
+#: ../src/calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "Tyyni_Valtameri/Fakaofo"
 
-#: ../calendar/zones.h:374
+#: ../src/calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "Tyyni_Valtameri/Fiji"
 
-#: ../calendar/zones.h:375
+#: ../src/calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "Tyyni_Valtameri/Funafuti"
 
-#: ../calendar/zones.h:376
+#: ../src/calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "Tyyni_Valtameri/Galapagos"
 
-#: ../calendar/zones.h:377
+#: ../src/calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "Tyyni_Valtameri/Gambier"
 
-#: ../calendar/zones.h:378
+#: ../src/calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "Tyyni_Valtameri/Guadalcanal"
 
-#: ../calendar/zones.h:379
+#: ../src/calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "Tyyni_Valtameri/Guam"
 
-#: ../calendar/zones.h:380
+#: ../src/calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "Tyyni_Valtameri/Honolulu"
 
-#: ../calendar/zones.h:381
+#: ../src/calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "Tyyni_Valtameri/Johnston"
 
-#: ../calendar/zones.h:382
+#: ../src/calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "Tyyni_Valtameri/Kiritimati"
 
-#: ../calendar/zones.h:383
+#: ../src/calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "Tyyni_Valtameri/Kosrae"
 
-#: ../calendar/zones.h:384
+#: ../src/calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "Tyyni_Valtameri/Kwajalein"
 
-#: ../calendar/zones.h:385
+#: ../src/calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "Tyyni_Valtameri/Majuro"
 
-#: ../calendar/zones.h:386
+#: ../src/calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "Tyyni_Valtameri/Marquesas"
 
-#: ../calendar/zones.h:387
+#: ../src/calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "Tyyni_Valtameri/Midway"
 
-#: ../calendar/zones.h:388
+#: ../src/calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "Tyyni_Valtameri/Nauru"
 
-#: ../calendar/zones.h:389
+#: ../src/calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "Tyyni_Valtameri/Niue"
 
-#: ../calendar/zones.h:390
+#: ../src/calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "Tyyni_Valtameri/Norfolk"
 
-#: ../calendar/zones.h:391
+#: ../src/calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "Tyyni_Valtameri/Noumea"
 
-#: ../calendar/zones.h:392
+#: ../src/calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "Tyyni_Valtameri/Pago_Pago"
 
-#: ../calendar/zones.h:393
+#: ../src/calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "Tyyni_Valtameri/Palau"
 
-#: ../calendar/zones.h:394
+#: ../src/calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "Tyyni_Valtameri/Pitcairn"
 
-#: ../calendar/zones.h:395
+#: ../src/calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "Tyyni_Valtameri/Ponape"
 
-#: ../calendar/zones.h:396
+#: ../src/calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "Tyyni_Valtameri/Port_Moresby"
 
-#: ../calendar/zones.h:397
+#: ../src/calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "Tyyni_Valtameri/Rarotonga"
 
-#: ../calendar/zones.h:398
+#: ../src/calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "Tyyni_Valtameri/Saipan"
 
-#: ../calendar/zones.h:399
+#: ../src/calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "Tyyni_Valtameri/Tahiti"
 
-#: ../calendar/zones.h:400
+#: ../src/calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "Tyyni_Valtameri/Tarawa"
 
-#: ../calendar/zones.h:401
+#: ../src/calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "Tyyni_Valtameri/Tongatapu"
 
-#: ../calendar/zones.h:402
+#: ../src/calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "Tyyni_Valtameri/Truk"
 
-#: ../calendar/zones.h:403
+#: ../src/calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "Tyyni_Valtameri/Wake"
 
-#: ../calendar/zones.h:404
+#: ../src/calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "Tyyni_Valtameri/Wallis"
 
-#: ../calendar/zones.h:405
+#: ../src/calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
-#: ../composer/e-composer-actions.c:227
+#: ../src/composer/e-composer-actions.c:225
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../composer/e-composer-actions.c:328
+#: ../src/composer/e-composer-actions.c:329
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:333
+#: ../src/composer/e-composer-actions.c:334
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../composer/e-composer-actions.c:335
+#: ../src/composer/e-composer-actions.c:336
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../composer/e-composer-actions.c:340 ../shell/e-shell.c:1217
-#: ../shell/e-shell-window-actions.c:848
+#: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
+#: ../src/shell/e-shell-window-actions.c:857
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../composer/e-composer-actions.c:342 ../shell/e-shell-window-actions.c:850
+#: ../src/composer/e-composer-actions.c:343
+#: ../src/shell/e-shell-window-actions.c:859
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
-#: ../composer/e-composer-actions.c:349
+#: ../src/composer/e-composer-actions.c:350
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:354
+#: ../src/composer/e-composer-actions.c:355
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../composer/e-composer-actions.c:356
+#: ../src/composer/e-composer-actions.c:357
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ../composer/e-composer-actions.c:363
+#: ../src/composer/e-composer-actions.c:364
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../composer/e-composer-actions.c:387
+#: ../src/composer/e-composer-actions.c:388
 msgid "Print Pre_view"
 msgstr "Tulostuksen _esikatselu"
 
-#: ../composer/e-composer-actions.c:394
+#: ../src/composer/e-composer-actions.c:395
 msgid "Save as _Draft"
 msgstr "Tallenna _luonnoksena"
 
-#: ../composer/e-composer-actions.c:396
+#: ../src/composer/e-composer-actions.c:397
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:401
+#: ../src/composer/e-composer-actions.c:402
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../composer/e-composer-actions.c:403
+#: ../src/composer/e-composer-actions.c:404
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../composer/e-composer-actions.c:411
+#: ../src/composer/e-composer-actions.c:412
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../composer/e-composer-actions.c:413
+#: ../src/composer/e-composer-actions.c:414
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../composer/e-composer-actions.c:419
+#: ../src/composer/e-composer-actions.c:420
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../composer/e-composer-actions.c:421
+#: ../src/composer/e-composer-actions.c:422
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../composer/e-composer-actions.c:427
+#: ../src/composer/e-composer-actions.c:428
 msgid "_Picture Gallery"
 msgstr "_Kuvagalleria"
 
-#: ../composer/e-composer-actions.c:429
+#: ../src/composer/e-composer-actions.c:430
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Näytä kokoelma kuvia, joita voi raahata viesteihin"
 
-#: ../composer/e-composer-actions.c:435
+#: ../src/composer/e-composer-actions.c:436
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../composer/e-composer-actions.c:437
+#: ../src/composer/e-composer-actions.c:438
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../composer/e-composer-actions.c:443
+#: ../src/composer/e-composer-actions.c:444
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../composer/e-composer-actions.c:445
+#: ../src/composer/e-composer-actions.c:446
 msgid "Get delivery notification when your message is read"
 msgstr "Pyydä lähettämään kuittaus, kun viestisi on luettu"
 
-#: ../composer/e-composer-actions.c:451
+#: ../src/composer/e-composer-actions.c:452
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../composer/e-composer-actions.c:453
+#: ../src/composer/e-composer-actions.c:454
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME-salausvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:459
+#: ../src/composer/e-composer-actions.c:460
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../composer/e-composer-actions.c:461
+#: ../src/composer/e-composer-actions.c:462
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tämä viesti S/MIME-allekirjoitusvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:515
+#: ../src/composer/e-composer-actions.c:516
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:517
+#: ../src/composer/e-composer-actions.c:518
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee näytetäänkö BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:523
+#: ../src/composer/e-composer-actions.c:524
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../composer/e-composer-actions.c:525
+#: ../src/composer/e-composer-actions.c:526
 msgid "Toggles whether the CC field is displayed"
 msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
-#: ../composer/e-composer-actions.c:531
+#: ../src/composer/e-composer-actions.c:532
 msgid "_From Override Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:533
+#: ../src/composer/e-composer-actions.c:534
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid ""
@@ -7940,39 +11289,39 @@ msgid ""
 "displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../composer/e-composer-actions.c:539
+#: ../src/composer/e-composer-actions.c:540
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:541
+#: ../src/composer/e-composer-actions.c:542
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:596
+#: ../src/composer/e-composer-actions.c:597
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../composer/e-composer-actions.c:602
+#: ../src/composer/e-composer-actions.c:603
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
-#: ../composer/e-composer-from-header.c:109
-#: ../e-util/e-mail-signature-script-dialog.c:415
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:341
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../src/composer/e-composer-from-header.c:108
+#: ../src/e-util/e-mail-signature-script-dialog.c:416
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../src/mail/e-mail-config-identity-page.c:553
+#: ../src/mail/e-mail-config-summary-page.c:333
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../src/composer/e-composer-header-table.c:36
 msgid "Enter the recipients of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../src/composer/e-composer-header-table.c:38
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../src/composer/e-composer-header-table.c:41
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -7980,48 +11329,48 @@ msgstr ""
 "Anna osoitteet, joihin lähetetään kopiot viestistä ilman että muut "
 "vastaanottajat näkevät vastaanottajia"
 
-#: ../composer/e-composer-header-table.c:829
+#: ../src/composer/e-composer-header-table.c:840
 msgid "Fr_om:"
 msgstr "_Lähettäjä:"
 
-#: ../composer/e-composer-header-table.c:836
+#: ../src/composer/e-composer-header-table.c:847
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../composer/e-composer-header-table.c:841
+#: ../src/composer/e-composer-header-table.c:852
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../composer/e-composer-header-table.c:847
+#: ../src/composer/e-composer-header-table.c:858
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../composer/e-composer-header-table.c:853
+#: ../src/composer/e-composer-header-table.c:864
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../composer/e-composer-header-table.c:858
+#: ../src/composer/e-composer-header-table.c:869
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../composer/e-composer-header-table.c:862
+#: ../src/composer/e-composer-header-table.c:873
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:534
+#: ../src/composer/e-composer-header-table.c:883
+#: ../src/mail/e-mail-config-identity-page.c:746
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-composer-name-header.c:233
+#: ../src/composer/e-composer-name-header.c:231
 msgid "Click here for the address book"
 msgstr "Avaa osoitekirja tästä"
 
-#: ../composer/e-composer-post-header.c:182
+#: ../src/composer/e-composer-post-header.c:180
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../composer/e-msg-composer.c:876
+#: ../src/composer/e-msg-composer.c:859
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -8029,7 +11378,7 @@ msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:885
+#: ../src/composer/e-msg-composer.c:868
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -8038,38 +11387,44 @@ msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2403
-#: ../data/evolution.desktop.in.in.h:7
+#: ../src/composer/e-msg-composer.c:1606 ../src/composer/e-msg-composer.c:2412
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4728
+#: ../src/composer/e-msg-composer.c:4767
 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)"
 
-#: ../composer/mail-composer.error.xml.h:1
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
+#: ../src/composer/mail-composer.error.xml.h:1
+#, fuzzy
+#| msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgid "You cannot attach the file “{0}” to this message."
 msgstr "Et voi lisätä tiedostoa ”{0}” tähän viestiin."
 
-#: ../composer/mail-composer.error.xml.h:2
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+#: ../src/composer/mail-composer.error.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "The file '{0}' is not a regular file and cannot be sent in a message."
+msgid "The file “{0}” is not a regular file and cannot be sent in a message."
 msgstr ""
 "Tiedosto ”{0}” ei ole tavallinen tiedosto eikä sitä voi lähettää viestissä."
 
-#: ../composer/mail-composer.error.xml.h:3
+#: ../src/composer/mail-composer.error.xml.h:3
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Viestejä ei voi hakea liitettäväksi kohteesta {0}."
 
-#: ../composer/mail-composer.error.xml.h:4
-msgid "Because &quot;{1}&quot;."
-msgstr "Syy: &quot;{1}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:4
+#: ../src/e-util/e-system.error.xml.h:5
+#| msgid "Because \"{1}\"."
+msgid "Because “{1}”."
+msgstr "Syy: “{1}”."
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../src/composer/mail-composer.error.xml.h:5
 msgid "Do you want to recover unfinished messages?"
 msgstr "Haluatko palauttaa viimeistelemättömät viestit?"
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../src/composer/mail-composer.error.xml.h:6
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -8077,29 +11432,37 @@ msgstr ""
 "Evolution suljettiin odottamatta, kun olit muokkaamassa uutta viestiä. "
 "Viestin palautuksen avulla voit jatkaa siitä, mihin jäit."
 
-#: ../composer/mail-composer.error.xml.h:7
+#: ../src/composer/mail-composer.error.xml.h:7
 msgid "_Do not Recover"
 msgstr "Ä_lä palauta"
 
-#: ../composer/mail-composer.error.xml.h:8
+#: ../src/composer/mail-composer.error.xml.h:8
 msgid "_Recover"
 msgstr "_Palauta"
 
-#: ../composer/mail-composer.error.xml.h:9
-msgid "Could not save to autosave file &quot;{0}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:9
+#, fuzzy
+#| msgid "Could not save to autosave file &quot;{0}&quot;."
+msgid "Could not save to autosave file “{0}”."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
-#: ../composer/mail-composer.error.xml.h:10
-msgid "Error saving to autosave because &quot;{1}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:10
+#, fuzzy
+#| msgid "Error saving to autosave because &quot;{1}&quot;."
+msgid "Error saving to autosave because “{1}”."
 msgstr "Automaattinen tallennus epäonnistui: &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:11
+#: ../src/composer/mail-composer.error.xml.h:11
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to discard the message, titled '{0}', you are "
+#| "composing?"
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
+"Are you sure you want to discard the message, titled “{0}”, you are "
 "composing?"
 msgstr "Haluatko todella hylätä viestin otsikolla '{0}', vaikka muokkaat sitä?"
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../src/composer/mail-composer.error.xml.h:12
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -8110,3093 +11473,341 @@ msgstr ""
 "voi jatkaa myöhemmin."
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:15
+#: ../src/composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "_Jatka muokkausta"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../src/composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "Tallenna _luonnos"
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../src/composer/mail-composer.error.xml.h:17
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "Haluatko varmasti hylätä kirjoittamasi viestin?"
 
-#: ../composer/mail-composer.error.xml.h:18
+#: ../src/composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "Viestiä ei voi luoda."
 
-#: ../composer/mail-composer.error.xml.h:19
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+#: ../src/composer/mail-composer.error.xml.h:19
+#, fuzzy
+#| msgid ""
+#| "Because &quot;{0}&quot;, you may need to select different mail options."
+msgid ""
+"You may need to select different mail options.\n"
+"\n"
+"Detailed error: {0}"
 msgstr ""
 "&quot;{0}&quot; johtuen sinun täytyy ehkä valita eri sähköpostiasetukset."
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "Could not read signature file &quot;{0}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:22
+#, fuzzy
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Could not read signature file “{0}”."
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../src/composer/mail-composer.error.xml.h:23
 msgid "All accounts have been removed."
 msgstr "Kaikki tilit on poistettu."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../src/composer/mail-composer.error.xml.h:24
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../src/composer/mail-composer.error.xml.h:25
 #, fuzzy
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Tapahtui virhe tulostettaessa"
 
-#: ../composer/mail-composer.error.xml.h:24
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+#: ../src/composer/mail-composer.error.xml.h:26
+#, fuzzy
+#| msgid ""
+#| "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgid "The reported error was “{0}”. The message has not been sent."
 msgstr "Ilmoitettu virhe oli &quot;{0}&quot;. Viestiä ei lähetetty."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../src/composer/mail-composer.error.xml.h:27
 #, fuzzy
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Tapahtui virhe käynnistettäessä %s: %s."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../src/composer/mail-composer.error.xml.h:28
+#, fuzzy
+#| msgid ""
+#| "The reported error was &quot;{0}&quot;. The message has most likely not "
+#| "been saved."
 msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
+"The reported error was “{0}”. The message has most likely not been saved."
 msgstr ""
 "Ilmoitettu virhe oli &quot;{0}&quot;. Viestiä ei mitä luultavimmin ole "
 "tallennettu."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../src/composer/mail-composer.error.xml.h:29
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Lähettäessä tapahtui virhe. Kuinka haluat jatkaa?"
 
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:175
-msgid "The reported error was &quot;{0}&quot;."
-msgstr "Ilmoitettu virhe oli &quot;{0}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:30
+#: ../src/mail/mail.error.xml.h:175
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "The reported error was “{0}”."
+msgstr "Ilmoitettu virhe oli “{0}”."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../src/composer/mail-composer.error.xml.h:31
 #, fuzzy
 msgid "_Save to Outbox"
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../src/composer/mail-composer.error.xml.h:32
 msgid "_Try Again"
 msgstr "_Yritä uudelleen"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:33
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Viestisi lähetettiin, mutta jälkikäsittelyn yhteydessä tapahtui virhe."
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../src/composer/mail-composer.error.xml.h:34
 #, fuzzy
 msgid "Saving message to Outbox."
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../src/composer/mail-composer.error.xml.h:35
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
-"clicking the Send/Receive button in Evolution's toolbar."
+"clicking the Send/Receive button in Evolution’s toolbar."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../src/composer/mail-composer.error.xml.h:36
 msgid "Are you sure you want to send the message?"
 msgstr "Haluatko varmasti lähettää tämän viestin?"
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../src/composer/mail-composer.error.xml.h:37
 msgid ""
 "A keyboard accelerator to send the message has been pressed. Either cancel "
 "sending the message, if it was done by an accident, or send the message."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:37
+#: ../src/composer/mail-composer.error.xml.h:39
 #, fuzzy
 #| msgid "Are you sure you want to delete this memo?"
-msgid "Are you sure you want to change the composer mode?"
+msgid "Are you sure you want to change the composer format?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
 
-#: ../composer/mail-composer.error.xml.h:38
+#: ../src/composer/mail-composer.error.xml.h:40
 msgid ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
+"Switching to Plain Text format will cause the text to lose all the HTML "
+"formatting. Do you want to continue?"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:39
+#: ../src/composer/mail-composer.error.xml.h:41
 #, fuzzy
 #| msgid "Address formatting"
-msgid "_Don't lose formatting"
+msgid "_Don’t lose formatting"
 msgstr "Osoitteen muotoilu"
 
-#: ../composer/mail-composer.error.xml.h:40
+#: ../src/composer/mail-composer.error.xml.h:42
 #, fuzzy
 #| msgid "Address formatting"
 msgid "Lose _formatting"
 msgstr "Osoitteen muotoilu"
 
-#: ../composer/mail-composer.error.xml.h:41
+#: ../src/composer/mail-composer.error.xml.h:43
 #, fuzzy
 msgid "An error occurred while saving to your Templates folder."
 msgstr "Tapahtui virhe käynnistettäessä %s: %s."
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Evolutionin hälytysilmoitukset"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "Kalenteritapahtumien ilmoitukset"
-
-#: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
-#: ../mail/e-mail-browser.c:1101
-#: ../modules/mailto-handler/evolution-mailto-handler.c:210
-#: ../shell/e-shell-window-private.c:242
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-utils.c:418
-msgid "Groupware Suite"
-msgstr "Ryhmätyöohjelmisto"
-
-#: ../data/evolution.desktop.in.in.h:3
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution-sähköposti ja -kalenteri"
-
-#: ../data/evolution.desktop.in.in.h:4 ../evolution.appdata.xml.in.h:2
-msgid "Manage your email, contacts and schedule"
-msgstr "Hallitse sähköposteja, yhteystietoja ja ajan käyttöä"
-
-#: ../data/evolution.desktop.in.in.h:5
-msgid "email;calendar;contact;addressbook;task;"
-msgstr ""
-"email;calendar;contact;addressbook;task;sähköposti;kalenteri;yhteystiedot;"
-"osoitekirja;tehtävä;"
-
-#: ../data/evolution.desktop.in.in.h:6
-msgid "New Window"
-msgstr "Uusi ikkuna"
-
-#: ../data/evolution.desktop.in.in.h:8 ../e-util/e-name-selector-dialog.c:451
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:373
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
-#: ../data/evolution.desktop.in.in.h:10 ../e-util/e-send-options.c:538
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/kmail-importer.c:253
-#: ../mail/importers/pine-importer.c:422
-#: ../modules/mail/e-mail-shell-view.c:1242
-#: ../smime/gui/certificate-manager.c:1684
-msgid "Mail"
-msgstr "Sähköposti"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-msgid "Enable address formatting"
-msgstr "Käytä osoitteen muotoilua"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-msgid "Autocomplete length"
-msgstr "Automaattisen täydennyksen pituus"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"Kuinka monta merkkiä tulee kirjoittaa ennen kuin Evolution yrittää "
-"automaattista täydennystä."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "Näytä automaattitäydennetyt nimet osoitteen kanssa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Pakotetaanko sähköpostiosoitteen näyttäminen nimen lisäksi automaattisesti "
-"täydennetyn yhteystiedon kohdalla kentässä."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-msgid "URI for the folder last used in the select names dialog"
-msgstr "Viimeksi nimien valinta -ikkunassa valitun kansion URI"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-msgid "URI for the folder last used in the select names dialog."
-msgstr "Viimeksi nimien valinta -ikkunassa valitun kansion URI."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-msgid "Contact layout style"
-msgstr "Yhteystiedon asettelutyyli"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-msgid "Contact preview pane position (horizontal)"
-msgstr "Yhteystietojen esikatselupaneelin sijainti (vaaka)"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-msgid "Position of the contact preview pane when oriented horizontally."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-msgid "Contact preview pane position (vertical)"
-msgstr "Yhteystietojen esikatselupaneelin sijainti (pysty)"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-msgid "Show maps"
-msgstr "Näytä kartat"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-msgid "Whether to show maps in preview pane"
-msgstr "Näytetäänkö kartat esikatselupaneelissa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-msgid "Primary address book"
-msgstr "Ensisijainen osoitekirja"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-msgid "Show preview pane"
-msgstr "Näytä Esikatselupaneeli"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-msgid "Whether to show the preview pane."
-msgstr "Näytetäänkö esikatselupaneeli."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
-msgid "true"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
-#, fuzzy
-#| msgid "Whether to show timezone field in the event/meeting editor"
-msgid "Whether to show phone numbers in the editor"
-msgstr "Näytetäänkö aikavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
-#, fuzzy
-#| msgid "Whether to show categories field in the event/meeting editor"
-msgid "Whether to show SIP addresses in the editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
-#, fuzzy
-#| msgid "Whether to show categories field in the event/meeting editor"
-msgid "Whether to show IM addresses in the editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
-#, fuzzy
-#| msgid "Whether to show categories field in the event/meeting editor"
-msgid "Whether to show mailing Home addresses in the editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
-#, fuzzy
-#| msgid "Whether to show categories field in the event/meeting editor"
-msgid "Whether to show mailing addresses Work in the editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
-#, fuzzy
-#| msgid "Whether to show categories field in the event/meeting editor"
-msgid "Whether to show mailing addresses Other in the editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
-#, fuzzy
-#| msgid "Whether to show categories field in the event/meeting editor"
-msgid "Whether to show Web Addresses in the editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
-#, fuzzy
-#| msgid "Whether to show timezone field in the event/meeting editor"
-msgid "Whether to show job information in the editor"
-msgstr "Näytetäänkö aikavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
-#, fuzzy
-#| msgid "Whether to show categories field in the event/meeting editor"
-msgid "Whether to show Miscellaneous information in the editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
-#, fuzzy
-#| msgid "Whether to show categories field in the event/meeting editor"
-msgid "Whether to show notes in the editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
-#, fuzzy
-#| msgid "Whether to show categories field in the event/meeting editor"
-msgid "Whether to show Certificates tab in the editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Muunna sähköpostiviestit Unicode-muotoon"
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Muunna viestin teksti Unicode UTF-8-muotoon, jotta roskapostin tunnistavat "
-"merkinnät eivät eroa merkistöjen välillä."
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
-msgid "Full path command to run Bogofilter"
-msgstr ""
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
-msgid ""
-"Full path to a Bogofilter command. If not set, then a compile-time path is "
-"used, usually /usr/bin/bogofilter. The command should not contain any other "
-"arguments."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#, fuzzy
-msgid "Save directory for reminder audio"
-msgstr "Äänihälytysten tiedostojen tallennuskansio"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-#, fuzzy
-msgid "Directory for saving reminder audio files"
-msgstr "Kansio, johon äänimerkkien tiedostot tallennetaan"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-#, fuzzy
-msgid "Birthday and anniversary reminder value"
-msgstr "Syntymä- ja vuosipäivät"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-#, fuzzy
-msgid "Number of units for determining a birthday or anniversary reminder"
-msgstr "Kuinka monta yksikköä määrittelee oletusmuistutuksen."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#, fuzzy
-msgid "Birthday and anniversary reminder units"
-msgstr "Syntymä- ja vuosipäivät"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#, fuzzy
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
-msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-msgid "Compress weekends in month view"
-msgstr "Tiivistä viikonloput kuukausinäkymässä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-#, fuzzy
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
-msgstr ""
-"Pakataanko viikonloput kuukausinäkymässä. Tämä tiivistää lauantain ja "
-"sunnuntain yhden viikonpäivän kokoisiksi."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-msgid "Ask for confirmation when deleting items"
-msgstr "Pyydä vahvistusta poistettaessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
-#, fuzzy
-msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr "Kysytäänkö vahvistusta poistettaessa tapaamista tai tehtävää."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-msgid "Confirm expunge"
-msgstr "Varmista siivottaessa poistetut lopullisesti"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
-#, fuzzy
-msgid "Whether to ask for confirmation when expunging appointments and tasks"
-msgstr "Kysytäänkö vahvistusta siivottaessa tapaamisia tai tehtäviä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-msgid "Month view vertical pane position"
-msgstr "Kuukausinäkymän pystypaneelin sijainti"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-#, fuzzy
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
-msgstr ""
-"Vaakapaneelin sijainti pikseleinä , kalenterin listojen ja päivämäärien "
-"selausnäkymän välissä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-msgid "Workday end hour"
-msgstr "Työpäivän päättymistunti"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
-#, fuzzy
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
-msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-msgid "Workday end minute"
-msgstr "Työpäivän päättymisminuutti"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minuutti, jona työpäivä loppuu, väliltä 0-59."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-msgid "Workday start hour"
-msgstr "Työpäivän alkamistunti"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "Tunti jona työpäivä alkaa 24-tunnin muodossa, väliltä 0-23."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-msgid "Workday start minute"
-msgstr "Työpäivän alkamisminuutti"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minuutti, jona työpäivä alkaa, väliltä 0-59."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-msgid "Workday start time for Monday"
-msgstr "Työpäivän alkamisaika maanantaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-#, fuzzy
-#| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgid ""
-"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
-"or -1 to use day-start-hour and day-start-minute"
-msgstr "Tunti jona työpäivä alkaa 24-tunnin muodossa, väliltä 0-23."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-msgid "Workday end time for Monday"
-msgstr "Työpäivän päättymisaika maanantaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-#, fuzzy
-msgid ""
-"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
-"-1 to use day-end-hour and day-end-minute"
-msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-msgid "Workday start time for Tuesday"
-msgstr "Työpäivän alkamisaika tiistaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-#, fuzzy
-msgid ""
-"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
-"-1 to use day-start-hour and day-start-minute"
-msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-msgid "Workday end time for Tuesday"
-msgstr "Työpäivän päättymisaika tiistaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-msgid "Workday start time for Wednesday"
-msgstr "Työpäivän alkamisaika keskiviikolle"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-msgid "Workday end time for Wednesday"
-msgstr "Työpäivän päättymisaika keskiviikolle"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-msgid "Workday start time for Thursday"
-msgstr "Työpäivän alkamisaika torstaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-msgid "Workday end time for Thursday"
-msgstr "Työpäivän päättymisaika torstaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-msgid "Workday start time for Friday"
-msgstr "Työpäivän alkamisaika perjantaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-msgid "Workday end time for Friday"
-msgstr "Työpäivän päättymisaika perjantaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-msgid "Workday start time for Saturday"
-msgstr "Työpäivän alkamisaika lauantaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-msgid "Workday end time for Saturday"
-msgstr "Työpäivän päättymisaika lauantaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-msgid "Workday start time for Sunday"
-msgstr "Työpäivän alkamisaika sunnuntaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-msgid "Workday end time for Sunday"
-msgstr "Työpäivän päättymisaika sunnuntaille"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-msgid "The second timezone for a Day View"
-msgstr "Päivänäkymän toissijainen aikavyöhyke"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#, fuzzy
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key"
-msgstr ""
-"Näyttää toissijaisen aikavyöhykkeen aikanäkymässä, jos asetettu. Arvo on "
-"samanlainen kuin avaimessa \"timezone\"."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-msgid "Recently used second time zones in a Day View"
-msgstr "Päivänäkymässä äskettäin käytetyt toissijaiset aikavyöhykkeet"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#, fuzzy
-msgid "List of recently used second time zones in a Day View"
-msgstr "Luettelo äskettäin valituista toissijaisista aikavyöhykkeistä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#, fuzzy
-msgid "Maximum number of recently used timezones to remember"
-msgstr "Kuinka monta äskettäin valittua aikavyöhykettä muistetaan."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#, fuzzy
-msgid ""
-"Maximum number of recently used timezones to remember in a 'day-second-"
-"zones' list"
-msgstr ""
-"Enimmäismäärä äskettäin valittuja toissijaisia aikavyöhykkeitä avaimen "
-"\"day_second_zones\" luettelossa."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
-msgid "Default reminder value"
-msgstr "Muistutuksen oletusarvo"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#, fuzzy
-msgid "Number of units for determining a default reminder"
-msgstr "Kuinka monta yksikköä määrittelee oletusmuistutuksen."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-msgid "Default reminder units"
-msgstr "Muistutusten oletusyksikkö"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#, fuzzy
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-#, fuzzy
-#| msgid "Default reminder value"
-msgid "Default reminder snooze interval, in minutes"
-msgstr "Muistutuksen oletusarvo"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-msgid ""
-"Default reminder snooze interval, in minutes, to be filled in the reminder "
-"notification dialog"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "Näytä luokkakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Näytä roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Näytä RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Näytä tilakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Näytetäänkö tilakenttä tapahtuman, tehtävät tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Näytä aikavyöhyke tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Näytetäänkö aikavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
-msgid "Show type field in the event/task/meeting editor"
-msgstr "Näytä tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
-msgid "Hide completed tasks"
-msgstr "Piilota valmistuneet tehtävät"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#, fuzzy
-msgid "Whether to hide completed tasks in the tasks view"
-msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymistä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-msgid "Hide task units"
-msgstr "Piilota tehtävien yksiköt"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#, fuzzy
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
-msgstr ""
-"Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot \"minutes"
-"\", \"hours\" tai \"days\"."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-msgid "Hide task value"
-msgstr "Piilota tehtävän arvo"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#, fuzzy
-msgid "Number of units for determining when to hide tasks"
-msgstr "Kuinka monta yksikköä tarvitaan, jotta tehtävät piilotetaan."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
-msgid "Horizontal pane position"
-msgstr "Vaakapaneelin sijainti"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-#, fuzzy
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels"
-msgstr ""
-"Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
-"välissä jos ei olla kuukausinäkymässä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
-#, fuzzy
-msgid "Last reminder time"
-msgstr "Viimeisen hälytyksen aika"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#, fuzzy
-msgid "Time the last reminder ran, in time_t"
-msgstr "Viimeisimmän hälytyksen suoritusaika, time_t-yksikkönä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains -viivan väri - päivänäkymä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-#, fuzzy
-msgid "Color to draw the Marcus Bains line in the Day View"
-msgstr "Marcus Bains -viivan väri päivänäkymässä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains -viivan väri - aikajana"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#, fuzzy
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr ""
-"Väri, jolla Marcus Bains -viiva piirretään aikajanassa (tyhjä oletuksena)."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains -viiva"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-#, fuzzy
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
-msgstr "Piirretäänkö Marcus Bains -viiva (viiva nykyhetkessä) kalenteriin."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
-msgid "Memo preview pane position (horizontal)"
-msgstr "Muistilappujen esikatselupaneelin sijainti (vaaka)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-#, fuzzy
-msgid "Position of the task preview pane when oriented horizontally"
-msgstr "Paneelin sijainti sen ollessa vaaka-asennossa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
-msgid "Memo layout style"
-msgstr "Muistilappujen asettelutyyli"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
-msgid "Memo preview pane position (vertical)"
-msgstr "Muistilappujen esikatselupaneelin sijainti (pysty)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
-#, fuzzy
-msgid "Position of the memo preview pane when oriented vertically"
-msgstr "Paneelin sijainti sen ollessa pystyasennossa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
-msgid "Month view horizontal pane position"
-msgstr "Kuukausinäkymän vaakapaneelin sijainti"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
-#, fuzzy
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
-msgstr ""
-"Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
-"välissä käytettäessä kuukausinäkymää."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
-#, fuzzy
-msgid "Scroll Month View by a week, not by a month"
-msgstr "Siirrytäänkö kuukausinäkymässä viikoittain, eikä kuukausittain."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-#, fuzzy
-msgid "Whether to scroll a Month View by a week, not by a month"
-msgstr "Siirrytäänkö kuukausinäkymässä viikoittain, eikä kuukausittain."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid "Reminder programs"
-msgstr "Muistutusohjelmat"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-#, fuzzy
-msgid "Programs that are allowed to be run by reminders"
-msgstr "Ohjelmat, joita voidaan suorittaa hälytyksistä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-#, fuzzy
-msgid "Show display reminders in notification tray"
-msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-#, fuzzy
-msgid "Whether or not to use the notification tray for display reminders"
-msgstr "Käytetäänkö ilmoitusaluetta hälytysten näyttämiseen."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Preferred New button item"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-msgid "Name of the preferred New toolbar button item"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-msgid "Primary calendar"
-msgstr "Ensisijainen kalenteri"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-msgid "Primary memo list"
-msgstr "Ensisijainen muistilappulista"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-msgid "Primary task list"
-msgstr "Ensisijainen tehtävälista"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-msgid "Free/busy template URL"
-msgstr "Vapaa/varattu-mallin osoite"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
-#, fuzzy, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain"
-msgstr ""
-"URL-malli, jota käytetään vapaa/varattu-tiedon varaosoitteena. %u korvataan "
-"sähköpostiosoitteen käyttäjäosalla ja %d aluenimellä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-msgid "Recurrent Events in Italic"
-msgstr "Toistuvat tapahtumat kursivoituna"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-msgid "Show days with recurrent events in italic font in bottom left calendar"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-msgid "Search range for time-based searching in years"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-msgid ""
-"How many years can the time-based search go forward or backward from "
-"currently selected day when searching for another occurrence; default is ten "
-"years"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-msgid "Show appointment end times in week and month views"
-msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-#, fuzzy
-msgid "Whether to display the end time of events in the week and month views"
-msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-#, fuzzy
-#| msgid "Show appointment end times in week and month views"
-msgid "Show appointment icons in the month view"
-msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-#, fuzzy
-msgid "Whether to show icons of events in the month view"
-msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
-msgid "Show the memo preview pane"
-msgstr "Näytä muistilappujen esikatselupaneeli"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-#, fuzzy
-msgid "If \"true\", show the memo preview pane in the main window"
-msgstr "Näytä muistilappujen esikatselupaneeli"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-msgid "Show the task preview pane"
-msgstr "Näytä tehtävien esikatselupaneeli"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-#, fuzzy
-msgid "If \"true\", show the task preview pane in the main window"
-msgstr "Näytä tehtävien esikatselupaneeli"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#, fuzzy
-msgid "Whether to show week numbers in various places in the Calendar"
-msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
-#, fuzzy
-msgid "Vertical position for the tag pane"
-msgstr "Pystysijainti"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-msgid "Highlight tasks due today"
-msgstr "Korosta tänään erääntyvät tehtävät"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-msgid ""
-"Whether highlight tasks due today with a special color (task-due-today-color)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-msgid "Tasks due today color"
-msgstr "Tänään erääntyvien tehtävien väri"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
-#, fuzzy
-msgid ""
-"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-"together with task-due-today-highlight"
-msgstr "Tänään erääntyvien tehtävien väri, \"#rrggbb\"-muodossa."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Task preview pane position (horizontal)"
-msgstr "Tehtävien esikatselupaneelin sijainti (vaaka)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid "Task layout style"
-msgstr "Tehtävien asettelutapa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-msgid "Task preview pane position (vertical)"
-msgstr "Tehtävien esikatselupaneelin sijainti (pysty)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-#, fuzzy
-msgid "Position of the task preview pane when oriented vertically"
-msgstr "Paneelin sijainti sen ollessa pystyasennossa"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-#, fuzzy
-#| msgid "Hide completed tasks"
-msgid "Show reminders for completed tasks"
-msgstr "Piilota valmistuneet tehtävät"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-msgid ""
-"Whether to show reminders for completed tasks. When set to false, reminders "
-"for completed tasks are suppressed."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
-msgid "Highlight overdue tasks"
-msgstr "Korosta eräpäivän ylittäneet tehtävät"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
-msgid ""
-"Whether highlight overdue tasks with a special color (task-overdue-color)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
-msgid "Overdue tasks color"
-msgstr "Eräpäivän ylittäneiden tehtävien väri"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
-#, fuzzy
-msgid ""
-"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-"together with task-overdue-highlight."
-msgstr "Eräpäivän ylittäneiden tehtävien väri, \"#rrggbb\"-muodossa."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
-msgid "Time divisions"
-msgstr "Aikajaot"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
-#, fuzzy
-msgid "Intervals shown in Day and Work Week views, in minutes"
-msgstr "Päivä- ja viikkonäkymissä näytettävät aikavälit minuutteina."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
-msgid "Timezone"
-msgstr "Aikavyöhyke"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
-#, fuzzy
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olson timezone database location like \"America/New York\""
-msgstr ""
-"Oletusaikavyöhyke käytettävissä päivämäärissä ja kalenterissa, muodossa "
-"kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/"
-"Helsinki\"."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
-msgid "Twenty four hour time format"
-msgstr "24 tunnin kello"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
-#, fuzzy
-msgid "Whether to show times in twenty four hour format instead of using am/pm"
-msgstr "Näytetäänkö kello 24 tunnin vai am/pm-muodossa."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
-#, fuzzy
-msgid "Birthday and anniversary reminder"
-msgstr "Syntymä- ja vuosipäivät"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
-#, fuzzy
-msgid "Whether to set a reminder for birthdays and anniversaries"
-msgstr "Asetetaanko tapaamisille oletusmuistutus."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
-msgid "Default appointment reminder"
-msgstr "Tapaamisen oletusmuistutus"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
-#, fuzzy
-msgid "Whether to set a default reminder for appointments"
-msgstr "Asetetaanko tapaamisille oletusmuistutus."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
-msgid "Use system timezone"
-msgstr "Käytä järjestelmän aikavyöhykettä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
-msgid "Use the system timezone instead of the timezone selected in Evolution"
-msgstr "Käytä järjestelmän aikavyöhykettä Evolutionista valitun sijasta"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
-msgid "First day of the week"
-msgstr "Viikon ensimmäinen päivä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
-msgid "Monday is a work day"
-msgstr "Maanantai on työpäivä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
-msgid "Tuesday is a work day"
-msgstr "Tiistai on työpäivä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
-msgid "Wednesday is a work day"
-msgstr "Keskiviikko on työpäivä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
-msgid "Thursday is a work day"
-msgstr "Torstai on työpäivä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
-msgid "Friday is a work day"
-msgstr "Perjantai on työpäivä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
-msgid "Saturday is a work day"
-msgstr "Lauantai on työpäivä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
-msgid "Sunday is a work day"
-msgstr "Sunnuntai on työpäivä"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
-msgid "Create events, memos and tasks as Private by default"
-msgstr "Luo tapahtumat, muistiinpanot ja tehtävät yksityisenä oletuksena"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
-#, fuzzy
-msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
-msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"week-start-day-name\" instead."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
-msgid "(Deprecated) Work days"
-msgstr "(Vanhennettu) Työpäivät"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
-msgid ""
-"Days on which the start and end of work hours should be indicated. (This key "
-"was deprecated in version 3.10 and should no longer be used. Use the \"work-"
-"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:1
-msgid "Previous Evolution version"
-msgstr "Evolutionin edellinen versio"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:2
-msgid ""
-"The most recently used version of Evolution, expressed as \"major.minor.micro"
-"\". This is used for data and settings migration from older to newer "
-"versions."
-msgstr ""
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:3
-msgid "List of disabled plugins"
-msgstr "Luettelo käytöstä poistetuista lisäosista"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-msgid "The list of disabled plugins in Evolution"
-msgstr "Luettelo Evolutionin käytöstä poistetuista lisäosista"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-msgid "The window's X coordinate"
-msgstr "Ikkunan X-koordinaatti"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:6
-msgid "The window's Y coordinate"
-msgstr "Ikkunan Y-koordinaatti"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:7
-msgid "The window's width in pixels"
-msgstr "Ikkunan leveys pikseleissä"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:8
-msgid "The window's height in pixels"
-msgstr "Ikkunan korkeus pikseleissä"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:9
-msgid "Whether the window is maximized"
-msgstr "Onko ikkuna suurennettu"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
-msgid "Gnome Calendar's calendar import done"
-msgstr "Gnome-kalenterin kalenterituonti valmis"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-msgid "Whether calendar from Gnome Calendar has been imported or not"
-msgstr ""
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
-msgid "Gnome Calendar's tasks import done"
-msgstr ""
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
-msgid "Whether tasks from Gnome Calendar have been imported or not"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Tarkista onko Evolution sähköpostin oletusohjelma"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Tarkista aina Evolutionin käynnistyessä onko se sähköpostin oletusohjelma."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-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ö."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#, fuzzy
-#| msgid "_Show the photograph of sender in the message preview"
-msgid "Name of the editor to prefer in the message composer"
-msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-msgid ""
-"If the name doesn't correspond to any known editor, then the built-in WebKit "
-"editor is used."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-msgid "Path where picture gallery should search for its content"
-msgstr "Polku, josta kuvagallerian tulisi etsiä sisältöä"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-msgid "Spell check inline"
-msgstr "Oikolue kirjoitettaessa"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-msgid "Draw spelling error indicators on words as you type."
-msgstr "Näytä oikoluvun kirjoitusvirhemerkit sanoissa kirjoituksen aikana."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-msgid "Automatic link recognition"
-msgstr "Havaitse linkit automaattisesti"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize links in text and replace them."
-msgstr "Tunnista linkit tekstissä ja korvaa ne linkillä."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Automatic emoticon recognition"
-msgstr "Tunnista hymiöt automaattisesti"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-#, fuzzy
-#| msgid "Recognize emoticons in text and replace them with images."
-msgid ""
-"Recognize emoticons in text and replace them with images or Unicode "
-"characters."
-msgstr "Tunnista hymiöt tekstissä ja korvaa ne kuvilla."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
-#, fuzzy
-#| msgid "Unicode"
-msgid "Unicode emoticons"
-msgstr "Unicode"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-#, fuzzy
-#| msgid "Use Unicode characters for smileys."
-msgid "Use Unicode characters for emoticons."
-msgstr "Käytä Unicode-merkkejä hymiöitä varten."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
-#, fuzzy
-msgid "Attribute message"
-msgstr "Liitetty viesti"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-msgid "Forward message"
-msgstr "Välitetty viesti"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-msgid "Original message"
-msgstr "Alkuperäinen viesti"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-msgid "Group Reply replies to list"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-msgid "Put the cursor at the bottom of replies"
-msgstr "Aseta osoitin viestin loppuun vastattaessa"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-msgid ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
-msgstr ""
-"Käyttäjät ovat välillä hyvin tarkkoja siitä, mihin kohdistimen tulisi mennä "
-"vastattaessa viestiin. Tämä asetus määrittää, viedäänkö kursori viestin "
-"alkuun vai loppuun."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Always request read receipt"
-msgstr "Pyydä aina kuittaus lukemisesta"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Whether a read receipt request gets added to every message by default."
-msgstr "Lisätäänkö kaikkiin viesteihin oletuksena kuittauspyyntö."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-msgid "Send HTML mail by default"
-msgstr "Lähetä oletuksena HTML-sähköpostia"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-msgid "Send HTML mail by default."
-msgstr "Lähetä HTML-postia oletuksena."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-msgid "Spell checking languages"
-msgstr "Oikoluvun kielet"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-msgid "List of dictionary language codes used for spell checking."
-msgstr "Luettelo oikoluvun käyttämistä sanaston kielikoodeista."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
-"valikosta, kun sähköpostitili on valittu."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
-"valikosta, kun sähköpostitili on valittu."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#, fuzzy
-#| msgid "Show \"Cc\" field when sending a mail message"
-msgid "Show \"From\" override field when sending a mail message"
-msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#, fuzzy
-#| msgid ""
-#| "Show the \"Cc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
-msgid ""
-"Show the \"From\" override field when sending a mail message. This is "
-"controlled from the View menu when a mail account is chosen."
-msgstr ""
-"Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
-"valikosta, kun sähköpostitili on valittu."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-msgstr ""
-"Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan "
-"Näytä-valikosta, kun sähköpostitili on valittu."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "Näytä \"From\"-kenttä lähetettäessä uutisryhmään"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-"Näytä \"From\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
-"Näytä-valikosta, kun sähköpostitili on valittu."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
-msgstr ""
-"Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
-"Näytä-valikosta, kun sähköpostitili on valittu."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-msgid "Digitally sign replies when the original message is signed"
-msgstr ""
-"Allekirjoita digitaalisesti vastaukset, kun alkuperäinen viesti on "
-"allekirjoitettu"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-msgid ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#, fuzzy
-msgid "Encode filenames in an Outlook/GMail way"
-msgstr "Muotoile tiedostonimet Outlookin ja GMailin tapaan."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#, fuzzy
-msgid ""
-"Encode filenames in the mail headers same as Outlook or GMail do, to let "
-"them display correctly filenames with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
-msgstr ""
-"Koodaa tiedostonimet postiotsakkeissa samalla tavalla kuin Outlook ja Gmail, "
-"jotta ne pystyvät tunnistamaan Evolution lähettämät tiedostonimet, joissa on "
-"UTF-8 merkistön merkkejä. Nämä ohjelmat eivät noudata standardia RFC 2231, "
-"vaan käyttävät virheellistä standardia RFC 2047."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#, fuzzy
-msgid "Send messages through Outbox folder"
-msgstr "Tallennetaan viestiä kansioon"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-msgid ""
-"Always save messages to Outbox folder when sending, to let a user choose "
-"when the messages should be sent."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
-msgid "Put personalized signatures at the top of replies"
-msgstr "Lisää oma allekirjoitus vastauksen alkuun"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-msgid ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
-msgstr ""
-"Käyttäjät ovat välillä hyvin tarkkoja siitä, mihin allekirjoitus tulisi "
-"lisätä vastattaessa viestiin. Tämä asetus määrittää, lisätäänkö se viestin "
-"alkuun vai loppuun."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-msgid "Do not add signature delimiter"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "Ignore list Reply-To:"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "List of localized 'Re'"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-msgid ""
-"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-"text when replying to a message, as an addition to the standard \"Re\" "
-"prefix. An example is 'SV,AV'."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-msgid "Number of characters for wrapping"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-msgid "Will autowrap lines after given number of characters."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid ""
-"Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid ""
-"When to ask, when the number of To and CC recipients reaches this value."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-msgid ""
-"If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME are "
-"always shown in the composer's toolbar. Otherwise they are shown only when "
-"being used."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-msgid "Wrap quoted text in replies"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-msgid "If set to 'true' quoted text in replies will be wrapped."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-msgid "Whether to obey Content-Disposition:inline message header hint"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-msgid ""
-"Set to 'false' to block automatic display of attachments with Content-"
-"Disposition: inline."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-msgid "Save file format for drag-and-drop operation"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-msgid "Can be either 'mbox' or 'pdf'."
-msgstr "Voi olla joko 'mbox' tai 'pdf'."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-msgid "Show image animations"
-msgstr "Näytä kuvien animaatiot"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr ""
-"Näytä animoidut kuvat HTML-viesteissä. Monista käyttäjistä animoidut kuvat "
-"ovat ärsyttäviä ja he haluavat nähdä kuvat ilman animaatioita."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-msgid "Enable or disable type ahead search feature"
-msgstr "Käytetäänkö kirjoituksenaikaista hakua"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-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:75
-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:76
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-"Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
-"esikatselussa, viestiluettelossa ja kansioluettelossa."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-msgid "Enable to use a similar message list view settings for all folders"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#, 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:79
-msgid "Mark citations in the message \"Preview\""
-msgstr "Merkitse lainaukset viestin \"esikatselussa\""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-msgid "Mark citations in the message \"Preview\"."
-msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-msgid "Citation highlight color"
-msgstr "Lainauksen korostusväri"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-msgid "Citation highlight color."
-msgstr "Lainauksen korostukseen käytetty väri."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-msgid "Enable/disable caret mode"
-msgstr "Kytke/poista caret-tila"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-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:85
-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:86
-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:87
-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:88
-msgid "Show notification about missing remote content"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-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:90
-msgid "Show Animations"
-msgstr "Näytä animaatiot"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
-msgid "Show animated images as animations."
-msgstr "Näytä animoidut kuvat animaatioina."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-msgid "Show all message headers"
-msgstr "Näytä kaikki otsakkeet"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-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:94
-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:95
-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:96
-msgid "Show photo of the sender"
-msgstr "Näytä lähettäjän valokuva"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-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:98
-msgid "Search gravatar.com for photo of the sender"
-msgstr "Näytä lähettäjän valokuvaa gravatar.comista"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-msgid "Allow searching also at gravatar.com for photo of the sender."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-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:101
-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:102
-#, 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:103
-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:104
-#, fuzzy
-msgid "Timeout for marking messages as seen"
-msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-#, 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:106
-#, fuzzy
-#| msgid "Show Attachment _Bar"
-msgid "Show Attachment Bar"
-msgstr "Näytä _liitepalkki"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-msgid ""
-"Show Attachment Bar below the message preview pane when the message has "
-"attachments."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-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:109
-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:110
-msgid "Show deleted messages in the message-list"
-msgstr "Näytä poistetut viestit viestiluettelossa"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-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:112
-#, 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:113
-#, 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:114
-#, 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:115
-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:116
-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:117
-msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
-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:118
-msgid "Height of the message-list pane"
-msgstr "Viestiluettelon korkeus"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-msgid "Height of the message-list pane."
-msgstr "Viestiluettelopaneelin korkeus."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-msgid "Whether message headers are collapsed in the user interface"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Viestiluettelopaneelin leveys"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Viestiluettelopaneelin leveys."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-msgid "Layout style"
-msgstr "Asettelutyyli"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-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:125
-msgid "Variable width font"
-msgstr "Vaihtuvanlevyinen fontti"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-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:127
-msgid "Terminal font"
-msgstr "Päätteen fontti"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-msgid "The terminal font for mail display."
-msgstr "Päätefontti viestejä näytettäessä."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-msgid "Use custom fonts"
-msgstr "Käytä omia fontteja"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
-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:131
-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:132
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-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:133
-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:134
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin "
-"lukumäärän, jonka jälkeen näytetään '...'."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-msgid "Thread the message-list based on Subject"
-msgstr "Säikeistä viestiluettelo aiheen perusteella"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
-"sisällä In-Reply-To tai References-otsakkeita."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-msgid "Default value for thread expand state"
-msgstr "Säikeen laajennuksen tilan oletusarvo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. "
-"Muutos vaatii Evolutionin uudelleenkäynnistyksen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-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:140
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin "
-"mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
-"uudelleenkäynnistyksen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-msgid "Whether sort thread children always ascending"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../src/composer/mail-composer.error.xml.h:44
 #, fuzzy
-#| msgid ""
-#| "This setting specifies whether the threads should be sorted based on "
-#| "latest message in each thread, rather than by message's date. Evolution "
-#| "requires a restart."
-msgid ""
-"This setting specifies whether the thread children should be sorted always "
-"ascending, rather than using the same sort order as in the thread root level."
-msgstr ""
-"Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin "
-"mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
-"uudelleenkäynnistyksen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-msgid "Sort accounts alphabetically in a folder tree"
-msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-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:145
-msgid "Log filter actions"
-msgstr "Kirjaa suodatintoimenpiteet"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-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:147
-msgid "Logfile to log filter actions"
-msgstr "Lokitiedosto suodattimien toimenpiteille"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-msgid "Logfile to log filter actions."
-msgstr "Lokitiedosto suodattimien toimenpiteille."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-msgid "Flush Outbox after filtering"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-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:151
-msgid "Default forward style"
-msgstr "Välityksen oletustyyli"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-msgid "Default reply style"
-msgstr "Vastauksen oletustyyli"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#, 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:155
-msgid "Prompt on empty subject"
-msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-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:157
-msgid "Prompt when emptying the trash"
-msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-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:159
-msgid "Prompt when user expunges"
-msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-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:161
-#, 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:162
-#, fuzzy
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-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:163
-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:164
-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:165
-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:166
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
-"eivät sellaista halua vastaanottaa."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-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:168
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-"Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko "
-"todella tehdä sen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-msgid "Prompt while marking multiple messages"
-msgstr "Kysy vahvistus merkittäessä useita viestejä"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-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:171
-msgid "Prompt when deleting messages in search folder"
-msgstr "Kysy poistettaessa viestejä hakukansiosta"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
-"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-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:174
-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:175
-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:176
-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:177
-#, 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:178
-#, fuzzy
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-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:179
-#, 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:180
-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:181
-#, 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:182
-#, fuzzy
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr ""
-"Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko "
-"synkronointia yhteydettömään tilaan siirryttäessä."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-msgid ""
-"Prompt when switching composer mode and the content needs to lose its "
-"formatting"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-#, fuzzy
-msgid ""
-"It disables/enables the repeated prompts to warn that you are switching "
-"composer mode and the content needs to lose its formatting."
-msgstr ""
-"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
-"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#, 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:186
-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:187
-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:188
-msgid "Empty Trash folders on exit"
-msgstr "Tyhjennä roskakorit lopetettaessa"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-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:191
-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:192
-msgid "Last time Empty Trash was run"
-msgstr "Roskakori tyhjennettiin viimeksi"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-#, 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:194
-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:195
-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:196
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), "
-"\"1\" (varoitukset) tai \"2\" (vianetsintäviestit)."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-msgid "Show original \"Date\" header value."
-msgstr "Näytä alkuperäinen \"Date\"-otsakearvo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-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:199
-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:200
-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."
-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:201
-msgid "Check incoming mail being junk"
-msgstr "Etsi roskapostia saapuvista sähköposteista"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
-msgid "Run junk test on incoming mail."
-msgstr "Suorita roskapostitarkistus saapuvalle postille."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-msgid "Empty Junk folders on exit"
-msgstr "Tyhjennä roskapostikansiot lopetettaessa"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
-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:206
-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:207
-#, fuzzy
-msgid "Last time Empty Junk was run"
-msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
-#, 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:209
-msgid "The default plugin for Junk hook"
-msgstr "Roskapostikäsittelijän oletuslisäosa"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-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:211
-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:212
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"Määrittää etsitäänkö lähettäjän osoitetta osoitekirjasta. Jos lähettäjä "
-"löytyy, ei viestiä tulkita roskapostiksi. Lähettäjää etsitään "
-"osoitekirjoista, jotka on valittu automaattista täydennystä varten. Tämä "
-"haku voi olla hidas, jos osoitteita täydennetään esimerkiksi LDAP-"
-"osoitekirjoista."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-"Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta "
-"varten vain paikallisista osoitekirjoista"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-"Tämä valinta liittyy avaimeen lookup_addressbook ja sitä käytetään "
-"määrittämään, etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, "
-"joille ei tehdä roskapostisuodatusta."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
-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:216
-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."
-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:217
-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:218
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-"Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
-"kohdat ovat muodossa \"otsakenimi=arvo\"."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
-msgid "UID string of the default account."
-msgstr "Oletustilin UID-merkkijono."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
-msgid "Save directory"
-msgstr "Tallenna kansio"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
-msgid "Directory for saving mail component files."
-msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
-msgid "Composer load/attach directory"
-msgstr "Viesti-ikkunan lataus- ja liitekansio"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
-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:224
-msgid "Check for new messages on start"
-msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
-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:226
-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:227
-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:228
-msgid "Server synchronization interval"
-msgstr "Palvelimen synkronoinnin aikaväli"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-"Määrittää kuinka usein paikalliset muutokset synkronoidaan "
-"postipalvelimelle. Aikavälin täytyy olla vähintään 30 sekuntia."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
-#, 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:231
-msgid ""
-"Enables Expunge in virtual folders, which means that the Folder->Expunge "
-"will be callable in virtual folders, while the expunge itself will be done "
-"in all folders for all deleted messages within the virtual folder, not only "
-"for deleted messages belonging to the virtual folder."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
-#: ../mail/mail-config.ui.h:9
-msgid "Inherit theme colors in HTML mode"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
-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:234
-msgid "An Archive folder for On This Computer folders."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
-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:236
-#, fuzzy
-#| msgid "Default forward style"
-msgid "(Deprecated) Default forward style"
-msgstr "Välityksen oletustyyli"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
-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:238
-#, fuzzy
-#| msgid "Default reply style"
-msgid "(Deprecated) Default reply style"
-msgstr "Vastauksen oletustyyli"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
-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:240
-#, 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:241
-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:242
-#, 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:243
-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:244
-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:245
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"browser-close-on-reply-policy\" instead."
-msgstr ""
-
-#. Translators: This is the a list of words for the attach reminder plugin to look
-#. for in a message body. Please use any number of words here in your language that might
-#. indicate that an attachment should have been attached to the message.
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
-msgid "['attachment','attaching','attached','enclosed']"
-msgstr "['attachment','attaching','attached','enclosed,'liite','liitteenä','liitän']"
-
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta"
-
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta."
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
-msgid "Address book source"
-msgstr "Osoitekirjan lähde"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-#, fuzzy
-msgid "Address book to use for storing automatically synced contacts."
-msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync Pidgin contacts"
-msgstr "Synkronoi Pidginin yhteystiedot automaattisesti"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether Pidgin contacts should be automatically synced."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
-#, fuzzy
-msgid "Enable autocontacts"
-msgstr "Valitse kaikki yhteystiedot"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-msgid ""
-"Whether contacts should be automatically added to the user's address book."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "Pidgin address book source"
-msgstr "Pidginin osoitekirjan lähde"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-#, fuzzy
-msgid ""
-"Address book to use for storing automatically synced contacts from Pidgin."
-msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "Pidgin check interval"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for Pidgin syncing of contacts."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "Pidgin last sync MD5"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "Pidgin last sync MD5."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
-msgid "Pidgin last sync time"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
-msgid "Pidgin last sync time."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-msgid "List of Custom Headers"
-msgstr "Luettelo omista otsakkeista"
-
-#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"Avain määrittää luettelon omista otsakkeita, joita voit lisätä lähteviin "
-"viesteihin. Muoto otsakkeiden määrittelyksi avaimessa on seuraava: Otsakkeen "
-"nimi, \"=\"-merkki ja otsakkeen sisältö, eroteltuna \";\"-merkeillä."
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-msgid "Default External Editor"
-msgstr "Ulkoisen muokkaimen oletuskomento"
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-msgid "The default command that must be used as the editor."
-msgstr "Oletuskomento, jota käytetään ulkoisena muokkaimena."
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-msgid "Automatically launch when a new mail is edited"
-msgstr "Käynnistä automaattisesti uutta viestiä muokattaessa"
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-#, fuzzy
-msgid "Automatically launch editor when key is pressed in the mail composer."
-msgstr ""
-"Käynnistä muokkain automaattisesti, kun nappia painetaan viestin muokkaimessa"
-
-#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-msgid "Insert Face picture by default"
-msgstr "Lisää kasvokuva oletuksena"
-
-#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
-msgstr ""
-"Lisätäänkö kasvokuva lähteviin viestiin automaattisesti. Kuva on asetettava "
-"ennen tämän valintaa, muuten mitään ei tapahdu."
-
-#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
-#, fuzzy
-msgid "Delete processed"
-msgstr "Poista _viesti"
-
-#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
-msgid "Whether to delete processed iTip objects"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
-msgid "Notify new messages for Inbox only."
-msgstr "Huomauta uusista viesteistä vain saapuvien kansiossa."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-msgid "Whether to notify new messages in Inbox folder only."
-msgstr "Huomautetaanko uusista viesteistä vain saapuvien kansiossa."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
-msgid "Enable D-Bus messages."
-msgstr "Ota käyttöön D-Bus-viestit."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Luo D-BUS-viestin, kun uusia sähköpostiviestejä saapuu."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-msgid "Enable icon in notification area."
-msgstr "Ota käyttöön kuvake ilmoitusalueella."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Näytä sähköpostikuvake ilmoitusalueella, kun uusia viestejä saapuu."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
-msgid "Popup message together with the icon."
-msgstr "Ponnahdusikkuna kuvakkeen kanssa."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "Näytetäänkö viesti kuvakkeen päällä uuden sähköpostin saapuessa."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#, fuzzy
-#| msgid "Show new mail icon in notification area when new messages arrive."
-msgid "Enable audible notifications when new messages arrive."
-msgstr "Näytä sähköpostikuvake ilmoitusalueella, kun uusia viestejä saapuu."
+#| msgid "Are you sure you want to discard the message you are composing?"
+msgid "Are you sure you want to convert the message into a meeting?"
+msgstr "Haluatko varmasti hylätä kirjoittamasi viestin?"
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
+#: ../src/composer/mail-composer.error.xml.h:45
 msgid ""
-"Whether to make a sound of any kind when new messages arrive. If \"false\", "
-"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
-"and \"notify-sound-use-theme\" keys are disregarded."
+"By converting the message into the meeting the composed message will be "
+"closed and the changes being done discarded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#, fuzzy
-#| msgid "Whether to show the preview pane."
-msgid "Whether to emit a beep."
-msgstr "Näytetäänkö esikatselupaneeli."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#, fuzzy
-#| msgid "Whether play sound or beep when new messages arrive."
-msgid "Whether to emit a beep when new messages arrive."
-msgstr "Soitetaanko äänitiedosto vai piipataanko uuden sähköpostin saapuessa."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
+#: ../src/composer/mail-composer.error.xml.h:46
 #, fuzzy
-msgid "Sound filename to be played."
-msgstr "Soitettavan äänitiedoston nimi."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#, fuzzy
-#| msgid ""
-#| "Sound file to be played when new messages arrive, if not in beep mode."
-msgid ""
-"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
-"\" is \"true\"."
-msgstr ""
-"Soitettava äänitiedosto, kun uusia viestejä saapuu (jos ei piippaustilassa)."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-msgid "Whether to play a sound file."
-msgstr "Toistetaanko äänitiedosto."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-msgid ""
-"Whether to play a sound file when new messages arrive. The name of the sound "
-"file is given by the 'notify-sound-file' key."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-msgid "Use sound theme"
-msgstr "Käytä ääniteemaa"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
-msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr ""
-"Soita teeman äänitiedosto viestin saapuessa, jos ei olla piippaustilassa."
+#| msgid "Create a _Meeting"
+msgid "Convert to _Meeting"
+msgstr "Luo _kokous"
 
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
+#: ../src/composer/mail-composer.error.xml.h:47
 #, fuzzy
-msgid "Mode to use when displaying mails"
-msgstr "Käytä omia fontteja näytettäessä viestejä."
+#| msgid "Are you sure you want to send the message?"
+msgid "Are you sure you want to convert the event into a message?"
+msgstr "Haluatko varmasti lähettää tämän viestin?"
 
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+#: ../src/composer/mail-composer.error.xml.h:48
 msgid ""
-"The mode to use for displaying mails. \"normal\" makes Evolution choose the "
-"best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"\"prefer_source\" makes it use the text part, if present, otherwise shows "
-"HTML source, and \"only_plain\" forces Evolution to only show plain text"
+"By converting the event into the message the editing window will be closed "
+"and the changes being done discarded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+#: ../src/composer/mail-composer.error.xml.h:49
 #, fuzzy
-msgid "Whether to show suppressed HTML output"
-msgstr "Näytetäänkö esikatselupaneeli."
+#| msgid "Important Messages"
+msgid "Convert to _Message"
+msgstr "Tärkeät viestit"
 
-#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+#: ../src/composer/mail-composer.error.xml.h:50
 #, fuzzy
-#| msgid "List of server URLs for free/busy publishing."
-msgid "List of Destinations for publishing"
-msgstr "Luettelo osoitteista, joissa julkaistaan vapaa/varattu tietoja."
-
-#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
-msgid ""
-"The key specifies the list of destinations to where publish calendars. Each "
-"values specifies an XML with setup for publishing to one destination."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-msgstr ""
-"Luettelo avainsana- ja arvopareista, joita pohjat-lisäosa käyttää viestin "
-"rungon osien korvaamiseen."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-msgid "Skip development warning dialog"
-msgstr "Ohita kehitysversiovaroitus"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Piilotetaanko varoitusikkuna Evolutionin kehitysversion käytöstä vai ei."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-msgid "Initial attachment view"
-msgstr "Liitenäkymän oletusarvo"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-msgstr ""
-"Liitepalkin elementtien oletusnäkymä. \"0\" on kuvakenäkymä, \"1\" "
-"luettelonäkymä."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
-msgid "Initial file chooser folder"
-msgstr "Tiedostovalitsimen oletuskansio"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "GtkFileChooser-ikkunoiden oletuskansio."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
-msgid "Compression format used by autoar"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-msgid ""
-"Compression format used when compressing attached directories with autoar."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
-msgid "Compression filter used by autoar"
-msgstr ""
+#| msgid "Are you sure you want to save the memo without a summary?"
+msgid "Are you sure you want to convert the memo into a message?"
+msgstr "Haluatko varmasti tallentaa muistion ilman yhteenvetoa?"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+#: ../src/composer/mail-composer.error.xml.h:51
 msgid ""
-"Compression filter used when compressing attached directories with autoar."
+"By converting the memo into the message the editing window will be closed "
+"and the changes being done discarded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../shell/main.c:320
-msgid "Start in offline mode"
-msgstr "Aloita yhteydettömässä tilassa"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Käynnistetäänkö Evolution verkkoyhteyksillä vai ilman."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#, fuzzy
-msgid "Offline folder paths"
-msgstr "Avataan kansiota %s"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../src/composer/mail-composer.error.xml.h:52
 #, fuzzy
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage."
-msgstr ""
-"Luettelo poluista kansioihin, jotka synkronisoidaan kovalevylle "
-"yhteydettömään käyttöön"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-msgid "Enable express mode"
-msgstr "Ota pikatila käyttöön"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-msgid "Flag that enables a much simplified user interface."
-msgstr "Ottaa käyttöön paljon yksinkertaistetun käyttöliittymän."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-msgid "List of button names to hide in the window switcher"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-msgid ""
-"Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
-"Change of this requires restart of the application."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-msgid "Window buttons are visible"
-msgstr "Ikkunan napit näytetään"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-msgid "Whether the window buttons should be visible."
-msgstr "Näytetäänkö ikkunan napit."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-msgid "Window button style"
-msgstr "Ikkunan painikkeiden tyyli"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"Näytettävien painikkeiden tyyli. Voi olla \"text\", \"icons\", \"both\" tai "
-"\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen "
-"asetusta."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-msgid "Toolbar is visible"
-msgstr "Työkalupalkki on näkyvissä"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-msgid "Whether the toolbar should be visible."
-msgstr "Näytetäänkö työkalupalkki."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-msgid "Sidebar is visible"
-msgstr "Sivupaneeli on näkyvissä"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
-msgid "Whether the sidebar should be visible."
-msgstr "Näytetäänkö sivupaneeli."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
-msgid "Statusbar is visible"
-msgstr "Tilarivi on näkyvissä"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
-msgid "Whether the status bar should be visible."
-msgstr "Näytetäänkö tilarivi."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "ID tai alias käynnistyksessä oletuksena näytettävälle komponentille."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
-msgid "Default sidebar width"
-msgstr "Sivupaneelin oletusleveys"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
-msgid "The default width for the sidebar, in pixels."
-msgstr "Sivupaneelin oletusleveys pikseleinä."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-msgid "Use only local spam tests."
-msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:ää)."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "Full path command to run spamassassin"
-msgstr ""
+#| msgid "Are you sure you want to save the task without a summary?"
+msgid "Are you sure you want to convert the task into a message?"
+msgstr "Haluatko varmasti tallentaa tehtävän ilman yhteenvetoa?"
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+#: ../src/composer/mail-composer.error.xml.h:53
 msgid ""
-"Full path to a spamassassin command. If not set, then a compile-time path is "
-"used, usually /usr/bin/spamassassin. The command should not contain any "
-"other arguments."
+"By converting the task into the message the editing window will be closed "
+"and the changes being done discarded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Full path command to run sa-learn"
+#: ../src/composer/mail-composer.error.xml.h:54
+msgid "Something has gone wrong when editing the message"
 msgstr ""
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+#: ../src/composer/mail-composer.error.xml.h:55
 msgid ""
-"Full path to a sa-learn command. If not set, then a compile-time path is "
-"used, usually /usr/bin/sa-learn. The command should not contain any other "
-"arguments."
+"A WebKitWebProcess crashed when editing the message. You can try again by "
+"closing the composer window and opening a new one. If the issue persists, "
+"please file a bug report in the GNOME bugzilla."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-attachment.c:338
+#: ../src/em-format/e-mail-formatter-attachment.c:334
 msgid "Display as attachment"
 msgstr "Näytä liitteenä"
 
-#: ../em-format/e-mail-formatter-audio.c:152
+#: ../src/em-format/e-mail-formatter-audio.c:150
 msgid "Audio Player"
 msgstr "Äänisoitin"
 
-#: ../em-format/e-mail-formatter-audio.c:153
+#: ../src/em-format/e-mail-formatter-audio.c:151
 msgid "Play the attachment in embedded audio player"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
+#: ../src/em-format/e-mail-formatter-headers.c:107
+#: ../src/em-format/e-mail-part-headers.c:46
+#: ../src/mail/e-mail-tag-editor.c:203 ../src/mail/message-list.etspec.h:5
+#: ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../em-format/e-mail-formatter-headers.c:128
+#: ../src/em-format/e-mail-formatter-headers.c:132
 msgid "(no subject)"
 msgstr "(Ei aihetta)"
 
-#: ../em-format/e-mail-formatter-headers.c:329
+#. Translators: This message suggests to the receipients
+#. * that the sender of the mail is different from the one
+#. * listed in From field.
+#: ../src/em-format/e-mail-formatter-headers.c:339
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Tämä viesti lähetettiin %s käyttäjän %s puolesta"
 
-#: ../em-format/e-mail-formatter-image.c:170
+#: ../src/em-format/e-mail-formatter-image.c:168
 msgid "Regular Image"
 msgstr "Tavallinen kuva"
 
-#: ../em-format/e-mail-formatter-image.c:171
+#: ../src/em-format/e-mail-formatter-image.c:169
 #, fuzzy
 #| msgid "Display the next message"
 msgid "Display part as an image"
 msgstr "Näytä seuraava viesti"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:250
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
 msgid "RFC822 message"
 msgstr "RFC822-viesti"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:251
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
 #, fuzzy
 #| msgid "Formatting message"
 msgid "Format part as an RFC822 message"
 msgstr "Muotoillaan viestiä"
 
-#: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/gal-view-instance-save-as-dialog.c:94
-#: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:92
+#: ../src/mail/e-mail-label-tree-view.c:96
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
 msgid "Name"
 msgstr "Nimi"
 
-#: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/e-attachment-tree-view.c:193
+#: ../src/mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Koko"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:180
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
-#: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
-#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1645
+#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-part-headers.c:51
+#: ../src/mail/e-mail-tag-editor.c:208 ../src/mail/filtertypes.xml.in.h:16
+#: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
+#: ../src/mail/vfoldertypes.xml.in.h:17
+#: ../src/modules/mail/em-mailer-prefs.c:65
+#: ../src/smime/gui/certificate-manager.c:1643
 msgid "Subject"
 msgstr "Aihe"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:199
-#: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1490
+#: ../src/em-format/e-mail-formatter-quote-headers.c:197
+#: ../src/em-format/e-mail-formatter-utils.c:341
+#: ../src/modules/mail/em-mailer-prefs.c:1488
 msgid "Mailer"
 msgstr "Postittaja"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
-#: ../em-format/e-mail-formatter-text-enriched.c:102
+#: ../src/em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../src/em-format/e-mail-formatter-text-enriched.c:100
 msgid "Richtext"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
-#: ../em-format/e-mail-formatter-text-enriched.c:103
+#: ../src/em-format/e-mail-formatter-quote-text-enriched.c:93
+#: ../src/em-format/e-mail-formatter-text-enriched.c:101
 msgid "Display part as enriched text"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:387
+#: ../src/em-format/e-mail-formatter-quote-text-html.c:93
+#: ../src/em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:388
+#: ../src/em-format/e-mail-formatter-quote-text-html.c:94
+#: ../src/em-format/e-mail-formatter-text-html.c:386
 #, fuzzy
 msgid "Format part as HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1300
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../src/em-format/e-mail-formatter-text-plain.c:196
+#: ../src/e-util/e-html-editor-actions.c:1314
 msgid "Plain Text"
 msgstr "Raakateksti"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:124
-#: ../em-format/e-mail-formatter-text-plain.c:199
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../src/em-format/e-mail-formatter-text-plain.c:197
 #, fuzzy
 #| msgid "Only ever show plain text"
 msgid "Format part as plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:44
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:44
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11204,11 +11815,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:45
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:45
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11216,11 +11827,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennäköisesti aito."
 
-#: ../em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:46
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:46
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11228,11 +11839,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
 "aikana."
 
-#: ../em-format/e-mail-formatter-secure-button.c:49
+#: ../src/em-format/e-mail-formatter-secure-button.c:47
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voi varmistaa"
 
-#: ../em-format/e-mail-formatter-secure-button.c:49
+#: ../src/em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11240,7 +11851,7 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voi varmistaa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:50
+#: ../src/em-format/e-mail-formatter-secure-button.c:48
 #, fuzzy
 #| msgid ""
 #| "This message is signed with a signature, but there is no corresponding "
@@ -11250,7 +11861,7 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjän julkista avainta ei löydy."
 
-#: ../em-format/e-mail-formatter-secure-button.c:50
+#: ../src/em-format/e-mail-formatter-secure-button.c:48
 msgid ""
 "This message was digitally signed, but the corresponding public key is not "
 "present in your keyring. If you want to be able to verify the authenticity "
@@ -11259,11 +11870,11 @@ msgid ""
 "that this message truly came from that person and that it arrived unaltered."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:57
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:57
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11271,11 +11882,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:58
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:58
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11285,11 +11896,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
 "melko lyhyessä ajassa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:61
+#: ../src/em-format/e-mail-formatter-secure-button.c:59
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../em-format/e-mail-formatter-secure-button.c:61
+#: ../src/em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11297,11 +11908,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../src/em-format/e-mail-formatter-secure-button.c:60
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../src/em-format/e-mail-formatter-secure-button.c:60
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11311,218 +11922,228 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältöä missään "
 "käytännöllisessä ajassa."
 
-#: ../em-format/e-mail-formatter-source.c:121
+#: ../src/em-format/e-mail-formatter-source.c:119
 msgid "Display source of a MIME part"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
-#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
-#: ../modules/mail/em-mailer-prefs.c:64
+#: ../src/em-format/e-mail-formatter-utils.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:217
+#: ../src/em-format/e-mail-part-headers.c:48
+#: ../src/mail/message-list.etspec.h:9 ../src/mail/searchtypes.xml.in.h:11
+#: ../src/mail/vfoldertypes.xml.in.h:11
+#: ../src/modules/mail/em-mailer-prefs.c:62
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
+#: ../src/em-format/e-mail-formatter-utils.c:201
+#: ../src/em-format/e-mail-formatter-utils.c:218
+#: ../src/em-format/e-mail-part-headers.c:49
+#: ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../em-format/e-mail-formatter-utils.c:204
-#: ../em-format/e-mail-formatter-utils.c:221
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
+#: ../src/em-format/e-mail-formatter-utils.c:202
+#: ../src/em-format/e-mail-formatter-utils.c:219
+#: ../src/em-format/e-mail-part-headers.c:50
+#: ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Piilokopiot"
 
-#: ../em-format/e-mail-formatter-utils.c:566
+#: ../src/em-format/e-mail-formatter-utils.c:582
 msgid "GPG signed"
 msgstr "GPG-allekirjoitettu"
 
-#: ../em-format/e-mail-formatter-utils.c:572
+#: ../src/em-format/e-mail-formatter-utils.c:588
 msgid "GPG encrypted"
 msgstr "GPG-salattu"
 
-#: ../em-format/e-mail-formatter-utils.c:578
+#: ../src/em-format/e-mail-formatter-utils.c:594
 msgid "S/MIME signed"
 msgstr "S/MIME-allekirjoitettu"
 
-#: ../em-format/e-mail-formatter-utils.c:584
+#: ../src/em-format/e-mail-formatter-utils.c:600
 msgid "S/MIME encrypted"
 msgstr "S/MIME-salattu"
 
-#: ../em-format/e-mail-formatter-utils.c:593
-#: ../mail/e-mail-config-security-page.c:760
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:271
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:214
+#: ../src/em-format/e-mail-formatter-utils.c:609
+#: ../src/mail/e-mail-config-security-page.c:716
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: ../em-format/e-mail-parser-application-mbox.c:87
+#: ../src/em-format/e-mail-parser-application-mbox.c:85
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr ""
 
-#: ../em-format/e-mail-parser-application-smime.c:83
+#: ../src/em-format/e-mail-parser-application-smime.c:81
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "S/MIME-viestin jäsennys epäonnistui: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
+#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:75
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "PGP-viestin jäsennys epäonnistui: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
-#: ../em-format/e-mail-parser-multipart-signed.c:135
+#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:78
+#: ../src/em-format/e-mail-parser-multipart-signed.c:133
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Virhe vahvistaessa allekirjoitusta: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:68
+#: ../src/em-format/e-mail-parser-message-external.c:66
 #, fuzzy
 #| msgid "Malformed external-body part."
 msgid "Malformed external-body part"
 msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../em-format/e-mail-parser-message-external.c:101
+#: ../src/em-format/e-mail-parser-message-external.c:99
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:112
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
+#: ../src/em-format/e-mail-parser-message-external.c:110
+#, fuzzy, c-format
+#| msgid "Pointer to local file (%s) valid at site \"%s\""
+msgid "Pointer to local file (%s) valid at site “%s”"
 msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: ../em-format/e-mail-parser-message-external.c:114
+#: ../src/em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:133
+#: ../src/em-format/e-mail-parser-message-external.c:131
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:151
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
+#: ../src/em-format/e-mail-parser-message-external.c:149
+#, fuzzy, c-format
+#| msgid "Pointer to unknown external data (\"%s\" type)"
+msgid "Pointer to unknown external data (“%s” type)"
 msgstr ""
 "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:66
-#: ../em-format/e-mail-parser-multipart-signed.c:83
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:64
+#: ../src/em-format/e-mail-parser-multipart-signed.c:81
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME-viestin tulkitseminen epäonnistui, näytetään lähdekoodi."
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:82
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:79
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:101
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:98
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "PGP/MIME-viestin jäsennys epäonnistui: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:121
+#: ../src/em-format/e-mail-parser-multipart-signed.c:119
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
+#: ../src/em-format/e-mail-part-headers.c:47
+#: ../src/modules/mail/em-mailer-prefs.c:61
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:552
-#: ../e-util/e-dateedit.c:575 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:68
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:550
+#: ../src/e-util/e-dateedit.c:573 ../src/mail/message-list.etspec.h:7
+#: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
+#: ../src/em-format/e-mail-part-headers.c:53
+#: ../src/modules/mail/em-mailer-prefs.c:67
 msgid "Newsgroups"
 msgstr "Uutisryhmät"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../src/em-format/e-mail-part-headers.c:54
+#: ../src/modules/mail/em-mailer-prefs.c:68
+#: ../src/plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Kasvokuva"
 
-#: ../em-format/e-mail-part-secure-button.c:118 ../shell/shell.error.xml.h:28
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../src/em-format/e-mail-part-secure-button.c:116
+#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: ../em-format/e-mail-part-secure-button.c:133
+#: ../src/em-format/e-mail-part-secure-button.c:131
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voi näyttää"
 
-#: ../em-format/e-mail-part-utils.c:552
+#: ../src/em-format/e-mail-part-utils.c:551
 #, c-format
 msgid "%s attachment"
 msgstr "Liite: %s"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+#: ../src/e-util/ea-calendar-item.c:312 ../src/e-util/ea-calendar-item.c:321
 msgid "%d %B %Y"
 msgstr "%e. %Bta %Y"
 
-#: ../e-util/ea-calendar-item.c:326
+#: ../src/e-util/ea-calendar-item.c:324
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalenteri väliltä %s - %s"
 
-#: ../e-util/ea-calendar-item.c:363
+#: ../src/e-util/ea-calendar-item.c:361
 msgid "evolution calendar item"
 msgstr "evolutionin kalenterin kohta"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:258
+#: ../src/e-util/e-activity.c:256
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (peruttu)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:261
+#: ../src/e-util/e-activity.c:259
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (valmis)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:264
+#: ../src/e-util/e-activity.c:262
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (odottaa)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:268
+#: ../src/e-util/e-activity.c:266
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (perutaan)"
 
-#: ../e-util/e-activity.c:270
+#: ../src/e-util/e-activity.c:268
 #, c-format
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose
+#. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
-#: ../e-util/e-activity.c:275
-#: ../modules/calendar/e-cal-base-shell-content.c:144
+#: ../src/e-util/e-activity.c:273
+#: ../src/modules/calendar/e-cal-base-shell-content.c:142
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
-#: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1923
+#: ../src/e-util/e-activity-proxy.c:350
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
 msgid "Cancel"
 msgstr "Peru"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:124
+#: ../src/e-util/e-alert-bar.c:124
 msgid "Close this message (Escape)"
 msgstr "Sulje tämä viesti (Escape)"
 
-#: ../e-util/e-alert-sink.c:246
+#: ../src/e-util/e-alert-sink.c:244
 #, fuzzy
 #| msgid "Failed to mark messages as read."
 msgid "Failed to create a thread: "
@@ -11532,698 +12153,710 @@ msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1140
+#: ../src/e-util/e-attachment.c:1138
 msgid "Attached message"
 msgstr "Liitetty viesti"
 
-#: ../e-util/e-attachment.c:2042 ../e-util/e-attachment.c:3098
+#: ../src/e-util/e-attachment.c:2040 ../src/e-util/e-attachment.c:3093
 msgid "Operation was cancelled"
 msgstr "Toiminto peruttiin"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2226 ../e-util/e-attachment.c:2945
-#: ../e-util/e-attachment.c:3388 ../e-util/e-attachment-store.c:884
+#: ../src/e-util/e-attachment.c:2224 ../src/e-util/e-attachment.c:2940
+#: ../src/e-util/e-attachment.c:3383 ../src/e-util/e-attachment-store.c:886
 msgid "attachment.dat"
 msgstr "liite.dat"
 
-#: ../e-util/e-attachment.c:2307 ../e-util/e-attachment.c:3448
+#: ../src/e-util/e-attachment.c:2302 ../src/e-util/e-attachment.c:3443
 msgid "A load operation is already in progress"
 msgstr "Lataus on jo käynnissä"
 
-#: ../e-util/e-attachment.c:2315 ../e-util/e-attachment.c:3456
+#: ../src/e-util/e-attachment.c:2310 ../src/e-util/e-attachment.c:3451
 msgid "A save operation is already in progress"
 msgstr "Tallennus on jo käynnissä"
 
-#: ../e-util/e-attachment.c:2712
-#, c-format
-msgid "Could not open '%s'"
-msgstr "%s ei voitu avata"
+#: ../src/e-util/e-attachment.c:2707
+#, fuzzy, c-format
+#| msgid "Could not open %s:"
+msgid "Could not open “%s”"
+msgstr "Ei voitu avata %s:"
 
-#: ../e-util/e-attachment.c:2715
+#: ../src/e-util/e-attachment.c:2710
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../e-util/e-attachment.c:3465
+#: ../src/e-util/e-attachment.c:3460
 msgid "Attachment contents not loaded"
 msgstr "Liitteen sisältöä ei ladattu"
 
-#: ../e-util/e-attachment.c:3556
-#, c-format
-msgid "Could not save '%s'"
+#: ../src/e-util/e-attachment.c:3551
+#, fuzzy, c-format
+#| msgid "Could not save '%s'"
+msgid "Could not save “%s”"
 msgstr "Tiedostoa \"%s\" ei voitu tallentaa"
 
-#: ../e-util/e-attachment.c:3559
+#: ../src/e-util/e-attachment.c:3554
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Liitettä ei voitu tallentaa"
 
-#: ../e-util/e-attachment-dialog.c:317
+#: ../src/e-util/e-attachment-dialog.c:315
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:278
+#: ../src/e-util/e-attachment-dialog.c:337
+#: ../src/e-util/e-import-assistant.c:276
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
-#: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:510
-#: ../e-util/e-html-editor-link-dialog.c:243
+#: ../src/e-util/e-attachment-dialog.c:354
+#: ../src/e-util/e-html-editor-image-dialog.c:508
+#: ../src/e-util/e-html-editor-link-dialog.c:241
 msgid "_Description:"
 msgstr "K_uvaus:"
 
-#: ../e-util/e-attachment-dialog.c:374
+#: ../src/e-util/e-attachment-dialog.c:372
 msgid "MIME Type:"
 msgstr "MIME-tyyppi:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:696
+#: ../src/e-util/e-attachment-dialog.c:380
+#: ../src/e-util/e-attachment-store.c:694
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
-#: ../e-util/e-attachment-handler-image.c:98
+#: ../src/e-util/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "Ei voitu asettaa taustakuvaksi"
 
-#: ../e-util/e-attachment-handler-image.c:148
+#: ../src/e-util/e-attachment-handler-image.c:146
 msgid "Set as _Background"
 msgstr "Aseta _taustakuvaksi"
 
-#: ../e-util/e-attachment-icon-view.c:170
-#: ../e-util/e-attachment-tree-view.c:170
+#: ../src/e-util/e-attachment-icon-view.c:168
+#: ../src/e-util/e-attachment-tree-view.c:168
 msgid "Loading"
 msgstr "Ladataan"
 
-#: ../e-util/e-attachment-icon-view.c:182
-#: ../e-util/e-attachment-tree-view.c:182
+#: ../src/e-util/e-attachment-icon-view.c:180
+#: ../src/e-util/e-attachment-tree-view.c:180
 msgid "Saving"
 msgstr "Tallennetaan"
 
-#: ../e-util/e-attachment-paned.c:107
+#: ../src/e-util/e-attachment-paned.c:103
 msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:751
+#: ../src/e-util/e-attachment-paned.c:105
+#: ../src/e-util/e-attachment-paned.c:741
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../e-util/e-attachment-store.c:661
+#: ../src/e-util/e-attachment-store.c:659
 msgid "Add Attachment"
 msgstr "Lisää liite"
 
-#: ../e-util/e-attachment-store.c:668 ../e-util/e-attachment-store.c:670
+#: ../src/e-util/e-attachment-store.c:666
+#: ../src/e-util/e-attachment-store.c:668
 msgid "A_ttach"
 msgstr "Lii_tä"
 
-#: ../e-util/e-attachment-store.c:717
+#: ../src/e-util/e-attachment-store.c:715
 msgid "Archive selected directories using this format:"
 msgstr ""
 
-#: ../e-util/e-attachment-store.c:821
+#: ../src/e-util/e-attachment-store.c:823
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Tallenna liite"
 msgstr[1] "Tallenna liitteet"
 
-#: ../e-util/e-attachment-store.c:848
+#: ../src/e-util/e-attachment-store.c:850
 msgid "Do _not extract files from the attachment"
 msgstr "_Älä pura tiedostoja liitteestä"
 
-#: ../e-util/e-attachment-store.c:853
+#: ../src/e-util/e-attachment-store.c:855
 msgid "Save extracted files _only"
 msgstr ""
 
-#: ../e-util/e-attachment-store.c:858
+#: ../src/e-util/e-attachment-store.c:860
 msgid "Save extracted files and the original _archive"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:310
+#: ../src/e-util/e-attachment-view.c:308
 msgid "Open With Other Application..."
 msgstr "Avaa tois_ella sovelluksella..."
 
-#: ../e-util/e-attachment-view.c:317
+#: ../src/e-util/e-attachment-view.c:315
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../e-util/e-attachment-view.c:324
+#: ../src/e-util/e-attachment-view.c:322
 msgid "Sa_ve As"
 msgstr "_Tallenna nimellä"
 
-#: ../e-util/e-attachment-view.c:333
-#: ../plugins/save-calendar/save-calendar.c:349
-#: ../plugins/save-calendar/save-calendar.c:380
-#: ../plugins/save-calendar/save-calendar.c:411
+#: ../src/e-util/e-attachment-view.c:331
+#: ../src/plugins/save-calendar/save-calendar.c:351
+#: ../src/plugins/save-calendar/save-calendar.c:382
+#: ../src/plugins/save-calendar/save-calendar.c:413
 msgid "Save _As"
 msgstr "Tallenna _nimellä"
 
-#: ../e-util/e-attachment-view.c:343
+#: ../src/e-util/e-attachment-view.c:341
 msgid "A_dd Attachment..."
 msgstr "_Lisää liite..."
 
-#: ../e-util/e-attachment-view.c:350
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
-#: ../modules/calendar/e-cal-shell-view-actions.c:1278
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
-#: ../modules/calendar/e-task-shell-view-actions.c:733
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
-#: ../modules/mail/e-mail-shell-view-actions.c:1788
+#: ../src/e-util/e-attachment-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1095
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
+#: ../src/modules/calendar/e-task-shell-view-actions.c:731
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
-#: ../e-util/e-attachment-view.c:660
+#: ../src/e-util/e-attachment-view.c:658
 #, c-format
-msgid "Open With \"%s\""
-msgstr "Avaa sovelluksella \"%s\""
+#| msgid "Open With \"%s\""
+msgid "Open With “%s”"
+msgstr "Avaa sovelluksella “%s”"
 
-#: ../e-util/e-attachment-view.c:663
+#: ../src/e-util/e-attachment-view.c:661
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Avaa tämä liite ohjelmalla %s"
 
-#: ../e-util/e-book-source-config.c:97
+#: ../src/e-util/e-book-source-config.c:98
 msgid "Mark as default address book"
 msgstr "Merkitse oletusosoitekirjaksi"
 
-#: ../e-util/e-book-source-config.c:102
-#, fuzzy
+#: ../src/e-util/e-book-source-config.c:103
 #| msgid "A_utocomplete with this address book"
 msgid "Autocomplete with this address book"
-msgstr "_Täydennä automaattisesti tästä osoitekirjasta"
+msgstr "Täydennä automaattisesti tästä osoitekirjasta"
 
-#: ../e-util/e-book-source-config.c:276
-#, fuzzy
+#: ../src/e-util/e-book-source-config.c:277
 #| msgid "Copy _book content locally for offline operation"
 msgid "Copy book content locally for offline operation"
-msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
+msgstr "Kopioi kirjan sisältö paikallisesti yhteydettömään käyttöön"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../e-util/e-buffer-tagger.c:412
+#: ../src/e-util/e-buffer-tagger.c:410
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-napsauta avataksesi linkin"
 
-#: ../e-util/e-calendar.c:272
+#: ../src/e-util/e-calendar.c:272
 msgid "Previous month"
 msgstr "Edellinen kuukausi"
 
-#: ../e-util/e-calendar.c:291
+#: ../src/e-util/e-calendar.c:291
 msgid "Next month"
 msgstr "Seuraava kuukausi"
 
-#: ../e-util/e-calendar.c:311
+#: ../src/e-util/e-calendar.c:311
 msgid "Previous year"
 msgstr "Edellinen vuosi"
 
-#: ../e-util/e-calendar.c:330
+#: ../src/e-util/e-calendar.c:330
 msgid "Next year"
 msgstr "Seuraava vuosi"
 
-#: ../e-util/e-calendar.c:354
+#: ../src/e-util/e-calendar.c:354
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
+#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2218
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1342
+#: ../src/e-util/e-calendar-item.c:1340
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1379
+#: ../src/e-util/e-calendar-item.c:1377
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../e-util/e-cal-source-config.c:169
+#: ../src/e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Merkitse oletuskalenteriksi"
 
-#: ../e-util/e-cal-source-config.c:172
+#: ../src/e-util/e-cal-source-config.c:172
 msgid "Mark as default task list"
 msgstr "Merkitse oletustehtävälistaksi"
 
-#: ../e-util/e-cal-source-config.c:175
+#: ../src/e-util/e-cal-source-config.c:175
 msgid "Mark as default memo list"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../e-util/e-cal-source-config.c:200
+#: ../src/e-util/e-cal-source-config.c:200
 msgid "Color:"
 msgstr "Väri:"
 
-#: ../e-util/e-cal-source-config.c:428
+#: ../src/e-util/e-cal-source-config.c:428
 #, 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"
 
-#: ../e-util/e-cal-source-config.c:432
+#: ../src/e-util/e-cal-source-config.c:432
 #, 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"
 
-#: ../e-util/e-cal-source-config.c:436
+#: ../src/e-util/e-cal-source-config.c:436
 #, fuzzy
 #| msgid "Cop_y memo list contents locally for offline operation"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "_Kopioi muistilappujen sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../e-util/e-categories-editor.c:223
+#: ../src/e-util/e-categories-editor.c:224
 msgid "Currently _used categories:"
 msgstr "Käytössä _olevat luokat:"
 
-#: ../e-util/e-categories-editor.c:234
+#: ../src/e-util/e-categories-editor.c:235
 msgid "_Available Categories:"
 msgstr "_Käytettävissä olevat luokat:"
 
-#: ../e-util/e-categories-editor.c:274
+#: ../src/e-util/e-categories-editor.c:275
 msgctxt "category"
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../e-util/e-categories-editor.c:278
+#: ../src/e-util/e-categories-editor.c:279
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../e-util/e-categories-editor.c:282
+#: ../src/e-util/e-categories-editor.c:283
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../e-util/e-categories-selector.c:322
+#: ../src/e-util/e-categories-selector.c:323
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../e-util/e-category-completion.c:307
+#: ../src/e-util/e-category-completion.c:304
 #, c-format
-msgid "Create category \"%s\""
-msgstr "Luo luokka \"%s\""
+#| msgid "Create category \"%s\""
+msgid "Create category “%s”"
+msgstr "Luo luokka “%s”"
 
-#: ../e-util/e-category-editor.c:136
+#: ../src/e-util/e-category-editor.c:135
 msgid "Category Icon"
 msgstr "Luokan kuvake"
 
-#: ../e-util/e-category-editor.c:140
+#: ../src/e-util/e-category-editor.c:139
 msgid "_No Image"
 msgstr "_Ei kuvaa"
 
-#: ../e-util/e-category-editor.c:173
+#: ../src/e-util/e-category-editor.c:172
 msgid "Category _Name"
 msgstr "Luokan _nimi"
 
-#: ../e-util/e-category-editor.c:185
+#: ../src/e-util/e-category-editor.c:184
 msgid "Category _Icon"
 msgstr "Luokan _kuvake"
 
-#: ../e-util/e-category-editor.c:211
+#: ../src/e-util/e-category-editor.c:210
 msgid "Category Properties"
 msgstr "Luokan ominaisuudet"
 
-#: ../e-util/e-category-editor.c:272
-#, c-format
+#: ../src/e-util/e-category-editor.c:271
+#, fuzzy, c-format
+#| msgid ""
+#| "There is already a category '%s' in the configuration. Please use another "
+#| "name"
 msgid ""
-"There is already a category '%s' in the configuration. Please use another "
+"There is already a category “%s” in the configuration. Please use another "
 "name"
 msgstr "Asetuksista löytyy jo luokka nimeltä \"%s\". Valitse toinen nimi"
 
-#: ../e-util/e-cell-combo.c:185
+#: ../src/e-util/e-cell-combo.c:183
 msgid "popup list"
 msgstr "ponnahduslista"
 
-#: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2054
+#: ../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:2066
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-date-edit.c:303
+#: ../src/e-util/e-cell-date-edit.c:320
 msgid "Now"
 msgstr "Nyt"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
-#: ../modules/itip-formatter/itip-view.c:255
+#: ../src/e-util/e-cell-date-edit.c:328 ../src/e-util/e-datetime-format.c:206
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1791
+#: ../src/modules/itip-formatter/itip-view.c:253
 msgid "Today"
 msgstr "Tänään"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:321
+#: ../src/e-util/e-cell-date-edit.c:338
 msgctxt "table-date"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../e-util/e-cell-date-edit.c:329 ../mail/e-mail-label-dialog.c:200
+#: ../src/e-util/e-cell-date-edit.c:346 ../src/mail/e-mail-label-dialog.c:198
 msgid "OK"
 msgstr "OK"
 
-#: ../e-util/e-cell-date-edit.c:878
+#: ../src/e-util/e-cell-date-edit.c:897
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
 
-#: ../e-util/e-cell-percent.c:81
+#: ../src/e-util/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosenttiarvon tulee olla välillä 0 - 100"
 
-#: ../e-util/e-charset.c:52
+#: ../src/e-util/e-charset.c:50
 msgid "Arabic"
 msgstr "Arabia"
 
-#: ../e-util/e-charset.c:53
+#: ../src/e-util/e-charset.c:51
 msgid "Baltic"
 msgstr "Balttilainen"
 
-#: ../e-util/e-charset.c:54
+#: ../src/e-util/e-charset.c:52
 msgid "Central European"
 msgstr "Keskieurooppalainen"
 
-#: ../e-util/e-charset.c:55
+#: ../src/e-util/e-charset.c:53
 msgid "Chinese"
 msgstr "Kiinalainen"
 
-#: ../e-util/e-charset.c:56
+#: ../src/e-util/e-charset.c:54
 msgid "Cyrillic"
 msgstr "Kyrillinen"
 
-#: ../e-util/e-charset.c:57
+#: ../src/e-util/e-charset.c:55
 msgid "Greek"
 msgstr "Kreikkalainen"
 
-#: ../e-util/e-charset.c:58
+#: ../src/e-util/e-charset.c:56
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: ../e-util/e-charset.c:59
+#: ../src/e-util/e-charset.c:57
 msgid "Japanese"
 msgstr "Japanilainen"
 
-#: ../e-util/e-charset.c:60
+#: ../src/e-util/e-charset.c:58
 msgid "Korean"
 msgstr "Korealainen"
 
-#: ../e-util/e-charset.c:61
+#: ../src/e-util/e-charset.c:59
 msgid "Thai"
 msgstr "Thai"
 
-#: ../e-util/e-charset.c:62
+#: ../src/e-util/e-charset.c:60
 msgid "Turkish"
 msgstr "Turkkilainen"
 
-#: ../e-util/e-charset.c:63
+#: ../src/e-util/e-charset.c:61
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../e-util/e-charset.c:64
+#: ../src/e-util/e-charset.c:62
 msgid "Western European"
 msgstr "Länsieurooppalainen"
 
-#: ../e-util/e-charset.c:65
+#: ../src/e-util/e-charset.c:63
 msgid "Western European, New"
 msgstr "Länsieurooppalainen, uusi"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
+#: ../src/e-util/e-charset.c:82 ../src/e-util/e-charset.c:84
+#: ../src/e-util/e-charset.c:86
 msgid "Traditional"
 msgstr "Perinteinen"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
-#: ../e-util/e-charset.c:96
+#: ../src/e-util/e-charset.c:88 ../src/e-util/e-charset.c:90
+#: ../src/e-util/e-charset.c:92 ../src/e-util/e-charset.c:94
 msgid "Simplified"
 msgstr "Yksinkertaistettu"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:100
+#: ../src/e-util/e-charset.c:98
 msgid "Ukrainian"
 msgstr "Ukrainalainen"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:104
+#: ../src/e-util/e-charset.c:102
 msgid "Visual"
 msgstr "Visuaali"
 
-#: ../e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-charset-combo-box.c:97
 msgid "Character Encoding"
 msgstr "Merkistön koodaus"
 
-#: ../e-util/e-charset-combo-box.c:119
+#: ../src/e-util/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "Syötä käytettävä merkistö"
 
-#: ../e-util/e-charset-combo-box.c:365
+#: ../src/e-util/e-charset-combo-box.c:363
 msgid "Other..."
 msgstr "Muut..."
 
-#: ../e-util/e-client-cache.c:1148 ../e-util/e-client-cache.c:1279
+#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
 #, c-format
-msgid "Cannot create a client object from extension name '%s'"
+msgid "Cannot create a client object from extension name “%s”"
 msgstr ""
 
-#: ../e-util/e-color-chooser-widget.c:124
+#: ../src/e-util/e-color-chooser-widget.c:122
 msgid "Choose custom color"
 msgstr "Käytä omavalintainen väri"
 
-#: ../e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:79
 msgid "black"
 msgstr "musta"
 
-#: ../e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:80
 msgid "light brown"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:81
 msgid "brown gold"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:84
+#: ../src/e-util/e-color-combo.c:82
 msgid "dark green #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:83
 msgid "navy"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:84
 msgid "dark blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:87
+#: ../src/e-util/e-color-combo.c:85
 msgid "purple #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:88
+#: ../src/e-util/e-color-combo.c:86
 msgid "very dark gray"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:88
 #, fuzzy
 #| msgid "Mark as _Unread"
 msgid "dark red"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:89
 msgid "red-orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:90
 msgid "gold"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:93
+#: ../src/e-util/e-color-combo.c:91
 msgid "dark green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:92
 msgid "dull blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:93
 msgid "blue"
 msgstr "sininen"
 
-#: ../e-util/e-color-combo.c:96
+#: ../src/e-util/e-color-combo.c:94
 msgid "dull purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:95
 msgid "dark grey"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:97
 msgid "red"
 msgstr "punainen"
 
-#: ../e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:98
 msgid "orange"
 msgstr "oranssi"
 
-#: ../e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:99
 msgid "lime"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:102
+#: ../src/e-util/e-color-combo.c:100
 msgid "dull green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:101
 msgid "dull blue #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:102
 msgid "sky blue #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:105
+#: ../src/e-util/e-color-combo.c:103
 msgid "purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:104
 msgid "gray"
 msgstr "harmaa"
 
-#: ../e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:106
 #, fuzzy
 #| msgid "Image"
 msgid "magenta"
 msgstr "Kuva"
 
-#: ../e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:107
 msgid "bright orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:108
 msgid "yellow"
 msgstr "keltainen"
 
-#: ../e-util/e-color-combo.c:111
+#: ../src/e-util/e-color-combo.c:109
 msgid "green"
 msgstr "vihreä"
 
-#: ../e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:110
 msgid "cyan"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:111
 msgid "bright blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:114
+#: ../src/e-util/e-color-combo.c:112
 #, fuzzy
 #| msgid "_Required people"
 msgid "red purple"
 msgstr "_Vaaditut henkilöt"
 
-#: ../e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:113
 msgid "light grey"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:115
 msgid "pink"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:116
 msgid "light orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:117
 msgid "light yellow"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:120
+#: ../src/e-util/e-color-combo.c:118
 msgid "light green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:121
+#: ../src/e-util/e-color-combo.c:119
 msgid "light cyan"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:122
+#: ../src/e-util/e-color-combo.c:120
 msgid "light blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:123
+#: ../src/e-util/e-color-combo.c:121
 msgid "light purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:124
+#: ../src/e-util/e-color-combo.c:122
 msgid "white"
 msgstr "valkoinen"
 
-#: ../e-util/e-color-combo.c:644 ../mail/e-mail-account-tree-view.c:134
-#: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4063
-#: ../mail/mail-config.ui.h:73
+#: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/mail/e-mail-config-security-page.c:406
+#: ../src/mail/e-mail-config-security-page.c:570
+#: ../src/mail/e-mail-reader.c:4049 ../src/mail/mail-config.ui.h:75
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../e-util/e-dateedit.c:526
+#: ../src/e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "Päiväys ja aika"
 
-#: ../e-util/e-dateedit.c:551
+#: ../src/e-util/e-dateedit.c:549
 msgid "Text entry to input date"
 msgstr "Tekstikenttä päiväyksen syöttöön"
 
-#: ../e-util/e-dateedit.c:574
+#: ../src/e-util/e-dateedit.c:572
 msgid "Click this button to show a calendar"
 msgstr "Paina tästä näyttääksesi kalenterin"
 
-#: ../e-util/e-dateedit.c:628
+#: ../src/e-util/e-dateedit.c:626
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../src/e-util/e-dateedit.c:627
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Aika"
 
-#: ../e-util/e-dateedit.c:703
+#: ../src/e-util/e-dateedit.c:701
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../e-util/e-dateedit.c:710
+#: ../src/e-util/e-dateedit.c:708
 msgid "_Today"
 msgstr "_Tänään"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:719
+#: ../src/e-util/e-dateedit.c:717
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1841 ../e-util/e-dateedit.c:2089
+#: ../src/e-util/e-dateedit.c:1839 ../src/e-util/e-dateedit.c:2087
 msgctxt "date"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../e-util/e-dateedit.c:1981
+#: ../src/e-util/e-dateedit.c:1979
 msgid "Invalid Date Value"
 msgstr "Virheellinen päivämäärä"
 
-#: ../e-util/e-dateedit.c:2026
+#: ../src/e-util/e-dateedit.c:2024
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:283
+#: ../src/e-util/e-datetime-format.c:217
+#: ../src/modules/itip-formatter/itip-view.c:281
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../e-util/e-datetime-format.c:221
+#: ../src/e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "Eilen"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
+#: ../src/e-util/e-datetime-format.c:227
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Seuraava ma"
@@ -12231,7 +12864,7 @@ msgstr "Seuraava ma"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
+#: ../src/e-util/e-datetime-format.c:233
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Seuraava ti"
@@ -12239,7 +12872,7 @@ msgstr "Seuraava ti"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
+#: ../src/e-util/e-datetime-format.c:239
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Seuraava ke"
@@ -12247,7 +12880,7 @@ msgstr "Seuraava ke"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
+#: ../src/e-util/e-datetime-format.c:245
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Seuraava to"
@@ -12255,7 +12888,7 @@ msgstr "Seuraava to"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
+#: ../src/e-util/e-datetime-format.c:251
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Seuraava pe"
@@ -12263,7 +12896,7 @@ msgstr "Seuraava pe"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:259
+#: ../src/e-util/e-datetime-format.c:257
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Seuraava la"
@@ -12271,287 +12904,326 @@ msgstr "Seuraava la"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:265
+#: ../src/e-util/e-datetime-format.c:263
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Seuraava su"
 
-#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
-#: ../e-util/e-datetime-format.c:370
+#: ../src/e-util/e-datetime-format.c:349 ../src/e-util/e-datetime-format.c:359
+#: ../src/e-util/e-datetime-format.c:368
 msgid "Use locale default"
 msgstr "Käytä oletusaikavyöhykettä"
 
-#: ../e-util/e-datetime-format.c:575
+#: ../src/e-util/e-datetime-format.c:573
 msgid "Format:"
 msgstr "Muoto:"
 
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:181
+#, fuzzy
+#| msgid "days"
+msgctxt "time-unit"
+msgid "days"
+msgstr "päivä"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
+#: ../src/e-util/e-dialog-widgets.c:183
+#, fuzzy
+#| msgid "weeks"
+msgctxt "time-unit"
+msgid "weeks"
+msgstr "viikkoa"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
+#: ../src/e-util/e-dialog-widgets.c:185
+#, fuzzy
+#| msgid "months"
+msgctxt "time-unit"
+msgid "months"
+msgstr "kuukautta"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
+#: ../src/e-util/e-dialog-widgets.c:187
+#, fuzzy
+#| msgid "years"
+msgctxt "time-unit"
+msgid "years"
+msgstr "vuotta"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:245
+msgid "Do not synchronize locally mails older than"
+msgstr ""
+
 #. Translators: :-)
-#: ../e-util/e-emoticon-chooser.c:40
+#: ../src/e-util/e-emoticon-chooser.c:38
 msgid "_Smile"
 msgstr ""
 
 #. Translators: :-(
-#: ../e-util/e-emoticon-chooser.c:42
+#: ../src/e-util/e-emoticon-chooser.c:40
 msgid "S_ad"
-msgstr ""
+msgstr "Su_rullinen"
 
 #. Translators: ;-)
-#: ../e-util/e-emoticon-chooser.c:44
+#: ../src/e-util/e-emoticon-chooser.c:42
 #, fuzzy
 #| msgid "_Window"
 msgid "_Wink"
 msgstr "_Ikkuna"
 
 #. Translators: :-P
-#: ../e-util/e-emoticon-chooser.c:46
+#: ../src/e-util/e-emoticon-chooser.c:44
 msgid "Ton_gue"
 msgstr ""
 
 #. Translators: :-))
-#: ../e-util/e-emoticon-chooser.c:48
+#: ../src/e-util/e-emoticon-chooser.c:46
 msgid "Laug_h"
 msgstr ""
 
 #. Translators: :-|
-#: ../e-util/e-emoticon-chooser.c:50
+#: ../src/e-util/e-emoticon-chooser.c:48
 #, fuzzy
 #| msgid "_Plain text"
 msgid "_Plain"
 msgstr "_Raakateksti"
 
 #. Translators: :-!
-#: ../e-util/e-emoticon-chooser.c:52
+#: ../src/e-util/e-emoticon-chooser.c:50
 msgid "Smi_rk"
 msgstr ""
 
 #. Translators: :"-)
-#: ../e-util/e-emoticon-chooser.c:54
+#: ../src/e-util/e-emoticon-chooser.c:52
 msgid "_Embarrassed"
 msgstr ""
 
 #. Translators: :-D
-#: ../e-util/e-emoticon-chooser.c:56
+#: ../src/e-util/e-emoticon-chooser.c:54
 msgid "_Big Smile"
 msgstr ""
 
 #. Translators: :-/
-#: ../e-util/e-emoticon-chooser.c:58
+#: ../src/e-util/e-emoticon-chooser.c:56
 msgid "Uncer_tain"
-msgstr ""
+msgstr "_Epävarma"
 
 #. Translators: :-O
-#: ../e-util/e-emoticon-chooser.c:60
+#: ../src/e-util/e-emoticon-chooser.c:58
 msgid "S_urprise"
 msgstr ""
 
 #. Translators: :-S
-#: ../e-util/e-emoticon-chooser.c:62
+#: ../src/e-util/e-emoticon-chooser.c:60
 msgid "W_orried"
-msgstr ""
+msgstr "_Huolestunut"
 
 #. Translators: :-*
-#: ../e-util/e-emoticon-chooser.c:64
+#: ../src/e-util/e-emoticon-chooser.c:62
 msgid "_Kiss"
-msgstr ""
+msgstr "_Suukko"
 
 #. Translators: X-(
-#: ../e-util/e-emoticon-chooser.c:66
+#: ../src/e-util/e-emoticon-chooser.c:64
 msgid "A_ngry"
 msgstr ""
 
 #. Translators: B-)
-#: ../e-util/e-emoticon-chooser.c:68
+#: ../src/e-util/e-emoticon-chooser.c:66
 msgid "_Cool"
 msgstr ""
 
 #. Translators: O:-)
-#: ../e-util/e-emoticon-chooser.c:70
+#: ../src/e-util/e-emoticon-chooser.c:68
 msgid "Ange_l"
 msgstr ""
 
 #. Translators: :'(
-#: ../e-util/e-emoticon-chooser.c:72
+#: ../src/e-util/e-emoticon-chooser.c:70
 msgid "Cr_ying"
-msgstr ""
+msgstr "Itke_vä"
 
 #. Translators: :-Q
-#: ../e-util/e-emoticon-chooser.c:74
+#: ../src/e-util/e-emoticon-chooser.c:72
 msgid "S_ick"
-msgstr ""
+msgstr "S_airas"
 
 #. Translators: |-)
-#: ../e-util/e-emoticon-chooser.c:76
+#: ../src/e-util/e-emoticon-chooser.c:74
 msgid "Tire_d"
-msgstr ""
+msgstr "Väs_ynyt"
 
 #. Translators: >:-)
-#: ../e-util/e-emoticon-chooser.c:78
+#: ../src/e-util/e-emoticon-chooser.c:76
 msgid "De_vilish"
 msgstr ""
 
 #. Translators: :-(|)
-#: ../e-util/e-emoticon-chooser.c:80
+#: ../src/e-util/e-emoticon-chooser.c:78
 #, fuzzy
 #| msgid "_Mon"
 msgid "_Monkey"
 msgstr "_Ma"
 
-#: ../e-util/e-file-utils.c:120
+#: ../src/e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(Tuntematon tiedostonimi)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:124
-#, c-format
-msgid "Writing \"%s\""
+#: ../src/e-util/e-file-utils.c:125
+#, fuzzy, c-format
+#| msgid "Writing \"%s\""
+msgid "Writing “%s”"
 msgstr "Kirjoitetaan tiedostoa ”%s”"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:129
-#, c-format
-msgid "Writing \"%s\" to %s"
+#: ../src/e-util/e-file-utils.c:130
+#, fuzzy, c-format
+#| msgid "Writing \"%s\" to %s"
+msgid "Writing “%s” to %s"
 msgstr "Kirjoitetaan tiedostoa ”%s” palvelimelle ”%s”"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../e-util/e-filter-datespec.c:66
+#: ../src/e-util/e-filter-datespec.c:64
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../e-util/e-filter-datespec.c:67
+#: ../src/e-util/e-filter-datespec.c:65
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekunti tulevaisuudessa"
 msgstr[1] "%d sekuntia tulevaisuudessa"
 
-#: ../e-util/e-filter-datespec.c:68
+#: ../src/e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../e-util/e-filter-datespec.c:69
+#: ../src/e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "yhden minuutin päässä"
 msgstr[1] "%d minuutin päässä"
 
-#: ../e-util/e-filter-datespec.c:70
+#: ../src/e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../e-util/e-filter-datespec.c:71
+#: ../src/e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 tunti tulevaisuudessa"
 msgstr[1] "%d tuntia tulevaisuudessa"
 
-#: ../e-util/e-filter-datespec.c:72
+#: ../src/e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../e-util/e-filter-datespec.c:73
+#: ../src/e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "yhden päivän päässä"
 msgstr[1] "%d päivän päässä"
 
-#: ../e-util/e-filter-datespec.c:74
+#: ../src/e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../e-util/e-filter-datespec.c:75
+#: ../src/e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 viikko tulevaisuudessa"
 msgstr[1] "%d viikkoa tulevaisuudessa"
 
-#: ../e-util/e-filter-datespec.c:76
+#: ../src/e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../e-util/e-filter-datespec.c:77
+#: ../src/e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "yhden kuukauden päässä"
 msgstr[1] "%d kuukauden päässä"
 
-#: ../e-util/e-filter-datespec.c:78
+#: ../src/e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 vuosi sitten"
 msgstr[1] "%d vuotta sitten"
 
-#: ../e-util/e-filter-datespec.c:79
+#: ../src/e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "yhden vuoden päässä"
 msgstr[1] "%d vuoden päässä"
 
-#: ../e-util/e-filter-datespec.c:129
+#: ../src/e-util/e-filter-datespec.c:127
 msgid "<click here to select a date>"
 msgstr "<napsauta valitaksesi päiväys>"
 
-#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
-#: ../e-util/e-filter-datespec.c:154
+#: ../src/e-util/e-filter-datespec.c:130 ../src/e-util/e-filter-datespec.c:141
+#: ../src/e-util/e-filter-datespec.c:152
 msgid "now"
 msgstr "nyt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../e-util/e-filter-datespec.c:139
+#: ../src/e-util/e-filter-datespec.c:137
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../e-util/e-filter-datespec.c:288
+#: ../src/e-util/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: ../e-util/e-filter-file.c:186
+#: ../src/e-util/e-filter-file.c:184
 msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../e-util/e-filter-rule.c:765
+#: ../src/e-util/e-filter-rule.c:763
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../e-util/e-filter-rule.c:815
+#: ../src/e-util/e-filter-rule.c:813
 msgid "all the following conditions"
 msgstr "kaikkia seuraavia ehtoja"
 
-#: ../e-util/e-filter-rule.c:816
+#: ../src/e-util/e-filter-rule.c:814
 msgid "any of the following conditions"
 msgstr "mitä tahansa seuraavista ehdoista"
 
-#: ../e-util/e-filter-rule.c:822
+#: ../src/e-util/e-filter-rule.c:820
 msgid "_Find items which match:"
 msgstr "_Etsi kohteet, jotka vastaavat:"
 
-#: ../e-util/e-filter-rule.c:845
+#: ../src/e-util/e-filter-rule.c:843
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
@@ -12559,1140 +13231,1123 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:860 ../e-util/e-html-editor-page-dialog.c:61
-#: ../e-util/e-mail-identity-combo-box.c:479
-#: ../e-util/e-mail-signature-combo-box.c:367
-#: ../libemail-engine/camel-null-store.c:27
-#: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+#: ../src/e-util/e-filter-rule.c:858
+#: ../src/e-util/e-html-editor-page-dialog.c:59
+#: ../src/e-util/e-mail-identity-combo-box.c:597
+#: ../src/e-util/e-mail-signature-combo-box.c:422
+#: ../src/libemail-engine/camel-null-store.c:28
+#: ../src/mail/e-mail-config-summary-page.c:140
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../e-util/e-filter-rule.c:861
+#: ../src/e-util/e-filter-rule.c:859
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../e-util/e-filter-rule.c:862 ../e-util/e-send-options.ui.h:19
+#: ../src/e-util/e-filter-rule.c:860 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../e-util/e-filter-rule.c:863
+#: ../src/e-util/e-filter-rule.c:861
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../e-util/e-filter-rule.c:864
+#: ../src/e-util/e-filter-rule.c:862
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../e-util/e-filter-rule.c:867
+#: ../src/e-util/e-filter-rule.c:865
 #, fuzzy
 msgid "I_nclude threads:"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../e-util/e-filter-rule.c:946
+#: ../src/e-util/e-filter-rule.c:944
 msgid "A_dd Condition"
 msgstr "Lisää _ehto"
 
-#: ../e-util/e-filter-rule.c:1260 ../e-util/filter.ui.h:1
-#: ../mail/em-utils.c:165
+#: ../src/e-util/e-filter-rule.c:1258 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../e-util/e-filter-rule.c:1260 ../mail/em-utils.c:166
+#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Lähtevät"
 
-#: ../e-util/e-html-editor-actions.c:82
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:80
 #| msgid "Failed to open folder."
 msgid "Failed to insert HTML file."
-msgstr "Kansion avaus epäonnistui."
+msgstr "HTML-tiedoston sisällyttäminen epäonnistui."
 
-#: ../e-util/e-html-editor-actions.c:120
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:118
 #| msgid "Failed to import certificate"
 msgid "Failed to insert text file."
-msgstr "Varmenteen tuonti epäonnistui"
+msgstr "Tekstitiedoston sisällyttäminen epäonnistui."
 
-#: ../e-util/e-html-editor-actions.c:321
+#: ../src/e-util/e-html-editor-actions.c:319
 msgid "Insert HTML File"
 msgstr "Syötä HTML-tiedosto"
 
-#: ../e-util/e-html-editor-actions.c:327
+#: ../src/e-util/e-html-editor-actions.c:325
 msgid "HTML file"
 msgstr "HTML-tiedosto"
 
-#: ../e-util/e-html-editor-actions.c:354
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:355
 #| msgid "Inline Image"
 msgctxt "dialog-title"
 msgid "Insert Image"
-msgstr "Sisäkkäiset kuvat"
+msgstr "Sisällytä kuva"
 
-#: ../e-util/e-html-editor-actions.c:412
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:413
 #| msgid "Increase the text size"
 msgid "Insert text file"
-msgstr "Kasvata tekstin kokoa"
+msgstr "Sisällytä tekstitiedosto"
 
-#: ../e-util/e-html-editor-actions.c:418
+#: ../src/e-util/e-html-editor-actions.c:419
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
-#: ../e-util/e-html-editor-actions.c:866
+#: ../src/e-util/e-html-editor-actions.c:880
 msgid "Copy selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
-#: ../e-util/e-html-editor-actions.c:873
+#: ../src/e-util/e-html-editor-actions.c:887
 msgid "Cut selected text to the clipboard"
 msgstr "Leikkaa valittu teksti leikepöydälle"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:880
+#: ../src/e-util/e-html-editor-actions.c:894
 msgid "Paste text from the clipboard"
 msgstr "Liitä teksti leikepöydältä"
 
-#: ../e-util/e-html-editor-actions.c:887
+#: ../src/e-util/e-html-editor-actions.c:901
 msgid "Redo the last undone action"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:901
+#: ../src/e-util/e-html-editor-actions.c:915
 msgid "Undo the last action"
 msgstr "Kumoa viimeisin toiminto"
 
-#: ../e-util/e-html-editor-actions.c:922
+#: ../src/e-util/e-html-editor-actions.c:936
 msgid "For_mat"
 msgstr "_Muotoilu"
 
-#: ../e-util/e-html-editor-actions.c:929
-#| msgid "Tool_bar Style"
+#: ../src/e-util/e-html-editor-actions.c:943
 msgid "_Paragraph Style"
 msgstr "_Kappaleen tyyli"
 
-#: ../e-util/e-html-editor-actions.c:943
-#: ../e-util/e-html-editor-image-dialog.c:587
-#| msgid "A_lignment"
+#: ../src/e-util/e-html-editor-actions.c:957
+#: ../src/e-util/e-html-editor-image-dialog.c:585
 msgid "_Alignment"
 msgstr "_Tasaus"
 
-#: ../e-util/e-html-editor-actions.c:950
+#: ../src/e-util/e-html-editor-actions.c:964
 msgid "Current _Languages"
 msgstr "_Nykyiset kielet"
 
-#: ../e-util/e-html-editor-actions.c:967
+#: ../src/e-util/e-html-editor-actions.c:981
 msgid "_Increase Indent"
 msgstr "_Lisää sisennystä"
 
-#: ../e-util/e-html-editor-actions.c:969
+#: ../src/e-util/e-html-editor-actions.c:983
 msgid "Increase Indent"
 msgstr "Lisää sisennystä"
 
-#: ../e-util/e-html-editor-actions.c:974
+#: ../src/e-util/e-html-editor-actions.c:988
 msgid "_HTML File..."
 msgstr "_HTML-tiedosto..."
 
-#: ../e-util/e-html-editor-actions.c:981
+#: ../src/e-util/e-html-editor-actions.c:995
 msgid "Te_xt File..."
 msgstr "Te_kstitiedosto..."
 
-#: ../e-util/e-html-editor-actions.c:988
+#: ../src/e-util/e-html-editor-actions.c:1002
 msgid "Paste _Quotation"
 msgstr "_Liitä lainaus"
 
-#: ../e-util/e-html-editor-actions.c:995
+#: ../src/e-util/e-html-editor-actions.c:1009
 msgid "_Find..."
 msgstr "_Etsi..."
 
-#: ../e-util/e-html-editor-actions.c:997
+#: ../src/e-util/e-html-editor-actions.c:1011
 msgid "Search for text"
 msgstr "Etsi tekstiä"
 
-#: ../e-util/e-html-editor-actions.c:1002
+#: ../src/e-util/e-html-editor-actions.c:1016
 msgid "Find A_gain"
 msgstr "Etsi _uudelleen"
 
-#: ../e-util/e-html-editor-actions.c:1009
+#: ../src/e-util/e-html-editor-actions.c:1023
 msgid "Re_place..."
 msgstr "_Korvaa..."
 
-#: ../e-util/e-html-editor-actions.c:1011
+#: ../src/e-util/e-html-editor-actions.c:1025
 msgid "Search for and replace text"
 msgstr "Etsi ja korvaa tekstiä"
 
-#: ../e-util/e-html-editor-actions.c:1016
-#| msgid "Canceling..."
+#: ../src/e-util/e-html-editor-actions.c:1030
 msgid "Check _Spelling..."
 msgstr "_Oikolue..."
 
-#: ../e-util/e-html-editor-actions.c:1023
+#: ../src/e-util/e-html-editor-actions.c:1037
 msgid "_Decrease Indent"
 msgstr "_Vähennä sisennystä"
 
-#: ../e-util/e-html-editor-actions.c:1025
+#: ../src/e-util/e-html-editor-actions.c:1039
 msgid "Decrease Indent"
 msgstr "Vähennä sisennystä"
 
-#: ../e-util/e-html-editor-actions.c:1030
+#: ../src/e-util/e-html-editor-actions.c:1044
 msgid "_Wrap Lines"
 msgstr ""
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1040
-#: ../e-util/e-html-editor-paragraph-dialog.c:110
+#: ../src/e-util/e-html-editor-actions.c:1054
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:108
 msgid "_Center"
 msgstr "_Keskelle"
 
-#: ../e-util/e-html-editor-actions.c:1042
-#| msgid "A_lignment"
+#: ../src/e-util/e-html-editor-actions.c:1056
 msgid "Center Alignment"
 msgstr "Tasaus keskelle"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1047
-#: ../e-util/e-html-editor-paragraph-dialog.c:101
+#: ../src/e-util/e-html-editor-actions.c:1061
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:99
 msgid "_Left"
 msgstr "_Vasemmalle"
 
-#: ../e-util/e-html-editor-actions.c:1049
-#| msgid "A_lignment"
+#: ../src/e-util/e-html-editor-actions.c:1063
 msgid "Left Alignment"
 msgstr "Tasaus vasemmalle"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1054
-#: ../e-util/e-html-editor-paragraph-dialog.c:119
+#: ../src/e-util/e-html-editor-actions.c:1068
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:117
 msgid "_Right"
 msgstr "_Oikealle"
 
-#: ../e-util/e-html-editor-actions.c:1056
-#| msgid "A_lignment"
+#: ../src/e-util/e-html-editor-actions.c:1070
 msgid "Right Alignment"
 msgstr "Tasaus oikealle"
 
-#: ../e-util/e-html-editor-actions.c:1064
-#: ../modules/text-highlight/languages.c:72
+#: ../src/e-util/e-html-editor-actions.c:1078
+#: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1066
+#: ../src/e-util/e-html-editor-actions.c:1080
 msgid "HTML editing mode"
 msgstr "HTML-muokkaustila"
 
-#: ../e-util/e-html-editor-actions.c:1071
-#| msgid "Plain Text"
+#: ../src/e-util/e-html-editor-actions.c:1085
 msgid "Plain _Text"
 msgstr "Raaka_teksti"
 
-#: ../e-util/e-html-editor-actions.c:1073
-#| msgid "Plain Text Mode"
+#: ../src/e-util/e-html-editor-actions.c:1087
 msgid "Plain text editing mode"
 msgstr "Raakatekstin muokkaustila"
 
-#: ../e-util/e-html-editor-actions.c:1081
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1095
 #| msgid "Normal"
 msgid "_Normal"
-msgstr "Tavallinen"
+msgstr "_Tavallinen"
 
-#: ../e-util/e-html-editor-actions.c:1088
-msgid "Header _1"
+#: ../src/e-util/e-html-editor-actions.c:1102
+#| msgid "Header _1"
+msgid "Heading _1"
 msgstr "Otsake _1"
 
-#: ../e-util/e-html-editor-actions.c:1095
-msgid "Header _2"
+#: ../src/e-util/e-html-editor-actions.c:1109
+#| msgid "Header _2"
+msgid "Heading _2"
 msgstr "Otsake _2"
 
-#: ../e-util/e-html-editor-actions.c:1102
-msgid "Header _3"
+#: ../src/e-util/e-html-editor-actions.c:1116
+#| msgid "Header _3"
+msgid "Heading _3"
 msgstr "Otsake _3"
 
-#: ../e-util/e-html-editor-actions.c:1109
-msgid "Header _4"
+#: ../src/e-util/e-html-editor-actions.c:1123
+#| msgid "Header _4"
+msgid "Heading _4"
 msgstr "Otsake _4"
 
-#: ../e-util/e-html-editor-actions.c:1116
-msgid "Header _5"
+#: ../src/e-util/e-html-editor-actions.c:1130
+#| msgid "Header _5"
+msgid "Heading _5"
 msgstr "Otsake _5"
 
-#: ../e-util/e-html-editor-actions.c:1123
-msgid "Header _6"
+#: ../src/e-util/e-html-editor-actions.c:1137
+#| msgid "Header _6"
+msgid "Heading _6"
 msgstr "Otsake _6"
 
-#: ../e-util/e-html-editor-actions.c:1130
+#: ../src/e-util/e-html-editor-actions.c:1144
 msgid "_Preformatted"
 msgstr "_Esimuotoiltu"
 
-#: ../e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1151
 msgid "A_ddress"
 msgstr "_Osoite"
 
-#: ../e-util/e-html-editor-actions.c:1144
+#: ../src/e-util/e-html-editor-actions.c:1158
 #, fuzzy
 #| msgid "D_elete Memo List"
 msgid "_Bulleted List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../e-util/e-html-editor-actions.c:1151
+#: ../src/e-util/e-html-editor-actions.c:1165
 msgid "_Roman Numeral List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1158
+#: ../src/e-util/e-html-editor-actions.c:1172
 msgid "Numbered _List"
 msgstr "Numeroitu _luetelo"
 
-#: ../e-util/e-html-editor-actions.c:1165
+#: ../src/e-util/e-html-editor-actions.c:1179
 msgid "_Alphabetical List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1181
-#: ../e-util/e-html-editor-actions.c:1219
+#: ../src/e-util/e-html-editor-actions.c:1195
+#: ../src/e-util/e-html-editor-actions.c:1233
 msgid "_Image..."
 msgstr "_Kuva..."
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1184
+#: ../src/e-util/e-html-editor-actions.c:1198
 #, fuzzy
 #| msgid "Inline Image"
 msgid "Insert Image"
 msgstr "Sisäkkäiset kuvat"
 
-#: ../e-util/e-html-editor-actions.c:1189
-#: ../e-util/e-html-editor-actions.c:1226
+#: ../src/e-util/e-html-editor-actions.c:1203
+#: ../src/e-util/e-html-editor-actions.c:1240
 msgid "_Link..."
 msgstr "_Linkki..."
 
-#: ../e-util/e-html-editor-actions.c:1191
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1205
 #| msgid "_Insert"
 msgid "Insert Link"
-msgstr "L_isää"
+msgstr "Lisää linkki"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1197
-#: ../e-util/e-html-editor-actions.c:1241
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1211
+#: ../src/e-util/e-html-editor-actions.c:1255
 #| msgid "_Rename..."
 msgid "_Rule..."
-msgstr "_Nimeä uudestaan..."
+msgstr "_Viiva..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1200
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1214
 #| msgid "_Insert"
 msgid "Insert Rule"
-msgstr "L_isää"
+msgstr "Lisää viiva"
 
-#: ../e-util/e-html-editor-actions.c:1205
-#: ../e-util/e-html-editor-actions.c:1248
-#| msgid "_Rename..."
+#: ../src/e-util/e-html-editor-actions.c:1219
+#: ../src/e-util/e-html-editor-actions.c:1262
 msgid "_Table..."
 msgstr "_Taulukko..."
 
-#: ../e-util/e-html-editor-actions.c:1207
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1221
 #| msgid "_Insert"
 msgid "Insert Table"
-msgstr "L_isää"
+msgstr "Lisää taulukko"
 
-#: ../e-util/e-html-editor-actions.c:1212
+#: ../src/e-util/e-html-editor-actions.c:1226
 msgid "_Cell..."
 msgstr "_Solu..."
 
-#: ../e-util/e-html-editor-actions.c:1233
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1247
 #| msgid "Save _Image..."
 msgid "Pa_ge..."
-msgstr "Tal_lenna kuva..."
+msgstr "Si_vu..."
 
-#: ../e-util/e-html-editor-actions.c:1257
+#: ../src/e-util/e-html-editor-actions.c:1271
 msgid "Font _Size"
 msgstr "Fontin _koko"
 
-#: ../e-util/e-html-editor-actions.c:1264
+#: ../src/e-util/e-html-editor-actions.c:1278
 msgid "_Font Style"
 msgstr "_Fontin tyyli"
 
-#: ../e-util/e-html-editor-actions.c:1271
+#: ../src/e-util/e-html-editor-actions.c:1285
 msgid "Paste As _Text"
 msgstr "Liitä _tekstinä"
 
-#: ../e-util/e-html-editor-actions.c:1282
-#: ../e-util/e-html-editor-text-dialog.c:203
+#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1284
+#: ../src/e-util/e-html-editor-actions.c:1298
 msgid "Bold"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1290
-#: ../e-util/e-html-editor-text-dialog.c:214
+#: ../src/e-util/e-html-editor-actions.c:1304
+#: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../src/e-util/e-html-editor-actions.c:1306
 msgid "Italic"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1298
+#: ../src/e-util/e-html-editor-actions.c:1312
 #, fuzzy
 #| msgid "Plain Text"
 msgid "_Plain Text"
 msgstr "Raakateksti"
 
-#: ../e-util/e-html-editor-actions.c:1306
-#: ../e-util/e-html-editor-text-dialog.c:235
+#: ../src/e-util/e-html-editor-actions.c:1320
+#: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1308
+#: ../src/e-util/e-html-editor-actions.c:1322
 msgid "Strikethrough"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1314
-#: ../e-util/e-html-editor-text-dialog.c:225
+#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-text-dialog.c:223
 #, fuzzy
 #| msgid "Undefined"
 msgid "_Underline"
 msgstr "Määrittämätön"
 
-#: ../e-util/e-html-editor-actions.c:1316
+#: ../src/e-util/e-html-editor-actions.c:1330
 #, fuzzy
 #| msgid "Undefined"
 msgid "Underline"
 msgstr "Määrittämätön"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1326
+#: ../src/e-util/e-html-editor-actions.c:1340
 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.
-#: ../e-util/e-html-editor-actions.c:1334
+#: ../src/e-util/e-html-editor-actions.c:1348
 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.
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../src/e-util/e-html-editor-actions.c:1356
 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.
-#: ../e-util/e-html-editor-actions.c:1350
+#: ../src/e-util/e-html-editor-actions.c:1364
 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.
-#: ../e-util/e-html-editor-actions.c:1358
+#: ../src/e-util/e-html-editor-actions.c:1372
 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.
-#: ../e-util/e-html-editor-actions.c:1366
+#: ../src/e-util/e-html-editor-actions.c:1380
 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.
-#: ../e-util/e-html-editor-actions.c:1374
+#: ../src/e-util/e-html-editor-actions.c:1388
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1393
+#: ../src/e-util/e-html-editor-actions.c:1407
 #, fuzzy
 #| msgid "_Contents"
 msgid "Cell Contents"
 msgstr "_Sisältö"
 
-#: ../e-util/e-html-editor-actions.c:1400
+#: ../src/e-util/e-html-editor-actions.c:1414
 #, fuzzy
 #| msgid "Add a Column"
 msgid "Column"
 msgstr "Lisää sarake"
 
-#: ../e-util/e-html-editor-actions.c:1407
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1421
 #| msgid "Low"
 msgid "Row"
-msgstr "Matala"
+msgstr "Rivi"
 
-#: ../e-util/e-html-editor-actions.c:1414
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1428
 #| msgid "Table Cell"
 msgid "Table"
-msgstr "Taulukon solu"
+msgstr "Taulukko"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1424
+#: ../src/e-util/e-html-editor-actions.c:1438
 #, fuzzy
 #| msgid "Table Cell"
 msgid "Table Delete"
 msgstr "Taulukon solu"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1432
+#: ../src/e-util/e-html-editor-actions.c:1446
 #, fuzzy
 #| msgid "Table Cell"
 msgid "Table Insert"
 msgstr "Taulukon solu"
 
-#: ../e-util/e-html-editor-actions.c:1439
+#: ../src/e-util/e-html-editor-actions.c:1453
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: ../e-util/e-html-editor-actions.c:1457
+#: ../src/e-util/e-html-editor-actions.c:1471
 msgid "Column After"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1464
+#: ../src/e-util/e-html-editor-actions.c:1478
 msgid "Column Before"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1471
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1485
 #| msgid "_Insert"
 msgid "Insert _Link"
-msgstr "L_isää"
+msgstr "L_isää linkki"
 
-#: ../e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1492
 msgid "Row Above"
-msgstr ""
+msgstr "Rivi ylös"
 
-#: ../e-util/e-html-editor-actions.c:1485
+#: ../src/e-util/e-html-editor-actions.c:1499
 msgid "Row Below"
-msgstr ""
+msgstr "Rivi alas"
 
-#: ../e-util/e-html-editor-actions.c:1492
+#: ../src/e-util/e-html-editor-actions.c:1506
 msgid "Cell..."
-msgstr ""
+msgstr "Solu..."
 
-#: ../e-util/e-html-editor-actions.c:1499
+#: ../src/e-util/e-html-editor-actions.c:1513
 msgid "Image..."
 msgstr "Kuva..."
 
-#: ../e-util/e-html-editor-actions.c:1506
+#: ../src/e-util/e-html-editor-actions.c:1520
 msgid "Link..."
-msgstr ""
+msgstr "Linkki..."
 
-#: ../e-util/e-html-editor-actions.c:1513
+#: ../src/e-util/e-html-editor-actions.c:1527
 msgid "Page..."
-msgstr ""
+msgstr "Sivu..."
 
-#: ../e-util/e-html-editor-actions.c:1520
+#: ../src/e-util/e-html-editor-actions.c:1534
 msgid "Paragraph..."
-msgstr ""
+msgstr "Kappale..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1528
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1542
 #| msgid "Full _Name..."
 msgid "Rule..."
-msgstr "_Koko nimi..."
+msgstr "Viiva..."
 
-#: ../e-util/e-html-editor-actions.c:1535
+#: ../src/e-util/e-html-editor-actions.c:1549
 msgid "Table..."
-msgstr ""
+msgstr "Taulukko..."
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../src/e-util/e-html-editor-actions.c:1556
 msgid "Text..."
 msgstr "Text..."
 
-#: ../e-util/e-html-editor-actions.c:1549
+#: ../src/e-util/e-html-editor-actions.c:1563
 msgid "Remove Link"
 msgstr "Poista linkki"
 
-#: ../e-util/e-html-editor-actions.c:1566
+#: ../src/e-util/e-html-editor-actions.c:1580
 msgid "Add Word to Dictionary"
 msgstr "Lisää sana sanastoon"
 
-#: ../e-util/e-html-editor-actions.c:1573
+#: ../src/e-util/e-html-editor-actions.c:1587
 #, fuzzy
 #| msgid "Color for _misspelled words:"
 msgid "Ignore Misspelled Word"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: ../e-util/e-html-editor-actions.c:1580
+#: ../src/e-util/e-html-editor-actions.c:1594
 msgid "Add Word To"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1589
+#: ../src/e-util/e-html-editor-actions.c:1603
 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.
-#: ../e-util/e-html-editor-actions.c:1713
+#: ../src/e-util/e-html-editor-actions.c:1727
 #, fuzzy, c-format
 #| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
 msgstr "Lisää \"%s\" sanastoon"
 
-#: ../e-util/e-html-editor-actions.c:1792
+#: ../src/e-util/e-html-editor-actions.c:1806
 msgid "_Emoticon"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1793
+#: ../src/e-util/e-html-editor-actions.c:1807
 #, fuzzy
 #| msgid "Restart Evolution"
 msgid "Insert Emoticon"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../e-util/e-html-editor-actions.c:1861
+#: ../src/e-util/e-html-editor-actions.c:1875
 msgid "Re_place"
 msgstr "_Korvaa"
 
-#: ../e-util/e-html-editor-actions.c:1864
+#: ../src/e-util/e-html-editor-actions.c:1878
 msgid "_Image"
 msgstr "_Kuva"
 
-#: ../e-util/e-html-editor-actions.c:1867
+#: ../src/e-util/e-html-editor-actions.c:1881
 msgid "_Link"
-msgstr ""
+msgstr "_Linkki"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1871
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1885
 #| msgid "Add Rule"
 msgid "_Rule"
-msgstr "Lisää sääntö"
+msgstr "_Viiva"
 
-#: ../e-util/e-html-editor-actions.c:1874
-#: ../e-util/e-html-editor-cell-dialog.c:450
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1888
+#: ../src/e-util/e-html-editor-cell-dialog.c:448
 #| msgid "E_nable"
 msgid "_Table"
-msgstr "Kä_ytä"
+msgstr "_Taulukko"
 
-#: ../e-util/e-html-editor.c:689
+#: ../src/e-util/e-html-editor.c:689
 msgid "Paragraph Style"
-msgstr ""
+msgstr "Kappaleen tyyli"
 
-#: ../e-util/e-html-editor.c:703
+#: ../src/e-util/e-html-editor.c:703
 msgid "Editing Mode"
 msgstr "Muokkaustila"
 
-#: ../e-util/e-html-editor.c:715
+#: ../src/e-util/e-html-editor.c:715
 msgid "Font Color"
 msgstr "Fontin väri"
 
-#: ../e-util/e-html-editor.c:725
+#: ../src/e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "Fontin koko"
 
-#: ../e-util/e-html-editor-cell-dialog.c:410
+#: ../src/e-util/e-html-editor-cell-dialog.c:408
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:424
+#: ../src/e-util/e-html-editor-cell-dialog.c:422
 msgid "C_ell"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:437
+#: ../src/e-util/e-html-editor-cell-dialog.c:435
 msgid "_Row"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:463
+#: ../src/e-util/e-html-editor-cell-dialog.c:461
 msgid "Col_umn"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:473
+#: ../src/e-util/e-html-editor-cell-dialog.c:471
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:486
-#: ../e-util/e-html-editor-hrule-dialog.c:330
-#: ../e-util/e-html-editor-table-dialog.c:651
+#: ../src/e-util/e-html-editor-cell-dialog.c:484
+#: ../src/e-util/e-html-editor-hrule-dialog.c:328
+#: ../src/e-util/e-html-editor-table-dialog.c:649
 msgid "Left"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:487
-#: ../e-util/e-html-editor-hrule-dialog.c:332
-#: ../e-util/e-html-editor-table-dialog.c:652
+#: ../src/e-util/e-html-editor-cell-dialog.c:485
+#: ../src/e-util/e-html-editor-hrule-dialog.c:330
+#: ../src/e-util/e-html-editor-table-dialog.c:650
 msgid "Center"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:488
-#: ../e-util/e-html-editor-hrule-dialog.c:334
-#: ../e-util/e-html-editor-table-dialog.c:653
+#: ../src/e-util/e-html-editor-cell-dialog.c:486
+#: ../src/e-util/e-html-editor-hrule-dialog.c:332
+#: ../src/e-util/e-html-editor-table-dialog.c:651
 msgid "Right"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:496
+#: ../src/e-util/e-html-editor-cell-dialog.c:494
 msgid "_Horizontal:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:504
-#: ../e-util/e-html-editor-image-dialog.c:577
+#: ../src/e-util/e-html-editor-cell-dialog.c:502
+#: ../src/e-util/e-html-editor-image-dialog.c:575
 #, fuzzy
 #| msgid "_Top"
 msgid "Top"
 msgstr "Ylimm_äiseksi"
 
-#: ../e-util/e-html-editor-cell-dialog.c:505
-#: ../e-util/e-html-editor-image-dialog.c:578
+#: ../src/e-util/e-html-editor-cell-dialog.c:503
+#: ../src/e-util/e-html-editor-image-dialog.c:576
 #, fuzzy
 #| msgid "_Middle:"
 msgid "Middle"
 msgstr "_Toinen nimi:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:506
-#: ../e-util/e-html-editor-image-dialog.c:579
+#: ../src/e-util/e-html-editor-cell-dialog.c:504
+#: ../src/e-util/e-html-editor-image-dialog.c:577
 #, fuzzy
 #| msgid "_Bottom"
 msgid "Bottom"
 msgstr "Ali_mmaiseksi"
 
-#: ../e-util/e-html-editor-cell-dialog.c:514
+#: ../src/e-util/e-html-editor-cell-dialog.c:512
 #, fuzzy
 #| msgid "_Vertical View"
 msgid "_Vertical:"
 msgstr "_Pystysuuntainen näkymä"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:520
+#: ../src/e-util/e-html-editor-cell-dialog.c:518
 #, fuzzy
 #| msgid "Plain Text"
 msgid "_Wrap Text"
 msgstr "Raakateksti"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:528
+#: ../src/e-util/e-html-editor-cell-dialog.c:526
 msgid "_Header Style"
 msgstr "_Otsaketyyli"
 
-#: ../e-util/e-html-editor-cell-dialog.c:542
-#: ../e-util/e-html-editor-image-dialog.c:517
-#: ../e-util/e-html-editor-table-dialog.c:563
+#: ../src/e-util/e-html-editor-cell-dialog.c:540
+#: ../src/e-util/e-html-editor-image-dialog.c:515
+#: ../src/e-util/e-html-editor-table-dialog.c:561
 msgid "<b>Layout</b>"
 msgstr "<b>Asettelu</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:553
+#: ../src/e-util/e-html-editor-cell-dialog.c:551
 msgid "_Width"
 msgstr "_Leveys"
 
-#: ../e-util/e-html-editor-cell-dialog.c:593
+#: ../src/e-util/e-html-editor-cell-dialog.c:591
 msgid "Row S_pan:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:607
+#: ../src/e-util/e-html-editor-cell-dialog.c:605
 msgid "Co_lumn Span:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:614
-#: ../e-util/e-html-editor-table-dialog.c:667
+#: ../src/e-util/e-html-editor-cell-dialog.c:612
+#: ../src/e-util/e-html-editor-table-dialog.c:665
 msgid "<b>Background</b>"
 msgstr "<b>Tausta</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:627
-#: ../e-util/e-html-editor-table-dialog.c:680
+#: ../src/e-util/e-html-editor-cell-dialog.c:625
+#: ../src/e-util/e-html-editor-table-dialog.c:678
 msgid "Transparent"
 msgstr "Läpinäkyvä"
 
-#: ../e-util/e-html-editor-cell-dialog.c:635
+#: ../src/e-util/e-html-editor-cell-dialog.c:633
 msgid "C_olor:"
 msgstr "V_äri:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:643
-#: ../e-util/e-html-editor-image-dialog.c:479
-#: ../e-util/e-html-editor-table-dialog.c:696
+#: ../src/e-util/e-html-editor-cell-dialog.c:641
+#: ../src/e-util/e-html-editor-image-dialog.c:477
+#: ../src/e-util/e-html-editor-table-dialog.c:694
 msgid "Choose Background Image"
 msgstr "Valitse taustakuva"
 
-#: ../e-util/e-html-editor-cell-dialog.c:648
-#: ../e-util/e-html-editor-image-dialog.c:485
-#: ../e-util/e-html-editor-table-dialog.c:701
+#: ../src/e-util/e-html-editor-cell-dialog.c:646
+#: ../src/e-util/e-html-editor-image-dialog.c:483
+#: ../src/e-util/e-html-editor-table-dialog.c:699
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../e-util/e-html-editor-cell-dialog.c:661
+#: ../src/e-util/e-html-editor-cell-dialog.c:659
 msgid "_Image:"
 msgstr "_Kuva:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:668
-#: ../e-util/e-html-editor-page-dialog.c:497
-#: ../e-util/e-html-editor-table-dialog.c:721
+#: ../src/e-util/e-html-editor-cell-dialog.c:666
+#: ../src/e-util/e-html-editor-page-dialog.c:495
+#: ../src/e-util/e-html-editor-table-dialog.c:719
 msgid "_Remove image"
 msgstr "_Poista kuva"
 
-#: ../e-util/e-html-editor-cell-dialog.c:688
-#, fuzzy
+#: ../src/e-util/e-html-editor-cell-dialog.c:686
 #| msgid "_Properties"
 msgid "Cell Properties"
-msgstr "_Ominaisuudet"
+msgstr "Solun ominaisuudet"
 
-#: ../e-util/e-html-editor-find-dialog.c:94
-#: ../e-util/e-html-editor-replace-dialog.c:70
+#: ../src/e-util/e-html-editor-find-dialog.c:92
+#: ../src/e-util/e-html-editor-replace-dialog.c:68
 msgid "No match found"
 msgstr ""
 
-#: ../e-util/e-html-editor-find-dialog.c:217
-#: ../e-util/e-html-editor-replace-dialog.c:297
+#: ../src/e-util/e-html-editor-find-dialog.c:215
+#: ../src/e-util/e-html-editor-replace-dialog.c:295
 msgid "Search _backwards"
 msgstr "Etsi _taaksepäin"
 
-#: ../e-util/e-html-editor-find-dialog.c:224
+#: ../src/e-util/e-html-editor-find-dialog.c:222
 msgid "Case _Sensitive"
 msgstr "_Huomioi kirjainkoko"
 
-#: ../e-util/e-html-editor-find-dialog.c:231
+#: ../src/e-util/e-html-editor-find-dialog.c:229
 #, fuzzy
 #| msgid "_Search"
 msgid "_Wrap Search"
 msgstr "Et_si"
 
-#: ../e-util/e-html-editor-find-dialog.c:270
+#: ../src/e-util/e-html-editor-find-dialog.c:268
 msgid "Find"
 msgstr "Etsi"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:265
+#: ../src/e-util/e-html-editor-hrule-dialog.c:263
 msgid "<b>Size</b>"
 msgstr "<b>Koko</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:285
-#: ../e-util/e-html-editor-image-dialog.c:535
-#: ../e-util/e-html-editor-table-dialog.c:574
+#: ../src/e-util/e-html-editor-hrule-dialog.c:283
+#: ../src/e-util/e-html-editor-image-dialog.c:533
+#: ../src/e-util/e-html-editor-table-dialog.c:572
 msgid "_Width:"
 msgstr "_Leveys:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:310
+#: ../src/e-util/e-html-editor-hrule-dialog.c:308
 msgid "_Size:"
 msgstr "_Koko:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:317
+#: ../src/e-util/e-html-editor-hrule-dialog.c:315
 msgid "<b>Style</b>"
 msgstr "<b>Tyyli</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:342
-#: ../e-util/e-html-editor-table-dialog.c:660
-#| msgid "A_lignment"
+#: ../src/e-util/e-html-editor-hrule-dialog.c:340
+#: ../src/e-util/e-html-editor-table-dialog.c:658
 msgid "_Alignment:"
 msgstr "_Tasaus:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:348
+#: ../src/e-util/e-html-editor-hrule-dialog.c:346
 msgid "S_haded"
 msgstr ""
 
-#: ../e-util/e-html-editor-hrule-dialog.c:365
+#: ../src/e-util/e-html-editor-hrule-dialog.c:363
 #, fuzzy
 #| msgid "Folder Properties"
 msgid "Rule properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../e-util/e-html-editor-image-dialog.c:467
-#: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:517
+#: ../src/e-util/e-html-editor-image-dialog.c:465
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:64
+#: ../src/e-util/e-html-editor-table-dialog.c:515
 msgid "<b>General</b>"
 msgstr "<b>Yleiset</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:496
+#: ../src/e-util/e-html-editor-image-dialog.c:494
 msgid "_Source:"
 msgstr "_Lähde:"
 
-#: ../e-util/e-html-editor-image-dialog.c:559
+#: ../src/e-util/e-html-editor-image-dialog.c:557
 msgid "_Height:"
 msgstr "_Korkeus:"
 
-#: ../e-util/e-html-editor-image-dialog.c:600
+#: ../src/e-util/e-html-editor-image-dialog.c:598
 msgid "_X-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:616
+#: ../src/e-util/e-html-editor-image-dialog.c:614
 msgid "_Y-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:632
-#: ../e-util/e-html-editor-table-dialog.c:641
+#: ../src/e-util/e-html-editor-image-dialog.c:630
+#: ../src/e-util/e-html-editor-table-dialog.c:639
 msgid "_Border:"
 msgstr "_Reunus:"
 
-#: ../e-util/e-html-editor-image-dialog.c:642
+#: ../src/e-util/e-html-editor-image-dialog.c:640
 msgid "<b>Link</b>"
-msgstr ""
+msgstr "<b>Linkki</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:660
-#: ../e-util/e-html-editor-link-dialog.c:221
-#, fuzzy
+#: ../src/e-util/e-html-editor-image-dialog.c:658
+#: ../src/e-util/e-html-editor-link-dialog.c:219
 #| msgid "URL:"
 msgid "_URL:"
-msgstr "URL:"
+msgstr "_Osoite:"
 
-#: ../e-util/e-html-editor-image-dialog.c:665
-#: ../e-util/e-html-editor-link-dialog.c:226
+#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-link-dialog.c:224
 msgid "_Test URL..."
-msgstr ""
+msgstr "_Testaa osoite..."
 
-#: ../e-util/e-html-editor-image-dialog.c:682
+#: ../src/e-util/e-html-editor-image-dialog.c:680
 msgid "Image Properties"
 msgstr "Kuvan ominaisuudet"
 
-#: ../e-util/e-html-editor-link-dialog.c:250
+#: ../src/e-util/e-html-editor-link-dialog.c:248
 msgid "_Remove Link"
 msgstr "_Poista linkki"
 
-#: ../e-util/e-html-editor-link-dialog.c:275
+#: ../src/e-util/e-html-editor-link-dialog.c:273
 msgid "Link Properties"
 msgstr "Linkin ominaisuudet"
 
-#: ../e-util/e-html-editor-page-dialog.c:70
+#: ../src/e-util/e-html-editor-page-dialog.c:68
 msgid "Perforated Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:79
+#: ../src/e-util/e-html-editor-page-dialog.c:77
 msgid "Blue Ink"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:88
+#: ../src/e-util/e-html-editor-page-dialog.c:86
 msgid "Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:97
+#: ../src/e-util/e-html-editor-page-dialog.c:95
 msgid "Ribbon"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:106
+#: ../src/e-util/e-html-editor-page-dialog.c:104
 msgid "Midnight"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:124 ../mail/filtertypes.xml.in.h:38
-#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+#: ../src/e-util/e-html-editor-page-dialog.c:122
+#: ../src/mail/filtertypes.xml.in.h:38 ../src/mail/searchtypes.xml.in.h:41
+#: ../src/mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../e-util/e-html-editor-page-dialog.c:133
+#: ../src/e-util/e-html-editor-page-dialog.c:131
 msgid "Graph Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:381
+#: ../src/e-util/e-html-editor-page-dialog.c:379
 msgid "<b>Colors</b>"
 msgstr "<b>Värit</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:400
+#: ../src/e-util/e-html-editor-page-dialog.c:398
 msgid "_Text:"
 msgstr "_Teksti:"
 
-#: ../e-util/e-html-editor-page-dialog.c:415
+#: ../src/e-util/e-html-editor-page-dialog.c:413
 msgid "_Link:"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:430
+#: ../src/e-util/e-html-editor-page-dialog.c:428
 msgid "_Visited Link:"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:445
+#: ../src/e-util/e-html-editor-page-dialog.c:443
 msgid "_Background:"
 msgstr "_Tausta:"
 
-#: ../e-util/e-html-editor-page-dialog.c:453
+#: ../src/e-util/e-html-editor-page-dialog.c:451
 msgid "<b>Background Image</b>"
 msgstr "<b>Taustakuva</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:475
-#: ../modules/calendar/e-calendar-preferences.ui.h:80
+#: ../src/e-util/e-html-editor-page-dialog.c:473
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 #, fuzzy
 #| msgid "Template:"
 msgid "_Template:"
 msgstr "Pohja:"
 
-#: ../e-util/e-html-editor-page-dialog.c:483 ../e-util/e-import-assistant.c:288
+#: ../src/e-util/e-html-editor-page-dialog.c:481
+#: ../src/e-util/e-import-assistant.c:286
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../e-util/e-html-editor-page-dialog.c:490
+#: ../src/e-util/e-html-editor-page-dialog.c:488
 #, fuzzy
 #| msgid "_Custom"
 msgid "_Custom:"
 msgstr "_Oma"
 
-#: ../e-util/e-html-editor-page-dialog.c:517
-#| msgid "_Properties"
+#: ../src/e-util/e-html-editor-page-dialog.c:515
 msgid "Page Properties"
 msgstr "Sivun ominaisuudet"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:83
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:81
 msgid "_Style:"
 msgstr "_Tyyli:"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:90
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:88
 #, fuzzy
 #| msgid "A_lignment"
 msgid "<b>Alignment</b>"
 msgstr "_Tasaus"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:155
-#| msgid "Category Properties"
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:153
 msgid "Paragraph Properties"
 msgstr "Kappaleen ominaisuudet"
 
-#: ../e-util/e-html-editor-replace-dialog.c:92
+#: ../src/e-util/e-html-editor-replace-dialog.c:90
 #, c-format
 msgid "%d occurrence replaced"
 msgid_plural "%d occurrences replaced"
 msgstr[0] "%d ilmentymä korvattu"
 msgstr[1] "%d ilmentymää korvattu"
 
-#: ../e-util/e-html-editor-replace-dialog.c:280
+#: ../src/e-util/e-html-editor-replace-dialog.c:278
 msgid "R_eplace:"
 msgstr "_Korvaa:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:289
+#: ../src/e-util/e-html-editor-replace-dialog.c:287
 msgid "_With:"
 msgstr ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:301
+#: ../src/e-util/e-html-editor-replace-dialog.c:299
 msgid "_Case sensitive"
 msgstr "_Huomioi kirjainkoko"
 
-#: ../e-util/e-html-editor-replace-dialog.c:305
+#: ../src/e-util/e-html-editor-replace-dialog.c:303
 #, fuzzy
 #| msgid "_Search"
 msgid "Wra_p search"
 msgstr "Et_si"
 
-#: ../e-util/e-html-editor-replace-dialog.c:315
+#: ../src/e-util/e-html-editor-replace-dialog.c:313
 msgid "_Skip"
 msgstr "_Ohita"
 
-#: ../e-util/e-html-editor-replace-dialog.c:323
-#: ../e-util/e-system.error.xml.h:3
+#: ../src/e-util/e-html-editor-replace-dialog.c:321
+#: ../src/e-util/e-system.error.xml.h:3
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: ../e-util/e-html-editor-replace-dialog.c:331
+#: ../src/e-util/e-html-editor-replace-dialog.c:329
 msgid "Replace _All"
 msgstr "Ko_rvaa kaikki"
 
-#: ../e-util/e-html-editor-replace-dialog.c:351
+#: ../src/e-util/e-html-editor-replace-dialog.c:349
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Korvaa"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:85
-#, c-format
-msgid "<b>Suggestions for '%s'</b>"
-msgstr ""
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:83
+#, fuzzy, c-format
+#| msgid "<b>Suggestions</b>"
+msgid "<b>Suggestions for “%s”</b>"
+msgstr "<b>Ehdotukset</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:390
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:388
 msgid "<b>Suggestions</b>"
 msgstr "<b>Ehdotukset</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:425
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:423
 msgid "Replace"
 msgstr "Korvaa"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:434
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:432
 msgid "Replace All"
 msgstr "Korvaa kaikki"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:443
-#: ../mail/mail.error.xml.h:116
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:441
+#: ../src/mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:452
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:450
 msgid "Skip"
 msgstr "Ohita"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:461
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:459
 #, fuzzy
 #| msgid "Go Back"
 msgid "Back"
 msgstr "Siirry takaisin"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:470
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:468
 msgid "<b>Dictionary</b>"
 msgstr "<b>Sanasto</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:490
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:488
 msgid "Add word"
 msgstr "Lisää sana"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:507 ../mail/mail-config.ui.h:39
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:505
+#: ../src/mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../e-util/e-html-editor-table-dialog.c:539
+#: ../src/e-util/e-html-editor-table-dialog.c:537
 msgid "_Rows:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:556
+#: ../src/e-util/e-html-editor-table-dialog.c:554
 #, fuzzy
 #| msgid "_Table column:"
 msgid "C_olumns:"
 msgstr "_Taulukon sarake:"
 
-#: ../e-util/e-html-editor-table-dialog.c:607
+#: ../src/e-util/e-html-editor-table-dialog.c:605
 msgid "_Spacing:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:624
+#: ../src/e-util/e-html-editor-table-dialog.c:622
 #, fuzzy
 #| msgid "Loading"
 msgid "_Padding:"
 msgstr "Ladataan"
 
-#: ../e-util/e-html-editor-table-dialog.c:688
-#: ../e-util/e-html-editor-text-dialog.c:250
+#: ../src/e-util/e-html-editor-table-dialog.c:686
+#: ../src/e-util/e-html-editor-text-dialog.c:248
 msgid "_Color:"
 msgstr "_Väri:"
 
-#: ../e-util/e-html-editor-table-dialog.c:714
+#: ../src/e-util/e-html-editor-table-dialog.c:712
 msgid "Image:"
 msgstr "Kuva:"
 
-#: ../e-util/e-html-editor-table-dialog.c:741
+#: ../src/e-util/e-html-editor-table-dialog.c:739
 msgid "Table Properties"
 msgstr "Taulukon ominaisuudet"
 
-#: ../e-util/e-html-editor-text-dialog.c:270
+#: ../src/e-util/e-html-editor-text-dialog.c:268
 msgid "Si_ze:"
 msgstr "_Koko:"
 
-#: ../e-util/e-html-editor-text-dialog.c:285
+#: ../src/e-util/e-html-editor-text-dialog.c:283
 msgid "Text Properties"
 msgstr "Tekstin ominaisuudet"
 
-#: ../e-util/e-import-assistant.c:261
+#: ../src/e-util/e-import-assistant.c:259
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 "Valitse Evolutioniin tuotavat tiedosto ja valitse listasta tiedoston tyyppi."
 
-#: ../e-util/e-import-assistant.c:302 ../e-util/e-import-assistant.c:477
+#: ../src/e-util/e-import-assistant.c:300
+#: ../src/e-util/e-import-assistant.c:475
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../e-util/e-import-assistant.c:345 ../e-util/e-import-assistant.c:925
+#: ../src/e-util/e-import-assistant.c:343
+#: ../src/e-util/e-import-assistant.c:923
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
-#: ../e-util/e-import-assistant.c:370
+#: ../src/e-util/e-import-assistant.c:368
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../e-util/e-import-assistant.c:378
+#: ../src/e-util/e-import-assistant.c:376
 msgid "Import data and settings from _older programs"
 msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: ../e-util/e-import-assistant.c:386
+#: ../src/e-util/e-import-assistant.c:384
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: ../e-util/e-import-assistant.c:408
-#: ../modules/startup-wizard/e-mail-config-import-page.c:210
+#: ../src/e-util/e-import-assistant.c:406
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:211
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
-#: ../e-util/e-import-assistant.c:538
+#: ../src/e-util/e-import-assistant.c:536
 #, fuzzy
 #| msgid ""
 #| "Evolution checked for settings to import from the following applications: "
@@ -13701,46 +14356,50 @@ msgstr "Valitse tieto jota haluaisit tuoda:"
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
-"would like to try again, please click the \"Back\" button."
+"would like to try again, please click the “Back” button."
 msgstr ""
 "Evolution etsi tuotavia asetuksia seuraavista ohjelmista: Pine, Netscape, "
 "Elm, iCalendar. Mitään tuotavia asetuksia ei löytynyt. Jos haluat kokeilla "
 "uudestaan, napsauta ”Takaisin”-painiketta."
 
-#: ../e-util/e-import-assistant.c:564
-#: ../modules/startup-wizard/e-mail-config-import-page.c:239
+#: ../src/e-util/e-import-assistant.c:562
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:240
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:783
+#: ../src/e-util/e-import-assistant.c:781
 msgid "_Cancel Import"
 msgstr "_Peru tuonti"
 
-#: ../e-util/e-import-assistant.c:924
+#: ../src/e-util/e-import-assistant.c:922
 msgid "Preview data to be imported"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../e-util/e-import-assistant.c:930 ../e-util/e-import-assistant.c:943
-#: ../e-util/e-import-assistant.c:1296 ../e-util/e-import-assistant.c:1372
-#: ../e-util/e-import-assistant.c:1381
+#: ../src/e-util/e-import-assistant.c:928
+#: ../src/e-util/e-import-assistant.c:941
+#: ../src/e-util/e-import-assistant.c:1294
+#: ../src/e-util/e-import-assistant.c:1370
+#: ../src/e-util/e-import-assistant.c:1379
 msgid "Import Data"
 msgstr "Tuo tiedot"
 
-#: ../e-util/e-import-assistant.c:938
+#: ../src/e-util/e-import-assistant.c:936
 msgid "Select what type of file you want to import from the list."
 msgstr "Valitse luettelosta minkä tyyppisen tiedoston haluat tuoda."
 
-#: ../e-util/e-import-assistant.c:1286 ../e-util/e-import-assistant.c:1321
+#: ../src/e-util/e-import-assistant.c:1284
+#: ../src/e-util/e-import-assistant.c:1319
 msgid "Evolution Import Assistant"
 msgstr "Evolutionin tuontiapulainen"
 
-#: ../e-util/e-import-assistant.c:1303 ../e-util/e-import-assistant.c:1359
+#: ../src/e-util/e-import-assistant.c:1301
+#: ../src/e-util/e-import-assistant.c:1357
 msgid "Import Location"
 msgstr "Tuo sijainti"
 
-#: ../e-util/e-import-assistant.c:1314
+#: ../src/e-util/e-import-assistant.c:1312
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -13750,59 +14409,61 @@ msgstr ""
 "Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
 "Evolutionin käyttöön."
 
-#: ../e-util/e-import-assistant.c:1331
+#: ../src/e-util/e-import-assistant.c:1329
 msgid "Importer Type"
 msgstr "Tuojan tyyppi"
 
-#: ../e-util/e-import-assistant.c:1341
+#: ../src/e-util/e-import-assistant.c:1339
 msgid "Select Information to Import"
 msgstr "Valitse tuotavat tiedot"
 
-#: ../e-util/e-import-assistant.c:1350
+#: ../src/e-util/e-import-assistant.c:1348
 msgid "Select a File"
 msgstr "Valitse tiedosto"
 
-#: ../e-util/e-import-assistant.c:1367
-msgid "Click \"Apply\" to begin importing the file into Evolution."
+#: ../src/e-util/e-import-assistant.c:1365
+#, fuzzy
+#| msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
 
-#: ../e-util/e-mail-signature-combo-box.c:376
+#: ../src/e-util/e-mail-signature-combo-box.c:431
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../e-util/e-mail-signature-editor.c:310 ../mail/e-mail-notes.c:933
+#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:933
 msgid "Close"
 msgstr "Sulje"
 
-#: ../e-util/e-mail-signature-editor.c:315 ../mail/e-mail-notes.c:938
+#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:938
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../e-util/e-mail-signature-editor.c:558
+#: ../src/e-util/e-mail-signature-editor.c:559
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../e-util/e-mail-signature-editor.c:591
+#: ../src/e-util/e-mail-signature-editor.c:592
 msgid "_Signature Name:"
 msgstr "Allekirjoituk_sen nimi:"
 
-#: ../e-util/e-mail-signature-editor.c:627
+#: ../src/e-util/e-mail-signature-editor.c:628
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: ../e-util/e-mail-signature-manager.c:338
+#: ../src/e-util/e-mail-signature-manager.c:338
 msgid "Add _Script"
 msgstr "Lisää _skripti"
 
-#: ../e-util/e-mail-signature-manager.c:444
+#: ../src/e-util/e-mail-signature-manager.c:444
 msgid "Add Signature Script"
 msgstr "Lisää allekirjoitus-skripti"
 
-#: ../e-util/e-mail-signature-manager.c:538
+#: ../src/e-util/e-mail-signature-manager.c:538
 msgid "Edit Signature Script"
 msgstr "Muokkaa allekirjoitus-skriptiä"
 
-#: ../e-util/e-mail-signature-script-dialog.c:393
+#: ../src/e-util/e-mail-signature-script-dialog.c:394
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13812,19 +14473,19 @@ msgstr ""
 "Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../e-util/e-mail-signature-script-dialog.c:444
+#: ../src/e-util/e-mail-signature-script-dialog.c:445
 msgid "S_cript:"
 msgstr "_Skripti:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:475
+#: ../src/e-util/e-mail-signature-script-dialog.c:476
 msgid "Script file must be executable."
 msgstr "Skriptitiedoston tulee olla suoritettavissa."
 
-#: ../e-util/e-map.c:885
+#: ../src/e-util/e-map.c:886
 msgid "World Map"
 msgstr "Maailmankartta"
 
-#: ../e-util/e-map.c:888
+#: ../src/e-util/e-map.c:889
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -13832,506 +14493,516 @@ msgstr ""
 "Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
 "käyttäjät voivat valita aikavyöhykkeen alla olevasta pudotusvalikosta."
 
-#: ../e-util/e-misc-utils.c:255
+#: ../src/e-util/e-misc-utils.c:253
 msgid "Could not open the link."
 msgstr "Linkkiä ei voitu avata."
 
-#: ../e-util/e-misc-utils.c:338
+#: ../src/e-util/e-misc-utils.c:336
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
-#: ../e-util/e-misc-utils.c:2503
+#: ../src/e-util/e-misc-utils.c:2501
 #, c-format
-msgid "Opening calendar '%s'"
-msgstr "Avataan kalenteria %s"
+#| msgid "Opening calendar '%s'"
+msgid "Opening calendar “%s”"
+msgstr "Avataan kalenteria “%s”"
 
-#: ../e-util/e-misc-utils.c:2506
+#: ../src/e-util/e-misc-utils.c:2504
 #, c-format
-msgid "Opening memo list '%s'"
-msgstr "Avataan muistilappuluetteloa '%s'"
+#| msgid "Opening memo list '%s'"
+msgid "Opening memo list “%s”"
+msgstr "Avataan muistilappuluetteloa “%s”"
 
-#: ../e-util/e-misc-utils.c:2509
+#: ../src/e-util/e-misc-utils.c:2507
 #, c-format
-msgid "Opening task list '%s'"
-msgstr "Avataan tehtävälistaa '%s'"
+#| msgid "Opening task list '%s'"
+msgid "Opening task list “%s”"
+msgstr "Avataan tehtävälistaa “%s”"
 
-#: ../e-util/e-misc-utils.c:2512
+#: ../src/e-util/e-misc-utils.c:2510
 #, c-format
-msgid "Opening address book '%s'"
-msgstr "Avataan osoitekirja '%s'"
+#| msgid "Opening address book '%s'"
+msgid "Opening address book “%s”"
+msgstr "Avataan osoitekirja “%s”"
 
-#: ../e-util/e-misc-utils.c:3290
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+#: ../src/e-util/e-misc-utils.c:3290
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "Älä _näytä tätä viestiä uudestaan"
 
-#: ../e-util/e-name-selector-dialog.c:277
+#: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "Näytä yhteystiedot"
 
-#: ../e-util/e-name-selector-dialog.c:309
+#: ../src/e-util/e-name-selector-dialog.c:306
 msgid "Address B_ook:"
 msgstr "_Osoitekirja:"
 
-#: ../e-util/e-name-selector-dialog.c:316
+#: ../src/e-util/e-name-selector-dialog.c:313
 msgid "Cat_egory:"
 msgstr "_Luokka:"
 
-#: ../e-util/e-name-selector-dialog.c:340
+#: ../src/e-util/e-name-selector-dialog.c:337
 msgid "_Search:"
 msgstr "Et_si:"
 
-#: ../e-util/e-name-selector-dialog.c:366
-#: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1183
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:760
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../src/e-util/e-name-selector-dialog.c:363
+#: ../src/e-util/e-name-selector-dialog.c:1330
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:758
+#: ../src/modules/calendar/e-task-shell-view-actions.c:931
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
-#: ../e-util/e-name-selector-dialog.c:368
+#: ../src/e-util/e-name-selector-dialog.c:365
 msgid "Co_ntacts"
 msgstr "_Yhteystiedot"
 
-#: ../e-util/e-name-selector-dialog.c:445
+#: ../src/e-util/e-name-selector-dialog.c:442
 msgid "Search"
 msgstr "Etsi"
 
-#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
+#: ../src/e-util/e-name-selector-dialog.c:445
+#: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../e-util/e-name-selector-dialog.c:576
+#: ../src/e-util/e-name-selector-dialog.c:573
 msgid "Select Contacts from Address Book"
 msgstr "Valitse yhteystiedot osoitekirjasta"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3186
+#: ../src/e-util/e-name-selector-entry.c:3207
 #, fuzzy, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Laajenna kaikki"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3202
+#: ../src/e-util/e-name-selector-entry.c:3223
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopioi %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3213
+#: ../src/e-util/e-name-selector-entry.c:3234
 #, c-format
 msgid "C_ut %s"
 msgstr "_Leikkaa %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3231
+#: ../src/e-util/e-name-selector-entry.c:3252
 #, c-format
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
 
-#: ../e-util/e-name-selector-list.c:584
+#: ../src/e-util/e-name-selector-list.c:585
 #, c-format
 msgid "_Delete %s"
 msgstr "_Poista %s"
 
-#: ../e-util/e-online-button.c:32
+#: ../src/e-util/e-online-button.c:30
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution on verkossa. Katkaise verkkoyhteydet napsauttamalla napista."
 
-#: ../e-util/e-online-button.c:35
+#: ../src/e-util/e-online-button.c:33
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution ei ole verkossa. Avaa verkkoyhteydet napsauttamalla napista."
 
-#: ../e-util/e-online-button.c:38
+#: ../src/e-util/e-online-button.c:36
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
 
-#: ../e-util/e-passwords.c:127
+#: ../src/e-util/e-passwords.c:125
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 
-#: ../e-util/e-passwords.c:447
+#: ../src/e-util/e-passwords.c:445
 msgid "You have the Caps Lock key on."
 msgstr "Caps Lock -näppäin on päällä."
 
-#: ../e-util/e-passwords.c:578
+#: ../src/e-util/e-passwords.c:576
 msgid "_Remember this passphrase"
 msgstr "_Muista salalause"
 
-#: ../e-util/e-passwords.c:579
+#: ../src/e-util/e-passwords.c:577
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr ""
 
-#: ../e-util/e-passwords.c:584
+#: ../src/e-util/e-passwords.c:582
 msgid "_Remember this password"
 msgstr "_Muista salasana"
 
-#: ../e-util/e-passwords.c:585
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: ../e-util/e-preferences-window.c:321
+#: ../src/e-util/e-preferences-window.c:319
 msgid "Evolution Preferences"
 msgstr "Evolutionin asetukset"
 
-#: ../e-util/e-print.c:160
+#: ../src/e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Tapahtui virhe tulostettaessa"
 
-#: ../e-util/e-print.c:167
+#: ../src/e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "Tulostusjärjestelmä kertoi seuraavat yksityiskohdat virheestä:"
 
-#: ../e-util/e-print.c:173
+#: ../src/e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Tulostusjärjestelmä ei kertonut tarkempia tietoja virheestä."
 
-#: ../e-util/e-proxy-editor.c:325
+#: ../src/e-util/e-proxy-editor.c:326
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../e-util/e-proxy-editor.c:347
+#: ../src/e-util/e-proxy-editor.c:348
 msgid "Defer to Desktop Settings"
 msgstr "Käytä työpöydän asetuksia"
 
-#: ../e-util/e-proxy-editor.c:351
+#: ../src/e-util/e-proxy-editor.c:352
 msgid "_Open Desktop Settings"
 msgstr "_Avaa työpöydän asetukset"
 
-#: ../e-util/e-proxy-editor.c:377
+#: ../src/e-util/e-proxy-editor.c:378
 msgid "Manual"
 msgstr "Manuaalisesti"
 
-#: ../e-util/e-proxy-editor.c:396
+#: ../src/e-util/e-proxy-editor.c:397
 msgid "_HTTP Proxy:"
 msgstr "_HTTP-välityspalvelin:"
 
-#: ../e-util/e-proxy-editor.c:427
+#: ../src/e-util/e-proxy-editor.c:428
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS-välityspalvelin:"
 
-#: ../e-util/e-proxy-editor.c:458
+#: ../src/e-util/e-proxy-editor.c:459
 msgid "_Socks Proxy:"
 msgstr "So_cks-välityspalvelin:"
 
-#: ../e-util/e-proxy-editor.c:489
+#: ../src/e-util/e-proxy-editor.c:490
 #, fuzzy
 #| msgid "Ignore"
 msgid "_Ignore Hosts:"
 msgstr "Älä välitä"
 
-#: ../e-util/e-proxy-editor.c:515
+#: ../src/e-util/e-proxy-editor.c:516
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../e-util/e-proxy-editor.c:534
+#: ../src/e-util/e-proxy-editor.c:535
 msgid "Configuration _URL:"
 msgstr "_Määritysosoite:"
 
-#: ../e-util/e-proxy-editor.c:560
-#| msgid "_Custom binary:"
+#: ../src/e-util/e-proxy-editor.c:561
 msgid "No proxy"
 msgstr "Ei välityspalvelinta"
 
-#: ../e-util/e-proxy-editor.c:563
+#: ../src/e-util/e-proxy-editor.c:564
 msgid "Use a direct connection, no proxying required."
 msgstr "Käytä suoraa yhteyttä, välityspalvelinta ei tarvita."
 
-#: ../e-util/e-proxy-preferences.c:213
+#: ../src/e-util/e-proxy-preferences.c:214
 msgid "Switch to Basic Proxy Preferences"
 msgstr "Siirry välityspalvelimen perusasetuksiin"
 
-#: ../e-util/e-proxy-preferences.c:215
+#: ../src/e-util/e-proxy-preferences.c:216
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "Siirry välityspalvelimen edistyneisiin asetuksiin"
 
-#: ../e-util/e-proxy-preferences.c:526
+#: ../src/e-util/e-proxy-preferences.c:527
 msgid "Apply custom proxy settings to these accounts:"
 msgstr ""
 
-#: ../e-util/e-proxy-preferences.c:561
+#: ../src/e-util/e-proxy-preferences.c:562
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
 msgstr ""
 
-#: ../e-util/e-proxy-selector.c:85
-#| msgid "_Custom binary:"
+#: ../src/e-util/e-proxy-selector.c:86
 msgid "Custom Proxy"
 msgstr "Omavalintainen välityspalvelin"
 
-#: ../e-util/e-proxy-selector.c:487
+#: ../src/e-util/e-proxy-selector.c:488
 msgid "Create a new proxy profile"
 msgstr "Luo uusi välityspalvelinprofiili"
 
-#: ../e-util/e-proxy-selector.c:492
+#: ../src/e-util/e-proxy-selector.c:493
 msgid "Delete the selected proxy profile"
 msgstr "Poista valittu välityspalvelinprofiili"
 
-#: ../e-util/e-rule-editor.c:184
+#: ../src/e-util/e-rule-editor.c:182
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
-#: ../e-util/e-rule-editor.c:286
+#: ../src/e-util/e-rule-editor.c:284
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
-#: ../e-util/e-search-bar.c:84
+#: ../src/e-util/e-search-bar.c:82
 #, c-format
 msgid "Matches: %u"
 msgstr "Osumia: %u"
 
-#: ../e-util/e-search-bar.c:611
+#: ../src/e-util/e-search-bar.c:609
 msgid "Close the find bar"
 msgstr "Sulje hakupalkki"
 
-#: ../e-util/e-search-bar.c:619
+#: ../src/e-util/e-search-bar.c:617
 msgid "Fin_d:"
 msgstr "Et_si:"
 
-#: ../e-util/e-search-bar.c:631
+#: ../src/e-util/e-search-bar.c:629
 msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
-#: ../e-util/e-search-bar.c:655
+#: ../src/e-util/e-search-bar.c:653
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: ../e-util/e-search-bar.c:658
+#: ../src/e-util/e-search-bar.c:656
 msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../e-util/e-search-bar.c:667
+#: ../src/e-util/e-search-bar.c:665
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../e-util/e-search-bar.c:670
+#: ../src/e-util/e-search-bar.c:668
 msgid "Find the next occurrence of the phrase"
 msgstr "Etsi lauseen seuraava esiintymä"
 
-#: ../e-util/e-search-bar.c:679
+#: ../src/e-util/e-search-bar.c:677
 msgid "Mat_ch case"
 msgstr "Huomioi _kirjainkoko"
 
-#: ../e-util/e-search-bar.c:707
+#: ../src/e-util/e-search-bar.c:705
 msgid "Reached bottom of page, continued from top"
 msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 
-#: ../e-util/e-search-bar.c:729
+#: ../src/e-util/e-search-bar.c:727
 msgid "Reached top of page, continued from bottom"
 msgstr "Saavutettiin sivun alku, jatketaan lopusta"
 
-#: ../e-util/e-send-options.c:570
+#: ../src/e-util/e-send-options.c:568
 msgid "When de_leted:"
 msgstr "Milloin _poistettu:"
 
-#: ../e-util/e-send-options.ui.h:3
+#: ../src/e-util/e-send-options.ui.h:3
 msgid "Standard"
 msgstr "Tavallinen"
 
-#: ../e-util/e-send-options.ui.h:6
+#: ../src/e-util/e-send-options.ui.h:6
 msgid "Proprietary"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:8
+#: ../src/e-util/e-send-options.ui.h:8
 msgid "Secret"
 msgstr "Salainen"
 
-#: ../e-util/e-send-options.ui.h:9
+#: ../src/e-util/e-send-options.ui.h:9
 msgid "Top Secret"
 msgstr "Erittäin salainen"
 
-#: ../e-util/e-send-options.ui.h:10
+#: ../src/e-util/e-send-options.ui.h:10
 msgid "For Your Eyes Only"
 msgstr "Vain sinulle"
 
 #. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
+#: ../src/e-util/e-send-options.ui.h:12
 msgctxt "send-options"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../e-util/e-send-options.ui.h:13
+#: ../src/e-util/e-send-options.ui.h:13
 msgid "Mail Receipt"
 msgstr "Sähköpostin vastaanotto"
 
-#: ../e-util/e-send-options.ui.h:14
+#: ../src/e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Lähetysasetukset"
 
-#: ../e-util/e-send-options.ui.h:15
+#: ../src/e-util/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "V_astausta pyydetty"
 
-#: ../e-util/e-send-options.ui.h:16
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:20
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "S_isällä"
 
-#: ../e-util/e-send-options.ui.h:17
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:22
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "päivää"
 
-#: ../e-util/e-send-options.ui.h:18
+#: ../src/e-util/e-send-options.ui.h:23
 msgid "_When convenient"
 msgstr "Milloin _sopii"
 
-#: ../e-util/e-send-options.ui.h:20
+#. To translators: This means Delay the message delivery for some time
+#: ../src/e-util/e-send-options.ui.h:26
 msgid "_Delay message delivery"
 msgstr "_Viivästä viestin toimitusta"
 
-#: ../e-util/e-send-options.ui.h:21
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:28
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_Jälkeen"
 
-#: ../e-util/e-send-options.ui.h:22
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:30
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "päivää"
 
-#: ../e-util/e-send-options.ui.h:23
+#: ../src/e-util/e-send-options.ui.h:31
 msgid "_Set expiration date"
 msgstr "Aseta _eräpäivä"
 
-#: ../e-util/e-send-options.ui.h:24
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:33
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "_Kunnes"
 
-#: ../e-util/e-send-options.ui.h:25
+#: ../src/e-util/e-send-options.ui.h:34
 msgid "Delivery Options"
 msgstr "Toimitusvalinnat"
 
-#: ../e-util/e-send-options.ui.h:26
+#: ../src/e-util/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
-#: ../e-util/e-send-options.ui.h:27
+#: ../src/e-util/e-send-options.ui.h:36
 msgid "_Classification:"
 msgstr "Lu_okittelu:"
 
-#: ../e-util/e-send-options.ui.h:28
+#: ../src/e-util/e-send-options.ui.h:37
 msgid "Gene_ral Options"
 msgstr "_Yleisasetukset"
 
-#: ../e-util/e-send-options.ui.h:29
+#: ../src/e-util/e-send-options.ui.h:38
 msgid "Creat_e a sent item to track information"
 msgstr "_Luo lähetyskohde, jonka tietoja seurataan"
 
-#: ../e-util/e-send-options.ui.h:30
+#: ../src/e-util/e-send-options.ui.h:39
 msgid "_Delivered"
 msgstr "_Toimitettu"
 
-#: ../e-util/e-send-options.ui.h:31
+#: ../src/e-util/e-send-options.ui.h:40
 msgid "Deli_vered and opened"
 msgstr "_Toimitettu ja avattu"
 
-#: ../e-util/e-send-options.ui.h:32
+#: ../src/e-util/e-send-options.ui.h:41
 msgid "_All information"
 msgstr "_Kaikki tiedot"
 
-#: ../e-util/e-send-options.ui.h:33
+#: ../src/e-util/e-send-options.ui.h:42
 msgid "A_uto-delete sent item"
 msgstr "Poista lähetetty _automaattisesti"
 
-#: ../e-util/e-send-options.ui.h:34
+#: ../src/e-util/e-send-options.ui.h:43
 msgid "Status Tracking"
 msgstr "Tilan seuranta"
 
-#: ../e-util/e-send-options.ui.h:35
+#: ../src/e-util/e-send-options.ui.h:44
 msgid "_When opened:"
 msgstr "_Milloin avattu:"
 
-#: ../e-util/e-send-options.ui.h:36
+#: ../src/e-util/e-send-options.ui.h:45
 msgid "When decli_ned:"
 msgstr "Milloin h_ylätty:"
 
-#: ../e-util/e-send-options.ui.h:37
+#: ../src/e-util/e-send-options.ui.h:46
 msgid "When co_mpleted:"
 msgstr "Milloin val_mistuu:"
 
-#: ../e-util/e-send-options.ui.h:38
+#: ../src/e-util/e-send-options.ui.h:47
 msgid "When acce_pted:"
 msgstr "Milloin hy_väksytty:"
 
-#: ../e-util/e-send-options.ui.h:39
+#: ../src/e-util/e-send-options.ui.h:48
 msgid "Return Notification"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:40
+#: ../src/e-util/e-send-options.ui.h:49
 msgid "Sta_tus Tracking"
 msgstr "_Tilan seuranta"
 
-#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
+#: ../src/e-util/e-source-config.c:691 ../src/e-util/e-source-config.c:695
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
+#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../e-util/e-source-config.c:813
+#: ../src/e-util/e-source-config.c:814
 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]"
-#: ../e-util/e-source-config.c:1313
+#: ../src/e-util/e-source-config.c:1314
 msgid "Refresh every"
 msgstr "Päivitysväli"
 
-#: ../e-util/e-source-config.c:1343 ../e-util/e-source-config.c:1413
+#: ../src/e-util/e-source-config.c:1344 ../src/e-util/e-source-config.c:1414
 msgid "Use a secure connection"
 msgstr "Käytä salattua yhteyttä:"
 
-#: ../e-util/e-source-config.c:1439
+#: ../src/e-util/e-source-config.c:1440
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Tuotu varmenne"
 
-#: ../e-util/e-source-config.c:1475
+#: ../src/e-util/e-source-config.c:1476
 msgid "User"
 msgstr "Käyttäjä"
 
-#: ../e-util/e-source-selector.c:3214
+#: ../src/e-util/e-source-selector.c:3212
 msgid "Show"
 msgstr "Näytä"
 
-#: ../e-util/e-source-selector.c:3221
+#: ../src/e-util/e-source-selector.c:3219
 msgid "Group name"
 msgstr "Ryhmän nimi"
 
-#: ../e-util/e-source-selector.c:3376 ../mail/e-mail-display.c:742
+#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:796
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
+#: ../src/e-util/e-source-selector.c:3374
+#: ../src/e-util/e-source-selector.c:3473
 msgid "_Show"
 msgstr "_Näytä"
 
-#: ../e-util/e-source-selector.c:3428
+#: ../src/e-util/e-source-selector.c:3426
 msgid "Manage Groups"
 msgstr "Hallitse ryhmiä"
 
-#: ../e-util/e-source-selector.c:3440
+#: ../src/e-util/e-source-selector.c:3438
 msgid "Available Groups:"
 msgstr "Käytettävissä olevat ryhmät:"
 
-#: ../e-util/e-source-selector-dialog.c:236
+#: ../src/e-util/e-source-selector-dialog.c:234
 msgid "_Destination"
 msgstr "_Kohde"
 
-#: ../e-util/e-source-selector-dialog.c:364
+#: ../src/e-util/e-source-selector-dialog.c:362
 msgid "Select destination"
 msgstr "Valitse kohde"
 
 #. Translators: %s is the language ISO code.
-#: ../e-util/e-spell-dictionary.c:266
+#: ../src/e-util/e-spell-dictionary.c:264
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -14339,102 +15010,110 @@ msgstr "Tuntematon (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#: ../src/e-util/e-spell-dictionary.c:279
+#: ../src/e-util/e-spell-dictionary.c:284
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:478
+#: ../src/e-util/e-spell-entry.c:479
 msgid "(no suggestions)"
 msgstr "(ei ehdotuksia)"
 
-#: ../e-util/e-spell-entry.c:502
+#: ../src/e-util/e-spell-entry.c:503
 msgid "More..."
 msgstr "Lisää..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:587
+#: ../src/e-util/e-spell-entry.c:588
 #, c-format
-msgid "Add \"%s\" to Dictionary"
-msgstr "Lisää \"%s\" sanastoon"
+#| msgid "Add \"%s\" to Dictionary"
+msgid "Add “%s” to Dictionary"
+msgstr "Lisää “%s” sanastoon"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:636
+#: ../src/e-util/e-spell-entry.c:637
 #, fuzzy
 #| msgid "Ignore"
 msgid "Ignore All"
 msgstr "Älä välitä"
 
-#: ../e-util/e-spell-entry.c:668
+#: ../src/e-util/e-spell-entry.c:669
 msgid "Spelling Suggestions"
 msgstr "Kirjoitusehdotukset"
 
-#: ../e-util/e-system.error.xml.h:1
-msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+#: ../src/e-util/e-system.error.xml.h:1
+#, fuzzy
+#| msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgid "A file named “{0}” already exists. Do you want to replace it?"
 msgstr "Tiedosto \"{0}\" on jo olemassa. Korvataanko se?"
 
-#: ../e-util/e-system.error.xml.h:2
+#: ../src/e-util/e-system.error.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "The file already exists in \"{0}\". Replacing it will overwrite its "
+#| "contents."
 msgid ""
-"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+"The file already exists in “{0}”. Replacing it will overwrite its contents."
 msgstr ""
 "Tiedosto on jo olemassa kohteessa \"{0}\". Uusi tiedosto korvaa vanhan "
 "sisällön."
 
-#: ../e-util/e-system.error.xml.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Tiedostoa \"{0}\" ei voi tallentaa."
-
-#: ../e-util/e-system.error.xml.h:5
-msgid "Because \"{1}\"."
-msgstr "Syy: \"{1}\"."
+#: ../src/e-util/e-system.error.xml.h:4
+#| msgid "Cannot save file \"{0}\"."
+msgid "Cannot save file “{0}”."
+msgstr "Tiedostoa “{0}” ei voi tallentaa."
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Cannot open file \"{0}\"."
-msgstr "Tiedostoa \"{0}\" ei voi avata."
+#: ../src/e-util/e-system.error.xml.h:6
+#| msgid "Cannot open file \"{0}\"."
+msgid "Cannot open file “{0}”."
+msgstr "Tiedostoa “{0}” ei voi avata."
 
-#: ../e-util/e-system.error.xml.h:7
+#: ../src/e-util/e-system.error.xml.h:7
 #, fuzzy
 #| msgid "Could not read signature file &quot;{0}&quot;."
-msgid "Failed to remove data source &quot;{0}&quot;."
+msgid "Failed to remove data source “{0}”."
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
-msgid "The reported error was &quot;{1}&quot;."
-msgstr "Ilmoitettu virhe oli &quot;{1}&quot;."
+#: ../src/e-util/e-system.error.xml.h:8 ../src/mail/mail.error.xml.h:64
+#| msgid "The reported error was &quot;{1}&quot;."
+msgid "The reported error was “{1}”."
+msgstr "Ilmoitettu virhe oli “{1}”."
 
-#: ../e-util/e-system.error.xml.h:9
+#: ../src/e-util/e-system.error.xml.h:9
 #, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
-msgid "Failed to update data source &quot;{0}&quot;."
+msgid "Failed to update data source “{0}”."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
-#: ../e-util/e-system.error.xml.h:10
-msgid "Failed to delete resource &quot;{0}&quot;."
+#: ../src/e-util/e-system.error.xml.h:10
+#, fuzzy
+#| msgid "Failed to delete resource &quot;{0}&quot;."
+msgid "Failed to delete resource “{0}”."
 msgstr "Resurssin &quot;{0}&quot; poistaminen epäonnistui."
 
-#: ../e-util/e-system.error.xml.h:11
+#: ../src/e-util/e-system.error.xml.h:11
 #, fuzzy
 #| msgid "The Evolution address book has quit unexpectedly."
-msgid ""
-"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The address book backend servicing “{0}” has quit unexpectedly."
 msgstr "Evolutionin osoitekirja sulkeutui odottamatta."
 
-#: ../e-util/e-system.error.xml.h:12
+#: ../src/e-util/e-system.error.xml.h:12
 msgid ""
 "Some of your contacts may not be available until Evolution is restarted."
 msgstr ""
 "Joitain yhteystietoja ei välttämättä voi käyttää, ennen kuin Evolution on "
 "käynnistetty uudelleen."
 
-#: ../e-util/e-system.error.xml.h:13
+#: ../src/e-util/e-system.error.xml.h:13
 #, fuzzy
 #| msgid "The Evolution calendar has quit unexpectedly."
-msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The calendar backend servicing “{0}” has quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../e-util/e-system.error.xml.h:14
+#: ../src/e-util/e-system.error.xml.h:14
 #, fuzzy
 #| msgid "Your memos will not be available until Evolution is restarted."
 msgid ""
@@ -14443,13 +15122,13 @@ msgstr ""
 "Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../e-util/e-system.error.xml.h:15
+#: ../src/e-util/e-system.error.xml.h:15
 #, fuzzy
 #| msgid "The Evolution calendar has quit unexpectedly."
-msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The memo list backend servicing “{0}” has quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../e-util/e-system.error.xml.h:16
+#: ../src/e-util/e-system.error.xml.h:16
 #, fuzzy
 #| msgid "Your memos will not be available until Evolution is restarted."
 msgid "Some of your memos may not be available until Evolution is restarted."
@@ -14457,13 +15136,13 @@ msgstr ""
 "Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../e-util/e-system.error.xml.h:17
+#: ../src/e-util/e-system.error.xml.h:17
 #, fuzzy
 #| msgid "The Evolution calendar has quit unexpectedly."
-msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The task list backend servicing “{0}” has quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../e-util/e-system.error.xml.h:18
+#: ../src/e-util/e-system.error.xml.h:18
 #, fuzzy
 #| msgid "Your tasks will not be available until Evolution is restarted."
 msgid "Some of your tasks may not be available until Evolution is restarted."
@@ -14471,148 +15150,166 @@ msgstr ""
 "Tehtävät eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../e-util/e-system.error.xml.h:19
-msgid ""
-"The address book backend servicing &quot;{0}&quot; encountered an error."
-msgstr ""
+#: ../src/e-util/e-system.error.xml.h:19
+#, fuzzy
+#| msgid "The Evolution address book has quit unexpectedly."
+msgid "The address book backend servicing “{0}” encountered an error."
+msgstr "Evolutionin osoitekirja sulkeutui odottamatta."
 
-#: ../e-util/e-system.error.xml.h:20
-msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
-msgstr ""
+#: ../src/e-util/e-system.error.xml.h:20
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The calendar backend servicing “{0}” encountered an error."
+msgstr "Evolutionin kalenteri sulkeutui odottamatta."
+
+#: ../src/e-util/e-system.error.xml.h:21
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The memo list backend servicing “{0}” encountered an error."
+msgstr "Evolutionin kalenteri sulkeutui odottamatta."
+
+#: ../src/e-util/e-system.error.xml.h:22
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The task list backend servicing “{0}” encountered an error."
+msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../e-util/e-system.error.xml.h:21
-msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
+#: ../src/e-util/e-system.error.xml.h:23
+msgid "Something has gone wrong"
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:22
-msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
+#: ../src/e-util/e-system.error.xml.h:24
+msgid ""
+"A WebKitWebProcess crashed when displaying the content. You can try again by "
+"reopening the window. If the issue persists, please file a bug report in the "
+"GNOME bugzilla."
 msgstr ""
 
-#: ../e-util/e-table-click-to-add.c:689
-#: ../e-util/gal-a11y-e-table-click-to-add.c:61
-#: ../e-util/gal-a11y-e-table-click-to-add.c:142
+#: ../src/e-util/e-table-click-to-add.c:687
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
 msgstr "lisää napsauttamalla"
 
-#: ../e-util/e-table-column-selector.c:264
+#: ../src/e-util/e-table-column-selector.c:264
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected column names to top"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../e-util/e-table-column-selector.c:269
+#: ../src/e-util/e-table-column-selector.c:269
 #, fuzzy
 #| msgid "Move selected contacts to another address book"
 msgid "Move selected column names up one row"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../e-util/e-table-column-selector.c:274
+#: ../src/e-util/e-table-column-selector.c:274
 #, fuzzy
 #| msgid "Move selected contacts to another address book"
 msgid "Move selected column names down one row"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../e-util/e-table-column-selector.c:279
+#: ../src/e-util/e-table-column-selector.c:279
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected column names to bottom"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../e-util/e-table-column-selector.c:284
+#: ../src/e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "Valitse kaikki sarakenimet"
 
-#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr "(nouseva)"
 
-#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr "(laskeva)"
 
-#: ../e-util/e-table-config.c:395
+#: ../src/e-util/e-table-config.c:395
 msgid "Not sorted"
 msgstr "Ei järjestetty"
 
-#: ../e-util/e-table-config.c:440
+#: ../src/e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "Ei ryhmitystä"
 
-#: ../e-util/e-table-config.c:545
+#: ../src/e-util/e-table-config.c:545
 msgid "Show Fields"
 msgstr "Näytä kentät"
 
-#: ../e-util/e-table-config.c:559
+#: ../src/e-util/e-table-config.c:559
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose the order of information to appear in the message list."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../e-util/e-table-config.ui.h:2
-msgid "_Apply"
-msgstr "_Toteuta"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Järjestä..."
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "_Ryhmittele..."
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "_Näytettävät kentät..."
-
-#: ../e-util/e-table-config.ui.h:9
+#: ../src/e-util/e-table-config.ui.h:2
 msgid "Clear _All"
 msgstr "Tyhjennä k_aikki"
 
-#: ../e-util/e-table-config.ui.h:10
+#: ../src/e-util/e-table-config.ui.h:5
 msgid "_Show field in View"
 msgstr "_Näytä kenttä näkymässä"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1796
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1783
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1796
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1783
 msgid "Descending"
 msgstr "Laskeva"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../src/e-util/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "Ryhmittele kentän mukaan"
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../src/e-util/e-table-config.ui.h:9
 msgid "Show _field in View"
 msgstr "Näytä _kenttä näkymässä"
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../src/e-util/e-table-config.ui.h:10
 msgid "Then By"
 msgstr "sitten"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../src/e-util/e-table-config.ui.h:11
 msgid "Show field i_n View"
 msgstr "Näytä k_enttä näkymässä"
 
-#: ../e-util/e-table-config.ui.h:17
+#: ../src/e-util/e-table-config.ui.h:12
 msgid "Show field in _View"
 msgstr "Näytä kenttä _näkymässä"
 
-#: ../e-util/e-table-config.ui.h:18
+#: ../src/e-util/e-table-config.ui.h:13
 msgid "Sort"
 msgstr "Järjestä"
 
-#: ../e-util/e-table-config.ui.h:19
+#: ../src/e-util/e-table-config.ui.h:14
 msgid "Clear All"
 msgstr "Tyhjennä merkki"
 
-#: ../e-util/e-table-config.ui.h:20
+#: ../src/e-util/e-table-config.ui.h:15
 msgid "Sort Items By"
 msgstr "Järjestä kentän mukaan"
 
-#: ../e-util/e-table-field-chooser.c:166
+#: ../src/e-util/e-table-config.ui.h:16
+msgid "_Apply"
+msgstr "_Toteuta"
+
+#: ../src/e-util/e-table-config.ui.h:17
+msgid "_Sort..."
+msgstr "_Järjestä..."
+
+#: ../src/e-util/e-table-config.ui.h:18
+msgid "_Group By..."
+msgstr "_Ryhmittele..."
+
+#: ../src/e-util/e-table-config.ui.h:19
+msgid "_Fields Shown..."
+msgstr "_Näytettävät kentät..."
+
+#: ../src/e-util/e-table-field-chooser.c:164
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -14620,101 +15317,114 @@ msgstr ""
 "Lisää sarake taulukkoon raahaamalla se kohtaan,\n"
 "johon haluat sen ilmestyvän."
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
+#: ../src/e-util/e-table-field-chooser-dialog.c:224
 msgid "Add a Column"
 msgstr "Lisää sarake"
 
-#: ../e-util/e-table-group-container.c:368
+#. Translators: This text is used as a special row when an ETable
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * 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
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s: %s (%d kohta)"
 msgstr[1] "%s: %s (%d kohtaa)"
 
-#: ../e-util/e-table-group-container.c:382
+#. Translators: This text is used as a special row when an ETable
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
+#.
+#: ../src/e-util/e-table-group-container.c:380
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../e-util/e-table-header-item.c:1619
+#: ../src/e-util/e-table-header-item.c:1606
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1629
 msgid "Sort _Ascending"
 msgstr "järjestä _nousevasti"
 
-#: ../e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1632
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../e-util/e-table-header-item.c:1648
+#: ../src/e-util/e-table-header-item.c:1635
 msgid "_Reset sort"
 msgstr "_Palauta järjestys"
 
-#: ../e-util/e-table-header-item.c:1651
+#: ../src/e-util/e-table-header-item.c:1638
 msgid "Group By This _Field"
 msgstr "Ryhmittele tämän _kentän mukaan"
 
-#: ../e-util/e-table-header-item.c:1654
+#: ../src/e-util/e-table-header-item.c:1641
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1645
 msgid "Remove This _Column"
 msgstr "Poista tämä sa_rake"
 
-#: ../e-util/e-table-header-item.c:1661
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "Add a C_olumn..."
 msgstr "Lisää _sarake..."
 
-#: ../e-util/e-table-header-item.c:1665
+#: ../src/e-util/e-table-header-item.c:1652
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../e-util/e-table-header-item.c:1668
+#: ../src/e-util/e-table-header-item.c:1655
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../e-util/e-table-header-item.c:1671
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "Format Column_s..."
 msgstr "Muotoile _sarakkeet..."
 
-#: ../e-util/e-table-header-item.c:1675
+#: ../src/e-util/e-table-header-item.c:1662
 msgid "Custo_mize Current View..."
 msgstr "_Mukauta nykyistä näkymää..."
 
-#: ../e-util/e-table-header-item.c:1746
+#: ../src/e-util/e-table-header-item.c:1733
 msgid "_Sort By"
 msgstr "_Järjestystapa"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1769
+#: ../src/e-util/e-table-header-item.c:1756
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../e-util/e-text.c:2134
+#: ../src/e-util/e-text.c:2135
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../e-util/e-text.c:2147
+#: ../src/e-util/e-text.c:2148
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:270 ../e-util/e-timezone-dialog.c:510
-#: ../e-util/e-timezone-dialog.c:514 ../e-util/e-timezone-dialog.c:518
-#: ../e-util/e-timezone-dialog.c:901
+#: ../src/e-util/e-timezone-dialog.c:268 ../src/e-util/e-timezone-dialog.c:508
+#: ../src/e-util/e-timezone-dialog.c:512 ../src/e-util/e-timezone-dialog.c:516
+#: ../src/e-util/e-timezone-dialog.c:899
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-timezone-dialog.ui.h:1
+#: ../src/e-util/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
 msgstr "Valitse aikavyöhyke"
 
-#: ../e-util/e-timezone-dialog.ui.h:4
+#: ../src/e-util/e-timezone-dialog.ui.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -14724,522 +15434,530 @@ msgstr ""
 "aikavyöhyke.\n"
 "Loitonna kartalla oikealla hiiren napilla."
 
-#: ../e-util/e-timezone-dialog.ui.h:6
+#: ../src/e-util/e-timezone-dialog.ui.h:6
 msgid "Time Zones"
 msgstr "Aikavyöhykkeet"
 
-#: ../e-util/e-timezone-dialog.ui.h:7
+#: ../src/e-util/e-timezone-dialog.ui.h:7
 msgid "_Selection"
 msgstr "_Valinta"
 
-#: ../e-util/e-timezone-dialog.ui.h:8
+#: ../src/e-util/e-timezone-dialog.ui.h:8
 msgid "Timezone drop-down combination box"
 msgstr "Aikavyöhykkeen valinnan pudotusvalikko"
 
-#: ../e-util/e-url-entry.c:108
+#: ../src/e-util/e-url-entry.c:106
 msgid "Click here to open the URL"
 msgstr "Napsauta tästä avataksesi verkko-osoitteen"
 
-#: ../e-util/e-url-entry.c:110
+#: ../src/e-util/e-url-entry.c:108
 msgid "Enter a URL here"
 msgstr "Kirjoita verkko-osoite tähän"
 
-#: ../e-util/evolution-source-viewer.c:637
+#: ../src/e-util/evolution-source-viewer.c:638
 #, fuzzy
 #| msgid "Evolution Pine importer"
 msgid "Evolution Source Viewer"
 msgstr "Evolutionin Pine-tuoja"
 
 #. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:667
+#: ../src/e-util/evolution-source-viewer.c:668
 #, fuzzy
 #| msgid "Display"
 msgid "Display Name"
 msgstr "Näytä"
 
-#: ../e-util/evolution-source-viewer.c:676
+#: ../src/e-util/evolution-source-viewer.c:677
 #, fuzzy
 #| msgid "_Flag:"
 msgid "Flags"
 msgstr "_Merkki:"
 
-#: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:779
+#: ../src/e-util/evolution-source-viewer.c:729
+#: ../src/mail/e-mail-config-identity-page.c:1148
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../e-util/e-web-view.c:337
+#: ../src/e-util/e-web-view.c:346
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../e-util/e-web-view.c:339
+#: ../src/e-util/e-web-view.c:348
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../e-util/e-web-view.c:347
+#: ../src/e-util/e-web-view.c:356
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view.c:349
+#: ../src/e-util/e-web-view.c:358
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view.c:357
+#: ../src/e-util/e-web-view.c:366
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../e-util/e-web-view.c:364
+#: ../src/e-util/e-web-view.c:373
 #, fuzzy
 #| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
-#: ../e-util/e-web-view.c:366
+#: ../src/e-util/e-web-view.c:375
 #, fuzzy
 #| msgid "Copy the email address to the clipboard"
 msgid "Copy the raw email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
-#: ../e-util/e-web-view.c:381
+#: ../src/e-util/e-web-view.c:390
 msgid "_Copy Image"
 msgstr "K_opioi kuva"
 
-#: ../e-util/e-web-view.c:383
+#: ../src/e-util/e-web-view.c:392
 msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
-#: ../e-util/e-web-view.c:388
+#: ../src/e-util/e-web-view.c:397
 msgid "Save _Image..."
 msgstr "Tal_lenna kuva..."
 
-#: ../e-util/e-web-view.c:390
+#: ../src/e-util/e-web-view.c:399
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../e-util/e-web-view.c:410 ../e-util/e-web-view.c:1826
+#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1964
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../e-util/e-web-view.c:1284
+#: ../src/e-util/e-web-view.c:1322
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../e-util/e-web-view.c:1286
+#: ../src/e-util/e-web-view.c:1324
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../e-util/e-web-view.c:1297
+#: ../src/e-util/e-web-view.c:1335
 #, fuzzy, c-format
 #| msgid "Enter the recipients of the message"
 msgid "Go to the section %s of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../e-util/e-web-view.c:1299
+#: ../src/e-util/e-web-view.c:1337
 #, fuzzy
 #| msgid "Enter the recipients of the message"
 msgid "Go to the beginning of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../e-util/e-web-view.c:1303
+#: ../src/e-util/e-web-view.c:1341
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../e-util/e-web-view.c:3672
+#: ../src/e-util/e-web-view.c:3875
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../e-util/e-web-view.c:3860
+#: ../src/e-util/e-web-view.c:4063
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../e-util/e-web-view.c:3896
+#: ../src/e-util/e-web-view.c:4104
 #, c-format
-msgid "Saving image to '%s'"
-msgstr "Tallennetaan kuva kohteeseen \"%s\""
+#| msgid "Saving image to '%s'"
+msgid "Saving image to “%s”"
+msgstr "Tallennetaan kuva kohteeseen “%s”"
 
-#: ../e-util/e-web-view.c:3991
+#: ../src/e-util/e-web-view.c:4199
 #, c-format
-msgid "Cannot get URI '%s', do not know how to download it."
+msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:430
-msgid "Undo 'Insert text'"
+#: ../src/e-util/e-widget-undo.c:428
+msgid "Undo “Insert text”"
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:432
-msgid "Redo 'Insert text'"
+#: ../src/e-util/e-widget-undo.c:430
+msgid "Redo “Insert text”"
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:446
-msgid "Undo 'Delete text'"
+#: ../src/e-util/e-widget-undo.c:444
+msgid "Undo “Delete text”"
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:448
-msgid "Redo 'Delete text'"
+#: ../src/e-util/e-widget-undo.c:446
+msgid "Redo “Delete text”"
 msgstr ""
 
-#: ../e-util/filter.error.xml.h:1
+#: ../src/e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Päiväys puuttuu."
 
-#: ../e-util/filter.error.xml.h:2
+#: ../src/e-util/filter.error.xml.h:2
 msgid "You must choose a date."
 msgstr "Unohdit valita päivän."
 
-#: ../e-util/filter.error.xml.h:3
+#: ../src/e-util/filter.error.xml.h:3
 msgid "Missing filename."
 msgstr "Tiedostonimi puuttuu."
 
-#: ../e-util/filter.error.xml.h:4
+#: ../src/e-util/filter.error.xml.h:4
 msgid "You must specify a filename."
 msgstr "Tiedostonimi täytyy antaa."
 
-#: ../e-util/filter.error.xml.h:5
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr ""
-"Tiedostoa &quot;{0}&quot; ei ole olemassa tai se ei ole tavallinen tiedosto."
+#: ../src/e-util/filter.error.xml.h:5
+#| msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgid "File “{0}” does not exist or is not a regular file."
+msgstr "Tiedostoa “{0}” ei ole olemassa tai se ei ole tavallinen tiedosto."
 
-#: ../e-util/filter.error.xml.h:6
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "Virhe säännöllisessä lausekkeessa &quot;{0}&quot;."
+#: ../src/e-util/filter.error.xml.h:6
+#| msgid "Bad regular expression &quot;{0}&quot;."
+msgid "Bad regular expression “{0}”."
+msgstr "Virhe säännöllisessä lausekkeessa “{0}”."
 
-#: ../e-util/filter.error.xml.h:7
-msgid "Could not compile regular expression &quot;{1}&quot;."
+#: ../src/e-util/filter.error.xml.h:7
+#, fuzzy
+#| msgid "Could not compile regular expression &quot;{1}&quot;."
+msgid "Could not compile regular expression “{1}”."
 msgstr "Säännöllistä lauseketta &quot;{1}&quot; ei voi kääntää."
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:107
+#: ../src/e-util/filter.error.xml.h:8 ../src/mail/mail.error.xml.h:107
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
-#: ../e-util/filter.error.xml.h:9
+#: ../src/e-util/filter.error.xml.h:9
 msgid "You must name this filter."
 msgstr "Suodattimella täytyy olla nimi."
 
-#: ../e-util/filter.error.xml.h:10
-msgid "Name &quot;{0}&quot; already used."
-msgstr "Nimi &quot;{0}&quot; on jo käytössä."
+#: ../src/e-util/filter.error.xml.h:10
+#| msgid "Name &quot;{0}&quot; already used."
+msgid "Name “{0}” already used."
+msgstr "Nimi “{0}” on jo käytössä."
 
-#: ../e-util/filter.error.xml.h:11
+#: ../src/e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "Valitse toinen nimi."
 
-#: ../e-util/filter.error.xml.h:12
+#: ../src/e-util/filter.error.xml.h:12
 msgid "Missing condition."
 msgstr "Ehto puuttuu."
 
-#: ../e-util/filter.error.xml.h:13
+#: ../src/e-util/filter.error.xml.h:13
 msgid "Filter should have at least one condition."
 msgstr "Suodattimella tulee olla vähintään yksi ehto."
 
-#: ../e-util/filter.error.xml.h:14
+#: ../src/e-util/filter.error.xml.h:14
 msgid "Missing value."
 msgstr "Arvo puuttuu."
 
-#: ../e-util/filter.error.xml.h:15
+#: ../src/e-util/filter.error.xml.h:15
 msgid "One or more values cannot be empty."
 msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
 
-#: ../e-util/filter.error.xml.h:16
-#| msgid "Are you sure you want to delete the '{0}' task?"
-msgid "Are you sure you want to remove rule '{0}'?"
-msgstr "Haluatko varmasti poistaa säännön \"{0}\"?"
+#: ../src/e-util/filter.error.xml.h:16
+#| msgid "Are you sure you want to remove rule '{0}'?"
+msgid "Are you sure you want to remove rule “{0}”?"
+msgstr "Haluatko varmasti poistaa säännön “{0}”?"
 
-#: ../e-util/filter.error.xml.h:17
+#: ../src/e-util/filter.error.xml.h:17
 msgid "_Keep"
 msgstr "_Säilytä"
 
-#: ../e-util/filter.ui.h:2
+#: ../src/e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "tämänhetkinen aika"
 
-#: ../e-util/filter.ui.h:3
+#: ../src/e-util/filter.ui.h:3
 msgid "the time you specify"
 msgstr "määrittelemäsi aika"
 
-#: ../e-util/filter.ui.h:4
+#: ../src/e-util/filter.ui.h:4
 msgid "a time relative to the current time"
 msgstr "Aika suhteessa tämänhetkiseen aikaan"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:90
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:92
 msgid "seconds"
 msgstr "sekuntia"
 
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../src/e-util/filter.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "weeks"
 msgstr "viikkoa"
 
-#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../src/e-util/filter.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "kuukautta"
 
-#: ../e-util/filter.ui.h:11
+#: ../src/e-util/filter.ui.h:11
 msgid "years"
 msgstr "vuotta"
 
-#: ../e-util/filter.ui.h:12
+#: ../src/e-util/filter.ui.h:12
 msgid "ago"
 msgstr "sitten"
 
-#: ../e-util/filter.ui.h:13
+#: ../src/e-util/filter.ui.h:13
 msgid "in the future"
 msgstr "tulevaisuudessa"
 
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Sähköpostin näytön suodattimet:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "_Suodatinsäännöt"
-
-#: ../e-util/filter.ui.h:23
+#: ../src/e-util/filter.ui.h:14
 msgid "Compare against"
 msgstr "Vertaa arvoon"
 
-#: ../e-util/filter.ui.h:24
+#: ../src/e-util/filter.ui.h:15
+#, fuzzy
+#| msgid ""
+#| "The message's date will be compared against\n"
+#| "the current time when filtering occurs."
 msgid ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 "Viestin päiväystä verrataan aikaan, jolloin\n"
 "suodatus tapahtuu."
 
-#: ../e-util/filter.ui.h:26
+#: ../src/e-util/filter.ui.h:17
+#, fuzzy
+#| msgid ""
+#| "The message's date will be compared against\n"
+#| "12:00am of the date specified."
 msgid ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 "Viestin päiväystä verrataan määritellyn päivän\n"
 " keskipäivään (klo 12:00)."
 
-#: ../e-util/filter.ui.h:28
+#: ../src/e-util/filter.ui.h:19
+#, fuzzy
+#| msgid ""
+#| "The message's date will be compared against\n"
+#| "a time relative to when filtering occurs."
 msgid ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 "Viestin päiväystä verrataan suhteessa aikaan\n"
 "jolloin suodatus tapahtuu."
 
-#: ../e-util/gal-a11y-e-cell.c:130
+#: ../src/e-util/filter.ui.h:21
+msgid "Show filters for mail:"
+msgstr "Sähköpostin näytön suodattimet:"
+
+#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:163
+msgid "_Filter Rules"
+msgstr "_Suodatinsäännöt"
+
+#: ../src/e-util/gal-a11y-e-cell.c:128
 msgid "Table Cell"
 msgstr "Taulukon solu"
 
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:127
+#: ../src/e-util/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "Ponnauta lapsi"
 
 #. Translators: description of an "edit" action
-#: ../e-util/gal-a11y-e-cell-text.c:631
+#: ../src/e-util/gal-a11y-e-cell-text.c:631
 msgid "begin editing this cell"
 msgstr ""
 
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:185
+#: ../src/e-util/gal-a11y-e-cell-toggle.c:183
 msgid "toggle the cell"
 msgstr "Vaihtele solun näkyvyyttä"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:215
+#: ../src/e-util/gal-a11y-e-cell-tree.c:213
 msgid "expands the row in the ETree containing this cell"
 msgstr "laajentaa tämän solun sisältävän rivin ETreessä"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:223
+#: ../src/e-util/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "piilota tämän solun sisältävä ETreen rivi"
 
-#: ../e-util/gal-a11y-e-table-click-to-add.c:71
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:69
 msgid "click"
 msgstr "napsauta"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:162
+#: ../src/e-util/gal-a11y-e-table-column-header.c:160
 msgid "sort"
 msgstr "järjestä"
 
-#: ../e-util/gal-view-instance-save-as-dialog.c:295
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:293
 msgid "Save Current View"
 msgstr "Tallenna nykyinen näkymä"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "Luo uusi _näkymä"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
-#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:201
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:201
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: ../e-util/widgets.error.xml.h:2
+#: ../src/e-util/widgets.error.xml.h:2
 msgid "This signature has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
-#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:203
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:203
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
-#: ../e-util/widgets.error.xml.h:4
+#: ../src/e-util/widgets.error.xml.h:4
 msgid "Blank Signature"
 msgstr "Tyhjä allekirjoitus"
 
-#: ../e-util/widgets.error.xml.h:5
+#: ../src/e-util/widgets.error.xml.h:5
 msgid "Please provide an unique name to identify this signature."
 msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
 
-#: ../e-util/widgets.error.xml.h:6
+#: ../src/e-util/widgets.error.xml.h:6
 msgid "Unable to copy image to clipboard."
 msgstr "Kuvan kopioiminen leikepödälle ei onnistu."
 
-#: ../e-util/widgets.error.xml.h:7
+#: ../src/e-util/widgets.error.xml.h:7
 msgid "Unable to save image."
 msgstr "Kuvan tallennus ei onnistu."
 
-#: ../e-util/widgets.error.xml.h:8
+#: ../src/e-util/widgets.error.xml.h:8
 msgid "Could not load signature."
 msgstr "Allekirjoitusta ei voi ladata."
 
-#: ../e-util/widgets.error.xml.h:9
+#: ../src/e-util/widgets.error.xml.h:9
 msgid "Could not save signature."
 msgstr "Allekirjoitusta ei voi tallentaa."
 
-#: ../evolution.appdata.xml.in.h:3
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution on henkilökohtaisen tiedon hallintasovellus, joka tarjoaa "
-"sähköpostin, kalenterin ja osoitekirjan."
-
-#: ../evolution.appdata.xml.in.h:4
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolution tukee lukuisia standardeja tiedostomuotoja ja verkkoprotokollia "
-"tiedonvaihtoa varten, painoarvoa on asetettu erityisesti standardien "
-"noudattamiseen ja tietoturvaan. Evolution voi myös integroitua Microsoft "
-"Exchange -palvelimeen Exchange Web Services (EWS) -laajennuksen avulla."
-
-#: ../libemail-engine/camel-sasl-oauth2-google.c:29
+#: ../src/libemail-engine/camel-sasl-oauth2-google.c:27
 msgid "OAuth2 Google"
 msgstr "OAuth2 Google"
 
-#: ../libemail-engine/camel-sasl-oauth2-google.c:30
+#: ../src/libemail-engine/camel-sasl-oauth2-google.c:28
 msgid ""
 "This option will use an OAuth 2.0 access token to connect to the Google "
 "server"
 msgstr ""
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:26
+#: ../src/libemail-engine/camel-sasl-xoauth2.c:27
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#: ../src/libemail-engine/camel-sasl-xoauth2.c:28
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:115
+#: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
-msgid "Saving message to folder '%s'"
-msgstr "Tallennetaan viestiä kansioon ”%s”"
+#| msgid "Saving message to folder '%s'"
+msgid "Saving message to folder “%s”"
+msgstr "Tallennetaan viesti kansioon “%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:574
+#: ../src/libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:946
+#: ../src/libemail-engine/e-mail-folder-utils.c:675
+#: ../src/libemail-engine/e-mail-folder-utils.c:937
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Noudetaan %d viesti"
 msgstr[1] "Noudetaan %d viestiä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:786
+#: ../src/libemail-engine/e-mail-folder-utils.c:777
 msgid "Scanning messages for duplicates"
 msgstr "Etsitään kaksoiskappaleita viesteistä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1159
+#: ../src/libemail-engine/e-mail-folder-utils.c:1150
 #, c-format
-msgid "Removing folder '%s'"
-msgstr "Poistetaan kansiota ”%s”"
+#| msgid "Removing folder '%s'"
+msgid "Removing folder “%s”"
+msgstr "Poistetaan kansiota “%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1340
+#: ../src/libemail-engine/e-mail-folder-utils.c:1331
 #, c-format
-msgid "File \"%s\" has been removed."
-msgstr "Tiedosto \"%s\" on poistettu."
+#| msgid "File \"%s\" has been removed."
+msgid "File “%s” has been removed."
+msgstr "Tiedosto “%s” on poistettu."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1344
+#: ../src/libemail-engine/e-mail-folder-utils.c:1335
 msgid "File has been removed."
 msgstr "Tiedosto on poistettu."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1421
+#: ../src/libemail-engine/e-mail-folder-utils.c:1411
 msgid "Removing attachments"
 msgstr "Poistetaan liitteitä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1593
+#: ../src/libemail-engine/e-mail-folder-utils.c:1583
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1971
+#: ../src/libemail-engine/e-mail-folder-utils.c:1961
 #, fuzzy, c-format
-msgid "Invalid folder URI '%s'"
+msgid "Invalid folder URI “%s”"
 msgstr "Virheellinen kansio: ”%s”"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-properties.c:778
-#: ../mail/em-folder-tree-model.c:1212 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1053
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../src/libemail-engine/e-mail-session.c:125
+#: ../src/mail/em-folder-properties.c:1150
+#: ../src/mail/em-folder-tree-model.c:1236
+#: ../src/mail/importers/kmail-libs.c:139
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
+#: ../src/modules/mail/e-mail-shell-view-private.c:1037
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1205
-#: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../src/libemail-engine/e-mail-session.c:126
+#: ../src/mail/em-folder-tree-model.c:1229
+#: ../src/mail/importers/kmail-libs.c:145
+#: ../src/modules/mail/e-mail-shell-view-private.c:1024
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1216
-#: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../src/libemail-engine/e-mail-session.c:127
+#: ../src/mail/em-folder-tree-model.c:1240
+#: ../src/mail/importers/kmail-libs.c:141
+#: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:130 ../mail/em-folder-tree-model.c:1220
-#: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1057
+#: ../src/libemail-engine/e-mail-session.c:128
+#: ../src/mail/em-folder-tree-model.c:1244
+#: ../src/mail/importers/kmail-libs.c:143
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:131 ../mail/em-folder-tree-model.c:1208
-#: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1059
-#: ../plugins/templates/e-templates-store.c:2214
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../src/libemail-engine/e-mail-session.c:129
+#: ../src/mail/em-folder-tree-model.c:1232
+#: ../src/mail/importers/kmail-libs.c:147
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/plugins/templates/e-templates-store.c:2212
+#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../libemail-engine/e-mail-session.c:1305
+#: ../src/libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../libemail-engine/e-mail-session.c:1362
+#: ../src/libemail-engine/e-mail-session.c:1389
 #, fuzzy, c-format
 #| msgid ""
 #| "No destination address provided, forward of the message has been "
@@ -15249,86 +15967,93 @@ msgid ""
 "cancelled."
 msgstr "Kohdeosoitetta ei annettu, viestin edelleenlähetys on peruttu."
 
-#: ../libemail-engine/e-mail-session.c:1375
+#: ../src/libemail-engine/e-mail-session.c:1402
 #, 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."
 
-#: ../libemail-engine/e-mail-session.c:2405
+#: ../src/libemail-engine/e-mail-session.c:2444
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
-msgid "Waiting for '%s'"
+msgid "Waiting for “%s”"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:540
+#: ../src/libemail-engine/e-mail-session-utils.c:524
 #, fuzzy
 #| msgid "No HTML stream available"
 msgid "No mail transport service available"
 msgstr "HTML-virtaa ei ole saatavilla"
 
-#: ../libemail-engine/e-mail-session-utils.c:630
-#: ../libemail-engine/mail-ops.c:720
+#: ../src/libemail-engine/e-mail-session-utils.c:614
+#: ../src/libemail-engine/mail-ops.c:706
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
-msgid "Posting message to '%s'"
+msgid "Posting message to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:667
-#: ../libemail-engine/mail-ops.c:756
+#: ../src/libemail-engine/e-mail-session-utils.c:651
+#: ../src/libemail-engine/mail-ops.c:742
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:697
-#: ../libemail-engine/e-mail-session-utils.c:732
-#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:815
+#: ../src/libemail-engine/e-mail-session-utils.c:681
+#: ../src/libemail-engine/e-mail-session-utils.c:716
+#: ../src/libemail-engine/mail-ops.c:766 ../src/libemail-engine/mail-ops.c:801
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
-msgid "Storing sent message to '%s'"
+msgid "Storing sent message to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:721
-#: ../libemail-engine/mail-ops.c:804
-#, c-format
+#: ../src/libemail-engine/e-mail-session-utils.c:705
+#: ../src/libemail-engine/mail-ops.c:790
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to append to %s: %s\n"
+#| "Appending to local 'Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
+"Appending to local “Sent” folder instead."
 msgstr ""
 "Kansioon %s lisääminen epäonnistui: %s\n"
 "Lisätään paikalliseen ”Lähetetyt”-kansioon."
 
-#: ../libemail-engine/e-mail-session-utils.c:751
-#: ../libemail-engine/mail-ops.c:832
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
+#: ../src/libemail-engine/e-mail-session-utils.c:735
+#: ../src/libemail-engine/mail-ops.c:818
+#, 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"
 
-#: ../libemail-engine/e-mail-session-utils.c:953
-#: ../libemail-engine/mail-ops.c:995 ../libemail-engine/mail-ops.c:1097
+#: ../src/libemail-engine/e-mail-session-utils.c:923
+#: ../src/libemail-engine/mail-ops.c:978 ../src/libemail-engine/mail-ops.c:1080
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: ../libemail-engine/e-mail-store-utils.c:190
-#, c-format
-msgid "Disconnecting from '%s'"
+#: ../src/libemail-engine/e-mail-store-utils.c:188
+#, fuzzy, c-format
+#| msgid "Disconnecting from '%s'"
+msgid "Disconnecting from “%s”"
 msgstr "Katkaistaan yhteys kohteeseen ”%s”"
 
-#: ../libemail-engine/e-mail-store-utils.c:266
-#, c-format
-msgid "Reconnecting to '%s'"
+#: ../src/libemail-engine/e-mail-store-utils.c:264
+#, fuzzy, c-format
+#| msgid "Reconnecting to '%s'"
+msgid "Reconnecting to “%s”"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../libemail-engine/e-mail-store-utils.c:351
-#, c-format
-msgid "Preparing account '%s' for offline"
+#: ../src/libemail-engine/e-mail-store-utils.c:349
+#, fuzzy, c-format
+#| msgid "Preparing account '%s' for offline"
+msgid "Preparing account “%s” for offline"
 msgstr "Valmistellaan tiliä \"%s\" yhteydettömään tilaan"
 
-#: ../libemail-engine/mail-ops.c:90
+#: ../src/libemail-engine/mail-ops.c:88
 msgid "Filtering Selected Messages"
 msgstr "Suodatetaan valittuja viestejä"
 
-#: ../libemail-engine/mail-ops.c:148
+#: ../src/libemail-engine/mail-ops.c:146
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
@@ -15337,12 +16062,13 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:229
-#, c-format
-msgid "Fetching mail from '%s'"
+#: ../src/libemail-engine/mail-ops.c:226
+#, fuzzy, c-format
+#| msgid "Fetching mail from '%s'"
+msgid "Fetching mail from “%s”"
 msgstr "Noudetaan viestejä kohteesta '%s'"
 
-#: ../libemail-engine/mail-ops.c:750
+#: ../src/libemail-engine/mail-ops.c:736
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -15351,90 +16077,100 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1006
+#: ../src/libemail-engine/mail-ops.c:989
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: ../libemail-engine/mail-ops.c:1058
+#. 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:1041
 #, 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"
 
-#: ../libemail-engine/mail-ops.c:1064
-#| msgid "Cancelled"
+#: ../src/libemail-engine/mail-ops.c:1047
 msgid "Cancelled."
 msgstr "Peruttu."
 
-#: ../libemail-engine/mail-ops.c:1066
+#: ../src/libemail-engine/mail-ops.c:1049
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../libemail-engine/mail-ops.c:1182
-#, c-format
-msgid "Moving messages to '%s'"
+#: ../src/libemail-engine/mail-ops.c:1164
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Moving messages to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1183
-#, c-format
-msgid "Copying messages to '%s'"
+#: ../src/libemail-engine/mail-ops.c:1165
+#, fuzzy, c-format
+#| msgid "Copying messages to '%s'"
+msgid "Copying messages to “%s”"
 msgstr "Kopioidaan viestejä kansioon ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1302
-#, c-format
-msgid "Storing folder '%s'"
+#: ../src/libemail-engine/mail-ops.c:1284
+#, fuzzy, c-format
+#| msgid "Storing folder '%s'"
+msgid "Storing folder “%s”"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../libemail-engine/mail-ops.c:1430
-#, c-format
-msgid "Expunging and storing account '%s'"
+#: ../src/libemail-engine/mail-ops.c:1412
+#, fuzzy, c-format
+#| msgid "Expunging and storing account '%s'"
+msgid "Expunging and storing account “%s”"
 msgstr "Siivotaan ja tallennetaan tiliä ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1431
-#, c-format
-msgid "Storing account '%s'"
+#: ../src/libemail-engine/mail-ops.c:1413
+#, fuzzy, c-format
+#| msgid "Storing account '%s'"
+msgid "Storing account “%s”"
 msgstr "Tallennetaan tiliä ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1506
-#, c-format
-msgid "Emptying trash in '%s'"
+#: ../src/libemail-engine/mail-ops.c:1488
+#, fuzzy, c-format
+#| msgid "Emptying trash in '%s'"
+msgid "Emptying trash in “%s”"
 msgstr "Tyhjennetään roskakoria ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1598
+#: ../src/libemail-engine/mail-ops.c:1580
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
-msgid "Processing folder changes in '%s'"
+msgid "Processing folder changes in “%s”"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../libemail-engine/mail-tools.c:70
+#: ../src/libemail-engine/mail-tools.c:68
 #, c-format
-msgid "Could not create spool directory '%s': %s"
+msgid "Could not create spool directory “%s”: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-tools.c:110
+#: ../src/libemail-engine/mail-tools.c:108
 #, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
+msgid "Trying to movemail a non-mbox source “%s”"
 msgstr ""
 
-#: ../libemail-engine/mail-tools.c:236
-#, c-format
-msgid "Forwarded message - %s"
+#: ../src/libemail-engine/mail-tools.c:257
+#, fuzzy, c-format
+#| msgid "Forwarded message - %s"
+msgid "Forwarded message — %s"
 msgstr "Välitetty viesti - %s"
 
-#: ../libemail-engine/mail-tools.c:238
+#: ../src/libemail-engine/mail-tools.c:259
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: ../libemail-engine/mail-vfolder.c:151
+#: ../src/libemail-engine/mail-vfolder.c:149
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Määritellään hakunäkymää: %s"
 
-#: ../libemail-engine/mail-vfolder.c:304
-#, c-format
-msgid "Updating Search Folders for '%s' - %s"
+#: ../src/libemail-engine/mail-vfolder.c:302
+#, fuzzy, c-format
+#| msgid "Updating Search Folders for '%s' - %s"
+msgid "Updating Search Folders for “%s : %s”"
 msgstr "Päivitetään hakukansioita - '%s' - %s"
 
 #. Translators: The first %s is name of the affected
@@ -15442,16 +16178,23 @@ msgstr "Päivitetään hakukansioita - '%s' - %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:668
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
+#: ../src/libemail-engine/mail-vfolder.c:666
+#, fuzzy, c-format
+#| msgid ""
+#| "The Search Folder \"%s\" has been modified to account for the deleted "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following Search Folders\n"
+#| "%s have been modified to account for the deleted folder\n"
+#| "\"%s\"."
+msgid ""
+"The Search Folder “%s” has been modified to account for the deleted folder\n"
+"“%s”."
 msgid_plural ""
 "The following Search Folders\n"
 "%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+"“%s”."
 msgstr[0] ""
 "Hakunäkymää ”%s” on muokattu ottamaan huomioon poistettu kansio \n"
 "”%s”."
@@ -15460,91 +16203,101 @@ msgstr[1] ""
 "%s on muokattu ottamaan huomioon poistettu kansio \n"
 "”%s”."
 
-#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
+#: ../src/mail/e-mail-account-manager.c:118
+#: ../src/mail/e-mail-account-manager.c:205
 msgid "Open _Online Accounts"
 msgstr "Avaa _verkkotilit"
 
-#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
+#: ../src/mail/e-mail-account-manager.c:144
+#: ../src/mail/e-mail-account-manager.c:231
 msgid "This account was created through the Online Accounts service."
 msgstr "Tämä tili luotiin verkkotilipalvelun kautta."
 
-#: ../mail/e-mail-account-manager.c:689
+#: ../src/mail/e-mail-account-manager.c:690
 msgid "_Reset Order"
 msgstr "_Palauta järjestys"
 
-#: ../mail/e-mail-account-manager.c:702
+#: ../src/mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr ""
 "Voit vetää ja tippuuttaa tilinimiä määrittääksesi niiden järjestyksen "
 "uudelleen."
 
-#: ../mail/e-mail-account-manager.c:745
+#: ../src/mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "_Oletustili"
 
-#: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1281
-#: ../modules/plugin-manager/evolution-plugin-manager.c:357
-#: ../plugins/publish-calendar/publish-calendar.c:855
+#: ../src/mail/e-mail-account-tree-view.c:84
+#: ../src/modules/mail/em-composer-prefs.c:1299
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
 msgid "Enabled"
 msgstr "käytössä"
 
-#: ../mail/e-mail-account-tree-view.c:107
+#: ../src/mail/e-mail-account-tree-view.c:108
 msgid "Account Name"
 msgstr "Tilin nimi"
 
-#: ../mail/e-mail-autoconfig.c:619
+#: ../src/mail/e-mail-autoconfig.c:620
 msgid "No email address provided"
 msgstr "Sähköpostiosoitetta ei annettu."
 
-#: ../mail/e-mail-autoconfig.c:628
+#: ../src/mail/e-mail-autoconfig.c:629
 msgid "Missing domain in email address"
 msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
-#: ../mail/e-mail-browser.c:131 ../shell/e-shell-window-actions.c:773
-#: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
+#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:782
+#: ../src/shell/e-shell-window-actions.c:789
+#: ../src/shell/e-shell-window-actions.c:796
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../mail/e-mail-browser.c:289
+#: ../src/mail/e-mail-browser.c:287
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
 #. GtkAssistant's back button label.
-#: ../mail/e-mail-config-assistant.c:46
+#: ../src/mail/e-mail-config-assistant.c:47
 msgid "Go _Back"
 msgstr "Siirr_y takaisin"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:115
+#: ../src/mail/e-mail-config-assistant.c:116
 msgid "_Skip Lookup"
 msgstr "_Ohita haku"
 
-#: ../mail/e-mail-config-assistant.c:660
+#: ../src/mail/e-mail-config-assistant.c:661
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: ../mail/e-mail-config-assistant.c:954
+#: ../src/mail/e-mail-config-assistant.c:955
 msgid "_Revise Details"
 msgstr "_Tarkista tiedot"
 
-#: ../mail/e-mail-config-auth-check.c:177
+#: ../src/mail/e-mail-config-auth-check.c:178
 #, fuzzy
 #| msgid "%s authentication failed"
 msgid "Querying authentication types..."
 msgstr "%s-tunnistautuminen epäonnistui"
 
-#: ../mail/e-mail-config-auth-check.c:340
+#: ../src/mail/e-mail-config-auth-check.c:341
 msgid "Check for Supported Types"
 msgstr "Tarkista tuetut tyypit"
 
-#: ../mail/e-mail-config-confirm-page.c:155
+#: ../src/mail/e-mail-config-confirm-page.c:156
+#, fuzzy
+#| msgid ""
+#| "Congratulations, your mail configuration is complete.\n"
+#| "\n"
+#| "You are now ready to send and receive email using Evolution.\n"
+#| "\n"
+#| "Click \"Apply\" to save your settings."
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email using Evolution.\n"
 "\n"
-"Click \"Apply\" to save your settings."
+"Click “Apply” to save your settings."
 msgstr ""
 "Onneksi olkoon, sähköpostiasetuksesi ovat nyt valmiit.\n"
 "\n"
@@ -15552,625 +16305,659 @@ msgstr ""
 "\n"
 "Tallenna asetuksesi napsauttamalla painiketta \"Toteuta\"."
 
-#: ../mail/e-mail-config-confirm-page.c:167
+#: ../src/mail/e-mail-config-confirm-page.c:168
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/e-mail-config-defaults-page.c:377
+#: ../src/mail/e-mail-config-defaults-page.c:378
 msgid "Checking server settings..."
 msgstr "Tarkistetaan palvelimen asetuksia..."
 
-#: ../mail/e-mail-config-defaults-page.c:495
+#: ../src/mail/e-mail-config-defaults-page.c:496
 #, fuzzy
 #| msgid "Use locale default"
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Käytä oletusaikavyöhykettä"
 
-#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:26
+#: ../src/mail/e-mail-config-defaults-page.c:498
+#: ../src/mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../mail/e-mail-config-defaults-page.c:499 ../mail/mail-config.ui.h:27
+#: ../src/mail/e-mail-config-defaults-page.c:500
+#: ../src/mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Sisennetty (Outlookin tapaan)"
 
-#: ../mail/e-mail-config-defaults-page.c:501 ../mail/mail-config.ui.h:28
+#: ../src/mail/e-mail-config-defaults-page.c:502
+#: ../src/mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
+#: ../src/mail/e-mail-config-defaults-page.c:504
+#: ../src/mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Älä lainaa"
 
-#: ../mail/e-mail-config-defaults-page.c:829
+#: ../src/mail/e-mail-config-defaults-page.c:830
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: ../mail/e-mail-config-defaults-page.c:838
+#: ../src/mail/e-mail-config-defaults-page.c:839
 msgid "Draft Messages _Folder:"
 msgstr "Luonnosviestin _kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:848
+#: ../src/mail/e-mail-config-defaults-page.c:849
 msgid "Choose a folder for saving draft messages."
 msgstr "Valitse tallennuskansio luonnosviesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:862
+#: ../src/mail/e-mail-config-defaults-page.c:863
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:872
+#: ../src/mail/e-mail-config-defaults-page.c:873
 msgid "Choose a folder for saving sent messages."
 msgstr "Valitse tallennuskansio lähetetyille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:891
+#: ../src/mail/e-mail-config-defaults-page.c:892
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:908
-#| msgid "Search Folders"
+#: ../src/mail/e-mail-config-defaults-page.c:909
 msgid "Archi_ve Folder:"
 msgstr "A_rkistointikansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:918
-#: ../modules/mail/em-mailer-prefs.c:1403
-#| msgid "Choose folders to post the message to."
+#: ../src/mail/e-mail-config-defaults-page.c:919
+#: ../src/modules/mail/em-mailer-prefs.c:1401
 msgid "Choose a folder to archive messages to."
 msgstr "Valitse kansio johon viesti arkistoidaan."
 
-#: ../mail/e-mail-config-defaults-page.c:932
+#: ../src/mail/e-mail-config-defaults-page.c:933
 #, fuzzy
 #| msgid "Template:"
 msgid "_Templates Folder:"
 msgstr "Pohja:"
 
-#: ../mail/e-mail-config-defaults-page.c:942
+#: ../src/mail/e-mail-config-defaults-page.c:943
 #, fuzzy
 #| msgid "Choose a folder for deleted messages."
 msgid "Choose a folder to use for template messages."
 msgstr "Valitse kansio poistetuille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:964
+#: ../src/mail/e-mail-config-defaults-page.c:965
 msgid "_Restore Defaults"
 msgstr "_Palauta oletukset"
 
-#: ../mail/e-mail-config-defaults-page.c:981
+#: ../src/mail/e-mail-config-defaults-page.c:982
 #, fuzzy
 #| msgid "Go to Folder"
 msgid "_Lookup Folders"
 msgstr "Siirry kansioon"
 
-#: ../mail/e-mail-config-defaults-page.c:999
+#: ../src/mail/e-mail-config-defaults-page.c:1000
 msgid "Use a Real Folder for _Trash:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:1000
+#: ../src/mail/e-mail-config-defaults-page.c:1001
 msgid "Choose a folder for deleted messages."
 msgstr "Valitse kansio poistetuille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:1009
+#: ../src/mail/e-mail-config-defaults-page.c:1010
 msgid "Use a Real Folder for _Junk:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:1010
+#: ../src/mail/e-mail-config-defaults-page.c:1011
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for junk messages."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../mail/e-mail-config-defaults-page.c:1027
+#: ../src/mail/e-mail-config-defaults-page.c:1028
 msgid "Composing Messages"
 msgstr "Viestien kirjoittaminen"
 
-#: ../mail/e-mail-config-defaults-page.c:1036
+#: ../src/mail/e-mail-config-defaults-page.c:1037
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:1061
+#: ../src/mail/e-mail-config-defaults-page.c:1062
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:1092
+#: ../src/mail/e-mail-config-defaults-page.c:1093
 #, fuzzy
 #| msgid "_Reply style:"
 msgid "Re_ply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/e-mail-config-defaults-page.c:1128
+#: ../src/mail/e-mail-config-defaults-page.c:1129
 msgid "Message Receipts"
 msgstr "Viestin kuittaukset"
 
-#: ../mail/e-mail-config-defaults-page.c:1137
+#: ../src/mail/e-mail-config-defaults-page.c:1138
 msgid "S_end message receipts:"
 msgstr "Läh_etä viestin kuittaus:"
 
-#: ../mail/e-mail-config-defaults-page.c:1162
+#: ../src/mail/e-mail-config-defaults-page.c:1163
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../mail/e-mail-config-defaults-page.c:1168
+#: ../src/mail/e-mail-config-defaults-page.c:1169
 msgid "Always"
 msgstr "Aina"
 
-#: ../mail/e-mail-config-defaults-page.c:1174
+#: ../src/mail/e-mail-config-defaults-page.c:1175
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../mail/e-mail-config-defaults-page.c:1281
+#: ../src/mail/e-mail-config-defaults-page.c:1282
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
-#: ../mail/e-mail-config-identity-page.c:304
+#: ../src/mail/e-mail-config-identity-page.c:516
+#, fuzzy
+#| msgid ""
+#| "Please enter your name and email address below. The \"optional\" fields "
+#| "below do not need to be filled in, unless you wish to include this "
+#| "information in email you send."
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"Please enter your name and email address below. The “optional” fields below "
+"do not need to be filled in, unless you wish to include this information in "
+"email you send."
 msgstr ""
 "Syötä nimesi ja sähköpostiosoitteesi alla oleviin kenttiin. Valinnaiset "
 "tiedot eivät ole pakollisia, mutta täyttämällä kyseiset kentät voit lisätä "
 "tiedot lähettämiisi sähköpostiviesteihin."
 
-#: ../mail/e-mail-config-identity-page.c:332
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../src/mail/e-mail-config-identity-page.c:544
+#: ../src/mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: ../mail/e-mail-config-identity-page.c:370
-#: ../mail/e-mail-config-summary-page.c:353
+#: ../src/mail/e-mail-config-identity-page.c:582
+#: ../src/mail/e-mail-config-summary-page.c:354
+#, fuzzy
 #| msgid ""
-#| "Type the name by which you would like to refer to this account.\n"
-#| "For example, \"Work\" or \"Personal\"."
+#| "The above name will be used to identify this account.\n"
+#| "Use for example, \"Work\" or \"Personal\"."
 msgid ""
 "The above name will be used to identify this account.\n"
-"Use for example, \"Work\" or \"Personal\"."
+"Use for example, “Work” or “Personal”."
 msgstr ""
 "Yllä olevaa nimeä käytetään tilin yksilöintiin.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtainen\""
 
-#: ../mail/e-mail-config-identity-page.c:387
+#: ../src/mail/e-mail-config-identity-page.c:599
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: ../mail/e-mail-config-identity-page.c:396
+#: ../src/mail/e-mail-config-identity-page.c:608
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/e-mail-config-identity-page.c:425
+#: ../src/mail/e-mail-config-identity-page.c:637
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: ../mail/e-mail-config-identity-page.c:474
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../src/mail/e-mail-config-identity-page.c:686
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: ../mail/e-mail-config-identity-page.c:483
+#: ../src/mail/e-mail-config-identity-page.c:695
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/e-mail-config-identity-page.c:512
+#: ../src/mail/e-mail-config-identity-page.c:724
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/e-mail-config-identity-page.c:567
+#: ../src/mail/e-mail-config-identity-page.c:779
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi _allekirjoitus..."
 
-#: ../mail/e-mail-config-identity-page.c:585
+#: ../src/mail/e-mail-config-identity-page.c:793
+msgid "A_liases:"
+msgstr ""
+
+#: ../src/mail/e-mail-config-identity-page.c:855
+#: ../src/mail/mail-config.ui.h:113
+msgid "Add"
+msgstr "Lisää"
+
+#: ../src/mail/e-mail-config-identity-page.c:864
+#| msgid "_Edit"
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: ../src/mail/e-mail-config-identity-page.c:873
+#: ../src/mail/mail-config.ui.h:114
+msgid "Remove"
+msgstr "Poista"
+
+#: ../src/mail/e-mail-config-identity-page.c:887
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "_Etsi postipalvelimen tiedot pohjautuen sähköpostiosoitteeseen"
 
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
-#: ../mail/e-mail-config-identity-page.c:630
-#| msgid "Full Name cannot be empty"
+#: ../src/mail/e-mail-config-identity-page.c:934
 msgid "Full Name should not be empty"
 msgstr "Koko nimi ei voi olla tyhjä"
 
-#: ../mail/e-mail-config-identity-page.c:637
+#: ../src/mail/e-mail-config-identity-page.c:941
 msgid "Email Address cannot be empty"
 msgstr "Sähköpostiosoite ei voi olla tyhjä"
 
-#: ../mail/e-mail-config-identity-page.c:642
+#: ../src/mail/e-mail-config-identity-page.c:946
 msgid "Email Address is not a valid email"
 msgstr "Sähköpostiosoite ei ole kelvollinen osoite"
 
-#: ../mail/e-mail-config-identity-page.c:654
+#: ../src/mail/e-mail-config-identity-page.c:958
 msgid "Reply To is not a valid email"
 msgstr "Vastausosoite ei ole kelvollinen osoite"
 
-#: ../mail/e-mail-config-identity-page.c:665
-#: ../mail/e-mail-config-summary-page.c:632
+#: ../src/mail/e-mail-config-identity-page.c:969
+#: ../src/mail/e-mail-config-summary-page.c:633
 msgid "Account Name cannot be empty"
 msgstr "Tilin nimi ei voi olla tyhjä"
 
-#: ../mail/e-mail-config-lookup-page.c:70
+#: ../src/mail/e-mail-config-lookup-page.c:69
 msgid "Looking up account details..."
 msgstr "Etsitään tilin tietoja..."
 
-#: ../mail/e-mail-config-provider-page.c:484
+#: ../src/mail/e-mail-config-provider-page.c:529
 msgid "Checking for New Mail"
 msgstr "Tarkistetaan uusia viestejä"
 
-#: ../mail/e-mail-config-provider-page.c:500
+#: ../src/mail/e-mail-config-provider-page.c:545
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../mail/e-mail-config-provider-page.c:698
+#: ../src/mail/e-mail-config-provider-page.c:753
 msgid "Receiving Options"
 msgstr "Vastaanottoasetukset"
 
-#: ../mail/e-mail-config-receiving-page.c:49
+#: ../src/mail/e-mail-config-receiving-page.c:50
 msgid "Receiving Email"
 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.
-#: ../mail/e-mail-config-security-page.c:251
+#: ../src/mail/e-mail-config-security-page.c:231
 #, c-format
 msgctxt "PGPKeyDescription"
-msgid "%s - %s"
-msgstr "%s - %s"
-
-#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:701
-#: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.c:620
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
-#: ../modules/mail/e-mail-shell-backend.c:731
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "%s — %s"
+msgstr "%s — %s"
+
+#: ../src/mail/e-mail-config-security-page.c:320
+#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:31
+#: ../src/modules/addressbook/autocompletion-config.c:114
+#: ../src/modules/calendar/e-calendar-preferences.c:644
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:48
+#: ../src/modules/mail/e-mail-shell-backend.c:729
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Yleiset"
 
-#: ../mail/e-mail-config-security-page.c:349
+#: ../src/mail/e-mail-config-security-page.c:329
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../mail/e-mail-config-security-page.c:371
+#: ../src/mail/e-mail-config-security-page.c:351
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP) -salaus"
 
-#: ../mail/e-mail-config-security-page.c:380
+#: ../src/mail/e-mail-config-security-page.c:360
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP_-avaimen ID:"
 
-#: ../mail/e-mail-config-security-page.c:413
+#: ../src/mail/e-mail-config-security-page.c:393
 msgid "Si_gning algorithm:"
 msgstr "_Allekirjoitusalgoritmi:"
 
-#: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:593 ../mail/mail-config.ui.h:74
+#: ../src/mail/e-mail-config-security-page.c:409
+#: ../src/mail/e-mail-config-security-page.c:573
+#: ../src/mail/mail-config.ui.h:76
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:596 ../mail/mail-config.ui.h:75
+#: ../src/mail/e-mail-config-security-page.c:412
+#: ../src/mail/e-mail-config-security-page.c:576
+#: ../src/mail/mail-config.ui.h:77
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:599 ../mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-config-security-page.c:415
+#: ../src/mail/e-mail-config-security-page.c:579
+#: ../src/mail/mail-config.ui.h:78
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:602 ../mail/mail-config.ui.h:77
+#: ../src/mail/e-mail-config-security-page.c:418
+#: ../src/mail/e-mail-config-security-page.c:582
+#: ../src/mail/mail-config.ui.h:79
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:454
+#: ../src/mail/e-mail-config-security-page.c:434
 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ä"
 
-#: ../mail/e-mail-config-security-page.c:466
-#, fuzzy
+#: ../src/mail/e-mail-config-security-page.c:446
 #| msgid "Always encrypt outgoing messages when using this account"
 msgid "Always enc_rypt outgoing messages when using this account"
-msgstr "Salaa aina lähtevät viestit käytettäessä tätä tiliä"
+msgstr "Salaa aina lä_htevät viestit käytettäessä tätä tiliä"
 
-#: ../mail/e-mail-config-security-page.c:478
+#: ../src/mail/e-mail-config-security-page.c:458
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 
-#: ../mail/e-mail-config-security-page.c:490
+#: ../src/mail/e-mail-config-security-page.c:470
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../mail/e-mail-config-security-page.c:502
+#: ../src/mail/e-mail-config-security-page.c:482
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../src/mail/e-mail-config-security-page.c:506
 msgid "Secure MIME (S/MIME)"
 msgstr "Suojattu MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:535
+#: ../src/mail/e-mail-config-security-page.c:515
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/e-mail-config-security-page.c:559
-#: ../mail/e-mail-config-security-page.c:665
+#: ../src/mail/e-mail-config-security-page.c:539
+#: ../src/mail/e-mail-config-security-page.c:637
 msgid "Select"
 msgstr "Valitse"
 
-#: ../mail/e-mail-config-security-page.c:568
-#: ../mail/e-mail-config-security-page.c:674 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:876
+#: ../src/mail/e-mail-config-security-page.c:548
+#: ../src/mail/e-mail-config-security-page.c:646
+#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:885
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../mail/e-mail-config-security-page.c:577
+#: ../src/mail/e-mail-config-security-page.c:557
 msgid "Signing _algorithm:"
 msgstr "Allekirjoitus_algoritmi:"
 
-#: ../mail/e-mail-config-security-page.c:618
+#: ../src/mail/e-mail-config-security-page.c:598
 msgid "Always sign outgoing messages when using this account"
 msgstr "Allekirjoita aina lähtevät viestit käytettäessä tätä tiliä"
 
-#: ../mail/e-mail-config-security-page.c:641
+#: ../src/mail/e-mail-config-security-page.c:613
 msgid "Encryption certificate:"
 msgstr "Salausvarmenne:"
 
-#: ../mail/e-mail-config-security-page.c:683
+#: ../src/mail/e-mail-config-security-page.c:655
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Salaa aina lähtevät viestit käytettäessä tätä tiliä"
 
-#: ../mail/e-mail-config-security-page.c:703
+#: ../src/mail/e-mail-config-security-page.c:667
 #, fuzzy
 #| msgid "Always encrypt to _myself when sending encrypted messages"
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 
-#: ../mail/e-mail-config-sending-page.c:49
+#: ../src/mail/e-mail-config-sending-page.c:50
 msgid "Sending Email"
 msgstr "Lähetys"
 
-#: ../mail/e-mail-config-service-page.c:638
+#: ../src/mail/e-mail-config-service-page.c:639
 msgid "Server _Type:"
 msgstr "_Palvelintyyppi:"
 
-#: ../mail/e-mail-config-summary-page.c:142
+#: ../src/mail/e-mail-config-summary-page.c:143
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:145
+#: ../src/mail/e-mail-config-summary-page.c:146
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../src/mail/e-mail-config-summary-page.c:307
 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."
 
-#: ../mail/e-mail-config-summary-page.c:370
+#: ../src/mail/e-mail-config-summary-page.c:371
 msgid "Personal Details"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../mail/e-mail-config-summary-page.c:379
+#: ../src/mail/e-mail-config-summary-page.c:380
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
-#: ../mail/e-mail-config-summary-page.c:393
+#: ../src/mail/e-mail-config-summary-page.c:394
 msgid "Email Address:"
 msgstr "Sähköpostiosoite:"
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../src/mail/e-mail-config-summary-page.c:408
 msgid "Receiving"
 msgstr "Vastaanotto"
 
-#: ../mail/e-mail-config-summary-page.c:419
+#: ../src/mail/e-mail-config-summary-page.c:420
 msgid "Sending"
 msgstr "Lähetys"
 
-#: ../mail/e-mail-config-summary-page.c:431
+#: ../src/mail/e-mail-config-summary-page.c:432
 msgid "Server Type:"
 msgstr "Palvelintyyppi:"
 
-#: ../mail/e-mail-config-summary-page.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:605
+#: ../src/mail/e-mail-config-summary-page.c:453
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: ../mail/e-mail-config-summary-page.c:473
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:703
+#: ../src/mail/e-mail-config-summary-page.c:474
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: ../mail/e-mail-config-summary-page.c:494
+#: ../src/mail/e-mail-config-summary-page.c:495
 msgid "Security:"
 msgstr "Salaus:"
 
-#: ../mail/e-mail-config-summary-page.c:787
+#: ../src/mail/e-mail-config-summary-page.c:788
 msgid "Account Summary"
 msgstr "Tilin yhteenveto"
 
-#: ../mail/e-mail-config-welcome-page.c:156
+#: ../src/mail/e-mail-config-welcome-page.c:157
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Next\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin."
+"Click “Next” to begin."
 msgstr ""
 "Tervetuloa Evolutionin sähköpostitilin asetusapulaiseen.\n"
 "\n"
-"Aloita napsauttamalla \"Jatka\"."
+"Aloita napsauttamalla “Jatka”."
 
-#: ../mail/e-mail-config-welcome-page.c:166
-#: ../modules/startup-wizard/e-startup-assistant.c:151
+#: ../src/mail/e-mail-config-welcome-page.c:167
+#: ../src/modules/startup-wizard/e-startup-assistant.c:152
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../mail/e-mail-config-window.c:325
+#: ../src/mail/e-mail-config-window.c:326
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/e-mail-display.c:124
+#: ../src/mail/e-mail-display.c:128
 msgid "_Add to Address Book..."
 msgstr "_Lisää osoitekirjaan..."
 
-#: ../mail/e-mail-display.c:131
+#: ../src/mail/e-mail-display.c:135
 msgid "_To This Address"
 msgstr "_Tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:138
+#: ../src/mail/e-mail-display.c:142
 msgid "_From This Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/e-mail-display.c:145
+#: ../src/mail/e-mail-display.c:149
 msgid "Send _Reply To..."
 msgstr "Lähetä _vastaus osoitteeseen..."
 
-#: ../mail/e-mail-display.c:147
+#: ../src/mail/e-mail-display.c:151
 msgid "Send a reply message to this address"
 msgstr "Lähetä vastausviesti tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:154
+#: ../src/mail/e-mail-display.c:158
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
-#: ../mail/e-mail-display.c:749
+#: ../src/mail/e-mail-display.c:803
 msgid "Hid_e All"
 msgstr "_Piilota kaikki"
 
-#: ../mail/e-mail-display.c:756
+#: ../src/mail/e-mail-display.c:810
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../mail/e-mail-display.c:763
+#: ../src/mail/e-mail-display.c:817
 msgid "Vie_w All Inline"
 msgstr "_Näytä kaikki sisäkkäisesti"
 
-#: ../mail/e-mail-display.c:770
+#: ../src/mail/e-mail-display.c:824
 msgid "_Zoom to 100%"
 msgstr "_Zoomaa kokoon 100 %"
 
-#: ../mail/e-mail-display.c:772
-#, fuzzy
+#: ../src/mail/e-mail-display.c:826
 #| msgid "Reset the text to its original size"
 msgid "Zoom the image to its natural size"
-msgstr "Palauta teksti alkuperäisen kokoiseksi"
+msgstr "Palauta kuva alkuperäiseen kokoon"
 
-#: ../mail/e-mail-display.c:777
+#: ../src/mail/e-mail-display.c:831
 #, fuzzy
 #| msgid "Close this window"
 msgid "_Zoom to window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../mail/e-mail-display.c:779
+#: ../src/mail/e-mail-display.c:833
 msgid "Zoom large images to not be wider than the window width"
 msgstr ""
 
-#: ../mail/e-mail-folder-create-dialog.c:327
+#: ../src/mail/e-mail-folder-create-dialog.c:328
 msgid "Create Folder"
 msgstr "Luo kansio"
 
-#: ../mail/e-mail-folder-create-dialog.c:331
+#: ../src/mail/e-mail-folder-create-dialog.c:332
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/e-mail-folder-create-dialog.c:334
+#: ../src/mail/e-mail-folder-create-dialog.c:335
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../mail/e-mail-folder-create-dialog.c:351
+#: ../src/mail/e-mail-folder-create-dialog.c:352
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:234
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/e-mail-free-form-exp.c:237
+#: ../src/mail/e-mail-free-form-exp.c:235
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../mail/e-mail-free-form-exp.c:238
+#: ../src/mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../mail/e-mail-free-form-exp.c:239
+#: ../src/mail/e-mail-free-form-exp.c:237
 #, fuzzy
 #| msgid "Flagged"
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Merkitty"
 
-#: ../mail/e-mail-free-form-exp.c:240
+#: ../src/mail/e-mail-free-form-exp.c:238
 #, fuzzy
 #| msgid "Seen"
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/e-mail-free-form-exp.c:241
+#: ../src/mail/e-mail-free-form-exp.c:239
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../mail/e-mail-free-form-exp.c:489
+#: ../src/mail/e-mail-free-form-exp.c:487
 #, fuzzy
 #| msgid "now"
 msgctxt "ffe"
 msgid "no"
 msgstr "nyt"
 
-#: ../mail/e-mail-free-form-exp.c:490
+#: ../src/mail/e-mail-free-form-exp.c:488
 msgctxt "ffe"
 msgid "false"
 msgstr ""
 
-#: ../mail/e-mail-junk-options.c:295
+#: ../src/mail/e-mail-junk-options.c:296
 msgid "Junk filtering software:"
 msgstr ""
 
-#: ../mail/e-mail-label-dialog.c:224
+#: ../src/mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "_Otsakkeen nimi:"
 
-#: ../mail/e-mail-label-list-store.c:57
+#: ../src/mail/e-mail-label-list-store.c:55
 msgid "I_mportant"
 msgstr "Tärk_eä"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:58
+#: ../src/mail/e-mail-label-list-store.c:56
 msgid "_Work"
 msgstr "_Työ"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:59
+#: ../src/mail/e-mail-label-list-store.c:57
 msgid "_Personal"
 msgstr "_Henkilökohtainen"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:60
+#: ../src/mail/e-mail-label-list-store.c:58
 msgid "_To Do"
 msgstr "Te_htävää"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:61
+#: ../src/mail/e-mail-label-list-store.c:59
 msgid "_Later"
 msgstr "_Myöhemmin"
 
-#: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1200
+#: ../src/mail/e-mail-label-manager.c:169
+#: ../src/mail/em-folder-properties.c:842
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1198
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
-#: ../mail/e-mail-label-manager.c:222
+#: ../src/mail/e-mail-label-manager.c:220
+#: ../src/mail/em-folder-properties.c:869
 msgid "Edit Label"
 msgstr "Muokkaa merkintää"
 
-#: ../mail/e-mail-label-manager.c:354
+#: ../src/mail/e-mail-label-manager.c:352
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -16178,805 +16965,827 @@ msgstr ""
 "Huomautus: Alaviivaa merkinnän nimessä käytetään\n"
 "valikon pikavalintana."
 
-#: ../mail/e-mail-label-tree-view.c:88
+#: ../src/mail/e-mail-label-tree-view.c:86
 msgid "Color"
 msgstr "Väri"
 
-#: ../mail/e-mail-notes.c:321 ../mail/e-mail-notes.c:719
+#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:719
 #, fuzzy
 #| msgid "Messages"
 msgid "Message Note"
 msgstr "Viestit"
 
-#: ../mail/e-mail-notes.c:639
+#: ../src/mail/e-mail-notes.c:639
 #, fuzzy
 #| msgid "Copying messages into folder %s"
 msgid "Cannot find message in its folder summary"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../mail/e-mail-notes.c:842
+#: ../src/mail/e-mail-notes.c:842
 msgid "Storing changes..."
 msgstr "Tallennetaan muutoksia..."
 
-#: ../mail/e-mail-notes.c:968
+#: ../src/mail/e-mail-notes.c:968
 #, fuzzy
 #| msgid "_Edit Message"
 msgid "Edit Message Note"
 msgstr "_Muokkaa viestiä"
 
-#: ../mail/e-mail-notes.c:1122
+#: ../src/mail/e-mail-notes.c:1122
 msgid "Retrieving message..."
 msgstr "Noudetaan viestiä..."
 
-#: ../mail/e-mail-print-config-headers.c:165
+#: ../src/mail/e-mail-print-config-headers.c:166
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected headers to top"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-print-config-headers.c:170
+#: ../src/mail/e-mail-print-config-headers.c:171
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected headers up one row"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-print-config-headers.c:175
+#: ../src/mail/e-mail-print-config-headers.c:176
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected headers down one row"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-print-config-headers.c:180
+#: ../src/mail/e-mail-print-config-headers.c:181
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected headers to bottom"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-print-config-headers.c:185
+#: ../src/mail/e-mail-print-config-headers.c:186
 msgid "Select all headers"
 msgstr "Valitse kaikki otsakkeet"
 
-#: ../mail/e-mail-print-config-headers.c:204
+#: ../src/mail/e-mail-print-config-headers.c:205
 msgid "Header Name"
 msgstr "Otsakkeen nimi"
 
-#: ../mail/e-mail-print-config-headers.c:213
+#: ../src/mail/e-mail-print-config-headers.c:214
 msgid "Header Value"
 msgstr "Otsakkeen arvo"
 
-#: ../mail/e-mail-printer.c:111 ../mail/mail-config.ui.h:123
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:125
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/e-mail-printer.c:153
+#: ../src/mail/e-mail-printer.c:142
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:152
+#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
+#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/e-mail-reader.c:488
-#| msgid "Delete junk messages on e_xit"
+#: ../src/mail/e-mail-reader.c:485
 msgid "Deleting message note..."
 msgstr "Poistetaan viestin huomautus..."
 
-#: ../mail/e-mail-reader.c:1310 ../mail/e-mail-reader.c:1522
-#: ../mail/e-mail-reader.c:1562
+#: ../src/mail/e-mail-reader.c:1307 ../src/mail/e-mail-reader.c:1519
+#: ../src/mail/e-mail-reader.c:1559
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../mail/e-mail-reader.c:1568
+#: ../src/mail/e-mail-reader.c:1565
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../mail/e-mail-reader.c:1771
+#: ../src/mail/e-mail-reader.c:1768
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../mail/e-mail-reader.c:1816 ../mail/e-mail-reader.c:3186
-#, c-format
-msgid "Retrieving message '%s'"
+#: ../src/mail/e-mail-reader.c:1813 ../src/mail/e-mail-reader.c:3172
+#, fuzzy, c-format
+#| msgid "Retrieving message '%s'"
+msgid "Retrieving message “%s”"
 msgstr "Noudetaan viestiä ”%s”"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../src/mail/e-mail-reader.c:2001
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../src/mail/e-mail-reader.c:2003
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../src/mail/e-mail-reader.c:2008
 msgid "_Archive..."
 msgstr "_Arkistoi..."
 
-#: ../mail/e-mail-reader.c:2013
+#: ../src/mail/e-mail-reader.c:2010
 #, 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"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../src/mail/e-mail-reader.c:2015
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../src/mail/e-mail-reader.c:2017
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../src/mail/e-mail-reader.c:2022
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/e-mail-reader.c:2027
+#: ../src/mail/e-mail-reader.c:2024
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../src/mail/e-mail-reader.c:2029
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../src/mail/e-mail-reader.c:2031
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../mail/e-mail-reader.c:2039
-#| msgid "_Add Attachment..."
+#: ../src/mail/e-mail-reader.c:2036
 msgid "_Add note..."
 msgstr "_Lisää huomautus..."
 
-#: ../mail/e-mail-reader.c:2041
+#: ../src/mail/e-mail-reader.c:2038
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Add a note for the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../mail/e-mail-reader.c:2046
-#| msgid "Delete Memo"
+#: ../src/mail/e-mail-reader.c:2043
 msgid "Delete no_te"
 msgstr "Poista _huomautus"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../src/mail/e-mail-reader.c:2045
 #, fuzzy
 #| msgid "Create a new event from the selected message"
 msgid "Delete the note for the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../src/mail/e-mail-reader.c:2050
 msgid "_Edit note..."
 msgstr "_Muokkaa huomautusta..."
 
-#: ../mail/e-mail-reader.c:2055
+#: ../src/mail/e-mail-reader.c:2052
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Edit a note for the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../src/mail/e-mail-reader.c:2057
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../mail/e-mail-reader.c:2062
+#: ../src/mail/e-mail-reader.c:2059
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tälle postilistalle"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../src/mail/e-mail-reader.c:2064
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../mail/e-mail-reader.c:2069
+#: ../src/mail/e-mail-reader.c:2066
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Luo sääntö, jolla suodatetaan viestejä näille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../src/mail/e-mail-reader.c:2071
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../mail/e-mail-reader.c:2076
+#: ../src/mail/e-mail-reader.c:2073
 msgid "Create a rule to filter messages from this sender"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tältä lähettäjältä"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../src/mail/e-mail-reader.c:2078
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../mail/e-mail-reader.c:2083
+#: ../src/mail/e-mail-reader.c:2080
 msgid "Create a rule to filter messages with this subject"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tämän otsikon perusteella"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../src/mail/e-mail-reader.c:2085
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../src/mail/e-mail-reader.c:2087
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../src/mail/e-mail-reader.c:2092
 msgid "_Find in Message..."
 msgstr "_Etsi viestistä..."
 
-#: ../mail/e-mail-reader.c:2097
+#: ../src/mail/e-mail-reader.c:2094
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../src/mail/e-mail-reader.c:2099
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../src/mail/e-mail-reader.c:2101
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../src/mail/e-mail-reader.c:2106
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../src/mail/e-mail-reader.c:2108
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../src/mail/e-mail-reader.c:2113
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../mail/e-mail-reader.c:2118
+#: ../src/mail/e-mail-reader.c:2115
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../mail/e-mail-reader.c:2123 ../modules/mail/e-mail-attachment-handler.c:432
+#: ../src/mail/e-mail-reader.c:2120
+#: ../src/modules/mail/e-mail-attachment-handler.c:430
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../mail/e-mail-reader.c:2125 ../mail/e-mail-reader.c:2132
-#: ../modules/mail/e-mail-attachment-handler.c:434
+#: ../src/mail/e-mail-reader.c:2122 ../src/mail/e-mail-reader.c:2129
+#: ../src/modules/mail/e-mail-attachment-handler.c:432
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../src/mail/e-mail-reader.c:2127
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../mail/e-mail-reader.c:2137 ../modules/mail/e-mail-attachment-handler.c:439
+#: ../src/mail/e-mail-reader.c:2134
+#: ../src/modules/mail/e-mail-attachment-handler.c:437
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../mail/e-mail-reader.c:2139 ../mail/e-mail-reader.c:2146
-#: ../modules/mail/e-mail-attachment-handler.c:441
+#: ../src/mail/e-mail-reader.c:2136 ../src/mail/e-mail-reader.c:2143
+#: ../src/modules/mail/e-mail-attachment-handler.c:439
 msgid "Forward the selected message in the body of a new message"
 msgstr "Välitä edelleen valitut viestit uuden viestin rungossa"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../src/mail/e-mail-reader.c:2141
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../mail/e-mail-reader.c:2151 ../modules/mail/e-mail-attachment-handler.c:446
+#: ../src/mail/e-mail-reader.c:2148
+#: ../src/modules/mail/e-mail-attachment-handler.c:444
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../mail/e-mail-reader.c:2153 ../mail/e-mail-reader.c:2160
-#: ../modules/mail/e-mail-attachment-handler.c:448
+#: ../src/mail/e-mail-reader.c:2150 ../src/mail/e-mail-reader.c:2157
+#: ../src/modules/mail/e-mail-attachment-handler.c:446
 msgid "Forward the selected message quoted like a reply"
 msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../src/mail/e-mail-reader.c:2155
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../src/mail/e-mail-reader.c:2162
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../src/mail/e-mail-reader.c:2164
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../mail/e-mail-reader.c:2172 ../mail/e-mail-reader.c:2562
+#: ../src/mail/e-mail-reader.c:2169 ../src/mail/e-mail-reader.c:2559
 msgid "_Ignore Subthread"
 msgstr "_Jätä huomiotta aliketju"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../src/mail/e-mail-reader.c:2171
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2179 ../mail/e-mail-reader.c:2566
-#| msgid "Next _Thread"
+#: ../src/mail/e-mail-reader.c:2176 ../src/mail/e-mail-reader.c:2563
 msgid "_Ignore Thread"
 msgstr "_Jätä huomiotta ketju"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../src/mail/e-mail-reader.c:2178
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2186
+#: ../src/mail/e-mail-reader.c:2183
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../src/mail/e-mail-reader.c:2185
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../src/mail/e-mail-reader.c:2190
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../mail/e-mail-reader.c:2195
+#: ../src/mail/e-mail-reader.c:2192
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../src/mail/e-mail-reader.c:2197
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../mail/e-mail-reader.c:2202
+#: ../src/mail/e-mail-reader.c:2199
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../src/mail/e-mail-reader.c:2204
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../src/mail/e-mail-reader.c:2206
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../mail/e-mail-reader.c:2214 ../mail/e-mail-reader.c:2586
+#: ../src/mail/e-mail-reader.c:2211 ../src/mail/e-mail-reader.c:2583
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../mail/e-mail-reader.c:2216
+#: ../src/mail/e-mail-reader.c:2213
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2221 ../mail/e-mail-reader.c:2590
+#: ../src/mail/e-mail-reader.c:2218 ../src/mail/e-mail-reader.c:2587
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2223
+#: ../src/mail/e-mail-reader.c:2220
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2228
+#: ../src/mail/e-mail-reader.c:2225
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../mail/e-mail-reader.c:2230
+#: ../src/mail/e-mail-reader.c:2227
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../src/mail/e-mail-reader.c:2232
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../mail/e-mail-reader.c:2237
+#: ../src/mail/e-mail-reader.c:2234
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../mail/e-mail-reader.c:2242 ../modules/mail/e-mail-attachment-handler.c:418
+#: ../src/mail/e-mail-reader.c:2239
+#: ../src/modules/mail/e-mail-attachment-handler.c:416
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:420
+#: ../src/mail/e-mail-reader.c:2241
+#: ../src/modules/mail/e-mail-attachment-handler.c:418
 msgid "Open the selected messages in the composer for editing"
 msgstr "Avaa valitut viestit muokkaimessa"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../src/mail/e-mail-reader.c:2246
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../src/mail/e-mail-reader.c:2248
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../src/mail/e-mail-reader.c:2253
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../src/mail/e-mail-reader.c:2255
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../src/mail/e-mail-reader.c:2260
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/e-mail-reader.c:2265
+#: ../src/mail/e-mail-reader.c:2262
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../src/mail/e-mail-reader.c:2267
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../src/mail/e-mail-reader.c:2269
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../src/mail/e-mail-reader.c:2274
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../src/mail/e-mail-reader.c:2276
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../src/mail/e-mail-reader.c:2281
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../src/mail/e-mail-reader.c:2283
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../src/mail/e-mail-reader.c:2288
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../src/mail/e-mail-reader.c:2290
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../src/mail/e-mail-reader.c:2295
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2300
+#: ../src/mail/e-mail-reader.c:2297
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../src/mail/e-mail-reader.c:2302
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2307
+#: ../src/mail/e-mail-reader.c:2304
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../src/mail/e-mail-reader.c:2309
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../mail/e-mail-reader.c:2314
+#: ../src/mail/e-mail-reader.c:2311
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../src/mail/e-mail-reader.c:2316
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../src/mail/e-mail-reader.c:2318
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2328
+#: ../src/mail/e-mail-reader.c:2325
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../mail/e-mail-reader.c:2335
+#: ../src/mail/e-mail-reader.c:2332
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../mail/e-mail-reader.c:2340 ../modules/mail/e-mail-attachment-handler.c:453
+#: ../src/mail/e-mail-reader.c:2337
+#: ../src/modules/mail/e-mail-attachment-handler.c:451
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../mail/e-mail-reader.c:2342 ../modules/mail/e-mail-attachment-handler.c:455
+#: ../src/mail/e-mail-reader.c:2339
+#: ../src/modules/mail/e-mail-attachment-handler.c:453
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../src/mail/e-mail-reader.c:2344
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../mail/e-mail-reader.c:2349
+#: ../src/mail/e-mail-reader.c:2346
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../src/mail/e-mail-reader.c:2351
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../src/mail/e-mail-reader.c:2353
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../mail/e-mail-reader.c:2361 ../mail/mail.error.xml.h:28
-#: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/mail/e-mail-attachment-handler.c:397
+#: ../src/mail/e-mail-reader.c:2358 ../src/mail/mail.error.xml.h:28
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../src/modules/mail/e-mail-attachment-handler.c:395
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../mail/e-mail-reader.c:2363 ../modules/mail/e-mail-attachment-handler.c:399
+#: ../src/mail/e-mail-reader.c:2360
+#: ../src/modules/mail/e-mail-attachment-handler.c:397
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
 
-#: ../mail/e-mail-reader.c:2368 ../mail/mail.error.xml.h:26
-#: ../modules/mail/e-mail-attachment-handler.c:404
+#: ../src/mail/e-mail-reader.c:2365 ../src/mail/mail.error.xml.h:26
+#: ../src/modules/mail/e-mail-attachment-handler.c:402
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../mail/e-mail-reader.c:2370 ../modules/mail/e-mail-attachment-handler.c:406
+#: ../src/mail/e-mail-reader.c:2367
+#: ../src/modules/mail/e-mail-attachment-handler.c:404
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Kirjoita vastaus valitussa viestissä olevalle sähköpostilistalle"
 
-#: ../mail/e-mail-reader.c:2375 ../modules/mail/e-mail-attachment-handler.c:411
+#: ../src/mail/e-mail-reader.c:2372
+#: ../src/modules/mail/e-mail-attachment-handler.c:409
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2377 ../modules/mail/e-mail-attachment-handler.c:413
+#: ../src/mail/e-mail-reader.c:2374
+#: ../src/modules/mail/e-mail-attachment-handler.c:411
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2382
+#: ../src/mail/e-mail-reader.c:2379
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../mail/e-mail-reader.c:2384
+#: ../src/mail/e-mail-reader.c:2381
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../mail/e-mail-reader.c:2389
+#: ../src/mail/e-mail-reader.c:2386
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../src/mail/e-mail-reader.c:2388
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../src/mail/e-mail-reader.c:2400
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../mail/e-mail-reader.c:2405
+#: ../src/mail/e-mail-reader.c:2402
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../src/mail/e-mail-reader.c:2407
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../src/mail/e-mail-reader.c:2409
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../mail/e-mail-reader.c:2417
+#: ../src/mail/e-mail-reader.c:2414
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../mail/e-mail-reader.c:2419
+#: ../src/mail/e-mail-reader.c:2416
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2426
+#: ../src/mail/e-mail-reader.c:2423
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2433
+#: ../src/mail/e-mail-reader.c:2430
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../mail/e-mail-reader.c:2440
+#: ../src/mail/e-mail-reader.c:2437
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../mail/e-mail-reader.c:2447 ../modules/mail/e-mail-attachment-handler.c:425
+#: ../src/mail/e-mail-reader.c:2444
+#: ../src/modules/mail/e-mail-attachment-handler.c:423
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../mail/e-mail-reader.c:2454
+#: ../src/mail/e-mail-reader.c:2451
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:2461
+#: ../src/mail/e-mail-reader.c:2458
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../mail/e-mail-reader.c:2468
+#: ../src/mail/e-mail-reader.c:2465
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../src/mail/e-mail-reader.c:2472
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../mail/e-mail-reader.c:2482
+#: ../src/mail/e-mail-reader.c:2479
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../mail/e-mail-reader.c:2492
+#: ../src/mail/e-mail-reader.c:2489
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../mail/e-mail-reader.c:2494
+#: ../src/mail/e-mail-reader.c:2491
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../src/mail/e-mail-reader.c:2496
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../mail/e-mail-reader.c:2501
+#: ../src/mail/e-mail-reader.c:2498
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../mail/e-mail-reader.c:2506
+#: ../src/mail/e-mail-reader.c:2503
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../mail/e-mail-reader.c:2508
+#: ../src/mail/e-mail-reader.c:2505
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../mail/e-mail-reader.c:2513
+#: ../src/mail/e-mail-reader.c:2510
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../mail/e-mail-reader.c:2515
+#: ../src/mail/e-mail-reader.c:2512
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../mail/e-mail-reader.c:2554
+#: ../src/mail/e-mail-reader.c:2551
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../mail/e-mail-reader.c:2570
+#: ../src/mail/e-mail-reader.c:2567
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/e-mail-reader.c:2574
+#: ../src/mail/e-mail-reader.c:2571
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2578
+#: ../src/mail/e-mail-reader.c:2575
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2582
+#: ../src/mail/e-mail-reader.c:2579
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/e-mail-reader.c:2594
+#: ../src/mail/e-mail-reader.c:2591
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/e-mail-reader.c:2598
+#: ../src/mail/e-mail-reader.c:2595
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/e-mail-reader.c:2642
+#: ../src/mail/e-mail-reader.c:2639
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../mail/e-mail-reader.c:2644
+#: ../src/mail/e-mail-reader.c:2641
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Näytä välkkyvä kursori näytettävien viestin rungossa"
 
-#: ../mail/e-mail-reader.c:2650
+#: ../src/mail/e-mail-reader.c:2647
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../mail/e-mail-reader.c:2652
+#: ../src/mail/e-mail-reader.c:2649
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../mail/e-mail-reader.c:3192
+#: ../src/mail/e-mail-reader.c:3178
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../mail/e-mail-reader.c:4242 ../modules/mail/e-mail-attachment-handler.c:390
+#: ../src/mail/e-mail-reader.c:4228
+#: ../src/modules/mail/e-mail-attachment-handler.c:388
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/e-mail-reader.c:4243 ../modules/mail/e-mail-attachment-handler.c:392
+#: ../src/mail/e-mail-reader.c:4229
+#: ../src/modules/mail/e-mail-attachment-handler.c:390
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:4262
+#. For Translators: "Group Reply" will reply either to a mailing list
+#. * (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:4248
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:4263
+#: ../src/mail/e-mail-reader.c:4249
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:4329 ../mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:4315 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/e-mail-reader.c:4341
-#: ../modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../src/mail/e-mail-reader.c:4327
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1241
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mail/e-mail-reader.c:4345
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../src/mail/e-mail-reader.c:4331
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1234
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../mail/e-mail-reader.c:4354 ../mail/mail-dialogs.ui.h:16
+#: ../src/mail/e-mail-reader.c:4340 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../mail/e-mail-reader.c:5426
+#: ../src/mail/e-mail-reader.c:5413
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:5428
+#: ../src/mail/e-mail-reader.c:5415
 #, c-format
 msgid "Allow remote content for %s"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:5445
+#: ../src/mail/e-mail-reader.c:5432
 #, c-format
 msgid "Allow remote content from %s"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:5462
+#: ../src/mail/e-mail-reader.c:5449
 msgid "Do not show this message again"
 msgstr "Älä näytä tätä viestiä uudestaan"
 
-#: ../mail/e-mail-reader.c:5510
+#: ../src/mail/e-mail-reader.c:5497
 msgid "Load remote content"
 msgstr "Lataa etäsisältö"
 
-#: ../mail/e-mail-reader-utils.c:146
+#: ../src/mail/e-mail-reader-utils.c:144
 msgid "Do not warn me again"
 msgstr "Älä varoita uudelleen"
 
-#: ../mail/e-mail-reader-utils.c:570
+#: ../src/mail/e-mail-reader-utils.c:568
 #, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Päivitetään kansiota '%s'"
+#| msgid "Refreshing folder '%s'"
+msgid "Refreshing folder “%s”"
+msgstr "Päivitetään kansiota “%s”"
 
-#: ../mail/e-mail-reader-utils.c:1163
+#: ../src/mail/e-mail-reader-utils.c:1175
 #, fuzzy
 #| msgid "Preview data to be imported"
 msgid "Marking thread to be ignored"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../mail/e-mail-reader-utils.c:1167
+#: ../src/mail/e-mail-reader-utils.c:1179
 msgid "Unmarking thread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1171
+#: ../src/mail/e-mail-reader-utils.c:1183
 msgid "Marking subthread to be ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1175
+#: ../src/mail/e-mail-reader-utils.c:1187
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1419
+#: ../src/mail/e-mail-reader-utils.c:1439
 msgid "Printing"
 msgstr "Tulostetaan"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1656
-#, c-format
+#: ../src/mail/e-mail-reader-utils.c:1676
+#, fuzzy, c-format
+#| msgid ""
+#| "Folder '%s' contains %u duplicate message. Are you sure you want to "
+#| "delete it?"
+#| msgid_plural ""
+#| "Folder '%s' contains %u duplicate messages. Are you sure you want to "
+#| "delete them?"
 msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"Folder “%s” contains %u duplicate message. Are you sure you want to delete "
 "it?"
 msgid_plural ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"Folder “%s” contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 msgstr[0] ""
 "Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa "
@@ -16985,7 +17794,7 @@ msgstr[1] ""
 "Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa "
 "sen?"
 
-#: ../mail/e-mail-reader-utils.c:2656
+#: ../src/mail/e-mail-reader-utils.c:2694
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -16996,36 +17805,36 @@ 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".
-#: ../mail/e-mail-reader-utils.c:2677
+#: ../src/mail/e-mail-reader-utils.c:2715
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../mail/e-mail-reader-utils.c:3050
+#: ../src/mail/e-mail-reader-utils.c:3088
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
-#: ../mail/e-mail-request.c:272
+#: ../src/mail/e-mail-request.c:270
 msgid "The message has no text content."
 msgstr "Viestissä ei ole tekstisisältöä."
 
-#: ../mail/e-mail-tag-editor.c:237
+#: ../src/mail/e-mail-tag-editor.c:163
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
 
-#: ../mail/e-mail-ui-session.c:801
+#: ../src/mail/e-mail-ui-session.c:813
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s-tunnistautuminen epäonnistui"
 
-#: ../mail/e-mail-ui-session.c:851
+#: ../src/mail/e-mail-ui-session.c:863
 #, c-format
-msgid "No data source found for UID '%s'"
+msgid "No data source found for UID “%s”"
 msgstr ""
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../mail/em-composer-utils.c:390
+#: ../src/mail/em-composer-utils.c:388
 #, fuzzy, c-format
 #| msgid "Are you sure you want to send a message with only BCC recipients?"
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
@@ -17039,7 +17848,7 @@ msgstr[1] ""
 "(Bcc)?"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../mail/em-composer-utils.c:396
+#: ../src/mail/em-composer-utils.c:394
 #, c-format
 msgid ""
 "You are trying to send a message to %d recipients in To and CC fields. This "
@@ -17058,7 +17867,7 @@ msgstr[1] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../mail/em-composer-utils.c:791
+#: ../src/mail/em-composer-utils.c:790
 msgid "Waiting for attachments to load..."
 msgstr "Odotetaan liitteiden latautumista..."
 
@@ -17066,7 +17875,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.
-#: ../mail/em-composer-utils.c:1742
+#: ../src/mail/em-composer-utils.c:1745
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -17074,299 +17883,336 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:1748
+#: ../src/mail/em-composer-utils.c:1751
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1753
+#: ../src/mail/em-composer-utils.c:1756
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
-#: ../mail/em-composer-utils.c:2968
+#: ../src/mail/em-composer-utils.c:3042
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3440
+#: ../src/mail/em-composer-utils.c:3518
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../mail/em-composer-utils.c:3445
+#: ../src/mail/em-composer-utils.c:3523
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../mail/em-filter-editor-folder-element.c:153
+#: ../src/mail/em-filter-editor-folder-element.c:154
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:597
+#: ../src/mail/em-filter-rule.c:595
 msgid "Then"
 msgstr "sitten"
 
-#: ../mail/em-filter-rule.c:662
+#: ../src/mail/em-filter-rule.c:660
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
-#: ../mail/em-folder-properties.c:227
+#: ../src/mail/em-folder-properties.c:240
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lukemattomia viestejä:"
 msgstr[1] "Lukemattomia viestejä:"
 
-#: ../mail/em-folder-properties.c:238
+#: ../src/mail/em-folder-properties.c:251
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Viestejä kaikkiaan:"
 msgstr[1] "Viestejä kaikkiaan:"
 
-#: ../mail/em-folder-properties.c:259
+#: ../src/mail/em-folder-properties.c:272
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Levytilan käyttö (%s):"
 
-#: ../mail/em-folder-properties.c:261
+#: ../src/mail/em-folder-properties.c:274
 #, 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
-#: ../mail/em-folder-properties.c:385
+#: ../src/mail/em-folder-properties.c:398
 msgid "_Send Account Override:"
 msgstr "_Lähetystilin ohitus:"
 
-#: ../mail/em-folder-properties.c:589
+#: ../src/mail/em-folder-properties.c:605
 msgid "_Archive this folder using these settings:"
 msgstr "_Arkistoi tämä kansio käyttäen seuraavia asetuksia:"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:598
-#| msgid "Sent _Messages Folder:"
+#: ../src/mail/em-folder-properties.c:614
 msgctxt "autoarchive"
 msgid "_Cleanup messages older than"
 msgstr "_Siivoa vanhemmat viestit kuin"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:614
-#| msgid "days"
+#: ../src/mail/em-folder-properties.c:630
 msgctxt "autoarchive"
 msgid "days"
 msgstr "päivää"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:616
-#| msgid "weeks"
+#: ../src/mail/em-folder-properties.c:632
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "viikkoa"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:618
-#| msgid "months"
+#: ../src/mail/em-folder-properties.c:634
 msgctxt "autoarchive"
 msgid "months"
 msgstr "kuukautta"
 
-#: ../mail/em-folder-properties.c:624
-#| msgid "Move selected messages to another folder"
+#: ../src/mail/em-folder-properties.c:640
 msgid "Move old messages to the default archive _folder"
 msgstr "Siirrä valitut viestit _oletusarkistokansioon"
 
-#: ../mail/em-folder-properties.c:635
-#| msgid "Moving messages to '%s'"
+#: ../src/mail/em-folder-properties.c:651
 msgid "_Move old messages to:"
 msgstr "Siirrä va_nhat viestit kansioon:"
 
-#: ../mail/em-folder-properties.c:639
+#: ../src/mail/em-folder-properties.c:655
 msgid "AutoArchive folder"
 msgstr "Automaattisen arkistoinnin kansio"
 
-#: ../mail/em-folder-properties.c:639
+#: ../src/mail/em-folder-properties.c:655
 #, fuzzy
 #| msgid "Select folder to import into"
 msgid "Select folder to use for AutoArchive"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../mail/em-folder-properties.c:645
+#: ../src/mail/em-folder-properties.c:661
 msgid "_Delete old messages"
 msgstr "_Poista vanhat viestit"
 
-#: ../mail/em-folder-properties.c:704
+#: ../src/mail/em-folder-properties.c:1018
+#, fuzzy
+#| msgid "Server Type:"
+msgid "Server Tag"
+msgstr "Palvelintyyppi:"
+
+#: ../src/mail/em-folder-properties.c:1022 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "Merkintä"
+
+#: ../src/mail/em-folder-properties.c:1073
 msgid "AutoArchive"
 msgstr "Automaattinen arkistointi"
 
-#: ../mail/em-folder-properties.c:783
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:118
+#: ../src/mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Merkinnät"
+
+#: ../src/mail/em-folder-properties.c:1155
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../mail/em-folder-selection-button.c:76
+#: ../src/mail/em-folder-properties.c:1394
+#| msgid "Category Properties"
+msgid "Gathering folder properties"
+msgstr "Kerätään kansion ominaisuuksia"
+
+#: ../src/mail/em-folder-selection-button.c:77
 msgid "<click here to select a folder>"
 msgstr "<Valitse kansio tästä>"
 
-#: ../mail/em-folder-selector.c:398
+#: ../src/mail/em-folder-selector.c:399
 msgid "Create a new folder"
 msgstr "Luo uusi kansio"
 
-#: ../mail/em-folder-tree.c:682
-msgid "Folder names cannot contain '/'"
-msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
-
-#: ../mail/em-folder-tree.c:845
+#: ../src/mail/em-folder-tree.c:683
+#| msgid "Folder names cannot contain '/'"
+msgid "Folder names cannot contain “/”"
+msgstr "Kansion nimi ei voi sisältää merkkiä “/”"
+
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
+#. *
+#. * Most languages should translate this as "%s (%u%s)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../src/mail/em-folder-tree.c:877
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1703
+#: ../src/mail/em-folder-tree.c:1742
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../mail/em-folder-tree.c:2251 ../mail/em-folder-utils.c:82
+#: ../src/mail/em-folder-tree.c:2290 ../src/mail/em-folder-utils.c:83
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/em-folder-tree.c:2254 ../mail/em-folder-utils.c:84
+#: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2508
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2510
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2284
+#: ../src/mail/em-folder-tree.c:2323
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:444 ../mail/em-folder-tree-model.c:446
+#: ../src/mail/em-folder-tree-model.c:445
+#: ../src/mail/em-folder-tree-model.c:447
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:1301 ../mail/em-folder-tree-model.c:1677
+#: ../src/mail/em-folder-tree-model.c:1325
+#: ../src/mail/em-folder-tree-model.c:1701
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../mail/em-folder-utils.c:488
+#: ../src/mail/em-folder-utils.c:502
 msgid "Move Folder To"
 msgstr "Siirrä kansio kohteeseen"
 
-#: ../mail/em-folder-utils.c:488
+#: ../src/mail/em-folder-utils.c:502
 msgid "Copy Folder To"
 msgstr "Kopioi kansio kohteeseen"
 
-#: ../mail/em-subscription-editor.c:855
+#: ../src/mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "_Tilaa"
 
-#: ../mail/em-subscription-editor.c:864
+#: ../src/mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
 msgstr "_Tilaa näytetyt"
 
-#: ../mail/em-subscription-editor.c:872
+#: ../src/mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "Tilaa kaikk_i"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
-#: ../mail/mail.error.xml.h:73 ../modules/mail/e-mail-shell-view-actions.c:1823
+#: ../src/mail/em-subscription-editor.c:970
+#: ../src/mail/em-subscription-editor.c:1914 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1770
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../mail/em-subscription-editor.c:979
+#: ../src/mail/em-subscription-editor.c:979
 #, fuzzy
 msgid "Unsu_bscribe From Hidden"
 msgstr "Peru kansioiden tilauksia"
 
-#: ../mail/em-subscription-editor.c:987
+#: ../src/mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
-#: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1030
+#: ../src/mail/em-subscription-editor.c:1339
+#: ../src/modules/mail/e-mail-shell-view-private.c:1003
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../src/mail/em-subscription-editor.c:1343
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../mail/em-subscription-editor.c:1755
+#: ../src/mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../mail/em-subscription-editor.c:1790
+#: ../src/mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "_Tili:"
 
-#: ../mail/em-subscription-editor.c:1803
+#: ../src/mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "Tyhjennä haku"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../src/mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "_Näytä kohteet, jotka sisältävät:"
 
-#: ../mail/em-subscription-editor.c:1867
+#: ../src/mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "Tilaa valittu kansio"
 
-#: ../mail/em-subscription-editor.c:1868
+#: ../src/mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "Tila_a"
 
-#: ../mail/em-subscription-editor.c:1913
-#: ../modules/mail/e-mail-shell-view-actions.c:1825
+#: ../src/mail/em-subscription-editor.c:1913
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
-#: ../mail/em-subscription-editor.c:1953
+#: ../src/mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "Pienennä kaikki kansiot"
 
-#: ../mail/em-subscription-editor.c:1954
+#: ../src/mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "Pienennä kaikki"
 
-#: ../mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "Laajenna kaikki kansiot"
 
-#: ../mail/em-subscription-editor.c:1965
+#: ../src/mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "_Laajenna kaikki"
 
-#: ../mail/em-subscription-editor.c:1975
+#: ../src/mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "Päivitä kansioluettelo"
 
-#: ../mail/em-subscription-editor.c:1976
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../src/mail/em-subscription-editor.c:1976
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
 msgid "_Refresh"
 msgstr "_Päivitä"
 
-#: ../mail/em-subscription-editor.c:1987
+#: ../src/mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "Keskeytä nykyinen operaatio"
 
-#: ../mail/em-subscription-editor.c:1988
-#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../src/mail/em-subscription-editor.c:1988
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:999
 msgid "_Stop"
 msgstr "_Pysäytä"
 
@@ -17374,498 +18220,491 @@ msgstr "_Pysäytä"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:76
+#: ../src/mail/em-utils.c:77
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Haluatko varmasti avata %d viestin kerralla?"
 msgstr[1] "Haluatko varmasti avata %d viestiä kerralla?"
 
-#: ../mail/em-utils.c:177
+#: ../src/mail/em-utils.c:178
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../mail/em-utils.c:923
+#: ../src/mail/em-utils.c:950
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
-#: ../mail/em-utils.c:1680
+#: ../src/mail/em-utils.c:1764
 msgid "Deleting old messages"
 msgstr "Poistetaan vanhoja viestejä"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../src/mail/em-vfolder-editor.c:102
 msgid "Search _Folders"
 msgstr "_Hakukansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:392
+#: ../src/mail/em-vfolder-editor-rule.c:393
 msgid "Add Folder"
 msgstr "Lisää kansio"
 
-#: ../mail/em-vfolder-editor-rule.c:521
+#: ../src/mail/em-vfolder-editor-rule.c:522
 msgid "Search Folder Sources"
-msgstr ""
+msgstr "Hakukansioiden lähteet"
 
-#: ../mail/em-vfolder-editor-rule.c:553
+#: ../src/mail/em-vfolder-editor-rule.c:554
 msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../src/mail/em-vfolder-editor-rule.c:566
 msgid "All local folders"
 msgstr "Kaikki paikalliset kansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:566
+#: ../src/mail/em-vfolder-editor-rule.c:567
 msgid "All active remote folders"
 msgstr "Kaikki aktiiviset etäkansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:567
+#: ../src/mail/em-vfolder-editor-rule.c:568
 msgid "All local and active remote folders"
 msgstr "Kaikki paikalliset kansiot ja aktiiviset etäkansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:568
+#: ../src/mail/em-vfolder-editor-rule.c:569
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:606
+#: ../src/mail/em-vfolder-editor-rule.c:607
 msgid "include subfolders"
 msgstr "sisällytä alikansiot"
 
-#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
-#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+#: ../src/mail/filtertypes.xml.in.h:1 ../src/mail/message-list.etspec.h:15
+#: ../src/mail/searchtypes.xml.in.h:1 ../src/mail/vfoldertypes.xml.in.h:1
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
-#: ../mail/vfoldertypes.xml.in.h:6
+#: ../src/mail/filtertypes.xml.in.h:6 ../src/mail/searchtypes.xml.in.h:6
+#: ../src/mail/vfoldertypes.xml.in.h:6
 msgid "starts with"
 msgstr "alkaa"
 
-#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
-#: ../mail/vfoldertypes.xml.in.h:7
+#: ../src/mail/filtertypes.xml.in.h:7 ../src/mail/searchtypes.xml.in.h:7
+#: ../src/mail/vfoldertypes.xml.in.h:7
 msgid "does not start with"
 msgstr "ei ala"
 
-#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
-#: ../mail/vfoldertypes.xml.in.h:8
+#: ../src/mail/filtertypes.xml.in.h:8 ../src/mail/searchtypes.xml.in.h:8
+#: ../src/mail/vfoldertypes.xml.in.h:8
 msgid "ends with"
 msgstr "päättyy"
 
-#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
-#: ../mail/vfoldertypes.xml.in.h:9
+#: ../src/mail/filtertypes.xml.in.h:9 ../src/mail/searchtypes.xml.in.h:9
+#: ../src/mail/vfoldertypes.xml.in.h:9
 msgid "does not end with"
 msgstr "ei pääty"
 
-#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
-#: ../mail/vfoldertypes.xml.in.h:12
+#: ../src/mail/filtertypes.xml.in.h:10 ../src/mail/searchtypes.xml.in.h:12
+#: ../src/mail/vfoldertypes.xml.in.h:12
 msgid "sounds like"
 msgstr "kuulostaa samalta kuin"
 
-#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
-#: ../mail/vfoldertypes.xml.in.h:13
+#: ../src/mail/filtertypes.xml.in.h:11 ../src/mail/searchtypes.xml.in.h:13
+#: ../src/mail/vfoldertypes.xml.in.h:13
 msgid "does not sound like"
 msgstr "ei kuulosta samalta kuin"
 
-#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
-#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+#: ../src/mail/filtertypes.xml.in.h:12 ../src/mail/message-list.etspec.h:16
+#: ../src/mail/searchtypes.xml.in.h:10 ../src/mail/vfoldertypes.xml.in.h:10
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
-#: ../mail/vfoldertypes.xml.in.h:14
+#: ../src/mail/filtertypes.xml.in.h:13 ../src/mail/searchtypes.xml.in.h:14
+#: ../src/mail/vfoldertypes.xml.in.h:14
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
-#: ../mail/vfoldertypes.xml.in.h:15
+#: ../src/mail/filtertypes.xml.in.h:14 ../src/mail/searchtypes.xml.in.h:15
+#: ../src/mail/vfoldertypes.xml.in.h:15
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
-#: ../mail/vfoldertypes.xml.in.h:16
+#: ../src/mail/filtertypes.xml.in.h:15 ../src/mail/searchtypes.xml.in.h:16
+#: ../src/mail/vfoldertypes.xml.in.h:16
 msgid "Sender or Recipients"
 msgstr "Lähettäjä tai vastaanottajat"
 
-#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
-#: ../mail/vfoldertypes.xml.in.h:18
+#: ../src/mail/filtertypes.xml.in.h:17 ../src/mail/searchtypes.xml.in.h:18
+#: ../src/mail/vfoldertypes.xml.in.h:18
 msgid "has words"
 msgstr "sisältää sanat"
 
-#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
-#: ../mail/vfoldertypes.xml.in.h:19
+#: ../src/mail/filtertypes.xml.in.h:18 ../src/mail/searchtypes.xml.in.h:19
+#: ../src/mail/vfoldertypes.xml.in.h:19
 msgid "does not have words"
 msgstr "ei sisällä sanoja"
 
-#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
-#: ../mail/vfoldertypes.xml.in.h:20
+#: ../src/mail/filtertypes.xml.in.h:19 ../src/mail/searchtypes.xml.in.h:20
+#: ../src/mail/vfoldertypes.xml.in.h:20
 msgid "Specific header"
 msgstr "Annettu otsake"
 
-#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
-#: ../mail/vfoldertypes.xml.in.h:21
+#: ../src/mail/filtertypes.xml.in.h:20 ../src/mail/searchtypes.xml.in.h:21
+#: ../src/mail/vfoldertypes.xml.in.h:21
 msgid "exists"
 msgstr "on olemassa"
 
-#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
-#: ../mail/vfoldertypes.xml.in.h:22
+#: ../src/mail/filtertypes.xml.in.h:21 ../src/mail/searchtypes.xml.in.h:22
+#: ../src/mail/vfoldertypes.xml.in.h:22
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
-#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
-#: ../mail/vfoldertypes.xml.in.h:24
+#: ../src/mail/filtertypes.xml.in.h:22 ../src/mail/searchtypes.xml.in.h:24
+#: ../src/mail/vfoldertypes.xml.in.h:24
 msgid "Message Body"
 msgstr "Viestin runko"
 
-#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
-#: ../mail/vfoldertypes.xml.in.h:25
+#: ../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"
 
-#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
-#: ../mail/vfoldertypes.xml.in.h:26
+#: ../src/mail/filtertypes.xml.in.h:24 ../src/mail/searchtypes.xml.in.h:26
+#: ../src/mail/vfoldertypes.xml.in.h:26
 #, fuzzy
 #| msgid "Expression"
 msgid "Free Form Expression"
 msgstr "Lauseke"
 
-#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
-#: ../mail/vfoldertypes.xml.in.h:27
+#: ../src/mail/filtertypes.xml.in.h:25 ../src/mail/searchtypes.xml.in.h:27
+#: ../src/mail/vfoldertypes.xml.in.h:27
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
-#: ../mail/vfoldertypes.xml.in.h:28
+#: ../src/mail/filtertypes.xml.in.h:26 ../src/mail/searchtypes.xml.in.h:28
+#: ../src/mail/vfoldertypes.xml.in.h:28
 msgid "is before"
 msgstr "on ennen"
 
-#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
-#: ../mail/vfoldertypes.xml.in.h:29
+#: ../src/mail/filtertypes.xml.in.h:27 ../src/mail/searchtypes.xml.in.h:29
+#: ../src/mail/vfoldertypes.xml.in.h:29
 msgid "is after"
 msgstr "on jälkeen"
 
-#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
-#: ../mail/vfoldertypes.xml.in.h:30
+#: ../src/mail/filtertypes.xml.in.h:28 ../src/mail/searchtypes.xml.in.h:30
+#: ../src/mail/vfoldertypes.xml.in.h:30
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
-#: ../mail/vfoldertypes.xml.in.h:31
-msgid "Label"
-msgstr "Merkintä"
-
-#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
-#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+#: ../src/mail/filtertypes.xml.in.h:30 ../src/mail/message-list.etspec.h:3
+#: ../src/mail/searchtypes.xml.in.h:32 ../src/mail/vfoldertypes.xml.in.h:32
 msgid "Score"
 msgstr "Pistemäärä"
 
-#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
-#: ../mail/vfoldertypes.xml.in.h:35
+#: ../src/mail/filtertypes.xml.in.h:33 ../src/mail/searchtypes.xml.in.h:35
+#: ../src/mail/vfoldertypes.xml.in.h:35
 msgid "Size (kB)"
-msgstr "Koko (kB)"
+msgstr "Koko (kt)"
 
-#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
-#, fuzzy
+#: ../src/mail/filtertypes.xml.in.h:34 ../src/mail/searchtypes.xml.in.h:36
+#: ../src/mail/vfoldertypes.xml.in.h:36
 #| msgid "is greater than"
 msgid "is greater than or equal to"
-msgstr "on suurempi kuin"
+msgstr "on yhtä suuri tai suurempi kuin"
 
-#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
-#: ../mail/vfoldertypes.xml.in.h:37
-#, fuzzy
+#: ../src/mail/filtertypes.xml.in.h:35 ../src/mail/searchtypes.xml.in.h:37
+#: ../src/mail/vfoldertypes.xml.in.h:37
 #| msgid "is less than"
 msgid "is less than or equal to"
-msgstr "on vähemmän kuin"
+msgstr "on yhtä suuri tai vähemmän kuin"
 
-#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:39
-#: ../mail/vfoldertypes.xml.in.h:39
+#: ../src/mail/filtertypes.xml.in.h:37 ../src/mail/searchtypes.xml.in.h:39
+#: ../src/mail/vfoldertypes.xml.in.h:39
 msgid "Replied to"
 msgstr "Vastaus viestiin"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../src/mail/filtertypes.xml.in.h:39 ../src/mail/searchtypes.xml.in.h:42
+#: ../src/mail/vfoldertypes.xml.in.h:42
 msgid "Important"
 msgstr "Tärkeä"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:40 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:43 ../mail/vfoldertypes.xml.in.h:43
+#: ../src/mail/filtertypes.xml.in.h:40 ../src/mail/mail-dialogs.ui.h:8
+#: ../src/mail/searchtypes.xml.in.h:43 ../src/mail/vfoldertypes.xml.in.h:43
 msgid "Read"
 msgstr "Luettu"
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/mail-config.ui.h:130
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
-#: ../mail/vfoldertypes.xml.in.h:45
+#: ../src/mail/filtertypes.xml.in.h:42 ../src/mail/searchtypes.xml.in.h:44
+#: ../src/mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
+#: ../src/mail/filtertypes.xml.in.h:43 ../src/mail/searchtypes.xml.in.h:45
+#: ../src/mail/vfoldertypes.xml.in.h:46
 msgid "is Flagged"
 msgstr "on merkitty"
 
-#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
+#: ../src/mail/filtertypes.xml.in.h:44 ../src/mail/searchtypes.xml.in.h:46
+#: ../src/mail/vfoldertypes.xml.in.h:47
 msgid "is not Flagged"
 msgstr "ei ole merkitty"
 
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
-#| msgid "% Completed"
+#: ../src/mail/filtertypes.xml.in.h:45 ../src/mail/searchtypes.xml.in.h:47
+#: ../src/mail/vfoldertypes.xml.in.h:48
 msgid "is Completed"
 msgstr "on valmis"
 
-#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
-#: ../mail/vfoldertypes.xml.in.h:49
-#| msgid "% Completed"
+#: ../src/mail/filtertypes.xml.in.h:46 ../src/mail/searchtypes.xml.in.h:48
+#: ../src/mail/vfoldertypes.xml.in.h:49
 msgid "is not Completed"
 msgstr "ei ole valmis"
 
-#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:54
+#: ../src/mail/filtertypes.xml.in.h:51 ../src/mail/searchtypes.xml.in.h:53
+#: ../src/mail/vfoldertypes.xml.in.h:54
 msgid "Mailing list"
 msgstr "Postituslista"
 
-#: ../mail/filtertypes.xml.in.h:52 ../mail/searchtypes.xml.in.h:54
-#: ../mail/vfoldertypes.xml.in.h:55
+#: ../src/mail/filtertypes.xml.in.h:52 ../src/mail/searchtypes.xml.in.h:54
+#: ../src/mail/vfoldertypes.xml.in.h:55
 msgid "Regex Match"
 msgstr "Regex-osuma"
 
-#: ../mail/filtertypes.xml.in.h:53 ../mail/searchtypes.xml.in.h:55
-#: ../mail/vfoldertypes.xml.in.h:56
+#: ../src/mail/filtertypes.xml.in.h:53 ../src/mail/searchtypes.xml.in.h:55
+#: ../src/mail/vfoldertypes.xml.in.h:56
 msgid "Message Header"
 msgstr "Viestin otsakkeet"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../src/mail/filtertypes.xml.in.h:54
 msgid "Source Account"
 msgstr "Lähteen yhteystieto"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../src/mail/filtertypes.xml.in.h:55
 msgid "Pipe to Program"
 msgstr "Välitä putkessa ohjelmalle"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../src/mail/filtertypes.xml.in.h:56
 msgid "returns"
 msgstr "palauttaa"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../src/mail/filtertypes.xml.in.h:57
 msgid "does not return"
 msgstr "ei palauta"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../src/mail/filtertypes.xml.in.h:58
 msgid "returns greater than"
 msgstr "palauttaa enemmän kuin"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../src/mail/filtertypes.xml.in.h:59
 msgid "returns less than"
 msgstr "palauttaa vähemmän kuin"
 
-#: ../mail/filtertypes.xml.in.h:60
+#: ../src/mail/filtertypes.xml.in.h:60
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: ../mail/filtertypes.xml.in.h:61
+#: ../src/mail/filtertypes.xml.in.h:61
 msgid "Message is Junk"
 msgstr "Viesti on roskapostia"
 
-#: ../mail/filtertypes.xml.in.h:62
+#: ../src/mail/filtertypes.xml.in.h:62
 msgid "Message is not Junk"
 msgstr "Viesti ei ole roskapostia"
 
-#: ../mail/filtertypes.xml.in.h:63 ../mail/vfoldertypes.xml.in.h:57
+#: ../src/mail/filtertypes.xml.in.h:63 ../src/mail/vfoldertypes.xml.in.h:57
 msgid "Message Location"
 msgstr "Viestin sijainti"
 
-#: ../mail/filtertypes.xml.in.h:64 ../mail/searchtypes.xml.in.h:56
-#: ../mail/vfoldertypes.xml.in.h:58
+#: ../src/mail/filtertypes.xml.in.h:64 ../src/mail/searchtypes.xml.in.h:56
+#: ../src/mail/vfoldertypes.xml.in.h:58
 msgid "Match All"
 msgstr "Kaikki käyvät"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../src/mail/filtertypes.xml.in.h:68
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../src/mail/filtertypes.xml.in.h:69
 msgid "Set Label"
 msgstr "Aseta merkintä"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../src/mail/filtertypes.xml.in.h:70
 msgid "Assign Color"
 msgstr "Aseta väri"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../src/mail/filtertypes.xml.in.h:71
 msgid "Unset Color"
 msgstr "Poista värin asetus"
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../src/mail/filtertypes.xml.in.h:72
 msgid "Assign Score"
 msgstr "Aseta pistemäärä"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../src/mail/filtertypes.xml.in.h:73
 msgid "Adjust Score"
 msgstr "Muuta pisteytystä"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../src/mail/filtertypes.xml.in.h:74
 msgid "Set Status"
 msgstr "Aseta tila"
 
-#: ../mail/filtertypes.xml.in.h:75 ../mail/searchtypes.xml.in.h:40
-#: ../mail/vfoldertypes.xml.in.h:40
+#: ../src/mail/filtertypes.xml.in.h:75 ../src/mail/searchtypes.xml.in.h:40
+#: ../src/mail/vfoldertypes.xml.in.h:40
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../src/mail/filtertypes.xml.in.h:76
 msgid "Unset Status"
 msgstr "Poista tilan asetus"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../src/mail/filtertypes.xml.in.h:77
 msgid "Beep"
 msgstr "Piippaa"
 
-#: ../mail/filtertypes.xml.in.h:78
+#: ../src/mail/filtertypes.xml.in.h:78
 msgid "Play Sound"
 msgstr "Soita ääni"
 
-#: ../mail/filtertypes.xml.in.h:79
+#: ../src/mail/filtertypes.xml.in.h:79
 msgid "Run Program"
 msgstr "Suorita ohjelma"
 
-#: ../mail/filtertypes.xml.in.h:80
+#: ../src/mail/filtertypes.xml.in.h:80
 msgid "Forward to"
 msgstr "Välitä"
 
-#: ../mail/importers/elm-importer.c:173
+#: ../src/mail/importers/elm-importer.c:174
 msgid "Importing Elm data"
 msgstr "Tuodaan tietoja Elmistä"
 
-#: ../mail/importers/elm-importer.c:376
+#: ../src/mail/importers/elm-importer.c:377
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-tuoja"
 
-#: ../mail/importers/elm-importer.c:377
+#: ../src/mail/importers/elm-importer.c:378
 msgid "Import mail from Elm."
 msgstr "Tuodaan sähköpostit Elmistä."
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../mail/importers/kmail-importer.c:210
-#: ../plugins/dbx-import/dbx-importer.c:246
+#: ../src/mail/importers/evolution-mbox-importer.c:135
+#: ../src/mail/importers/kmail-importer.c:208
+#: ../src/plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "_Kohdekansio:"
 
-#: ../mail/importers/evolution-mbox-importer.c:140
-#: ../mail/importers/kmail-importer.c:216
-#: ../plugins/dbx-import/dbx-importer.c:252
-#: ../plugins/pst-import/pst-importer.c:541
+#: ../src/mail/importers/evolution-mbox-importer.c:141
+#: ../src/mail/importers/kmail-importer.c:214
+#: ../src/plugins/dbx-import/dbx-importer.c:248
+#: ../src/plugins/pst-import/pst-importer.c:537
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/importers/evolution-mbox-importer.c:141
-#: ../mail/importers/kmail-importer.c:217
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:542
+#: ../src/mail/importers/evolution-mbox-importer.c:142
+#: ../src/mail/importers/kmail-importer.c:215
+#: ../src/plugins/dbx-import/dbx-importer.c:249
+#: ../src/plugins/pst-import/pst-importer.c:538
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../mail/importers/evolution-mbox-importer.c:509
+#. Translators: Column header for a message subject
+#: ../src/mail/importers/evolution-mbox-importer.c:510
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../mail/importers/evolution-mbox-importer.c:514
+#. Translators: Column header for a message From address
+#: ../src/mail/importers/evolution-mbox-importer.c:515
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
+#: ../src/mail/importers/evolution-mbox-importer.c:569
+#: ../src/shell/e-shell-utils.c:176
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:569
+#: ../src/mail/importers/evolution-mbox-importer.c:570
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
-#: ../mail/importers/kmail-importer.c:263
+#: ../src/mail/importers/kmail-importer.c:261
 #, c-format
-#| msgid "Address"
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] "%d osoite"
 msgstr[1] "%d osoitetta"
 
-#: ../mail/importers/kmail-importer.c:354
+#: ../src/mail/importers/kmail-importer.c:352
 msgid "Evolution KMail importer"
 msgstr "Evolution KMail-tuoja"
 
-#: ../mail/importers/kmail-importer.c:355
-#, fuzzy
+#: ../src/mail/importers/kmail-importer.c:353
 #| msgid "Import mail from Elm."
 msgid "Import mail and contacts from KMail."
-msgstr "Tuodaan sähköpostit Elmistä."
+msgstr "Tuo sähköpostit ja yhteystiedot KMailista."
 
-#: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1061
+#: ../src/mail/importers/kmail-libs.c:150
+#: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Trash"
 msgstr "Roskakori"
 
-#: ../mail/importers/mail-importer.c:54
+#: ../src/mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
-#: ../mail/importers/mail-importer.c:60
-#, fuzzy
+#: ../src/mail/importers/mail-importer.c:61
 #| msgid "Import mail from Elm."
 msgid "Importing mail and contacts from KMail"
-msgstr "Tuodaan sähköpostit Elmistä."
+msgstr "Tuodaan sähköpostit ja yhteystiedot KMailista."
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311
-#: ../plugins/dbx-import/dbx-importer.c:609
-#: ../plugins/pst-import/pst-importer.c:760
+#: ../src/mail/importers/mail-importer.c:187
+#: ../src/mail/importers/mail-importer.c:312
+#: ../src/plugins/dbx-import/dbx-importer.c:605
+#: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
-msgid "Importing '%s'"
-msgstr "Tuodaan ”%s”"
+#| msgid "Importing '%s'"
+msgid "Importing “%s”"
+msgstr "Tuodaan “%s”"
 
-#: ../mail/importers/mail-importer.c:555
+#: ../src/mail/importers/mail-importer.c:556
 #, c-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
 
-#: ../mail/importers/pine-importer.c:247
+#: ../src/mail/importers/pine-importer.c:248
 msgid "Importing Pine data"
 msgstr "Tuodaan tietoja Pinestä"
 
-#: ../mail/importers/pine-importer.c:477
+#: ../src/mail/importers/pine-importer.c:478
 msgid "Evolution Pine importer"
 msgstr "Evolutionin Pine-tuoja"
 
-#: ../mail/importers/pine-importer.c:478
+#: ../src/mail/importers/pine-importer.c:479
 msgid "Import mail from Pine."
 msgstr "Tuo sähköpostit Pinestä."
 
-#: ../mail/mail-autofilter.c:63
+#: ../src/mail/mail-autofilter.c:64
 #, c-format
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
+#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:267
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltä"
 
-#: ../mail/mail-autofilter.c:245
+#: ../src/mail/mail-autofilter.c:250
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../mail/mail-autofilter.c:286
+#: ../src/mail/mail-autofilter.c:290
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: ../mail/mail-autofilter.c:396
+#: ../src/mail/mail-autofilter.c:400
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
@@ -17874,15 +18713,23 @@ msgstr "Lisää suodatussääntö"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:505
-#, c-format
-msgid ""
-"The filter rule \"%s\" has been modified to account for the deleted folder\n"
-"\"%s\"."
+#: ../src/mail/mail-autofilter.c:509
+#, fuzzy, c-format
+#| msgid ""
+#| "The filter rule \"%s\" has been modified to account for the deleted "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following filter rules\n"
+#| "%s have been modified to account for the deleted folder\n"
+#| "\"%s\"."
+msgid ""
+"The filter rule “%s” has been modified to account for the deleted folder\n"
+"“%s”."
 msgid_plural ""
 "The following filter rules\n"
 "%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+"“%s”."
 msgstr[0] ""
 "Suodatussääntöä ”%s” on muokattu ottamaan huomioon poistettu kansio \n"
 "”%s”."
@@ -17891,123 +18738,121 @@ msgstr[1] ""
 "%s on muokattu ottamaan huomioon poistettu kansio\n"
 "”%s”."
 
-#: ../mail/mail-config.ui.h:1
+#: ../src/mail/mail-config.ui.h:1
 #, fuzzy
 msgid "Set custom junk header"
 msgstr "Lisää oma roskapostiotsake"
 
-#: ../mail/mail-config.ui.h:4
+#: ../src/mail/mail-config.ui.h:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:5
+#: ../src/mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "Otsakkeen nimi"
 
-#: ../mail/mail-config.ui.h:6
+#: ../src/mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "Otsakkeen sisältö"
 
-#: ../mail/mail-config.ui.h:7
+#: ../src/mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "Oletustoiminta"
 
-#: ../mail/mail-config.ui.h:8
+#: ../src/mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
-#: ../mail/mail-config.ui.h:10
-#| msgid "Automatically insert _emoticon images"
+#: ../src/mail/mail-config.ui.h:10
 msgid "Automatically insert _emoticons"
 msgstr "Lisää _hymiöt automaattisesti"
 
-#: ../mail/mail-config.ui.h:11
-#| msgid "Use Unicode characters for smileys."
+#: ../src/mail/mail-config.ui.h:11
 msgid "Use Un_icode characters for emoticons"
 msgstr "Käytä _Unicode-merkkejä hymiöitä varten."
 
-#: ../mail/mail-config.ui.h:12
+#: ../src/mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Pyydä aina vastaanoton _kuittausta"
 
-#: ../mail/mail-config.ui.h:13
+#: ../src/mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Muotoile tiedostonimet Outlookin ja _GMailin tapaan."
 
-#: ../mail/mail-config.ui.h:14
+#: ../src/mail/mail-config.ui.h:14
 msgid "Send messages through Outbo_x folder"
 msgstr "Lähetä viestit Outbo_x-kansion kautta"
 
-#: ../mail/mail-config.ui.h:15
+#: ../src/mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
 msgstr "Merkkien määrä ennen _sanarivitystä:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../src/mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
 msgstr "_Merkistökoodaus:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../src/mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr "Vastaukset ja välitykset"
 
-#: ../mail/mail-config.ui.h:18
+#: ../src/mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../src/mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "_Välitystyyli:"
 
-#: ../mail/mail-config.ui.h:20
+#: ../src/mail/mail-config.ui.h:20
 msgid "Start _typing at the bottom on replying"
 msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
-#: ../mail/mail-config.ui.h:21
+#: ../src/mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
 
-#: ../mail/mail-config.ui.h:22
+#: ../src/mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Älä huomioi _postituslistojen Reply-To-otsaketta"
 
-#: ../mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:23
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Ryhmävastaus menee vain sä_hköpostilistalle, jos mahdollista"
 
-#: ../mail/mail-config.ui.h:24
+#: ../src/mail/mail-config.ui.h:24
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Allekirjoita viestit _digitaalisesti alkuperäisen viestin ollessa "
 "allekirjoitettu (PGP tai S/MIME)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../src/mail/mail-config.ui.h:25
 msgid "_Wrap quoted text in replies"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:30
+#: ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Sisennettynä"
 
-#: ../mail/mail-config.ui.h:32
+#: ../src/mail/mail-config.ui.h:32
 msgid "Sig_natures"
 msgstr "A_llekirjoitukset"
 
-#: ../mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:33
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:34
 msgid "_Languages"
 msgstr "_Kielet"
 
-#: ../mail/mail-config.ui.h:35
+#: ../src/mail/mail-config.ui.h:35
 msgid "Languages Table"
 msgstr "Kielitaulukko"
 
-#: ../mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:36
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -18015,11 +18860,11 @@ msgstr ""
 "Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.ui.h:38
+#: ../src/mail/mail-config.ui.h:38
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../mail/mail-config.ui.h:40
+#: ../src/mail/mail-config.ui.h:40
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -18028,34 +18873,34 @@ msgstr ""
 "seuraavissa tilanteissa etenemistä:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../src/mail/mail-config.ui.h:42
 msgid "Sending a message with an _empty subject line"
 msgstr "Lähettäessä viestejä tyhjällä _Aihe-otsakkeella"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:44
+#: ../src/mail/mail-config.ui.h:44
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Jos ainoastaan _Bcc-vastaanottajia (piilokopio) on määritelty"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:46
+#: ../src/mail/mail-config.ui.h:46
 #, fuzzy
 #| msgid "Sending a message with only _Bcc recipients defined"
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Jos ainoastaan _Bcc-vastaanottajia (piilokopio) on määritelty"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:48
+#: ../src/mail/mail-config.ui.h:48
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Lähetettäessä yksityisiä vastauksia _sähköpostilistaviesteihin"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:50
+#: ../src/mail/mail-config.ui.h:50
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Lähettäessä vastausta suurelle määrälle _vastaanottajia"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:52
+#: ../src/mail/mail-config.ui.h:52
 #, fuzzy
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
@@ -18063,45 +18908,48 @@ msgstr ""
 "listalle"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:54
+#: ../src/mail/mail-config.ui.h:54
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Lähettäessä viestiä vastaanottajille, _joita ei ole kirjoitettu "
 "sähköpostiosoitteen muodossa"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:56
+#: ../src/mail/mail-config.ui.h:56
 #, fuzzy
 #| msgid "Sending a message with an _empty subject line"
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Lähettäessä viestejä tyhjällä _Aihe-otsakkeella"
 
-#: ../mail/mail-config.ui.h:57
+#. Translators:
+#: ../src/mail/mail-config.ui.h:58
+msgid "Before composer _format changes from HTML to Plain Text"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:59
 msgid "Confirmations"
 msgstr "Vahvistukset"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:61
-#| msgid "Search Folders"
+#: ../src/mail/mail-config.ui.h:63
 msgid "Use for Folders"
 msgstr "Käytä kansioille"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:66
-#| msgid "Sender or Recipients"
+#: ../src/mail/mail-config.ui.h:68
 msgid "Use for Recipients"
 msgstr "Käytä vastaanottajille"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:863
+#: ../src/mail/mail-config.ui.h:70 ../src/modules/mail/em-composer-prefs.c:875
 msgid "Account"
 msgstr "Tili"
 
-#: ../mail/mail-config.ui.h:69
+#: ../src/mail/mail-config.ui.h:71
 msgid "Send account overrides"
 msgstr "Lähetystilin ohitukset"
 
-#: ../mail/mail-config.ui.h:70
+#: ../src/mail/mail-config.ui.h:72
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -18113,314 +18961,302 @@ msgstr ""
 "havaitsemisen. Vastaanottajaluettelo voi sisältää vaillinaisia osoitteita "
 "tai nimiä. Nimi- ja osoitekohtia vertaillaan erikseen."
 
-#: ../mail/mail-config.ui.h:71
+#: ../src/mail/mail-config.ui.h:73
 msgid "_Folder override has precedence over Recipient override"
 msgstr "_Kansiotason ohitus ylittää vastaanottajatason ohituksen"
 
-#: ../mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:74
 msgid "Send Account"
 msgstr "Lähetystili"
 
-#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:1
+#: ../src/mail/mail-config.ui.h:80 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:79 ../smime/gui/smime-ui.ui.h:2
+#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:80
+#: ../src/mail/mail-config.ui.h:82
 msgid "Start up"
 msgstr "Käynnistys"
 
-#: ../mail/mail-config.ui.h:81
+#: ../src/mail/mail-config.ui.h:83
 msgid "Check for new _messages on start"
 msgstr "T_arkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../mail/mail-config.ui.h:82
+#: ../src/mail/mail-config.ui.h:84
 msgid "Check for new messa_ges in all active accounts"
 msgstr "_Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:85
 msgid "Message Display"
 msgstr "Viestin näyttäminen"
 
-#: ../mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:86
 msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _fontteja kuin muut ohjelmat"
 
-#: ../mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:87
 msgid "S_tandard Font:"
 msgstr "_Oletusfontti:"
 
-#: ../mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:88
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen fontti"
 
-#: ../mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:89
 msgid "Select HTML variable width font"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen fontti"
 
-#: ../mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:90
 msgid "Fix_ed Width Font:"
 msgstr "_Tasalevyinen fontti:"
 
-#: ../mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:91
 msgid "_Mark messages as read after"
 msgstr "Merkitse vie_stit luetuiksi viiveellä"
 
-#: ../mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:93
 msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen käytetty väri"
 
-#: ../mail/mail-config.ui.h:92
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/mail/mail-config.ui.h:94
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: ../mail/mail-config.ui.h:93
+#: ../src/mail/mail-config.ui.h:95
 msgid "color"
 msgstr "väri"
 
-#: ../mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:96
 msgid "Default character e_ncoding:"
 msgstr "Merkistön _oletuskoodaus:"
 
-#: ../mail/mail-config.ui.h:95
+#: ../src/mail/mail-config.ui.h:97
 msgid "Apply the same _view settings to all folders"
 msgstr "Käytä samoja _näkymäasetuksia kaikille kansioille"
 
-#: ../mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:98
 msgid "F_all back to threading messages by subject"
 msgstr "Palaa viestien säikeistämiseen _aiheen perusteella"
 
-#: ../mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:99
 msgid "Delete Mail"
 msgstr "Sähköpostien poistaminen"
 
-#: ../mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:100
 msgid "Empty _trash folders"
 msgstr "Tyhj_ennä roskakorikansiot"
 
-#: ../mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:101
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:102
 msgid "Archive Mail"
 msgstr "Arkistoi viestit"
 
-#: ../mail/mail-config.ui.h:101
-msgid "On This Computer A_rchive folder:"
-msgstr "Arkistointikansio t_ällä tietokoneella:"
-
-#: ../mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:103
 msgid "Archive folder to use for On This Computer messages"
 msgstr ""
 
+#: ../src/mail/mail-config.ui.h:104
+msgid "On This Computer A_rchive folder:"
+msgstr "Arkistointikansio t_ällä tietokoneella:"
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:106
 msgid "_Show animated images"
 msgstr "N_äytä animoidut kuvat"
 
-#: ../mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:107
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Kysy vahvistus HTML-viesteistä henkilöille, jotka eivät niitä halua"
 
-#: ../mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:108
 msgid "Loading Remote Content"
 msgstr "Etäsisällön lataaminen"
 
-#: ../mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:109
 msgid "_Never load remote content from the Internet"
 msgstr "_Älä koskaan lataa etäsisältöä verkosta"
 
-#: ../mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:110
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Lataa viestin etäsisältö vain yhteystietojen lähettämissä viesteissä"
 
-#: ../mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:111
 msgid "_Always load remote content from the Internet"
 msgstr "Lataa _aina etäsisältö verkosta"
 
-#: ../mail/mail-config.ui.h:110
-#| msgid "_Show the photograph of sender in the message preview"
+#: ../src/mail/mail-config.ui.h:112
 msgid "Notify about _missing remote content in the message preview"
 msgstr "_Huomauta puuttuvasta etäsisällöstä viestien esikatselussa"
 
-#: ../mail/mail-config.ui.h:111
-msgid "Add"
-msgstr "Lisää"
-
-#: ../mail/mail-config.ui.h:112
-msgid "Remove"
-msgstr "Poista"
-
-#: ../mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:115
 msgid "Allow for sites:"
 msgstr "Salli sivustoille:"
 
-#: ../mail/mail-config.ui.h:114
-#| msgid "All local folders"
+#: ../src/mail/mail-config.ui.h:116
 msgid "Allow for senders:"
 msgstr "Salli lähettäjille:"
 
-#: ../mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:117
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../mail/mail-config.ui.h:116 ../mail/message-list.etspec.h:19
-msgid "Labels"
-msgstr "Merkinnät"
-
-#: ../mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:119
 msgid "Sender Photograph"
 msgstr "Lähettäjän valokuva"
 
-#: ../mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:120
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
 
-#: ../mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:121
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Etsi lähettäjän kuvaa _gravatar.comista"
 
-#: ../mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:122
 msgid "Displayed Message Headers"
 msgstr "Näytettävät viestin otsakkeet"
 
-#: ../mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:123
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../mail/mail-config.ui.h:122
-#: ../modules/addressbook/autocompletion-config.c:116
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../src/mail/mail-config.ui.h:124
+#: ../src/modules/addressbook/autocompletion-config.c:117
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Päiväys/aika -muotoilu"
 
-#: ../mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:126
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../mail/mail-config.ui.h:125
-#| msgid "Delete junk messages on e_xit"
+#: ../src/mail/mail-config.ui.h:127
 msgid "_Delete junk messages"
 msgstr "Poista roskapostivi_estit"
 
-#: ../mail/mail-config.ui.h:126
-#| msgid "Junk Test"
+#: ../src/mail/mail-config.ui.h:128
 msgid "Junk Test Options"
 msgstr "Roskapostitestaus"
 
-#: ../mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:129
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Älä merkitse viestejä _roskapostiksi, jos lähettäjä on osoitekirjassa"
 
-#: ../mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:130
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:131
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
-#: ../mail/mail-config.ui.h:131
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:301
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:244
+#: ../src/mail/mail-config.ui.h:133
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
 msgid "No encryption"
 msgstr "Ei salausta"
 
-#: ../mail/mail-config.ui.h:132
+#: ../src/mail/mail-config.ui.h:134
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
-#: ../mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:135
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
-#: ../mail/mail-dialogs.ui.h:1
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Viestit jotka olet valinnut lähetettäviksi edelleen on listattu alla.\n"
-"Valitse tehtävä uudelleenlähetys \"Merkki\" valikosta."
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "_Flag:"
-msgstr "_Merkki:"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "_Due By:"
-msgstr "_Erääntyy:"
-
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Co_mpleted"
-msgstr "_Valmis"
-
-#: ../mail/mail-dialogs.ui.h:8
+#: ../src/mail/mail-dialogs.ui.h:1
 msgid "Call"
 msgstr "Soita"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../src/mail/mail-dialogs.ui.h:2
 msgid "Do Not Forward"
 msgstr "Älä välitä"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../src/mail/mail-dialogs.ui.h:3
 msgid "Follow-Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../src/mail/mail-dialogs.ui.h:4
 msgid "For Your Information"
 msgstr "Tiedoksesi"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../src/mail/mail-dialogs.ui.h:5
 msgid "Forward"
 msgstr "Välitä"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../src/mail/mail-dialogs.ui.h:6
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../src/mail/mail-dialogs.ui.h:10
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../src/mail/mail-dialogs.ui.h:11
 msgid "Review"
 msgstr "Arvio"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../src/mail/mail-dialogs.ui.h:12
+#, fuzzy
+#| msgid ""
+#| "The messages you have selected for follow up are listed below.\n"
+#| "Please select a follow up action from the \"Flag\" menu."
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the “Flag” menu."
+msgstr ""
+"Viestit jotka olet valinnut lähetettäviksi edelleen on listattu alla.\n"
+"Valitse tehtävä uudelleenlähetys \"Merkki\" valikosta."
+
+#: ../src/mail/mail-dialogs.ui.h:14
+msgid "_Flag:"
+msgstr "_Merkki:"
+
+#: ../src/mail/mail-dialogs.ui.h:15
+msgid "_Due By:"
+msgstr "_Erääntyy:"
+
+#. Translators: Flag Completed
+#: ../src/mail/mail-dialogs.ui.h:18
+msgid "Co_mpleted"
+msgstr "_Valmis"
+
+#: ../src/mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "Lisenssisopimus"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "_Tick this to accept the license agreement"
-msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
-
-#: ../mail/mail-dialogs.ui.h:22
+#: ../src/mail/mail-dialogs.ui.h:21
 msgid "_Accept License"
 msgstr "_Hyväksy lisenssi"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../src/mail/mail-dialogs.ui.h:22
+msgid "_Tick this to accept the license agreement"
+msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
+
+#: ../src/mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../src/mail/mail-dialogs.ui.h:25
 msgid "Digital Signature"
 msgstr "Digitaalinen allekirjoitus"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../src/mail/mail-dialogs.ui.h:26
 msgid "Encryption"
 msgstr "Salaus"
 
-#: ../mail/mail.error.xml.h:1
+#: ../src/mail/mail.error.xml.h:1
 msgid "Invalid authentication"
 msgstr "Virheellinen tunnistautuminen"
 
-#: ../mail/mail.error.xml.h:2
+#: ../src/mail/mail.error.xml.h:2
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -18428,11 +19264,12 @@ msgstr ""
 "Palvelin ei tue tämän tyyppistä tunnistautumista eikä välttämättä tue "
 "lainkaan tunnistautumista."
 
-#: ../mail/mail.error.xml.h:3
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Kirjautuminen palvelimelle \"{0}\" käyttäjänä \"{0}\" epäonnistui."
+#: ../src/mail/mail.error.xml.h:3
+#| msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgid "Your login to your server “{0}” as “{0}” failed."
+msgstr "Kirjautuminen palvelimelle “{0}” käyttäjänä “{0}” epäonnistui."
 
-#: ../mail/mail.error.xml.h:4
+#: ../src/mail/mail.error.xml.h:4
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -18441,11 +19278,11 @@ msgstr ""
 "salasanoissa isot ja pienet kirjaimet ovat eri asia. Tarkista myös ettei "
 "CapsLock ole päällä."
 
-#: ../mail/mail.error.xml.h:5
+#: ../src/mail/mail.error.xml.h:5
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Haluatko varmasti lähettää viestin HTML-muodossa?"
 
-#: ../mail/mail.error.xml.h:6
+#: ../src/mail/mail.error.xml.h:6
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -18455,11 +19292,11 @@ msgstr ""
 "sähköpostia:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:9
+#: ../src/mail/mail.error.xml.h:9
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Haluatko varmasti lähettää ilman aihetta?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../src/mail/mail.error.xml.h:10
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -18467,13 +19304,13 @@ msgstr ""
 "Merkityksellisen aihe-kentän lisääminen viesteihisi helpottaa vastaanottajaa "
 "ymmärtämään, mistä viestissä on kyse."
 
-#: ../mail/mail.error.xml.h:11
+#: ../src/mail/mail.error.xml.h:11
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
 "(Bcc)?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../src/mail/mail.error.xml.h:12
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -18490,7 +19327,7 @@ msgstr ""
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
 "määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite."
 
-#: ../mail/mail.error.xml.h:15
+#: ../src/mail/mail.error.xml.h:15
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -18502,11 +19339,11 @@ msgstr ""
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
 "määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite."
 
-#: ../mail/mail.error.xml.h:17
+#: ../src/mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Haluatko varmasti lähettää viestin, jossa on virheellinen osoite?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../src/mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -18515,11 +19352,11 @@ msgstr ""
 "sähköpostiosoitteeksi:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:20
+#: ../src/mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Haluatko varmasti lähettää viestin, jossa on virheellisiä osoitteita?"
 
-#: ../mail/mail.error.xml.h:21
+#: ../src/mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -18528,11 +19365,11 @@ msgstr ""
 "sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:23
+#: ../src/mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "Lähetetäänkö yksityinen vastaus?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../src/mail/mail.error.xml.h:24
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -18542,11 +19379,11 @@ msgstr ""
 "Sähköpostilista yrittää ohjata vastaustasi takaisin listalle. Haluatko "
 "jatkaa?"
 
-#: ../mail/mail.error.xml.h:25
+#: ../src/mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "Vastaa _yksityisesti"
 
-#: ../mail/mail.error.xml.h:27
+#: ../src/mail/mail.error.xml.h:27
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -18556,11 +19393,11 @@ msgstr ""
 "vastaamassa yksityisesti lähettäjälle etkä sähköpostilistalle. Haluatko "
 "jatkaa?"
 
-#: ../mail/mail.error.xml.h:29
+#: ../src/mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "Lähetetäänkö vastaus kaikille vastaanottajille?"
 
-#: ../mail/mail.error.xml.h:30
+#: ../src/mail/mail.error.xml.h:30
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -18568,12 +19405,12 @@ msgstr ""
 "Olet vastaamassa viestiin, joka lähetettiin useille vastaanottajille. "
 "Haluatko vastata kaikille heille?"
 
-#: ../mail/mail.error.xml.h:31
+#: ../src/mail/mail.error.xml.h:31
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Viestiä ei voi lähettää, koska et ole määritellyt vastaanottajia"
 
-#: ../mail/mail.error.xml.h:32
+#: ../src/mail/mail.error.xml.h:32
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -18582,11 +19419,11 @@ msgstr ""
 "sähköpostiosoitteita napsauttamalla Vastaanottaja: -painiketta kentän "
 "vieressä."
 
-#: ../mail/mail.error.xml.h:33
+#: ../src/mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Käytä oletuskansiota luonnoksille?"
 
-#: ../mail/mail.error.xml.h:34
+#: ../src/mail/mail.error.xml.h:34
 #, fuzzy
 #| msgid ""
 #| "Unable to open the drafts folder for this account. Use the system drafts "
@@ -18595,54 +19432,58 @@ msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?\n"
 "\n"
-"The reported error was &quot;{0}&quot;."
+"The reported error was “{0}”."
 msgstr ""
 "Tämän sähköpostitilin luonnoskansiota ei voi avata. Haluatko käyttää "
 "luonnosten oletuskansiota sen sijaan?"
 
-#: ../mail/mail.error.xml.h:37
+#: ../src/mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Käytä _oletuksia"
 
-#: ../mail/mail.error.xml.h:38
+#: ../src/mail/mail.error.xml.h:38
+#| msgid ""
+#| "Are you sure you want to permanently remove all the deleted messages in "
+#| "folder \"{0}\"?"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
-msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kansiosta \"%{0}\"?"
+"folder “{0}”?"
+msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kansiosta “{0}”?"
 
-#: ../mail/mail.error.xml.h:39
+#: ../src/mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Jos jatkat, et voi palauttaa näitä viestejä."
 
-#: ../mail/mail.error.xml.h:40
+#: ../src/mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
 
-#: ../mail/mail.error.xml.h:41
+#: ../src/mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
-#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../src/mail/mail.error.xml.h:42
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1657
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../mail/mail.error.xml.h:43
+#: ../src/mail/mail.error.xml.h:43
 msgid "Opening too many messages at once may take a long time."
 msgstr "Liian monen viestin avaus kerralla voi viedä pitkän ajan."
 
-#: ../mail/mail.error.xml.h:44
+#: ../src/mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/mail.error.xml.h:45
+#: ../src/mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../src/mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -18653,55 +19494,60 @@ msgstr ""
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:50
+#: ../src/mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "Virhe suoritettaessa komentoa \"{0}\"."
 
-#: ../mail/mail.error.xml.h:51
+#: ../src/mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "Virhe suoritettaessa toimenpidettä."
 
-#: ../mail/mail.error.xml.h:52
+#: ../src/mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Syötä salasana."
 
-#: ../mail/mail.error.xml.h:53
+#: ../src/mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Virhe ladattaessa suodatinten määrittelyjä."
 
-#: ../mail/mail.error.xml.h:54
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Hakemistoon \"{0}\" ei voi tallentaa."
+#: ../src/mail/mail.error.xml.h:54
+#| msgid "Cannot save to directory \"{0}\"."
+msgid "Cannot save to directory “{0}”."
+msgstr "Hakemistoon “{0}” ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:55
-msgid "Cannot save to file \"{0}\"."
-msgstr "Tiedostoon \"{0}\" ei voi tallentaa."
+#: ../src/mail/mail.error.xml.h:55
+#| msgid "Cannot save to file \"{0}\"."
+msgid "Cannot save to file “{0}”."
+msgstr "Tiedostoon “{0}” ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:56
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Tallennushakemisto ei voi luoda, syy: \"{1}\""
+#: ../src/mail/mail.error.xml.h:56
+#| msgid "Cannot create the save directory, because \"{1}\""
+msgid "Cannot create the save directory, because “{1}”"
+msgstr "Tallennushakemistoa ei voi luoda, syy: “{1}”"
 
-#: ../mail/mail.error.xml.h:57
+#: ../src/mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "Väliaikaista hakemistoa ei voi luoda."
 
-#: ../mail/mail.error.xml.h:58
+#: ../src/mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Tiedosto on jo olemassa, mutta sitä ei voi ylikirjoittaa."
 
-#: ../mail/mail.error.xml.h:59
+#: ../src/mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Tiedosto on olemassa mutta ei ole tavallinen tiedosto."
 
-#: ../mail/mail.error.xml.h:60
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Kansiota \"{0}\" ei voi poistaa."
+#: ../src/mail/mail.error.xml.h:60
+#| msgid "Cannot delete folder \"{0}\"."
+msgid "Cannot delete folder “{0}”."
+msgstr "Kansiota “{0}” ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:61
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Järjestelmäkansiota \"{0}\" ei voi poistaa."
+#: ../src/mail/mail.error.xml.h:61
+#| msgid "Cannot delete system folder \"{0}\"."
+msgid "Cannot delete system folder “{0}”."
+msgstr "Järjestelmäkansiota “{0}” ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:62
+#: ../src/mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -18709,64 +19555,70 @@ msgstr ""
 "Järjestelmäkansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
 "voi nimetä uudestaan, siirtää tai poistaa."
 
-#: ../mail/mail.error.xml.h:63
+#: ../src/mail/mail.error.xml.h:63
 #, fuzzy
 #| msgid "Could not read signature file &quot;{0}&quot;."
-msgid "Failed to expunge folder &quot;{0}&quot;."
+msgid "Failed to expunge folder “{0}”."
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
-#: ../mail/mail.error.xml.h:65
-msgid "Failed to refresh folder &quot;{0}&quot;."
-msgstr "Kansion &quot;{0}&quot; päivittäminen epäonnistui."
+#: ../src/mail/mail.error.xml.h:65
+#| msgid "Failed to refresh folder &quot;{0}&quot;."
+msgid "Failed to refresh folder “{0}”."
+msgstr "Kansion “{0}” päivittäminen epäonnistui."
 
-#: ../mail/mail.error.xml.h:66
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Järjestelmäkansiota \"{0}\" ei voi siirtää tai nimetä uudestaan."
+#: ../src/mail/mail.error.xml.h:66
+#| msgid "Cannot rename or move system folder \"{0}\"."
+msgid "Cannot rename or move system folder “{0}”."
+msgstr "Järjestelmäkansiota “{0}” ei voi siirtää tai nimetä uudestaan."
 
-#: ../mail/mail.error.xml.h:67
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Poistetaanko todella kansio \"{0}\" ja kaikki sen alikansiot?"
+#: ../src/mail/mail.error.xml.h:67
+#| msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgid "Really delete folder “{0}” and all of its subfolders?"
+msgstr "Poistetaanko todella kansio “{0}” ja kaikki sen alikansiot?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../src/mail/mail.error.xml.h:68
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders' "
+#| "contents will be deleted permanently."
 msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
+"If you delete the folder, all of its contents and its subfolders’ contents "
 "will be deleted permanently."
 msgstr ""
-"Jos poistat kansion, menetetään kaikki sen sisältö ja alikansiot "
-"sisältöineen pysyvästi."
+"Jos poistat kansion, kaikki sen sisältö ja alikansiot sisältöineen poistuvat "
+"pysyvästi."
 
-#: ../mail/mail.error.xml.h:70
+#: ../src/mail/mail.error.xml.h:70
 #, fuzzy
 #| msgid "Really delete folder \"{0}\"?"
-msgid "Really unsubscribe folder \"{0}\"?"
+msgid "Really unsubscribe folder “{0}”?"
 msgstr "Haluatko varmasti poistaa kansion ”{0}”?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../src/mail/mail.error.xml.h:71
 msgid ""
 "If you unsubscribe the folder, it might not be visible in the Evolution, "
-"while still being available on the server. You can re-subscribe in Folder-"
-">Subscriptions... menu."
+"while still being available on the server. You can re-subscribe in "
+"Folder→Subscriptions... menu."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:72
-#| msgid "_Unsubscribe"
+#: ../src/mail/mail.error.xml.h:72
 msgid "Do _Not Unsubscribe"
 msgstr "_Älä peru tilausta"
 
-#: ../mail/mail.error.xml.h:74
-msgid "Really delete folder \"{0}\"?"
-msgstr "Haluatko varmasti poistaa kansion ”{0}”?"
+#: ../src/mail/mail.error.xml.h:74
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really delete folder “{0}”?"
+msgstr "Haluatko varmasti poistaa kansion “{0}”?"
 
-#: ../mail/mail.error.xml.h:75
+#: ../src/mail/mail.error.xml.h:75
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Jos poistat kansion, kaikki sen sisältö menetetään pysyvästi."
 
-#: ../mail/mail.error.xml.h:76
+#: ../src/mail/mail.error.xml.h:76
 msgid "These messages are not copies."
 msgstr "Nämä viestit eivät ole kopioita."
 
-#: ../mail/mail.error.xml.h:77
+#: ../src/mail/mail.error.xml.h:77
 #, fuzzy
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
@@ -18777,63 +19629,71 @@ msgstr ""
 "alkuperäisestä kansiosta, ei vain hakutuloksista.\n"
 "Haluatko varmasti poistaa viestin?"
 
-#: ../mail/mail.error.xml.h:78
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:78
+#, fuzzy
+#| msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgid "Cannot rename “{0}” to “{1}”."
 msgstr "\"{0}\" ei voi nimetä uudestaan nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:79
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Kansio \"{1}\" on jo olemassa. Valitse toinen nimi."
+#: ../src/mail/mail.error.xml.h:79
+#| msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgid "A folder named “{1}” already exists. Please use a different name."
+msgstr "Kansio “{1}” on jo olemassa. Valitse toinen nimi."
 
-#: ../mail/mail.error.xml.h:80
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:80
+#, fuzzy
+#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgid "Cannot move folder “{0}” to “{1}”."
 msgstr "Kansiota \"{0}\" ei voi siirtää  kohtaan \"{1}\"."
 
-#: ../mail/mail.error.xml.h:81
+#: ../src/mail/mail.error.xml.h:81
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Lähdekansiota ei voi avata. Virhe: {2}"
 
-#: ../mail/mail.error.xml.h:82
+#: ../src/mail/mail.error.xml.h:82
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Kohdekansiota ei voi avata. Virhe: {2}"
 
-#: ../mail/mail.error.xml.h:83
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:83
+#, fuzzy
+#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgid "Cannot copy folder “{0}” to “{1}”."
 msgstr "Kansiota \"{0}\" ei voi kopioida nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:84
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kansiota \"{0}\" ei voi luoda."
+#: ../src/mail/mail.error.xml.h:84
+#| msgid "Cannot create folder \"{0}\"."
+msgid "Cannot create folder “{0}”."
+msgstr "Kansiota “{0}” ei voi luoda."
 
-#: ../mail/mail.error.xml.h:85
+#: ../src/mail/mail.error.xml.h:85
 msgid "Cannot open folder. Error: {1}"
 msgstr "Kansiota ei voi avata. Virhe: {1}"
 
-#: ../mail/mail.error.xml.h:86
+#: ../src/mail/mail.error.xml.h:86
 msgid "Cannot save changes to account."
 msgstr "Muutoksia tiliin ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:87
+#: ../src/mail/mail.error.xml.h:87
 msgid "You have not filled in all of the required information."
 msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
-#: ../mail/mail.error.xml.h:88
+#: ../src/mail/mail.error.xml.h:88
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: ../mail/mail.error.xml.h:89
+#: ../src/mail/mail.error.xml.h:89
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../src/mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jos jatkat, tilin tiedot poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:91
+#: ../src/mail/mail.error.xml.h:91
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Haluatko varmasti poistaa tämän tilin ja kaikki sen välimuistit?"
 
-#: ../mail/mail.error.xml.h:92
+#: ../src/mail/mail.error.xml.h:92
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -18841,30 +19701,31 @@ msgstr ""
 "Jos jatkat, tilin tiedot ja kaikki siihen liittyvä välimuistitieto "
 "poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:94
+#: ../src/mail/mail.error.xml.h:94
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Haluatko varmasti poistaa tämän tilin käytöstä ja poistaa kaikki sen "
 "välimuistit?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../src/mail/mail.error.xml.h:95
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Jos jatkat, kaikki välimuistitilit poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:96
+#: ../src/mail/mail.error.xml.h:96
 msgid "Do _Not Disable"
 msgstr "_Älä poista käytöstä"
 
-#: ../mail/mail.error.xml.h:97
+#: ../src/mail/mail.error.xml.h:97
 msgid "_Disable"
 msgstr "Älä _käytä"
 
-#: ../mail/mail.error.xml.h:98
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "Hakunäkymää \"{0}\" ei voi muokata, koska sitä ei ole olemassa."
+#: ../src/mail/mail.error.xml.h:98
+#| msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgid "Cannot edit Search Folder “{0}” as it does not exist."
+msgstr "Hakukansiota “{0}” ei voi muokata, koska sitä ei ole olemassa."
 
-#: ../mail/mail.error.xml.h:99
+#: ../src/mail/mail.error.xml.h:99
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -18872,39 +19733,41 @@ msgstr ""
 "Kansio on ehkä lisätty järjestelmän puolesta.\n"
 "Siirry hakunäkymien muokkaukseen ja lisää se erikseen, jos tarpeen."
 
-#: ../mail/mail.error.xml.h:101
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Hakunäkymää \"{0}\" ei voi lisätä."
+#: ../src/mail/mail.error.xml.h:101
+#| msgid "Cannot add Search Folder \"{0}\"."
+msgid "Cannot add Search Folder “{0}”."
+msgstr "Hakukansiota “{0}” ei voi lisätä."
 
-#: ../mail/mail.error.xml.h:102
-msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "Kansio \"{0}\" on jo olemassa. Valitse toinen nimi."
+#: ../src/mail/mail.error.xml.h:102
+#| msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid "A folder named “{0}” already exists. Please use a different name."
+msgstr "Kansio “{0}” on jo olemassa. Valitse toinen nimi."
 
-#: ../mail/mail.error.xml.h:103
+#: ../src/mail/mail.error.xml.h:103
 msgid "Search Folders automatically updated."
 msgstr "Hakunäkymät päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:104
+#: ../src/mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
 msgstr "Sähköpostin suodattimet päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:105
+#: ../src/mail/mail.error.xml.h:105
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:106
+#: ../src/mail/mail.error.xml.h:106
 msgid "You must specify a folder."
 msgstr "Kansio täytyy valita."
 
-#: ../mail/mail.error.xml.h:108
+#: ../src/mail/mail.error.xml.h:108
 msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
-#: ../mail/mail.error.xml.h:109
+#: ../src/mail/mail.error.xml.h:109
 msgid "No folder selected."
 msgstr "Kansiota ei ole valittu."
 
-#: ../mail/mail.error.xml.h:110
+#: ../src/mail/mail.error.xml.h:110
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -18914,13 +19777,20 @@ msgstr ""
 "Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai "
 "kaikki etä- ja paikalliset kansiot."
 
-#: ../mail/mail.error.xml.h:112
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Virhe muunnettaessa vanhaa sähköpostikansiota \"{0}\"."
+#: ../src/mail/mail.error.xml.h:112
+#| msgid "Problem migrating old mail folder \"{0}\"."
+msgid "Problem migrating old mail folder “{0}”."
+msgstr "Virhe muunnettaessa vanhaa sähköpostikansiota “{0}”."
 
-#: ../mail/mail.error.xml.h:113
+#: ../src/mail/mail.error.xml.h:113
+#, fuzzy
+#| msgid ""
+#| "A non-empty folder at \"{1}\" already exists.\n"
+#| "\n"
+#| "You can choose to ignore this folder, overwrite or append its contents, "
+#| "or quit."
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
+"A non-empty folder at “{1}” already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
@@ -18929,21 +19799,21 @@ msgstr ""
 "\n"
 "Voit ohittaa tämän kansion, kirjoittaa sen yli, lisätä kansioon tai poistua."
 
-#: ../mail/mail.error.xml.h:117
+#: ../src/mail/mail.error.xml.h:117
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: ../mail/mail.error.xml.h:118
+#: ../src/mail/mail.error.xml.h:118
 msgid "_Append"
 msgstr "_Lisää"
 
-#: ../mail/mail.error.xml.h:119
-msgid "Evolution's local mail format has changed."
+#: ../src/mail/mail.error.xml.h:119
+msgid "Evolution’s local mail format has changed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:120
+#: ../src/mail/mail.error.xml.h:120
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"Evolution’s local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
 "want to migrate now?\n"
 "\n"
@@ -18952,51 +19822,55 @@ msgid ""
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:123
+#: ../src/mail/mail.error.xml.h:123
 msgid "_Exit Evolution"
 msgstr "_Poistu Evolutionista"
 
-#: ../mail/mail.error.xml.h:124
+#: ../src/mail/mail.error.xml.h:124
 #, fuzzy
 msgid "_Migrate Now"
 msgstr "Siirto"
 
-#: ../mail/mail.error.xml.h:125
+#: ../src/mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "Lisenssitiedostoa ei voi avata."
 
-#: ../mail/mail.error.xml.h:126
+#: ../src/mail/mail.error.xml.h:126
+#, fuzzy
+#| msgid ""
+#| "Cannot read the license file \"{0}\", due to an installation problem. You "
+#| "will not be able to use this provider until you can accept its license."
 msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
+"Cannot read the license file “{0}”, due to an installation problem. You will "
+"not be able to use this provider until you can accept its license."
 msgstr ""
 "Lisenssitiedostoa \"{0}\" ei voi lukea asennusongelman takia. Et voi käyttää "
 "tätä lähdettä ennen kuin voit hyväksyä lisenssin."
 
-#: ../mail/mail.error.xml.h:127
+#: ../src/mail/mail.error.xml.h:127
 msgid "Please wait."
 msgstr "Odota, ole hyvä."
 
-#: ../mail/mail.error.xml.h:128
+#: ../src/mail/mail.error.xml.h:128
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
-#: ../mail/mail.error.xml.h:129
+#: ../src/mail/mail.error.xml.h:129
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr "Tuettujen tunnistautumistapojen kysely palvelimelta epäonnistui."
 
-#: ../mail/mail.error.xml.h:130
+#: ../src/mail/mail.error.xml.h:130
 #, fuzzy
 #| msgid "Failed to retrieve messages."
 msgid "Failed to get server setup."
 msgstr "Viestien nouto epäonnistui."
 
-#: ../mail/mail.error.xml.h:131
+#: ../src/mail/mail.error.xml.h:131
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkronoidaanko kansiot levylle verkkoyhteydetöntä käyttöä varten?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../src/mail/mail.error.xml.h:132
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -19004,27 +19878,27 @@ msgstr ""
 "Haluatko synkronoida paikallisesti kansiot, jotka on merkitty yhteydettömään "
 "käyttöön?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../src/mail/mail.error.xml.h:133
 msgid "Do _Not Synchronize"
 msgstr "Ä_lä synkronoi"
 
-#: ../mail/mail.error.xml.h:134
+#: ../src/mail/mail.error.xml.h:134
 msgid "_Synchronize"
 msgstr "_Synkronoi"
 
-#: ../mail/mail.error.xml.h:135
+#: ../src/mail/mail.error.xml.h:135
 msgid "Do you want to mark all messages as read?"
 msgstr "Haluatko merkitä kaikki viestit luetuiksi?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../src/mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Tämä toiminto merkitsee kaikki viestit luetuiksi valitussa kansiossa."
 
-#: ../mail/mail.error.xml.h:137
+#: ../src/mail/mail.error.xml.h:137
 msgid "Also mark messages in subfolders?"
 msgstr "Merkitse viestit myös alikansioissa?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../src/mail/mail.error.xml.h:138
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19032,76 +19906,80 @@ msgstr ""
 "Haluatko merkitä viestit luetuksi vain nykyisessä kansiossa vai myös "
 "kaikissa sen alikansioissa?"
 
-#: ../mail/mail.error.xml.h:139
+#: ../src/mail/mail.error.xml.h:139
 msgid "In Current Folder and _Subfolders"
 msgstr "Nykyisessä kansiossa ja alikan_sioissa"
 
-#: ../mail/mail.error.xml.h:140
+#: ../src/mail/mail.error.xml.h:140
 msgid "In Current _Folder Only"
 msgstr "Vain nykyisessä _kansiossa"
 
-#: ../mail/mail.error.xml.h:141
+#: ../src/mail/mail.error.xml.h:141
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 "Pitäisikö Evolutionin sulkea tämä ikkuna vastatessa tai lähettäessä edelleen?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../src/mail/mail.error.xml.h:142
 msgid "_Yes, Always"
 msgstr "_Kyllä, aina"
 
-#: ../mail/mail.error.xml.h:143
+#: ../src/mail/mail.error.xml.h:143
 msgid "_No, Never"
 msgstr "Ei, ei koskaan"
 
-#: ../mail/mail.error.xml.h:144
+#: ../src/mail/mail.error.xml.h:144
 #, fuzzy
 #| msgid "Copying folder %s"
 msgid "Copy folder in folder tree."
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/mail.error.xml.h:145
-msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+#: ../src/mail/mail.error.xml.h:145
+#, fuzzy
+#| msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
 msgstr "Haluatko varmasti kopioida kansion '{0}' kansioon '{1}'?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../src/mail/mail.error.xml.h:147
 msgid "Do _not copy"
 msgstr "Älä ko_pioi"
 
-#: ../mail/mail.error.xml.h:148
+#: ../src/mail/mail.error.xml.h:148
 msgid "_Always copy"
 msgstr "_Kopioi aina"
 
-#: ../mail/mail.error.xml.h:149
+#: ../src/mail/mail.error.xml.h:149
 #, fuzzy
 #| msgid "N_ever"
 msgid "N_ever copy"
 msgstr "E_i koskaan"
 
-#: ../mail/mail.error.xml.h:150
+#: ../src/mail/mail.error.xml.h:150
 #, fuzzy
 #| msgid "Moving folder %s"
 msgid "Move folder in folder tree."
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/mail.error.xml.h:151
-msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+#: ../src/mail/mail.error.xml.h:151
+#, fuzzy
+#| msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgid "Are you sure you want to to move folder “{0}” to folder “{1}”?"
 msgstr "Haluatko varmasti siirtää kansion '{0}' kansioon '{1}'?"
 
-#: ../mail/mail.error.xml.h:153
+#: ../src/mail/mail.error.xml.h:153
 msgid "Do _not move"
 msgstr "Ä_lä siirrä"
 
-#: ../mail/mail.error.xml.h:154
+#: ../src/mail/mail.error.xml.h:154
 msgid "_Always move"
 msgstr "_Siirrä aina"
 
-#: ../mail/mail.error.xml.h:155
+#: ../src/mail/mail.error.xml.h:155
 #, fuzzy
 #| msgid "N_ever"
 msgid "N_ever move"
 msgstr "E_i koskaan"
 
-#: ../mail/mail.error.xml.h:156
+#: ../src/mail/mail.error.xml.h:156
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -19109,117 +19987,124 @@ msgstr ""
 "Viestiä ei voi lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
 "käytössä"
 
-#: ../mail/mail.error.xml.h:157
+#: ../src/mail/mail.error.xml.h:157
 msgid "Please enable the account or send using another account."
 msgstr "Ota tili käyttöön tai lähetä käyttäen toista tiliä."
 
-#: ../mail/mail.error.xml.h:158
+#: ../src/mail/mail.error.xml.h:158
 msgid "Mail Deletion Failed"
 msgstr "Sähköpostin poisto epäonnistui"
 
-#: ../mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:159
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Oikeutesi eivät riitä tämän sähköpostin poistamiseen."
 
-#: ../mail/mail.error.xml.h:160
-msgid "\"Check Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:160
+#, fuzzy
+#| msgid "\"Check Junk\" Failed"
+msgid "“Check Junk” Failed"
 msgstr "”Etsi roskapostia” epäonnistui"
 
-#: ../mail/mail.error.xml.h:161
-msgid "\"Report Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:161
+#, fuzzy
+#| msgid "\"Report Junk\" Failed"
+msgid "“Report Junk” Failed"
 msgstr "”Ilmoita roskapostiksi” epäonnistui"
 
-#: ../mail/mail.error.xml.h:162
-msgid "\"Report Not Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:162
+#, fuzzy
+#| msgid "\"Report Not Junk\" Failed"
+msgid "“Report Not Junk” Failed"
 msgstr "”Ilmoita ei-roskapostiksi” epäonnistui"
 
-#: ../mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:163
 msgid "Remove duplicate messages?"
 msgstr "Poistetaanko viestien kaksoiskappaleet?"
 
-#: ../mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:164
 msgid "No duplicate messages found."
 msgstr "Kaksoiskappaleita ei löytynyt."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:166
-msgid "Folder '{0}' doesn't contain any duplicate message."
+#: ../src/mail/mail.error.xml.h:166
+#, fuzzy
+#| msgid "Folder '{0}' doesn't contain any duplicate message."
+msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "Kansio '{0}' ei sisällä viestien kaksoiskappaleita."
 
-#: ../mail/mail.error.xml.h:167
+#: ../src/mail/mail.error.xml.h:167
 #, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
-msgid "Failed to connect account &quot;{0}&quot;."
+msgid "Failed to connect account “{0}”."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:168
+#: ../src/mail/mail.error.xml.h:168
 #, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
-msgid "Failed to disconnect account &quot;{0}&quot;."
+msgid "Failed to disconnect account “{0}”."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:169
+#: ../src/mail/mail.error.xml.h:169
 #, fuzzy
-msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgid "Failed to unsubscribe from folder “{0}”."
 msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
-#: ../mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:170
 msgid "Unable to retrieve message."
 msgstr "Viestin nouto ei onnistunut."
 
-#: ../mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:172
-#, fuzzy
+#: ../src/mail/mail.error.xml.h:172
 #| msgid "Start in offline mode"
 msgid "Message is not available in offline mode."
-msgstr "Aloita yhteydettömässä tilassa"
+msgstr "Viesti ei ole saatavilla yhteydettömässä tilassa."
 
-#: ../mail/mail.error.xml.h:173
+#: ../src/mail/mail.error.xml.h:173
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
-"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"is online again, use File→Download Messages for Offline Usage, when this "
 "folder is selected, to make sure that all the messages in the folder will be "
 "available in offline mode."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:174
+#: ../src/mail/mail.error.xml.h:174
 msgid "Failed to open folder."
 msgstr "Kansion avaus epäonnistui."
 
-#: ../mail/mail.error.xml.h:176
+#: ../src/mail/mail.error.xml.h:176
 msgid "Failed to find duplicate messages."
 msgstr "VIestin kaksoiskappaleiden etsiminen epäonnistui."
 
-#: ../mail/mail.error.xml.h:177
+#: ../src/mail/mail.error.xml.h:177
 msgid "Failed to retrieve messages."
 msgstr "Viestien nouto epäonnistui."
 
-#: ../mail/mail.error.xml.h:178
+#: ../src/mail/mail.error.xml.h:178
 msgid "Failed to mark messages as read."
 msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 
-#: ../mail/mail.error.xml.h:179
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to remove attachments from messages."
 msgstr "Liitteiden poisto viesteistä epäonnistui."
 
-#: ../mail/mail.error.xml.h:180
+#: ../src/mail/mail.error.xml.h:180
 #, fuzzy
 msgid "Failed to download messages for offline viewing."
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../mail/mail.error.xml.h:181
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to save messages to disk."
 msgstr "Viestien tallennus levylle epäonnistui."
 
-#: ../mail/mail.error.xml.h:182
+#: ../src/mail/mail.error.xml.h:182
 msgid "Hidden file is attached."
 msgstr "Piilotiedosto on liitetty."
 
-#: ../mail/mail.error.xml.h:183
+#: ../src/mail/mail.error.xml.h:183
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -19227,53 +20112,60 @@ msgstr ""
 "Liite nimeltä {0} on piilotiedosto, ja se saattaa sisältää arkaluontoista "
 "tietoa. Varmista tiedoston sisältö ennen lähettämistä."
 
-#: ../mail/mail.error.xml.h:184
+#: ../src/mail/mail.error.xml.h:184
 msgid "Printing failed."
 msgstr "Tulostus epäonnistui."
 
-#: ../mail/mail.error.xml.h:185
-msgid "The printer replied &quot;{0}&quot;."
-msgstr "Tulostimen vastaus: &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:185
+#| msgid "The printer replied &quot;{0}&quot;."
+msgid "The printer replied “{0}”."
+msgstr "Tulostimen vastaus: “{0}”."
 
-#: ../mail/mail.error.xml.h:186
+#: ../src/mail/mail.error.xml.h:186
 #, fuzzy
 #| msgid "Could not open destination"
 msgid "Could not perform this operation on {0}."
 msgstr "Kohdetta ei voi avata"
 
-#: ../mail/mail.error.xml.h:187
+#: ../src/mail/mail.error.xml.h:187
 msgid "You must be working online to complete this operation."
 msgstr ""
 "Verkkoyhteyden tulee olla muodostettu, jotta tämä toimenpide on mahdollista "
 "suorittaa."
 
-#: ../mail/mail.error.xml.h:188
-msgid "Message from &quot;{0}&quot; account:"
-msgstr ""
+#: ../src/mail/mail.error.xml.h:188
+msgid "Message from “{0}” account:"
+msgstr "Viesti “{0}”-tililtä:"
 
-#: ../mail/mail.error.xml.h:189
+#: ../src/mail/mail.error.xml.h:189
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgid "Failed to mark thread to be ignored in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../mail/mail.error.xml.h:190
-msgid "Failed to unmark thread from being ignored in folder '{0}'"
-msgstr ""
+#: ../src/mail/mail.error.xml.h:190
+#, fuzzy
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Failed to unmark thread from being ignored in folder “{0}”"
+msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../mail/mail.error.xml.h:191
-msgid "Failed to mark subthread to be ignored in folder '{0}'"
-msgstr ""
+#: ../src/mail/mail.error.xml.h:191
+#, fuzzy
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Failed to mark subthread to be ignored in folder “{0}”"
+msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../mail/mail.error.xml.h:192
-msgid "Failed to unmark subthread from being ignored in folder '{0}'"
-msgstr ""
+#: ../src/mail/mail.error.xml.h:192
+#, fuzzy
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Failed to unmark subthread from being ignored in folder “{0}”"
+msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../mail/mail.error.xml.h:193
+#: ../src/mail/mail.error.xml.h:193
 msgid "Remote content download had been blocked for this message."
 msgstr "Etäsisällön lataaminen on estetty tämän viestin kohdalla."
 
-#: ../mail/mail.error.xml.h:194
+#: ../src/mail/mail.error.xml.h:194
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -19282,623 +20174,651 @@ msgstr ""
 "automaattiseksi tämän lähettäjän tai sivustoston perusteella."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:196
+#: ../src/mail/mail.error.xml.h:196
 #, fuzzy
 #| msgid " (Completed "
 msgid "{0}, Completed on {1}"
 msgstr " (Valmis "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:198
+#: ../src/mail/mail.error.xml.h:198
 msgid "{0} by {1}"
 msgstr ""
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:200
+#: ../src/mail/mail.error.xml.h:200
 msgid "Overdue: {0} by {1}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:202
+#: ../src/mail/mail.error.xml.h:202
 #, fuzzy
 #| msgid "This signature has been changed, but has not been saved."
 msgid "This message note has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../mail/mail.error.xml.h:205
+#: ../src/mail/mail.error.xml.h:205
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to delete message note in folder '{0}'"
+msgid "Failed to delete message note in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../mail/mail.error.xml.h:207
+#: ../src/mail/mail.error.xml.h:207
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to store message note in folder '{0}'"
+msgid "Failed to store message note in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../mail/mail-send-recv.c:191
+#: ../src/mail/mail.error.xml.h:208
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Something has gone wrong when displaying the message"
+msgstr "Etsiä tekstiä näytetyn viestin rungosta"
+
+#: ../src/mail/mail.error.xml.h:209
+msgid ""
+"A WebKitWebProcess crashed when displaying the message. You can try again by "
+"moving to another message and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:210
+msgid "Something has gone wrong when displaying the signature"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:211
+msgid ""
+"A WebKitWebProcess crashed when displaying the signature. You can try again "
+"by moving to another signature and back. If the issue persists, please file "
+"a bug report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/mail/mail-send-recv.c:192
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../mail/mail-send-recv.c:639
+#: ../src/mail/mail-send-recv.c:640
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../mail/mail-send-recv.c:653
+#: ../src/mail/mail-send-recv.c:654
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:1263
+#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:1262
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:826
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:1229
-#, c-format
-#| msgid "Checking for new mail"
-msgid "Checking for new mail at '%s'"
+#: ../src/mail/mail-send-recv.c:1228
+#, fuzzy, c-format
+#| msgid "Checking for new mail at '%s'"
+msgid "Checking for new mail at “%s”"
 msgstr "Tarkistetaan onko uusia viestejä palvelusta '%s'"
 
-#: ../mail/mail-send-recv.c:1456
+#: ../src/mail/mail-send-recv.c:1455
 #, c-format
-msgid "Deleting junk and expunging trash at '%s'"
+msgid "Deleting junk and expunging trash at “%s”"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1458
+#: ../src/mail/mail-send-recv.c:1457
 #, fuzzy, c-format
 #| msgid "Reconnecting to '%s'"
-msgid "Deleting junk at '%s'"
+msgid "Deleting junk at “%s”"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../mail/mail-send-recv.c:1460
+#: ../src/mail/mail-send-recv.c:1459
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
-msgid "Expunging trash at '%s'"
+msgid "Expunging trash at “%s”"
 msgstr "Tyhjennetään roskakoria ”%s”"
 
-#: ../mail/mail-vfolder-ui.c:66
+#: ../src/mail/mail-vfolder-ui.c:67
 msgid "Search Folders"
 msgstr "Hakunäkymät"
 
-#: ../mail/mail-vfolder-ui.c:146
+#: ../src/mail/mail-vfolder-ui.c:147
 msgid "Edit Search Folder"
 msgstr "Muokkaa hakunäkymää"
 
-#: ../mail/mail-vfolder-ui.c:267
+#: ../src/mail/mail-vfolder-ui.c:268
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../mail/message-list.c:296
+#: ../src/mail/message-list.c:300
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:297
+#: ../src/mail/message-list.c:301
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:298
+#: ../src/mail/message-list.c:302
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:299
+#: ../src/mail/message-list.c:303
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:300
+#: ../src/mail/message-list.c:304
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:301
+#: ../src/mail/message-list.c:305
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:314
+#: ../src/mail/message-list.c:318
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:315
+#: ../src/mail/message-list.c:319
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:319
+#: ../src/mail/message-list.c:323
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:320
+#: ../src/mail/message-list.c:324
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:466 ../mail/message-list.c:6186
+#: ../src/mail/message-list.c:470 ../src/mail/message-list.c:6286
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:269
+#: ../src/mail/message-list.c:2074
+#: ../src/modules/itip-formatter/itip-view.c:267
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:2071
+#: ../src/mail/message-list.c:2083
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:2083
+#: ../src/mail/message-list.c:2095
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:2091
+#: ../src/mail/message-list.c:2103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:2093
+#: ../src/mail/message-list.c:2105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3001
+#: ../src/mail/message-list.c:3062
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../mail/message-list.c:3703 ../mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3781 ../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
-#: ../mail/message-list.c:5117
+#: ../src/mail/message-list.c:5213
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/message-list.c:6125
+#: ../src/mail/message-list.c:6225
 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."
+"running a new search either by clearing it with Search→Clear menu item or by "
+"changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:6133
+#: ../src/mail/message-list.c:6233
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
-#: ../mail/message-list.etspec.h:2
+#: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Merkitty"
 
-#: ../mail/message-list.etspec.h:8
+#: ../src/mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: ../mail/message-list.etspec.h:11
+#: ../src/mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Merkin tila"
 
-#: ../mail/message-list.etspec.h:12
+#: ../src/mail/message-list.etspec.h:12
 msgid "Follow Up Flag"
 msgstr "Lähetä edelleen-merkki"
 
-#: ../mail/message-list.etspec.h:13
+#: ../src/mail/message-list.etspec.h:13
 msgid "Due By"
 msgstr "Erääntyy"
 
-#: ../mail/message-list.etspec.h:18
+#: ../src/mail/message-list.etspec.h:18
 #, fuzzy
 #| msgid "Messages"
 msgid "Messages To"
 msgstr "Viestit"
 
-#: ../mail/message-list.etspec.h:20
-msgid "Subject - Trimmed"
+#: ../src/mail/message-list.etspec.h:20
+#, fuzzy
+#| msgid "Subject - Trimmed"
+msgid "Subject — Trimmed"
 msgstr "Otsikko - rajattu"
 
-#: ../mail/message-list.etspec.h:21 ../plugins/save-calendar/csv-format.c:374
+#: ../src/mail/message-list.etspec.h:21
+#: ../src/plugins/save-calendar/csv-format.c:372
 msgid "UID"
 msgstr "UID"
 
-#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+#: ../src/mail/searchtypes.xml.in.h:23 ../src/mail/vfoldertypes.xml.in.h:23
 msgid "Any header"
 msgstr "Mikä tahansa otsake"
 
-#: ../mail/searchtypes.xml.in.h:57
+#: ../src/mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr "Aihe tai lähettäjät sisältävät"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2239
+#: ../src/mail/searchtypes.xml.in.h:58
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2232
+#: ../src/mail/searchtypes.xml.in.h:59
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2253
+#: ../src/mail/searchtypes.xml.in.h:60
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
-#: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2246
+#: ../src/mail/searchtypes.xml.in.h:61
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
-#: ../mail/searchtypes.xml.in.h:62
-#: ../modules/mail/e-mail-shell-view-actions.c:2218
+#: ../src/mail/searchtypes.xml.in.h:62
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Body contains"
 msgstr "Runko sisältää"
 
-#: ../mail/searchtypes.xml.in.h:63
-#: ../modules/mail/e-mail-shell-view-actions.c:2225
+#: ../src/mail/searchtypes.xml.in.h:63
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
 msgstr "Lauseke"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:122
-#: ../modules/mail/em-mailer-prefs.c:1558
+#: ../src/modules/addressbook/autocompletion-config.c:123
+#: ../src/modules/mail/em-mailer-prefs.c:1556
 msgid "_Table column:"
 msgstr "_Taulukon sarake:"
 
-#: ../modules/addressbook/autocompletion-config.c:125
+#: ../src/modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "Osoitteen muotoilu"
 
-#: ../modules/addressbook/autocompletion-config.c:128
+#: ../src/modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "_Muotoile osoite sen kohdemaan standardien mukaisesti"
 
-#: ../modules/addressbook/autocompletion-config.c:136
+#: ../src/modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "Automaattinen täydennys"
 
-#: ../modules/addressbook/autocompletion-config.c:139
+#: ../src/modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "Näytä _aina automaattitäydennetyn yhteystiedon osoite"
 
-#: ../modules/addressbook/eab-composer-util.c:100
+#: ../src/modules/addressbook/eab-composer-util.c:98
 msgid "Multiple vCards"
 msgstr "Useita vCard-tiedostoja"
 
-#: ../modules/addressbook/eab-composer-util.c:108
+#: ../src/modules/addressbook/eab-composer-util.c:106
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard %s"
 
-#: ../modules/addressbook/eab-composer-util.c:119
-#: ../modules/addressbook/eab-composer-util.c:146
+#: ../src/modules/addressbook/eab-composer-util.c:117
+#: ../src/modules/addressbook/eab-composer-util.c:144
 #, c-format
 msgid "Contact information"
 msgstr "Yhteystiedot"
 
-#: ../modules/addressbook/eab-composer-util.c:148
+#: ../src/modules/addressbook/eab-composer-util.c:146
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:139
+#: ../src/modules/addressbook/e-book-shell-backend.c:256
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:267
+#: ../src/modules/addressbook/e-book-shell-backend.c:265
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1045
+#: ../src/modules/addressbook/e-book-shell-backend.c:267
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../src/modules/addressbook/e-book-shell-backend.c:272
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Yhteystieto_luettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../src/modules/addressbook/e-book-shell-backend.c:274
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../src/modules/addressbook/e-book-shell-backend.c:282
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:968
+#: ../src/modules/addressbook/e-book-shell-backend.c:284
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:966
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:212
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:535
-#: ../modules/addressbook/e-book-shell-view-actions.c:831
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:533
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:829
 msgid "Save as vCard"
 msgstr "Tallenna vCard-muodossa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:938
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:936
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pioi kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:938
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopioi valitun osoitekirjan sisältö toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:945
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:943
 msgid "D_elete Address Book"
 msgstr "_Poista osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:947
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:945
 msgid "Delete the selected address book"
 msgstr "Poista valittu osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:950
 #, fuzzy
 #| msgid "_Add to Address Book..."
 msgid "_Manage Address Book groups..."
 msgstr "_Lisää osoitekirjaan..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:954
-#: ../modules/calendar/e-task-shell-view-actions.c:721
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:952
+#: ../src/modules/calendar/e-task-shell-view-actions.c:719
 msgid "Manage task list groups order and visibility"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:959
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:957
 msgid "Mo_ve All Contacts To..."
 msgstr "Sii_rrä kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:961
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:959
 msgid "Move the contacts of the selected address book to another"
 msgstr "Siirrä valitun osoitekirjan sisältö toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:964
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:973
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:971
 msgid "Address _Book Properties"
 msgstr "Osoite_kirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:975
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Show properties of the selected address book"
 msgstr "Näytä valitun osoitekirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:980
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:978
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "Re_fresh"
 msgstr "Vi_rkistä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:982
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:980
 msgid "Refresh the selected address book"
 msgstr "Päivitä valittu osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:987
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:985
 #, fuzzy
 msgid "Address Book _Map"
 msgstr "Osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:989
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:987
 msgid "Show map with all contacts from selected address book"
 msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:994
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
-#: ../modules/calendar/e-task-shell-view-actions.c:747
-#: ../modules/mail/e-mail-shell-view-actions.c:1802
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:992
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../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:1749
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:994
 msgid "Rename the selected address book"
 msgstr "Nimeä valittu osoitekirja uudestaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "Stop loading"
 msgstr "Keskeytä lataaminen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1008
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1006
 msgid "_Copy Contact To..."
 msgstr "_Kopioi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1010
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1008
 msgid "Copy selected contacts to another address book"
 msgstr "Kopioi valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1015
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1013
 msgid "_Delete Contact"
 msgstr "_Poista yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "_Find in Contact..."
 msgstr "_Etsi yhteystiedosta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "Search for text in the displayed contact"
 msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1029
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "_Forward Contact..."
 msgstr "_Välitä yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
 msgid "Send selected contacts to another person"
 msgstr "Lähetä valitut yhteystiedot toiselle henkilölle"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1036
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1034
 msgid "_Move Contact To..."
 msgstr "_Siirry yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1038
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
 msgid "Move selected contacts to another address book"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1043
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1041
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1050
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1048
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1057
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1055
 msgid "_Open Contact"
 msgstr "_Avaa yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1064
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1062
 msgid "_Send Message to Contact..."
 msgstr "Lähetä _viesti henkilölle..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1064
 msgid "Send a message to the selected contacts"
 msgstr "Lähetä viesti valituille henkilöille"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1071
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1080
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
-#: ../modules/calendar/e-task-shell-view-actions.c:819
-#: ../modules/mail/e-mail-shell-view-actions.c:1974
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
+#: ../src/modules/calendar/e-task-shell-view-actions.c:817
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1093
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
-#: ../modules/calendar/e-memo-shell-view-actions.c:682
-#: ../modules/calendar/e-task-shell-view-actions.c:836
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1091
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:680
+#: ../src/modules/calendar/e-task-shell-view-actions.c:834
 msgid "_Manage groups..."
 msgstr "_Hallitse ryhmiä..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1105
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1103
 msgid "Address Book Map"
 msgstr "Osoitekirjakartta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1135
 msgid "Contact _Preview"
 msgstr "Yhteystiedon _esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1139
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Show contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1145
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "Show _Maps"
 msgstr "Näytä _kartat"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1145
 #, fuzzy
 msgid "Show maps in contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1166
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
-#: ../modules/calendar/e-task-shell-view-actions.c:909
-#: ../modules/mail/e-mail-shell-view-actions.c:2120
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:741
+#: ../src/modules/calendar/e-task-shell-view-actions.c:907
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1168
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1166
 msgid "Show contact preview below the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1173
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:916
-#: ../modules/mail/e-mail-shell-view-actions.c:2127
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1171
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:748
+#: ../src/modules/calendar/e-task-shell-view-actions.c:914
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2074
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1175
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
 msgid "Show contact preview alongside the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1190
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:968
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1188
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:765
+#: ../src/modules/calendar/e-task-shell-view-actions.c:966
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1200
-#: ../modules/calendar/e-cal-shell-view-actions.c:1657
-#: ../modules/calendar/e-memo-shell-view-actions.c:777
-#: ../modules/calendar/e-task-shell-view-actions.c:978
-#: ../modules/mail/e-mail-shell-view-actions.c:2211
-#: ../shell/e-shell-content.c:657
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:976
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
+#: ../src/shell/e-shell-content.c:655
 msgid "Advanced Search"
 msgstr "Oma haku"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1233
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1231
 msgid "Print all shown contacts"
 msgstr "Tulosta kaikki näytettävät yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1240
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1238
 msgid "Preview the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1247
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1245
 msgid "Print selected contacts"
 msgstr "Tulosta valitut yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1260
 msgid "S_ave Address Book as vCard"
 msgstr "T_allenna osoitekirja VCardina"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1264
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1262
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Tallenna yhteystiedot valitussa osoitekirjassa VCardina"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1270
-#: ../modules/addressbook/e-book-shell-view-actions.c:1280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1272
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1270
 msgid "Save selected contacts as a vCard"
 msgstr "Tallenna valitut yhteystiedot VCardina"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../src/modules/addressbook/e-book-shell-view.c:311
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view.c:315
+#: ../src/modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../src/modules/addressbook/e-book-shell-view.c:344
 msgid "_Send Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../modules/addressbook/e-book-shell-view.c:350
+#: ../src/modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:163
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:164
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -19909,179 +20829,181 @@ msgstr ""
 "Palautus palauttaa kaikki henkilökohtaiset tiedot, asetukset, "
 "sähköpostisuodattimet jne."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:178
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:179
 msgid "_Restore from a backup file:"
 msgstr "_Palauta varmuuskopiotiedostosta:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:189
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:190
 msgid "Choose a backup file to restore"
 msgstr "Valitse palautettava varmuuskopiotiedosto"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:309
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Palauta varmuuskopiosta"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:217
+#: ../src/modules/backup-restore/evolution-backup-restore.c:233
 msgid "Select name of the Evolution backup file"
 msgstr "Valitse Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:250
+#: ../src/modules/backup-restore/evolution-backup-restore.c:266
 msgid "_Restart Evolution after backup"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:285
+#: ../src/modules/backup-restore/evolution-backup-restore.c:301
 #, fuzzy
 #| msgid "_Restart Evolution after restore"
 msgid "Re_start Evolution after restore"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:327
+#: ../src/modules/backup-restore/evolution-backup-restore.c:343
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:336
-#, c-format
-msgid "Checking content of backup file '%s', please wait..."
+#: ../src/modules/backup-restore/evolution-backup-restore.c:352
+#, fuzzy, c-format
+#| msgid "Checking content of backup file '%s', please wait..."
+msgid "Checking content of backup file “%s”, please wait..."
 msgstr "Tarkistetaan varmuuskopiotiedoston '%s' sisältöä, odota hetki..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:357
+#: ../src/modules/backup-restore/evolution-backup-restore.c:373
 msgid "_Back up Evolution Data..."
 msgstr "_Varmuuskopioi Evolutionin tiedot..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:359
+#: ../src/modules/backup-restore/evolution-backup-restore.c:375
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Varmuuskopioi Evolutionin tiedot ja asetukset arkistotiedostoon"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:364
+#: ../src/modules/backup-restore/evolution-backup-restore.c:380
 msgid "R_estore Evolution Data..."
 msgstr "Palauta _Evolutionin tiedot..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:366
+#: ../src/modules/backup-restore/evolution-backup-restore.c:382
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Palauta Evolutionin tietoja ja asetuksia arkistotiedostosta"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:75
+#: ../src/modules/backup-restore/evolution-backup-tool.c:73
 msgid "Back up Evolution directory"
 msgstr "Varmuuskopioi Evolutionin hakemisto"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:77
+#: ../src/modules/backup-restore/evolution-backup-tool.c:75
 msgid "Restore Evolution directory"
 msgstr "Palauta Evolutionin hakemisto"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:79
+#: ../src/modules/backup-restore/evolution-backup-tool.c:77
 msgid "Check Evolution Back up"
 msgstr "Tarkista Evolutionin varmuuskopio"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:81
+#: ../src/modules/backup-restore/evolution-backup-tool.c:79
 msgid "Restart Evolution"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../src/modules/backup-restore/evolution-backup-tool.c:81
 msgid "With Graphical User Interface"
 msgstr "Graafisen käyttöliittymän kanssa"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:281
-#: ../modules/backup-restore/evolution-backup-tool.c:485
+#: ../src/modules/backup-restore/evolution-backup-tool.c:294
+#: ../src/modules/backup-restore/evolution-backup-tool.c:498
 msgid "Shutting down Evolution"
 msgstr "Sammutetaan Evolutionia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:290
+#: ../src/modules/backup-restore/evolution-backup-tool.c:303
 msgid "Backing Evolution accounts and settings"
 msgstr "Varmuuskopioidaan Evolutionin tilejä ja asetuksia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:307
+#: ../src/modules/backup-restore/evolution-backup-tool.c:320
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varmuuskopioidaan Evolutionin tietoja (viestejä, yhteystietoja, "
 "kalentereita, tehtäviä ja muistioita)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:323
+#: ../src/modules/backup-restore/evolution-backup-tool.c:336
 msgid "Back up complete"
 msgstr "Varmuuskopiointi valmistui"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
-#: ../modules/backup-restore/evolution-backup-tool.c:679
+#: ../src/modules/backup-restore/evolution-backup-tool.c:343
+#: ../src/modules/backup-restore/evolution-backup-tool.c:705
 msgid "Restarting Evolution"
 msgstr "Käynnistetään Evolution uudestaan"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:491
+#: ../src/modules/backup-restore/evolution-backup-tool.c:504
 msgid "Back up current Evolution data"
 msgstr "Varmuuskopioi tämänhetkiset Evolutionin tiedot"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:498
+#: ../src/modules/backup-restore/evolution-backup-tool.c:511
 msgid "Extracting files from back up"
 msgstr "Puretaan tiedostoja varmuuskopiosta"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:580
+#: ../src/modules/backup-restore/evolution-backup-tool.c:606
 msgid "Loading Evolution settings"
 msgstr "Ladataan Evolutionin asetuksia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:650
+#: ../src/modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "Poistetaan varmuuskopioinnin väliaikaistiedostoja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:664
+#: ../src/modules/backup-restore/evolution-backup-tool.c:690
 msgid "Reloading registry service"
 msgstr "Ladataan uudelleen rekisteripalvelua"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:866
+#: ../src/modules/backup-restore/evolution-backup-tool.c:899
 msgid "Evolution Back Up"
 msgstr "Evolutionin varmuuskopiointi"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
-#, c-format
-msgid "Backing up to the folder %s"
+#: ../src/modules/backup-restore/evolution-backup-tool.c:900
+#, fuzzy, c-format
+#| msgid "Backing up to the folder %s"
+msgid "Backing up to the file %s"
 msgstr "Varmuuskopioidaan kansioon %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:871
+#: ../src/modules/backup-restore/evolution-backup-tool.c:904
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
-#, c-format
-msgid "Restoring from the folder %s"
+#: ../src/modules/backup-restore/evolution-backup-tool.c:905
+#, fuzzy, c-format
+#| msgid "Restoring from the folder %s"
+msgid "Restoring from the file %s"
 msgstr "Palautetaan kansiosta %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:941
+#: ../src/modules/backup-restore/evolution-backup-tool.c:974
 msgid "Backing up Evolution Data"
 msgstr "Varmuuskopioidaan Evolutionin tietoja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:942
+#: ../src/modules/backup-restore/evolution-backup-tool.c:975
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Odota, että Evolution ottaa varmuuskopion tiedoistasi."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:944
+#: ../src/modules/backup-restore/evolution-backup-tool.c:977
 msgid "Restoring Evolution Data"
 msgstr "Palautetaan Evolutionin tietoja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:945
+#: ../src/modules/backup-restore/evolution-backup-tool.c:978
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Odota, että Evolution palauttaa tietosi."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:967
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1000
 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ä."
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Invalid Evolution backup file"
 msgstr "Virheellinen Evolutionin varmuuskopiotiedosto"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
 #| msgid "Invalid Evolution backup file"
-msgid "File '{0}' is not a valid Evolution backup file."
-msgstr "Virheellinen Evolutionin varmuuskopiotiedosto"
+msgid "File “{0}” is not a valid Evolution backup file."
+msgstr "Tiedosto “{0}” ei ole kelvollinen Evolution-varmuuskopiotiedosto."
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
 msgstr "Haluatko varmasti sulkea Evolutionin?"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
@@ -20089,19 +21011,18 @@ msgstr ""
 "Tietojen ja asetusten varmuuskopioimiseksi Evolution on suljettava. Tallenna "
 "kaikki tallentamattomat tiedot ennen jatkamista."
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-#, fuzzy
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
 #| msgid "Close and Back up Evolution"
 msgid "Close and _Back up Evolution"
-msgstr "Sulje ja varmuuskopioi Evolution"
+msgstr "Sulje ja _varmuuskopioi Evolution"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 "Haluatko varmasti palauttaa Evolutionin valitusta varmuuskopiotiedostosta?"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
@@ -20112,126 +21033,125 @@ msgstr ""
 "kaikki tallentamattomat tiedot ennen jatkamista. Tämä poistaa kaikki "
 "nykyiset Evolutionin tiedot ja asetukset ja palauttaa varmuuskopion."
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-#, fuzzy
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
 #| msgid "Close and Restore Evolution"
 msgid "Close and _Restore Evolution"
-msgstr "Sulje ja palauta Evolutionin varmuuskopio"
+msgstr "Sulje ja _palauta Evolutionin varmuuskopio"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
 msgstr "Oikeudet eivät riitä"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid "The selected folder is not writable."
 msgstr "Valittuun kansioon ei voi kirjoittaa."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:160
+#: ../src/modules/bogofilter/evolution-bogofilter.c:158
 #, fuzzy, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:178
+#: ../src/modules/bogofilter/evolution-bogofilter.c:176
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:227
+#: ../src/modules/bogofilter/evolution-bogofilter.c:225
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:372
+#: ../src/modules/bogofilter/evolution-bogofilter.c:370
 msgid "Bogofilter Options"
 msgstr "Bogofilter-asetukset"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:381
+#: ../src/modules/bogofilter/evolution-bogofilter.c:379
 msgid "Convert message text to _Unicode"
 msgstr "Muunna viestin teksti _Unicode-muotoon"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:539
-#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+#: ../src/modules/bogofilter/evolution-bogofilter.c:537
+#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
 msgid "Junk filter using Bogofilter"
 msgstr ""
 
-#: ../modules/book-config-google/evolution-book-config-google.c:92
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
-#: ../modules/cal-config-google/e-cal-config-google.c:177
-#: ../modules/cal-config-google/e-cal-config-gtasks.c:117
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:433
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:468
+#: ../src/modules/book-config-google/evolution-book-config-google.c:93
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:994
+#: ../src/modules/cal-config-google/e-cal-config-google.c:190
+#: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:469
 msgid "User name cannot be empty"
 msgstr "Käyttäjätunnus ei voi olla tyhjä"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:443
 msgid "Standard LDAP Port"
 msgstr "Standardi LDAP_portti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:449
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:632
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP SSL/TLS:n yli (vanhennettu)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:455
 msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:461
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr ""
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:567
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:568
 msgid "Connecting to LDAP"
 msgstr "LDAP:iin yhdistäminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:584
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:585
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:611
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:612
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:200
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
 msgid "Port number is not valid"
 msgstr "Portin numero ei ole kelvollinen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:634
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:635
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (suositeltu)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:636
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
 msgid "Encryption:"
 msgstr "Salaus:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:322
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:265
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "Anonymous"
 msgstr "Anonyymisti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
 msgid "Method:"
 msgstr "Menetelmä:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
 #, fuzzy
 #| msgid ""
 #| "This is the method Evolution will use to authenticate you.  Note that "
@@ -20239,46 +21159,46 @@ msgstr "Menetelmä:"
 #| "server."
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Using email address\" requires anonymous access to your "
-"LDAP server."
+"setting this to “Using email address” requires anonymous access to your LDAP "
+"server."
 msgstr ""
 "Tämä on menetelmä, jota Evolution käyttää tunnistamiseesi. Huomaa, että "
 "asettaminen arvoon \"Sähköpostiosoite\" vaatii anonyymiä pääsyä LDAP-"
 "palvelimellesi."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:711
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
 msgid "Using LDAP"
 msgstr "LDAP:in käyttäminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:728
-#: ../modules/mail/e-mail-shell-view.c:120
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:729
+#: ../src/modules/mail/e-mail-shell-view.c:118
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:750
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:751
 msgid "Search Base:"
 msgstr "Hakupohja:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:754
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
 #, fuzzy
 #| msgid "_Find Possible Search Bases"
 msgid "Find Possible Search Bases"
 msgstr "_Etsi mahdolliset hakupohjat"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:777
 msgid "One Level"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
 msgid "Subtree"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Scope:"
 msgstr "Hakualue:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
 #, fuzzy
 #| msgid ""
 #| "The search scope defines how deep you would like the search to extend "
@@ -20287,141 +21207,140 @@ msgstr "Hakualue:"
 #| "include the entries one level beneath your base."
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the directory tree.  A search scope of \"Subtree\" will include all entries "
-"below your search base.  A search scope of \"One Level\" will only include "
-"the entries one level beneath your search base."
+"the directory tree.  A search scope of “Subtree” will include all entries "
+"below your search base.  A search scope of “One Level” will only include the "
+"entries one level beneath your search base."
 msgstr ""
 "Haun kattavuus määrittelee, kuinka syvälle hakemistopuuhun haluat hakusi "
 "menevän. Kattavuus \"Ali\" kattaa kaikki kentät hakupohjasi alla ja sen "
 "alipuissa, kun taas kattavuus \"Yksi\" kattaa kentät yhden tason "
 "hakupohjastasi alaspäin."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:795
 msgid "Search Filter:"
 msgstr "Hakusuodatin:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:807
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
 msgid "Limit:"
 msgstr "Raja:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:839
 msgid "contacts"
 msgstr "yhteystietoa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:844
 msgid "Browse until limit is reached"
 msgstr "Selaa kunnes raja tulee vastaan"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:414
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:450
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:979
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
 msgid "Server address cannot be empty"
 msgstr "Palvelimen osoite ei voi olla tyhjä"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:92
-#| msgid "New Address Book"
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:93
 msgid "Choose an Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:240
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:296
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:241
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:297
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:249
-#| msgid "Address Book"
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:250
 msgid "Find Address Books"
 msgstr "Etsi osoitekirjoja"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:259
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:260
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:308
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:412
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:309
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:413
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:109
-#: ../modules/cal-config-google/e-google-chooser-button.c:224
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:225
 msgid "Choose a Calendar"
 msgstr "Valitse kalenteri"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:113
-#: ../modules/cal-config-google/e-google-chooser-button.c:228
-#, fuzzy
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:229
 #| msgid "New Memo List"
 msgid "Choose a Memo List"
-msgstr "Uusi muistilappulista"
+msgstr "Valitse muistilappulista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:117
-#: ../modules/cal-config-google/e-google-chooser-button.c:232
-#, fuzzy
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:233
 #| msgid "Select a Task List"
 msgid "Choose a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:310
-#| msgid "Web Calendars"
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:311
 msgid "Find Calendars"
 msgstr "Etsi kalentereja"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:314
 #, fuzzy
 #| msgid "Memo List"
 msgid "Find Memo Lists"
 msgstr "Muistilappulista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:317
 #, fuzzy
 #| msgid "Task List"
 msgid "Find Task Lists"
 msgstr "Tehtävälista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:334
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:335
 msgid "Email:"
 msgstr "Sähköposti_"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:339
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:340
 msgid "Server handles meeting invitations"
 msgstr "Palvelin hallitsee tapaamiskutsuja"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:71
 msgid "Choose which address books to use."
 msgstr "Valitse käytettävät osoitekirjat."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:204
 #, fuzzy
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Syntymä- ja vuosipäivät"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:143
+#: ../src/modules/cal-config-google/e-cal-config-google.c:101
+msgid "Enable Calendars to synchronize"
+msgstr ""
+
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:144
 msgid "Default User Calendar"
 msgstr "Käyttäjän oletuskalenteri"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:158
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Käytä olemassa olevaa iCalendar (ics) -tiedostoa"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:183
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:184
 msgid "iCalendar File"
 msgstr "iCalendar-tiedosto"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:195
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:196
 msgid "Choose an iCalendar file"
 msgstr "Valitse iCalendar-tiedosto"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:199
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:213
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Allow Evolution to update the file"
 msgstr "Salli Evolutionin päivittää tiedosto"
 
@@ -20431,7 +21350,7 @@ msgstr "Salli Evolutionin päivittää tiedosto"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
 #, fuzzy
 #| msgid "Default"
 msgctxt "locale-metric"
@@ -20440,479 +21359,519 @@ msgstr "Oletukset"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:259
 msgid "Fahrenheit (°F)"
 msgstr "Fahrenheit (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:264
 msgid "Centigrade (°C)"
 msgstr "Celsius (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:270
 msgid "Units:"
 msgstr "Yksiköt:"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:322
 msgid "Location cannot be empty"
 msgstr "Sijainti ei voi olla tyhjä"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:287
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
 msgstr "_Tuo"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:337
+#: ../src/modules/calendar/e-cal-attachment-handler.c:335
 #, fuzzy
 #| msgid "Importing Pine data"
 msgid "Importing an event"
 msgstr "Tuodaan tietoja Pinestä"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../src/modules/calendar/e-cal-attachment-handler.c:339
 #, fuzzy
 #| msgid "Importing mailbox"
 msgid "Importing a memo"
 msgstr "Tuodaan kansiota"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:345
+#: ../src/modules/calendar/e-cal-attachment-handler.c:343
 #, fuzzy
 #| msgid "Importing Elm data"
 msgid "Importing a task"
 msgstr "Tuodaan tietoja Elmistä"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:403
+#: ../src/modules/calendar/e-cal-attachment-handler.c:401
 msgid "Select a Calendar"
 msgstr "Valitse kalenteri"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:410
+#: ../src/modules/calendar/e-cal-attachment-handler.c:408
 #, fuzzy
 #| msgid "D_elete Memo List"
 msgid "Select a Memo List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:417
+#: ../src/modules/calendar/e-cal-attachment-handler.c:415
 msgid "Select a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:424
+#: ../src/modules/calendar/e-cal-attachment-handler.c:422
 msgid "I_mport to Calendar"
 msgstr "Tuo _kalenteriin"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:431
+#: ../src/modules/calendar/e-cal-attachment-handler.c:429
 #, fuzzy
 #| msgid "I_mport to Tasks"
 msgid "I_mport to Memo List"
 msgstr "_Tuo tehtäviin"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:438
+#: ../src/modules/calendar/e-cal-attachment-handler.c:436
 #, fuzzy
 #| msgid "I_mport to Tasks"
 msgid "I_mport to Task List"
 msgstr "_Tuo tehtäviin"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:187
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:556
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
 #, fuzzy, c-format
 #| msgid "Copying an event into the calendar %s"
-msgid "Copying an event into the calendar '%s'"
+msgid "Copying an event into the calendar “%s”"
 msgstr "Kopioidaan tapahtumaa kalenteriin %s"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:557
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
-msgid "Moving an event into the calendar '%s'"
+msgid "Moving an event into the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:562
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
-msgid "Copying a memo into the memo list '%s'"
+msgid "Copying a memo into the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:563
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
-msgid "Moving a memo into the memo list '%s'"
+msgid "Moving a memo into the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:568
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
-msgid "Copying a task into the task list '%s'"
+msgid "Copying a task into the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:569
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
-msgid "Moving a task into the task list '%s'"
+msgid "Moving a task into the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:686
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:693
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:692
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
 msgid "Memo List Selector"
 msgstr "Muistilappuluetteloiden valitsin"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:697
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:704
 msgid "Task List Selector"
 msgstr "Tehtävienluetteloiden valitsin"
 
-#: ../modules/calendar/e-calendar-preferences.c:515
+#: ../src/modules/calendar/e-calendar-preferences.c:525
 #, fuzzy
-msgid "Selected Calendars for Alarms"
-msgstr "Valitse kalenterit hälytyksille"
+#| msgid "Select the calendars for reminder notification"
+msgid "Selected Calendars for Notifications of Reminders"
+msgstr "Valitse kalenterit, joiden muistutuksista ilmoitetaan"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:532
+msgid "Selected Memo Lists for Notifications of Reminders"
+msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.c:611
+#: ../src/modules/calendar/e-calendar-preferences.c:539
+msgid "Selected Task Lists for Notifications of Reminders"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.c:635
 msgid "Meeting Invitations"
 msgstr "Kokouskutsut"
 
-#: ../modules/calendar/e-calendar-preferences.c:637
+#: ../src/modules/calendar/e-calendar-preferences.c:661
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../modules/calendar/e-calendar-preferences.c:651
-#: ../modules/calendar/e-calendar-preferences.c:682
+#: ../src/modules/calendar/e-calendar-preferences.c:675
+#: ../src/modules/calendar/e-calendar-preferences.c:706
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../modules/calendar/e-calendar-preferences.c:666
+#: ../src/modules/calendar/e-calendar-preferences.c:690
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
-#: ../modules/calendar/e-calendar-preferences.c:1064
+#: ../src/modules/calendar/e-calendar-preferences.c:1102
 msgid "Ti_me and date:"
 msgstr "_Päiväys ja aika:"
 
-#: ../modules/calendar/e-calendar-preferences.c:1065
+#: ../src/modules/calendar/e-calendar-preferences.c:1103
 msgid "_Date only:"
 msgstr "_Vain päiväys:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "Minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "Tuntia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "Päivää"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "5 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "_Toinen aikavyöhyke:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(Näytetään päivänäkymässä)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "Aika_vyöhyke:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Näytä _järjestelmän aikavyöhyke"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "Ajan muoto:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tuntia (am/pm)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 tuntia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:18
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Work Week"
 msgstr "Työviikko"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "_Viikon ensimmäinen päivä:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "Työpäivät:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "_Päivä alkaa:"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "_Ma"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Maanantai"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Ti"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Tiistai"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:30
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "_Ke"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "_To"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Torstai"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Pe"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Perjantai"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "_La"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Lauantai"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "_Su"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "Päivä _päättyy:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Create events, memos and tasks as _Private by default"
 msgstr "Luo tapahtumat, muistiinpanot ja tehtävät yksit_yisenä oletuksena"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
-#| msgid "Send Options"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:49
 msgid "View Options"
 msgstr "Näkymän valinnat"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
 msgstr "_Aikajaot:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Show appointment end times in week and month view"
 msgstr "_Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
-#| msgid "Show appointment end times in week and month views"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Show appointment _icons in the month view"
 msgstr "Näytä tapaami_skuvakkeet kuukausinäkymässä"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:53
 msgid "_Compress weekends in month view"
 msgstr "_Tiivistä viikonloput kuukausinäkymässä"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Show week _numbers"
 msgstr "Näytä viikko_numerot"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 "N_äytä toistuvat tapahtumat kursivoituna vasemman alareunan kalenterissa"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Sc_roll Month View by a week"
 msgstr "Vie_ritä kuukausinäkymää viikoittain"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Alerts"
 msgstr "Hälytykset"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Display"
 msgstr "Näytä"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Task List"
 msgstr "Tehtävälista"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight t_asks due today"
 msgstr "Korosta _tänään erääntyvät tehtävät"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight _overdue tasks"
 msgstr "Korosta _eräpäivän ylittäneet tehtävät"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Display reminders in _notification area only"
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
-#| msgid "Delete completed tasks"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Keep reminder notification _window always on top"
+msgstr "Näytä muistutukset vain _ilmoitusalueella"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "Display reminders for completed _tasks"
 msgstr "Poista muistutukset _valmistuneista tehtävistä"
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:70
-msgid "Sh_ow a reminder"
-msgstr "_Näytä muistutus"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#, fuzzy
+#| msgid "Display reminders for completed _tasks"
+msgid "Display reminders for _past events"
+msgstr "Poista muistutukset _valmistuneista tehtävistä"
+
+#. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#, fuzzy
+#| msgid "Default reminder value"
+msgid "Set _default reminder"
+msgstr "Muistutuksen oletusarvo"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "before every appointment"
+#. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#, fuzzy
+#| msgid "before every appointment"
+msgid "before every new appointment"
 msgstr "ennen tapaamista"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Show a _reminder"
 msgstr "Näytä _muistutus"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
 msgid "before every anniversary/birthday"
 msgstr "ennen joka vuosipäivää ja syntymäpäivää"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Default _snooze time (in minutes)"
 msgstr "Oletus_torkkuaika (minuuteissa)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:78
-msgid "Select the calendars for reminder notification"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+#, fuzzy
+#| msgid "Select the calendars for reminder notification"
+msgid "Select the sources for reminder notification:"
 msgstr "Valitse kalenterit, joiden muistutuksista ilmoitetaan"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#| msgid "Calendar"
+msgid "Calendars"
+msgstr "Kalenterit"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
+#| msgctxt "New"
+#| msgid "Memo Li_st"
+msgid "Memo Lists"
+msgstr "Muistilappulistat"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#| msgid "Task List"
+msgid "Task Lists"
+msgstr "Tehtävälistat"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "Default Free/Busy Server"
 msgstr "Oletus-vapaa/varattu-palvelin"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:82
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u ja %d korvataan sähköpostiosoitteen käyttäjällä ja aluenimellä."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:83
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Publishing Information"
 msgstr "Julkaisutiedot"
 
-#: ../modules/calendar/e-cal-shell-backend.c:114
+#: ../src/modules/calendar/e-cal-shell-backend.c:112
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../src/modules/calendar/e-cal-shell-backend.c:114
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../src/modules/calendar/e-cal-shell-backend.c:119
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../src/modules/calendar/e-cal-shell-backend.c:121
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:128
+#: ../src/modules/calendar/e-cal-shell-backend.c:126
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../modules/calendar/e-cal-shell-backend.c:130
+#: ../src/modules/calendar/e-cal-shell-backend.c:128
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../modules/calendar/e-cal-shell-backend.c:138
+#: ../src/modules/calendar/e-cal-shell-backend.c:136
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#: ../src/modules/calendar/e-cal-shell-backend.c:138
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:257
+#: ../src/modules/calendar/e-cal-shell-backend.c:255
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:199
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:285
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:314
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:312
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -20923,11 +21882,11 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:331
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:329
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:926
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:924
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Making an occurrence movable"
@@ -20935,368 +21894,368 @@ 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.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1086
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1084
 msgid "event"
 msgstr "tapahtuma"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1088
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:498
-#: ../modules/calendar/e-task-shell-view-actions.c:617
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1086
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:496
+#: ../src/modules/calendar/e-task-shell-view-actions.c:615
 msgid "Save as iCalendar"
 msgstr "Tallenna iCalendar-muodossa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1222
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1227
 msgid "D_elete Calendar"
 msgstr "_Poista kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1231
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1229
 msgid "Delete the selected calendar"
 msgstr "Poista valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1238
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Go Back"
 msgstr "Siirry takaisin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1245
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Go Forward"
 msgstr "Siirry eteenpäin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1250
 msgid "Select today"
 msgstr "Valitse tämä päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1255
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1262
 msgid "_Manage Calendar groups..."
 msgstr "_Hallitse kalenteriryhmiä..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1264
 msgid "Manage Calendar groups order and visibility"
-msgstr ""
+msgstr "Hallitse kalenteriryhmien järjestystä ja näkyvyyttä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1285
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "Purg_e"
 msgstr "_Tyhjennä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "Refresh the selected calendar"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
 msgid "Rename the selected calendar"
 msgstr "Nimeä valittu kalenteri uudestaan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Find _Next"
 msgstr "Etsi _seuraava"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Find next occurrence of the current search string"
 msgstr "Etsi hakuehdon seuraava esiintymä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Find _Previous"
 msgstr "Etsi _edellinen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1315
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Find previous occurrence of the current search string"
 msgstr "Etsi hakuehdon edellinen esiintymä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Stop _Running Search"
 msgstr "Pysäytä _meneillään oleva haku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Stop currently running search"
 msgstr "Pysäytä meneillään oleva haku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
-#| msgid "Show _Only This Calendar"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Sho_w All Calendars"
 msgstr "Näytä _kaikki kalenterit"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Show _Only This Calendar"
 msgstr "Näytä _vain tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "_Delete Appointment"
 msgstr "_Poista tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete selected appointments"
 msgstr "Poista valitut tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Delete This _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Delete All Occ_urrences"
 msgstr "Poista kaikki _esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete all occurrences"
 msgstr "Poista kaikki esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "New All Day _Event..."
 msgstr "Uusi koko pä_ivän tapahtuma..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "Create a new all day event"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1383
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
-#: ../modules/calendar/e-task-shell-view-actions.c:698
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "New _Meeting..."
 msgstr "Uusi _kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Create a new meeting"
 msgstr "Luo uusi kokous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Converts an appointment to a meeting"
 msgstr "Muuntaa tapaamisen kokoukseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
 msgid "Conv_ert to Appointment..."
 msgstr "_Muunna kokoukseksi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Converts a meeting to an appointment"
 msgstr "Muuntaa kokouksen tapaamiseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Day"
 msgstr "Päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1583
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1590
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Show as list"
 msgstr "Näytä luettelona"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1597
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Week"
 msgstr "Viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Show one work week"
 msgstr "Näytä yksi työviikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1617
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-msgid "Next 7 Days' Appointments"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1631
+#| msgid "Next 7 Days' Appointments"
+msgid "Next 7 Days’ Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1638
 msgid "Occurs Less Than 5 Times"
 msgstr "Ilmenee vähemmän kuin viisi kertaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1671
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
-#: ../modules/calendar/e-task-shell-view-actions.c:992
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:789
+#: ../src/modules/calendar/e-task-shell-view-actions.c:990
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1678
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1676
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:796
+#: ../src/modules/calendar/e-task-shell-view-actions.c:997
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:822
-#: ../modules/calendar/e-task-shell-view-actions.c:1009
-#: ../modules/calendar/e-task-shell-view-actions.c:1023
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1700
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:806
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:820
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1007
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1690
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1697
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
 msgid "Preview the calendar to be printed"
 msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
-#: ../modules/calendar/e-cal-shell-view-memopad.c:284
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:839
-#: ../modules/calendar/e-task-shell-view-actions.c:1040
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:837
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1038
 msgid "_Save as iCalendar..."
 msgstr "_Tallenna iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1794
 msgid "Go To"
 msgstr "Siirry"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:496
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:494
 msgid "memo"
 msgstr "muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "_Uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:81
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-memo-shell-backend.c:79
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "_Avaa muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:651
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "Näytä valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:276
-#: ../modules/calendar/e-memo-shell-view-actions.c:824
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:816
+#: ../src/modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching next matching event"
 msgstr "Etsitään seuraavaa vastaavaa tapahtumaa"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:817
+#: ../src/modules/calendar/e-cal-shell-view-private.c:812
 msgid "Searching previous matching event"
 msgstr "Etsitään edellistä vastaavaa tapahtumaa"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:838
+#: ../src/modules/calendar/e-cal-shell-view-private.c:833
 #, 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"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:842
+#: ../src/modules/calendar/e-cal-shell-view-private.c:837
 #, 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"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:865
+#: ../src/modules/calendar/e-cal-shell-view-private.c:860
 msgid "Cannot search with no active calendar"
 msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 
@@ -21304,223 +22263,223 @@ msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:615
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
+#: ../src/modules/calendar/e-task-shell-view-actions.c:613
 msgid "task"
 msgstr "tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:677
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
+#: ../src/modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
+#: ../src/modules/calendar/e-task-shell-view-actions.c:766
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
 msgid "Mark selected tasks as complete"
 msgstr "Merkitse valitut tehtävät valmistuneiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
 msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:777
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../src/modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mark selected tasks as incomplete"
 msgstr "Merkitse valitut tehtävät keskeneräisiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:79
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-task-shell-backend.c:77
+#: ../src/modules/calendar/e-task-shell-view-actions.c:782
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
 msgid "_Open Task"
 msgstr "Avaa _tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:791
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
-#: ../modules/calendar/e-memo-shell-backend.c:79
+#: ../src/modules/calendar/e-memo-shell-backend.c:77
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:86
+#: ../src/modules/calendar/e-memo-shell-backend.c:84
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:88
+#: ../src/modules/calendar/e-memo-shell-backend.c:86
 msgid "Create a new shared memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../src/modules/calendar/e-memo-shell-backend.c:94
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Mui_stilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:98
-#: ../modules/calendar/e-memo-shell-view-actions.c:602
+#: ../src/modules/calendar/e-memo-shell-backend.c:96
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:252
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
 msgid "Memo List Properties"
 msgstr "Muistilappulistan ominaisuudet"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:558
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:556
 msgid "_Delete Memo"
 msgstr "_Poista muistilappu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:565
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:563
 msgid "_Find in Memo..."
 msgstr "_Etsi muistilapusta..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:567
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:565
 msgid "Search for text in the displayed memo"
 msgstr "Etsi tekstiä näytettävästä muistilapusta"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
 msgid "D_elete Memo List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete the selected memo list"
 msgstr "Poista valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Manage Memo List groups..."
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Manage Memo List groups order and visibility"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Refresh the selected memo list"
 msgstr "Päivitä valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Rename the selected memo list"
 msgstr "Nimeä valittu muistilappuluettelo uudestaan"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Show _Only This Memo List"
 msgstr "Näytä _vain tämä muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
 #, fuzzy
 #| msgid "Show _Only This Memo List"
 msgid "Sho_w All Memo Lists"
 msgstr "Näytä _vain tämä muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:722
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:720
 msgid "Memo _Preview"
 msgstr "Muistilapun _esikatselu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Show memo preview pane"
 msgstr "Näytä muistilapun esikatselupaneeli"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:745
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:743
 msgid "Show memo preview below the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon alla"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview alongside the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon vieressä"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:810
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the list of memos"
 msgstr "Tulosta luettelo muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:817
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Preview the list of memos to be printed"
 msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view.c:219
+#: ../src/modules/calendar/e-memo-shell-view.c:217
 msgid "Delete Memos"
 msgstr "Poista muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view.c:221
+#: ../src/modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memo"
 msgstr "Poista muistilappu"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:369
+#: ../src/modules/calendar/e-memo-shell-view-private.c:367
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:373
-#: ../modules/calendar/e-task-shell-view-private.c:550
+#: ../src/modules/calendar/e-memo-shell-view-private.c:371
+#: ../src/modules/calendar/e-task-shell-view-private.c:548
 #, c-format
 msgid "%d selected"
 msgstr ", %d valittu"
 
-#: ../modules/calendar/e-task-shell-backend.c:77
+#: ../src/modules/calendar/e-task-shell-backend.c:75
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: ../modules/calendar/e-task-shell-backend.c:84
+#: ../src/modules/calendar/e-task-shell-backend.c:82
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../modules/calendar/e-task-shell-backend.c:86
+#: ../src/modules/calendar/e-task-shell-backend.c:84
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../src/modules/calendar/e-task-shell-backend.c:92
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Te_htävälista"
 
-#: ../modules/calendar/e-task-shell-backend.c:96
-#: ../modules/calendar/e-task-shell-view-actions.c:728
+#: ../src/modules/calendar/e-task-shell-backend.c:94
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:220
-#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:276
+#: ../src/modules/calendar/e-task-shell-view-actions.c:274
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../src/modules/calendar/e-task-shell-view-actions.c:557
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -21532,410 +22491,435 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:566
+#: ../src/modules/calendar/e-task-shell-view-actions.c:564
 msgid "Do not ask me again"
 msgstr "Älä kysy uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:682
 msgid "_Delete Task"
 msgstr "_Poista tehtävä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
 msgid "_Find in Task..."
 msgstr "_Etsi tehtävästä..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:693
+#: ../src/modules/calendar/e-task-shell-view-actions.c:691
 msgid "Search for text in the displayed task"
 msgstr "Etsi tekstiä näytettävästä tehtävästä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
 msgid "D_elete Task List"
 msgstr "_Poista tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:714
+#: ../src/modules/calendar/e-task-shell-view-actions.c:712
 msgid "Delete the selected task list"
 msgstr "Poista valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../src/modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Manage Task List groups..."
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "Refresh the selected task list"
 msgstr "Päivitä valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:749
+#: ../src/modules/calendar/e-task-shell-view-actions.c:747
 msgid "Rename the selected task list"
 msgstr "Nimeä valittu tehtäväluettelo uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
 #, fuzzy
 #| msgid "Show _Only This Task List"
 msgid "Sho_w All Task Lists"
 msgstr "Näytä _vain tämä tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
 msgid "Show _Only This Task List"
 msgstr "Näytä _vain tämä tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
 msgid "Mar_k as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "Delete completed tasks"
 msgstr "Poista valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../src/modules/calendar/e-task-shell-view-actions.c:886
 msgid "Task _Preview"
 msgstr "Tehtävien _esikatselu"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../src/modules/calendar/e-task-shell-view-actions.c:888
 msgid "Show task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../src/modules/calendar/e-task-shell-view-actions.c:909
 msgid "Show task preview below the task list"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../src/modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview alongside the task list"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../src/modules/calendar/e-task-shell-view-actions.c:924
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../src/modules/calendar/e-task-shell-view-actions.c:938
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:947
-msgid "Next 7 Days' Tasks"
+#: ../src/modules/calendar/e-task-shell-view-actions.c:945
+#| msgid "Next 7 Days' Tasks"
+msgid "Next 7 Days’ Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:954
+#: ../src/modules/calendar/e-task-shell-view-actions.c:952
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:961
+#: ../src/modules/calendar/e-task-shell-view-actions.c:959
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1009
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
 
-#: ../modules/calendar/e-task-shell-view.c:323
+#: ../src/modules/calendar/e-task-shell-view.c:321
 msgid "Delete Tasks"
 msgstr "Poista tehtäviä"
 
-#: ../modules/calendar/e-task-shell-view.c:325
+#: ../src/modules/calendar/e-task-shell-view.c:323
 msgid "Delete Task"
 msgstr "Poista tehtävä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:546
+#: ../src/modules/calendar/e-task-shell-view-private.c:544
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:156
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319
+#, fuzzy
+#| msgid "Create a _Meeting"
+msgid "Convert to M_eeting"
+msgstr "Luo _kokous"
+
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Convert the message to a meeting request"
+msgstr "Luo uusi kokouskutsu"
+
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
+#, fuzzy
+#| msgid "Important Messages"
+msgid "Convert to M_essage"
+msgstr "Tärkeät viestit"
+
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#, fuzzy
+#| msgid "Compose a new mail message"
+msgid "Convert to the mail message"
+msgstr "Kirjoita uusi viesti"
+
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:157
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:163
 msgid "Display part as an invitation"
 msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:260
+#: ../src/modules/itip-formatter/itip-view.c:258
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:264
+#: ../src/modules/itip-formatter/itip-view.c:262
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:273
+#: ../src/modules/itip-formatter/itip-view.c:271
 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.
-#: ../modules/itip-formatter/itip-view.c:288
+#: ../src/modules/itip-formatter/itip-view.c:286
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:292
+#: ../src/modules/itip-formatter/itip-view.c:290
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:297
+#: ../src/modules/itip-formatter/itip-view.c:295
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:301
+#: ../src/modules/itip-formatter/itip-view.c:299
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:320
+#: ../src/modules/itip-formatter/itip-view.c:318
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:325
+#: ../src/modules/itip-formatter/itip-view.c:323
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:329
+#: ../src/modules/itip-formatter/itip-view.c:327
 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.
-#: ../modules/itip-formatter/itip-view.c:334
+#: ../src/modules/itip-formatter/itip-view.c:332
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:338
+#: ../src/modules/itip-formatter/itip-view.c:336
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:347
+#: ../src/modules/itip-formatter/itip-view.c:345
 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.
-#: ../modules/itip-formatter/itip-view.c:353
+#: ../src/modules/itip-formatter/itip-view.c:351
 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.
-#: ../modules/itip-formatter/itip-view.c:357
+#: ../src/modules/itip-formatter/itip-view.c:355
 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.
-#: ../modules/itip-formatter/itip-view.c:362
+#: ../src/modules/itip-formatter/itip-view.c:360
 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.
-#: ../modules/itip-formatter/itip-view.c:366
+#: ../src/modules/itip-formatter/itip-view.c:364
 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.
-#: ../modules/itip-formatter/itip-view.c:372
+#: ../src/modules/itip-formatter/itip-view.c:370
 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.
-#: ../modules/itip-formatter/itip-view.c:377
+#: ../src/modules/itip-formatter/itip-view.c:375
 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.
-#: ../modules/itip-formatter/itip-view.c:381
+#: ../src/modules/itip-formatter/itip-view.c:379
 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.
-#: ../modules/itip-formatter/itip-view.c:386
+#: ../src/modules/itip-formatter/itip-view.c:384
 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.
-#: ../modules/itip-formatter/itip-view.c:390
+#: ../src/modules/itip-formatter/itip-view.c:388
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M.%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:428
-#: ../modules/itip-formatter/itip-view.c:429
-#: ../modules/itip-formatter/itip-view.c:518
-#: ../modules/itip-formatter/itip-view.c:519
-#: ../modules/itip-formatter/itip-view.c:608
+#: ../src/modules/itip-formatter/itip-view.c:426
+#: ../src/modules/itip-formatter/itip-view.c:427
+#: ../src/modules/itip-formatter/itip-view.c:516
+#: ../src/modules/itip-formatter/itip-view.c:517
+#: ../src/modules/itip-formatter/itip-view.c:606
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
-#: ../modules/itip-formatter/itip-view.c:433
-#: ../modules/itip-formatter/itip-view.c:523
-#: ../modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:431
+#: ../src/modules/itip-formatter/itip-view.c:521
+#: ../src/modules/itip-formatter/itip-view.c:610
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vastaa henkilön %s puolesta"
 
-#: ../modules/itip-formatter/itip-view.c:435
-#: ../modules/itip-formatter/itip-view.c:525
-#: ../modules/itip-formatter/itip-view.c:614
+#: ../src/modules/itip-formatter/itip-view.c:433
+#: ../src/modules/itip-formatter/itip-view.c:523
+#: ../src/modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Vastaanotettu henkilön %s puolesta"
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:442
+#: ../src/modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot:"
 
-#: ../modules/itip-formatter/itip-view.c:447
+#: ../src/modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegoi seuraavan kokouksen sinulle:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:448
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../src/modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystänsä olemassa olevaan kokoukseen %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:460
+#: ../src/modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystään olemassa olevaan kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:462
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:466
+#: ../src/modules/itip-formatter/itip-view.c:464
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:468
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:472
+#: ../src/modules/itip-formatter/itip-view.c:470
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:476
+#: ../src/modules/itip-formatter/itip-view.c:474
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:478
+#: ../src/modules/itip-formatter/itip-view.c:476
 #, fuzzy, c-format
 #| msgid "%s has canceled the following meeting:"
 msgid "%s has cancelled the following meeting:"
 msgstr "%s on perunut seuraavan tapaamisen:"
 
-#: ../modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:480
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../modules/itip-formatter/itip-view.c:484
+#: ../src/modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ehdottaa seuraavia muutoksia kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:488
+#: ../src/modules/itip-formatter/itip-view.c:486
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:490
+#: ../src/modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s kieltäytyi seuraavista kokousmuutoksista:"
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:532
+#: ../src/modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s julkaisi seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:537
+#: ../src/modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:538
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../src/modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän:"
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:546
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:550
+#: ../src/modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:552
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -21943,342 +22927,361 @@ msgid ""
 msgstr ""
 "%s %s kautta toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../modules/itip-formatter/itip-view.c:556
+#: ../src/modules/itip-formatter/itip-view.c:554
 #, 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ä:"
 
-#: ../modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:558
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:562
+#: ../src/modules/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:566
+#: ../src/modules/itip-formatter/itip-view.c:564
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:568
+#: ../src/modules/itip-formatter/itip-view.c:566
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:570
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:574
+#: ../src/modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:578
+#: ../src/modules/itip-formatter/itip-view.c:576
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../src/modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../modules/itip-formatter/itip-view.c:619
+#: ../src/modules/itip-formatter/itip-view.c:617
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:621
+#: ../src/modules/itip-formatter/itip-view.c:619
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s julkaisi seuraavan muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:624
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:628
+#: ../src/modules/itip-formatter/itip-view.c:626
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun:"
 
-#: ../modules/itip-formatter/itip-view.c:632
+#: ../src/modules/itip-formatter/itip-view.c:630
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:634
+#: ../src/modules/itip-formatter/itip-view.c:632
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:859
+#: ../src/modules/itip-formatter/itip-view.c:857
 msgid "All day:"
 msgstr "Koko päivä:"
 
-#: ../modules/itip-formatter/itip-view.c:865
+#: ../src/modules/itip-formatter/itip-view.c:863
 msgid "Start day:"
 msgstr "Aloituspäivä:"
 
-#: ../modules/itip-formatter/itip-view.c:865
-#: ../modules/itip-formatter/itip-view.c:1667
+#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:1679
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
-#: ../modules/itip-formatter/itip-view.c:874
+#: ../src/modules/itip-formatter/itip-view.c:872
 msgid "End day:"
 msgstr "Päättymispäivä:"
 
-#: ../modules/itip-formatter/itip-view.c:874
-#: ../modules/itip-formatter/itip-view.c:1668
+#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:1680
 msgid "End time:"
 msgstr "Loppumisaika:"
 
-#: ../modules/itip-formatter/itip-view.c:1205
+#: ../src/modules/itip-formatter/itip-view.c:1210
 msgid "Ope_n Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../modules/itip-formatter/itip-view.c:1208
+#: ../src/modules/itip-formatter/itip-view.c:1213
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../modules/itip-formatter/itip-view.c:1211
+#: ../src/modules/itip-formatter/itip-view.c:1216
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../modules/itip-formatter/itip-view.c:1214
+#: ../src/modules/itip-formatter/itip-view.c:1219
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../modules/itip-formatter/itip-view.c:1217
+#: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../modules/itip-formatter/itip-view.c:1220
+#: ../src/modules/itip-formatter/itip-view.c:1225
 msgid "Acce_pt all"
 msgstr "_Hyväksy kaikki"
 
-#: ../modules/itip-formatter/itip-view.c:1223
+#: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt"
 msgstr "H_yväksy"
 
-#: ../modules/itip-formatter/itip-view.c:1226
+#: ../src/modules/itip-formatter/itip-view.c:1231
 msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
-#: ../modules/itip-formatter/itip-view.c:1229
+#: ../src/modules/itip-formatter/itip-view.c:1234
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../modules/itip-formatter/itip-view.c:1232
-#: ../smime/gui/certificate-manager.c:1679
+#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/smime/gui/certificate-manager.c:1677
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../modules/itip-formatter/itip-view.c:1670
-#: ../modules/itip-formatter/itip-view.c:1718
-#: ../modules/itip-formatter/itip-view.c:1789
+#: ../src/modules/itip-formatter/itip-view.c:1682
+#: ../src/modules/itip-formatter/itip-view.c:1730
+#: ../src/modules/itip-formatter/itip-view.c:1801
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1706
+#: ../src/modules/itip-formatter/itip-view.c:1718
 msgid "Send reply to sender"
 msgstr "Vastaa lähettäjälle"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1721
+#: ../src/modules/itip-formatter/itip-view.c:1733
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1724
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../modules/itip-formatter/itip-view.c:1725
+#: ../src/modules/itip-formatter/itip-view.c:1737
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../modules/itip-formatter/itip-view.c:1726
+#: ../src/modules/itip-formatter/itip-view.c:1738
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
-#: ../modules/itip-formatter/itip-view.c:1727
+#: ../src/modules/itip-formatter/itip-view.c:1739
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../modules/itip-formatter/itip-view.c:2036
+#: ../src/modules/itip-formatter/itip-view.c:2048
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:2039
+#: ../src/modules/itip-formatter/itip-view.c:2051
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
-#: ../modules/itip-formatter/itip-view.c:2952
+#: ../src/modules/itip-formatter/itip-view.c:2964
 msgid "Sa_ve"
 msgstr "_Tallenna"
 
-#: ../modules/itip-formatter/itip-view.c:3392
-#: ../modules/itip-formatter/itip-view.c:4848
+#: ../src/modules/itip-formatter/itip-view.c:3486
+#: ../src/modules/itip-formatter/itip-view.c:4955
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../modules/itip-formatter/itip-view.c:3557
+#: ../src/modules/itip-formatter/itip-view.c:3658
 #, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+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:3664
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid ""
+"The calendar “%s” contains an appointment which conflicts with this meeting"
+msgid_plural ""
+"The calendar “%s” contains %d appointments which conflict with this meeting"
+msgstr[0] ""
+"Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
+"kanssa"
+msgstr[1] ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
 "kanssa"
 
-#: ../modules/itip-formatter/itip-view.c:3587
-#, c-format
-msgid "Found the appointment in the calendar '%s'"
+#: ../src/modules/itip-formatter/itip-view.c:3697
+#, 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\""
 
-#: ../modules/itip-formatter/itip-view.c:3721
+#: ../src/modules/itip-formatter/itip-view.c:3831
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:3729
+#: ../src/modules/itip-formatter/itip-view.c:3839
 msgid "Unable to find this meeting in any calendar"
 msgstr "Tätä kokousta ei löydy mistään kalenterista"
 
-#: ../modules/itip-formatter/itip-view.c:3734
+#: ../src/modules/itip-formatter/itip-view.c:3844
 msgid "Unable to find this task in any task list"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../modules/itip-formatter/itip-view.c:3739
+#: ../src/modules/itip-formatter/itip-view.c:3849
 msgid "Unable to find this memo in any memo list"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../modules/itip-formatter/itip-view.c:4083
+#: ../src/modules/itip-formatter/itip-view.c:4190
 msgid "Opening the calendar. Please wait..."
 msgstr "Avataan kalenteria, odota hetki..."
 
-#: ../modules/itip-formatter/itip-view.c:4088
+#: ../src/modules/itip-formatter/itip-view.c:4195
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../modules/itip-formatter/itip-view.c:4487
-#, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
+#: ../src/modules/itip-formatter/itip-view.c:4594
+#, 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"
 
-#: ../modules/itip-formatter/itip-view.c:4502
-#, c-format
-msgid "Sent to calendar '%s' as accepted"
+#: ../src/modules/itip-formatter/itip-view.c:4609
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as accepted"
+msgid "Sent to calendar “%s” as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../modules/itip-formatter/itip-view.c:4507
-#, c-format
-msgid "Sent to calendar '%s' as tentative"
+#: ../src/modules/itip-formatter/itip-view.c:4614
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as tentative"
+msgid "Sent to calendar “%s” as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../modules/itip-formatter/itip-view.c:4513
-#, c-format
-msgid "Sent to calendar '%s' as declined"
+#: ../src/modules/itip-formatter/itip-view.c:4620
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as declined"
+msgid "Sent to calendar “%s” as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../modules/itip-formatter/itip-view.c:4519
+#: ../src/modules/itip-formatter/itip-view.c:4626
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as canceled"
-msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar “%s” as cancelled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../modules/itip-formatter/itip-view.c:4539
-#: ../modules/itip-formatter/itip-view.c:4985
-#: ../modules/itip-formatter/itip-view.c:5088
+#: ../src/modules/itip-formatter/itip-view.c:4646
+#: ../src/modules/itip-formatter/itip-view.c:5092
+#: ../src/modules/itip-formatter/itip-view.c:5195
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../modules/itip-formatter/itip-view.c:4580
+#: ../src/modules/itip-formatter/itip-view.c:4687
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../modules/itip-formatter/itip-view.c:4772
+#: ../src/modules/itip-formatter/itip-view.c:4879
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../modules/itip-formatter/itip-view.c:4789
+#: ../src/modules/itip-formatter/itip-view.c:4896
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../modules/itip-formatter/itip-view.c:4793
+#: ../src/modules/itip-formatter/itip-view.c:4900
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../modules/itip-formatter/itip-view.c:4840
+#: ../src/modules/itip-formatter/itip-view.c:4947
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4875
+#: ../src/modules/itip-formatter/itip-view.c:4982
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Tapaaminen on virheellinen, eikä sitä voi päivittää"
 
-#: ../modules/itip-formatter/itip-view.c:4950
+#: ../src/modules/itip-formatter/itip-view.c:5057
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../modules/itip-formatter/itip-view.c:5021
-#: ../modules/itip-formatter/itip-view.c:5059
+#: ../src/modules/itip-formatter/itip-view.c:5128
+#: ../src/modules/itip-formatter/itip-view.c:5166
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5120
+#: ../src/modules/itip-formatter/itip-view.c:5227
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5125
+#: ../src/modules/itip-formatter/itip-view.c:5232
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5130
+#: ../src/modules/itip-formatter/itip-view.c:5237
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5141
+#: ../src/modules/itip-formatter/itip-view.c:5248
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lähettää, koska kokousta ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:5146
+#: ../src/modules/itip-formatter/itip-view.c:5253
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5151
+#: ../src/modules/itip-formatter/itip-view.c:5258
 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.
-#: ../modules/itip-formatter/itip-view.c:5216
+#: ../src/modules/itip-formatter/itip-view.c:5323
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5221
+#: ../src/modules/itip-formatter/itip-view.c:5328
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../modules/itip-formatter/itip-view.c:5269
-#: ../modules/itip-formatter/itip-view.c:5282
+#: ../src/modules/itip-formatter/itip-view.c:5376
+#: ../src/modules/itip-formatter/itip-view.c:5389
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../modules/itip-formatter/itip-view.c:5270
-#: ../modules/itip-formatter/itip-view.c:5283
+#: ../src/modules/itip-formatter/itip-view.c:5377
+#: ../src/modules/itip-formatter/itip-view.c:5390
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -22286,15 +23289,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../modules/itip-formatter/itip-view.c:5325
-#: ../modules/itip-formatter/itip-view.c:5355
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../src/modules/itip-formatter/itip-view.c:5432
+#: ../src/modules/itip-formatter/itip-view.c:5462
+#: ../src/modules/itip-formatter/itip-view.c:5565
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../modules/itip-formatter/itip-view.c:5326
-#: ../modules/itip-formatter/itip-view.c:5356
-#: ../modules/itip-formatter/itip-view.c:5459
+#: ../src/modules/itip-formatter/itip-view.c:5433
+#: ../src/modules/itip-formatter/itip-view.c:5463
+#: ../src/modules/itip-formatter/itip-view.c:5566
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -22302,11 +23305,11 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../modules/itip-formatter/itip-view.c:5371
+#: ../src/modules/itip-formatter/itip-view.c:5478
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../modules/itip-formatter/itip-view.c:5372
+#: ../src/modules/itip-formatter/itip-view.c:5479
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -22314,593 +23317,614 @@ msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../modules/itip-formatter/itip-view.c:5890
+#: ../src/modules/itip-formatter/itip-view.c:5997
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../modules/itip-formatter/itip-view.c:5906
+#: ../src/modules/itip-formatter/itip-view.c:6013
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../modules/itip-formatter/itip-view.c:6072
+#: ../src/modules/itip-formatter/itip-view.c:6179
 msgid "This meeting recurs"
 msgstr "Tapaaminen on toistuva"
 
-#: ../modules/itip-formatter/itip-view.c:6075
+#: ../src/modules/itip-formatter/itip-view.c:6182
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../modules/itip-formatter/itip-view.c:6078
+#: ../src/modules/itip-formatter/itip-view.c:6185
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Vastaus ei ole olemassa olevalta läsnäolijalta. Lisätäänkö läsnäolijaksi?"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Kokous on valtuutettu"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 #, fuzzy
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 msgstr ""
 "&quot;{0}&quot; on antanut kokouksen järjestettäväksi. Haluatko lisätä "
 "osallistujan &quot;{1}&quot;?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:265
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:283
 msgid "Google Features"
 msgstr "Google-ominaisuudet"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:274
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:292
 msgid "Add Google Ca_lendar to this account"
 msgstr "Lisää _Google-kalenteri tähän tiliin"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:283
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
 msgid "Add Google Con_tacts to this account"
 msgstr "Lisää Google-_yhteystiedot tähän tiliin"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:292
-msgid "You may need to enable IMAP access"
+#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
+#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:312
+msgctxt "GoggleSummary"
+msgid "IMAP access"
+msgstr "IMAP-käyttö"
+
+#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
+#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
+#, fuzzy
+#| msgid "Do _Not Synchronize"
+msgctxt "GoggleSummary"
+msgid "Calendars to synchronize"
+msgstr "Ä_lä synkronoi"
+
+#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
+#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:318
+#, fuzzy, c-format
+#| msgid "You may need to enable IMAP access"
+msgctxt "GoggleSummary"
+msgid "You may need to enable %s and %s"
 msgstr "Sinun on mahdollisesti sallittava IMAP-käyttö"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:267
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:316
 #, fuzzy
 #| msgid "Save directory"
 msgid "Mail _Directory:"
 msgstr "Tallenna kansio"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:269
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Choose a MH mail directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:271
 #, fuzzy
 #| msgid "One or more values cannot be empty."
 msgid "MH mail directory cannot be empty"
 msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Local Delivery _File:"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:293
 #, fuzzy
 #| msgid "Choose calendar file"
 msgid "Choose a local delivery file"
 msgstr "Valitse kalenteritiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:294
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:295
 #, fuzzy
 #| msgid "One or more values cannot be empty."
 msgid "Local delivery file cannot be empty"
 msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:317
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Choose a Maildir mail directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:318
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:319
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Maildir mail directory cannot be empty"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:340
 #, fuzzy
 #| msgid "_File:"
 msgid "Spool _File:"
 msgstr "_Tiedosto:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:340
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:341
 #, fuzzy
 #| msgid "Choose a File"
 msgid "Choose a mbox spool file"
 msgstr "Valitse tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:342
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:343
 #, fuzzy
 #| msgid "One or more values cannot be empty."
 msgid "Mbox spool file cannot be empty"
 msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:363
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:364
 #, fuzzy
 #| msgid "Save directory"
 msgid "Spool _Directory:"
 msgstr "Tallenna kansio"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:364
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:365
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Choose a mbox spool directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:366
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:367
 msgid "Mbox spool directory cannot be empty"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:197
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:153
-#: ../modules/plugin-manager/evolution-plugin-manager.c:158
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:198
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:154
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:156
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:215
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:171
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
 msgid "_Port:"
 msgstr "_Portti:"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:250
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:312
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:251
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:313
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:264
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:326
-#, fuzzy
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:265
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:327
 #| msgid "Enter password"
 msgid "_Forget password"
-msgstr "Syötä salasana"
+msgstr "_Unohda salasana"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:290
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:233
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:291
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "Encryption _method:"
 msgstr "Salaus_tapa:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:305
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:248
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:306
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:249
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS yhteyden muodostamisen jälkeen"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:309
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:310
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:253
 #, fuzzy
 #| msgid "SSL on a dedicated port"
 msgid "TLS on a dedicated port"
 msgstr "SSL tietyssä portissa"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
-msgid "_Use custom binary, instead of 'sendmail'"
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:75
+#, fuzzy
+#| msgid "_Use custom binary, instead of 'sendmail'"
+msgid "_Use custom binary, instead of “sendmail”"
 msgstr "_Käytä omavalintaista binääriä 'sendmail'-binäärin sijaan"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:81
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:79
 msgid "_Custom binary:"
 msgstr "_Omavalintainen binääri:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:100
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:98
 #, fuzzy
 #| msgid "Use custom fonts"
 msgid "U_se custom arguments"
 msgstr "Käytä omia fontteja"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:104
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:102
 #, fuzzy
 #| msgid "_Arguments:"
 msgid "Cus_tom arguments:"
 msgstr "_Argumentit:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:122
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:120
 msgid ""
-"Default arguments are '-i -f %F -- %R', where\n"
-"   %F - stands for the From address\n"
-"   %R - stands for the recipient addresses"
+"Default arguments are “-i -f %F -- %R”, where\n"
+"   %F — stands for the From address\n"
+"   %R — stands for the recipient addresses"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:135
 #, fuzzy
 #| msgid "Start in offline mode"
 msgid "Send mail also when in offline _mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:210
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:208
 #, fuzzy
 #| msgid "One or more values cannot be empty."
 msgid "Custom binary cannot be empty"
 msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:206
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:294
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:295
 msgid "T_ype:"
 msgstr "_Tyyppi:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:252
 msgid "Yahoo! Features"
 msgstr "Yahoo!-ominaisuudet"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:261
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Lisää Yahoo!-kalenteri ja -tehtävät tälle tilille"
 
-#: ../modules/mail/e-mail-attachment-handler.c:673
+#: ../src/modules/mail/e-mail-attachment-handler.c:671
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../modules/mail/e-mail-shell-backend.c:377
+#: ../src/modules/mail/e-mail-shell-backend.c:375
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Sähköpostiviesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:379
+#: ../src/modules/mail/e-mail-shell-backend.c:377
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:387
+#: ../src/modules/mail/e-mail-shell-backend.c:385
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "_Sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:389
+#: ../src/modules/mail/e-mail-shell-backend.c:387
 msgid "Create a new mail account"
 msgstr "Luo uusi sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:394
+#: ../src/modules/mail/e-mail-shell-backend.c:392
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Sähköposti_kansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:396
+#: ../src/modules/mail/e-mail-shell-backend.c:394
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../modules/mail/e-mail-shell-backend.c:711
+#: ../src/modules/mail/e-mail-shell-backend.c:709
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr ""
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../modules/mail/e-mail-shell-backend.c:714
+#: ../src/modules/mail/e-mail-shell-backend.c:712
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr ""
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../modules/mail/e-mail-shell-backend.c:717
+#: ../src/modules/mail/e-mail-shell-backend.c:715
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../modules/mail/e-mail-shell-backend.c:749
+#: ../src/modules/mail/e-mail-shell-backend.c:749
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Yhteydellisen tilan _havaintatapa:"
 
 #. Always as the first
-#: ../modules/mail/e-mail-shell-backend.c:758
-#| msgid "Default"
+#: ../src/modules/mail/e-mail-shell-backend.c:758
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Oletus"
 
 #. Always as the last
-#: ../modules/mail/e-mail-shell-backend.c:772
-#| msgid "_Always move"
+#: ../src/modules/mail/e-mail-shell-backend.c:772
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Aina yhteydessä"
 
-#: ../modules/mail/e-mail-shell-backend.c:832
+#: ../src/modules/mail/e-mail-shell-backend.c:832
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: ../modules/mail/e-mail-shell-backend.c:841
+#: ../src/modules/mail/e-mail-shell-backend.c:841
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:850
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:859
+#: ../src/modules/mail/e-mail-shell-backend.c:859
 msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1151
+#: ../src/modules/mail/e-mail-shell-backend.c:1151
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:734
 msgid "Marking messages as read..."
 msgstr "Merkitään viestejä luetuiksi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1093
 msgid "Go to Folder"
 msgstr "Siirry kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1097
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Refresh list of folders of this account"
 msgstr "Päivitä tämän tilin kansioiden luettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Lataa yhteydettömään käyttöön merkittyjen tilien ja kansioiden viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1759
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1766
-#: ../modules/mail/e-mail-shell-view-actions.c:1874
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
-#: ../modules/mail/e-mail-shell-view-actions.c:1876
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1773
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1783
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1790
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1804
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1809
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1811
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 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"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1777
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1832
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1779
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Poista pysyvästi kaikki poistetut viestit kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1837
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1784
 msgid "Go to _Folder"
 msgstr "Siirry ka_nsioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1839
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1786
 #, 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"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1844
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1791
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1853
+#. Translators: "None" is used in the message label context menu.
+#. *              It removes all labels from the selected messages.
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1867
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
-#: ../modules/mail/e-mail-shell-view-actions.c:1953
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1900
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1881
-#: ../modules/mail/e-mail-shell-view-actions.c:1902
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1849
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1883
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1888
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1835
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1890
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1837
 msgid "Receive new items from all accounts"
 msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1895
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1842
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1897
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
 #, fuzzy
 msgid "Send queued items in all accounts"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1925
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1930
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1937
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1884
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1939
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1944
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1891
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1946
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
 msgid "Create or edit rules for filtering new mail"
 msgstr "Luo tai muokkaa sääntöjä uuden sähköpostin suodatukseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1951
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1898
 msgid "_Subscriptions..."
 msgstr "_Tilaukset..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1960
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1907
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1967
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1914
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1984
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1931
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1991
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1938
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1993
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1979
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2060
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2007
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2062
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2068
-#| msgid "Show Attachment _Bar"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2015
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid ""
@@ -22908,361 +23932,359 @@ msgid ""
 "attachments"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2076
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2078
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2025
 msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2084
-#| msgid "Show _Deleted Messages"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
 msgid "Show _Junk Messages"
 msgstr "Näytä _roskapostiviestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2086
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2033
 #, 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"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2039
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2094
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2041
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2100
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2047
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2102
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2049
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2122
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2129
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2076
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2137
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2144
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2151
-msgid "Last 5 Days' Messages"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
+#, fuzzy
+#| msgid "Last 5 Days' Messages"
+msgid "Last 5 Days’ Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2158
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2165
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2172
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
 #, fuzzy
 #| msgid "Messages with Attachments"
 msgid "Messages with Notes"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2179
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2186
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2193
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2200
-#| msgid "Message Header"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2147
 msgid "Message Thread"
 msgstr "Viestinketju"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2260
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2207
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2270
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2277
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2284
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2231
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../modules/mail/e-mail-shell-view.c:779
+#: ../src/modules/mail/e-mail-shell-view.c:777
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view.c:887
+#: ../src/modules/mail/e-mail-shell-view.c:885
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:958
+#: ../src/modules/mail/e-mail-shell-view-private.c:931
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valittu, "
 msgstr[1] "%d valittua, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:967
-#: ../modules/mail/e-mail-shell-view-private.c:984
+#: ../src/modules/mail/e-mail-shell-view-private.c:940
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettua"
 
-#: ../modules/mail/e-mail-shell-view-private.c:993
-#: ../modules/mail/e-mail-shell-view-private.c:999
+#: ../src/modules/mail/e-mail-shell-view-private.c:966
+#: ../src/modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1006
+#: ../src/modules/mail/e-mail-shell-view-private.c:979
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1012
+#: ../src/modules/mail/e-mail-shell-view-private.c:985
 #, 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ä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1018
+#: ../src/modules/mail/e-mail-shell-view-private.c:991
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1035
+#: ../src/modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
-#| msgid "%d unread, "
-#| msgid_plural "%d unread, "
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d lukematon"
 msgstr[1] "%d lukematonta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1553
+#: ../src/modules/mail/e-mail-shell-view-private.c:1526
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ../modules/mail/em-composer-prefs.c:413
+#: ../src/modules/mail/em-composer-prefs.c:419
 msgid "Select Folder to Add"
 msgstr "Valitse lisättävä kansio"
 
-#: ../modules/mail/em-composer-prefs.c:883
+#: ../src/modules/mail/em-composer-prefs.c:895
 msgid "Folder"
 msgstr "Kansio"
 
-#: ../modules/mail/em-composer-prefs.c:919
+#: ../src/modules/mail/em-composer-prefs.c:931
 msgid "Recipient"
 msgstr "Vastaanottaja"
 
-#: ../modules/mail/em-composer-prefs.c:1204
+#: ../src/modules/mail/em-composer-prefs.c:1222
 #, fuzzy
 msgid "Keep in Outbox"
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../modules/mail/em-composer-prefs.c:1205
+#: ../src/modules/mail/em-composer-prefs.c:1223
 msgid "Send immediately"
 msgstr "Lähetä välittömästi"
 
-#: ../modules/mail/em-composer-prefs.c:1206
+#: ../src/modules/mail/em-composer-prefs.c:1224
 msgid "Send after 5 minutes"
 msgstr "Lähetä 5 minuutin jälkeen"
 
-#: ../modules/mail/em-composer-prefs.c:1285
+#: ../src/modules/mail/em-composer-prefs.c:1303
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../src/modules/mail/em-mailer-prefs.c:77
 msgid "On exit, every time"
 msgstr "Poistuessa, joka kerta"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../src/modules/mail/em-mailer-prefs.c:78
 msgid "Once per day"
 msgstr "Kerran päivässä"
 
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../src/modules/mail/em-mailer-prefs.c:79
 msgid "Once per week"
 msgstr "Kerran viikossa"
 
-#: ../modules/mail/em-mailer-prefs.c:82
+#: ../src/modules/mail/em-mailer-prefs.c:80
 msgid "Once per month"
 msgstr "Kerran kuussa"
 
-#: ../modules/mail/em-mailer-prefs.c:83
+#: ../src/modules/mail/em-mailer-prefs.c:81
 msgid "Immediately, on folder leave"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:420
+#: ../src/modules/mail/em-mailer-prefs.c:418
 msgid "Header"
 msgstr "Otsake"
 
-#: ../modules/mail/em-mailer-prefs.c:424
+#: ../src/modules/mail/em-mailer-prefs.c:422
 msgid "Contains Value"
 msgstr "Sisältää arvon"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1560
+#: ../src/modules/mail/em-mailer-prefs.c:1558
 msgid "_Date header:"
 msgstr "_Päiväysotsake:"
 
-#: ../modules/mail/em-mailer-prefs.c:1561
+#: ../src/modules/mail/em-mailer-prefs.c:1559
 msgid "Show _original header value"
 msgstr "Näytä _alkuperäinen otsakkeen arvo"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:140
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:138
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Haluatko käyttää Evolutionia oletuksena sähköpostin käsittelyyn?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:304
-#, c-format
-msgid "Your message to %s about \"%s\" on %s has been read."
+#: ../src/modules/mdn/evolution-mdn.c:308
+#, fuzzy, c-format
+#| msgid "Your message to %s about \"%s\" on %s has been read."
+msgid "Your message to %s about “%s” on %s has been read."
 msgstr "Osoitteeseen %1$s %3$s lähettämäsi viesti ”%2$s” on luettu."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:370
+#: ../src/modules/mdn/evolution-mdn.c:374
 #, fuzzy, c-format
-msgid "Delivery Notification for \"%s\""
+msgid "Delivery Notification for “%s”"
 msgstr "Toimituskuittaus viestille: ”%s”"
 
-#: ../modules/mdn/evolution-mdn.c:534
+#: ../src/modules/mdn/evolution-mdn.c:540
 #, fuzzy, c-format
-msgid "Send a read receipt to '%s'"
+msgid "Send a read receipt to “%s”"
 msgstr "Läh_etä viestin kuittaus:"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../src/modules/mdn/evolution-mdn.c:545
 msgid "_Notify Sender"
 msgstr "_Ilmoita lähettäjälle"
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:1
+#: ../src/modules/mdn/evolution-mdn.error.xml.h:1
 msgid "Sender wants to be notified when you have read this message."
 msgstr "Lähettäjä haluaa tiedon, kun olet lukenut viestin."
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:2
+#: ../src/modules/mdn/evolution-mdn.error.xml.h:2
 msgid "Sender has been notified that you have read this message."
 msgstr "Lähettäjälle on ilmoitettu, että luit hänen viestinsä."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:1
 msgid "Evolution is currently offline."
 msgstr "Evolution on parhaillaan yhteydettömässä tilassa."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-msgid "Click 'Work Online' to return to online mode."
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Click “Work Online” to return to online mode."
 msgstr ""
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr ""
 "Evolution on yhteydettömässä tilassa, koska verkko ei ole käytettävissä."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
 "Evolution will return to online mode once a network connection is "
 "established."
 msgstr "Evolution palaa yhdistettyyn tilaan, kun verkko on taas käytettävissä."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:65
 msgid "Author(s)"
 msgstr "Kirjoittaja(t)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:253
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:251
 msgid "Plugin Manager"
 msgstr "Lisäosien hallinta"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:268
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:266
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Huomio: jotkut muutokset eivät astu voimaan ennen uudelleenkäynnistystä"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:294
 msgid "Overview"
 msgstr "Yhteenveto"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:365
-#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:363
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:446
 msgid "Plugin"
 msgstr "Lisäosa"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:484
 msgid "_Plugins"
 msgstr "_Lisäosat"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:485
 msgid "Enable and disable plugins"
 msgstr "Käytä ja poista käytöstä lisäosia"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:137
 msgid "Display plain text version"
 msgstr "Näytä raakatekstiversio"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
-#| msgid "Display the next important message"
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version of multipart/alternative message"
 msgstr "Näytä raakatekstiversio multipart/alternative-viestistä"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:145
 msgid "Display HTML version"
 msgstr "Näytä HTML-versio"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 #, fuzzy
 #| msgid "Display the previous important message"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:37
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../src/modules/prefer-plain/plugin/config-ui.c:35
 msgid "Show HTML if present"
 msgstr "Näytä HTML:ää, jos se on saatavilla"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
-#: ../modules/prefer-plain/plugin/config-ui.c:38
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../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."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:41
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../src/modules/prefer-plain/plugin/config-ui.c:39
 msgid "Show plain text if present"
 msgstr "Näytä raakatekstinä, jos mahdollista"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
-#: ../modules/prefer-plain/plugin/config-ui.c:42
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../src/modules/prefer-plain/plugin/config-ui.c:40
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -23270,14 +24292,13 @@ msgstr ""
 "Näytä raakatekstiosa, jos se on saatavilla, muussa tapauksessa anna "
 "Evolutionin valita näytettäväksi paras osa."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:46
-#| msgid "Show plain text if present"
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../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"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../src/modules/prefer-plain/plugin/config-ui.c:45
 #, fuzzy
 #| msgid ""
 #| "Show plain text part, if present, otherwise let Evolution choose the best "
@@ -23287,13 +24308,13 @@ msgstr ""
 "Näytä raakatekstiosa, jos se on saatavilla, muussa tapauksessa anna "
 "Evolutionin valita näytettäväksi paras osa."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:93
-#: ../modules/prefer-plain/plugin/config-ui.c:51
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:91
+#: ../src/modules/prefer-plain/plugin/config-ui.c:49
 msgid "Only ever show plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:94
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../src/modules/prefer-plain/plugin/config-ui.c:50
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -23301,87 +24322,87 @@ msgstr ""
 "Näytä aina raakatekstinä ja tee muista osista liitetiedostoja, jos niin "
 "pyydetään."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:103
+#: ../src/modules/prefer-plain/plugin/config-ui.c:101
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Näytä _piilotetut HTML-osat liitetiedostoina"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:125
+#: ../src/modules/prefer-plain/plugin/config-ui.c:123
 msgid "HTML _Mode"
 msgstr "HTML-_tila"
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
 msgid "Prefer Plain Text"
 msgstr "Suosi raakatekstiä"
 
 #. but then we also need to create our own section frame
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr "Raakatekstin tila"
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Näytä viestit raakatekstinä, vaikka ne sisältäisivät HTML-sisältöä."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:187
+#: ../src/modules/spamassassin/evolution-spamassassin.c:188
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:210
+#: ../src/modules/spamassassin/evolution-spamassassin.c:211
 #, fuzzy
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Suodata roskaposteja spamassasinilla."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:229
+#: ../src/modules/spamassassin/evolution-spamassassin.c:230
 #, fuzzy, c-format
-msgid "Failed to write '%s' to SpamAssassin: "
+msgid "Failed to write “%s” to SpamAssassin: "
 msgstr "%d viestin %d:stä lähetys epäonnistui"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:257
+#: ../src/modules/spamassassin/evolution-spamassassin.c:258
 msgid "Failed to read output from SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:312
+#: ../src/modules/spamassassin/evolution-spamassassin.c:313
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:535
+#: ../src/modules/spamassassin/evolution-spamassassin.c:536
 msgid "SpamAssassin Options"
 msgstr "Spamassassin-valitsimet"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:550
+#: ../src/modules/spamassassin/evolution-spamassassin.c:551
 msgid "I_nclude remote tests"
 msgstr "_Lisää myös etätestit"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:564
+#: ../src/modules/spamassassin/evolution-spamassassin.c:565
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Tämä tekee SpamAssassinista luotettavamman, mutta hitaamman."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:739
-#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
+#: ../src/modules/spamassassin/evolution-spamassassin.c:740
+#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
 msgid "Junk filter using SpamAssassin"
 msgstr "Roskapostisuodatus SpamAssassinia käyttäen"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:270
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:271
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:340
 msgid "Importing Files"
 msgstr "Tiedostojen tuonti"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:259
 msgid "Import cancelled."
 msgstr "Tuonti peruttiin."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:276
 msgid "Import complete."
 msgstr "Tuonti valmistui."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:155
+#: ../src/modules/startup-wizard/e-startup-assistant.c:156
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -23393,282 +24414,283 @@ msgstr ""
 "Seuraavaksi kysyttävien tietojen avulla Evolution ottaa yhteyttä "
 "sähköpostitileihisi ja tuo tarvittavia tietoja muista sovelluksista."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:228
+#: ../src/modules/startup-wizard/evolution-startup-wizard.c:226
 msgid "Loading accounts..."
 msgstr "Ladataan tilejä..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
 msgid "_Format as..."
 msgstr "_Muotoile..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
 msgid "_Other languages"
 msgstr "_Muut kielet"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:436
 msgid "Text Highlight"
 msgstr "Tekstin korostus"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:437
 msgid "Syntax highlighting of mail parts"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:31
+#: ../src/modules/text-highlight/languages.c:29
 msgid "_Plain text"
 msgstr "_Raakateksti"
 
-#: ../modules/text-highlight/languages.c:37
+#: ../src/modules/text-highlight/languages.c:35
 msgid "_Assembler"
 msgstr "_Assembler"
 
-#: ../modules/text-highlight/languages.c:42
+#: ../src/modules/text-highlight/languages.c:40
 msgid "_Bash"
 msgstr "_Bash"
 
-#: ../modules/text-highlight/languages.c:53
+#: ../src/modules/text-highlight/languages.c:51
 msgid "_C/C++"
 msgstr "_C/C++"
 
-#: ../modules/text-highlight/languages.c:62
+#: ../src/modules/text-highlight/languages.c:60
 msgid "_C#"
 msgstr "_C#"
 
-#: ../modules/text-highlight/languages.c:67
+#: ../src/modules/text-highlight/languages.c:65
 msgid "_Cascade Style Sheet"
 msgstr "_Cascade Style Sheet (CSS)"
 
-#: ../modules/text-highlight/languages.c:80
+#: ../src/modules/text-highlight/languages.c:78
 msgid "_Java"
 msgstr "_Java"
 
-#: ../modules/text-highlight/languages.c:86
+#: ../src/modules/text-highlight/languages.c:84
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: ../modules/text-highlight/languages.c:92
+#: ../src/modules/text-highlight/languages.c:90
 msgid "_Patch/diff"
 msgstr "_Patch/diff"
 
-#: ../modules/text-highlight/languages.c:98
+#: ../src/modules/text-highlight/languages.c:96
 msgid "_Perl"
 msgstr "_Perl"
 
-#: ../modules/text-highlight/languages.c:109
+#: ../src/modules/text-highlight/languages.c:107
 msgid "_PHP"
 msgstr "_PHP"
 
-#: ../modules/text-highlight/languages.c:122
+#: ../src/modules/text-highlight/languages.c:120
 msgid "_Python"
 msgstr "_Python"
 
-#: ../modules/text-highlight/languages.c:127
+#: ../src/modules/text-highlight/languages.c:125
 msgid "_Ruby"
 msgstr "_Ruby"
 
-#: ../modules/text-highlight/languages.c:134
+#: ../src/modules/text-highlight/languages.c:132
 msgid "_Tcl/Tk"
 msgstr "_Tcl/Tk"
 
-#: ../modules/text-highlight/languages.c:140
+#: ../src/modules/text-highlight/languages.c:138
 msgid "_TeX/LaTeX"
 msgstr "_TeX/LaTeX"
 
-#: ../modules/text-highlight/languages.c:146
+#: ../src/modules/text-highlight/languages.c:144
 msgid "_Vala"
 msgstr "_Vala"
 
-#: ../modules/text-highlight/languages.c:151
+#: ../src/modules/text-highlight/languages.c:149
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
-#: ../modules/text-highlight/languages.c:158
+#: ../src/modules/text-highlight/languages.c:156
 msgid "_XML"
 msgstr "_XML"
 
-#: ../modules/text-highlight/languages.c:176
+#: ../src/modules/text-highlight/languages.c:174
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
-#: ../modules/text-highlight/languages.c:181
+#: ../src/modules/text-highlight/languages.c:179
 msgid "_ADA95"
 msgstr "_ADA95"
 
-#: ../modules/text-highlight/languages.c:188
+#: ../src/modules/text-highlight/languages.c:186
 msgid "_ALGOL 68"
 msgstr "_ALGOL 68"
 
-#: ../modules/text-highlight/languages.c:193
+#: ../src/modules/text-highlight/languages.c:191
 msgid "(_G)AWK"
 msgstr "(_G)AWK"
 
-#: ../modules/text-highlight/languages.c:198
+#: ../src/modules/text-highlight/languages.c:196
 msgid "_COBOL"
 msgstr "_COBOL"
 
-#: ../modules/text-highlight/languages.c:203
+#: ../src/modules/text-highlight/languages.c:201
 msgid "_DOS Batch"
 msgstr "_DOS Batch"
 
-#: ../modules/text-highlight/languages.c:208
+#: ../src/modules/text-highlight/languages.c:206
 msgid "_D"
 msgstr "_D"
 
-#: ../modules/text-highlight/languages.c:213
+#: ../src/modules/text-highlight/languages.c:211
 msgid "_Erlang"
 msgstr "_Erlang"
 
-#: ../modules/text-highlight/languages.c:218
+#: ../src/modules/text-highlight/languages.c:216
 msgid "_FORTRAN 77"
 msgstr "_FORTRAN 77"
 
-#: ../modules/text-highlight/languages.c:224
+#: ../src/modules/text-highlight/languages.c:222
 msgid "_FORTRAN 90"
 msgstr "_FORTRAN 90"
 
-#: ../modules/text-highlight/languages.c:229
+#: ../src/modules/text-highlight/languages.c:227
 msgid "_F#"
 msgstr "_F#"
 
-#: ../modules/text-highlight/languages.c:234
+#: ../src/modules/text-highlight/languages.c:232
 msgid "_Go"
 msgstr "_Go"
 
-#: ../modules/text-highlight/languages.c:239
+#: ../src/modules/text-highlight/languages.c:237
 msgid "_Haskell"
 msgstr "_Haskell"
 
-#: ../modules/text-highlight/languages.c:244
+#: ../src/modules/text-highlight/languages.c:242
 msgid "_JSP"
 msgstr "_JSP"
 
-#: ../modules/text-highlight/languages.c:249
+#: ../src/modules/text-highlight/languages.c:247
 msgid "_Lisp"
 msgstr "_Lisp"
 
-#: ../modules/text-highlight/languages.c:257
+#: ../src/modules/text-highlight/languages.c:255
 msgid "_Lotus"
 msgstr "_Lotus"
 
-#: ../modules/text-highlight/languages.c:262
+#: ../src/modules/text-highlight/languages.c:260
 msgid "_Lua"
 msgstr "_Lua"
 
-#: ../modules/text-highlight/languages.c:267
+#: ../src/modules/text-highlight/languages.c:265
 msgid "_Maple"
 msgstr "_Maple"
 
-#: ../modules/text-highlight/languages.c:272
+#: ../src/modules/text-highlight/languages.c:270
 msgid "_Matlab"
 msgstr "_Matlab"
 
-#: ../modules/text-highlight/languages.c:277
+#: ../src/modules/text-highlight/languages.c:275
 msgid "_Maya"
 msgstr "_Maya"
 
-#: ../modules/text-highlight/languages.c:282
+#: ../src/modules/text-highlight/languages.c:280
 msgid "_Oberon"
 msgstr "_Oberon"
 
-#: ../modules/text-highlight/languages.c:287
+#: ../src/modules/text-highlight/languages.c:285
 msgid "_Objective C"
 msgstr "_Objective C"
 
-#: ../modules/text-highlight/languages.c:293
+#: ../src/modules/text-highlight/languages.c:291
 msgid "_OCaml"
 msgstr "_OCaml"
 
-#: ../modules/text-highlight/languages.c:298
+#: ../src/modules/text-highlight/languages.c:296
 msgid "_Octave"
 msgstr "_Octave"
 
-#: ../modules/text-highlight/languages.c:303
+#: ../src/modules/text-highlight/languages.c:301
 msgid "_Object Script"
 msgstr "_Object Script"
 
-#: ../modules/text-highlight/languages.c:308
+#: ../src/modules/text-highlight/languages.c:306
 msgid "_Pascal"
 msgstr "_Pascal"
 
-#: ../modules/text-highlight/languages.c:313
+#: ../src/modules/text-highlight/languages.c:311
 msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
-#: ../modules/text-highlight/languages.c:318
+#: ../src/modules/text-highlight/languages.c:316
 msgid "_Prolog"
 msgstr "_Prolog"
 
-#: ../modules/text-highlight/languages.c:323
+#: ../src/modules/text-highlight/languages.c:321
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:328
+#: ../src/modules/text-highlight/languages.c:326
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../src/modules/text-highlight/languages.c:331
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../src/modules/text-highlight/languages.c:336
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:344
+#: ../src/modules/text-highlight/languages.c:342
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../src/modules/text-highlight/languages.c:347
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
-#: ../modules/vcard-inline/e-mail-part-vcard.c:187
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../src/modules/vcard-inline/e-mail-part-vcard.c:188
 msgid "Show F_ull vCard"
 msgstr "Näytä koko _vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
-#: ../modules/vcard-inline/e-mail-part-vcard.c:192
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../src/modules/vcard-inline/e-mail-part-vcard.c:193
 msgid "Show Com_pact vCard"
 msgstr "Näytä tiivistetty vCar_d"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:165
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:163
 msgid "Save _To Addressbook"
 msgstr "Tallenna _osoitekirjaan"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:187
 msgid "There is one other contact."
 msgstr "Löytyi yksi muu yhteystieto."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:194
+#. Translators: This will always be two or more.
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:192
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Löytyi %d muu yhteystieto."
 msgstr[1] "Löytyi %d muuta yhteystietoa."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:220
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:218
 #, fuzzy
 msgid "Addressbook Contact"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:221
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:219
 msgid "Display the part as an addressbook contact"
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:126
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:169
 msgid "_Do not show this message again."
 msgstr "Älä _näytä tätä viestiä uudestaan."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:490
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:570
+#: ../src/plugins/templates/templates.c:488
 msgid "Keywords"
 msgstr "Avainsanat"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Message has no attachments"
 msgstr "Viestissä ei ole liitteitä"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -23676,59 +24698,59 @@ msgstr ""
 "Evolution löysi joitain avainsanoja, joista ohjelma päätteli että tämän "
 "viestin pitäisi sisältää liitetiedosto, mutta liitettä ei ole lisätty."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
 msgstr "_Lisää liite..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "_Muokkaa viestiä"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../src/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
 msgstr "Liitemuistuttaja"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+#: ../src/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Muistuttaa, jos unohdit lisätä liitteen viestiin."
 
-#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+#: ../src/plugins/bbdb/bbdb.c:735 ../src/plugins/bbdb/bbdb.c:846
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:739
+#: ../src/plugins/bbdb/bbdb.c:750
 msgid "Create _address book entries when sending mails"
 msgstr "Lisää lähettäjä _osoitekirjaan lähetettäessä viestejä"
 
-#: ../plugins/bbdb/bbdb.c:749
+#: ../src/plugins/bbdb/bbdb.c:760
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:769
+#: ../src/plugins/bbdb/bbdb.c:780
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:784
+#: ../src/plugins/bbdb/bbdb.c:795
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Yhdistä yhteystiedot ja kuvat Pidginin tuttavalistasta"
 
-#: ../plugins/bbdb/bbdb.c:794
+#: ../src/plugins/bbdb/bbdb.c:805
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:810
+#: ../src/plugins/bbdb/bbdb.c:821
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _tuttavalistasta"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
@@ -23741,132 +24763,138 @@ msgstr ""
 "Lisää nimet ja sähköpostiosoitteet automaattisesti osoitekirjaan, kun "
 "vastaat viesteihin. Liittää myös IM-yhteystiedot tuttavalistoiltasi."
 
-#: ../plugins/dbx-import/dbx-importer.c:278
+#: ../src/plugins/dbx-import/dbx-importer.c:274
 msgid "Importing Outlook Express data"
 msgstr "Tuodaan Outlook Expressin tietoja"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
 msgid "Outlook DBX import"
 msgstr "Outlook DBX -tuonti"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook Express 5/6 -henkilökohtaiset kansiot (.dbx)"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Tuodaan Outlook Express -viestejä DBX-tiedostosta"
 
-#: ../plugins/email-custom-header/email-custom-header.c:293
+#: ../src/plugins/email-custom-header/email-custom-header.c:291
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Turvallisuus:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../src/plugins/email-custom-header/email-custom-header.c:295
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../src/plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Luokittelematon"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../src/plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Suojattu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../src/plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../src/plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:302
+#: ../src/plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Erittäin salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:362
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from 
Composer,
+#. * indicating the header will not be added to a mail message
+#: ../src/plugins/email-custom-header/email-custom-header.c:360
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../plugins/email-custom-header/email-custom-header.c:539
+#: ../src/plugins/email-custom-header/email-custom-header.c:537
 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
-#: ../plugins/email-custom-header/email-custom-header.c:809
+#: ../src/plugins/email-custom-header/email-custom-header.c:807
+#, fuzzy
+#| msgid ""
+#| "The format for specifying a Custom Header key value is:\n"
+#| "Name of the Custom Header key values separated by \";\"."
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
+"Name of the Custom Header key values separated by “;”."
 msgstr ""
 "Omien otsakeavainten määrittelyssä käytetty muoto on seuraava:\n"
 "Omien otsakenimien avainarvot eroteltuna merkillä \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:862
+#: ../src/plugins/email-custom-header/email-custom-header.c:860
 msgid "Key"
 msgstr "Avaimet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:499
+#: ../src/plugins/email-custom-header/email-custom-header.c:877
+#: ../src/plugins/templates/templates.c:497
 msgid "Values"
 msgstr "Arvot"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
 msgid "Custom Header"
 msgstr "Omat otsakkeet"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to 
specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr "Lisää oma otsake lähteviin viesteihin."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "Omat sähköpostiotsakkeet"
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../src/plugins/external-editor/external-editor.c:111
 msgid "Command to be executed to launch the editor: "
 msgstr "Ulkoisen muokkaimen käynnistyskomento: "
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../src/plugins/external-editor/external-editor.c:112
 #, fuzzy
 msgid ""
-"For XEmacs use \"xemacs\"\n"
-"For Vim use \"gvim -f\""
+"For XEmacs use “xemacs”\n"
+"For Vim use “gvim -f”"
 msgstr ""
 "Emacsia varten käytä arvoa \"xemacs\"\n"
 "VI:tä varten käytä arvoa \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:124
+#: ../src/plugins/external-editor/external-editor.c:122
 msgid "_Automatically launch when a new mail is edited"
 msgstr "Käynnistä _automaattisesti, kun uutta viestiä on muokattu"
 
-#: ../plugins/external-editor/external-editor.c:437
-#: ../plugins/external-editor/external-editor.c:439
+#: ../src/plugins/external-editor/external-editor.c:453
+#: ../src/plugins/external-editor/external-editor.c:455
 msgid "Compose in External Editor"
 msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#: ../src/plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "Ulkoinen muokkain"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#: ../src/plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
 msgstr "Kirjoita tekstimuotoiset viestit ulkoisessa muokkaimessa."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Editor not launchable"
 msgstr "Muokkainta ei voi käynnistää"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -23874,11 +24902,11 @@ msgstr ""
 "Lisäosien asetuksissa määriteltyä ulkoista muokkainta ei voi käynnistää. "
 "Yritä käyttää muuta komentoa."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid "Cannot create Temporary File"
 msgstr "Väliaikaista tiedostoa ei voi luoda"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -23886,11 +24914,11 @@ msgstr ""
 "Evolution ei voinut luoda väliaikaistiedostoa viestin tallentamiseksi. Yritä "
 "myöhemmin uudestaan."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr "Ulkoinen muokkain on edelleen käynnissä"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
@@ -23898,160 +24926,169 @@ msgstr ""
 "Ulkoinen muokkain on vielä käynnissä. Viestin lähetysikkunaa ei voi sulkea "
 "ennen kuin ulkoinen muokkain on käynnissä."
 
-#: ../plugins/face/face.c:294
+#: ../src/plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "Valitse kasvokuva"
 
-#: ../plugins/face/face.c:304
+#: ../src/plugins/face/face.c:302
 msgid "Image files"
 msgstr "Kuvatiedostot"
 
-#: ../plugins/face/face.c:392
+#: ../src/plugins/face/face.c:390
 msgid "_Insert Face picture by default"
 msgstr "_Lisää kasvokuva oletuksena"
 
-#: ../plugins/face/face.c:405
+#: ../src/plugins/face/face.c:403
 msgid "Load new _Face picture"
 msgstr "Lataa uusi _kasvokuva"
 
-#: ../plugins/face/face.c:449
+#: ../src/plugins/face/face.c:447
 msgid "Change Face Image"
 msgstr "Muuta kasvokuvaa"
 
-#: ../plugins/face/face.c:537
+#: ../src/plugins/face/face.c:535
 msgid "Include _Face"
 msgstr "Sisällytä _kasvokuva"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../src/plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr "Lisää lähteviin viesteihin pieni kuva kasvoistasi."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:1
+#: ../src/plugins/face/org-gnome-face.error.xml.h:1
 msgid "Failed Read"
 msgstr "Luku epäonnistui"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:2
+#: ../src/plugins/face/org-gnome-face.error.xml.h:2
 msgid "The file cannot be read"
 msgstr "Tiedostoa ei voi lukea"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:3
+#: ../src/plugins/face/org-gnome-face.error.xml.h:3
 msgid "Invalid Image Size"
 msgstr "Virheellinen kuvakoko"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:4
+#: ../src/plugins/face/org-gnome-face.error.xml.h:4
+#, fuzzy
+#| msgid ""
+#| "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+#| "exceed 723 bytes."
 msgid ""
-"Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+"Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t "
 "exceed 723 bytes."
 msgstr ""
 "Valitse PNG-kuva kokoa 48 * 48 pikseliä, jonka koko ei ylitä 723 tavua."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:5
+#: ../src/plugins/face/org-gnome-face.error.xml.h:5
 msgid "Incorrect Face Image Byte Size"
 msgstr ""
 
-#: ../plugins/face/org-gnome-face.error.xml.h:6
+#: ../src/plugins/face/org-gnome-face.error.xml.h:6
+#, fuzzy
+#| msgid ""
+#| "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+#| "exceed 723 bytes."
 msgid ""
 "The Face image size is {0} bytes, while it should not be more than 723 "
-"bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
-"doesn't exceed 723 bytes."
+"bytes. Please select a PNG image of size 48 × 48 pixels, whose file size "
+"doesn’t exceed 723 bytes."
 msgstr ""
+"Valitse PNG-kuva kokoa 48 * 48 pikseliä, jonka koko ei ylitä 723 tavua."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:7
+#: ../src/plugins/face/org-gnome-face.error.xml.h:7
 msgid "Not an image"
 msgstr "Tiedosto ei ole kuvatiedosto"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:8
+#: ../src/plugins/face/org-gnome-face.error.xml.h:8
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "Valittu tiedosto ei näytä kelvolliselta png-kuvalta. Virhe: {0}"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:413
 msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "Get an archive of the list this message belongs to"
 msgstr "Nouda arkisto viestin sisältämästä postituslistasta"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:420
 #, fuzzy
 #| msgid "_Message Source"
 msgid "Copy _Message Archive URL"
 msgstr "_Viestin lähdekoodi"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:422
 #, fuzzy
 #| msgid "Redirect (bounce) the selected message to someone"
 msgid "Copy direct URL for the selected message in its archive"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:429
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:427
 msgid "Get List _Usage Information"
 msgstr "Näytä tietoja listan _käytöstä"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:429
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Nouda tietoja viestin sisältämän postituslistan käytöstä"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:436
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:434
 msgid "Contact List _Owner"
 msgstr "Ota yhteyttä listan _omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:438
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:436
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Ota yhteyttä viestin sisältämän sähköpostilistan omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:443
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:441
 msgid "_Post Message to List"
 msgstr "_Lähetä viesti listalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:445
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:443
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Kirjoita vastaus viestin sisältämälle sähköpostilistalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:450
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:448
 msgid "_Subscribe to List"
 msgstr "_Tilaa lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:452
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:450
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Tilaa viestin sisältämä postituslista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:457
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:455
 msgid "_Unsubscribe from List"
 msgstr "Per_u listan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:459
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:457
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Peru viestin sisältämän postituslistan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:466
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:464
 msgid "Mailing _List"
 msgstr "Postitus_lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Mailing List Actions"
 msgstr "Postituslistan toiminnot"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr "Suorita yleisimpiä postituslistan komentoja (tilaa, peru tilaus...)."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "Toiminto ei käytettävissä"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
 "This message does not contain the header information required for this "
 "action."
 msgstr ""
 "Tämä viesti ei sisällä otsaketietoja, jotka vaaditaan tähän toimenpiteeseen."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 msgid "Posting not allowed"
 msgstr "Postitus ei ole sallittu"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
@@ -24059,13 +25096,20 @@ msgstr ""
 "Tälle sähköpostilistalle lähetys ei ole sallittu. Voi olla että tämä on vain "
 "luettavissa oleva sähköpostilista. Kysy lisätietoja listan omistajalta."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
 msgstr "Lähetä sähköpostiviesti listalle?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#, fuzzy
+#| msgid ""
+#| "An e-mail message will be sent to the URL \"{0}\". You can either send "
+#| "the message automatically, or see and change it first.\n"
+#| "\n"
+#| "You should receive an answer from the mailing list shortly after the "
+#| "message has been sent."
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"An e-mail message will be sent to the URL “{0}”. You can either send the "
 "message automatically, or see and change it first.\n"
 "\n"
 "You should receive an answer from the mailing list shortly after the message "
@@ -24077,19 +25121,19 @@ msgstr ""
 "saat vastauksen sähköpostilistalta vähän sen jälkeen kun viestisi on "
 "lähetetty."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "_Send message"
 msgstr "_Lähetä viesti"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid "_Edit message"
 msgstr "_Muokkaa viestiä"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
 msgid "Malformed header"
 msgstr "Virhe otsakkeen muotoilussa"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -24099,11 +25143,11 @@ msgstr ""
 "\n"
 "Otsake: {1}"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
 msgid "No e-mail action"
 msgstr "Ei sähköpostitoimintoa"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
 "The action could not be performed. The header for this action did not "
 "contain any action that could be processed.\n"
@@ -24115,8 +25159,9 @@ msgstr ""
 "\n"
 "Otsake: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:400
-#: ../plugins/mail-notification/mail-notification.c:436
+#. Translators: '%d' is the count of mails received.
+#: ../src/plugins/mail-notification/mail-notification.c:398
+#: ../src/plugins/mail-notification/mail-notification.c:434
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -24125,117 +25170,127 @@ msgstr[1] "%d uutta viestiä vastaanotettu."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:411
+#: ../src/plugins/mail-notification/mail-notification.c:409
 #, c-format
 msgid "From: %s"
 msgstr "Lähettäjä: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../src/plugins/mail-notification/mail-notification.c:423
 #, c-format
 msgid "Subject: %s"
 msgstr "Aihe: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:442
+#: ../src/plugins/mail-notification/mail-notification.c:440
 msgid "New email in Evolution"
 msgstr "Uusia sähköpostiviestejä Evolutionissa"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:483
+#: ../src/plugins/mail-notification/mail-notification.c:481
 #, c-format
 msgid "Show %s"
 msgstr "Näytä %s"
 
-#: ../plugins/mail-notification/mail-notification.c:687
+#: ../src/plugins/mail-notification/mail-notification.c:685
 msgid "_Play sound when a new message arrives"
 msgstr "_Soita ääni uuden sähköpostin saapuessa"
 
-#: ../plugins/mail-notification/mail-notification.c:719
+#: ../src/plugins/mail-notification/mail-notification.c:717
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../plugins/mail-notification/mail-notification.c:732
+#: ../src/plugins/mail-notification/mail-notification.c:730
 msgid "Use sound _theme"
 msgstr "Käytä ääni_teemaa"
 
-#: ../plugins/mail-notification/mail-notification.c:751
+#: ../src/plugins/mail-notification/mail-notification.c:749
 msgid "Play _file:"
 msgstr "So_ita tiedosto:"
 
-#: ../plugins/mail-notification/mail-notification.c:760
+#: ../src/plugins/mail-notification/mail-notification.c:758
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:837
+#: ../src/plugins/mail-notification/mail-notification.c:835
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistä _vain saapuvien kansiossa"
 
-#: ../plugins/mail-notification/mail-notification.c:853
+#: ../src/plugins/mail-notification/mail-notification.c:851
 msgid "Show _notification when a new message arrives"
 msgstr "Näytä ilmoitus uusien _viestien saapuessa"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "Huomautus uusista viesteistä"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Notifies you when new mail messages arrive."
 msgstr "Huomauttaa uusien viestien saapumisesta."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:196
+#: ../src/plugins/mail-to-task/mail-to-task.c:194
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Luotu sähköpostiviestistä, jonka lähetti %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:561
+#: ../src/plugins/mail-to-task/mail-to-task.c:576
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Peru"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:563
+#: ../src/plugins/mail-to-task/mail-to-task.c:578
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:565
+#: ../src/plugins/mail-to-task/mail-to-task.c:580
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../plugins/mail-to-task/mail-to-task.c:583
-#, c-format
+#: ../src/plugins/mail-to-task/mail-to-task.c:598
+#, fuzzy, c-format
+#| msgid ""
+#| "Selected calendar contains event '%s' already. Would you like to edit the "
+#| "old event?"
 msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
+"Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
 msgstr ""
 "Valittu kalenteri sisältää jo tapahtuman \"%s\". Haluatko muokata aiemmin "
 "lisättyä tapahtumaa?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:586
-#, c-format
+#: ../src/plugins/mail-to-task/mail-to-task.c:601
+#, fuzzy, c-format
+#| msgid ""
+#| "Selected task list contains task '%s' already. Would you like to edit the "
+#| "old task?"
 msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
+"Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
 msgstr ""
 "Valittu tehtävälista sisältää jo tehtävän \"%s\". Haluatko muokata aiemmin "
 "lisättyä tehtävää?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:589
-#, c-format
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
+#, fuzzy, c-format
+#| msgid ""
+#| "Selected memo list contains memo '%s' already. Would you like to edit the "
+#| "old memo?"
 msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
+"Selected memo list contains memo “%s” already. Would you like to edit the "
 "old memo?"
 msgstr ""
 "Valittu muistilappulista sisältää jo muistilapun \"%s\". Haluatko muokata "
 "aiemmin lisättyä muistilappua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:624
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -24246,7 +25301,8 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:631
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -24257,7 +25313,8 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:623
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:638
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -24268,30 +25325,30 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:644
+#: ../src/plugins/mail-to-task/mail-to-task.c:659
 #, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Haluatko ylikirjoittaa?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:720
+#: ../src/plugins/mail-to-task/mail-to-task.c:735
 msgid "[No Summary]"
 msgstr "[Ei yhteenvetoa]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:733
+#: ../src/plugins/mail-to-task/mail-to-task.c:748
 msgid "Invalid object returned from a server"
 msgstr "Palvelin palautti virheellisen olion"
 
-#: ../plugins/mail-to-task/mail-to-task.c:787
+#: ../src/plugins/mail-to-task/mail-to-task.c:802
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Tapahtui virhe käsiteltäessä: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:823
+#: ../src/plugins/mail-to-task/mail-to-task.c:838
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:827
+#: ../src/plugins/mail-to-task/mail-to-task.c:842
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -24299,7 +25356,7 @@ msgstr ""
 "Valittu kalenteri on vain luettavissa, joten et voi luoda siihen tapahtumia. "
 "Valitse jokin toinen kalenteri."
 
-#: ../plugins/mail-to-task/mail-to-task.c:830
+#: ../src/plugins/mail-to-task/mail-to-task.c:845
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create task there. Select other "
@@ -24311,7 +25368,7 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen tehtäviä. "
 "Valitse joku toinen lähde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:833
+#: ../src/plugins/mail-to-task/mail-to-task.c:848
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create memo there. Select other "
@@ -24323,321 +25380,318 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen muistilappuja. "
 "Valitse joku toinen lähde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1231
+#: ../src/plugins/mail-to-task/mail-to-task.c:1252
 msgid "Create an _Appointment"
 msgstr "Luo _tapaaminen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1233
+#: ../src/plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1238
+#: ../src/plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1240
+#: ../src/plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1245
+#: ../src/plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1247
+#: ../src/plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a new task from the selected message"
 msgstr "Luo uusi tehtävä valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1255
+#: ../src/plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1257
+#: ../src/plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid "Convert a mail message to a task."
 msgstr "Muunna valittu viesti tehtäväksi."
 
-#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlookin PST-tuoja"
 
-#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "Tuo Outlook-viestejä PST-tiedostosta"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlookin omat kansiot (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:526
+#: ../src/plugins/pst-import/pst-importer.c:522
 msgid "_Mail"
 msgstr "_Sähköposti"
 
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../src/plugins/pst-import/pst-importer.c:551
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
-#: ../plugins/pst-import/pst-importer.c:565
+#: ../src/plugins/pst-import/pst-importer.c:561
 msgid "_Address Book"
 msgstr "_Osoitekirja"
 
-#: ../plugins/pst-import/pst-importer.c:570
+#: ../src/plugins/pst-import/pst-importer.c:566
 msgid "A_ppointments"
 msgstr "_Tapaamiset"
 
-#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
-msgid "_Tasks"
-msgstr "_Tehtävät"
-
-#: ../plugins/pst-import/pst-importer.c:580
+#: ../src/plugins/pst-import/pst-importer.c:576
 msgid "_Journal entries"
 msgstr "_Päiväkirjamerkinnät"
 
-#: ../plugins/pst-import/pst-importer.c:697
+#: ../src/plugins/pst-import/pst-importer.c:693
 msgid "Importing Outlook data"
 msgstr "Tuodaan tietoja Outlookista"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:140
-#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../src/plugins/publish-calendar/publish-calendar.c:138
+#: ../src/plugins/publish-calendar/publish-calendar.c:145
 msgid "Calendar Publishing"
 msgstr "Kalenterien julkaisu"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Sijainnit"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Publish calendars to the web."
 msgstr "Julkaise kalenterit verkossa."
 
-#: ../plugins/publish-calendar/publish-calendar.c:217
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../src/plugins/publish-calendar/publish-calendar.c:215
+#: ../src/plugins/publish-calendar/publish-calendar.c:482
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ei voitu avata %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../src/plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Virhe julkaistaessa kohteeseen %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:242
+#: ../src/plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Julkaisu kohteeseen %s onnistui"
 
-#: ../plugins/publish-calendar/publish-calendar.c:290
+#: ../src/plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Kohteen %s liittäminen epäonnistui:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:789
+#: ../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.
-#: ../plugins/publish-calendar/publish-calendar.c:1097
+#: ../src/plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../src/plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Julkaise kalenteritietoja"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "Päivittäin"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "Weekly"
 msgstr "Viikoittain"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr "Käsin (Toiminnot-valikon kautta)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "Secure FTP (SFTP)"
 msgstr "Salattu FTP (SFTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "Julkinen FTP"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "FTP (with login)"
 msgstr "FTP (sisäänkirjautumisen vaativa)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "Windows share"
 msgstr "Windows-jako"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Salattu WebDAV (HTTPS)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Custom Location"
 msgstr "Mukautettu sijainti"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "_Publish as:"
 msgstr "_Julkaise muodossa:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "Publishing _Frequency:"
 msgstr "Julkaisu_tiheys:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "_Kesto:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
 msgid "Sources"
 msgstr "Lähteet"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 msgid "Service _type:"
 msgstr "Palvelun _tyyppi:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "_Tiedosto:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "P_ort:"
 msgstr "P_ortti:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Username:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:787
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../src/smime/gui/certificate-manager.c:785
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "Publishing Location"
 msgstr "Julkaisupaikka"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:84
-#: ../plugins/publish-calendar/publish-format-ical.c:104
+#: ../src/plugins/publish-calendar/publish-format-fb.c:82
+#: ../src/plugins/publish-calendar/publish-format-ical.c:102
 #, fuzzy, c-format
-msgid "Invalid source UID '%s'"
+msgid "Invalid source UID “%s”"
 msgstr "Virheellinen kansio: ”%s”"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:544
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
 msgid "New Location"
 msgstr "Uusi sijainti"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:546
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:544
 msgid "Edit Location"
 msgstr "Muokkaa sijaintia"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../src/plugins/save-calendar/csv-format.c:158
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:374
 msgid "Description List"
 msgstr "Kuvauslista"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../src/plugins/save-calendar/csv-format.c:375
 msgid "Categories List"
 msgstr "Luokkalista"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Comment List"
 msgstr "Kommenttilista"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:379
 msgid "Contact List"
 msgstr "Yhteystietolista"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:380
 msgid "Start"
 msgstr "Alkaa"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:381
 msgid "End"
 msgstr "Päättyy"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:382
 msgid "Due"
 msgstr "Erääntyy"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:383
 msgid "percent Done"
 msgstr "prosenttia valmiina"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/save-calendar/csv-format.c:385
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:386
 msgid "Attendees List"
 msgstr "Osanottajalista"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../src/plugins/save-calendar/csv-format.c:388
 msgid "Modified"
 msgstr "Muokattu"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../src/plugins/save-calendar/csv-format.c:561
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV-muodon _lisäasetukset"
 
-#: ../plugins/save-calendar/csv-format.c:571
+#: ../src/plugins/save-calendar/csv-format.c:569
 msgid "Prepend a _header"
 msgstr "Lisää otsake _ennen"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../src/plugins/save-calendar/csv-format.c:578
 msgid "_Value delimiter:"
 msgstr "_Arvojen erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:591
+#: ../src/plugins/save-calendar/csv-format.c:589
 msgid "_Record delimiter:"
 msgstr "_Kenttien erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../src/plugins/save-calendar/csv-format.c:600
 msgid "_Encapsulate values with:"
 msgstr "_Kapsuloi arvot käyttäen:"
 
-#: ../plugins/save-calendar/csv-format.c:628
+#: ../src/plugins/save-calendar/csv-format.c:626
 msgid "Comma separated values (.csv)"
 msgstr "Pilkuin erotetut arvot (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:179
+#: ../src/plugins/save-calendar/ical-format.c:181
+#: ../src/shell/e-shell-utils.c:182
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+#: ../src/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Tallenna valittu"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#: ../src/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save a calendar or task list to disk."
 msgstr "Tallenna kalenteri tai tehtävälista levylle."
 
@@ -24646,105 +25700,109 @@ msgstr "Tallenna kalenteri tai tehtävälista levylle."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../src/plugins/save-calendar/rdf-format.c:145
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:385
+#: ../src/plugins/save-calendar/rdf-format.c:383
 msgid "RDF (.rdf)"
 msgstr "RDF-tiedostot (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:119
+#: ../src/plugins/save-calendar/save-calendar.c:117
 msgid "_Format:"
 msgstr "_Muoto:"
 
-#: ../plugins/save-calendar/save-calendar.c:184
+#: ../src/plugins/save-calendar/save-calendar.c:182
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
-#: ../plugins/save-calendar/save-calendar.c:188
+#: ../src/plugins/save-calendar/save-calendar.c:186
 msgid "_Save As"
 msgstr "_Tallenna nimellä"
 
-#: ../plugins/save-calendar/save-calendar.c:347
+#: ../src/plugins/save-calendar/save-calendar.c:349
 msgid "Save the selected calendar to disk"
 msgstr "Tallenna valittu kalenteri levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:378
+#: ../src/plugins/save-calendar/save-calendar.c:380
 msgid "Save the selected memo list to disk"
 msgstr "Tallenna valittu muistilappu levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:409
+#: ../src/plugins/save-calendar/save-calendar.c:411
 msgid "Save the selected task list to disk"
 msgstr "Tallenna valittu tehtävälista levylle"
 
-#: ../plugins/templates/e-templates-store.c:117
+#: ../src/plugins/templates/e-templates-store.c:115
 msgid "No Title"
 msgstr "Ei otsikkoa"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1286
+#: ../src/plugins/templates/templates.c:1299
 #, fuzzy
 msgid "Saving message template"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../plugins/templates/templates.c:1307
+#: ../src/plugins/templates/templates.c:1320
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../plugins/templates/templates.c:1309
+#: ../src/plugins/templates/templates.c:1322
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
-#: ../shell/e-shell.c:381
+#: ../src/shell/e-shell.c:379
 msgid "Preparing to go offline..."
 msgstr "Valmistellaan verkotonta tilaa..."
 
-#: ../shell/e-shell.c:410
+#: ../src/shell/e-shell.c:408
 msgid "Preparing to go online..."
 msgstr "Valmistellaan verkkoyhteydellistä tilaa..."
 
-#: ../shell/e-shell.c:521
+#: ../src/shell/e-shell.c:519
 msgid "Preparing to quit"
 msgstr "Valmistellaan sulkemista"
 
-#: ../shell/e-shell.c:527
+#: ../src/shell/e-shell.c:525
 msgid "Preparing to quit..."
 msgstr "Valmistellaan sulkemista..."
 
-#: ../shell/e-shell.c:1044
+#: ../src/shell/e-shell.c:926
+#| msgid "_Open Desktop Settings"
+msgid "Open _Settings"
+msgstr "_Avaa asetukset"
+
+#: ../src/shell/e-shell.c:1127
 msgid "Credentials are required to connect to the destination host."
 msgstr ""
 
-#: ../shell/e-shell.c:1212 ../shell/e-shell-window-actions.c:827
+#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:836
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../shell/e-shell.c:1223
-#, fuzzy
+#: ../src/shell/e-shell.c:1308
 #| msgid "_Quick Reference"
 msgid "Quick _Reference"
 msgstr "_Pikaopas"
 
-#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:764
+#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:773
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../shell/e-shell.c:1226 ../shell/e-shell-window-actions.c:862
+#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:871
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
+#: ../src/shell/e-shell-content.c:718 ../src/shell/e-shell-content.c:719
 msgid "Searches"
 msgstr "Haut"
 
-#: ../shell/e-shell-content.c:764
+#: ../src/shell/e-shell-content.c:762
 msgid "Save Search"
 msgstr "Tallenna haku"
 
@@ -24752,37 +25810,37 @@ 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".
-#: ../shell/e-shell-searchbar.c:926
+#: ../src/shell/e-shell-searchbar.c:925
 msgid "Sho_w:"
 msgstr "Nä_ytä:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../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 ]
-#: ../shell/e-shell-searchbar.c:1019
+#: ../src/shell/e-shell-searchbar.c:1018
 msgid "i_n"
 msgstr "lä_hteestä"
 
-#: ../shell/e-shell-utils.c:176
+#: ../src/shell/e-shell-utils.c:179
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:200
+#: ../src/shell/e-shell-utils.c:205
 msgid "All Files (*)"
 msgstr "Kaikki tiedostot (*)"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-utils.c:409
+#: ../src/shell/e-shell-utils.c:419
 msgid "translator-credits"
 msgstr ""
-"Jiri Grönroos, 2012-2016\n"
+"Jiri Grönroos, 2012-2017\n"
 "Ilkka Tuohela, 2002-2009\n"
 "Timo Jyrinki, 2008\n"
 "Sami Pesonen, 2001-2003\n"
@@ -24807,289 +25865,302 @@ msgstr ""
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
 "  papukaija https://launchpad.net/~papukaija";
 
-#: ../shell/e-shell-utils.c:420
+#: ../src/shell/e-shell-utils.c:430
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../shell/e-shell-view.c:292
+#: ../src/shell/e-shell-view.c:290
 msgid "Saving user interface state"
 msgstr "Tallennetaan käyttöliittymän tilaa"
 
-#: ../shell/e-shell-window-actions.c:277
+#: ../src/shell/e-shell-window-actions.c:275
 msgid "Categories Editor"
 msgstr "Luokkamuokkain"
 
-#: ../shell/e-shell-window-actions.c:585
+#: ../src/shell/e-shell-window-actions.c:594
 msgid "Bug Buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../shell/e-shell-window-actions.c:586
+#: ../src/shell/e-shell-window-actions.c:595
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../shell/e-shell-window-actions.c:766
+#: ../src/shell/e-shell-window-actions.c:775
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../shell/e-shell-window-actions.c:771 ../shell/e-shell-window-actions.c:785
+#: ../src/shell/e-shell-window-actions.c:780
+#: ../src/shell/e-shell-window-actions.c:794
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../shell/e-shell-window-actions.c:792
+#: ../src/shell/e-shell-window-actions.c:801
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../shell/e-shell-window-actions.c:794
+#: ../src/shell/e-shell-window-actions.c:803
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin käyttäjäopas"
 
-#: ../shell/e-shell-window-actions.c:820
+#: ../src/shell/e-shell-window-actions.c:829
 msgid "I_mport..."
 msgstr "_Tuo..."
 
-#: ../shell/e-shell-window-actions.c:822
+#: ../src/shell/e-shell-window-actions.c:831
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../shell/e-shell-window-actions.c:829
+#: ../src/shell/e-shell-window-actions.c:838
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tälle näkymälle"
 
-#: ../shell/e-shell-window-actions.c:841
+#: ../src/shell/e-shell-window-actions.c:850
 msgid "Available Cate_gories"
 msgstr "Käytettävissä olevat _luokat"
 
-#: ../shell/e-shell-window-actions.c:843
+#: ../src/shell/e-shell-window-actions.c:852
 msgid "Manage available categories"
 msgstr "Hallitse käytettävissä olevia luokkia"
 
-#: ../shell/e-shell-window-actions.c:855
+#: ../src/shell/e-shell-window-actions.c:864
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ../shell/e-shell-window-actions.c:857
-msgid "Show Evolution's shortcut keys"
+#: ../src/shell/e-shell-window-actions.c:866
+#| msgid "Show Evolution's shortcut keys"
+msgid "Show Evolution’s shortcut keys"
 msgstr "Näytä Evolutionin pikanäppäimet"
 
-#: ../shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:873
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../shell/e-shell-window-actions.c:869
+#: ../src/shell/e-shell-window-actions.c:878
 msgid "_Advanced Search..."
 msgstr "_Oma haku..."
 
-#: ../shell/e-shell-window-actions.c:871
+#: ../src/shell/e-shell-window-actions.c:880
 msgid "Construct a more advanced search"
 msgstr "Luo monimutkaisempi haku"
 
-#: ../shell/e-shell-window-actions.c:878
+#: ../src/shell/e-shell-window-actions.c:887
 msgid "Clear the current search parameters"
 msgstr "Tyhjennä nykyiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:883
+#: ../src/shell/e-shell-window-actions.c:892
 msgid "_Edit Saved Searches..."
 msgstr "_Muokkaa tallennettuja hakuja..."
 
-#: ../shell/e-shell-window-actions.c:885
+#: ../src/shell/e-shell-window-actions.c:894
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:901
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../src/shell/e-shell-window-actions.c:906
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../shell/e-shell-window-actions.c:899
+#: ../src/shell/e-shell-window-actions.c:908
 msgid "Execute the current search parameters"
 msgstr "Suorita tämänhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:904
+#: ../src/shell/e-shell-window-actions.c:913
 msgid "_Save Search..."
 msgstr "_Tallenna haku..."
 
-#: ../shell/e-shell-window-actions.c:906
+#: ../src/shell/e-shell-window-actions.c:915
 msgid "Save the current search parameters"
 msgstr "Tallenna tämänhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:918
+#: ../src/shell/e-shell-window-actions.c:927
 msgid "Submit _Bug Report..."
 msgstr "Lähetä _vikailmoitus..."
 
-#: ../shell/e-shell-window-actions.c:920
+#: ../src/shell/e-shell-window-actions.c:929
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../src/shell/e-shell-window-actions.c:934
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:927
+#: ../src/shell/e-shell-window-actions.c:936
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:932
+#: ../src/shell/e-shell-window-actions.c:941
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:934
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:962
+#: ../src/shell/e-shell-window-actions.c:971
 msgid "Lay_out"
 msgstr "_Asettelu"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../shell/e-shell-window-actions.c:970
+#: ../src/shell/e-shell-window-actions.c:979
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../shell/e-shell-window-actions.c:977
+#: ../src/shell/e-shell-window-actions.c:986
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../shell/e-shell-window-actions.c:984
+#: ../src/shell/e-shell-window-actions.c:993
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../shell/e-shell-window-actions.c:998
+#: ../src/shell/e-shell-window-actions.c:1007
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1027
+#: ../src/shell/e-shell-window-actions.c:1036
+#| msgid "Show _Status Bar"
+msgid "Show _Menu Bar"
+msgstr "Näytä _valikkopalkki"
+
+#: ../src/shell/e-shell-window-actions.c:1038
+#| msgid "Show the side bar"
+msgid "Show the menu bar"
+msgstr "Näytä valikkopalkki"
+
+#: ../src/shell/e-shell-window-actions.c:1044
 msgid "Show Side _Bar"
 msgstr "Näytä sivu_palkki"
 
-#: ../shell/e-shell-window-actions.c:1029
+#: ../src/shell/e-shell-window-actions.c:1046
 msgid "Show the side bar"
 msgstr "Näytä sivupalkki"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../src/shell/e-shell-window-actions.c:1052
 msgid "Show _Buttons"
 msgstr "Näytä _painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:1054
 msgid "Show the switcher buttons"
 msgstr "Näytä vaihtimen painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1043
+#: ../src/shell/e-shell-window-actions.c:1060
 msgid "Show _Status Bar"
 msgstr "Näytä _tilarivi"
 
-#: ../shell/e-shell-window-actions.c:1045
+#: ../src/shell/e-shell-window-actions.c:1062
 msgid "Show the status bar"
 msgstr "Näytä tilarivi"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show _Tool Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../shell/e-shell-window-actions.c:1053
+#: ../src/shell/e-shell-window-actions.c:1070
 msgid "Show the tool bar"
 msgstr "Näytä työkalurivi"
 
-#: ../shell/e-shell-window-actions.c:1075
+#: ../src/shell/e-shell-window-actions.c:1092
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../shell/e-shell-window-actions.c:1077
+#: ../src/shell/e-shell-window-actions.c:1094
 msgid "Display window buttons with icons only"
 msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
 
-#: ../shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1099
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../shell/e-shell-window-actions.c:1084
+#: ../src/shell/e-shell-window-actions.c:1101
 msgid "Display window buttons with text only"
 msgstr "Näytä ikkunan napit ainoastaan tekstinä"
 
-#: ../shell/e-shell-window-actions.c:1089
+#: ../src/shell/e-shell-window-actions.c:1106
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../shell/e-shell-window-actions.c:1091
+#: ../src/shell/e-shell-window-actions.c:1108
 msgid "Display window buttons with icons and text"
 msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
 
-#: ../shell/e-shell-window-actions.c:1096
+#: ../src/shell/e-shell-window-actions.c:1113
 msgid "Tool_bar Style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../shell/e-shell-window-actions.c:1098
+#: ../src/shell/e-shell-window-actions.c:1115
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Näytä ikkunan napit työpöydän työkalupalkin asetuksen mukaisesti"
 
-#: ../shell/e-shell-window-actions.c:1106
+#: ../src/shell/e-shell-window-actions.c:1123
 msgid "Delete Current View"
 msgstr "Poista nykyinen näkymä"
 
-#: ../shell/e-shell-window-actions.c:1113
+#: ../src/shell/e-shell-window-actions.c:1130
 msgid "Save Custom View..."
 msgstr "Tallenna oma näkymä..."
 
-#: ../shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1132
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu näkymä"
 
-#: ../shell/e-shell-window-actions.c:1122
+#: ../src/shell/e-shell-window-actions.c:1139
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../shell/e-shell-window-actions.c:1132
+#: ../src/shell/e-shell-window-actions.c:1149
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../shell/e-shell-window-actions.c:1134
+#: ../src/shell/e-shell-window-actions.c:1151
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../shell/e-shell-window-actions.c:1142
+#: ../src/shell/e-shell-window-actions.c:1159
 msgid "Page Set_up..."
 msgstr "_Sivun asetukset..."
 
-#: ../shell/e-shell-window-actions.c:1144
+#: ../src/shell/e-shell-window-actions.c:1161
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../src/shell/e-shell-window-actions.c:1530
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../shell/e-shell-window-actions.c:1630
+#: ../src/shell/e-shell-window-actions.c:1653
 #, c-format
 msgid "Select view: %s"
 msgstr "Valitse näkymä: %s"
 
-#: ../shell/e-shell-window-actions.c:1647
+#: ../src/shell/e-shell-window-actions.c:1670
 #, c-format
 msgid "Delete view: %s"
 msgstr "Poista näkymä: %s"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../src/shell/e-shell-window-actions.c:1771
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../shell/e-shell-window.c:567
+#: ../src/shell/e-shell-window.c:563
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Uusi"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:632
+#: ../src/shell/e-shell-window-private.c:720
 #, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#| msgid "%s - Evolution"
+msgid "%s — Evolution"
+msgstr "%s — Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../src/shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25125,7 +26196,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:219
+#: ../src/shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -25133,54 +26204,58 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:225
+#: ../src/shell/main.c:225
 msgid "Do not tell me again"
 msgstr "Älä kerro tätä uudestaan"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:314
+#: ../src/shell/main.c:314
+#, fuzzy
+#| msgid ""
+#| "Start Evolution showing the specified component. Available options are "
+#| "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgid ""
 "Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+"“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
 msgstr ""
 "Käynnistä Evolution näyttäen tiettyä näkymää. Käytettävissä olevat valinnat "
 "ovat 'mail', 'calendar', 'contacts', 'tasks' ja 'memos'"
 
-#: ../shell/main.c:318
+#: ../src/shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../shell/main.c:322
+#: ../src/shell/main.c:322
 msgid "Start in online mode"
 msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../shell/main.c:324
+#: ../src/shell/main.c:324
 msgid "Ignore network availability"
 msgstr "Älä kiinnitä huomiota, onko verkko käytettävissä vai ei"
 
-#: ../shell/main.c:327
+#: ../src/shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Sammuta Evolution väkisin"
 
-#: ../shell/main.c:330
+#: ../src/shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään lisäosia."
 
-#: ../shell/main.c:332
+#: ../src/shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
 
-#: ../shell/main.c:336
+#: ../src/shell/main.c:336
 #, fuzzy
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Tuo argumentteina annettavat URI-osoitteet tai tiedostot."
 
-#: ../shell/main.c:338
+#: ../src/shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "Pyydä käynnissä olevaa Evolution-prosessia lopettamaan"
 
-#: ../shell/main.c:415
+#: ../src/shell/main.c:415
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -25189,33 +26264,35 @@ msgstr ""
 "Evolutionin käynnistäminen epäonnistui. Toinen Evolution-istunto saattaa "
 "olla reagoimaton. Järjestelmävirhe: %s"
 
-#: ../shell/main.c:469 ../shell/main.c:474
-msgid "- The Evolution PIM and Email Client"
+#: ../src/shell/main.c:466 ../src/shell/main.c:471
+#, fuzzy
+#| msgid "- The Evolution PIM and Email Client"
+msgid "— The Evolution PIM and Email Client"
 msgstr "- Evolution, henkilökohtaisten tietojen hallinta sekä sähköposti"
 
-#: ../shell/main.c:536
+#: ../src/shell/main.c:533
 #, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
-#: ../shell/main.c:542
+#: ../src/shell/main.c:539
 #, fuzzy, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
-#: ../shell/shell.error.xml.h:2
+#: ../src/shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
 msgstr "Päivitys edellisestä versiosta epäonnistui:"
 
-#: ../shell/shell.error.xml.h:3
+#: ../src/shell/shell.error.xml.h:3
 msgid ""
 "{0}\n"
 "\n"
@@ -25226,19 +26303,19 @@ msgstr ""
 "\n"
 "Jos päätät jatkaa, et ehkä pääse käsiksi joihinkin vanhoista tiedoistasi.\n"
 
-#: ../shell/shell.error.xml.h:7
+#: ../src/shell/shell.error.xml.h:7
 msgid "Continue Anyway"
 msgstr "Jatka silti"
 
-#: ../shell/shell.error.xml.h:8
+#: ../src/shell/shell.error.xml.h:8
 msgid "Quit Now"
 msgstr "Lopeta nyt"
 
-#: ../shell/shell.error.xml.h:9
+#: ../src/shell/shell.error.xml.h:9
 msgid "Cannot upgrade directly from version {0}"
 msgstr "Versiosta {0} ei voi päivittää suoraan"
 
-#: ../shell/shell.error.xml.h:10
+#: ../src/shell/shell.error.xml.h:10
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
 "a workaround you might try first upgrading to Evolution 2, and then "
@@ -25247,120 +26324,124 @@ msgstr ""
 "Evolution ei enää tue päivittämistä suoraan versiosta {0}. Kiertokeinona "
 "voit kokeilla päivittää ensin Evolutionin versioon 2 ja sitten versioon 3."
 
-#: ../shell/shell.error.xml.h:11
+#: ../src/shell/shell.error.xml.h:11
 #, fuzzy
 #| msgid "Unknown background operation"
 msgid "Close Evolution with pending background operations?"
 msgstr "Tuntematon taustatoiminto"
 
-#: ../shell/shell.error.xml.h:12
+#: ../src/shell/shell.error.xml.h:12
 msgid ""
 "Evolution is taking a long time to shut down, possibly due to network "
 "connectivity issues. Would you like to cancel all pending operations and "
 "close immediately, or keep waiting?"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:13
+#: ../src/shell/shell.error.xml.h:13
 msgid "_Close Immediately"
 msgstr "_Sulje välittömästi"
 
-#: ../shell/shell.error.xml.h:14
+#: ../src/shell/shell.error.xml.h:14
 msgid "Keep _Waiting"
 msgstr "Jatka _odottamista"
 
-#: ../shell/shell.error.xml.h:15
+#: ../src/shell/shell.error.xml.h:15
 #, fuzzy
 #| msgid "Unable to open address book '{0}'"
-msgid "Failed to get values from '{0}'"
+msgid "Failed to get values from “{0}”"
 msgstr "Osoitekirjan '{0}' avaaminen epäonnistui"
 
-#: ../shell/shell.error.xml.h:16
+#: ../src/shell/shell.error.xml.h:16
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
-msgid "Failed to invoke authenticate for '{0}'"
+msgid "Failed to invoke authenticate for “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../shell/shell.error.xml.h:17
+#: ../src/shell/shell.error.xml.h:17
 #, fuzzy
-msgid "Failed to connect '{0}'"
+msgid "Failed to connect “{0}”"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
-#: ../shell/shell.error.xml.h:18
+#: ../src/shell/shell.error.xml.h:18
 msgid "_Reconnect"
 msgstr "_Yhdistä uudelleen"
 
-#: ../shell/shell.error.xml.h:19
+#: ../src/shell/shell.error.xml.h:19
 #, fuzzy
 #| msgid "Unable to open address book '{0}'"
-msgid "Failed to connect address book '{0}'"
+msgid "Failed to connect address book “{0}”"
 msgstr "Osoitekirjan '{0}' avaaminen epäonnistui"
 
-#: ../shell/shell.error.xml.h:20
+#: ../src/shell/shell.error.xml.h:20
 #, fuzzy
 #| msgid "Failed to load the calendar '%s' (%s)"
-msgid "Failed to connect calendar '{0}'"
+msgid "Failed to connect calendar “{0}”"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
-#: ../shell/shell.error.xml.h:21
+#: ../src/shell/shell.error.xml.h:21
 #, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
-msgid "Failed to connect mail account '{0}'"
+msgid "Failed to connect mail account “{0}”"
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
-#: ../shell/shell.error.xml.h:22
+#: ../src/shell/shell.error.xml.h:22
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
-msgid "Failed to connect memo list '{0}'"
+msgid "Failed to connect memo list “{0}”"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../shell/shell.error.xml.h:23
+#: ../src/shell/shell.error.xml.h:23
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
-msgid "Failed to connect task list '{0}'"
+msgid "Failed to connect task list “{0}”"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../shell/shell.error.xml.h:24
+#: ../src/shell/shell.error.xml.h:24
 #, fuzzy
 #| msgid "Failed to load the calendar '%s' (%s)"
-msgid "Failed to prompt for credentials for '{0}'"
+msgid "Failed to prompt for credentials for “{0}”"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
-#: ../shell/shell.error.xml.h:25
-msgid "Failed to finish trust prompt for '{0}'"
+#: ../src/shell/shell.error.xml.h:25
+msgid "Failed to finish trust prompt for “{0}”"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:26
-msgid "SSL certificate for '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:26
+msgid "SSL certificate for “{0}” is not trusted."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:27
+#: ../src/shell/shell.error.xml.h:27
 msgid "Reason: {1}"
 msgstr "Syy: {1}"
 
-#: ../shell/shell.error.xml.h:29
-msgid "SSL certificate for address book '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:29
+msgid "SSL certificate for address book “{0}” is not trusted."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:30
-msgid "SSL certificate for calendar '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:30
+msgid "SSL certificate for calendar “{0}” is not trusted."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:31
-msgid "SSL certificate for mail account '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:31
+msgid "SSL certificate for mail account “{0}” is not trusted."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:32
-msgid "SSL certificate for memo list '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:32
+msgid "SSL certificate for memo list “{0}” is not trusted."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:33
-msgid "SSL certificate for task list '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:33
+msgid "SSL certificate for task list “{0}” is not trusted."
 msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:106
-#, c-format
+#: ../src/smime/gui/ca-trust-dialog.c:104
+#, fuzzy, c-format
+#| msgid ""
+#| "Certificate '%s' is a CA certificate.\n"
+#| "\n"
+#| "Edit trust settings:"
 msgid ""
-"Certificate '%s' is a CA certificate.\n"
+"Certificate “%s” is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
 msgstr ""
@@ -25368,70 +26449,82 @@ msgstr ""
 "\n"
 "Muokkaa luotettavuusasetuksia:"
 
-#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:123
+#: ../src/smime/gui/certificate-manager.c:82
+#: ../src/smime/gui/certificate-manager.c:101
+#: ../src/smime/gui/certificate-manager.c:121
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
+#: ../src/smime/gui/certificate-manager.c:83
+#: ../src/smime/gui/certificate-manager.c:103
 msgid "Issued To Organization"
 msgstr "Myönnetty organisaatiolle"
 
-#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:84
+#: ../src/smime/gui/certificate-manager.c:104
 msgid "Issued To Organizational Unit"
 msgstr "Myönnetty organisaatioyksikölle"
 
-#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../src/smime/gui/certificate-manager.c:85
+#: ../src/smime/gui/certificate-manager.c:105
+#: ../src/smime/gui/certificate-manager.c:123
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../src/smime/gui/certificate-manager.c:86
+#: ../src/smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:124
 msgid "Purposes"
 msgstr "Käyttötarkoitus"
 
-#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../src/smime/gui/certificate-manager.c:87
+#: ../src/smime/gui/certificate-manager.c:107
+#: ../src/smime/gui/certificate-manager.c:125
 msgid "Issued By"
 msgstr "Myöntäjä"
 
-#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../src/smime/gui/certificate-manager.c:88
+#: ../src/smime/gui/certificate-manager.c:108
+#: ../src/smime/gui/certificate-manager.c:126
 msgid "Issued By Organization"
 msgstr "Myöntäjäorganisaatio"
 
-#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../src/smime/gui/certificate-manager.c:89
+#: ../src/smime/gui/certificate-manager.c:109
+#: ../src/smime/gui/certificate-manager.c:127
 msgid "Issued By Organizational Unit"
 msgstr "Myöntäjä organisaatioyksikkö"
 
-#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
-#: ../smime/gui/certificate-manager.c:130
+#: ../src/smime/gui/certificate-manager.c:90
+#: ../src/smime/gui/certificate-manager.c:110
+#: ../src/smime/gui/certificate-manager.c:128
 msgid "Issued"
 msgstr "Myönnetty"
 
-#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
-#: ../smime/gui/certificate-manager.c:131
+#: ../src/smime/gui/certificate-manager.c:91
+#: ../src/smime/gui/certificate-manager.c:111
+#: ../src/smime/gui/certificate-manager.c:129
 msgid "Expires"
 msgstr "Vanhenemispäivä"
 
-#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
-#: ../smime/gui/certificate-manager.c:132
+#: ../src/smime/gui/certificate-manager.c:92
+#: ../src/smime/gui/certificate-manager.c:112
+#: ../src/smime/gui/certificate-manager.c:130
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-sormenjälki"
 
-#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
-#: ../smime/gui/certificate-manager.c:133
+#: ../src/smime/gui/certificate-manager.c:93
+#: ../src/smime/gui/certificate-manager.c:113
+#: ../src/smime/gui/certificate-manager.c:131
 msgid "MD5 Fingerprint"
 msgstr "MD5-sormenjälki"
 
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:124
+#: ../src/smime/gui/certificate-manager.c:102
+#: ../src/smime/gui/certificate-manager.c:122
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: ../smime/gui/certificate-manager.c:665
+#: ../src/smime/gui/certificate-manager.c:663
 msgid "Select a file to backup your key and certificate..."
 msgstr "Valitse tiedosto varmuuskopioidaksesi avaimesi ja varmenteen..."
 
@@ -25440,47 +26533,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
 #.
-#: ../smime/gui/certificate-manager.c:677
+#: ../src/smime/gui/certificate-manager.c:675
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-varmuuskopio.p12"
 
-#: ../smime/gui/certificate-manager.c:743
+#: ../src/smime/gui/certificate-manager.c:741
 msgid "Backup Certificate"
 msgstr "Varmuuskopioi varmenne"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:757
+#: ../src/smime/gui/certificate-manager.c:755
 msgid "_File name:"
 msgstr "_Tiedostonimi:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:762
+#: ../src/smime/gui/certificate-manager.c:760
 msgid "Please select a file..."
 msgstr "Valitse tiedosto..."
 
-#: ../smime/gui/certificate-manager.c:776
+#: ../src/smime/gui/certificate-manager.c:774
 msgid "_Include certificate chain in the backup"
 msgstr ""
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:782
+#: ../src/smime/gui/certificate-manager.c:780
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:801
+#: ../src/smime/gui/certificate-manager.c:799
 msgid "_Repeat Password:"
 msgstr "_Toista salasana:"
 
-#: ../smime/gui/certificate-manager.c:820
+#: ../src/smime/gui/certificate-manager.c:818
 msgid "Passwords do not match"
 msgstr "Salasanat eivät täsmää"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:828
+#: ../src/smime/gui/certificate-manager.c:826
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -25488,100 +26581,100 @@ msgid ""
 "Please record it in a safe location."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:873
+#: ../src/smime/gui/certificate-manager.c:871
 #, fuzzy
 #| msgid "No email address provided"
 msgid "No file name provided"
 msgstr "Sähköpostiosoitetta ei annettu."
 
-#: ../smime/gui/certificate-manager.c:877
+#: ../src/smime/gui/certificate-manager.c:875
 msgid "Failed to backup key and certificate"
 msgstr "Avaimen ja varmenteen varmuuskopiointi epäonnistui"
 
-#: ../smime/gui/certificate-manager.c:966
+#: ../src/smime/gui/certificate-manager.c:964
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: ../smime/gui/certificate-manager.c:1016
+#: ../src/smime/gui/certificate-manager.c:1014
 msgid "Failed to import certificate"
 msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../smime/gui/certificate-manager.c:1132
+#: ../src/smime/gui/certificate-manager.c:1130
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1134
+#: ../src/smime/gui/certificate-manager.c:1132
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../smime/gui/certificate-manager.c:1136
+#: ../src/smime/gui/certificate-manager.c:1134
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1138
+#: ../src/smime/gui/certificate-manager.c:1136
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1140
+#: ../src/smime/gui/certificate-manager.c:1138
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1142
+#: ../src/smime/gui/certificate-manager.c:1140
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1348
+#: ../src/smime/gui/certificate-manager.c:1346
 #, fuzzy
 #| msgid "Certificate Authority Trust"
 msgid "Change certificate trust"
 msgstr "Varmentajan luottamus"
 
-#: ../smime/gui/certificate-manager.c:1360
+#: ../src/smime/gui/certificate-manager.c:1358
 #, c-format
-msgid "Change trust for the host '%s':"
+msgid "Change trust for the host “%s”:"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1384
+#: ../src/smime/gui/certificate-manager.c:1382
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1385
+#: ../src/smime/gui/certificate-manager.c:1383
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Älä koskaan luota tähän varmenteeseen"
 
-#: ../smime/gui/certificate-manager.c:1386
+#: ../src/smime/gui/certificate-manager.c:1384
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1387
+#: ../src/smime/gui/certificate-manager.c:1385
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1388
+#: ../src/smime/gui/certificate-manager.c:1386
 #, fuzzy
 #| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "V_astausta pyydetty"
 
-#: ../smime/gui/certificate-manager.c:1389
+#: ../src/smime/gui/certificate-manager.c:1387
 #, fuzzy
 #| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "V_astausta pyydetty"
 
-#: ../smime/gui/certificate-manager.c:1393
+#: ../src/smime/gui/certificate-manager.c:1391
 #, fuzzy
 #| msgid ""
 #| "Before trusting this CA for any purpose, you should examine its "
@@ -25593,51 +26686,51 @@ msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../smime/gui/certificate-manager.c:1408
+#: ../src/smime/gui/certificate-manager.c:1406
 msgid "_Display certificate"
 msgstr "_Näytä varmenne"
 
-#: ../smime/gui/certificate-manager.c:1613
+#: ../src/smime/gui/certificate-manager.c:1611
 #, 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:"
 
-#: ../smime/gui/certificate-manager.c:1644
+#: ../src/smime/gui/certificate-manager.c:1642
 #, fuzzy
 #| msgid "_List name:"
 msgid "Host name"
 msgstr "_Listan nimi:"
 
-#: ../smime/gui/certificate-manager.c:1646
+#: ../src/smime/gui/certificate-manager.c:1644
 msgid "Issuer"
 msgstr "Myöntäjä"
 
-#: ../smime/gui/certificate-manager.c:1647
+#: ../src/smime/gui/certificate-manager.c:1645
 msgid "Fingerprint"
 msgstr "Sormenjälki"
 
-#: ../smime/gui/certificate-manager.c:1648
+#: ../src/smime/gui/certificate-manager.c:1646
 msgid "Trust"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1669
+#: ../src/smime/gui/certificate-manager.c:1667
 msgid "_Edit Trust"
 msgstr "_Muokkaa luottamusta"
 
-#: ../smime/gui/certificate-manager.c:2123
+#: ../src/smime/gui/certificate-manager.c:2121
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
-#: ../smime/gui/certificate-manager.c:2140
+#: ../src/smime/gui/certificate-manager.c:2138
 msgid "All email certificate files"
 msgstr "Kaikki sähköpostivarmennetiedostot"
 
-#: ../smime/gui/certificate-manager.c:2157
+#: ../src/smime/gui/certificate-manager.c:2155
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
-#: ../smime/gui/cert-trust-dialog.c:152
+#: ../src/smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -25646,7 +26739,7 @@ msgstr ""
 "Koska luotat varmentajaan, joka myönsi tämän varmenteen, luotat myös tämän "
 "varmenteen oikeellisuuteen, jollei tässä muuten mainita"
 
-#: ../smime/gui/cert-trust-dialog.c:157
+#: ../src/smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -25655,88 +26748,89 @@ msgstr ""
 "Koska et luota varmentajaan, joka myönsi tämän varmenteen, et "
 "automaattisesti luota tähän varmenteeseen, jollei tässä muuten mainita"
 
-#: ../smime/gui/component.c:55
+#: ../src/smime/gui/component.c:53
 #, fuzzy, c-format
 #| msgid "Enter Google password for user '%s'."
-msgid "Enter the password for '%s', token '%s'"
+msgid "Enter the password for “%s”, token “%s”"
 msgstr "Anna käyttäjän '%s' Google-salasana."
 
-#: ../smime/gui/component.c:57
-#, c-format
-msgid "Enter the password for '%s'"
-msgstr ""
+#: ../src/smime/gui/component.c:55
+#, fuzzy, c-format
+#| msgid "Enter Google password for user '%s'."
+msgid "Enter the password for “%s”"
+msgstr "Anna käyttäjän '%s' Google-salasana."
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:85
+#: ../src/smime/gui/component.c:83
 msgid "Enter new password for certificate database"
 msgstr "Syötä uusi salasana varmennetietokannalle"
 
-#: ../smime/gui/component.c:88
+#: ../src/smime/gui/component.c:86
 msgid "Enter new password"
 msgstr "Syötä uusi salasana"
 
-#: ../smime/gui/e-cert-selector.c:180
+#: ../src/smime/gui/e-cert-selector.c:178
 msgid "Select certificate"
 msgstr "Valitse varmenne"
 
-#: ../smime/gui/smime-ui.ui.h:3
+#: ../src/smime/gui/smime-ui.ui.h:1
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Seuraavien organisaatioiden varmenteet varmentavat identiteettisi:"
 
-#: ../smime/gui/smime-ui.ui.h:4
+#: ../src/smime/gui/smime-ui.ui.h:2
 msgid "Certificates Table"
 msgstr "Varmennetaulu"
 
 #. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../src/smime/gui/smime-ui.ui.h:5
 msgid "_Backup"
 msgstr "_Varmuuskopioi"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../src/smime/gui/smime-ui.ui.h:6
 msgid "Backup _All"
 msgstr "Varmuuskopioi _kaikki"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../src/smime/gui/smime-ui.ui.h:9
 msgid "Your Certificates"
 msgstr "Omat varmenteet"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../src/smime/gui/smime-ui.ui.h:10
 msgid "You have certificates on file that identify these people:"
 msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../src/smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Tuttavien varmenteet"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../src/smime/gui/smime-ui.ui.h:13
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Seuraavat varmentajat voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../src/smime/gui/smime-ui.ui.h:14
 msgid "Authorities"
 msgstr "Varmentajat"
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../src/smime/gui/smime-ui.ui.h:15
 msgid "Certificate Authority Trust"
 msgstr "Varmentajan luottamus"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../src/smime/gui/smime-ui.ui.h:19
 #, fuzzy
 msgid "Trust this CA to identify _websites."
 msgstr "Luota tähän CA:han www-sivustojen tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../src/smime/gui/smime-ui.ui.h:20
 #, fuzzy
 msgid "Trust this CA to identify _email users."
 msgstr "Luota tähän CA:han sähköpostikäyttäjien tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../src/smime/gui/smime-ui.ui.h:21
 #, fuzzy
 msgid "Trust this CA to identify _software developers."
 msgstr "Luota tähän CA:han ohjelmistokehittäjien tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../src/smime/gui/smime-ui.ui.h:22
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -25744,155 +26838,105 @@ msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "C_ertificate:"
-msgstr "_Varmenne:"
-
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../src/smime/gui/smime-ui.ui.h:23
 msgid "Email Certificate Trust Settings"
 msgstr "Varmenteen luottamuksen asetukset"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../src/smime/gui/smime-ui.ui.h:24
+msgid "_Edit CA Trust"
+msgstr "_Muokkaa CA:n luottamusta"
+
+#: ../src/smime/gui/smime-ui.ui.h:25
 msgid "Trust the authenticity of this certificate"
 msgstr "Luota tämän varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../src/smime/gui/smime-ui.ui.h:26
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Älä luota tämän varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "_Edit CA Trust"
-msgstr "_Muokkaa CA:n luottamusta"
+#: ../src/smime/gui/smime-ui.ui.h:29
+msgid "C_ertificate:"
+msgstr "_Varmenne:"
 
-#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
+#: ../src/smime/lib/e-cert.c:235 ../src/smime/lib/e-cert.c:247
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:404
+#: ../src/smime/lib/e-cert.c:403
 msgid "Sign"
 msgstr "Allekirjoita"
 
-#: ../smime/lib/e-cert.c:405
+#: ../src/smime/lib/e-cert.c:404
 msgid "Encrypt"
 msgstr "Salaa"
 
-#: ../smime/lib/e-cert-db.c:787
+#: ../src/smime/lib/e-cert-db.c:786
 msgid "Certificate already exists"
 msgstr "Varmenne on jo olemassa"
 
-#: ../smime/lib/e-pkcs12.c:201
+#: ../src/smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr "PKCS12-tiedoston salasana"
 
-#: ../smime/lib/e-pkcs12.c:202
+#: ../src/smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr "Syötä salasana PKCS12-tiedostolle:"
 
-#: ../smime/lib/e-pkcs12.c:328
+#: ../src/smime/lib/e-pkcs12.c:327
 #, fuzzy, c-format
 #| msgid "Unable to book a resource, error: %s"
 msgid "Unable to create export context, err_code: %i"
 msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 
-#: ../smime/lib/e-pkcs12.c:335
+#: ../src/smime/lib/e-pkcs12.c:334
 #, c-format
 msgid "Unable to setup password integrity, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:345
+#: ../src/smime/lib/e-pkcs12.c:344
 #, fuzzy, c-format
 #| msgid "Unable to book a resource, error: %s"
 msgid "Unable to create safe bag, err_code: %i"
 msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../src/smime/lib/e-pkcs12.c:362
 #, fuzzy, c-format
 #| msgid "Unable to book a resource, error: %s"
 msgid "Unable to add key/cert to the store, err_code: %i"
 msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 
-#: ../smime/lib/e-pkcs12.c:381
+#: ../src/smime/lib/e-pkcs12.c:380
 #, fuzzy, c-format
 #| msgid "Unable to book a resource, error: %s"
 msgid "Unable to write store to disk, err_code: %i"
 msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 
-#: ../smime/lib/e-pkcs12.c:408
+#: ../src/smime/lib/e-pkcs12.c:407
 msgid "Imported Certificate"
 msgstr "Tuotu varmenne"
 
-#: ../views/addressbook/galview.xml.h:1
-msgid "_Address Cards"
-msgstr "_Osoitekortit"
-
-#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
-msgid "_List View"
-msgstr "_Luettelonäkymä"
-
-#: ../views/addressbook/galview.xml.h:3
-msgid "By _Company"
-msgstr "_Yrityksen mukaan"
-
-#: ../views/calendar/galview.xml.h:1
-msgid "_Day View"
-msgstr "_Päivänäkymä"
-
-#: ../views/calendar/galview.xml.h:2
-msgid "_Work Week View"
-msgstr "Työviikk_onäkymä"
-
-#: ../views/calendar/galview.xml.h:3
-msgid "W_eek View"
-msgstr "_Viikkonäkymä"
-
-#: ../views/calendar/galview.xml.h:4
-msgid "_Month View"
-msgstr "_Kuukausinäkymä"
-
-#: ../views/mail/galview.xml.h:1
-msgid "_Messages"
-msgstr "_Viestit"
-
-#: ../views/mail/galview.xml.h:2
-msgid "As _Sent Folder"
-msgstr "_Lähetetyt-kansion mukaan"
+#~ msgid "Because &quot;{1}&quot;."
+#~ msgstr "Syy: &quot;{1}&quot;."
 
-#: ../views/mail/galview.xml.h:3
-msgid "By Su_bject"
-msgstr "_Aiheen mukaan"
+#~ msgid "Could not open '%s'"
+#~ msgstr "%s ei voitu avata"
 
-#: ../views/mail/galview.xml.h:4
-msgid "By Se_nder"
-msgstr "_Lähettäjän mukaan"
+#~ msgctxt "PGPKeyDescription"
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
 
-#: ../views/mail/galview.xml.h:5
-msgid "By S_tatus"
-msgstr "_Tilan mukaan"
-
-#: ../views/mail/galview.xml.h:6
-msgid "By _Follow Up Flag"
-msgstr "_Vastaus viestiin -lipun mukaan"
-
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Le_veälle näkymälle"
-
-#: ../views/mail/galview.xml.h:8
-msgid "As Sent Folder for Wi_de View"
-msgstr "Lähetetyt-kansion mukaan _leveässä näkymässä"
-
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Muistilaput"
+#, fuzzy
+#~| msgid "Could not save to autosave file &quot;{0}&quot;."
+#~ msgid "Failed to connect account &quot;{0}&quot;."
+#~ msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
-#: ../views/tasks/galview.xml.h:2
-msgid "With _Due Date"
-msgstr "_Eräpäivän kanssa"
+#, fuzzy
+#~ msgid "Selected Calendars for Alarms"
+#~ msgstr "Valitse kalenterit hälytyksille"
 
-#: ../views/tasks/galview.xml.h:3
-msgid "With _Status"
-msgstr "_Tilan kanssa"
+#~ msgid "Sh_ow a reminder"
+#~ msgstr "_Näytä muistutus"
 
 #~ msgid "Specify the output file instead of standard output"
 #~ msgstr "Määrittele tulostiedosto oletusulostulon sijaan"