[evolution/gnome-2-32] Updated Finnish translation by Ubuntu Finnish translators.

From: Timo Jyrinki <tjyrinki src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution/gnome-2-32] Updated Finnish translation by Ubuntu Finnish translators.
Date: Mon, 13 Sep 2010 15:28:39 +0000 (UTC)
commit 6ed1e54b3299768a2f61ccf70f5f585b875b0517
Author: Timo Jyrinki <timo jyrinki iki fi>
Date:   Mon Sep 13 18:27:46 2010 +0300

    Updated Finnish translation by Ubuntu Finnish translators.

 po/fi.po |17297 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 8641 insertions(+), 8656 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index a579549..09cd5e7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,19 +8,20 @@
 # Huomautus: PIM ei ole suomennettu, evolution on suomeksi
 # yksinkertaisesti sÃ¤hkÃ¶postiohjelma. Saa ehdottaa nimeÃ¤.
 #
-#: ../shell/main.c:507
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-13 09:24+0300\n"
-"PO-Revision-Date: 2009-02-10 16:15+0300\n"
-"Last-Translator: Ilkka Tuohela <hile iki fi>\n"
+"POT-Creation-Date: 2010-09-05 16:57+0000\n"
+"PO-Revision-Date: 2010-09-12 10:20+0000\n"
+"Last-Translator: Heikki MÃ¤ntysaari <heikki mantysaari linux fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2010-09-13 15:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -89,53 +90,44 @@ msgid "Delete address book '{0}'?"
 msgstr "Poista osoitekirja \"{0}\"?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "Virhe ladattaessa osoitekirjaa."
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Virhe tallennettaessa {0} kohteeseen {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP-palvelimelle tunnistautuminen epÃ¤onnistui."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epÃ¤onnistui"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise-osoitekirjan luonti:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP palvelin ei vastannut kelvollisella skeematiedolla."
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "Palvelimen versio"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Jotkut ominaisuudet eivÃ¤t vÃ¤lttÃ¤mÃ¤ttÃ¤ toimi oikein palvelimen tÃ¤mÃ¤nhetkisen "
 "version kanssa"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolutionin osoitekirja sulkeutui odottamatta."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 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:23
+#: ../addressbook/addressbook.error.xml.h:21
 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 "
@@ -145,15 +137,15 @@ msgstr ""
 "tÃ¤tÃ¤ toimintoa, tai palvelin voi olla vÃ¤Ã¤rin konfiguroitu. Kysy "
 "yllÃ¤pidoltasi mitkÃ¤ ovat tuetut hakupohjat."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "TÃ¤tÃ¤ osoitekirjaa ei voi avata."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 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:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -161,31 +153,31 @@ 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:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "TÃ¤mÃ¤ osoitekirja poistetaan pysyvÃ¤sti."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "TÃ¤mÃ¤ palvelin ei tue LDAPv3 skeematietoja."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "Osoitekirjaa ei voi avata"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "Hakua ei voi suorittaa."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "{0} ei voi tallentaa."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
 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?"
@@ -193,7 +185,7 @@ msgstr ""
 "YritÃ¤t siirtÃ¤Ã¤ yhteystietoa osoitekirjasta toiseen, mutta sitÃ¤ ei voi "
 "poistaa lÃ¤hteestÃ¤. Haluatko sen sijaan tallentaa kopion?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -203,404 +195,435 @@ msgstr ""
 "kohdata ongelmia Evolutionin kÃ¤ytÃ¶ssÃ¤. Parhaiden tulosten saamiseksi tulisi "
 "palvelin pÃ¤ivittÃ¤Ã¤ tuettuun versioon"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 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:36
+#: ../addressbook/addressbook.error.xml.h:34
 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:37
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Yhteystietoja {0} ei voi kÃ¤yttÃ¤Ã¤ ennen kuin Evolution kÃ¤ynnistetÃ¤Ã¤n "
 "uudestaan."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:519
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_LisÃ¤Ã¤"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "HylkÃ¤Ã¤"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "Ã?_lÃ¤ tallenna"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "_Muuta kokoa"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Use as it is"
 msgstr "KÃ¤ytÃ¤ _sellaisenaan"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:598
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Synkronoinnin oletusosoite:"
 
-#: ../addressbook/conduit/address-conduit.c:1621
-#: ../addressbook/conduit/address-conduit.c:1622
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "Osoitekirjaa ei voitu ladata"
 
-#: ../addressbook/conduit/address-conduit.c:1699
-#: ../addressbook/conduit/address-conduit.c:1702
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "Pilotin osoitekirjan ohjelmalohkoa ei voi lukea"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>SÃ¤hkÃ¶postiosoite</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>Koti</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>PikaviestintÃ¤</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>TyÃ¶</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Sekalaiset</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Notes</b>"
-msgstr "<b>Muistilaput</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Other</b>"
-msgstr "<b>Muuta</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Telephone</b>"
-msgstr "<b>Puhelin</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>WWW-osoitteet</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:1992
+msgid "Anniversary"
+msgstr "VuosipÃ¤ivÃ¤"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>TyÃ¶</b>"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:1991 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:123
+msgid "Birthday"
+msgstr "SyntymÃ¤pÃ¤ivÃ¤"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ry_hmÃ¤t..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:312
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1238
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Calendar:"
+msgstr "Kalenteri:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2581
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+msgid "Email"
+msgstr "SÃ¤hkÃ¶posti"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Free/Busy:"
+msgstr "Vapaa/Varattu:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "Koti"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Home Page:"
+msgstr "Kotisivu:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "Kuva"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Instant Messaging"
+msgstr "PikaviestintÃ¤"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr "TyÃ¶"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "Postitusosoite"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+msgid "Miscellaneous"
+msgstr "Sekalaiset"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "_Lempinimi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 msgid "Notes"
 msgstr "Muistilaput"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1700
+msgid "Other"
+msgstr "Muut"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "HenkilÃ¶kohtaiset tiedot"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+msgid "Video Chat:"
+msgstr "Videokeskustelu:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+msgid "Web Addresses"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Web Log:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+msgid "Web addresses"
+msgstr ""
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../mail/e-mail-migrate.c:961
+msgid "Work"
+msgstr "TyÃ¶"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_VuosipÃ¤ivÃ¤:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Apulainen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "_SyntymÃ¤pÃ¤ivÃ¤:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:822
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Company:"
 msgstr "_Yritys:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Country:"
 msgstr "_Maa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_File under:"
 msgstr "_NÃ¤ytÃ¤ nimellÃ¤:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Free/Busy:"
 msgstr "_Vapaa/varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Home Page:"
 msgstr "K_otisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Manager:"
 msgstr "_Esimies:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Office:"
 msgstr "_Toimisto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Spouse:"
 msgstr "_Puoliso:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_State/Province:"
 msgstr "_Osavaltio/lÃ¤Ã¤ni:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Titteli:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Video Chat:"
 msgstr "_Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Wants to receive HTML mail"
 msgstr "Haluaa sÃ¤hkÃ¶postit _HTML-muodossa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Web Log:"
 msgstr "_Web-lokin osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
-msgstr "_MissÃ¤: "
+msgstr "_MissÃ¤:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_Postinumero:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/exchange-operations/exchange-delegates.c:951
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
+#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1159
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-define-views-dialog.c:320
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:340
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1258
-#: ../addressbook/gui/widgets/e-addressbook-model.c:523
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
+#: ../addressbook/gui/widgets/e-addressbook-model.c:530
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:542
+#: ../addressbook/gui/widgets/e-minicard-view.c:548
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
+#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
+#: ../widgets/text/e-text.c:3442
 msgid "Editable"
 msgstr "Muokattava"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:538
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:534
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
-msgstr "Groupwise"
+msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:76
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../modules/mail/e-mail-shell-migrate.c:956
-msgid "Work"
-msgstr "TyÃ¶"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-msgid "Home"
-msgstr "Koti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:445
-#: ../calendar/gui/e-calendar-view.c:1603
-msgid "Other"
-msgstr "Muut"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:536
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
 msgid "Error adding contact"
 msgstr "Virhe lisÃ¤ttÃ¤essÃ¤ yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
 msgid "Error modifying contact"
 msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Source Book"
 msgstr "LÃ¤hdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
 msgid "Writable Fields"
 msgstr "Muokattavat kentÃ¤t"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
 msgid "Required Fields"
 msgstr "Vaaditut kentÃ¤t"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
 msgid "Changed"
 msgstr "Muutettu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2488
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2576
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2883
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2984
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tÃ¤lle henkilÃ¶lle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2985
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3258
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -608,186 +631,194 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3159
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3262
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisÃ¤ltÃ¤Ã¤ virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3269
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisÃ¤ltÃ¤Ã¤ virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3181
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3295
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjÃ¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3309
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisÃ¤ys"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:331
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "_Koko nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "SÃ¤hkÃ¶_posti"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:427
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:323
+#: ../shell/e-shell-window.c:758
 msgid "Shell"
 msgstr "Tulkki"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:324
+#: ../shell/e-shell-window.c:759
 msgid "The EShell singleton"
 msgstr "EShell-yksikkÃ¶"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr "Tr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
+msgstr "Esq."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr "Jr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr "Neiti"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr "Hra."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr "Rva."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr "Nti."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr "Hr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_Etunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "_Sukunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Toinen nimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "_PÃ¤Ã¤te:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>JÃ¤senet</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
 msgid "Contact List Editor"
 msgstr "Yhteystietolistojen muokkain"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:319
-msgid "Select..."
-msgstr "Valitse..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "JÃ¤senet"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 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.glade.h:5
+#: ../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.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+msgid "_Select..."
+msgstr "_Valitse..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 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/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
 msgid "Contact List Members"
 msgstr "Ota yhteyttÃ¤ listan jÃ¤seniin"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:928
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1319
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
 msgid "_Members"
 msgstr "_JÃ¤senet"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
 msgid "Error adding list"
 msgstr "Virhe lisÃ¤ttÃ¤essÃ¤ listalle"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1228
-#: ../addressbook/gui/widgets/e-addressbook-model.c:513
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../addressbook/gui/widgets/e-addressbook-model.c:520
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:528
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
 msgid "Book"
 msgstr "Kirja"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1248
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
 msgid "Is New List"
 msgstr "Uusi lista"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Muutettu yhteystieto:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
 msgstr "Ristiriitainen yhteystieto:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "PÃ¤Ã¤llekkÃ¤isiÃ¤ yhteystietoja havaittu"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -795,15 +826,15 @@ msgstr ""
 "Yhteystiedon nimi tai sÃ¤hkÃ¶postiosoite on ja tÃ¤ssÃ¤ kansioissa. Haluatko "
 "lisÃ¤tÃ¤ joka tapauksessa?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "Uusi yhteystieto:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "AlkuperÃ¤inen yhteystieto:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -811,81 +842,71 @@ msgstr ""
 "Yhteystiedon nimi tai sÃ¤hkÃ¶postiosoite on ja tÃ¤ssÃ¤ kansioissa.\n"
 "Haluatko lisÃ¤tÃ¤ joka tapauksessa?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "_YhdistÃ¤"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "YhdistÃ¤ yhteystieto"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:266
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:510
-#: ../addressbook/gui/widgets/eab-contact-display.c:515
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
-#: ../addressbook/gui/widgets/eab-contact-display.c:786
-#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
-msgid "Email"
-msgstr "SÃ¤hkÃ¶posti"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Any field contains"
 msgstr "MikÃ¤ tahansa kenttÃ¤ sisÃ¤ltÃ¤Ã¤"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Email begins with"
 msgstr "SÃ¤hkÃ¶posti alkaa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Name contains"
 msgstr "Nimi sisÃ¤ltÃ¤Ã¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d yhteystieto"
 msgstr[1] "%d yhteystietoa"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+#: ../addressbook/gui/widgets/e-addressbook-model.c:315
 msgid "Error getting book view"
 msgstr "Virhe ladattaessa kirjanÃ¤kymÃ¤Ã¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:533
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-addressbook-model.c:540
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:535
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
 msgid "Query"
 msgstr "Kysely"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+#: ../addressbook/gui/widgets/e-addressbook-model.c:714
 msgid "Search Interrupted"
 msgstr "Haku keskeytettiin"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
-#: ../addressbook/gui/widgets/e-addressbook-view.c:645
-#: ../calendar/gui/e-calendar-table.c:886 ../calendar/gui/e-memo-table.c:669
-#: ../modules/calendar/e-memo-shell-content.c:597
-#: ../modules/calendar/e-task-shell-content.c:620
-#: ../widgets/table/e-table-click-to-add.c:507
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
+#: ../addressbook/gui/widgets/e-addressbook-view.c:758
+#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:629
+#: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
+#: ../widgets/table/e-table.c:3367
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
+#: ../widgets/text/e-text.c:3309
 msgid "Model"
 msgstr "Malli"
 
@@ -893,47 +914,63 @@ msgstr "Malli"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
-#: ../calendar/gui/e-calendar-table.c:897 ../calendar/gui/e-memo-table.c:680
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+msgid "Cut selected contacts to the clipboard"
+msgstr "Leikkaa valitut yhteystiedot leikepÃ¶ydÃ¤lle"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+msgid "Copy selected contacts to the clipboard"
+msgstr "Kopioi valitut yhteystiedot leikepÃ¶ydÃ¤lle"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+msgid "Paste contacts from the clipboard"
+msgstr "LiitÃ¤ yhteystietoja leikepÃ¶ydÃ¤ltÃ¤"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
+msgid "Delete selected contacts"
+msgstr "Poista valitut yhteystiedot"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Select all visible contacts"
+msgstr "Valitse kaikki nÃ¤kyvÃ¤t yhteystiedot"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:774
+#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
 msgid "Shell View"
 msgstr "KuorinÃ¤kymÃ¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Source"
 msgstr "LÃ¤hde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1134
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1282
 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:1138
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1286
 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:1142
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1290
 #, 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:1148
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1296
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Haluatko varmasti poistaa nÃ¤mÃ¤ yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1152
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 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:1156
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 #, 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:1312
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "Save as vCard..."
-msgstr "Tallenna vCard-muodossa..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1459
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -942,16 +979,16 @@ msgstr ""
 "%d yhteystiedon avaaminen avaa myÃ¶s %d uutta ikkunaa.\n"
 "Haluatko varmasti nÃ¤yttÃ¤Ã¤ tÃ¤mÃ¤n yhteystiedon?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1350
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1464
 msgid "_Don't Display"
 msgstr "Ã?_lÃ¤ nÃ¤ytÃ¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
 msgid "Display _All Contacts"
 msgstr "NÃ¤ytÃ¤ k_aikki yhteystiedot"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "Apulainen"
 
@@ -980,7 +1017,7 @@ msgid "Car Phone"
 msgstr "Autopuhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -988,7 +1025,7 @@ msgid "Categories"
 msgstr "RyhmÃ¤t"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "Yritys"
 
@@ -1037,22 +1074,22 @@ msgid "Journal"
 msgstr "PÃ¤ivÃ¤kirja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "Johtaja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "Huomautus"
 
@@ -1081,14 +1118,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:573
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Rooli"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "Puoliso"
 
@@ -1107,7 +1143,7 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:519
+#: ../shell/e-shell-view.c:951
 msgid "Title"
 msgstr "Titteli"
 
@@ -1122,27 +1158,27 @@ msgstr "Kotisivu"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:521
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-click-to-add.c:525
+#: ../widgets/table/e-table-col.c:121
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
+#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
 msgid "Width"
 msgstr "Leveys"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:528
-#: ../widgets/table/e-table-group-container.c:987
-#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-click-to-add.c:532
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
+#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
 msgid "Height"
 msgstr "Korkeus"
 
@@ -1171,7 +1207,7 @@ msgstr "KentÃ¤n maksimipituus"
 msgid "Column Width"
 msgstr "Sarakkeen leveys"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -1181,7 +1217,7 @@ msgstr ""
 "\n"
 "EtsitÃ¤Ã¤n yhteystietoja..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -1195,7 +1231,7 @@ msgstr ""
 "\n"
 "tai luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -1209,7 +1245,7 @@ msgstr ""
 "\n"
 "Luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1219,7 +1255,7 @@ msgstr ""
 "\n"
 "Etsi yhteystietoja."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1229,7 +1265,7 @@ msgstr ""
 "\n"
 "NÃ¤kymÃ¤ssÃ¤ ei ole mitÃ¤Ã¤n nÃ¤ytettÃ¤vÃ¤Ã¤."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Adapter"
 msgstr "Sovitin"
 
@@ -1279,265 +1315,256 @@ msgstr[1] "Valitussa osoitekirjassa %s on %d korttia"
 msgid "Open"
 msgstr "Avaa"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:141
+#: ../addressbook/gui/widgets/ea-minicard.c:153
 msgid "Contact List: "
 msgstr "_Yhteystietoluettelo: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:142
+#: ../addressbook/gui/widgets/ea-minicard.c:154
 msgid "Contact: "
 msgstr "Yhteystiedot: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:168
+#: ../addressbook/gui/widgets/ea-minicard.c:180
 msgid "evolution minicard"
 msgstr "Evolutionin minikortti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "Kopioi sÃ¤hkÃ¶postiosoite"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:196
-#: ../widgets/misc/e-web-view.c:330
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:386
+msgid "Copy the email address to the clipboard"
+msgstr "Kopioi sÃ¤hkÃ¶postiosoite leikepÃ¶ydÃ¤lle"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:391
 msgid "_Send New Message To..."
 msgstr "LÃ¤hetÃ¤ uusi _viesti..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:206
-#: ../widgets/misc/e-web-view.c:303
-msgid "_Copy Link Location"
-msgstr "_Kopioi linkin sijainti"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:213
-#: ../widgets/misc/e-web-view.c:313
-msgid "_Open Link in Browser"
-msgstr "_Avaa linkki selaimessa"
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:393
+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:289
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(kartta)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:309
-#: ../addressbook/gui/widgets/eab-contact-display.c:320
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "kartta"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:404
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "Listan jÃ¤senet"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "Osasto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "Asema"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:329
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:572
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
-#: ../plugins/hula-account-setup/camel-hula-listener.c:372
-#: ../plugins/hula-account-setup/camel-hula-listener.c:400
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view.c:490
+#: ../plugins/groupwise-features/camel-gw-listener.c:420
+#: ../plugins/groupwise-features/camel-gw-listener.c:445
+#: ../plugins/groupwise-features/camel-gw-listener.c:560
+#: ../plugins/hula-account-setup/camel-hula-listener.c:371
+#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:124
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "Osoite"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "Web-loki"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../calendar/gui/e-calendar-view.c:1894 ../shell/main.c:127
-msgid "Birthday"
-msgstr "SyntymÃ¤pÃ¤ivÃ¤"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
-#: ../calendar/gui/e-calendar-view.c:1895
-msgid "Anniversary"
-msgstr "VuosipÃ¤ivÃ¤"
-
+#. Create the default Person addressbook
+#. orange
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#. orange
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
-#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
+#: ../modules/addressbook/e-book-shell-backend.c:176
 #: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:167
+#: ../modules/calendar/e-cal-shell-backend.c:183
 #: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:156
+#: ../modules/calendar/e-task-shell-backend.c:158
 #: ../modules/calendar/e-task-shell-migrate.c:511
-#: ../modules/mail/e-mail-shell-migrate.c:957
-#: ../plugins/email-custom-header/email-custom-header.c:336
+#: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "HenkilÃ¶kohtainen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:771
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "TehtÃ¤vÃ¤nimike"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Blog"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:802
+#, c-format
+msgid "Click to mail %s"
+msgstr "Napsauta lÃ¤hettÃ¤Ã¤ksesi %s"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "Onnistui"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "TaustajÃ¤rjestelmÃ¤ kÃ¤ytÃ¶ssÃ¤"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "LÃ¤hde poissa kÃ¤ytÃ¶stÃ¤"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "No Self Contact defined"
 msgstr "Omaa yhteystietoa ei ole mÃ¤Ã¤ritelty"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "Lupa evÃ¤tty"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "Yhteystietoa ei lÃ¶ytynyt"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "Yhteystiedon tunniste on jo olemassa"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "Protokolla ei ole tuettu"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/e-cal-component-preview.c:201
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:781
-#: ../calendar/gui/e-calendar-table.c:224
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:800 ../calendar/gui/print.c:2578
+#. To Translators: This is task status
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2651
 msgid "Canceled"
 msgstr "Peruutettu"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
 msgstr "Ei voi perua"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "Todennus epÃ¤onnistui"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS ei ole kÃ¤ytettÃ¤vissÃ¤"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "LÃ¤hdettÃ¤ ei ole olemassa"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "Ei kÃ¤ytettÃ¤vissÃ¤ yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "Muu virhe"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "Virheellinen palvelimen versio"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "Tunnistautumistapa ei ole tuettu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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 "
@@ -1547,7 +1574,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:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1556,7 +1583,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:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 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."
@@ -1564,7 +1591,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:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1572,11 +1599,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:142
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "Yksityiskohtainen virheviesti:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1588,7 +1615,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:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 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"
@@ -1599,121 +1626,97 @@ msgstr ""
 "annettu aikaraja. Tarkenna hakuasi, tai pidennÃ¤ palvelimen aikarajaa tÃ¤mÃ¤n "
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "TÃ¤mÃ¤n osoitekirjan taustajÃ¤rjestelmÃ¤ ei ymmÃ¤rtÃ¤nyt tÃ¤tÃ¤ kyselyÃ¤."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "TÃ¤mÃ¤n osoitekirjan taustajÃ¤rjestelmÃ¤ ei suostunut suorittamaan tÃ¤tÃ¤ kyselyÃ¤."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "KyselyÃ¤ ei voitu suorittaa onnistuneesti."
 
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s on jo olemassa\n"
-"Haluatko ylikirjoittaa?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-msgid "Overwrite"
-msgstr "Kirjoita yli"
-
-#. more than one, finding the total number of contacts might
-#. * hit performance while saving large number of contacts
-#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:255
-#: ../addressbook/gui/widgets/eab-gui-util.c:258
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "Yhteystieto"
-msgstr[1] "Yhteystiedot"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:304
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "kortti.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:341
+#: ../addressbook/gui/widgets/eab-gui-util.c:247
 msgid "Select Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:310
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:597
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contact to"
 msgstr "Siirry yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:599
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:602
+#: ../addressbook/gui/widgets/eab-gui-util.c:442
 msgid "Move contacts to"
 msgstr "SiirrÃ¤ yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:444
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr "KorttinÃ¤kymÃ¤"
 
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:512
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:262
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:862
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:871
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:880
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:565
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:566
 msgid "Evolution vCard Importer"
 msgstr "Evolutionin vCard-tuoja"
 
@@ -1767,47 +1770,48 @@ msgstr ""
 msgid "NUMBER"
 msgstr "NUMERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Virhe komentoriviparametreissa, kÃ¤ytÃ¤ optiota --help nÃ¤hdÃ¤ksesi kÃ¤yttÃ¶ohjeet."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "Asynkronisessa tilassa ulostulon tÃ¤ytyy olla tiedosto."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "Normaalitilassa kokoa ei pitÃ¤isi tarvita antaa."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "KÃ¤sittelemÃ¤tÃ¶n virhe"
 
-#: ../addressbook/util/addressbook.c:102
+#: ../addressbook/util/addressbook.c:103
 msgid "Accessing LDAP Server anonymously"
 msgstr "Otetaan yhteyttÃ¤ LDAP-palvelimeen anonyymisti"
 
-#: ../addressbook/util/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epÃ¤onnistui.\n"
 
-#: ../addressbook/util/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "SyÃ¶tÃ¤ salasana palvelulle %s (kÃ¤yttÃ¤jÃ¤ %s)"
 
-#: ../addressbook/util/addressbook.c:222
+#: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:518
-#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "SyÃ¶tÃ¤ salasana"
@@ -1847,28 +1851,33 @@ msgstr ""
 "ymmÃ¤rtÃ¤mÃ¤Ã¤n, mistÃ¤ tehtÃ¤vÃ¤ssÃ¤ on kyse."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid "All information in these memos will be deleted and can not be restored."
+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:8
 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."
+msgstr ""
+"Kaikki tiedot tÃ¤ssÃ¤ muistilapussa poistetaan eikÃ¤ niitÃ¤ voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:9
 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."
+msgstr ""
+"Kaikki tiedot nÃ¤istÃ¤ tapaamisista poistetaan eikÃ¤ niitÃ¤ voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information on these tasks will be deleted and can not be restored."
+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:11
 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."
+msgstr ""
+"Kaikki tiedot tÃ¤stÃ¤ tapaamisesta poistetaan eikÃ¤ niitÃ¤ voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid ""
@@ -1892,126 +1901,130 @@ 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
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "Haluatko varmasti poistaa tapaamisen '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Haluatko varmasti poistaa muistilapun \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Haluatko varmasti poistaa nÃ¤mÃ¤ {0} tapaamista?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Haluatko varmasti poistaa nÃ¤mÃ¤ {0} muistilappua?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 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:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Haluatko varmasti poistaa tÃ¤mÃ¤n tapaamisen?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, 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:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, 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:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, 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:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Haluatko varmasti tallentaa muistion ilman yhteenvetoa?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Haluatko varmasti lÃ¤hettÃ¤Ã¤ tapaamisen ilman yhteenvetoa?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Haluatko varmasti lÃ¤hettÃ¤Ã¤ tehtÃ¤vÃ¤n ilman yhteenvetoa?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "KalenterilÃ¤hde on yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Uutta tapahtumaa ei voi luoda"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "Tapahtumaa ei voi tallentaa"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "Poista kalenteri \"{0}\""
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "Poista tehtÃ¤vÃ¤lista \"{0}\""
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "Ã?lÃ¤ lÃ¤h_etÃ¤"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 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:36
+#: ../calendar/calendar.error.xml.h:37
 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:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "Muokkainta ei voi avata."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 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:39
+#: ../calendar/calendar.error.xml.h:40
 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
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "Virhe ladattaessa kalenteria"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "Virhe ladattaessa muistilappulistaa"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "Virhe ladattaessa tehtÃ¤vÃ¤listaa"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "Virhe palvelimella \"{0}\""
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2019,7 +2032,7 @@ msgstr ""
 "Jos et lÃ¤hetÃ¤ perumisilmoitusta, eivÃ¤t muut osanottajat ehkÃ¤ tiedÃ¤ ettÃ¤ "
 "kokous on peruttu."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2027,7 +2040,7 @@ msgstr ""
 "Jos et lÃ¤hetÃ¤ perumisilmoitusta, eivÃ¤t muut osanottajat ehkÃ¤ tiedÃ¤ ettÃ¤ "
 "muistilappu on poistettu."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2035,23 +2048,11 @@ msgstr ""
 "Jos et lÃ¤hetÃ¤ perumisilmoitusta, eivÃ¤t muut osanottajat ehkÃ¤ tiedÃ¤ ettÃ¤ "
 "tehtÃ¤vÃ¤ on peruttu."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "Palvelin ei vastannut."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "Tallenna tapaaminen"
-
 #: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "Tallenna muistilappu"
-
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "Tallenna tehtÃ¤vÃ¤"
-
-#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2059,7 +2060,7 @@ msgstr ""
 "PÃ¤ivitettyjen tietojen lÃ¤hettÃ¤minen antaa muille mahdollisuuden pitÃ¤Ã¤ "
 "kalenterinsa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2067,109 +2068,113 @@ msgstr ""
 "PÃ¤ivitettyjen tehtÃ¤vÃ¤tietojen lÃ¤hettÃ¤minen antaa muille mahdollisuuden pitÃ¤Ã¤ "
 "tehtÃ¤vÃ¤listansa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
-" Joidenkin liitteiden lataus on vielÃ¤ kesken. Tapaamisen tallentaminen nyt "
+"Joidenkin liitteiden lataus on vielÃ¤ kesken. Tapaamisen tallentaminen nyt "
 "aiheuttaa tapaamisen tallentamisen ilman nÃ¤itÃ¤ hakemattomia liitteitÃ¤."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
-" Joidenkin liitteiden lataus on vielÃ¤ kesken. TehtÃ¤vÃ¤n tallentaminen nyt "
+"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:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Jotkut toiminnot eivÃ¤t vÃ¤lttÃ¤mÃ¤ttÃ¤ toimi oikein nykyisellÃ¤ palvelimella."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolutionin muistilappuosa sulkeutui odottamatta."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutionin tehtÃ¤vÃ¤komponentti on sulkeutunut odottamatta."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 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:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr ""
 "Muistilappulistaa ei ole merkitty kÃ¤ytettÃ¤vÃ¤ksi yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 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."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "TÃ¤mÃ¤ kalenteri poistetaan pysyvÃ¤sti."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "TÃ¤mÃ¤ muistilappulista poistetaan pysyvÃ¤sti."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "TÃ¤mÃ¤ tehtÃ¤vÃ¤lista poistetaan pysyvÃ¤sti."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
 msgstr "Kalenteria ei voitu ladata"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Haluatko tallentaa muutokset tÃ¤hÃ¤n tapaamiseen?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Haluatko tallentaa muutokset tÃ¤hÃ¤n tapaamiseen?"
+
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this memo?"
 msgstr "Haluatko tallentaa muutoksesi tÃ¤hÃ¤n muistioon?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:69
 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:72
+#: ../calendar/calendar.error.xml.h:70
 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:73
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Haluatko lÃ¤hettÃ¤Ã¤ perumisilmoituksen kaikille osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Haluatko lÃ¤hettÃ¤Ã¤ kokouskutsuja osallistujille?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 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:76
+#: ../calendar/calendar.error.xml.h:74
 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:77
+#: ../calendar/calendar.error.xml.h:75
 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:78
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2179,113 +2184,285 @@ msgstr ""
 "kohdata ongelmia Evolutionin kÃ¤ytÃ¶ssÃ¤. Parhaiden tulosten saamiseksi tulisi "
 "palvelin pÃ¤ivittÃ¤Ã¤ tuettuun versioon."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:77
 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:80
+#: ../calendar/calendar.error.xml.h:78
+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:79
 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:81
+#: ../calendar/calendar.error.xml.h:80
 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:82
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenterisi eivÃ¤t ole kÃ¤ytettÃ¤vissÃ¤ ennen kuin Evolution on kÃ¤ynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Muistilaput eivÃ¤t ole kÃ¤ytettÃ¤vissÃ¤ ennen kuin Evolution on kÃ¤ynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "TehtÃ¤vÃ¤t eivÃ¤t ole kÃ¤ytettÃ¤vissÃ¤ ennen kuin Evolution on kÃ¤ynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_HylkÃ¤Ã¤ muutokset"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:332
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:268
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:86
 msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_LÃ¤hetÃ¤"
 
 # calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16 #: calendar/calendar-errors.xml.h:26
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Send Notice"
 msgstr "_LÃ¤hetÃ¤ huomautus"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:89
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Jaa usean pÃ¤ivÃ¤n tapahtumat:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1520
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/memo/memo-conduit.c:814
-#: ../calendar/conduits/memo/memo-conduit.c:815
-#: ../calendar/conduits/todo/todo-conduit.c:1014
-#: ../calendar/conduits/todo/todo-conduit.c:1015
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "Evolutionin tietopalvelimen kÃ¤ynnistys epÃ¤onnistui"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilotin kalenterin ohjelmalohkoa ei voi lukea"
 
-#: ../calendar/conduits/memo/memo-conduit.c:908
-#: ../calendar/conduits/memo/memo-conduit.c:911
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "Pilotin muistilappujen ohjelmalohkoa ei voi lukea"
 
-#: ../calendar/conduits/memo/memo-conduit.c:955
-#: ../calendar/conduits/memo/memo-conduit.c:958
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "Pilotin muistilappujen ohjelmalohkoa ei voi lukea"
 
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "Prioriteetin oletusarvo:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1098
-#: ../calendar/conduits/todo/todo-conduit.c:1101
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilotin tehtÃ¤vÃ¤listan ohjelmalohkoa ei voi lukea"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1143
-#: ../calendar/conduits/todo/todo-conduit.c:1146
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "Pilotin tehtÃ¤vÃ¤listan ohjelmalohkoa ei voi kirjoittaa"
 
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuutti"
+msgstr[1] "minuuttia"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "tunti"
+msgstr[1] "tuntia"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+msgid "Start time"
+msgstr "Alkamisaika"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
+msgid "Appointments"
+msgstr "Tapaamiset"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "HylkÃ¤Ã¤ _kaikki"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1035
+msgid "Location:"
+msgstr "Sijainti:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
+msgid "Snooze _time:"
+msgstr "Torkkumisaika:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+msgid "_Dismiss"
+msgstr "_HylkÃ¤Ã¤"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1644
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+msgid "_Snooze"
+msgstr "_Torku"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+msgid "hours"
+msgstr "tuntia"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+msgid "location of appointment"
+msgstr "tapaamisen sijainti"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+msgid "minutes"
+msgstr "minuutti"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+msgid "No summary available."
+msgstr "Ei yhteenvetoa saatavilla"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+msgid "No description available."
+msgstr "Ei kuvausta saatavilla"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+msgid "No location information available."
+msgstr "Ei sijaintitietoja saatavilla"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1516
+#, c-format
+msgid "You have %d alarms"
+msgstr "Sinulla on %d hÃ¤lytystÃ¤"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../e-util/e-non-intrusive-error-dialog.h:39
+msgid "Warning"
+msgstr "Varoitus"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+"Evolution ei vielÃ¤ tue kalenterin muistutuksia, joissa on\n"
+"sÃ¤hkÃ¶postihuomautus, mutta tÃ¤mÃ¤ muistutus oli mÃ¤Ã¤ritelty\n"
+"lÃ¤hettÃ¤mÃ¤Ã¤n sÃ¤hkÃ¶postia. Evolution nÃ¤yttÃ¤Ã¤ sen sijaan\n"
+"tavallisen huomautusikkunan."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+"Evolution kalenterin muistutus laukeaa nyt. Muistutus on mÃ¤Ã¤ritelty "
+"suorittamaan seuraavan ohjelman:\n"
+"\n"
+"         %s\n"
+"\n"
+"Haluatko varmasti suorittaa tÃ¤mÃ¤n ohjelman?"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1736
+msgid "Do not ask me about this program again."
+msgstr "Ã?lÃ¤ kysy tÃ¤stÃ¤ ohjelmasta enÃ¤Ã¤ uudestaan"
+
+#: ../calendar/gui/alarm-notify/util.c:44
+msgid "invalid time"
+msgstr "epÃ¤kelpo aika"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tunti"
+msgstr[1] "%d tuntia"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuutti"
+msgstr[1] "%d minuuttia"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunti"
+msgstr[1] "%d sekuntia"
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "HÃ¤lytysohjelmat"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 #: ../mail/evolution-mail.schemas.in.h:12
-msgid "Amount of time in seconds the error should be shown on the status bar."
+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Ã¤."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
@@ -2305,141 +2482,138 @@ msgid "Calendars to run alarms for"
 msgstr "Kalenterit, joille suoritetaan hÃ¤lytyksiÃ¤"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "Aseta tÃ¤mÃ¤, jos haluat kÃ¤yttÃ¤Ã¤ jÃ¤rjestelmÃ¤n aikavyÃ¶hykettÃ¤."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 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)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Marcus Bains-viivan vÃ¤ri pÃ¤ivÃ¤nÃ¤kymÃ¤ssÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "TiivistÃ¤ viikonloput kuukausinÃ¤kymÃ¤ssÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Varmista siivottaessa poistetut lopullisesti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
+"Uuden tapahtuman toistumiskertojen oletusmÃ¤Ã¤rÃ¤ - 1 tarkoittaa ikuisesti."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "PÃ¤ivÃ¤t, joina tyÃ¶tuntien alku ja loppu nÃ¤ytetÃ¤Ã¤n kalenterissa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Tapaamisen oletusmuistutus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Toistumiskertojen oletusmÃ¤Ã¤rÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Muistutusten oletusyksikkÃ¶"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Muistutuksen oletusarvo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "Kansio, johon Ã¤Ã¤nimerkkien tiedostot tallennetaan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Tapahtuman vÃ¤riliuku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Tapahtuman lÃ¤pinÃ¤kyvyys"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "Vapaa/varattu palvelinten URLit"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "Vapaa/varattu-mallin URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "Tapahtumien vÃ¤riliuku kalenterinÃ¤kymissÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Piilota valmistuneet tehtÃ¤vÃ¤t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Piilota tehtÃ¤vien yksikÃ¶t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Piilota tehtÃ¤vÃ¤n arvo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "Vaakapaneelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "PÃ¤ivÃ¤- ja viikkonÃ¤kymissÃ¤ nÃ¤ytettÃ¤vÃ¤t aikavÃ¤lit minuutteina."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Viimeisen hÃ¤lytyksen aika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Taso, jonka jÃ¤lkeen viesti lokitetaan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "Luettelo Ã¤skettÃ¤in valituista toissijaisista aikavyÃ¶hykkeistÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "Osoitteet URLeista, joissa julkaistaan vapaa/varattu tietoja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-viiva"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains-viivan vÃ¤ri - pÃ¤ivÃ¤nÃ¤kymÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains-viivan vÃ¤ri - aikajana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -2447,51 +2621,51 @@ msgstr ""
 "EnimmÃ¤ismÃ¤Ã¤rÃ¤ Ã¤skettÃ¤in valittuja toissijaisia aikavyÃ¶hykkeitÃ¤ avaimen "
 "\"day_second_zones\" luettelossa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Kuinka monta Ã¤skettÃ¤in valittua aikavyÃ¶hykettÃ¤ muistetaan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Muistilappujen asetttelutyyli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "Muistilappujen esikatselupaneelin sijainti (vaaka)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "Muistilappujen esikatselupaneelin sijainti (pysty)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuutti, jona tyÃ¶pÃ¤ivÃ¤ loppuu, vÃ¤liltÃ¤ 0-59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuutti, jona tyÃ¶pÃ¤ivÃ¤ alkaa, vÃ¤liltÃ¤ 0-59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "KuukausinÃ¤kymÃ¤n vaakapanelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "KuukausinÃ¤kymÃ¤n pystypaneelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "Kuinka monta yksikkÃ¶Ã¤ mÃ¤Ã¤rittelee oletusmuistutuksen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "Kuinka monta yksikkÃ¶Ã¤ tarvitaan, jotta tehtÃ¤vÃ¤t piilotetaan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "ErÃ¤pÃ¤ivÃ¤n ylittÃ¤neiden tehtÃ¤vien vÃ¤ri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2499,7 +2673,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinÃ¤, kalenteriselaimen ja tehtÃ¤vÃ¤listan "
 "vÃ¤lissÃ¤ jos ei olla kuukausinÃ¤kymÃ¤ssÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2507,19 +2681,19 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinÃ¤, kalenteriselaimen ja tehtÃ¤vÃ¤listan "
 "vÃ¤lissÃ¤ kÃ¤ytettÃ¤essÃ¤ kuukausinÃ¤kymÃ¤Ã¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -2527,7 +2701,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinÃ¤ , kalenterin listojen ja pÃ¤ivÃ¤mÃ¤Ã¤rien "
 "selausnÃ¤kymÃ¤n vÃ¤lissÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2535,7 +2709,7 @@ msgstr ""
 "Pystypaneelin sijainti pikseleinÃ¤, nÃ¤kymÃ¤n ja kalenteriselaimen sekÃ¤ "
 "tehtÃ¤vÃ¤listan vÃ¤lissÃ¤ kÃ¤ytettÃ¤essÃ¤ kuukausinÃ¤kymÃ¤Ã¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -2543,83 +2717,79 @@ msgstr ""
 "Pystypaneelin sijainti pikseleinÃ¤, nÃ¤kymÃ¤n ja kalenteriselaimen sekÃ¤ "
 "tehtÃ¤vÃ¤listan vÃ¤lissÃ¤ kun ei kÃ¤ytetÃ¤ kuukausinÃ¤kymÃ¤Ã¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "Ensisijainen kalenteri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Ensisijainen muistilappulista"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Ensisijainen tehtÃ¤vÃ¤lista"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Ohjelmat, joita voidaan suorittaa hÃ¤lytyksistÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "PÃ¤ivÃ¤nÃ¤kymÃ¤ssÃ¤ Ã¤skettÃ¤in kÃ¤ytetyt toissijaiset aikavyÃ¶hykkeet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "Ã?Ã¤nihÃ¤lytysten tiedostojen tallennuskansio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
-msgstr ""
+msgstr "VieritÃ¤ kuukausinÃ¤kymÃ¤Ã¤ viikoittain"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "NÃ¤ytÃ¤ RSVP-kenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "NÃ¤ytÃ¤ roolikenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "NÃ¤ytÃ¤ tapaamisten loppumisajat viikko- ja kuukausinÃ¤kymissÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "NÃ¤ytÃ¤ luokkakenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "NÃ¤ytÃ¤ nÃ¤kyvÃ¤t hÃ¤lytykset ilmoitusalueella"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "NÃ¤ytÃ¤ tilakenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "NÃ¤ytÃ¤ muistilappujen esikatselupaneeli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "NÃ¤ytÃ¤ tehtÃ¤vien esikatselupaneeli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "NÃ¤ytÃ¤ aikavyÃ¶hyke tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "NÃ¤ytÃ¤ tyyppikenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week number in Day and Work Week View"
-msgstr "NÃ¤ytÃ¤ viikkonumerot pÃ¤ivÃ¤- ja tyÃ¶viikkonÃ¤kymissÃ¤"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Show week numbers in date navigator"
-msgstr "NÃ¤ytÃ¤ viikkonumerot pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤selaimessa"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2627,23 +2797,23 @@ msgstr ""
 "NÃ¤yttÃ¤Ã¤ toissijaisen aikavyÃ¶hykkeen aikanÃ¤kymÃ¤ssÃ¤, jos asetettu. Arvo on "
 "samanlainen kuin avaimessa \"timezone\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "TehtÃ¤vien asettelutapa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "TehtÃ¤vien esikatselupaneelin sijainti (vaaka)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "TehtÃ¤vien esikatselupaneelin sijainti (pysty)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "TÃ¤nÃ¤Ã¤n erÃ¤Ã¤ntyvien tehtÃ¤vien vÃ¤ri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2652,54 +2822,54 @@ msgstr ""
 "URL-malli, jota kÃ¤ytetÃ¤Ã¤n vapaa/varattu tiedon varaosoitteena. %u korvataan "
 "sÃ¤hkÃ¶postiosoitteen kÃ¤yttÃ¤jÃ¤osalla ja %d aluenimellÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 "OletusaikavyÃ¶hyke kÃ¤ytettÃ¤vissÃ¤ pÃ¤ivÃ¤mÃ¤Ã¤rissÃ¤ ja kalenterissa, muodossa "
-"kÃ¤Ã¤ntÃ¤mÃ¤tÃ¶n Olsenin aikavyÃ¶hyketietokantamuoto, esimerkiksi \"Finland/"
-"Helsinki\"."
+"kÃ¤Ã¤ntÃ¤mÃ¤tÃ¶n Olsenin aikavyÃ¶hyketietokantamuoto, esimerkiksi "
+"\"Finland/Helsinki\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.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 ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 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 ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "PÃ¤ivÃ¤nÃ¤kymÃ¤n toissijainen aikavyÃ¶hyke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 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)."
+"TÃ¤llÃ¤ asetuksella voi olla kolme arvoa: \"0\" (ei virheitÃ¤), \"1\" "
+"(varoitukset) tai \"2\" (vianetsintÃ¤viestit)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "ViimeisimmÃ¤n hÃ¤lytyksen suoritusaika, time_t yksikkÃ¶nÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "AikavyÃ¶hyke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2707,66 +2877,68 @@ msgstr ""
 "Tapahtumien lÃ¤pinÃ¤kyvyys kalenterinÃ¤kymissÃ¤. Arvo on vÃ¤liltÃ¤ 0 (lÃ¤pinÃ¤kyvÃ¤) "
 "ja 1 (peittÃ¤vÃ¤)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "24-tunnin kello"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
-msgstr ""
+msgstr "Korostetun ensisijaisen kalenterin URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
-msgstr ""
+msgstr "Korostetun ensisijaisen muistilappuluettelon URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
-msgstr ""
+msgstr "Korostetun ensisijaisen tehtÃ¤vÃ¤listan URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Oletusmuistutusten yksikkÃ¶, \"minutes\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"YksikkÃ¶, jonka avulla pÃ¤Ã¤tetÃ¤Ã¤n milloin tehtÃ¤viÃ¤ piilotetaan. Arvot \"minutes"
-"\", \"hours\" tai \"days\"."
+"YksikkÃ¶, jonka avulla pÃ¤Ã¤tetÃ¤Ã¤n milloin tehtÃ¤viÃ¤ piilotetaan. Arvot "
+"\"minutes\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "KÃ¤ytÃ¤ jÃ¤rjestelmÃ¤n aikavyÃ¶hykettÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid ""
+"Use the system timezone instead of the timezone selected in Evolution."
+msgstr "KÃ¤ytÃ¤ jÃ¤rjestelmÃ¤n aikavyÃ¶hykettÃ¤ Evolutionista valitun sijasta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "Vaakapaneelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "Viikon alku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ViikonpÃ¤ivÃ¤ josta viikko alkaa, sunnuntaista (0) lauantaihin (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "KÃ¤ytetÃ¤Ã¤nkÃ¶ ilmoitusaluetta hÃ¤lytysten nÃ¤yttÃ¤miseen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "KysytÃ¤Ã¤nkÃ¶ vahvistusta poistettaessa tapaamista tai tehtÃ¤vÃ¤Ã¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+msgid ""
+"Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "KysytÃ¤Ã¤nkÃ¶ vahvistusta siivottaessa tapaamisia tai tehtÃ¤viÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -2774,84 +2946,82 @@ msgstr ""
 "Pakataanko viikonloput kuukausinÃ¤kymÃ¤ssÃ¤. TÃ¤mÃ¤ tiivistÃ¤Ã¤ lauantain ja "
 "sunnuntain yhden viikonpÃ¤ivÃ¤n kokoisiksi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to display the end time of events in the week and month views."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+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Ã¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "PiirretÃ¤Ã¤nkÃ¶ Marcus Bains-viiva (viiva nykyhetkessÃ¤) kalenteriin."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Piilotetaanko valmistuneet tehtÃ¤vÃ¤t tehtÃ¤vÃ¤nÃ¤kymistÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr ""
+msgstr "SiirrytÃ¤Ã¤nkÃ¶ kuukausinÃ¤kymÃ¤ssÃ¤ viikoittain, eikÃ¤ kuukausittain."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 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"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ luokkakenttÃ¤ tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "NÃ¤ytetÃ¤Ã¤nkÃ¶ roolikenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ tilakenttÃ¤ tapahtuman, tehtÃ¤vÃ¤t tai kokouksen muokkaimessa"
+msgstr ""
+"NÃ¤ytetÃ¤Ã¤nkÃ¶ tilakenttÃ¤ tapahtuman, tehtÃ¤vÃ¤t tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ aikavyÃ¶hykekenttÃ¤ tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "NÃ¤ytetÃ¤Ã¤nkÃ¶ tyyppikenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ viikkonumerot pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤- ja tyÃ¶viikkonÃ¤kymissÃ¤."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Whether to show week numbers in the date navigator."
-msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ viikkonumerot pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤selaimessa."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "TyÃ¶pÃ¤ivÃ¤t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "TyÃ¶pÃ¤ivÃ¤n pÃ¤Ã¤ttymistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "TyÃ¶pÃ¤ivÃ¤n pÃ¤Ã¤ttymisminuutti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "TyÃ¶pÃ¤ivÃ¤n alkamistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "TyÃ¶pÃ¤ivÃ¤n alkamisminuutti"
 
@@ -2859,19 +3029,19 @@ msgstr "TyÃ¶pÃ¤ivÃ¤n alkamisminuutti"
 msgid "Invalid object"
 msgstr "Virheellinen olio"
 
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "PÃ¤ivÃ¤nÃ¤kymÃ¤"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "TyÃ¶viikon nÃ¤kymÃ¤"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "TyÃ¶viikko"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "KuukausinÃ¤kymÃ¤"
 
@@ -2900,18 +3070,19 @@ msgstr "Luokka"
 msgid "Classification"
 msgstr "Luokittelu"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
-#: ../calendar/gui/e-cal-model.c:526 ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:510 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/misc/e-attachment-tree-view.c:514
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -2932,8 +3103,9 @@ msgstr "On olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:721
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "Sijainti"
 
@@ -2942,20 +3114,21 @@ msgstr "Sijainti"
 msgid "Organizer"
 msgstr "JÃ¤rjestÃ¤jÃ¤:"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
-#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:508 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "HenkilÃ¶kohtainen"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
-#: ../calendar/gui/e-cal-model.c:515 ../calendar/gui/e-cal-model.c:522
-#: ../calendar/gui/e-calendar-table.c:702 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-cal-model.c:506
+#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Julkinen"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:311
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -2964,7 +3137,7 @@ msgstr "Toistuvuus"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -2993,168 +3166,155 @@ msgstr "on"
 msgid "is not"
 msgstr "ei ole"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:627
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "Muokkaa hÃ¤lytystÃ¤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Ponnahdusikkuna hÃ¤lytykselle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Soita Ã¤Ã¤ni"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Suorita ohjelma"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>HÃ¤lytys</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>Asetukset</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>Toista</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "LisÃ¤Ã¤ hÃ¤lytys"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Alarm"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "Oma _viesti"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "Oma _hÃ¤lytysÃ¤Ã¤ni"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "_Viesti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "Asetukset"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "Valitse tiedosto"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "LÃ¤hetÃ¤:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "_Toista hÃ¤lytys"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "_Ã?Ã¤ni:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-msgid ""
-"before\n"
-"after"
-msgstr ""
-"ennen\n"
-"jÃ¤lkeen"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+msgid "after"
+msgstr "jÃ¤lkeen"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+msgid "before"
+msgstr "ennen"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+msgid "day(s)"
+msgstr "pÃ¤ivÃ¤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:37
+msgid "days"
+msgstr "pÃ¤ivÃ¤"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "tapaamisen pÃ¤Ã¤ttymistÃ¤"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "ylimÃ¤Ã¤rÃ¤istÃ¤ kertaa joka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"minuuttia\n"
-"tuntia\n"
-"pÃ¤ivÃ¤Ã¤"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+msgid "hour(s)"
+msgstr "tunti(a)"
 
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"minuuttia\n"
-"tuntia\n"
-"pÃ¤ivÃ¤Ã¤"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "minute(s)"
+msgstr "minuutti(a)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"tapaamisen alku\n"
-"tapaamisen loppu"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "start of appointment"
+msgstr "tapaamisen alkua"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Toimenpide/liipaisin"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "_LisÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "HÃ¤lytykset"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
-msgid "_Suggest automatic display of attachment"
-msgstr "_Ehdota liitteen automaattista nÃ¤yttÃ¤mistÃ¤"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
-msgid "Attach file(s)"
-msgstr "LiitÃ¤ tiedosto(t)"
-
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/event-page.c:2905
-#: ../calendar/gui/e-cal-model-tasks.c:773
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1159 ../filter/filter-rule.c:946
-#: ../mail/em-account-editor.c:919 ../mail/em-account-editor.c:1728
-#: ../modules/mail/e-mail-junk-hook.c:95
-#: ../plugins/calendar-weather/calendar-weather.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:378
-#: ../plugins/email-custom-header/email-custom-header.c:393
-#: ../plugins/exchange-operations/exchange-delegates-user.c:179
-#: ../plugins/itip-formatter/itip-formatter.c:2217
-#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1555
-#: ../widgets/misc/e-dateedit.c:1766
-#: ../widgets/misc/e-signature-combo-box.c:75
-#: ../widgets/table/e-cell-date-edit.c:312
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
+#: ../calendar/gui/e-day-view-time-item.c:797
+msgctxt "cal-second-zone"
 msgid "None"
-msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:343
+msgid "Select..."
+msgstr "Valitse..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hÃ¤lytyksille"
 
@@ -3166,304 +3326,282 @@ msgstr "PÃ¤ivÃ¤ys ja aika:"
 msgid "Date only:"
 msgstr "Vain pÃ¤ivÃ¤ys:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, 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Ã¤."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
 msgstr "(NÃ¤ytetÃ¤Ã¤n pÃ¤ivÃ¤nÃ¤kymÃ¤ssÃ¤)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 minuuttia\n"
-"30 minuuttia\n"
-"15 minuuttia\n"
-"10 minuuttia\n"
-"5 minuuttia"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
 msgstr ""
-"<i>%u ja %d korvataan kÃ¤yttÃ¤jÃ¤llÃ¤ ja aluenimellÃ¤ sÃ¤hkÃ¶postiosoitteesta.</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<span weight=\"bold\">Alarms</span>"
-msgstr "<span weight=\"bold\">HÃ¤lytykset</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">HÃ¤lytykset</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+msgid "10 minutes"
+msgstr "10 minuuttia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Date/Time Format</span>"
-msgstr "<span weight=\"bold\">PÃ¤ivÃ¤ys- ja aikamuotoilu</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "15 minuuttia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">Vapaa/varattu-tietojen oletuspalvelin</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "30 minuuttia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../mail/mail-config.glade.h:18
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">YleistÃ¤</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "60 minuuttia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">TehtÃ¤vÃ¤lista</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">Aika</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+msgid "Alerts"
+msgstr "HÃ¤lytykset"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">TyÃ¶viikko</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "PÃ¤ivÃ¤ys/aika -muotoilu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "PÃ¤ivÃ¤ _pÃ¤Ã¤ttyy:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+msgid "Days"
+msgstr "PÃ¤ivÃ¤Ã¤"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "NÃ¤ytÃ¤"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 msgid "Display alarms in _notification area only"
 msgstr "NÃ¤ytÃ¤ hÃ¤lytykset vain _ilmoitusalueella"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:82
-#: ../modules/addressbook/addressbook-config.c:1015
-#: ../modules/addressbook/ldap-config.glade.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:2567
-#: ../smime/gui/smime-ui.glade.h:28
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
+#: ../modules/addressbook/addressbook-config.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
 msgstr "Yleiset"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"minuuttia\n"
-"tuntia\n"
-"pÃ¤ivÃ¤Ã¤"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+msgid "Hours"
+msgstr "Tuntia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1109
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+msgid "Minutes"
+msgstr "Minuuttia"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"maanantai\n"
-"tiistai\n"
-"keskiviikko\n"
-"torstai\n"
-"perjantai\n"
-"lauantai\n"
-"sunnuntai"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:102
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../mail/mail-config.ui.h:80
 msgid "Pick a color"
 msgstr "Valitse vÃ¤ri"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "_Su"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
-msgstr ""
+msgstr "Vie_ritÃ¤ kuukausinÃ¤kymÃ¤Ã¤ viikoittain"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "_Toinen aikavyÃ¶hyke:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "Valitse kalenterit, joiden hÃ¤lytykset lÃ¤hetetÃ¤Ã¤n"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Sh_ow a reminder"
 msgstr "NÃ¤ytÃ¤ muistutus"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show a _reminder"
 msgstr "NÃ¤ytÃ¤ _muistutus"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Show week _numbers in date navigator"
-msgstr "NÃ¤ytÃ¤ _viikkonumerot"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "NÃ¤ytÃ¤ viikkonumero pÃ¤ivÃ¤- ja tyÃ¶viikkonÃ¤kymissÃ¤"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+msgid "Show week _numbers"
+msgstr "NÃ¤ytÃ¤ viikko_numerot"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_asks due today:"
 msgstr "_TÃ¤nÃ¤Ã¤n erÃ¤Ã¤ntyvÃ¤t tehtÃ¤vÃ¤t:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_hu"
 msgstr "_To"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "TehtÃ¤vÃ¤lista"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "Template:"
 msgstr "Pohja:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "Aika"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
-msgstr "AikavyÃ¶hyke: "
+msgstr "AikavyÃ¶hyke:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Time format:"
 msgstr "Ajan muoto:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Use s_ystem time zone"
 msgstr "NÃ¤ytÃ¤ _jÃ¤rjestelmÃ¤n aikavyÃ¶hyke"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "Wee_k starts on:"
 msgstr "Viikon ensimmÃ¤inen pÃ¤ivÃ¤:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../modules/calendar/e-cal-shell-view-actions.c:1597
+msgid "Work Week"
+msgstr "TyÃ¶viikko"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Work days:"
 msgstr "TyÃ¶pÃ¤ivÃ¤t:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tuntia (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_24 hour"
 msgstr "_24 tuntia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "PyydÃ¤ _vahvistusta poistettaessa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Compress weekends in month view"
 msgstr "_TiivistÃ¤ viikonloput kuukausinÃ¤kymÃ¤ssÃ¤"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Day begins:"
 msgstr "_PÃ¤ivÃ¤ alkaa:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Fri"
 msgstr "_Pe"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Mon"
 msgstr "_Ma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Overdue tasks:"
 msgstr "_ErÃ¤pÃ¤ivÃ¤n ylittÃ¤neet tehtÃ¤vÃ¤t:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Sat"
 msgstr "_La"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr "_NÃ¤ytÃ¤ tapaamisten loppumisajat viikko- ja kuukausinÃ¤kymissÃ¤"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Time divisions:"
 msgstr "_Aikajaot:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Tue"
 msgstr "_Ti"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Wed"
 msgstr "_Ke"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "ennen joka vuosipÃ¤ivÃ¤Ã¤ ja syntymÃ¤pÃ¤ivÃ¤Ã¤"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every appointment"
 msgstr "ennen tapaamista"
 
@@ -3472,15 +3610,14 @@ msgid "Type:"
 msgstr "Tyyppi:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:542
+#: ../modules/addressbook/addressbook-config.c:500
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:150
-#: ../modules/addressbook/ldap-config.glade.h:36
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
 msgid "_Name:"
 msgstr "_Nimi:"
@@ -3501,10 +3638,6 @@ msgstr "_Kopioi muistilappujen sisÃ¤ltÃ¶ paikallisesti yhteydettÃ¶mÃ¤Ã¤n kÃ¤ytt
 msgid "Colo_r:"
 msgstr "VÃ¤_ri:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "TehtÃ¤vÃ¤lista"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Muistilappulista"
@@ -3569,7 +3702,8 @@ msgstr "Muistilappua on muutettu."
 
 #: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgid ""
+"%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Olet tehnyt muutoksia. Unohda nÃ¤mÃ¤ muutokset ja pÃ¤ivitÃ¤ muokkain?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:102
@@ -3582,260 +3716,264 @@ msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 msgid "Validation error: %s"
 msgstr "Tarkistusvirhe: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2350
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
 msgid " to "
 msgstr " - "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2354
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
 msgid "Completed "
-msgstr "Valmis"
+msgstr "Valmis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2361
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
 msgid " (Due "
-msgstr "(erÃ¤Ã¤ntyy "
+msgstr " (erÃ¤Ã¤ntyy "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2363
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
 msgid "Due "
 msgstr "ErÃ¤Ã¤ntyy "
 
-#: ../calendar/gui/dialogs/comp-editor.c:238
+#: ../calendar/gui/dialogs/comp-editor.c:252
 msgid "Could not save attachments"
 msgstr "LiitteitÃ¤ ei voitu tallentaa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:501
+#: ../calendar/gui/dialogs/comp-editor.c:521
 msgid "Could not update object"
 msgstr "Kohdetta ei voi pÃ¤ivittÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:596
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:603
+#: ../calendar/gui/dialogs/comp-editor.c:627
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:629
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:635
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "TehtÃ¤vÃ¤nanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:637
 #, c-format
 msgid "Task - %s"
 msgstr "TehtÃ¤vÃ¤ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:618
+#: ../calendar/gui/dialogs/comp-editor.c:642
 #, c-format
 msgid "Memo - %s"
 msgstr "Muistilappu - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:634
+#: ../calendar/gui/dialogs/comp-editor.c:658
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:788
+#: ../calendar/gui/dialogs/comp-editor.c:767
 msgid "Keep original item?"
 msgstr "SÃ¤ilytÃ¤ alkuperÃ¤inen?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:992
+#: ../calendar/gui/dialogs/comp-editor.c:954
 msgid "Click here to close the current window"
 msgstr "Sulje nykyinen ikkuna napsauttamalla tÃ¤stÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:999
-msgid "Copy selected text to the clipboard"
-msgstr "Kopioi valittu teksti leikepÃ¶ydÃ¤lle"
+#: ../calendar/gui/dialogs/comp-editor.c:961 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1483
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:403 ../widgets/misc/e-web-view.c:1027
+msgid "Copy the selection"
+msgstr "Kopioi valinta"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1490
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:1021
+msgid "Cut the selection"
+msgstr "Leikkaa valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-msgid "Cut selected text to the clipboard"
-msgstr "_Kopioi valittu teksti leikepÃ¶ydÃ¤lle"
+#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../shell/e-shell-window-actions.c:1497
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+msgid "Delete the selection"
+msgstr "Poista valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1013
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Click here to view help available"
 msgstr "Napsauta tÃ¤stÃ¤ nÃ¤yttÃ¤Ã¤ksesi ohje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1020
-msgid "Paste text from the clipboard"
-msgstr "LiitÃ¤ tekstiÃ¤ leikepÃ¶ydÃ¤ltÃ¤"
+#: ../calendar/gui/dialogs/comp-editor.c:989 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1532
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:1033
+msgid "Paste the clipboard"
+msgstr "LiitÃ¤ leikepÃ¶ytÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1041
+#: ../calendar/gui/dialogs/comp-editor.c:1010
 msgid "Click here to save the current window"
 msgstr "Tallenna nykyinen ikkuna napsauttamalla tÃ¤stÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:1017 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1602
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1055
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1062
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/e-mail-browser.c:111
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../shell/e-shell-window-actions.c:1599
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1069 ../mail/e-mail-browser.c:104
-#: ../shell/e-shell-window-actions.c:1606
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:1038 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1651
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
-#: ../shell/e-shell-window-actions.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1052
 msgid "_Insert"
 msgstr "L_isÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../composer/e-composer-actions.c:312
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:118
-#: ../shell/e-shell-window-actions.c:1648
+#: ../calendar/gui/dialogs/comp-editor.c:1066 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1693
 msgid "_View"
 msgstr "_NÃ¤ytÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
-#: ../composer/e-composer-actions.c:304
+#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../composer/e-composer-actions.c:240
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Click here to attach a file"
 msgstr "LiitÃ¤ tiedosta napsauttamalla tÃ¤stÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 msgid "Toggles whether to display categories"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1094
 msgid "Time _Zone"
 msgstr "_AikavyÃ¶hyke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "Toggles whether the time zone is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ aikavyÃ¶hykekenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "R_ole Field"
 msgstr "R_oolikenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Role field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ roolikenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ RSVP-kenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "_Status Field"
 msgstr "_TilakenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Toggles whether the Status field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ tilakenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "_Type Field"
 msgstr "T_yyppikenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ lÃ¤snÃ¤olijan tyyppi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1210
-#: ../composer/e-composer-private.c:68
+#: ../calendar/gui/dialogs/comp-editor.c:1179
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "ViimeisimmÃ¤t _asiakirjat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1683
-#: ../composer/e-composer-actions.c:507
+#: ../calendar/gui/dialogs/comp-editor.c:1710
+#: ../composer/e-composer-actions.c:428
 msgid "Attach"
 msgstr "LiitÃ¤ tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1738
-msgid "Save"
-msgstr "Tallenna"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2013
-#: ../calendar/gui/dialogs/comp-editor.c:2062
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:3040
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "TÃ¤hÃ¤n kohtaan tehdyt muutokset voidaan hylÃ¤tÃ¤, jos pÃ¤ivitys saapuu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2912 ../mail/em-utils.c:359
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:3008
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2974
+#: ../calendar/gui/dialogs/comp-editor.c:3070
 msgid "Unable to use current version!"
 msgstr "NykyistÃ¤ versiota ei voi kÃ¤yttÃ¤Ã¤!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "LÃ¤hdettÃ¤ ei voi avata"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "Kohdetta ei voi avata"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Poistetaanko tÃ¤mÃ¤ kohta kaikkien muiden vastaanottajien kansioista?"
 
@@ -3887,147 +4025,158 @@ msgstr "Muistilappua ei voi poistaa virheen takia"
 msgid "The item could not be deleted due to an error"
 msgstr "Kohdetta ei voi poistaa virheen takia"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "Yhteystiedot..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:416
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "Valtuuta:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "SyÃ¶tÃ¤ valtuutettu"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "_Alarms"
 msgstr "_HÃ¤lytykset"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "Click here to set or unset alarms for this event"
 msgstr ""
 "Napsauta tÃ¤stÃ¤, jos haluat asettaa tai poistaa tÃ¤mÃ¤n tehtÃ¤vÃ¤n hÃ¤lytyksiÃ¤"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "Show Time as _Busy"
+msgstr "NÃ¤ytÃ¤ aika _varattuna"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to show time as busy"
+msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ aika varattuna"
+
+#: ../calendar/gui/dialogs/event-editor.c:231
+#: ../calendar/gui/dialogs/event-editor.c:329
 msgid "_Recurrence"
 msgstr "T_oistuvuus"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Make this a recurring event"
 msgstr "Muuta tÃ¤mÃ¤ tapahtuma toistuvaksi"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:238
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Send Options"
 msgstr "LÃ¤hetysasetukset"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "Insert advanced send options"
 msgstr "LisÃ¤Ã¤ erityisiÃ¤ lÃ¤hetysvaihtoehtoja"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "All _Day Event"
 msgstr "Koko _pÃ¤ivÃ¤n tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Toggles whether to have All Day Event"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ onko tÃ¤mÃ¤ koko pÃ¤ivÃ¤n tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
-msgid "Show Time as _Busy"
-msgstr "NÃ¤ytÃ¤ aika _varattuna"
-
-#: ../calendar/gui/dialogs/event-editor.c:236
-msgid "Toggles whether to show time as busy"
-msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ aika varattuna"
-
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:259
+#: ../calendar/gui/dialogs/event-editor.c:341
 msgid "_Free/Busy"
 msgstr "_Vapaa/Varattu"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:261
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../calendar/gui/dialogs/event-editor.c:292
+#: ../calendar/gui/dialogs/event-editor.c:308
 msgid "Appoint_ment"
 msgstr "Tapaa_minen"
 
-#: ../calendar/gui/dialogs/event-page.c:750
+#: ../calendar/gui/dialogs/event-editor.c:346
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+msgid "_Alarm"
+msgstr "_HÃ¤lytys"
+
+#: ../calendar/gui/dialogs/event-editor.c:369
+msgid "Attendee_s"
+msgstr "Osallistujat"
+
+#: ../calendar/gui/dialogs/event-page.c:751
 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/dialogs/event-page.c:754
+#: ../calendar/gui/dialogs/event-page.c:755
 msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr ""
+msgstr "Tapahtumaa ei voi muokata tÃ¤ysin, koska et ole sen jÃ¤rjestÃ¤jÃ¤"
 
-#: ../calendar/gui/dialogs/event-page.c:766
-#: ../calendar/gui/dialogs/event-page.c:2662
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2722
 msgid "This event has alarms"
 msgstr "Tapahtumassa on hÃ¤lytyksiÃ¤"
 
-#: ../calendar/gui/dialogs/event-page.c:829
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:834
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "_JÃ¤rjestÃ¤jÃ¤:"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:881
 msgid "_Delegatees"
 msgstr "_Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:883
 msgid "Atte_ndees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:1064
+#: ../calendar/gui/dialogs/event-page.c:1098
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupÃ¤ivÃ¤mÃ¤Ã¤rÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1067
+#: ../calendar/gui/dialogs/event-page.c:1101
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman pÃ¤Ã¤ttymispÃ¤ivÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:833
+#: ../calendar/gui/dialogs/event-page.c:1272
+#: ../calendar/gui/dialogs/memo-page.c:658
+#: ../calendar/gui/dialogs/task-page.c:864
 msgid "Start date is wrong"
 msgstr "AloituspÃ¤ivÃ¤ys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1248
+#: ../calendar/gui/dialogs/event-page.c:1282
 msgid "End date is wrong"
 msgstr "LopetuspÃ¤ivÃ¤ys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1271
+#: ../calendar/gui/dialogs/event-page.c:1305
 msgid "Start time is wrong"
 msgstr "Alkamisaika on vÃ¤Ã¤rin"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1440
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/memo-page.c:699
+#: ../calendar/gui/dialogs/task-page.c:924
 msgid "The organizer selected no longer has an account."
 msgstr "Valitulla jÃ¤rjestÃ¤jÃ¤llÃ¤ ei enÃ¤Ã¤ ole kÃ¤yttÃ¤jÃ¤tiliÃ¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1446
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:1480
+#: ../calendar/gui/dialogs/memo-page.c:705
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "An organizer is required."
 msgstr "JÃ¤rjestÃ¤jÃ¤ vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1471
-#: ../calendar/gui/dialogs/task-page.c:923
+#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/task-page.c:954
 msgid "At least one attendee is required."
 msgstr "VÃ¤hintÃ¤Ã¤n yksi lÃ¤snÃ¤olija vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:2535
+#: ../calendar/gui/dialogs/event-page.c:2595
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalenteria \"%s\" ei voi avata"
@@ -4038,172 +4187,143 @@ msgstr "Kalenteria \"%s\" ei voi avata"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2579
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1717
+#: ../calendar/gui/dialogs/event-page.c:2639
+#: ../calendar/gui/dialogs/memo-page.c:916
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Toimit henkilÃ¶n %s puolesta"
 
-#: ../calendar/gui/dialogs/event-page.c:2879
+#: ../calendar/gui/dialogs/event-page.c:2941
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d pÃ¤ivÃ¤ ennen tapaamista"
 msgstr[1] "%d pÃ¤ivÃ¤Ã¤ ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2885
+#: ../calendar/gui/dialogs/event-page.c:2947
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tunti ennen tapaamista"
 msgstr[1] "%d tuntia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2891
+#: ../calendar/gui/dialogs/event-page.c:2953
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuutti ennen tapaamista"
 msgstr[1] "%d minuuttia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2904
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgid "Customize"
 msgstr "Muokkaa"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"15 minuuttia ennen tapaamista\n"
-"1 tunti ennen tapaamista\n"
-"1 pÃ¤ivÃ¤ ennen tapaamista"
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2968
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "Ei hÃ¤lytystÃ¤"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+msgid "1 day before appointment"
+msgstr "Yksi pÃ¤ivÃ¤ ennen tapaamista"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgid "1 hour before appointment"
+msgstr "Yksi tunti ennen tapaamista"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+msgid "15 minutes before appointment"
+msgstr "15 minuuttia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
 msgstr "O_sanottajat..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "Oma hÃ¤lytys:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "Tapahtuman kuvaus:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-msgid "_Alarm"
-msgstr "_HÃ¤lytys"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "K_uvaus:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:363
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:356
 msgid "_Location:"
 msgstr "_Sijainti:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Aika:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:167 ../mail/mail-dialogs.glade.h:21
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
-#: ../smime/gui/smime-ui.glade.h:49
-msgid ""
-"a\n"
-"b"
-msgstr ""
-"a\n"
-"b"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid ""
-"for\n"
-"until"
-msgstr ""
-"toista\n"
-"kunnes"
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgid "for"
+msgstr "kesto"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+msgid "until"
+msgstr "kunnes"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:294
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:515
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-#: ../plugins/google-account-setup/google-source.c:740
-msgid "hours"
-msgstr "tuntia"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../modules/addressbook/ldap-config.glade.h:43
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:514
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-#: ../plugins/google-account-setup/google-source.c:739
-msgid "minutes"
-msgstr "minuutti"
-
-#: ../calendar/gui/dialogs/memo-editor.c:110 ../calendar/gui/print.c:2499
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/gui/dialogs/memo-page.c:347
+#: ../calendar/gui/dialogs/memo-page.c:350
 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/dialogs/memo-page.c:351
+#: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr ""
+msgstr "Muistilappua ei voi muokata tÃ¤ysin, koska et ole sen jÃ¤rjestÃ¤jÃ¤"
 
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:877
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Muistilappuja kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/memo-page.c:1037 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:938 ../mail/em-format-html.c:2137
-#: ../mail/em-format-html.c:2195 ../mail/em-format-html.c:2220
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1044 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:963 ../mail/em-format-html.c:2258
+#: ../mail/em-format-html.c:2317 ../mail/em-format-html.c:2341
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:81
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "_AlkamispÃ¤ivÃ¤:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "Vastaan_ottajat:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:378
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_RyhmÃ¤:"
 
@@ -4214,8 +4334,10 @@ msgstr "Olet muokkaamassa toistuvaa tapahtumaa. MitÃ¤ haluat muokata?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:55
 #, 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?"
+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/dialogs/recur-comp.c:59
 #, c-format
@@ -4248,25 +4370,25 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "TÃ¤mÃ¤ tapaaminen sisÃ¤ltÃ¤Ã¤ toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Toistuvuuden pÃ¤ivÃ¤ys on virheellinen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:934
 msgid "End time of the recurrence was before event's start"
-msgstr "Toistuvuuden pÃ¤Ã¤ttymisÃ¤pÃ¤ivÃ¤ oli ennen tapahtuman alkua"
+msgstr "Toistuvuuden pÃ¤Ã¤ttymispÃ¤ivÃ¤ oli ennen tapahtuman alkua"
 
 #. 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/dialogs/recurrence-page.c:958
+#: ../calendar/gui/dialogs/recurrence-page.c:963
 msgid "on"
-msgstr " "
+msgstr "KÃ¤ytÃ¶ssÃ¤"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [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/dialogs/recurrence-page.c:1015
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1020
 msgid "first"
 msgstr "ensimmÃ¤inen"
 
@@ -4274,159 +4396,142 @@ msgstr "ensimmÃ¤inen"
 #. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
 #. * (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/dialogs/recurrence-page.c:1021
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "second"
 msgstr "toinen"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (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/dialogs/recurrence-page.c:1026
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "third"
 msgstr "kolmas"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
 #. * (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/dialogs/recurrence-page.c:1031
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "fourth"
 msgstr "neljÃ¤s"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
 #. * (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/dialogs/recurrence-page.c:1036
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fifth"
 msgstr "viides"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (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/dialogs/recurrence-page.c:1041
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 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/dialogs/recurrence-page.c:1065
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
 msgid "Other Date"
 msgstr "Toinen pÃ¤ivÃ¤ys"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * 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/dialogs/recurrence-page.c:1071
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1076
 msgid "1st to 10th"
 msgstr "1. - 10."
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * 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/dialogs/recurrence-page.c:1077
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "11th to 20th"
 msgstr "11. - 20."
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * 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/dialogs/recurrence-page.c:1083
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 msgid "21st to 31st"
 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/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "day"
 msgstr "pÃ¤ivÃ¤"
 
 #. 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/dialogs/recurrence-page.c:1237
+#. 
+#: ../calendar/gui/dialogs/recurrence-page.c:1242
 msgid "on the"
-msgstr "  "
+msgstr "seuraavasti:"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1411
 msgid "occurrences"
 msgstr "tapahtumiskertaa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2117
+#: ../calendar/gui/dialogs/recurrence-page.c:2112
 msgid "Add exception"
 msgstr "LisÃ¤Ã¤ poikkeus"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2158
+#: ../calendar/gui/dialogs/recurrence-page.c:2153
 msgid "Could not get a selection to modify."
 msgstr "Valintaa ei voi hakea muokattavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2159
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2203
 msgid "Could not get a selection to delete."
 msgstr "Valintaa ei voitu hakea poistettavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2330
 msgid "Date/Time"
 msgstr "PÃ¤ivÃ¤ys/aika"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>Poikkeukset</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
-msgid "<b>Preview</b>"
-msgstr "<b>Esikatselu</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>Toistuvuus</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 msgid "Every"
 msgstr "Joka"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "Poikkeukset"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+msgid "Preview"
+msgstr "Esikatselu"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "Tapaaminen on _toistuva"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"pÃ¤ivÃ¤Ã¤\n"
-"viikkoa\n"
-"kuukautta\n"
-"vuotta"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+msgid "forever"
+msgstr "ikuisesti"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
-msgstr ""
-"toista\n"
-"kunnes\n"
-"pysyvÃ¤sti"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgid "month(s)"
+msgstr "kuukausi"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgid "week(s)"
+msgstr "viikko"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
+msgstr "vuosi"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
@@ -4445,115 +4550,163 @@ msgstr "ValmistumispÃ¤ivÃ¤ on vÃ¤Ã¤rin"
 msgid "Web Page"
 msgstr "WWW-sivu"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">LisÃ¤asetukset</span>"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
+msgid "Completed"
+msgstr "Valmis"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1178 ../widgets/misc/e-send-options.ui.h:8
+msgid "High"
+msgstr "Korkea"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">Tila</span>"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:289
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2645
+msgid "In Progress"
+msgstr "TyÃ¶n alla"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"Korkea\n"
-"Tavallinen\n"
-"Matala\n"
-"Ei mÃ¤Ã¤ritelty"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1176 ../widgets/misc/e-send-options.ui.h:9
+msgid "Low"
+msgstr "Matala"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"Ei aloitettu\n"
-"Kesken\n"
-"Valmis\n"
-"Peruttu"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1254 ../calendar/gui/e-task-table.c:509
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1177
+#: ../widgets/misc/e-send-options.ui.h:11
+msgid "Normal"
+msgstr "Tavallinen"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Ei aloitettu"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "Pros_enttia valmiina:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "_Tila:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. 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/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1748
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Tila"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Undefined"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "_ValmistumispÃ¤ivÃ¤:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "_Status Details"
 msgstr "_Tilan yksityiskohdat"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "Click to change or view the status details of the task"
-msgstr "Napsauta jos haluat muuttaa tai nÃ¤yttÃ¤Ã¤ tehtÃ¤vÃ¤n tilan yksityiskohtia"
+msgstr ""
+"Napsauta jos haluat muuttaa tai nÃ¤yttÃ¤Ã¤ tehtÃ¤vÃ¤n tilan yksityiskohtia"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:360
+#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "_LÃ¤hetysasetukset"
 
-#: ../calendar/gui/dialogs/task-editor.c:335
+#: ../calendar/gui/dialogs/task-editor.c:323
 msgid "_Task"
 msgstr "_TehtÃ¤vÃ¤"
 
-#: ../calendar/gui/dialogs/task-editor.c:338
+#: ../calendar/gui/dialogs/task-editor.c:326
 msgid "Task Details"
 msgstr "TehtÃ¤vÃ¤n yksityiskohdat"
 
-#: ../calendar/gui/dialogs/task-page.c:334
+#: ../calendar/gui/dialogs/task-page.c:336
 msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "TehtÃ¤vÃ¤Ã¤ ei voi muokata, koska valittu tehtÃ¤vÃ¤lista on vain luettavissa"
+msgstr ""
+"TehtÃ¤vÃ¤Ã¤ ei voi muokata, koska valittu tehtÃ¤vÃ¤lista on vain luettavissa"
 
-#: ../calendar/gui/dialogs/task-page.c:338
+#: ../calendar/gui/dialogs/task-page.c:340
 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/dialogs/task-page.c:386
-#: ../calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.c:391
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "_JÃ¤rjestÃ¤jÃ¤:"
 
-#: ../calendar/gui/dialogs/task-page.c:806
+#: ../calendar/gui/dialogs/task-page.c:837
 msgid "Due date is wrong"
 msgstr "ErÃ¤pÃ¤ivÃ¤ on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1674
+#: ../calendar/gui/dialogs/task-page.c:1701
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "TehtÃ¤viÃ¤ kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "_Luokat..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "_ErÃ¤pÃ¤ivÃ¤:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "AikavyÃ¶hyke:"
 
@@ -4573,31 +4726,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d viikko"
 msgstr[1] "%d viikkoa"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:406 ../calendar/gui/misc.c:116
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d tunti"
-msgstr[1] "%d tuntia"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:412 ../calendar/gui/misc.c:122
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuutti"
-msgstr[1] "%d minuuttia"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/e-alarm-list.c:418 ../calendar/gui/misc.c:126
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunti"
-msgstr[1] "%d sekuntia"
-
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Tuntematon suoritettava tehtÃ¤vÃ¤"
@@ -4658,107 +4786,53 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
-#: ../calendar/gui/e-cal-component-preview.c:110 ../filter/filter-rule.c:863
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "NimetÃ¶n"
 
-#: ../calendar/gui/e-cal-component-preview.c:116
+#: ../calendar/gui/e-cal-component-preview.c:198
 msgid "Categories:"
 msgstr "Luokat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:151
-#: ../calendar/gui/e-itip-control.c:1163
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:158
-#: ../calendar/gui/e-cal-component-preview.c:169
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
 msgid "Start Date:"
 msgstr "AlkamispÃ¤ivÃ¤:"
 
-#: ../calendar/gui/e-cal-component-preview.c:180
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "ErÃ¤pÃ¤ivÃ¤:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:191
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1066
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:777
-#: ../calendar/gui/e-cal-model-tasks.c:854
-#: ../calendar/gui/e-calendar-table.c:220
-#: ../calendar/gui/e-calendar-table.c:231
-#: ../calendar/gui/e-calendar-table.c:798 ../calendar/gui/print.c:2572
-msgid "In Progress"
-msgstr "TyÃ¶n alla"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:198
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-calendar-table.c:222
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:799 ../calendar/gui/e-itip-control.c:948
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/print.c:2575 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:360
-msgid "Completed"
-msgstr "Valmis"
-
-#: ../calendar/gui/e-cal-component-preview.c:205
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:775
-#: ../calendar/gui/e-calendar-table.c:218
-#: ../calendar/gui/e-calendar-table.c:229
-#: ../calendar/gui/e-calendar-table.c:797 ../calendar/gui/print.c:2569
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Ei aloitettu"
-
-#: ../calendar/gui/e-cal-component-preview.c:216
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
-#: ../calendar/gui/e-cal-component-preview.c:218
-#: ../calendar/gui/e-calendar-table.c:724 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1077
-msgid "High"
-msgstr "Korkea"
-
-#: ../calendar/gui/e-cal-component-preview.c:220
-#: ../calendar/gui/e-cal-model.c:1232 ../calendar/gui/e-calendar-table.c:725
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1076
-msgid "Normal"
-msgstr "Tavallinen"
-
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-calendar-table.c:726 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1075
-msgid "Low"
-msgstr "Matala"
-
-#: ../calendar/gui/e-cal-component-preview.c:239
-#: ../calendar/gui/e-itip-control.c:1219
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:65
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:368
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Created"
 msgstr "Luotu"
 
@@ -4778,17 +4852,16 @@ msgid "Start Date"
 msgstr "AloituspÃ¤ivÃ¤"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:776
+#: ../calendar/gui/e-task-table.c:560
 msgid "Free"
 msgstr "Vapaa"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:777
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../calendar/gui/e-cal-model-tasks.c:727
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4798,155 +4871,57 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:709
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Ei mitÃ¤Ã¤n"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1260
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "KyllÃ¤"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1260
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
 
-#: ../calendar/gui/e-cal-model.c:362 ../calendar/gui/gnome-cal.c:523
-#: ../shell/e-shell.c:720
-msgid "Shell Settings"
-msgstr "Kuoren asetukset"
-
-#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
-#: ../shell/e-shell.c:721
-msgid "Application-wide settings"
-msgstr "Ohjelmanlaajuiset asetukset"
+#: ../calendar/gui/e-cal-model.c:326
+msgid "Default Client"
+msgstr ""
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:528 ../calendar/gui/e-itip-control.c:1204
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-cal-model.c:512 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:977
-#: ../calendar/gui/print.c:994 ../e-util/e-charset.c:52
-#: ../mail/em-utils.c:1224 ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2242
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:932
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:1234
+#: ../calendar/gui/e-cal-model.c:1256
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:1236
+#: ../calendar/gui/e-cal-model.c:1258
 msgid "Assigned"
 msgstr "Annettu tehtÃ¤vÃ¤ksi"
 
-#: ../calendar/gui/e-calendar-table.c:337 ../calendar/gui/e-memo-table.c:270
-msgid "* No Summary *"
-msgstr "* Ei yhteenvetoa *"
-
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:1743 ../calendar/gui/e-memo-table.c:306
+#: ../calendar/gui/e-cal-model.c:2156
 #, c-format
-msgid "Organizer: %s <%s>"
-msgstr "JÃ¤rjestÃ¤jÃ¤: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:309
-#, c-format
-msgid "Organizer: %s"
-msgstr "JÃ¤rjestÃ¤jÃ¤: %s"
-
-#: ../calendar/gui/e-calendar-table.c:415 ../calendar/gui/e-memo-table.c:348
-msgid "Start: "
-msgstr "Alkaa:"
-
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/e-memo-table.c:366
-msgid "Due: "
-msgstr "ErÃ¤Ã¤ntyy:"
-
-#: ../calendar/gui/e-calendar-table.c:727 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
-
-#: ../calendar/gui/e-calendar-table.c:746
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:747
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:748
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:749
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:750
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:751
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:752
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:753
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:754
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:755
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:756
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:864 ../calendar/gui/print.c:1973
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:751
-#: ../modules/calendar/e-cal-shell-content.c:405
-#: ../modules/calendar/e-task-shell-view-actions.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
-#: ../modules/calendar/e-task-shell-view.c:426
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "TehtÃ¤vÃ¤t"
-
-#: ../calendar/gui/e-calendar-table.c:1108
-#: ../calendar/gui/e-calendar-view.c:610 ../calendar/gui/e-memo-table.c:894
-msgid "Deleting selected objects"
-msgstr "Poistetaan valitut kohteet"
-
-#: ../calendar/gui/e-calendar-table.c:1403
-#: ../calendar/gui/e-calendar-view.c:828 ../calendar/gui/e-memo-table.c:1118
-msgid "Updating objects"
-msgstr "PÃ¤ivitetÃ¤Ã¤n olioita"
+msgid "Opening %s"
+msgstr "Avataan %s"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4971,7 +4946,7 @@ msgstr "ErÃ¤pÃ¤ivÃ¤"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "Prioriteetti"
 
@@ -4979,82 +4954,113 @@ msgstr "Prioriteetti"
 msgid "Start date"
 msgstr "AloituspÃ¤ivÃ¤"
 
-#. 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-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1651
-#: ../calendar/gui/e-meeting-list-view.c:598
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Tila"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-list-view.c:566
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../calendar/gui/e-calendar-view.c:1598
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:395
+msgid "Cut selected events to the clipboard"
+msgstr "Leikkaa valitut tapahtumat leikepÃ¶ydÃ¤lle"
+
+#: ../calendar/gui/e-calendar-view.c:401
+msgid "Copy selected events to the clipboard"
+msgstr "Kopioi valitut tapahtumat leikepÃ¶ydÃ¤lle"
+
+#: ../calendar/gui/e-calendar-view.c:407
+msgid "Paste events from the clipboard"
+msgstr "LiitÃ¤ tapahtumat leikepÃ¶ydÃ¤ltÃ¤"
+
+#: ../calendar/gui/e-calendar-view.c:413
+msgid "Delete selected events"
+msgstr "Poista valitut tapahtumat"
+
+#: ../calendar/gui/e-calendar-view.c:432 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
+msgid "Deleting selected objects"
+msgstr "Poistetaan valitut kohteet"
+
+#: ../calendar/gui/e-calendar-view.c:620 ../calendar/gui/e-memo-table.c:842
+#: ../calendar/gui/e-task-table.c:1063
+msgid "Updating objects"
+msgstr "PÃ¤ivitetÃ¤Ã¤n olioita"
+
+#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "HyvÃ¤ksytty"
 
-#: ../calendar/gui/e-calendar-view.c:1599
-#: ../calendar/gui/e-itip-control.c:1200
+#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2236
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "HylÃ¤tty"
 
-#: ../calendar/gui/e-calendar-view.c:1600
+#: ../calendar/gui/e-calendar-view.c:1697
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-calendar-view.c:1698
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2239
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-calendar-view.c:1699
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitÃ¤"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1840 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:738
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "JÃ¤rjestÃ¤jÃ¤: %s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:1844 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:741
+#, c-format
+msgid "Organizer: %s"
+msgstr "JÃ¤rjestÃ¤jÃ¤: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1763 ../calendar/gui/print.c:2531
+#: ../calendar/gui/e-calendar-view.c:1860 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1891
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 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:165
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 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:173
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5066,13 +5072,13 @@ msgstr ""
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * to change the length of the time division in the calendar 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:750
+#. 
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuutin vÃ¤lein"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "NÃ¤ytÃ¤ toinen aikavyÃ¶hyke"
 
@@ -5082,8 +5088,8 @@ msgstr "NÃ¤ytÃ¤ toinen aikavyÃ¶hyke"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:843 ../calendar/gui/e-day-view.c:1888
-#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1665
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1839
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5093,10 +5099,10 @@ msgstr "%A %d %B"
 #. %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-day-view-top-item.c:847 ../calendar/gui/e-day-view.c:1905
-#: ../calendar/gui/e-week-view-main-item.c:368
-#: ../calendar/gui/ea-gnome-calendar.c:189
-#: ../modules/calendar/e-cal-shell-view-private.c:856
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1856
+#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5105,50 +5111,50 @@ msgstr "%a %d %b"
 #. 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-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1921
-#: ../calendar/gui/e-week-view-main-item.c:382
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:892
+#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1872
+#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:1041
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1124 ../calendar/gui/e-week-view.c:510
-#: ../calendar/gui/print.c:824
+#: ../calendar/gui/e-day-view.c:1072 ../calendar/gui/e-week-view.c:740
+#: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1127 ../calendar/gui/e-week-view.c:513
-#: ../calendar/gui/print.c:826
+#: ../calendar/gui/e-day-view.c:1075 ../calendar/gui/e-week-view.c:743
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2626
+#: ../calendar/gui/e-day-view.c:2569
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
 
-#: ../calendar/gui/e-itip-control.c:767
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "KyllÃ¤ (monimutkainen toistuvuus)"
 
-#: ../calendar/gui/e-itip-control.c:784
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Joka pÃ¤ivÃ¤"
 msgstr[1] "Joka %d:s pÃ¤ivÃ¤"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Joka kerta"
 msgstr[1] "Joka %d:s kerta"
 
-#: ../calendar/gui/e-itip-control.c:804
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -5156,397 +5162,397 @@ msgstr[0] "Joka viikko "
 msgstr[1] "Joka %d:s viikko "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " ja "
 
-#: ../calendar/gui/e-itip-control.c:824
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
-msgstr "%s:s pÃ¤ivÃ¤"
+msgstr "%s:s pÃ¤ivÃ¤ "
 
-#: ../calendar/gui/e-itip-control.c:840
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
-msgstr "%s %s"
+msgstr "%s %s "
 
-#: ../calendar/gui/e-itip-control.c:851
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "kerran kuussa"
 msgstr[1] "kerran %d:s kuu"
 
-#: ../calendar/gui/e-itip-control.c:863
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Joka vuosi"
 msgstr[1] "Joka %d:s vuosi"
 
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
-msgstr[0] " kaikkiaan %d kerran"
-msgstr[1] " kaikkiaan %d kertaa"
+msgstr[0] "kaikkiaan %d kerran"
+msgstr[1] "kaikkiaan %d kertaa"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:887
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
-msgstr ", pÃ¤Ã¤ttyen"
+msgstr ", pÃ¤Ã¤ttyen "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "Alkaa"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "PÃ¤Ã¤ttyy"
 
-#: ../calendar/gui/e-itip-control.c:963
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
-msgstr "ErÃ¤Ã¤ntyy "
+msgstr "ErÃ¤Ã¤ntyy"
 
-#: ../calendar/gui/e-itip-control.c:1004 ../calendar/gui/e-itip-control.c:1061
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "iCalendarin tiedot"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1021
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "iCalendarin virhe"
 
-#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
-#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
+#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 msgid "An unknown person"
 msgstr "Tuntematon henkilÃ¶"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1132
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Tarkista seuraavat tiedot ja valitse toimenpide allaolevasta valikosta"
 
-#. Location
-#: ../calendar/gui/e-itip-control.c:1173
-#: ../plugins/itip-formatter/itip-view.c:1023
-msgid "Location:"
-msgstr "Sijainti:"
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:2313
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Ei mitÃ¤Ã¤n"
 
-#: ../calendar/gui/e-itip-control.c:1196
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2329
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyvÃ¤ksytty"
 
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1277
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Kokous on peruttu, mutta sitÃ¤ ei lÃ¶ytynyt kalentereistasi"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1279
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "TehtÃ¤vÃ¤ on peruttu, mutta sitÃ¤ ei lÃ¶ytynyt tehtÃ¤vÃ¤listoiltasi"
 
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "Kokouksen tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pyytÃ¤Ã¤ %s lÃ¤snÃ¤oloa tapaamisessa."
 
-#: ../calendar/gui/e-itip-control.c:1371
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pyytÃ¤Ã¤ lÃ¤snÃ¤oloasi kokouksessa."
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "Kokousehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> toivoo liittÃ¤mistÃ¤Ã¤n olemassaolevaan kokoukseen."
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "Kokouksen pÃ¤ivitys"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmÃ¤t tapaamistiedot."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "Kokouksen pÃ¤ivityspyyntÃ¶"
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> on vastannut tapaamispyyntÃ¶Ã¶n."
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "Vastaus kokouspyyntÃ¶Ã¶n"
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> perui kokouksen."
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "Kokouksen peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1410 ../calendar/gui/e-itip-control.c:1487
-#: ../calendar/gui/e-itip-control.c:1527
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> lÃ¤hetti jÃ¤rjettÃ¶mÃ¤n viestin."
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> on julkaissut tehtÃ¤vÃ¤tietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "TehtÃ¤vÃ¤n tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pyytÃ¤Ã¤ %s tekemÃ¤Ã¤n tyÃ¶tehtÃ¤vÃ¤n."
 
-#: ../calendar/gui/e-itip-control.c:1448
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pyytÃ¤Ã¤ sinua suorittamaan tehtÃ¤vÃ¤n."
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "TehtÃ¤vÃ¤ehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> toivoo lisÃ¤ystÃ¤Ã¤n olemassaolevaan tehtÃ¤vÃ¤Ã¤n."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "TehtÃ¤vÃ¤n pÃ¤ivitys"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmÃ¤t tyÃ¶tehtÃ¤vÃ¤tiedot."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "TehtÃ¤vÃ¤n pÃ¤ivityspyyntÃ¶"
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> on vastannut tyÃ¶tehtÃ¤vÃ¤n antoon."
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "Vastaus tehtÃ¤vÃ¤Ã¤n"
 
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> perui tehtÃ¤vÃ¤n."
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "TehtÃ¤vÃ¤n peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "Huono tehtÃ¤vÃ¤-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> on julkaissut vapaa/varattu-tietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pyytÃ¤Ã¤ sinun vapaa/varattu -tietoja."
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "Vapaa/varattu-tiedustelu"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> on vastannut vapaa/varattu -kyselyyn."
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "Vapaa/varattu-vastaus"
 
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: ../calendar/gui/e-itip-control.c:1604
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "Viesti ei nÃ¤ytÃ¤ olevan kunnolla muotoiltu."
 
-#: ../calendar/gui/e-itip-control.c:1663
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "Viesti sisÃ¤ltÃ¤Ã¤ vain pyyntÃ¶jÃ¤, jotka eivÃ¤t ole tuettu."
 
-#: ../calendar/gui/e-itip-control.c:1696
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Liite ei sisÃ¤llÃ¤ kelvollista kalenteriviestiÃ¤"
 
-#: ../calendar/gui/e-itip-control.c:1734
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "LiitteessÃ¤ ei ole nÃ¤ytettÃ¤viÃ¤ kalenteriviestejÃ¤"
 
-#: ../calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "PÃ¤ivitys valmis\n"
 
-#: ../calendar/gui/e-itip-control.c:2010
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Kohde on virheellinen eikÃ¤ sitÃ¤ voi pÃ¤ivittÃ¤Ã¤\n"
 
-#: ../calendar/gui/e-itip-control.c:2027
+#: ../calendar/gui/e-itip-control.c:2022
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Vastaus ei ole tÃ¤mÃ¤nhetkiseltÃ¤ lÃ¤snÃ¤olijalta. LisÃ¤Ã¤ lÃ¤snÃ¤olijaksi?"
 
-#: ../calendar/gui/e-itip-control.c:2045
+#: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "LÃ¤snÃ¤olon tilaa ei voi pÃ¤ivittÃ¤Ã¤ virheellisen tilan takia!\n"
 
-#: ../calendar/gui/e-itip-control.c:2069
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "LÃ¤snÃ¤olon tila pÃ¤ivitetty\n"
 
-#: ../calendar/gui/e-itip-control.c:2076
-#: ../plugins/itip-formatter/itip-formatter.c:1394
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 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"
+msgstr ""
+"LÃ¤snÃ¤olon tilaa ei voi pÃ¤ivittÃ¤Ã¤, koska kohdetta ei enÃ¤Ã¤ ole olemassa"
 
-#: ../calendar/gui/e-itip-control.c:2107 ../calendar/gui/e-itip-control.c:2164
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "LÃ¤hetetty\n"
 
-#: ../calendar/gui/e-itip-control.c:2113 ../calendar/gui/e-itip-control.c:2172
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "Kohdetta ei voi lÃ¤hettÃ¤Ã¤!\n"
 
-#: ../calendar/gui/e-itip-control.c:2290
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "Valitse toiminto:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2319
-#: ../calendar/gui/e-meeting-list-view.c:586
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "KuittauspyyntÃ¶"
 
-#: ../calendar/gui/e-itip-control.c:2359
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "PÃ¤ivitÃ¤"
 
-#: ../calendar/gui/e-itip-control.c:2383
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "HyvÃ¤ksy"
 
-#: ../calendar/gui/e-itip-control.c:2384
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "HyvÃ¤ksy alustavasti"
 
-#: ../calendar/gui/e-itip-control.c:2385
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "HylkÃ¤Ã¤"
 
-#: ../calendar/gui/e-itip-control.c:2410
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "LÃ¤hetÃ¤ vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2434
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "PÃ¤ivitÃ¤ vastaajan tila"
 
-#: ../calendar/gui/e-itip-control.c:2458
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "LÃ¤hetÃ¤ viimeisimmÃ¤t tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2482
-#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
-msgstr " - "
+msgstr "-"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "Kalenteriviesti"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "PÃ¤ivÃ¤ys:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "Ladataan kalenteria"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "Ladataan kalenteria..."
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "JÃ¤rjestÃ¤jÃ¤:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "Palvelinviesti:"
 
@@ -5567,72 +5573,72 @@ msgid "Resources"
 msgstr "Resurssit"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:973
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "HenkilÃ¶"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:974 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "RyhmÃ¤"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/print.c:975
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Huone"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:990
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Vaadittu lÃ¤snÃ¤olija"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/print.c:992
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen lÃ¤snÃ¤olija"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Ei lÃ¤snÃ¤"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitÃ¤"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:541
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
-msgstr "Osallistuja                       "
+msgstr "Osallistuja                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "TyÃ¶n alla"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2272
+#: ../calendar/gui/e-meeting-time-sel.c:2309
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -5641,7 +5647,7 @@ msgstr "%A, %B %d, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2303
+#: ../calendar/gui/e-meeting-time-sel.c:2340
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5651,67 +5657,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "A_ttendees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "NÃ¤ytÃ¤ vain _tyÃ¶tunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:609
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
-msgstr "NÃ¤ytÃ¤ _etÃ¤Ã¤npÃ¤Ã¤"
+msgstr "NÃ¤ytÃ¤ _etÃ¤Ã¤mpÃ¤Ã¤"
 
-#: ../calendar/gui/e-meeting-time-sel.c:624
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "_Update free/busy"
 msgstr "_PÃ¤ivitÃ¤ vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:639
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:657
+#: ../calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:672
+#: ../calendar/gui/e-meeting-time-sel.c:676
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:689
+#: ../calendar/gui/e-meeting-time-sel.c:693
 msgid "_All people and resources"
 msgstr "_Kaikki henkilÃ¶t ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilÃ¶t ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "_Required people"
 msgstr "_Vaaditut henkilÃ¶t"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilÃ¶t ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:762
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:799
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
@@ -5739,86 +5745,197 @@ msgstr "Kieli"
 msgid "Member"
 msgstr "JÃ¤sen"
 
-#: ../calendar/gui/e-memo-table.c:647
-#: ../modules/calendar/e-cal-shell-content.c:429
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
-#: ../modules/calendar/e-memo-shell-view-actions.c:270
-#: ../modules/calendar/e-memo-shell-view.c:279
+#: ../calendar/gui/e-memo-table.c:411
+#: ../modules/calendar/e-cal-shell-content.c:463
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:432
 msgid "Memos"
 msgstr "Muistilaput"
 
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+msgid "* No Summary *"
+msgstr "* Ei yhteenvetoa *"
+
+#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+msgid "Start: "
+msgstr "Alkaa: "
+
+#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+msgid "Due: "
+msgstr "ErÃ¤Ã¤ntyy: "
+
+#: ../calendar/gui/e-memo-table.c:707
+msgid "Cut selected memos to the clipboard"
+msgstr "Leikkaa valitut muistilaput leikepÃ¶ydÃ¤lle"
+
+#: ../calendar/gui/e-memo-table.c:713
+msgid "Copy selected memos to the clipboard"
+msgstr "Kopioi valitut muistilaput leikepÃ¶ydÃ¤lle"
+
+#: ../calendar/gui/e-memo-table.c:719
+msgid "Paste memos from the clipboard"
+msgstr "LiitÃ¤ muistilaput leikepÃ¶ydÃ¤ltÃ¤"
+
+#: ../calendar/gui/e-memo-table.c:725
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
+msgid "Delete selected memos"
+msgstr "Poista valitut muistilaput"
+
+#: ../calendar/gui/e-memo-table.c:731
+msgid "Select all visible memos"
+msgstr "Valitse kaikki nÃ¤kyvissÃ¤ olevat muistilaput"
+
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "LisÃ¤Ã¤ muistilappu tÃ¤stÃ¤"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-task-table.c:530
+msgid "0%"
+msgstr "0%"
+
+#: ../calendar/gui/e-task-table.c:531
+msgid "10%"
+msgstr "10%"
+
+#: ../calendar/gui/e-task-table.c:532
+msgid "20%"
+msgstr "20%"
+
+#: ../calendar/gui/e-task-table.c:533
+msgid "30%"
+msgstr "30%"
+
+#: ../calendar/gui/e-task-table.c:534
+msgid "40%"
+msgstr "40%"
+
+#: ../calendar/gui/e-task-table.c:535
+msgid "50%"
+msgstr "50%"
+
+#: ../calendar/gui/e-task-table.c:536
+msgid "60%"
+msgstr "60%"
+
+#: ../calendar/gui/e-task-table.c:537
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-task-table.c:538
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-task-table.c:539
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-task-table.c:540
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:424
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:430
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "TehtÃ¤vÃ¤t"
+
+#: ../calendar/gui/e-task-table.c:928
+msgid "Cut selected tasks to the clipboard"
+msgstr "Leikkaa valitut tehtÃ¤vÃ¤t leikepÃ¶ydÃ¤lle"
+
+#: ../calendar/gui/e-task-table.c:934
+msgid "Copy selected tasks to the clipboard"
+msgstr "Kopioi valitut tehtÃ¤vÃ¤t leikepÃ¶ydÃ¤lle"
+
+#: ../calendar/gui/e-task-table.c:940
+msgid "Paste tasks from the clipboard"
+msgstr "LiitÃ¤ tehtÃ¤vÃ¤t leikepÃ¶ydÃ¤ltÃ¤"
+
+#: ../calendar/gui/e-task-table.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:689
+msgid "Delete selected tasks"
+msgstr "Poista valitut tehtÃ¤vÃ¤t"
+
+#: ../calendar/gui/e-task-table.c:952
+msgid "Select all visible tasks"
+msgstr "Valitse kaikki nÃ¤kyvissÃ¤ olevat tehtÃ¤vÃ¤t"
+
+#: ../calendar/gui/e-timezone-entry.c:354
 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:376 ../calendar/gui/print.c:1646
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:263
+#: ../calendar/gui/ea-cal-view-event.c:276
 msgid "It has alarms."
 msgstr "SisÃ¤ltÃ¤Ã¤ hÃ¤lytyksiÃ¤."
 
-#: ../calendar/gui/ea-cal-view-event.c:266
+#: ../calendar/gui/ea-cal-view-event.c:279
 msgid "It has recurrences."
 msgstr "SisÃ¤ltÃ¤Ã¤ toistuvuuksia."
 
-#: ../calendar/gui/ea-cal-view-event.c:269
+#: ../calendar/gui/ea-cal-view-event.c:282
 msgid "It is a meeting."
 msgstr "SisÃ¤ltÃ¤Ã¤ kokouksen."
 
-#: ../calendar/gui/ea-cal-view-event.c:275
+#: ../calendar/gui/ea-cal-view-event.c:288
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:277
+#: ../calendar/gui/ea-cal-view-event.c:290
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:312
 msgid "calendar view event"
 msgstr "kalenterinÃ¤kymÃ¤n tapahtuma"
 
-#: ../calendar/gui/ea-cal-view-event.c:525
+#: ../calendar/gui/ea-cal-view-event.c:540
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
-#: ../calendar/gui/ea-cal-view.c:298
+#: ../calendar/gui/ea-cal-view.c:300
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/ea-cal-view.c:299
+#: ../calendar/gui/ea-cal-view.c:301
 msgid "New All Day Event"
 msgstr "Uusi koko pÃ¤ivÃ¤n tapahtuma"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:302
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "Go to Today"
 msgstr "Siirry tÃ¤hÃ¤n pÃ¤ivÃ¤Ã¤n"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "Go to Date"
 msgstr "Siirry pÃ¤ivÃ¤Ã¤n"
 
-#: ../calendar/gui/ea-day-view-main-item.c:300
-#: ../calendar/gui/ea-week-view-main-item.c:297
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
 msgid "a table to view and select the current time range"
 msgstr "taulukko, josta voi nÃ¤hdÃ¤ ja valita nykyisen aika-alueen"
 
-#. 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:147 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5827,14 +5944,14 @@ 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:151 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Ei tapahtumia."
 
 #. 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."
-#: ../calendar/gui/ea-day-view.c:158
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "TyÃ¶viikon nÃ¤kymÃ¤: %s. %s"
@@ -5842,119 +5959,133 @@ msgstr "TyÃ¶viikon nÃ¤kymÃ¤: %s. %s"
 #. 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."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:170
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "PÃ¤ivÃ¤nÃ¤kymÃ¤: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:195
+#: ../calendar/gui/ea-day-view.c:201
 msgid "calendar view for a work week"
 msgstr "kalenterin nÃ¤kymÃ¤ tyÃ¶viikkoon"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for one or more days"
 msgstr "Kalenteri nÃ¤kymÃ¤ yhdelle tai useammalle pÃ¤ivÃ¤lle"
 
-#: ../calendar/gui/ea-gnome-calendar.c:186
-#: ../modules/calendar/e-cal-shell-view-private.c:852
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Gnome kalenteri"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
 msgstr "%A %d. %Bta %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:191
-#: ../calendar/gui/ea-gnome-calendar.c:196
-#: ../calendar/gui/ea-gnome-calendar.c:198
-#: ../modules/calendar/e-cal-shell-view-private.c:859
-#: ../modules/calendar/e-cal-shell-view-private.c:865
-#: ../modules/calendar/e-cal-shell-view-private.c:868
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:1008
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:215
-#: ../calendar/gui/ea-gnome-calendar.c:221
-#: ../calendar/gui/ea-gnome-calendar.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../modules/calendar/e-cal-shell-view-private.c:885
-#: ../modules/calendar/e-cal-shell-view-private.c:896
-#: ../modules/calendar/e-cal-shell-view-private.c:903
-#: ../modules/calendar/e-cal-shell-view-private.c:906
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:1034
+#: ../modules/calendar/e-cal-shell-view-private.c:1045
+#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
 msgstr "%d. %Bta %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
-msgid "Gnome Calendar"
-msgstr "Gnome kalenteri"
-
-#: ../calendar/gui/ea-jump-button.c:146
+#: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "HyppÃ¤yspainike"
 
-#: ../calendar/gui/ea-jump-button.c:155
+#: ../calendar/gui/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "napsauta tÃ¤stÃ¤, voit lÃ¶ytÃ¤Ã¤ lisÃ¤Ã¤ tapahtumia."
 
-#: ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "KuukausinÃ¤kymÃ¤: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "TyÃ¶viikko: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:188
+#: ../calendar/gui/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "kalenterin kuukausinÃ¤kymÃ¤"
 
-#: ../calendar/gui/ea-week-view.c:190
+#: ../calendar/gui/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "kalenterinÃ¤kymÃ¤ yhdelle tai useammalle viikolle"
 
-#: ../calendar/gui/gnome-cal.c:1944
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "Ladataan tapaamisia %s"
+#: ../calendar/gui/gnome-cal.c:2242
+msgid "Purging"
+msgstr "TyhjennetÃ¤Ã¤n"
 
-#: ../calendar/gui/gnome-cal.c:2030
-#, c-format
-msgid "Opening %s"
-msgstr "Avataan %s"
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr "Huhtikuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr "Elokuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+msgid "December"
+msgstr "Joulukuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr "Helmikuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
+msgstr "Tammikuu"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-msgstr ""
-"Tammikuu\n"
-"Helmikuu\n"
-"Maaliskuu\n"
-"Huhtikuu\n"
-"Toukokuu\n"
-"KesÃ¤kuu\n"
-"HeinÃ¤kuu\n"
-"Elokuu\n"
-"Syyskuu\n"
-"Lokakuu\n"
-"Marraskuu\n"
-"Joulukuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr "HeinÃ¤kuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+msgid "June"
+msgstr "KesÃ¤kuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:8
+msgid "March"
+msgstr "Maaliskuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+msgid "May"
+msgstr "Toukokuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+msgid "November"
+msgstr "Marraskuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+msgid "October"
+msgstr "Lokakuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "Valitse pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:13
+msgid "September"
+msgstr "Syyskuu"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "_Valitse tÃ¤mÃ¤ pÃ¤ivÃ¤"
 
@@ -5967,23 +6098,23 @@ msgstr "JÃ¤rjestÃ¤jÃ¤ tulee asettaa."
 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:634 ../calendar/gui/itip-utils.c:780
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
 msgid "Task information"
 msgstr "TehtÃ¤vÃ¤n tiedot"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:642
+#: ../calendar/gui/itip-utils.c:645
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -5991,7 +6122,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:676
+#: ../calendar/gui/itip-utils.c:679
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "HyvÃ¤ksytty"
@@ -6000,7 +6131,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:683
+#: ../calendar/gui/itip-utils.c:686
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyvÃ¤ksytty"
@@ -6012,7 +6143,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:690 ../calendar/gui/itip-utils.c:738
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "HylÃ¤tty"
@@ -6021,7 +6152,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:697
+#: ../calendar/gui/itip-utils.c:700
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -6029,7 +6160,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:710
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "PÃ¤ivitetty"
@@ -6037,7 +6168,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:717
+#: ../calendar/gui/itip-utils.c:720
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -6045,7 +6176,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:724
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "PÃ¤ivitÃ¤"
@@ -6053,219 +6184,227 @@ 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:731
+#: ../calendar/gui/itip-utils.c:734
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:801
+#: ../calendar/gui/itip-utils.c:804
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:809
+#: ../calendar/gui/itip-utils.c:812
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:980
+#: ../calendar/gui/itip-utils.c:832
+msgid "Unable to book a resource, the new event collides with some other."
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:834
+msgid "Unable to book a resource, error: "
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:987
 msgid "You must be an attendee of the event."
 msgstr "Sinun tÃ¤ytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Ti"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "Ke"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "To"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "La"
 
-#: ../calendar/gui/print.c:2495
+#: ../calendar/gui/print.c:2564
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../calendar/gui/print.c:2497
+#: ../calendar/gui/print.c:2566
 msgid "Task"
 msgstr "TehtÃ¤vÃ¤"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
 
-#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/print.c:2615
 msgid "Attendees: "
-msgstr "Osanottajat:"
+msgstr "Osanottajat: "
 
-#: ../calendar/gui/print.c:2585
+#: ../calendar/gui/print.c:2658
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:2599
+#: ../calendar/gui/print.c:2673
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:2614
+#: ../calendar/gui/print.c:2691
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2702
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2638
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Categories: %s"
 msgstr "RyhmÃ¤t: %s"
 
-#: ../calendar/gui/print.c:2649
+#: ../calendar/gui/print.c:2726
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
@@ -6295,8 +6434,8 @@ msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
@@ -6320,15 +6459,15 @@ msgstr "vCalendar tiedostot (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution kalenterin Ã¤lykÃ¤s tuoja"
 
-#.
+#. 
 #. *
 #. * This program is free software; you can redistribute it and/or
 #. * modify it under the terms of the GNU Lesser General Public
@@ -6346,12 +6485,12 @@ msgstr "Evolution kalenterin Ã¤lykÃ¤s tuoja"
 #. *
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
 #. *
-#.
-#.
+#. 
+#. 
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
-#.
+#. 
 #: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Afrikka/Abidjan"
@@ -6450,7 +6589,7 @@ msgstr "Afrikka/Harare"
 
 #: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
-msgstr "Afrikka/Johannsburg"
+msgstr "Afrikka/Johannesburg"
 
 #: ../calendar/zones.h:51
 msgid "Africa/Kampala"
@@ -6558,7 +6697,7 @@ msgstr "Afrikka/Tunis"
 
 #: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
-msgstr "Afrikka/Wndhoek"
+msgstr "Afrikka/Windhoek"
 
 #: ../calendar/zones.h:78
 msgid "America/Adak"
@@ -6877,7 +7016,7 @@ msgid "America/Nassau"
 msgstr "Amerikka/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "Amerikka/New_York"
 
@@ -7559,7 +7698,7 @@ msgstr "Eurooppa/London"
 
 #: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
-msgstr "Euroooppa/Luxemburg"
+msgstr "Eurooppa/Luxemburg"
 
 #: ../calendar/zones.h:328
 msgid "Europe/Madrid"
@@ -7877,176 +8016,148 @@ msgstr "Tyyni_Valtameri/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "NimeÃ¤mÃ¤tÃ¶n viesti"
-
-#: ../composer/e-composer-actions.c:202
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-memo-shell-view-actions.c:489
-#: ../modules/calendar/e-task-shell-view-actions.c:616
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "Tallenna nimellÃ¤..."
 
-#: ../composer/e-composer-actions.c:306
+#: ../composer/e-composer-actions.c:242
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "LiitÃ¤ tiedosto viestiin"
 
-#: ../composer/e-composer-actions.c:311
-#: ../widgets/misc/e-signature-editor.c:200
+#: ../composer/e-composer-actions.c:247
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../composer/e-composer-actions.c:313
+#: ../composer/e-composer-actions.c:249
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:254
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:261
 msgid "Print Pre_view"
 msgstr "Tulostuksen esikatselu"
 
-#: ../composer/e-composer-actions.c:334
+#: ../composer/e-composer-actions.c:270
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:339
+#: ../composer/e-composer-actions.c:275
 msgid "Save _As..."
 msgstr "Tallenna _nimellÃ¤..."
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:277
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellÃ¤"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:282
 msgid "Save as _Draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:284
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:353 ../composer/e-composer-private.c:192
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:290
 msgid "S_end"
 msgstr "_LÃ¤hetÃ¤"
 
-#: ../composer/e-composer-actions.c:355
+#: ../composer/e-composer-actions.c:291
 msgid "Send this message"
 msgstr "LÃ¤hetÃ¤ viesti heti"
 
-#: ../composer/e-composer-actions.c:362
-msgid "Insert Send options"
-msgstr "LisÃ¤Ã¤ lÃ¤hetysvaihtoehtoja"
-
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:296
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:298
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:305
 msgid "Character _Encoding"
 msgstr "M_erkistÃ¶n koodaus"
 
-#: ../composer/e-composer-actions.c:383
-msgid "_Security"
-msgstr "Turvalli_suus"
-
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:322
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:324
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tÃ¤mÃ¤ viesti PGP:llÃ¤"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:330
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:332
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:338
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:340
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:346
 msgid "Re_quest Read Receipt"
 msgstr "PyydÃ¤ luku_kuittausta"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:348
 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:425
+#: ../composer/e-composer-actions.c:354
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:356
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME salausvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:362
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:364
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tÃ¤mÃ¤ viesti S/MIME allekirjoitusvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:370
 msgid "_Bcc Field"
 msgstr "_BCC-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:372
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee nÃ¤ytetÃ¤Ã¤nkÃ¶ BCC-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:378
 msgid "_Cc Field"
 msgstr "_Kopio-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:380
 msgid "Toggles whether the CC field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Kopio-kenttÃ¤ (CC)."
 
-#: ../composer/e-composer-actions.c:457
-msgid "_From Field"
-msgstr "_LÃ¤hettÃ¤jÃ¤-kenttÃ¤"
-
-#: ../composer/e-composer-actions.c:459
-msgid "Toggles whether the From chooser is displayed"
-msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ LÃ¤hettÃ¤jÃ¤-kenttÃ¤"
-
-#: ../composer/e-composer-actions.c:465
+#: ../composer/e-composer-actions.c:386
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:467
+#: ../composer/e-composer-actions.c:388
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Vastausosoite-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:431
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
-#: ../composer/e-composer-autosave.c:445
-msgid "Unable to retrieve message from editor"
-msgstr "ViestiÃ¤ ei voi hakea muokkaimelta"
-
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "SyÃ¶tÃ¤ viestin vastaanottajat"
@@ -8063,50 +8174,35 @@ msgstr ""
 "Anna osoitteet, joihin lÃ¤hetetÃ¤Ã¤n kopiot viestistÃ¤ ilman ettÃ¤ muut "
 "vastaanottajat nÃ¤kevÃ¤t vastaanottajia"
 
-#: ../composer/e-composer-header-table.c:949
+#: ../composer/e-composer-header-table.c:962
 msgid "Fr_om:"
 msgstr "_LÃ¤hettÃ¤jÃ¤:"
 
-#: ../composer/e-composer-header-table.c:949
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:936
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:301
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "LÃ¤hettÃ¤jÃ¤"
-
-#: ../composer/e-composer-header-table.c:958
+#: ../composer/e-composer-header-table.c:971
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../composer/e-composer-header-table.c:963
+#: ../composer/e-composer-header-table.c:975
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../composer/e-composer-header-table.c:969
+#: ../composer/e-composer-header-table.c:980
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../composer/e-composer-header-table.c:969
-msgid "Show CC"
-msgstr "NÃ¤ytÃ¤ CC"
-
-#: ../composer/e-composer-header-table.c:975
+#: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../composer/e-composer-header-table.c:975
-msgid "Show BCC"
-msgstr "NÃ¤ytÃ¤ BCC"
-
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:990
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../composer/e-composer-header-table.c:984
+#: ../composer/e-composer-header-table.c:994
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: ../composer/e-composer-header-table.c:993
+#: ../composer/e-composer-header-table.c:1003
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
@@ -8119,23 +8215,39 @@ msgid "Click here to select folders to post to"
 msgstr "Valitse tÃ¤stÃ¤ kansiot, joihin postituksia lÃ¤hetetÃ¤Ã¤n"
 
 #: ../composer/e-composer-private.c:208
+msgid "Undo the last action"
+msgstr "Kumoa viimeisin toiminto"
+
+#: ../composer/e-composer-private.c:212
+msgid "Redo the last undone action"
+msgstr "Tee viimeisin kumottu toiminto uudelleen"
+
+#: ../composer/e-composer-private.c:216
+msgid "Search for text"
+msgstr "Etsi tekstiÃ¤"
+
+#: ../composer/e-composer-private.c:220
+msgid "Search for and replace text"
+msgstr "Etsi ja korvaa tekstiÃ¤"
+
+#: ../composer/e-composer-private.c:310
 msgid "Save draft"
 msgstr "Tallenna luonnos"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:191 ../mail/em-utils.c:144
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
+#: ../composer/e-msg-composer.c:185 ../mail/em-utils.c:149
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Ã?lÃ¤ _nÃ¤ytÃ¤ tÃ¤tÃ¤ viestiÃ¤ uudestaan."
 
-#: ../composer/e-msg-composer.c:900
+#: ../composer/e-msg-composer.c:981
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "LÃ¤htevÃ¤Ã¤ viestiÃ¤ ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tÃ¤lle tilille"
 
-#: ../composer/e-msg-composer.c:907
+#: ../composer/e-msg-composer.c:988
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8143,25 +8255,33 @@ msgstr ""
 "LÃ¤htevÃ¤Ã¤ viestiÃ¤ ei voi salata: Salausvarmennetta ei ole asetettu tÃ¤lle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1334 ../composer/e-msg-composer.c:2112
+#: ../composer/e-msg-composer.c:1379
+msgid "Unable to reconstruct message from autosave file"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1690
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:3320
+#: ../composer/e-msg-composer.c:3356
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+"<b>(The composer contains a non-text message body, which cannot be "
+"edited.)</b>"
 msgstr ""
 "<b>(Muokkain sisÃ¤ltÃ¤Ã¤ viestin rungon joka ei ole tekstiÃ¤ ja jota ei voi "
 "muokata)</b>"
 
+#: ../composer/e-msg-composer.c:3956
+msgid "Untitled Message"
+msgstr "NimeÃ¤mÃ¤tÃ¶n viesti"
+
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
 "the mail to be sent without those pending attachments "
 msgstr ""
 " Joidenkin liitteiden lataus on vielÃ¤ kesken. Viestin lÃ¤hettÃ¤minen aiheuttaa "
-"viestin lÃ¤hetyksen lÃ¤hetyksen ilman nÃ¤itÃ¤ keskenerÃ¤isiÃ¤ liitteitÃ¤"
+"viestin lÃ¤hetyksen lÃ¤hetyksen ilman nÃ¤itÃ¤ keskenerÃ¤isiÃ¤ liitteitÃ¤ "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
@@ -8171,10 +8291,12 @@ msgstr "Kaikki tilit on poistettu."
 msgid ""
 "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Ã¤?"
+msgstr ""
+"Haluatko todella hylÃ¤tÃ¤ viestin otsikolla '{0}', vaikka muokkaat sitÃ¤?"
 
 #: ../composer/mail-composer.error.xml.h:4
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgid ""
+"Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "&quot;{0}&quot; johtuen sinun tÃ¤ytyy ehkÃ¤ valita eri sÃ¤hkÃ¶postin asetukset."
 
@@ -8188,9 +8310,9 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"TÃ¤mÃ¤n muokkausikkunan sulkeminen unohtaa muokatun viestin pysyvÃ¤sti, jollet "
-"tallenna viesti luonnoskansioosi. NÃ¤in pystyt jatkamaan viestin kirjoitusta "
-"myÃ¶hemmin."
+"TÃ¤mÃ¤n ikkunan sulkeminen hÃ¤vittÃ¤Ã¤ muokatun viestin pysyvÃ¤sti, ellet tallenna "
+"viestiÃ¤ luonnoskansioon. Luonnoskansioon tallennettujen viestien kirjoitusta "
+"voi jatkaa myÃ¶hemmin."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -8213,22 +8335,18 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
 #: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "Hakemistoja ei voi liittÃ¤Ã¤ viesteihin."
-
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "Haluatko palauttaa viimeistelemÃ¤ttÃ¶mÃ¤t viestit?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "Tietojen haku kesken. Haluatko lÃ¤hettÃ¤Ã¤ viestin?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Automaattinen tallennus epÃ¤onnistui: &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -8236,32 +8354,11 @@ msgstr ""
 "Evolution suljettiin odottamatta, kun olit muokkaamassa uutta viestiÃ¤. "
 "Viestin palautuksen avulla voit jatkaa siitÃ¤, mihin jÃ¤it."
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"LÃ¤hetysasetukset ovat kÃ¤ytettÃ¤vissÃ¤ vain Novell Groupwise- ja Microsoft "
-"Exchange -tileille."
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "LÃ¤hetysasetukset eivÃ¤t ole saatavilla."
-
-#: ../composer/mail-composer.error.xml.h:19
-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:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+#: ../composer/mail-composer.error.xml.h:16
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
-"Jos haluat lisÃ¤tÃ¤ hakemiston sisÃ¤llÃ¶n, liitÃ¤ joko jokainen tiedosto "
-"hakemistossa erikseen tai luo arkisto hakemistosta ja liitÃ¤ arkisto."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -8272,62 +8369,407 @@ msgstr ""
 "\n"
 "Tarkista, ettÃ¤ oikeat versiot ohjelmista gtkhtml ja libgtkhtml on asennettu."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "Osoitteen valinnan ohjainta ei voi aktivoida"
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "Unfinished messages found"
-msgstr "ViimeistelemÃ¤tÃ¶n viesti lÃ¶ytyi"
-
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Warning: Modified Message"
-msgstr "Varoitus: Muutettu viesti"
-
-#: ../composer/mail-composer.error.xml.h:27
-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:21
+msgid "You cannot attach the file n{0}' to this message."
+msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:22
 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:29
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "_Jatka muokkausta"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "Ã?_lÃ¤ palauta"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "_Palauta"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "Tallenna _luonnos"
 
+#: ../capplet/anjal-settings-main.c:199
+msgid "Run Anjal in a window"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:200
+msgid "Make Anjal the default email client"
+msgstr ""
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:207
+msgid "ID of the socket to embed in"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:208
+msgid "socket"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:221
+msgid "Anjal email client"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:74
+msgid "Please enter your full name."
+msgstr "SyÃ¶tÃ¤ koko nimesi."
+
+#: ../capplet/settings/mail-account-view.c:75
+msgid "Please enter your email address."
+msgstr "SyÃ¶tÃ¤ sÃ¤hkÃ¶postiosoitteesi."
+
+#: ../capplet/settings/mail-account-view.c:76
+msgid "The email address you have entered is invalid."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "SyÃ¶tÃ¤ salasanasi."
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:82
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:463
+msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:468
+msgid "Name:"
+msgstr "Nimi:"
+
+#: ../capplet/settings/mail-account-view.c:477
+msgid "Email address:"
+msgstr "SÃ¤hkÃ¶postiosoite:"
+
+#: ../capplet/settings/mail-account-view.c:487
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:493
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:498
+msgid "Server type:"
+msgstr "Palvelimen tyyppi:"
+
+#: ../capplet/settings/mail-account-view.c:507
+msgid "Server address:"
+msgstr "Palvelimen osoite:"
+
+#: ../capplet/settings/mail-account-view.c:516
+msgid "Username:"
+msgstr "KÃ¤yttÃ¤jÃ¤tunnus:"
+
+#: ../capplet/settings/mail-account-view.c:525
+msgid "Use encryption:"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:530
+#: ../capplet/settings/mail-account-view.c:563
+msgid "never"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:542
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:582
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:584
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:586
+msgid "You can specify more options to configure the account."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:588
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:589
+msgid "You can specify your default settings for your account."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:590
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:605
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2180
+#: ../mail/mail-config.ui.h:58
+msgid "Identity"
+msgstr "Omat tiedot"
+
+#: ../capplet/settings/mail-account-view.c:605
+msgid "Next - Receiving mail"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:606
+msgid "Receiving mail"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:606
+#: ../capplet/settings/mail-account-view.c:607
+msgid "Next - Sending mail"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:606
+msgid "Back - Identity"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:606
+msgid "Next - Receiving options"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:607
+msgid "Receiving options"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:607
+#: ../capplet/settings/mail-account-view.c:609
+msgid "Back - Receiving mail"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:609
+msgid "Sending mail"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
+msgid "Next - Review account"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:609
+msgid "Next - Defaults"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:609
+msgid "Back - Receiving options"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:610
+#: ../mail/em-account-editor.c:2760 ../mail/mail-config.ui.h:31
+msgid "Defaults"
+msgstr "Oletusasetukset"
+
+#: ../capplet/settings/mail-account-view.c:610
+msgid "Back - Sending mail"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:612
+msgid "Review account"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:612
+msgid "Finish"
+msgstr "Valmis"
+
+#: ../capplet/settings/mail-account-view.c:612
+msgid "Back - Sending"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:716
+msgid "Setup Google contacts with Evolution"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:717
+msgid "Setup Google calendar with Evolution"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:722
+msgid "You may need to enable IMAP access."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:730
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Google-tilin asetukset:</span>"
+
+#: ../capplet/settings/mail-account-view.c:754
+msgid "Setup Yahoo calendar with Evolution"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:758
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:765
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Yahoo-tilin asetukset:</span>"
+
+#: ../capplet/settings/mail-account-view.c:777
+msgid "Yahoo Calendar name:"
+msgstr "Yahoo-kalenterin nimi:"
+
+#: ../capplet/settings/mail-account-view.c:1019
+msgid "Password:"
+msgstr "Salasana:"
+
+#: ../capplet/settings/mail-account-view.c:1085
+#: ../capplet/settings/mail-settings-view.c:262
+msgid "Close Tab"
+msgstr "Sulje vÃ¤lilehti"
+
+#: ../capplet/settings/mail-account-view.c:1095
+msgid "Account Wizard"
+msgstr "Ohjattu tilin luonti"
+
+#: ../capplet/settings/mail-capplet-shell.c:208
+msgid "Evolution account assistant"
+msgstr ""
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
+#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/em-folder-tree-model.c:169
+#: ../mail/em-folder-tree-model.c:171 ../mail/mail-vfolder.c:215
+#: ../mail/message-list.c:1660
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:136
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "TÃ¤llÃ¤ tietokoneella"
+
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "Muokkaa"
+
+#: ../capplet/settings/mail-settings-view.c:148
+msgid "Add a new account"
+msgstr "LisÃ¤Ã¤ uusi tili"
+
+#: ../capplet/settings/mail-settings-view.c:183
+msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgstr ""
+
+#: ../capplet/settings/mail-settings-view.c:272
+msgid "Settings"
+msgstr "Asetukset"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr ""
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr ""
+
 #: ../data/evolution.desktop.in.in.h:1
+msgid "Compose New Message"
+msgstr "Luo uusi viesti"
+
+#. Create the contacts group
+#: ../data/evolution.desktop.in.in.h:2
+#: ../modules/addressbook/e-book-shell-backend.c:377
+#: ../modules/addressbook/e-book-shell-view.c:397
+#: ../modules/calendar/e-cal-shell-backend.c:124
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../data/evolution.desktop.in.in.h:3 ../mail/e-mail-browser.c:827
+#: ../shell/e-shell-window-private.c:251
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-sÃ¤hkÃ¶posti ja -kalenteri"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:653
+#: ../data/evolution.desktop.in.in.h:5 ../shell/e-shell-window-actions.c:656
 msgid "Groupware Suite"
 msgstr "RyhmÃ¤tyÃ¶ohjelmisto"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:6
 msgid "Manage your email, contacts and schedule"
 msgstr "Hallitse sÃ¤hkÃ¶posteja, yhteystietoja ja ajan kÃ¤yttÃ¶Ã¤"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "osoitekortti"
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr ""
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "SÃ¤hkÃ¶postin asetukset"
 
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "Kalenterin tietoja"
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (peruttu)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (valmis)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, c-format
+msgid "%s..."
+msgstr "%s..."
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d %% valmiina)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "Evolutionin virhe"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "Evolutionin varoitus"
+
+#: ../e-util/e-alert.c:634
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "SisÃ¤inen virhe, tuntematonta virhettÃ¤ \"%s\" pyydettiin"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
@@ -8403,166 +8845,159 @@ msgid "Visual"
 msgstr "Visuaali"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
-#: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:304
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1748
+#: ../plugins/itip-formatter/itip-view.c:195
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "TÃ¤nÃ¤Ã¤n"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Eilen"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:210
 #, c-format
 msgid "%d days from now"
 msgstr "%d pÃ¤ivÃ¤n pÃ¤Ã¤stÃ¤"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 #, c-format
 msgid "%d days ago"
 msgstr "%d pÃ¤ivÃ¤Ã¤ sitten"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
+#: ../e-util/e-datetime-format.c:305
 msgid "Use locale default"
-msgstr "KÃ¤ytÃ¤ oletusaikavyÃ¶hykettÃ¤" 
+msgstr "KÃ¤ytÃ¤ oletusaikavyÃ¶hykettÃ¤"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:499
 msgid "Format:"
 msgstr "Muoto:"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
-msgid "Evolution Error"
-msgstr "Evolutionin virhe"
-
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
-msgid "Evolution Warning"
-msgstr "Evolutionin varoitus"
-
-#: ../e-util/e-error.c:117
-msgid "Evolution Information"
-msgstr "Evolutionin tiedot"
+#: ../e-util/e-file-utils.c:136
+msgid "(Unknown Filename)"
+msgstr ""
 
-#: ../e-util/e-error.c:119
-msgid "Evolution Query"
-msgstr "Evolutionin kysely"
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
+#, c-format
+msgid "Writing \"%s\""
+msgstr ""
 
-#. setup a dummy error
-#: ../e-util/e-error.c:452
+#. 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:145
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "SisÃ¤inen virhe, tuntematonta virhettÃ¤ \"%s\" pyydettiin"
+msgid "Writing \"%s\" to %s"
+msgstr ""
 
-#: ../e-util/e-logger.c:172
+#: ../e-util/e-logger.c:175
 msgid "Name of the logger"
 msgstr "PidemmmÃ¤n nimi"
 
-#: ../e-util/e-module.c:188
+#: ../e-util/e-module.c:194
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: ../e-util/e-module.c:189
+#: ../e-util/e-module.c:195
 msgid "The filename of the module"
 msgstr "Moduulin nimi"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "VianetsintÃ¤lokit"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "NÃ¤ytÃ¤ _viestit tilarivillÃ¤"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "sekunnin ajan."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "Lokita viestit:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "Lokituksen taso"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:493
-msgid "Time"
-msgstr "Aika"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2583
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2733
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Viestit"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
-#: ../shell/e-shell-window-actions.c:1459
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1455
+#: ../shell/e-shell-window-actions.c:1462
+#: ../shell/e-shell-window-actions.c:1469
 msgid "Close this window"
 msgstr "Sulje tÃ¤mÃ¤ ikkuna"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "Virhe"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "Virheet"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Warning"
-msgstr "Varoitus"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "Varoitukset ja virheet"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "VianetsintÃ¤"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "Virheet, varoitukset ja vianetsintÃ¤viestit"
 
-#: ../e-util/e-plugin.c:291 ../filter/rule-editor.c:802
-#: ../modules/mail/em-composer-prefs.c:474
+#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:475
 #: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:717
+#: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "kÃ¤ytÃ¶ssÃ¤"
 
-#: ../e-util/e-plugin.c:292
+#: ../e-util/e-plugin.c:296
 msgid "Whether the plugin is enabled"
 msgstr "Onko lisÃ¤osa kÃ¤ytÃ¶ssÃ¤"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "viikkoa"
+
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Tapahtui virhe tulostettaessa"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "TulostusjÃ¤rjestelmÃ¤ kertoi seuraavat yksityiskohdat virheestÃ¤:"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "TulostusjÃ¤rjestelmÃ¤ ei kertonut tarkempia tietoja virheestÃ¤."
 
-#: ../e-util/e-signature.c:695
+#: ../e-util/e-signature.c:701
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "Syy: \"{1}\"."
 
@@ -8582,304 +9017,315 @@ msgstr "Haluatko ylikirjoittaa?"
 msgid "File exists \"{0}\"."
 msgstr "Tiedosto \"{0}\" on jo olemassa."
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "Kirjoita tiedoston yli?"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:145
 msgid "Could not open the link."
 msgstr "LinkkiÃ¤ ei voitu avata."
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:195
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu nÃ¤yttÃ¤Ã¤."
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../e-util/gconf-bridge.c:1307
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-virhe: %s"
 
-#: ../e-util/gconf-bridge.c:1233
+#: ../e-util/gconf-bridge.c:1318
 msgid "All further errors shown only on terminal."
 msgstr "Kaikki virheet tÃ¤stÃ¤ eteenpÃ¤in nÃ¤kyvÃ¤t vain pÃ¤Ã¤tteessÃ¤."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:937
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:79
+msgid "From"
+msgstr "LÃ¤hettÃ¤jÃ¤"
+
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
+#: ../modules/mail/em-mailer-prefs.c:80
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:939
-#: ../mail/em-format-html.c:2138 ../mail/em-format-html.c:2202
-#: ../mail/em-format-html.c:2223 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:964
+#: ../mail/em-format-html.c:2259 ../mail/em-format-html.c:2321
+#: ../mail/em-format-html.c:2344 ../modules/mail/em-mailer-prefs.c:82
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:940
-#: ../mail/em-format-html.c:2139 ../mail/em-format-html.c:2208
-#: ../mail/em-format-html.c:2226 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:965
+#: ../mail/em-format-html.c:2260 ../mail/em-format-html.c:2325
+#: ../mail/em-format-html.c:2347 ../modules/mail/em-mailer-prefs.c:83
 msgid "Bcc"
 msgstr "Piilokopiot"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:941
-#: ../mail/em-filter-i18n.h:74 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:305 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1112
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:966
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:84
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "Aihe"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2318
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2441
+#: ../modules/mail/em-mailer-prefs.c:1132
 msgid "Mailer"
 msgstr "Postittaja"
 
-#: ../em-format/em-format-quote.c:429 ../mail/em-composer-utils.c:1135
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1219
 msgid "-------- Forwarded Message --------"
 msgstr "------- VÃ¤litetty viesti ---------"
 
-#: ../em-format/em-format.c:942 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:429
-#: ../widgets/misc/e-dateedit.c:451
+#: ../em-format/em-format.c:967 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:85 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "PÃ¤ivÃ¤ys"
 
-#: ../em-format/em-format.c:943 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:968 ../modules/mail/em-mailer-prefs.c:86
 msgid "Newsgroups"
 msgstr "UutisryhmÃ¤t"
 
-#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+#: ../em-format/em-format.c:969 ../modules/mail/em-mailer-prefs.c:87
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Kasvokuva"
 
-#: ../em-format/em-format.c:1297
+#: ../em-format/em-format.c:1325
 #, c-format
 msgid "%s attachment"
 msgstr "Liite: %s"
 
-#: ../em-format/em-format.c:1335
+#: ../em-format/em-format.c:1380
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME viestin tulkitseminen epÃ¤onnistui: tuntematon virhe"
 
-#: ../em-format/em-format.c:1472 ../em-format/em-format.c:1629
+#: ../em-format/em-format.c:1518 ../em-format/em-format.c:1680
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME-viestin tulkitseminen epÃ¤onnistui, nÃ¤ytetÃ¤Ã¤n lÃ¤hdekoodi"
 
-#: ../em-format/em-format.c:1480
+#: ../em-format/em-format.c:1526
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../em-format/em-format.c:1490
+#: ../em-format/em-format.c:1538
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME-viestiÃ¤ ei voitu tulkita"
 
-#: ../em-format/em-format.c:1490
+#: ../em-format/em-format.c:1538
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME-viestiÃ¤ ei voitu tulkita: tuntematon virhe"
 
-#: ../em-format/em-format.c:1648
+#: ../em-format/em-format.c:1704
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1794
+#: ../em-format/em-format.c:1712 ../em-format/em-format.c:1853
 msgid "Error verifying signature"
 msgstr "Virhe tarkistettaessa allekirjoitusta"
 
-#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1785
-#: ../em-format/em-format.c:1794
+#: ../em-format/em-format.c:1712 ../em-format/em-format.c:1842
+#: ../em-format/em-format.c:1853
 msgid "Unknown error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
-#: ../em-format/em-format.c:1868
+#: ../em-format/em-format.c:1930
 msgid "Could not parse PGP message"
 msgstr "PGP-viestiÃ¤ ei voitu tulkita"
 
-#: ../em-format/em-format.c:1868
+#: ../em-format/em-format.c:1930
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP-viestiÃ¤ ei voitu tulkita: tuntematon virhe"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:71
 #, 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"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, 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Ã¤"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, 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"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 pÃ¤ivÃ¤ sitten"
 msgstr[1] "%d pÃ¤ivÃ¤Ã¤ sitten"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, 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Ã¤"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, 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"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, 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Ã¤"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 vuosi sitten"
 msgstr[1] "%d vuotta sitten"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/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Ã¤"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<napsauta valitaksesi pÃ¤ivÃ¤ys>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "nyt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:442
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: ../filter/filter-file.c:281
-msgid "Choose a file"
+#: ../filter/e-filter-file.c:184
+msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../filter/filter-part.c:528
-msgid "Test"
-msgstr "Testi"
-
-#: ../filter/filter-rule.c:858
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "_SÃ¤Ã¤nnÃ¶n nimi:"
 
-#: ../filter/filter-rule.c:886
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
-#: ../filter/filter-rule.c:920
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "LisÃ¤Ã¤ _ehto"
 
-#: ../filter/filter-rule.c:926
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "jos kaikki ehdot tÃ¤ytetÃ¤Ã¤n"
 
-#: ../filter/filter-rule.c:926
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "jos joku ehdoista tÃ¤yttyy"
 
-#: ../filter/filter-rule.c:928
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "_Etsi kohteita:"
 
-#: ../filter/filter-rule.c:946
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:759
+msgid "None"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
+
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "Kaikki tÃ¤hÃ¤n liittyvÃ¤t"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:14
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../filter/filter-rule.c:948
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "O_ta myÃ¶s sÃ¤ikeet mukaan"
 
-#: ../filter/filter-rule.c:1042 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:295
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:300
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:296
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
 msgid "Outgoing"
 msgstr "LÃ¤htevÃ¤t"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "LisÃ¤Ã¤ sÃ¤Ã¤ntÃ¶"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "Muokkaa sÃ¤Ã¤ntÃ¶Ã¤"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Virhe sÃ¤Ã¤nnÃ¶llisessÃ¤ lausekkeessa &quot;{0}&quot;."
@@ -8901,7 +9347,7 @@ msgstr "PÃ¤ivÃ¤ys puuttuu."
 msgid "Missing file name."
 msgstr "Tiedostonimi puuttuu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
@@ -8925,19 +9371,15 @@ msgstr "Suodattimella tÃ¤ytyy olla nimi."
 msgid "You must specify a file name."
 msgstr "Tiedostonimi tÃ¤ytyy antaa."
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_SuodatinsÃ¤Ã¤nnÃ¶t</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "Vertaa arvoon"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "SÃ¤hkÃ¶postin nÃ¤ytÃ¶n suodattimet:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -8945,7 +9387,7 @@ msgstr ""
 "Viestin pÃ¤ivÃ¤ystÃ¤ verrataan mÃ¤Ã¤ritellyn pÃ¤ivÃ¤n\n"
 " keskipÃ¤ivÃ¤Ã¤n (klo 12:00)"
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -8953,7 +9395,7 @@ msgstr ""
 "Viestin pÃ¤ivÃ¤ystÃ¤ verrataan suhteessa aikaan\n"
 "jolloin suodatus tapahtuu."
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -8961,93 +9403,82 @@ msgstr ""
 "Viestin pÃ¤ivÃ¤ystÃ¤ verrataan aikaan, jolloin\n"
 "suodatus tapahtuu."
 
-#: ../filter/filter.glade.h:12
-msgid ""
-"ago\n"
-"in the future"
-msgstr ""
-"sitten\n"
-"tulevaisuudessa"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "_SuodatinsÃ¤Ã¤nnÃ¶t"
 
-#: ../filter/filter.glade.h:14
-msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
-msgstr ""
-"sekuntia\n"
-"minuuttia\n"
-"tuntia\n"
-"pÃ¤ivÃ¤Ã¤\n"
-"viikkoa\n"
-"kuukautta\n"
-"vuotta"
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr "Aika suhteessa tÃ¤mÃ¤nhetkiseen aikaan"
 
-#: ../filter/filter.glade.h:21
-msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
-msgstr ""
-"tÃ¤mÃ¤nhetkinen aika\n"
-"antamasi aika\n"
-"aika suhteessa tÃ¤mÃ¤nhetkiseen aikaan"
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "sitten"
 
-#: ../filter/rule-editor.c:382
-msgid "Add Rule"
-msgstr "LisÃ¤Ã¤ sÃ¤Ã¤ntÃ¶"
+#: ../filter/filter.ui.h:16
+msgid "in the future"
+msgstr "tulevaisuudessa"
 
-#: ../filter/rule-editor.c:465
-msgid "Edit Rule"
-msgstr "Muokkaa sÃ¤Ã¤ntÃ¶Ã¤"
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "kuukautta"
+
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+msgid "seconds"
+msgstr "sekuntia"
+
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "tÃ¤mÃ¤nhetkinen aika"
 
-#: ../filter/rule-editor.c:812
-msgid "Rule name"
-msgstr "SÃ¤Ã¤nnÃ¶n nimi"
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "mÃ¤Ã¤rittelemÃ¤si aika"
 
-#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:1271
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "vuotta"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1031 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
-#: ../mail/e-mail-attachment-bar.c:614
-#: ../widgets/misc/e-attachment-paned.c:607
+#: ../mail/e-mail-attachment-bar.c:590
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "KuvakenÃ¤kymÃ¤"
 
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:608
+#: ../mail/e-mail-attachment-bar.c:591
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "LuettelonÃ¤kymÃ¤"
 
-#: ../mail/e-mail-browser.c:663
+#: ../mail/e-mail-browser.c:771 ../shell/e-shell-window.c:711
+msgid "Focus Tracker"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:781
 msgid "Shell Module"
 msgstr "PÃ¤Ã¤temoduli"
 
-#: ../mail/e-mail-browser.c:664 ../mail/message-list.c:2467
+#: ../mail/e-mail-browser.c:782 ../mail/message-list.c:2626
 msgid "The mail shell backend"
 msgstr "SÃ¤hkÃ¶postikuoren taustajÃ¤rjestelmÃ¤"
 
-#: ../mail/e-mail-browser.c:674
+#: ../mail/e-mail-browser.c:792
 msgid "Show Deleted"
 msgstr "nÃ¤ytÃ¤ poistetut"
 
-#: ../mail/e-mail-browser.c:675
+#: ../mail/e-mail-browser.c:793
 msgid "Show deleted messages"
 msgstr "NÃ¤ytÃ¤ poistetut viestit"
 
-#: ../mail/e-mail-browser.c:710
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/e-shell-window-private.c:207
-msgid "Evolution"
-msgstr "Evolution"
-
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "_LisÃ¤Ã¤ osoitekirjaan..."
@@ -9093,7 +9524,7 @@ msgid "_Later"
 msgstr "_MyÃ¶hemmin"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:552
+#: ../modules/mail/e-mail-shell-view-actions.c:519
 msgid "Add Label"
 msgstr "LisÃ¤Ã¤ merkintÃ¤"
 
@@ -9114,669 +9545,742 @@ msgid "Color"
 msgstr "VÃ¤ri"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:599 ../mail/em-folder-tree.c:2497
-#: ../modules/mail/e-mail-shell-view-private.c:798
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../mail/em-folder-tree-model.c:712 ../mail/em-folder-tree.c:2746
+#: ../modules/mail/e-mail-shell-view-private.c:961
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:592
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:705
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:602
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:715
 msgid "Outbox"
 msgstr "LÃ¤htevÃ¤t"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:604
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:717
 msgid "Sent"
 msgstr "LÃ¤hetetyt"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:595
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:708
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:591
+#: ../plugins/templates/templates.c:574
 msgid "Templates"
 msgstr "Pohjat"
 
+#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "TÃ¤rkeÃ¤"
+
+#. green
+#: ../mail/e-mail-migrate.c:963
+msgid "To Do"
+msgstr "TehtÃ¤vÃ¤Ã¤"
+
+#. blue
+#: ../mail/e-mail-migrate.c:964
+msgid "Later"
+msgstr "MyÃ¶hemmin"
+
+#: ../mail/e-mail-migrate.c:1110
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "SiirretÃ¤Ã¤n..."
+
+#: ../mail/e-mail-migrate.c:1143
+msgid "Migration"
+msgstr "Siirto"
+
+#: ../mail/e-mail-migrate.c:1183
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#, c-format
+msgid "Migrating '%s':"
+msgstr "SiirretÃ¤Ã¤n  \"%s\":"
+
+#: ../mail/e-mail-migrate.c:1594
+#, c-format
+msgid "Unable to create new folder '%s': %s"
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:1622
+#, c-format
+msgid "Unable to copy folder '%s' to '%s': %s"
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:1817
+#, c-format
+msgid "Unable to scan for existing mailboxes at '%s': %s"
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+msgid "Migrating Folders"
+msgstr "SiirretÃ¤Ã¤n kansiota"
+
+#: ../mail/e-mail-migrate.c:1824
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolutionin sÃ¤hkÃ¶postikansioiden sijainti ja rakenne on muuttunut versiosta "
+"Evolution 1.x.\n"
+"\n"
+"Odota kÃ¤rsivÃ¤llisesti, ettÃ¤ Evolution muuntaa kansioitasi..."
+
+#: ../mail/e-mail-migrate.c:2027
+#, c-format
+msgid "Unable to open old POP keep-on-server data '%s': %s"
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:2043
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory '%s': %s"
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:2075
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data '%s': %s"
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
+#, c-format
+msgid "Failed to create local mail storage '%s': %s"
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:2933
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolutionin sÃ¤hkÃ¶postikansioiden yhteenvedon esitys on siirretty sqlite-"
+"tietokantaan version 2.24 jÃ¤lkeen.\n"
+"\n"
+"Odota kÃ¤rsivÃ¤llisesti, ettÃ¤ Evolution muuntaa kansioiden tietoja..."
+
+#: ../mail/e-mail-migrate.c:3030
+#, c-format
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:3048
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, "
+"'evolution/config.xmldb' does not exist or is corrupt."
+msgstr ""
+
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
 #: ../mail/e-mail-reader-utils.c:107
-#: ../modules/calendar/e-task-shell-view-actions.c:576
+#: ../modules/calendar/e-task-shell-view-actions.c:568
 msgid "Do not ask me again"
 msgstr "Ã?lÃ¤ kysy uudestaan"
 
-#: ../mail/e-mail-reader.c:215 ../mail/e-mail-reader.c:604
-#: ../mail/em-account-editor.c:667 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-folder-utils.c:392 ../mail/em-vfolder-rule.c:519
-msgid "Select Folder"
-msgstr "Valitse kansio"
+#: ../mail/e-mail-reader.c:258 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Kopioi kansioon"
 
-#: ../mail/e-mail-reader.c:215 ../mail/em-folder-utils.c:387
+#: ../mail/e-mail-reader.c:258 ../mail/em-folder-utils.c:385
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/e-mail-reader.c:604 ../mail/em-folder-utils.c:387
+#: ../mail/e-mail-reader.c:632 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "SiirrÃ¤ kansioon"
+
+#: ../mail/e-mail-reader.c:632 ../mail/em-folder-utils.c:385
 msgid "_Move"
 msgstr "_SiirrÃ¤"
 
-#: ../mail/e-mail-reader.c:1082
+#: ../mail/e-mail-reader.c:858
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Tallenna viesti"
+msgstr[1] "Tallenna viestit"
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:879 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:518
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Viesti"
+msgstr[1] "Viestit"
+
+#: ../mail/e-mail-reader.c:1137
 msgid "A_dd Sender to Address Book"
 msgstr "_LisÃ¤Ã¤ lÃ¤hettÃ¤jÃ¤ osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1084
+#: ../mail/e-mail-reader.c:1139
 msgid "Add sender to address book"
 msgstr "LisÃ¤Ã¤ lÃ¤hettÃ¤jÃ¤ osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1089
+#: ../mail/e-mail-reader.c:1144
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../mail/e-mail-reader.c:1091
+#: ../mail/e-mail-reader.c:1146
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1098
-msgid "Copy selected messages to the clipboard"
-msgstr "Kopioi valitut viestit leikepÃ¶ydÃ¤lle"
-
-#: ../mail/e-mail-reader.c:1103
+#: ../mail/e-mail-reader.c:1151
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/e-mail-reader.c:1105
+#: ../mail/e-mail-reader.c:1153
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../mail/e-mail-reader.c:1110
+#: ../mail/e-mail-reader.c:1158
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../mail/e-mail-reader.c:1112
+#: ../mail/e-mail-reader.c:1160
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../mail/e-mail-reader.c:1117
+#: ../mail/e-mail-reader.c:1165
 msgid "Filter on Mailing _List..."
 msgstr "Suodata postitus_listan mukaan..."
 
-#: ../mail/e-mail-reader.c:1119
+#: ../mail/e-mail-reader.c:1167
 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:1124
+#: ../mail/e-mail-reader.c:1172
 msgid "Filter on _Recipients..."
 msgstr "Suodata _vastaanottajien mukaan..."
 
-#: ../mail/e-mail-reader.c:1126
+#: ../mail/e-mail-reader.c:1174
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Luo sÃ¤Ã¤ntÃ¶, jolla suodatetaan viestejÃ¤ nÃ¤ille vastaanottajille "
+msgstr "Luo sÃ¤Ã¤ntÃ¶, jolla suodatetaan viestejÃ¤ nÃ¤ille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:1131
+#: ../mail/e-mail-reader.c:1179
 msgid "Filter on Se_nder..."
 msgstr "Suodata _lÃ¤hettÃ¤jÃ¤n mukaan..."
 
-#: ../mail/e-mail-reader.c:1133
+#: ../mail/e-mail-reader.c:1181
 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:1138
+#: ../mail/e-mail-reader.c:1186
 msgid "Filter on _Subject..."
 msgstr "Suodata _aiheen mukaan..."
 
-#: ../mail/e-mail-reader.c:1140
+#: ../mail/e-mail-reader.c:1188
 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:1145
+#: ../mail/e-mail-reader.c:1193
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../mail/e-mail-reader.c:1147
+#: ../mail/e-mail-reader.c:1195
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsÃ¤Ã¤nnÃ¶illÃ¤"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1200
 msgid "_Find in Message..."
 msgstr "Etsi viestistÃ¤..."
 
-#: ../mail/e-mail-reader.c:1154
+#: ../mail/e-mail-reader.c:1202
 msgid "Search for text in the body of the displayed message"
 msgstr "EtsiÃ¤ tekstiÃ¤ nÃ¤ytetyn viestin rungosta"
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1207
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/e-mail-reader.c:1161
+#: ../mail/e-mail-reader.c:1209
 msgid "Remove the follow-up flag from the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1214
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/e-mail-reader.c:1168
+#: ../mail/e-mail-reader.c:1216
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1221
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../mail/e-mail-reader.c:1175
+#: ../mail/e-mail-reader.c:1223
 msgid "Flag the selected messages for follow-up"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1180
-#: ../modules/mail/e-mail-attachment-handler.c:134
-msgid "_Forward"
-msgstr "_VÃ¤litÃ¤"
-
-#: ../mail/e-mail-reader.c:1182
-msgid "Forward the selected message to someone"
-msgstr "VÃ¤litÃ¤ edelleen valitut viestit jollekulle"
-
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1228
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../mail/e-mail-reader.c:1189
+#: ../mail/e-mail-reader.c:1230 ../mail/e-mail-reader.c:1237
 msgid "Forward the selected message to someone as an attachment"
 msgstr "VÃ¤litÃ¤ edelleen valitut viestit liitteenÃ¤"
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1235
+msgid "Forward As _Attached"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1242
 msgid "_Inline"
 msgstr "S_isÃ¤kkÃ¤isesti"
 
-#: ../mail/e-mail-reader.c:1196
+#: ../mail/e-mail-reader.c:1244 ../mail/e-mail-reader.c:1251
 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:1201
+#: ../mail/e-mail-reader.c:1249
+msgid "Forward As _Inline"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1256
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../mail/e-mail-reader.c:1203
+#: ../mail/e-mail-reader.c:1258 ../mail/e-mail-reader.c:1265
 msgid "Forward the selected message quoted like a reply"
 msgstr "VÃ¤litÃ¤ edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1263
+msgid "Forward As _Quoted"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1270
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../mail/e-mail-reader.c:1210
+#: ../mail/e-mail-reader.c:1272
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissÃ¤ olevien kuvien lataus"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1277
 msgid "_Important"
 msgstr "_TÃ¤rkeÃ¤"
 
-#: ../mail/e-mail-reader.c:1217
+#: ../mail/e-mail-reader.c:1279
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tÃ¤rkeiksi"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1284
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../mail/e-mail-reader.c:1224
+#: ../mail/e-mail-reader.c:1286
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1291
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../mail/e-mail-reader.c:1231
-msgid "Mark the selected messasges as not being junk"
+#: ../mail/e-mail-reader.c:1293
+msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1298
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../mail/e-mail-reader.c:1238
+#: ../mail/e-mail-reader.c:1300
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1305
 msgid "Uni_mportant"
 msgstr "Sa_mantekevÃ¤"
 
-#: ../mail/e-mail-reader.c:1245
+#: ../mail/e-mail-reader.c:1307
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1312
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../mail/e-mail-reader.c:1252
+#: ../mail/e-mail-reader.c:1314
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1319
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinÃ¤..."
 
-#: ../mail/e-mail-reader.c:1259
+#: ../mail/e-mail-reader.c:1321
 msgid "Open the selected messages in the composer for editing"
 msgstr "Avaa valitut viestit muokkaimessa"
 
-#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1326
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../mail/e-mail-reader.c:1266
+#: ../mail/e-mail-reader.c:1328
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sÃ¤hkÃ¶postin kirjoitusikkuna"
 
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1333
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:1273
+#: ../mail/e-mail-reader.c:1335
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1340
 msgid "_Move to Folder..."
 msgstr "_SiirrÃ¤ kansioon..."
 
-#: ../mail/e-mail-reader.c:1280
+#: ../mail/e-mail-reader.c:1342
 msgid "Move selected messages to another folder"
 msgstr "SiirrÃ¤ valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1347
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../mail/e-mail-reader.c:1287
+#: ../mail/e-mail-reader.c:1349
 msgid "Display the next message"
 msgstr "NÃ¤ytÃ¤ seuraava viesti"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1354
 msgid "Next _Important Message"
 msgstr "Seuraava _tÃ¤rkeÃ¤ viesti"
 
-#: ../mail/e-mail-reader.c:1294
+#: ../mail/e-mail-reader.c:1356
 msgid "Display the next important message"
 msgstr "NÃ¤ytÃ¤ seuraava tÃ¤rkeÃ¤ viesti"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1361
 msgid "Next _Thread"
 msgstr "Seuraava _sÃ¤ie"
 
-#: ../mail/e-mail-reader.c:1301
+#: ../mail/e-mail-reader.c:1363
 msgid "Display the next thread"
 msgstr "NÃ¤ytÃ¤ seuraava sÃ¤ie"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1368
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../mail/e-mail-reader.c:1308
+#: ../mail/e-mail-reader.c:1370
 msgid "Display the next unread message"
 msgstr "NÃ¤ytÃ¤ seuraava lukematon viesti"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1375
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../mail/e-mail-reader.c:1315
+#: ../mail/e-mail-reader.c:1377
 msgid "Display the previous message"
 msgstr "NÃ¤ytÃ¤ edellinen viesti"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1382
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tÃ¤rkeÃ¤ viesti"
 
-#: ../mail/e-mail-reader.c:1322
+#: ../mail/e-mail-reader.c:1384
 msgid "Display the previous important message"
 msgstr "NÃ¤ytÃ¤ edellinen tÃ¤rkeÃ¤ viesti"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1389
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:1329
+#: ../mail/e-mail-reader.c:1391
 msgid "Display the previous unread message"
 msgstr "NÃ¤ytÃ¤ edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:1336
+#: ../mail/e-mail-reader.c:1398
 msgid "Print this message"
 msgstr "Tulosta tÃ¤mÃ¤ viesti"
 
-#: ../mail/e-mail-reader.c:1343
+#: ../mail/e-mail-reader.c:1405
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiÃ¤"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1410
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../mail/e-mail-reader.c:1350
+#: ../mail/e-mail-reader.c:1412
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrÃ¤) valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:1355
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../mail/e-mail-reader.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../mail/e-mail-reader.c:1357
+#: ../mail/e-mail-reader.c:1419
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1424
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../mail/e-mail-reader.c:1364
+#: ../mail/e-mail-reader.c:1426
 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:1369
+#: ../mail/e-mail-reader.c:1431
 #: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "_Vastaa lÃ¤hettÃ¤jÃ¤lle"
 
-#: ../mail/e-mail-reader.c:1371
+#: ../mail/e-mail-reader.c:1433
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin lÃ¤hettÃ¤jÃ¤lle"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1438
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../mail/e-mail-reader.c:1378
+#: ../mail/e-mail-reader.c:1440
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1445
 msgid "Search Folder from Mailing _List..."
 msgstr "HakunÃ¤kymÃ¤ _postilistasta..."
 
-#: ../mail/e-mail-reader.c:1385
+#: ../mail/e-mail-reader.c:1447
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunÃ¤kymÃ¤ tÃ¤stÃ¤ postilistasta"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1452
 msgid "Search Folder from Recipien_ts..."
 msgstr "HakunÃ¤kymÃ¤ _vastaanottajista..."
 
-#: ../mail/e-mail-reader.c:1392
+#: ../mail/e-mail-reader.c:1454
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunÃ¤kymÃ¤ nÃ¤istÃ¤ vastaanottajista"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1459
 msgid "Search Folder from Sen_der..."
 msgstr "HakunÃ¤kymÃ¤ _lÃ¤hettÃ¤jÃ¤stÃ¤..."
 
-#: ../mail/e-mail-reader.c:1399
+#: ../mail/e-mail-reader.c:1461
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunÃ¤kymÃ¤ tÃ¤stÃ¤ lÃ¤hettÃ¤jÃ¤stÃ¤"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1466
 msgid "Search Folder from S_ubject..."
 msgstr "HakunÃ¤kymÃ¤ _aiheesta..."
 
-#: ../mail/e-mail-reader.c:1406
+#: ../mail/e-mail-reader.c:1468
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunÃ¤kymÃ¤ tÃ¤stÃ¤ aiheesta"
 
-#: ../mail/e-mail-reader.c:1411
-msgid "Select _All Text"
-msgstr "Valitse k_aikki teksti"
-
-#: ../mail/e-mail-reader.c:1413
-msgid "Select all the text in a message"
-msgstr "Valitse kaikki teksti viestistÃ¤"
-
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1473
 msgid "_Message Source"
 msgstr "_Viestin lÃ¤hdekoodi"
 
-#: ../mail/e-mail-reader.c:1420
+#: ../mail/e-mail-reader.c:1475
 msgid "Show the raw email source of the message"
 msgstr "NÃ¤ytÃ¤ viestin raakatekstimuotoinen lÃ¤hdekoodi"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1487
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../mail/e-mail-reader.c:1434
+#: ../mail/e-mail-reader.c:1489
 msgid "Undelete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1494
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../mail/e-mail-reader.c:1441
+#: ../mail/e-mail-reader.c:1496
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperÃ¤isen kokoiseksi"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1501
 msgid "_Zoom In"
 msgstr "LÃ¤_hennÃ¤"
 
-#: ../mail/e-mail-reader.c:1448
+#: ../mail/e-mail-reader.c:1503
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1508
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
-#: ../mail/e-mail-reader.c:1455
+#: ../mail/e-mail-reader.c:1510
 msgid "Decrease the text size"
 msgstr "PienennÃ¤ tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:1462
+#: ../mail/e-mail-reader.c:1517
 msgid "Create R_ule"
 msgstr "Luo _sÃ¤Ã¤ntÃ¶"
 
-#: ../mail/e-mail-reader.c:1469
+#: ../mail/e-mail-reader.c:1524
 msgid "Ch_aracter Encoding"
 msgstr "MerkistÃ¶n _koodaus"
 
-#: ../mail/e-mail-reader.c:1476
+#: ../mail/e-mail-reader.c:1531
 msgid "F_orward As"
 msgstr "_VÃ¤litÃ¤ muodossa"
 
-#: ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1538
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../mail/e-mail-reader.c:1490
+#: ../mail/e-mail-reader.c:1545
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../mail/e-mail-reader.c:1497
+#: ../mail/e-mail-reader.c:1552
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../mail/e-mail-reader.c:1504
+#: ../mail/e-mail-reader.c:1559
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../mail/e-mail-reader.c:1525
+#: ../mail/e-mail-reader.c:1584
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse _edelleen lÃ¤hetettÃ¤vÃ¤ksi..."
 
-#: ../mail/e-mail-reader.c:1533
+#: ../mail/e-mail-reader.c:1592
 msgid "Mark as _Important"
 msgstr "Merkitse _tÃ¤rkeÃ¤ksi"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1596
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1600
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1545
+#: ../mail/e-mail-reader.c:1604
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/e-mail-reader.c:1549
+#: ../mail/e-mail-reader.c:1608
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekevÃ¤ksi"
 
-#: ../mail/e-mail-reader.c:1553
+#: ../mail/e-mail-reader.c:1612
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/e-mail-reader.c:1589
+#: ../mail/e-mail-reader.c:1648
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../mail/e-mail-reader.c:1591
+#: ../mail/e-mail-reader.c:1650
 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:1597
+#: ../mail/e-mail-reader.c:1656
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../mail/e-mail-reader.c:1599
+#: ../mail/e-mail-reader.c:1658
 msgid "Show messages with all email headers"
 msgstr "NÃ¤ytÃ¤ viesti kaikilla otsakkeillaan"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1880
 msgid "Unable to retrieve message"
 msgstr "ViestiÃ¤ ei voi hakea"
 
+#: ../mail/e-mail-reader.c:1884 ../mail/e-mail-reader.c:1945
+#: ../mail/mail-ops.c:1848
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr ""
+
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2212
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:612
-#: ../plugins/google-account-setup/google-source.c:783
+#: ../mail/e-mail-reader.c:2461
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:534
+#: ../plugins/google-account-setup/google-source.c:656
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/e-mail-reader.c:2357 ../mail/em-filter-i18n.h:14
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:905
-#: ../modules/calendar/e-task-shell-view-actions.c:1105
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../mail/e-mail-reader.c:2582
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "_VÃ¤litÃ¤"
+
+#: ../mail/e-mail-reader.c:2583
+msgid "Forward the selected message to someone"
+msgstr "VÃ¤litÃ¤ edelleen valitut viestit jollekulle"
+
+#: ../mail/e-mail-reader.c:2628 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/e-mail-reader.c:2361
-#: ../modules/calendar/e-cal-shell-view-actions.c:1194
+#: ../mail/e-mail-reader.c:2632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mail/e-mail-reader.c:2365
-#: ../modules/calendar/e-cal-shell-view-actions.c:1187
+#: ../mail/e-mail-reader.c:2636
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../mail/e-mail-reader.c:2369 ../mail/message-tag-followup.c:62
+#: ../mail/e-mail-reader.c:2640 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../mail/e-mail-search-bar.c:77
-#, c-format
-msgid "Matches: %d"
-msgstr "Osumia: %d"
-
-#: ../mail/e-mail-search-bar.c:552
-msgid "Close the find bar"
-msgstr "Sulje hakupalkki"
-
-#: ../mail/e-mail-search-bar.c:560
-msgid "Fin_d:"
-msgstr "Et_si:"
-
-#: ../mail/e-mail-search-bar.c:572
-msgid "Clear the search"
-msgstr "TyhjennÃ¤ hakukenttÃ¤"
-
-#: ../mail/e-mail-search-bar.c:595
-msgid "_Previous"
-msgstr "_Edellinen"
-
-#: ../mail/e-mail-search-bar.c:601
-msgid "Find the previous occurrence of the phrase"
-msgstr "Etsi lauseen edellinen esiintymÃ¤"
-
-#: ../mail/e-mail-search-bar.c:611
-msgid "_Next"
-msgstr "_Seuraava"
-
-#: ../mail/e-mail-search-bar.c:617
-msgid "Find the next occurrence of the phrase"
-msgstr "Etsi lauseen seuraava esiintymÃ¤"
-
-#: ../mail/e-mail-search-bar.c:627
-msgid "Mat_ch case"
-msgstr "Huomioi _kirjainkoko"
-
-#: ../mail/e-mail-search-bar.c:655
-msgid "Reached bottom of page, continued from top"
-msgstr "Saavutettin sivun loppu, jatketaan alusta"
-
-#: ../mail/e-mail-search-bar.c:677
-msgid "Reached top of page, continued from bottom"
-msgstr "Saavutettiin sivun alku, jatketaan lopusta"
-
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
-#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:220
-#: ../mail/message-list.c:1555
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:120
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:107
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:501
-#: ../modules/mail/e-mail-shell-migrate.c:2931
-msgid "On This Computer"
-msgstr "TÃ¤llÃ¤ tietokoneella"
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "Merkitse edelleenlÃ¤hetettÃ¤vÃ¤ksi"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:486
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "Ei salausta"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:490
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:494
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
-#: ../mail/em-account-editor.c:587
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisenssisopimus ohjelmalle %s"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -9789,23 +10293,35 @@ msgstr ""
 "ohjelmalle %s\n"
 "ja ruksita laatikko, jos hyvÃ¤ksyt lisenssin\n"
 
-#: ../mail/em-account-editor.c:1002
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr ""
+
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../mail/em-account-editor.c:1003
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Aina"
 
-#: ../mail/em-account-editor.c:1004
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../mail/em-account-editor.c:2084
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+msgctxt "mail-receiving"
+msgid "None"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "SÃ¤hkÃ¶postiasetukset"
 
-#: ../mail/em-account-editor.c:2085
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9813,50 +10329,45 @@ msgid ""
 msgstr ""
 "Tervetuloa Evolutionin sÃ¤hkÃ¶postitilin asetusapulaiseen.\n"
 "\n"
-"Aloita napista \"Seuraava\"."
+"Aloita napista \"EteenpÃ¤in\"."
 
-#: ../mail/em-account-editor.c:2087 ../mail/em-account-editor.c:2213
-#: ../mail/mail-config.glade.h:87
-msgid "Identity"
-msgstr "Omat tiedot"
-
-#: ../mail/em-account-editor.c:2088
+#: ../mail/em-account-editor.c:2060
 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."
 msgstr ""
-"SyÃ¶tÃ¤ nimesi ja sÃ¤hkÃ¶postiosoitteesi alla oleviin kenttiin. \"Valinnaiset\" "
-"kentÃ¤t eivÃ¤t ole pakollisia, jollet halua sisÃ¤ltÃ¤Ã¤ nÃ¤itÃ¤ tietoja "
-"lÃ¤hettÃ¤miisi sÃ¤hkÃ¶postiviesteihin."
+"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/em-account-editor.c:2090 ../mail/em-account-editor.c:2254
-#: ../mail/mail-config.glade.h:107
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2219
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "Vastaanotto"
 
-#: ../mail/em-account-editor.c:2091
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "MÃ¤Ã¤rittele seuraavat tiliasetukset."
 
-#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2714
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2696
 msgid "Sending Email"
 msgstr "LÃ¤hetys"
 
-#: ../mail/em-account-editor.c:2094
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"SyÃ¶tÃ¤ tiedot siitÃ¤, kuinka lÃ¤hetÃ¤t sÃ¤hkÃ¶postia. jos et ole varma "
+"SyÃ¶tÃ¤ tiedot siitÃ¤, kuinka lÃ¤hetÃ¤t sÃ¤hkÃ¶postia. Jos et ole varma "
 "asetuksista, kysy jÃ¤rjestelmÃ¤si yllÃ¤pitÃ¤jÃ¤ltÃ¤ tai Internet-"
 "palveluntarjoajaltasi."
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: ../mail/em-account-editor.c:2097
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -9864,11 +10375,11 @@ msgstr ""
 "SyÃ¶tÃ¤ kuvaava nimi tÃ¤lle tilille allaolevaan kenttÃ¤Ã¤n.\n"
 "TÃ¤tÃ¤ nimeÃ¤ kÃ¤ytetÃ¤Ã¤n ainoastaan ohjelman sisÃ¤isesti tilin nÃ¤yttÃ¶Ã¶n."
 
-#: ../mail/em-account-editor.c:2101
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9882,59 +10393,56 @@ msgstr ""
 "\n"
 "Tallenna asetuksesi napsauttamalla painiketta \"Toteuta\""
 
-#: ../mail/em-account-editor.c:2526
+#: ../mail/em-account-editor.c:2506
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../mail/em-account-editor.c:2534
+#: ../mail/em-account-editor.c:2514
 msgid "minu_tes"
 msgstr "minuutti"
 
-#: ../mail/em-account-editor.c:2776 ../mail/mail-config.glade.h:63
-msgid "Defaults"
-msgstr "Oletusasetukset"
-
-#. Security settings
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:113
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../mail/em-account-editor.c:2822 ../mail/mail-config.ui.h:100
 msgid "Security"
 msgstr "Turvallisuus"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2879 ../mail/em-account-editor.c:2947
+#: ../mail/em-account-editor.c:2867 ../mail/em-account-editor.c:2935
 msgid "Receiving Options"
 msgstr "Vastaanottoasetukset"
 
-#: ../mail/em-account-editor.c:2880 ../mail/em-account-editor.c:2948
+#: ../mail/em-account-editor.c:2868 ../mail/em-account-editor.c:2936
 msgid "Checking for New Messages"
 msgstr "Uusien viestien etsintÃ¤"
 
-#: ../mail/em-account-editor.c:3407 ../mail/mail-config.glade.h:35
+#: ../mail/em-account-editor.c:3427
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/em-account-editor.c:3407
+#: ../mail/em-account-editor.c:3427
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sÃ¤hkÃ¶postitilien apulainen"
 
-#: ../mail/em-composer-utils.c:1590
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "Kohdeosoitetta ei annettu, viestin edelleenlÃ¤hetys on peruttu."
+#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
+#: ../mail/em-composer-utils.c:1568
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr ""
 
-#: ../mail/em-composer-utils.c:1596
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "KÃ¤ytettÃ¤vÃ¤Ã¤ tiliÃ¤ ei lÃ¶ydy, viestin edelleenlÃ¤hetys on peruttu."
+#. Translators: %s is the subject of the email message
+#: ../mail/em-composer-utils.c:1616
+#, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr ""
 
-#: ../mail/em-composer-utils.c:2063
+#: ../mail/em-composer-utils.c:1940
 msgid "an unknown sender"
 msgstr "Tuntematon lÃ¤hettÃ¤jÃ¤"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2110
+#: ../mail/em-composer-utils.c:1987
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9942,21 +10450,21 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:2253
+#: ../mail/em-composer-utils.c:2131
 msgid "-----Original Message-----"
 msgstr "-----AlkuperÃ¤inen viesti-----"
 
-#: ../mail/em-composer-utils.c:2431
+#: ../mail/em-composer-utils.c:2315
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../mail/em-composer-utils.c:2432
+#: ../mail/em-composer-utils.c:2316
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../mail/em-filter-editor.c:188
-msgid "_Filter Rules"
-msgstr "_SuodatinsÃ¤Ã¤nnÃ¶t"
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "Valitse kansio"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -9987,10 +10495,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Valmistui"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Kopioi kansioon"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Otettu vastaan"
@@ -10047,10 +10551,6 @@ msgstr "LÃ¤hetÃ¤ edelleen"
 msgid "Forward to"
 msgstr "VÃ¤litÃ¤"
 
-#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:955
-msgid "Important"
-msgstr "TÃ¤rkeÃ¤"
-
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "on jÃ¤lkeen"
@@ -10075,7 +10575,7 @@ msgstr "ei ole asetettu"
 msgid "is set"
 msgstr "on asetettu"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:88
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "Roskaposti"
 
@@ -10115,10 +10615,6 @@ msgstr "Viesti ei ole roskapostia"
 msgid "Message Location"
 msgstr "Viestin sijainti"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "SiirrÃ¤ kansioon"
-
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "VÃ¤litÃ¤ putkessa ohjelmalle"
@@ -10127,8 +10623,8 @@ msgstr "VÃ¤litÃ¤ putkessa ohjelmalle"
 msgid "Play Sound"
 msgstr "Soita Ã¤Ã¤ni"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "Luettu"
 
@@ -10209,11 +10705,11 @@ msgid "Unset Status"
 msgstr "Poista tilan asetus"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:530
 msgid "Then"
 msgstr "sitten"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:561
 msgid "Add Ac_tion"
 msgstr "LisÃ¤Ã¤ _toiminto"
 
@@ -10243,7 +10739,7 @@ msgid "Quota usage"
 msgstr "Levytilan kÃ¤yttÃ¶"
 
 #: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
@@ -10251,35 +10747,37 @@ msgstr "Kansion ominaisuudet"
 msgid "<click here to select a folder>"
 msgstr "<Valitse kansio tÃ¤stÃ¤>"
 
-#: ../mail/em-folder-selector.c:267
+#: ../mail/em-folder-selector.c:266
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../mail/em-folder-selector.c:271
+#: ../mail/em-folder-selector.c:270
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
-#: ../mail/mail-vfolder.c:978 ../mail/mail-vfolder.c:1034
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/em-folder-tree-model.c:173 ../mail/em-folder-tree-model.c:175
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "HakunÃ¤kymÃ¤t"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:180 ../mail/em-folder-tree-model.c:182
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:662 ../mail/em-folder-tree-model.c:998
+#: ../mail/em-folder-tree-model.c:780 ../mail/em-folder-tree-model.c:1117
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../mail/em-folder-tree.c:184 ../mail/mail-ops.c:1069
+#: ../mail/em-folder-tree.c:192
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "EtsitÃ¤Ã¤n kansioita kohteessa \"%s\""
 
-#: ../mail/em-folder-tree.c:431
+#: ../mail/em-folder-tree.c:605
 msgid "Folder names cannot contain '/'"
 msgstr "Kansion nimi ei voi sisÃ¤ltÃ¤Ã¤ merkkiÃ¤ '/'"
 
@@ -10300,72 +10798,75 @@ msgstr "Kansion nimi ei voi sisÃ¤ltÃ¤Ã¤ merkkiÃ¤ '/'"
 #. *
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:940
-#,  c-format
+#. 
+#: ../mail/em-folder-tree.c:1087
+#, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1268
+#: ../mail/em-folder-tree.c:1321
 msgid "Mail Folder Tree"
 msgstr "SÃ¤hkÃ¶postikansioiden puu"
 
-#: ../mail/em-folder-tree.c:1435
+#: ../mail/em-folder-tree.c:1611 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "SiirretÃ¤Ã¤n kansiota %s"
 
-#: ../mail/em-folder-tree.c:1437
+#: ../mail/em-folder-tree.c:1613 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:1444 ../mail/message-list.c:2052
+#: ../mail/em-folder-tree.c:1620 ../mail/message-list.c:2146
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "SiirretÃ¤Ã¤n viestejÃ¤ kansioon %s"
 
-#: ../mail/em-folder-tree.c:1446 ../mail/message-list.c:2054
+#: ../mail/em-folder-tree.c:1622 ../mail/message-list.c:2148
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejÃ¤ kansioon %s"
 
-#: ../mail/em-folder-tree.c:1461
+#: ../mail/em-folder-tree.c:1637
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ViestiÃ¤ ei voi tiputtaa ylÃ¤tason taltioon"
 
-#: ../mail/em-folder-utils.c:98
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "Kopioidaan %s paikkaan %s"
+#: ../mail/em-folder-utils.c:386
+msgid "Move Folder To"
+msgstr ""
+
+#: ../mail/em-folder-utils.c:386
+msgid "Copy Folder To"
+msgstr ""
 
-#: ../mail/em-folder-utils.c:513
-#: ../plugins/groupwise-features/share-folder-common.c:144
+#: ../mail/em-folder-utils.c:507
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "Luodaan kansiota %s"
+msgid "Creating folder '%s'"
+msgstr "Luodaan kansiota '%s'"
 
-#: ../mail/em-folder-utils.c:675
+#: ../mail/em-folder-utils.c:670
 msgid "Create Folder"
 msgstr "Luo kansio"
 
-#: ../mail/em-folder-utils.c:676
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../mail/em-folder-utils.c:671
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "MÃ¤Ã¤rittele mihin kansio luodaan:"
 
-#: ../mail/em-folder-utils.c:692
+#: ../mail/em-folder-utils.c:691
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Peru kansion \"%s\" tilaus"
 
-#: ../mail/em-format-html-display.c:108 ../mail/em-format-html.c:1453
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1552
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../mail/em-format-html-display.c:108
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10373,11 +10874,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, ettÃ¤ viestin lÃ¤hettÃ¤jÃ¤ on "
 "varmasti se, jolta viesti nÃ¤yttÃ¤Ã¤ olevan."
 
-#: ../mail/em-format-html-display.c:109 ../mail/em-format-html.c:1454
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1553
 msgid "Valid signature"
 msgstr "HyvÃ¤ksytty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:109
+#: ../mail/em-format-html-display.c:104
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10385,11 +10886,11 @@ msgstr ""
 "TÃ¤mÃ¤ viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennÃ¤kÃ¶isesti aito."
 
-#: ../mail/em-format-html-display.c:110 ../mail/em-format-html.c:1455
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1554
 msgid "Invalid signature"
 msgstr "HylÃ¤tty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:110
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10397,11 +10898,11 @@ msgstr ""
 "TÃ¤mÃ¤n viestin allekirjoitusta ei voi tarkistaa, se on ehkÃ¤ muuttunut siirron "
 "aikana."
 
-#: ../mail/em-format-html-display.c:111 ../mail/em-format-html.c:1456
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1555
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lÃ¤hettÃ¤jÃ¤Ã¤ ei voi varmistaa"
 
-#: ../mail/em-format-html-display.c:111
+#: ../mail/em-format-html-display.c:106
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10409,11 +10910,11 @@ msgstr ""
 "TÃ¤mÃ¤ viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lÃ¤hettÃ¤jÃ¤Ã¤ ei voi varmistaa."
 
-#: ../mail/em-format-html-display.c:112 ../mail/em-format-html.c:1457
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1556
 msgid "Signature exists, but need public key"
 msgstr "Allekirjoitus lÃ¶ytyi, mutta tarvitsee julkisen avaimen"
 
-#: ../mail/em-format-html-display.c:112
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10421,11 +10922,11 @@ msgstr ""
 "TÃ¤mÃ¤ viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lÃ¤hettÃ¤jÃ¤n julkista avainta ei lÃ¶ydy."
 
-#: ../mail/em-format-html-display.c:119 ../mail/em-format-html.c:1463
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1562
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../mail/em-format-html-display.c:119
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10433,11 +10934,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisÃ¤ltÃ¶Ã¤ voidaan tutkia sen kulkiessa "
 "Internetin lÃ¤pi."
 
-#: ../mail/em-format-html-display.c:120 ../mail/em-format-html.c:1464
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1563
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../mail/em-format-html-display.c:120
+#: ../mail/em-format-html-display.c:115
 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 "
@@ -10447,11 +10948,11 @@ msgstr ""
 "mahdotonta, ettÃ¤ ulkopuolinen pystyy purkamaan ja katsomaan viestin sisÃ¤llÃ¶n "
 "melko lyhyessÃ¤ ajassa."
 
-#: ../mail/em-format-html-display.c:121 ../mail/em-format-html.c:1465
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1564
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../mail/em-format-html-display.c:121
+#: ../mail/em-format-html-display.c:116
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10459,11 +10960,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisÃ¤ltÃ¶ "
 "luettavakseen."
 
-#: ../mail/em-format-html-display.c:122 ../mail/em-format-html.c:1466
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1565
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../mail/em-format-html-display.c:122
+#: ../mail/em-format-html-display.c:117
 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 "
@@ -10473,15 +10974,15 @@ msgstr ""
 "vaikea purkaa salausta ja nÃ¤hdÃ¤ tÃ¤mÃ¤n viestin sisÃ¤ltÃ¶Ã¤ missÃ¤Ã¤n "
 "kÃ¤ytÃ¤nnÃ¶llisessÃ¤ ajassa."
 
-#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_NÃ¤ytÃ¤ varmenne"
 
-#: ../mail/em-format-html-display.c:274
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "TÃ¤tÃ¤ varmennetta ei voi nÃ¤yttÃ¤Ã¤"
 
-#: ../mail/em-format-html-display.c:525
+#: ../mail/em-format-html-display.c:511
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10490,28 +10991,28 @@ msgstr ""
 "kÃ¤siteltÃ¤vÃ¤ksi.  Voit nÃ¤yttÃ¤Ã¤ sen muotoilemattomana tai ulkoisella "
 "tekstinmuokkaimella."
 
-#: ../mail/em-format-html-display.c:795
+#: ../mail/em-format-html-display.c:740
 msgid "Completed on"
 msgstr "Valmistui"
 
-#: ../mail/em-format-html-display.c:803
+#: ../mail/em-format-html-display.c:748
 msgid "Overdue:"
 msgstr "ErÃ¤pÃ¤ivÃ¤ ylitetty:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:807
+#: ../mail/em-format-html-display.c:752
 msgid "by"
 msgstr "mennessÃ¤"
 
-#: ../mail/em-format-html-display.c:1204 ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html-display.c:1003
 msgid "View _Unformatted"
 msgstr "NÃ¤ytÃ¤ _muotoilematon"
 
-#: ../mail/em-format-html-display.c:1206
+#: ../mail/em-format-html-display.c:966
 msgid "Hide _Unformatted"
 msgstr "Piilota _muotoilematon"
 
-#: ../mail/em-format-html-display.c:1263
+#: ../mail/em-format-html-display.c:1023
 msgid "O_pen With"
 msgstr "Avaa _ohjelmalla"
 
@@ -10520,48 +11021,48 @@ msgstr "Avaa _ohjelmalla"
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "Muotoillaan viestiÃ¤"
 
-#: ../mail/em-format-html.c:342
+#: ../mail/em-format-html.c:357
 msgid "Formatting Message..."
 msgstr "Muotoillaan viestiÃ¤..."
 
-#: ../mail/em-format-html.c:1304 ../mail/em-format-html.c:1313
+#: ../mail/em-format-html.c:1398 ../mail/em-format-html.c:1407
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "Noudetaan \"%s\""
+msgid "Retrieving '%s'"
+msgstr ""
 
-#: ../mail/em-format-html.c:1759
+#: ../mail/em-format-html.c:1871
 msgid "Unknown external-body part."
 msgstr "Tuntematon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:1767
+#: ../mail/em-format-html.c:1879
 msgid "Malformed external-body part."
 msgstr "VÃ¤Ã¤rin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:1797
+#: ../mail/em-format-html.c:1909
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../mail/em-format-html.c:1808
+#: ../mail/em-format-html.c:1920
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: ../mail/em-format-html.c:1810
+#: ../mail/em-format-html.c:1922
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../mail/em-format-html.c:1831
+#: ../mail/em-format-html.c:1943
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: ../mail/em-format-html.c:1842
+#: ../mail/em-format-html.c:1954
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
@@ -10569,47 +11070,39 @@ msgstr ""
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2483
+#. 
+#: ../mail/em-format-html.c:2614
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "TÃ¤mÃ¤ viesti lÃ¤hetettiin <b>%s</b> kÃ¤yttÃ¤jÃ¤n <b>%s</b> puolesta"
 
-#: ../mail/em-subscribe-editor.c:607
+#: ../mail/em-subscribe-editor.c:586
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "TÃ¤mÃ¤ varasto ei tue tilaamista tai tilaukset eivÃ¤t ole kÃ¤ytÃ¶ssÃ¤."
 
-#: ../mail/em-subscribe-editor.c:640
+#: ../mail/em-subscribe-editor.c:619
 msgid "Subscribed"
 msgstr "Tilattu"
 
-#: ../mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:623
 msgid "Folder"
 msgstr "Kansio"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: ../mail/em-subscribe-editor.c:896
+#: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: ../mail/em-utils.c:305
+#: ../mail/em-utils.c:310
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../mail/em-utils.c:357
-msgid "message"
-msgstr "viesti"
-
-#: ../mail/em-utils.c:645
-msgid "Save Message..."
-msgstr "Tallenna viesti..."
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1108
+#: ../mail/em-utils.c:816
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltÃ¤"
@@ -10618,9 +11111,9 @@ msgstr "Viestit %s:ltÃ¤"
 msgid "Search _Folders"
 msgstr "_HakunÃ¤kymÃ¤t"
 
-#: ../mail/em-vfolder-rule.c:596
-msgid "Search Folder source"
-msgstr "HakunÃ¤kymÃ¤n lÃ¤hde"
+#: ../mail/em-vfolder-rule.c:522
+msgid "Add Folder"
+msgstr "LisÃ¤Ã¤ kansio"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Filter Editor\" window height"
@@ -10791,7 +11284,7 @@ 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 roskÃ¶postin suodatusta "
+"MÃ¤Ã¤rittÃ¤Ã¤, etsitÃ¤Ã¤nkÃ¶ lÃ¤hettÃ¤jÃ¤n sÃ¤hkÃ¶postiosoitetta roskapostin suodatusta "
 "varten vain paikallisista osoitekirjoista"
 
 #: ../mail/evolution-mail.schemas.in.h:41
@@ -10831,8 +11324,8 @@ msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"MÃ¤Ã¤rittÃ¤Ã¤ kÃ¤ytetÃ¤Ã¤nkÃ¶ samaa kirjaisinta sekÃ¤ \"LÃ¤hettÃ¤jÃ¤\" ja \"Vastaanottaja"
-"\" riveillÃ¤ \"Viestit\"-sarakkeessa kÃ¤ytettÃ¤essÃ¤ pystynÃ¤kymÃ¤Ã¤."
+"MÃ¤Ã¤rittÃ¤Ã¤ kÃ¤ytetÃ¤Ã¤nkÃ¶ samaa kirjasinta sekÃ¤ \"LÃ¤hettÃ¤jÃ¤\" ja "
+"\"Vastaanottaja\" riveillÃ¤ \"Viestit\"-sarakkeessa kÃ¤ytettÃ¤essÃ¤ pystynÃ¤kymÃ¤Ã¤."
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
@@ -10847,83 +11340,90 @@ msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "MÃ¤Ã¤ritÃ¤ typistetÃ¤Ã¤nkÃ¶ kansioiden nimet kansionÃ¤kymÃ¤ssÃ¤"
 
 #: ../mail/evolution-mail.schemas.in.h:49
+msgid "Do not add signature delimiter"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "NÃ¤ytÃ¤ oikoluvun kirjoitusvirhemerkit sanoissa kirjoituksen aikana."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "TyhjennÃ¤ roskapostikansiot lopetettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "TyhjennÃ¤ roskakorit lopetettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "TyhjennÃ¤ kaikki roskapostikansiot kun Evolution suljetaan"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "TyhjennÃ¤ kaikki roskakorit kun Evolution suljetaan"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "KÃ¤ytetÃ¤Ã¤nkÃ¶ maagista vÃ¤lilyÃ¶ntinÃ¤ppÃ¤intÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ kehto merkittÃ¤essÃ¤ useita viestejÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "KÃ¤ytetÃ¤Ã¤nkÃ¶ kirjoituksenaikaista hakua"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "ota hakunÃ¤kymÃ¤t kÃ¤yttÃ¶Ã¶n"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "Ota hakunÃ¤kymÃ¤t kÃ¤yttÃ¶Ã¶n kÃ¤ynnistettÃ¤essÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 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Ã¤lilyntÃ¶nÃ¤ppÃ¤intÃ¤ siirtyÃ¤ksesi viestin "
+"KÃ¤ytÃ¤ tÃ¤tÃ¤, jos kaluat kÃ¤yttÃ¤Ã¤ vÃ¤lilyÃ¶ntinÃ¤ppÃ¤intÃ¤ siirtyÃ¤ksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "Ota kÃ¤yttÃ¶Ã¶n viestin tekstiosan rajoitettu nÃ¤yttÃ¶koko."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../mail/evolution-mail.schemas.in.h:65 ../mail/mail-config.glade.h:74
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Muotoile tiedostonimet outlookin ja gmailin tapaan."
 
-#: ../mail/evolution-mail.schemas.in.h:66
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10931,23 +11431,23 @@ msgid ""
 "standard."
 msgstr ""
 "Koodaa tiedostonimet postiotsakkeissa samalla tavalla kuin Outlook ja Gmail, "
-"jotta ne pystyvÃ¤t tunnistamaan Evolution lÃ¤hettÃ¤mÃ¤t tiedostonimet. NÃ¤mÃ¤ "
-"ohjelmat eivÃ¤t noudata standardia RFC 2231, vaan kÃ¤yttÃ¤vÃ¤t virheellistÃ¤ "
-"standardia RFC 2047."
+"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."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Piilottaa kansiokohtaisen esikatselun ja poistaa valinnan"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10955,7 +11455,7 @@ msgstr ""
 "Jos yritÃ¤t avata 10 tai useampia viestejÃ¤ kerralla, kysytÃ¤Ã¤n haluatko "
 "todella tehdÃ¤ sen."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -10966,25 +11466,19 @@ msgstr ""
 "tyyppientietokannassa mÃ¤Ã¤riteltyÃ¤ bonobo-komponentin katselinta viestin "
 "nÃ¤yttÃ¤miseen."
 
-#: ../mail/evolution-mail.schemas.in.h:72
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan aloituskorkeus. Arvo muuttuu, "
-"jos kÃ¤yttÃ¤jÃ¤ muuttaa ikkunan korkeutta."
 
-#: ../mail/evolution-mail.schemas.in.h:73
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan aloituskorkeus. Arvo muuttuu, "
-"jos kÃ¤yttÃ¤jÃ¤ muuttaa ikkunan korkeutta."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10992,38 +11486,28 @@ msgstr ""
 "\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan aloituskorkeus. Arvo muuttuu, "
 "jos kÃ¤yttÃ¤jÃ¤ muuttaa ikkunan korkeutta."
 
-#: ../mail/evolution-mail.schemas.in.h:75
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximized. This key exists only as an implementation detail."
 msgstr ""
-"\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan suurennustilan oletusarvo. Arvo "
-"muuttuu, jos kÃ¤yttÃ¤jÃ¤ suurentaa tai palauttaa ikkunan. Huomaa, ettÃ¤ "
-"evolution ei kÃ¤ytÃ¤ tÃ¤tÃ¤ arvoa, koska kyseinen ikkuna ei ole "
-"suurennettavissa. Avain on olemassa vain teknisten yksityiskohtien takia."
 
-#: ../mail/evolution-mail.schemas.in.h:76
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
 "particular value is not used by Evolution since the \"Search Folder Editor\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan suurennustilan oletusarvo. Arvo "
-"muuttuu, jos kÃ¤yttÃ¤jÃ¤ suurentaa tai palauttaa ikkunan. Huomaa, ettÃ¤ "
-"evolution ei kÃ¤ytÃ¤ tÃ¤tÃ¤ arvoa, koska kyseinen ikkuna ei ole "
-"suurennettavissa. Avain on olemassa vain teknisten yksityiskohtien takia."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
+"particular value is not used by Evolution since the \"Send and Receive "
+"Mail\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
 "\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan suurennustilan oletusarvo. Arvo "
@@ -11031,25 +11515,19 @@ msgstr ""
 "evolution ei kÃ¤ytÃ¤ tÃ¤tÃ¤ arvoa, koska kyseinen ikkuna ei ole "
 "suurennettavissa. Avain on olemassa vain teknisten yksityiskohtien takia."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
-"\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan aloitusleveys. Arvo muuttuu, "
-"jos kÃ¤yttÃ¤jÃ¤ muuttaa ikkunan leveyttÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:79
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan aloitusleveys. Arvo muuttuu, "
-"jos kÃ¤yttÃ¤jÃ¤ muuttaa ikkunan leveyttÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11057,14 +11535,6 @@ msgstr ""
 "\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan aloitusleveys. Arvo muuttuu, "
 "jos kÃ¤yttÃ¤jÃ¤ muuttaa ikkunan leveyttÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
-msgstr ""
-"Poistaa kÃ¤ytÃ¶stÃ¤ ominaisuuden, joka kysyy useita kertoja vaaditaanko "
-"synkronointia yhteydettÃ¶mÃ¤Ã¤n tilaan siirryttÃ¤essÃ¤."
-
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
@@ -11092,7 +11562,8 @@ msgstr "MerkinnÃ¤t ja niihin liittyvÃ¤t vÃ¤rit"
 
 #: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "Luettelo MIME-tyypeistÃ¤, joista etsitÃ¤Ã¤n bonobo-komponenttikatselimia"
+msgstr ""
+"Luettelo MIME-tyypeistÃ¤, joista etsitÃ¤Ã¤n bonobo-komponenttikatselimia"
 
 #: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
@@ -11108,8 +11579,8 @@ msgid ""
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 "Luettelo tileistÃ¤, jotka Evolutionin sÃ¤hkÃ¶postiosa tuntee. Luettelo sisÃ¤ltÃ¤Ã¤ "
-"merkkijonoja, jotka nimeÃ¤vÃ¤t alihakemistoja hakemiston/apps/evolution/mail/"
-"accounts alla."
+"merkkijonoja, jotka nimeÃ¤vÃ¤t alihakemistoja "
+"hakemiston/apps/evolution/mail/accounts alla."
 
 #: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
@@ -11195,11 +11666,13 @@ msgstr "Viestin nÃ¤yttÃ¶tyyli (\"normal\", \"full headers\" tai \"source\")"
 
 #: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
-msgstr "Lyhin aika pÃ¤ivinÃ¤, jonka kuluttua roskapostit poistetaan suljettaessa"
+msgstr ""
+"Lyhin aika pÃ¤ivinÃ¤, jonka kuluttua roskapostit poistetaan suljettaessa"
 
 #: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
-msgstr "Lyhin aika pÃ¤ivinÃ¤, jonka kuluttua roskakori tyhjennetÃ¤Ã¤n suljettaessa"
+msgstr ""
+"Lyhin aika pÃ¤ivinÃ¤, jonka kuluttua roskakori tyhjennetÃ¤Ã¤n suljettaessa"
 
 #: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
@@ -11230,26 +11703,22 @@ msgstr ""
 "Kysy vahvistus, jos yritetÃ¤Ã¤n lÃ¤hettÃ¤Ã¤ viestiÃ¤ tyhjÃ¤llÃ¤ aihe-otsakkeella."
 
 #: ../mail/evolution-mail.schemas.in.h:118
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "Kysy vahvistus haluaako kÃ¤yttÃ¤jÃ¤ siirtyÃ¤ yhteydettÃ¶mÃ¤Ã¤n tilaan heti"
-
-#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejÃ¤ hakukansiosta"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun kÃ¤yttÃ¤jÃ¤ siivoaa poistettuja"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos kÃ¤yttÃ¤jÃ¤ syÃ¶ttÃ¤Ã¤ ainoastaan Bcc-kentÃ¤n"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:121
 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"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11257,116 +11726,122 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lÃ¤hettÃ¤mÃ¤ssÃ¤ HTML-viestiÃ¤ vastaanottajille, jotka "
 "eivÃ¤t sellaista halua vastaanottaa."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:123
 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Ã¤"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetÃ¤Ã¤n lÃ¤hteÃ¤ ei-toivottua HTML-postia"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittÃ¤essÃ¤ useita viestejÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Put personalized signatures at the top of replies"
-msgstr ""
+msgstr "LisÃ¤Ã¤ oma allekirjoitus vastauksen alkuun"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put the cursor at the bottom of replies"
 msgstr "Aseta osoitin viestin loppuun vastattaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Tunnista hymiÃ¶t tekstissÃ¤ ja korvaa ne kuvilla."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "Tunnista linkit tekstissÃ¤ ja korvaa ne linkillÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "Etsi lÃ¤hettÃ¤jÃ¤n valokuvaa paikallisista osoitekirjoista"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "LÃ¤hetÃ¤ oletuksena HTML-sÃ¤hkÃ¶postia"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "LÃ¤hetÃ¤ HTML-postia oletuksena."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "NÃ¤ytÃ¤ lÃ¤hettÃ¤jÃ¤n sÃ¤hkÃ¶posti viestiluettelossa"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikavÃ¤li"
 
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
-msgstr ""
+msgstr "NÃ¤ytÃ¤ \"Bcc\"-kenttÃ¤ lÃ¤hetettÃ¤essÃ¤ sÃ¤hkÃ¶postia"
 
 #: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Cc\" field when sending a mail message"
-msgstr ""
+msgstr "NÃ¤ytÃ¤ \"Cc\"-kenttÃ¤ lÃ¤hetettÃ¤essÃ¤ sÃ¤hkÃ¶postia"
 
 #: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"From\" field when posting to a newsgroup"
-msgstr ""
+msgstr "NÃ¤ytÃ¤ \"From\"-kenttÃ¤ lÃ¤hetettÃ¤essÃ¤ uutisryhmÃ¤Ã¤n"
 
 #: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr ""
+msgstr "NÃ¤ytÃ¤ \"Reply To\"-kenttÃ¤ lÃ¤hetettÃ¤essÃ¤ uutisryhmÃ¤Ã¤n"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when sending a mail message"
-msgstr ""
+msgstr "NÃ¤ytÃ¤ \"Reply To\"-kenttÃ¤ lÃ¤hetettÃ¤essÃ¤ sÃ¤hkÃ¶postia"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show Animations"
 msgstr "NÃ¤ytÃ¤ animaatiot"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show all message headers"
 msgstr "NÃ¤ytÃ¤ kaikki otsakkeet"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show all the headers when viewing a messages."
 msgstr "NÃ¤ytÃ¤ kaikki viestin otsakkeet nÃ¤ytettÃ¤essÃ¤ viestiÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show animated images as animations."
 msgstr "NÃ¤ytÃ¤ animoidut kuvat animaatioina"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "NÃ¤ytÃ¤ poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages in the message-list"
 msgstr "NÃ¤ytÃ¤ poistetut viestit viestiluettelossa"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show image animations"
 msgstr "NÃ¤ytÃ¤ kuvien animaatiot"
 
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Show original \"Date\" header value."
+msgstr ""
+
 #: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show photo of the sender"
 msgstr "NÃ¤ytÃ¤ lÃ¤hettÃ¤jÃ¤n valokuva"
@@ -11376,97 +11851,100 @@ 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."
 
 #: ../mail/evolution-mail.schemas.in.h:153
 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."
 
 #: ../mail/evolution-mail.schemas.in.h:154
 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."
 
 #: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Show the \"Preview\" pane"
-msgstr "NÃ¤ytÃ¤ \"Esikatselu\"-paneeli"
-
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid "Show the \"Preview\" pane."
-msgstr "NÃ¤ytÃ¤ esikatselupaneeli"
-
-#: ../mail/evolution-mail.schemas.in.h:158
-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."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:156
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:157
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:158
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "NÃ¤ytÃ¤ lÃ¤hettÃ¤jÃ¤n kuva viesti-ikkunan lukupaneelissa"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Spell check inline"
 msgstr "Oikolue kirjoitettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Spell checking color"
 msgstr "Oikoluvun vÃ¤ri"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell checking languages"
 msgstr "Oikoluvun kielet"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Subscribe dialog default height"
 msgstr "Tilausikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Subscribe dialog default width"
 msgstr "Tilausikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Terminal font"
 msgstr "PÃ¤Ã¤tteen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Text message part limit"
 msgstr "Tekstin viestiosan kokoraja"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "The default plugin for Junk hook"
 msgstr "RoskapostikÃ¤sittelijÃ¤n oletuslisÃ¤osa"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "ViimeisimmÃ¤n roskapostien poistokerran unix-aikaleima."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "ViimeisimmÃ¤n roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:170
 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 "
@@ -11474,41 +11952,41 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The terminal font for mail display."
 msgstr "PÃ¤Ã¤tekirjasin viestejÃ¤ nÃ¤ytettÃ¤essÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen kirjasin viestejÃ¤ nÃ¤ytettÃ¤essÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:173
 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)."
+"TÃ¤llÃ¤ asetuksella voi olla kolme arvoa: \"0\" (ei virheitÃ¤), \"1\" "
+"(varoitukset) tai \"2\" (vianetsintÃ¤viestit)."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "MÃ¤Ã¤rittÃ¤Ã¤ evolutionin muotoileman viestin tekstiosan enimmÃ¤iskoon. "
-"Oletusarvo on 4096kt ja arvo mÃ¤Ã¤ritellÃ¤Ã¤ kilotavuina."
+"Oletusarvo on 4096kt ja arvo mÃ¤Ã¤ritellÃ¤Ã¤n kilotavuina."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:175
 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Ã¤osaei ole kÃ¤ytÃ¶ssÃ¤, ei palata kÃ¤yttÃ¤mÃ¤Ã¤n muita kÃ¤ytÃ¶ssÃ¤ olevia "
-"lisÃ¤osia."
+"Jos oletuslisÃ¤osa ei ole kÃ¤ytÃ¶ssÃ¤, ei palata kÃ¤yttÃ¤mÃ¤Ã¤n muita kÃ¤ytÃ¶ssÃ¤ "
+"olevia lisÃ¤osia."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:176
 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."
@@ -11517,18 +11995,18 @@ msgstr ""
 "jÃ¤lkeen.  TÃ¤mÃ¤ peruu sÃ¤hkÃ¶postin valinnan luettelosta ja poistaa esikatselun "
 "kansiolta."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
+"and whether they are to be displayed. The format of the XML structure is "
+"&lt;header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
 "TÃ¤mÃ¤ avain sisÃ¤ltÃ¤Ã¤ listan XML-rakenteista, jotka mÃ¤Ã¤rittelevÃ¤t omia "
 "otsakkeita ja sen, nÃ¤ytetÃ¤Ã¤nkÃ¶ niitÃ¤. XML-rakenteen muoto on &lt;header "
 "enabled&gt; - mÃ¤Ã¤rittele enabled, jos otsake halutaan nÃ¤yttÃ¤Ã¤ postinÃ¤kymÃ¤ssÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:178
 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 "
@@ -11538,11 +12016,11 @@ msgstr ""
 "mÃ¤Ã¤rittÃ¤mÃ¤Ã¤n, etsitÃ¤Ã¤nkÃ¶ paikallisesta osoitekirjasta tunnettuja osoitteita, "
 "joille ei tehdÃ¤ roskapostisuodatusta."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "This option would help in improving the speed of fetching."
 msgstr "TÃ¤mÃ¤ ominaisuus helpottaa noudon nopeuden parantamista."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11550,7 +12028,7 @@ msgstr ""
 "TÃ¤mÃ¤ asettaa viestiluettelon oletusnÃ¤kymÃ¤ssÃ¤ nÃ¤ytettÃ¤vien viestin "
 "lukumÃ¤Ã¤rÃ¤n, jonka jÃ¤lkeen nÃ¤ytetÃ¤Ã¤n '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -11558,97 +12036,96 @@ msgstr ""
 "TÃ¤mÃ¤ asetus mÃ¤Ã¤rittÃ¤Ã¤, laajennetaanko vai supistetaanko sÃ¤ikeet oletuksena. "
 "Muutos vaatii Evolutionin uudelleenkÃ¤ynnistyksen."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:182
 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Ã¤rjesteÃ¤Ã¤nkÃ¶ sÃ¤ikeet sÃ¤ikeen viimeisen viestin "
+"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."
 
-#: ../mail/evolution-mail.schemas.in.h:185
-msgid "Thread the message list."
-msgstr "SÃ¤ikeistÃ¤ viestiluettelo"
-
-#: ../mail/evolution-mail.schemas.in.h:186
-msgid "Thread the message-list"
-msgstr "SÃ¤ikeistÃ¤ viestiluettelo"
-
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Thread the message-list based on Subject"
 msgstr "SÃ¤ikeistÃ¤ viestiluettelo aiheen perusteella"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Timeout for marking message as seen"
 msgstr "Aikakatkaisu merkittÃ¤essÃ¤ viestejÃ¤ nÃ¤hdyiksi"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Timeout for marking message as seen."
 msgstr "Aikakatkaisu merkittÃ¤essÃ¤ viestejÃ¤ nÃ¤hdyiksi."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "VÃ¤Ã¤rinkirjoitettujen sanojen alleviivauksen vÃ¤ri kÃ¤ytettÃ¤essÃ¤ kirjoituksen "
 "aikaista oikolukua."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Use SpamAssassin daemon and client"
 msgstr "KÃ¤ytÃ¤ Spamassassin-palvelinta ja -asiakasta"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "KÃ¤ytÃ¤ Spamassassin-palvelinta ja -asiakasta (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use custom fonts"
 msgstr "KÃ¤ytÃ¤ omia kirjasimia"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use custom fonts for displaying mail."
 msgstr "KÃ¤ytÃ¤ omia kirjasimia nÃ¤ytettÃ¤essÃ¤ viestejÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use only local spam tests."
 msgstr "KÃ¤ytÃ¤ ainoastaan paikallisia roskapostin tarkistuksia"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use only the local spam tests (no DNS)."
 msgstr "KÃ¤ytÃ¤ ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:Ã¤Ã¤)."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:194
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:195
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid "Whether a read receipt request gets added to every message by default."
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid ""
+"Whether a read receipt request gets added to every message by default."
 msgstr "LisÃ¤tÃ¤Ã¤nkÃ¶ kaikkiin viesteihin oletuksena kuittauspyyntÃ¶."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Onko kansionimien typistys sivupalkissa poistettu kÃ¤ytÃ¶stÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11656,25 +12133,25 @@ msgstr ""
 "Palataanko viestien sÃ¤ikeistÃ¤miseen otsikon perusteella, jos otsakkeet eivÃ¤t "
 "sisÃ¤llÃ¤ In-Reply-To tai References-otsakkeita."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "JÃ¤rjestetÃ¤Ã¤nkÃ¶ sÃ¤ikeet sÃ¤ikeen viimeisen viestin mukaan"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Tuodaan tietoja ElmistÃ¤"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../modules/mail/e-mail-shell-view.c:481
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../modules/mail/e-mail-shell-view.c:952
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 msgid "Mail"
 msgstr "SÃ¤hkÃ¶posti"
 
@@ -11686,541 +12163,513 @@ msgstr "Evolution Elm-tuoja"
 msgid "Import mail from Elm."
 msgstr "Tuodaan sÃ¤hkÃ¶postit ElmistÃ¤."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
-#: ../plugins/pst-import/pst-importer.c:310
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
-#: ../mail/importers/evolution-mbox-importer.c:87
-#: ../plugins/pst-import/pst-importer.c:303
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/importers/evolution-mbox-importer.c:87
-#: ../plugins/pst-import/pst-importer.c:303
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:261
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
-#: ../mail/importers/mail-importer.c:131
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:215
-#: ../plugins/pst-import/pst-importer.c:455
-#: ../plugins/pst-import/pst-importer.c:561 ../shell/e-shell-importer.c:526
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
-msgid "Importing `%s'"
-msgstr "Tuodaan '%s'"
+msgid "Importing '%s'"
+msgstr ""
 
-#: ../mail/importers/mail-importer.c:358
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "Tuodaan tietoja PinestÃ¤"
 
-#: ../mail/importers/pine-importer.c:383
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../mail/importers/pine-importer.c:379
+#: ../modules/addressbook/addressbook-config.c:986
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:420
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine-tuoja"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
 msgstr "Tuo sÃ¤hkÃ¶postit PinestÃ¤."
 
-#: ../mail/mail-autofilter.c:71
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: ../mail/mail-autofilter.c:234 ../mail/mail-autofilter.c:273
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltÃ¤"
 
-#: ../mail/mail-autofilter.c:257
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../mail/mail-autofilter.c:292
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "LisÃ¤Ã¤ suodatussÃ¤Ã¤ntÃ¶"
 
-#: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types"
-msgstr "Tar_kista tuetut tyypit"
-
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(Huomautus: Vaatii ohjelman uudelleenkÃ¤ynnistÃ¤misen)"
 
-#: ../mail/mail-config.glade.h:4
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>SSL ei ole tuettu tÃ¤ssÃ¤ Evolutionin kÃ¤Ã¤nnÃ¶ksessÃ¤</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>LÃ¤hettÃ¤jÃ¤n valokuva</b>"
-
-#: ../mail/mail-config.glade.h:6
-msgid "<b>Sig_natures</b>"
-msgstr "<b>Alle_kirjoitukset</b>"
-
-#: ../mail/mail-config.glade.h:7
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>YlÃ¤postituksen valinta</b> (ei suositeltu)"
-
-#: ../mail/mail-config.glade.h:8
-msgid "<b>_Languages</b>"
-msgstr "<b>Kielet</b>"
-
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">Tilin tiedot</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">Tunnistus</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">Viestien kirjoitus</span>"
-
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">Asetukset</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">Oletustoimintatapa</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">Poista viesti</span>"
-
-#: ../mail/mail-config.glade.h:17
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">_NÃ¤ytettÃ¤vÃ¤t viestin otsakkeet</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">MerkinnÃ¤t</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">Kuvien lataus</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">Viestin nÃ¤yttÃ¶</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">Viestin kirjasimet</span>"
-
-#: ../mail/mail-config.glade.h:23
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Viestin vastaanottajat</span>"
-
-#: ../mail/mail-config.glade.h:24
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">Valinnaiset tiedot</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">Asetukset</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">Tulostettavat kirjasimet</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">VÃ¤lipalvelinasetukset</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">Vaadittavat tiedot</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">Turvallisuus</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">LÃ¤hetetyt viestit ja luonnokset</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">Palvelimen asetukset</span>"
+#: ../mail/mail-config.ui.h:2
+msgid "<b>Top Posting Option</b>"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:34
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">TunnistautumismenetelmÃ¤</span>"
+#: ../mail/mail-config.ui.h:3
+msgid "Account Information"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "LisÃ¤Ã¤ uusi _allekirjoitus..."
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.ui.h:5
 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Ã¤"
+msgstr ""
+"Allekirjoita _aina lÃ¤htevÃ¤t viestit kÃ¤ytettÃ¤essÃ¤ tÃ¤tÃ¤ sÃ¤hkÃ¶postitiliÃ¤"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Salaa myÃ¶s itselle, kun lÃ¤hetetÃ¤Ã¤n salattu viesti"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "LÃ¤hetÃ¤ aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "LÃ¤hetÃ¤ aina _piiloitettu kopio (Bcc) osoitteeseen:"
+msgstr "LÃ¤hetÃ¤ aina _piilotettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Salaa _aina myÃ¶s itselle lÃ¤hetettÃ¤essÃ¤ salattu viesti"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "PyydÃ¤ aina vastaanoton _kuittausta"
 
-#: ../mail/mail-config.glade.h:44
-msgid ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-msgstr ""
-"Liite\n"
-"SisÃ¤kkÃ¤inen\n"
-"Lainattu"
-
-#: ../mail/mail-config.glade.h:47
-msgid ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
-msgstr ""
-"Liite\n"
-"SisÃ¤kkÃ¤inen (Outlookin tapaan)\n"
-"Lainattu\n"
-"Ã?lÃ¤ lainaa"
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "Kirjautuminen"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "LisÃ¤Ã¤ _hymiÃ¶t kuvina automaattisesti"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "_MerkistÃ¶:"
 
-#: ../mail/mail-config.glade.h:53
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "Tar_kista tuetut tyypit"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
-msgstr "KÃ¤ytÃ¤ _omia roskpostiotsakkeita"
+msgstr "KÃ¤ytÃ¤ _omia roskapostiotsakkeita"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistÃ¤"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Etsi roskapostia saapuneiden viestien joukosta"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "_TyhjennÃ¤"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "_TyhjennÃ¤"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "_VÃ¤Ã¤rin kirjoitettujen sanojen vÃ¤ri:"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:25
+msgid "Composing Messages"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Asetukset"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.ui.h:29
+msgid "Default Behavior"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "MerkistÃ¶n _oletuskoodaus:"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.ui.h:32
+msgid "Delete Mail"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "Poista roskapostit _suljettaessa"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Allekirjoita lÃ¤htevÃ¤t viestit sÃ¤hkÃ¶isesti (oletuksena)"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.ui.h:36
+msgid "Displayed Message _Headers"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Ã?lÃ¤ muotoile viestiÃ¤, jos viestin _koko on suurempi kuin"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.ui.h:38
 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"
+msgstr ""
+"Ã?lÃ¤ merkitse viestejÃ¤ _roskapostiksi, jos lÃ¤hettÃ¤jÃ¤ on osoitekirjassa"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.ui.h:39
+msgid "Do not quote"
+msgstr "Ã?lÃ¤ lainaa"
+
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "_Luonnosten kansio:"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "SÃ¤hkÃ¶posti_osoite:"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "Tyhj_ennÃ¤ roskakorit lopetettaessa"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "KÃ¤ytÃ¤ maagista _vÃ¤lilyÃ¶ntiÃ¤"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "KÃ¤ytÃ¤ _hakunÃ¤kymiÃ¤"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "_Salausvarmenne:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Salaa lÃ¤htevÃ¤t viestit oletuksena"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "_Tasalevyinen:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "_Tasalevyinen kirjasin:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "Muotoile viestit HTML:nÃ¤"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-vÃ¤lipalvelin:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen kÃ¤ytetty vÃ¤ri"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.ui.h:59
+msgid "Inline"
+msgstr "SisÃ¤kkÃ¤isesti"
+
+#: ../mail/mail-config.ui.h:60
+msgid "Inline (Outlook style)"
+msgstr "SisÃ¤kkÃ¤inen alkuperÃ¤isviesti (Outlookin tapaan)"
+
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "kt"
 
-#: ../mail/mail-config.glade.h:90 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "MerkinnÃ¤t"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "Kielitaulukko"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:65
+msgid "Loading Images"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "SÃ¤hkÃ¶posti otsikkotaulu"
 
-#: ../mail/mail-config.glade.h:93 ../modules/mail/e-mail-shell-backend.c:213
-msgid "Mail Preferences"
-msgstr "SÃ¤hkÃ¶postin asetukset"
-
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "Postilaatikon sijainti"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Message Composer"
-msgstr "Viestin muokkain"
+#: ../mail/mail-config.ui.h:68
+msgid "Message Display"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Fonts"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "Ei _vÃ¤lipalvelinta seuraaville:"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:73
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Huomio: salasanaa ei kysytÃ¤ ennen kuin otat ensimmÃ¤istÃ¤ kertaa yhteyttÃ¤"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
-"Valitsin ohitetaan, jos tÃ¤smÃ¤Ã¤vÃ¤ oma sÃ¤hkÃ¶postn roskapostiotsake lÃ¶ydetÃ¤Ã¤n."
+"Valitsin ohitetaan, jos tÃ¤smÃ¤Ã¤vÃ¤ oma sÃ¤hkÃ¶postin roskapostiotsake lÃ¶ydetÃ¤Ã¤n."
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG _avaimen ID:"
+msgstr "PGP/GPG-_avaimen ID:"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "_Salasana:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Vahvista viestin lÃ¤hetys, jos ainoastaan Bcc-vastaanottajia on mÃ¤Ã¤ritelty"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.ui.h:83
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG) -salaus"
+
+#: ../mail/mail-config.ui.h:85
+msgid "Printed Fonts"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:86
+msgid "Proxy Settings"
+msgstr "VÃ¤lityspalvelimen asetukset"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Quoted"
+msgstr "Lainattu"
+
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:92
+msgid "Required Information"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:94
+msgid "SSL is not supported in this build of Evolution"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Et_si lÃ¤hettÃ¤jÃ¤n valokuvaa vain paikallisista osoitekirjoista"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "_Valitse..."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "LÃ¤h_etÃ¤ viestin kuittaus:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
-msgstr "_Oletuskirjaisin:"
+msgstr "_Oletuskirjasin:"
+
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:101
+msgid "Select Drafts Folder"
+msgstr "Valitse luonnosten kansio"
+
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font for printing"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.ui.h:106
+msgid "Select Sent Folder"
+msgstr "Valitse lÃ¤hetettyjen kansio"
+
+#: ../mail/mail-config.ui.h:107
+msgid "Sender Photograph"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "LÃ¤htevÃ¤ posti"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "LÃ¤hetettyjen _viestien kansio:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.ui.h:110
+msgid "Sent and Draft Messages"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.ui.h:112
+msgid "Server Configuration"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
-msgstr "_Palvelintyyppi: "
+msgstr "_Palvelintyyppi:"
+
+#: ../mail/mail-config.ui.h:114
+msgid "Sig_natures"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "_Allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.ui.h:121
 msgid "T_ype:"
 msgstr "_Tyyppi:"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:122
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12228,7 +12677,7 @@ msgstr ""
 "Luettelo kÃ¤ytettÃ¤vissÃ¤ olevista kielistÃ¤ riippuu ainoastaan siitÃ¤, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12236,219 +12685,254 @@ msgid ""
 msgstr ""
 "TÃ¤mÃ¤n komennon tulosta kÃ¤ytetÃ¤Ã¤n allekirjoituksenasi. \n"
 "Valitsemasi nimi on kÃ¤ytÃ¶ssÃ¤ ainoastaan tÃ¤ssÃ¤ listassa\n"
-"nÃ¤ytettÃ¤essÃ¤."
+"nÃ¤ytettÃ¤essÃ¤. "
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
-"Anna nimi jolla haluaisit kutsua tÃ¤tÃ¤ sÃ¤hkÃ¶postitiliÃ¤.\n"
+"Anna nimi, jolla haluat kutsua tÃ¤tÃ¤ sÃ¤hkÃ¶postitiliÃ¤.\n"
 "Esimerkiksi \"TyÃ¶\" tai \"HenkilÃ¶kohtaista\""
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "KÃ¤ytÃ¤ _tunnistautumista"
 
-#: ../mail/mail-config.glade.h:136 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/google-account-setup/google-source.c:700
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../plugins/google-account-setup/google-contacts-source.c:283
+#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "_LisÃ¤Ã¤ allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "_Tunnistautumistapa"
+
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "_Roskapostin oletuslisÃ¤osa"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "_Suora yhteys Internettiin"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Ã?lÃ¤ allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "_VÃ¤litÃ¤ tyyli:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "_PidÃ¤ allekirjoitus alkuperÃ¤isen viestin yllÃ¤ vastattaessa"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:140
+msgid "_Languages"
+msgstr "_Kielet"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "_Lataa viestin kuvat, jos yhteystieto on osoitekirjassa"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "Tee tÃ¤stÃ¤ _oletustilini"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "_VÃ¤lipalvelimen kÃ¤sin asettaminen:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "_Ã?lÃ¤ koskaan lataa kuvia verkosta"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.ui.h:149
 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.glade.h:154
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr "_Kysy vahvistus lÃ¤hetettÃ¤essÃ¤ viestejÃ¤ tyhjÃ¤llÃ¤ Aihe-otsakkella"
+msgstr "_Kysy vahvistus lÃ¤hetettÃ¤essÃ¤ viestejÃ¤ tyhjÃ¤llÃ¤ Aihe-otsakkeella"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "_Skripti:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "_HTTPS-vÃ¤lipalvelin:"
 
-#: ../mail/mail-config.glade.h:158
-msgid "_Select..."
-msgstr "_Valitse..."
-
-#: ../mail/mail-config.glade.h:159
-#: ../modules/addressbook/ldap-config.glade.h:39
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
-msgstr "_Palvelin: "
+msgstr "_Palvelin:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "NÃ¤ytÃ¤ kuvien animaatiot"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.ui.h:158
 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.glade.h:163
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Rajaa To-, Cc- ja Bcc-otsakkeet lukumÃ¤Ã¤rÃ¤Ã¤n "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "_KÃ¤ytÃ¤ salattua yhteyttÃ¤:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "KÃ¤ytÃ¤ jÃ¤rjestelmÃ¤n olet_uksia"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "KÃ¤ytÃ¤ samoja _kirjasimia kuin muut ohjelmat"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+msgid "a"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "osoitteet"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
-msgstr " vÃ¤ri"
+msgstr "vÃ¤ri"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "kuvaus"
 
-#: ../mail/mail-config.glade.h:172
-msgid "seconds"
-msgstr "sekuntia"
-
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
-msgstr " "
-
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>HakunÃ¤kymien lÃ¤hteet</b>"
+msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digitaalinen allekirjoitus</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Salaus</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Kaikki aktiiviset etÃ¤kansiot"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "Kaikki paikalliset kansiot ja aktiiviset etÃ¤kansiot"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "Kaikki paikalliset kansiot"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "Soita"
+
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
-msgid "Flag to Follow Up"
-msgstr "Merkitse edelleenlÃ¤hetettÃ¤vÃ¤ksi"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "Ã?lÃ¤ vÃ¤litÃ¤"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "Salaus"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "LÃ¤hetÃ¤ edelleen"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "Tiedoksesi"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "VÃ¤litÃ¤"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "Lisenssisopimus"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "Vastaus ei vÃ¤lttÃ¤mÃ¤tÃ¶n"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "Vastaa kaikille"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "Arvio"
+
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
-msgstr "_Palvelin: "
+msgstr "_Palvelin:"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Search Folder Sources"
+msgstr ""
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:25
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12456,167 +12940,168 @@ msgstr ""
 "Viestit jotka olet valinnut lÃ¤hetettÃ¤viksi edelleen on listattu alla.\n"
 "Valitse tehtÃ¤vÃ¤ uudelleenlÃ¤hetys \"Merkki\" valikosta."
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "_HyvÃ¤ksy lisenssi"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "_ErÃ¤Ã¤ntyy:"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "_Merkki:"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tÃ¤hÃ¤n rasti, jos hyvÃ¤ksyt lisenssiehdot"
 
-#: ../mail/mail-folder-cache.c:872
+#: ../mail/mail-folder-cache.c:906
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
 
-#: ../mail/mail-ops.c:110
+#: ../mail/mail-ops.c:95
 msgid "Filtering Selected Messages"
 msgstr "Suodatetaan valittuja viestejÃ¤"
 
-#: ../mail/mail-ops.c:269
+#: ../mail/mail-ops.c:254
 msgid "Fetching Mail"
 msgstr "Noudetaan viestejÃ¤"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:584
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe kÃ¤ytettÃ¤essÃ¤ lÃ¤htevÃ¤n postin suodattimia: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:605
+#: ../mail/mail-ops.c:596 ../mail/mail-ops.c:623
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
-"LisÃ¤ys '%s':Ã¤Ã¤n epÃ¤onnistui: %s\n"
-"LisÃ¤tÃ¤Ã¤n paikalliseen 'LÃ¤hetetyt' kansioon."
 
-#: ../mail/mail-ops.c:622
+#: ../mail/mail-ops.c:640
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Viestin lisÃ¤ys paikalliseen 'LÃ¤hetetyt'-kansioon epÃ¤onnistui: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr ""
 
-#: ../mail/mail-ops.c:730 ../mail/mail-ops.c:811
+#: ../mail/mail-ops.c:751 ../mail/mail-ops.c:832
 msgid "Sending message"
 msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
 
-#: ../mail/mail-ops.c:740
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤ %d / %d"
 
-#: ../mail/mail-ops.c:767
+#: ../mail/mail-ops.c:788
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d viestin %d:stÃ¤ epÃ¤onnistui"
 
-#: ../mail/mail-ops.c:769 ../mail/mail-send-recv.c:717
+#: ../mail/mail-ops.c:790 ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../mail/mail-ops.c:771 ../mail/mail-send-recv.c:719
+#: ../mail/mail-ops.c:792 ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:883
-msgid "Saving message to folder"
-msgstr "Tallennetaan viestiÃ¤ kansioon"
+#: ../mail/mail-ops.c:904
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:960
+#: ../mail/mail-ops.c:981
 #, c-format
-msgid "Moving messages to %s"
-msgstr "SiirretÃ¤Ã¤n viestejÃ¤ kohteeseen %s"
+msgid "Moving messages to '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:960
+#: ../mail/mail-ops.c:981
 #, c-format
-msgid "Copying messages to %s"
-msgstr "Kopioidaan viestejÃ¤ kohteeseen %s"
+msgid "Copying messages to '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:1177
+#: ../mail/mail-ops.c:1090
+#, c-format
+msgid "Scanning folders in '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1198
 msgid "Forwarded messages"
 msgstr "VÃ¤litetyt viestit"
 
-#: ../mail/mail-ops.c:1218
+#: ../mail/mail-ops.c:1239
 #, c-format
-msgid "Opening folder %s"
-msgstr "Avataan kansiota %s"
+msgid "Opening folder '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:1284
+#: ../mail/mail-ops.c:1305
 #, c-format
-msgid "Retrieving quota information for folder %s"
-msgstr "Noudetaan kansion %s levytilatietoja"
+msgid "Retrieving quota information for folder '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:1356
+#: ../mail/mail-ops.c:1377
 #, c-format
-msgid "Opening store %s"
-msgstr "Avataan tallennustilaa %s"
+msgid "Opening store '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:1427
+#: ../mail/mail-ops.c:1448
 #, c-format
-msgid "Removing folder %s"
-msgstr "Poistetaan kansiota %s"
+msgid "Removing folder '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:1545
+#: ../mail/mail-ops.c:1566
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1608
+#: ../mail/mail-ops.c:1629
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliÃ¤ '%s'"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1630
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliÃ¤ %s"
 
-#: ../mail/mail-ops.c:1663
-msgid "Refreshing folder"
-msgstr "VirkistetÃ¤Ã¤n kansiota"
+#: ../mail/mail-ops.c:1684
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:1703 ../mail/mail-ops.c:1753
-msgid "Expunging folder"
-msgstr "Poistetaan poistettuja kansiosta"
+#: ../mail/mail-ops.c:1724
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:1750
+#: ../mail/mail-ops.c:1769
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "TyhjennetÃ¤Ã¤n roskakoria '%s'"
 
-#: ../mail/mail-ops.c:1751
+#: ../mail/mail-ops.c:1770
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: ../mail/mail-ops.c:1832
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Noudetaan viestiÃ¤ %s"
-
-#: ../mail/mail-ops.c:1941
+#: ../mail/mail-ops.c:1966
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Noudetaan %d viesti"
 msgstr[1] "Noudetaan %d viestiÃ¤"
 
-#: ../mail/mail-ops.c:2026
+#: ../mail/mail-ops.c:2055
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiÃ¤"
 
-#: ../mail/mail-ops.c:2106
+#: ../mail/mail-ops.c:2135
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12625,11 +13110,11 @@ msgstr ""
 "Virhe tallennettaessa viestejÃ¤: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2178
+#: ../mail/mail-ops.c:2207
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: ../mail/mail-ops.c:2196 ../mail/mail-ops.c:2204
+#: ../mail/mail-ops.c:2225 ../mail/mail-ops.c:2233
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12638,122 +13123,130 @@ msgstr ""
 "Tulostiedostoa ei voi luoda: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2248
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voi kirjoittaa: %s"
 
-#: ../mail/mail-ops.c:2364
+#: ../mail/mail-ops.c:2393
 #, c-format
-msgid "Disconnecting from %s"
-msgstr "YhteyttÃ¤ %s katkaistaan"
+msgid "Disconnecting from '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:2364
+#: ../mail/mail-ops.c:2393
 #, c-format
-msgid "Reconnecting to %s"
-msgstr "Otetaan uudestaan yhteyttÃ¤ kohteeseen %s"
+msgid "Reconnecting to '%s'"
+msgstr ""
 
-#: ../mail/mail-ops.c:2460
+#: ../mail/mail-ops.c:2489
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Valmistellaan tiliÃ¤ \"%s\" yhteydettÃ¶mÃ¤Ã¤n tilaan"
 
-#: ../mail/mail-ops.c:2546
+#: ../mail/mail-ops.c:2575
 msgid "Checking Service"
 msgstr "Tarkistetaan palvelua"
 
-#: ../mail/mail-send-recv.c:186
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../mail/mail-send-recv.c:392
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "LÃ¤hetÃ¤ ja vastaanota postia"
 
-#: ../mail/mail-send-recv.c:405
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:514
+#: ../mail/mail-send-recv.c:553
 msgid "Updating..."
 msgstr "PÃ¤ivitetÃ¤Ã¤n..."
 
-#: ../mail/mail-send-recv.c:514 ../mail/mail-send-recv.c:591
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:830
+#: ../mail/mail-send-recv.c:873
 #, c-format
 msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejÃ¤"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "KÃ¤yttÃ¤jÃ¤ perui toimenpiteen."
 
-#: ../mail/mail-tools.c:122
+#: ../mail/mail-session.c:663
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "Kohdeosoitetta ei annettu, viestin edelleenlÃ¤hetys on peruttu."
+
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "KÃ¤ytettÃ¤vÃ¤Ã¤ tiliÃ¤ ei lÃ¶ydy, viestin edelleenlÃ¤hetys on peruttu."
+
+#: ../mail/mail-tools.c:123
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "Saapuvien kansiota '%s' ei voi luoda: %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr ""
 
-#: ../mail/mail-tools.c:152
+#: ../mail/mail-tools.c:153
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Yritettiin 'movemail':ia lÃ¤hteelle '%s', joka ei ole tyyppiÃ¤ mbox"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr ""
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "VÃ¤litetty viesti - %s"
 
-#: ../mail/mail-tools.c:260
+#: ../mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "VÃ¤litetty viesti"
 
-#: ../mail/mail-tools.c:300
+#: ../mail/mail-tools.c:301
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Virheellinen kansio: ' %s'"
+msgid "Invalid folder: '%s'"
+msgstr ""
 
-#: ../mail/mail-vfolder.c:92
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "MÃ¤Ã¤ritellÃ¤Ã¤n hakunÃ¤kymÃ¤Ã¤: %s"
 
-#: ../mail/mail-vfolder.c:237
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "PÃ¤ivitetÃ¤Ã¤n hakunÃ¤kymÃ¤Ã¤ \"%s:%s\""
 
-#: ../mail/mail-vfolder.c:244
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "PÃ¤ivitetÃ¤Ã¤n hakunÃ¤kymÃ¤Ã¤ \"%s\""
 
-#: ../mail/mail-vfolder.c:1085
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "Muokkaa hakunÃ¤kymÃ¤Ã¤"
 
-#: ../mail/mail-vfolder.c:1183
+#: ../mail/mail-vfolder.c:1274
 msgid "New Search Folder"
 msgstr "Uusi hakunÃ¤kymÃ¤"
 
@@ -12828,83 +13321,92 @@ msgstr ""
 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}\"?"
+msgstr ""
+"Haluatko varmasti poistaa kaikki poistetut viestit kansiosta \"%{0}\"?"
 
 #: ../mail/mail.error.xml.h:15
 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:16
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:18
 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:17
+#: ../mail/mail.error.xml.h:19
 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:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
 msgstr "Syy: \"{0}\"."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "Syy: \"{2}\"."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "TyhjÃ¤ allekirjoitus"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "HakunÃ¤kymÃ¤Ã¤ \"{0}\" ei voi lisÃ¤tÃ¤."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi kopioida nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi luoda."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
 msgstr "VÃ¤liaikaista hakemistoa ei voi luoda."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Tallennushakemisto ei voi luoda, syy: \"{1}\""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "JÃ¤rjestelmÃ¤kansiota \"{0}\" ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "HakunÃ¤kymÃ¤Ã¤ \"{0}\" ei voi muokata, koska sitÃ¤ ei ole olemassa."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi siirtÃ¤Ã¤  kohtaan \"{1}\"."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "LÃ¤hdettÃ¤ \"{1}\" ei voi avata."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "LÃ¤hdettÃ¤ \"{2}\" i voi avata."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "Kohdetta \"{2}\" ei voi avata."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 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."
@@ -12912,35 +13414,35 @@ 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:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ei voi nimetÃ¤ uudestaan nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "JÃ¤rjestelmÃ¤kansiota \"{0}\" ei voi siirtÃ¤Ã¤ tai nimetÃ¤ uudestaan."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "Muutoksia tiliin ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Hakemistoon \"{0}\" ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "Tiedostoon \"{0}\" ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Allekirjoitus-skriptiÃ¤ \"{0}\" ei voi asettaa."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "Roskapostin etsintÃ¤ epÃ¤onnistui"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -12949,43 +13451,27 @@ msgstr ""
 "salasanoissa isot ja pienet kirjaimet ovat eri asia. Tarkista myÃ¶s ettei "
 "CapsLock ole pÃ¤Ã¤llÃ¤."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "Could not save signature file."
 msgstr "Allekirjoitustiedostoa ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "Poistetetaanko \"{0}\"?"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "Poista tili?"
-
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Poistetaanko viestit hakunÃ¤kymÃ¤stÃ¤ \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "Poistetaanko viestit hakunÃ¤kymÃ¤ssÃ¤?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "HylkÃ¤Ã¤ muutokset?"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Ã?_lÃ¤ poista"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "Ã?lÃ¤ poista"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "Ã?lÃ¤ poista kÃ¤ytÃ¶stÃ¤"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -12993,43 +13479,43 @@ msgstr ""
 "Haluatko synkronoida paikallisesti kansiot, jotka on merkitty yhteydettÃ¶mÃ¤Ã¤n "
 "kÃ¤yttÃ¶Ã¶n?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Haluatko merkitÃ¤ kaikki viestit luetuiksi?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "SyÃ¶tÃ¤ salasana."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Virhe ladattaessa suodatinten mÃ¤Ã¤rittelyjÃ¤."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "Virhe suoritettaessa toimenpidettÃ¤."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "Virhe suoritettaessa komentoa \"{0}\"."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "Tiedosto on jo olemassa, mutta sitÃ¤ ei voi ylikirjoittaa."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "Tiedosto on olemassa mutta ei ole tavallinen tiedosto."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 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:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13037,11 +13523,16 @@ msgstr ""
 "Jos poistat kansion, menetetÃ¤Ã¤n kaikki sen sisÃ¤ltÃ¶ ja alikansiot "
 "sisÃ¤ltÃ¶ineen pysyvÃ¤sti."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:62
 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:64
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13049,11 +13540,11 @@ msgstr ""
 "Jos jatkat, tilin tiedot ja kaikki siihen liittyvÃ¤ vÃ¤limuistitieto "
 "poistetaan pysyvÃ¤sti."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jos jatkat, tilin tiedot poistetaan pysyvÃ¤sti."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13061,23 +13552,23 @@ msgstr ""
 "Jos suljet, nÃ¤itÃ¤ viestejÃ¤ ei lÃ¤hetetÃ¤ ennen kuin Evolution on kÃ¤ynnistetty "
 "uudestaan."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Ignore"
 msgstr "Ã?lÃ¤ vÃ¤litÃ¤"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Invalid authentication"
 msgstr "Virheellinen tunnistautuminen"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Mail Deletion Failed"
 msgstr "SÃ¤hkÃ¶postin poisto epÃ¤onnistui"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 msgid "Mail filters automatically updated."
 msgstr "SÃ¤hkÃ¶postin suodattimet pÃ¤ivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 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 "
@@ -13089,31 +13580,27 @@ 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:73
-msgid "Mark all messages as read"
-msgstr "Merkitse kaikki viestit luetuiksi"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "No sources selected."
 msgstr "LÃ¤hteitÃ¤ ei ole valittuna."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 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:78
+#: ../mail/mail.error.xml.h:76
 msgid "Please check your account settings and try again."
 msgstr "Tarkista tilisi asetukset ja yritÃ¤ uudestaan."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 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:80
+#: ../mail/mail.error.xml.h:78
 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."
@@ -13122,7 +13609,7 @@ msgstr ""
 "sÃ¤hkÃ¶postiosoitteita napsauttamalla Vastaanottaja: -painiketta kentÃ¤n "
 "vieressÃ¤."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13132,63 +13619,63 @@ msgstr ""
 "sÃ¤hkÃ¶postia:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "Please provide an unique name to identify this signature."
 msgstr "Anna allekirjoitukselle yksikÃ¤sitteinen nimi."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "Please wait."
 msgstr "Odota, ole hyvÃ¤."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Virhe muunnettaessa vanhaa sÃ¤hkÃ¶postikansiota \"{0}\"."
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "KysytÃ¤Ã¤n palvelimelta"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "KysytÃ¤Ã¤n palvelimelta tuettuja tunnistautumismenetelmiÃ¤."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Kuittausta pyydetty."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Poistetaanko todella kansio \"{0}\" ja kaikki sen alikansiot?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:87
+msgid "Really delete folder \"{0}\"?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:88
 msgid "Report Junk Failed"
 msgstr "Roskapostin raportoiminen ei onnistunut"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "Report Not Junk Failed"
 msgstr "Ei-roskapostin raportoiminen ei onnistunut"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "HakunÃ¤kymÃ¤t pÃ¤ivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid "Send Receipt"
 msgstr "LÃ¤hetÃ¤ kuittaus"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Signature Already Exists"
 msgstr "Allekirjoitus on jo olemassa"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize"
 msgstr "Synkronoi"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:94
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkronoidaanko kansiot levylle verkkoyhteydetÃ¶ntÃ¤ kÃ¤yttÃ¶Ã¤ varten?"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13196,7 +13683,7 @@ msgstr ""
 "JÃ¤rjestelmÃ¤kansioita tarvitaan, jotta Evolution toimii oikein, eikÃ¤ niitÃ¤ "
 "voi nimetÃ¤ uudestaan, siirtÃ¤Ã¤ tai poistaa."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:96
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13211,9 +13698,9 @@ msgstr ""
 "Monet sÃ¤hkÃ¶postijÃ¤rjestelmÃ¤n lisÃ¤Ã¤vÃ¤t viesteihin 'Apparently-To' otsakkeen "
 "viesteihin, joissa on vain BCC vastaanottajia. Jos tÃ¤mÃ¤ otsake lisÃ¤tÃ¤Ã¤n, se "
 "paljastaa kaikki viestisi vastaanottajat. VÃ¤lttÃ¤Ã¤ksesi tÃ¤mÃ¤n tulee viestiin "
-"mÃ¤Ã¤ritellÃ¤ ainakin yksi tavallinen vastaanottaja tai kopio-osoite"
+"mÃ¤Ã¤ritellÃ¤ ainakin yksi tavallinen vastaanottaja tai kopio-osoite "
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -13227,7 +13714,7 @@ msgstr ""
 "   \"{1}\"\n"
 "ja ne on pÃ¤ivitetty."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13241,11 +13728,23 @@ msgstr ""
 "   \"{1}\"\n"
 "ja ne on pÃ¤ivitetty."
 
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+
 #: ../mail/mail.error.xml.h:111
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:113
 msgid "The script file must exist and be executable."
 msgstr "Skriptitiedoston tulee olla olemassa ja suoritettavissa."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13253,7 +13752,7 @@ 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:114
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13261,12 +13760,12 @@ msgstr ""
 "ViestiÃ¤ ei voi lÃ¤hettÃ¤Ã¤, koska viestin lÃ¤hetykseen valitsemasi tili ei ole "
 "kÃ¤ytÃ¶ssÃ¤"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 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:116
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13274,11 +13773,11 @@ msgstr ""
 "Palvelin ei tue tÃ¤mÃ¤n tyyppistÃ¤ tunnistautumista eikÃ¤ vÃ¤lttÃ¤mÃ¤ttÃ¤ tue "
 "lainkaan tunnistautumista."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "This signature has been changed, but has not been saved."
 msgstr "TÃ¤mÃ¤ allekirjoitus on muuttunut, mutta sitÃ¤ ei ole tallennettu."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13286,11 +13785,11 @@ msgstr ""
 "TÃ¤mÃ¤ toiminto merkitsee kaikki viestit valitussa kansiossa ja sen "
 "alikansioissa luetuiksi."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise-palvelimeen ei saatu yhteyttÃ¤."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13298,19 +13797,19 @@ msgstr ""
 "TÃ¤mÃ¤n sÃ¤hkÃ¶postitilin luonnoskansiota ei voi avata. Haluatko kÃ¤yttÃ¤Ã¤ "
 "luonnosten oletuskansiota sen sijaan?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "Unable to read license file."
 msgstr "Lisenssitiedostoa ei voi avata."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid "Use _Default"
 msgstr "KÃ¤ytÃ¤ _oletuksia"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:125
 msgid "Use default drafts folder?"
 msgstr "KÃ¤ytÃ¤ oletuskansiota luonnoksille?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13320,32 +13819,32 @@ msgstr ""
 "alkuperÃ¤isestÃ¤ kansiosta, ei vain hakutuloksista.\n"
 "Haluatko varmasti poistaa viestin?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 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:127
+#: ../mail/mail.error.xml.h:129
 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:128
+#: ../mail/mail.error.xml.h:130
 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:129
+#: ../mail/mail.error.xml.h:131
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliÃ¤ samalla nimellÃ¤."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid "You must name this Search Folder."
 msgstr "HakunÃ¤kymÃ¤lle tÃ¤ytyy antaa nimi."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:133
 msgid "You must specify a folder."
 msgstr "Kansio tÃ¤ytyy valita."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13355,110 +13854,115 @@ msgstr ""
 "Valitse joko kansiot yksitellen, kaikki paikalliset tai etÃ¤kansiot, tai "
 "kaikki etÃ¤- ja paikalliset kansiot."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:136
 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:135
+#: ../mail/mail.error.xml.h:137
 msgid "_Append"
 msgstr "_LisÃ¤Ã¤"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid "_Discard changes"
 msgstr "_HylkÃ¤Ã¤ muutokset"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 msgid "_Do not Synchronize"
 msgstr "Ã?_lÃ¤ synkronoi"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:140
+#: ../modules/mail/e-mail-shell-view-actions.c:866
 msgid "_Empty Trash"
 msgstr "_TyhjennÃ¤ roskakori"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:141
 msgid "_Expunge"
 msgstr "_Poista pysyvÃ¤sti"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:142
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1165
 msgid "Unseen"
 msgstr "NÃ¤hty"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1166
 msgid "Seen"
 msgstr "NÃ¤kemÃ¤ttÃ¤"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1167
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1168
 msgid "Forwarded"
 msgstr "VÃ¤litetty"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1169
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejÃ¤"
 
-#: ../mail/message-list.c:1069
+#: ../mail/message-list.c:1170
 msgid "Multiple Messages"
 msgstr "Useita viestejÃ¤"
 
-#: ../mail/message-list.c:1073
+#: ../mail/message-list.c:1174
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1074
+#: ../mail/message-list.c:1175
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1078
+#: ../mail/message-list.c:1179
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1079
+#: ../mail/message-list.c:1180
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1688 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1790 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1695 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1797 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "TÃ¤nÃ¤Ã¤n %l.%M %p"
 
-#: ../mail/message-list.c:1704
+#: ../mail/message-list.c:1806
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:1716
+#: ../mail/message-list.c:1818
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:1724
+#: ../mail/message-list.c:1826
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:1726
+#: ../mail/message-list.c:1828
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2466 ../shell/e-shell-view.c:534
+#: ../mail/message-list.c:2574
+msgid "Select all visible messages"
+msgstr "Valitse kaikki nÃ¤kyvÃ¤t viestit"
+
+#: ../mail/message-list.c:2625 ../shell/e-shell-view.c:855
 msgid "Shell Backend"
 msgstr "Tulkin taustajÃ¤rjestelmÃ¤"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4054 ../mail/message-list.c:4528
+#: ../mail/message-list.c:4532 ../mail/message-list.c:5032
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: ../mail/message-list.c:4365
+#: ../mail/message-list.c:4864
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13466,13 +13970,15 @@ msgstr ""
 "MikÃ¤Ã¤n viesti ei vastaa hakuehtojasi. TyhjennÃ¤ hakukenttÃ¤ valikon kohdasta "
 "Haku -> TyhjennÃ¤ tai muuta hakua."
 
-#: ../mail/message-list.c:4367
+#: ../mail/message-list.c:4866
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
 msgstr ""
+"TÃ¤ssÃ¤ kansiossa on vain piilotettuja viestejÃ¤. Valitse NÃ¤ytÃ¤-valikosta kohta "
+"NÃ¤ytÃ¤ piilotetut viestit, jos haluat nÃ¤hdÃ¤ ne."
 
-#: ../mail/message-list.c:4369
+#: ../mail/message-list.c:4868
 msgid "There are no messages in this folder."
 msgstr "TÃ¤ssÃ¤ kansiossa ei ole viestejÃ¤."
 
@@ -13501,8 +14007,7 @@ msgid "Sent Messages"
 msgstr "LÃ¤hetetyt viestit"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "Koko"
 
@@ -13510,60 +14015,28 @@ msgstr "Koko"
 msgid "Subject - Trimmed"
 msgstr "Otsikko - rajattu"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "Soita"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "Ã?lÃ¤ vÃ¤litÃ¤"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "LÃ¤hetÃ¤ edelleen"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "Tiedoksesi"
-
-#: ../mail/message-tag-followup.c:58
-msgid "Forward"
-msgstr "VÃ¤litÃ¤"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "Vastaus ei vÃ¤lttÃ¤mÃ¤tÃ¶n"
-
-#: ../mail/message-tag-followup.c:63
-msgid "Reply to All"
-msgstr "Vastaa kaikille"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "Arvio"
-
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
 msgid "Body contains"
 msgstr "Runko sisÃ¤ltÃ¤Ã¤"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1450
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
 msgid "Message contains"
 msgstr "Viesti sisÃ¤ltÃ¤Ã¤"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1457
+#: ../modules/mail/e-mail-shell-view-actions.c:1293
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisÃ¤ltÃ¤Ã¤"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1464
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
 msgid "Sender contains"
 msgstr "LÃ¤hettÃ¤jÃ¤ sisÃ¤ltÃ¤Ã¤"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
 msgid "Subject contains"
 msgstr "Otsikko sisÃ¤ltÃ¤Ã¤"
 
@@ -13571,7 +14044,7 @@ msgstr "Otsikko sisÃ¤ltÃ¤Ã¤"
 msgid "Subject or Addresses contains"
 msgstr "Aihe tai lÃ¤hettÃ¤jÃ¤t sisÃ¤ltÃ¤vÃ¤t"
 
-#: ../modules/addressbook/addressbook-config.c:212
+#: ../modules/addressbook/addressbook-config.c:206
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13579,7 +14052,7 @@ msgstr ""
 "TÃ¤mÃ¤n vaihtoehdon valinta tarkoittaa, ettÃ¤ Evolution ottaa yhteyttÃ¤ LDAP-"
 "palvelimeen vain, jos se tukee SSL-salausta."
 
-#: ../modules/addressbook/addressbook-config.c:214
+#: ../modules/addressbook/addressbook-config.c:208
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13587,7 +14060,7 @@ msgstr ""
 "TÃ¤mÃ¤n vaihtoehdon valinta tarkoittaa, ettÃ¤ Evolution ottaa yhteyttÃ¤ LDAP-"
 "palvelimeen vain, jos se tukee TLS-salausta."
 
-#: ../modules/addressbook/addressbook-config.c:216
+#: ../modules/addressbook/addressbook-config.c:210
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13597,15 +14070,15 @@ msgstr ""
 "salausta. TÃ¤mÃ¤ tarkoittaa, ettÃ¤ yhteytesi on turvaton ja ettÃ¤ olet "
 "haavoittuvainen yhteyden turvaan kohdistuville hyÃ¶kkÃ¤yksille."
 
-#: ../modules/addressbook/addressbook-config.c:341
-msgid "Base"
-msgstr "Kanta"
+#: ../modules/addressbook/addressbook-config.c:592
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr ""
 
-#: ../modules/addressbook/addressbook-config.c:643
+#: ../modules/addressbook/addressbook-config.c:628
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopioi _kirjan sisÃ¤ltÃ¶ yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 
-#: ../modules/addressbook/addressbook-config.c:754
+#: ../modules/addressbook/addressbook-config.c:736
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13615,7 +14088,7 @@ msgstr ""
 "on lista yleisistÃ¤ porteista. Kysy tarvittaessa jÃ¤rjestelmÃ¤si yllÃ¤pitÃ¤jÃ¤ltÃ¤ "
 "mitÃ¤ porttia sinun tulisi kÃ¤yttÃ¤Ã¤."
 
-#: ../modules/addressbook/addressbook-config.c:832
+#: ../modules/addressbook/addressbook-config.c:810
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13625,7 +14098,7 @@ msgstr ""
 "asettaminen arvoon \"SÃ¤hkÃ¶postiosoite\" vaatii anonyymiÃ¤ pÃ¤Ã¤syÃ¤ LDAP-"
 "palvelimellesi."
 
-#: ../modules/addressbook/addressbook-config.c:911
+#: ../modules/addressbook/addressbook-config.c:885
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13637,34 +14110,29 @@ msgstr ""
 "alipuissa, kun taas kattavuus \"Yksi\" kattaa kentÃ¤t yhden tason "
 "hakupohjastasi alaspÃ¤in."
 
-#: ../modules/addressbook/addressbook-config.c:1020
+#: ../modules/addressbook/addressbook-config.c:991
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../modules/addressbook/addressbook-config.c:1022
-msgid "Authentication"
-msgstr "Kirjautuminen"
-
-#: ../modules/addressbook/addressbook-config.c:1025
-#: ../modules/addressbook/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "EtsitÃ¤Ã¤n"
 
-#: ../modules/addressbook/addressbook-config.c:1028
+#: ../modules/addressbook/addressbook-config.c:999
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../modules/addressbook/addressbook-config.c:1238
-#: ../modules/addressbook/ldap-config.glade.h:9
+#: ../modules/addressbook/addressbook-config.c:1205
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: ../modules/addressbook/addressbook-config.c:1240
+#: ../modules/addressbook/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
@@ -13744,12 +14212,7 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ esikatselupaneeli."
 
-#: ../modules/addressbook/autocompletion-config.c:153
-msgid "Date/Time Format"
-msgstr "PÃ¤ivÃ¤ys/aika -muotoilu"
-
 #: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "Table column:"
 msgstr "Taulun sarake:"
 
@@ -13762,106 +14225,82 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "NÃ¤ytÃ¤ _aina automaattitÃ¤ydennetyn yhteystiedon osoite"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-backend.c:191
 #: ../modules/addressbook/e-book-shell-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP-palvelimilla"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:341
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:343
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:348
+msgctxt "New"
 msgid "Contact _List"
 msgstr "Yhteystieto_luettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-backend.c:350
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:358
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:619
+#: ../modules/addressbook/e-book-shell-backend.c:360
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:378
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:480
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:579
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
-#: ../modules/addressbook/e-book-shell-backend.c:595
-#: ../modules/calendar/e-cal-shell-backend.c:758
-#: ../modules/calendar/e-memo-shell-backend.c:582
-#: ../modules/calendar/e-task-shell-backend.c:592
+#: ../modules/addressbook/e-book-shell-backend.c:597
+#: ../modules/calendar/e-cal-shell-backend.c:815
+#: ../modules/calendar/e-memo-shell-backend.c:587
+#: ../modules/calendar/e-task-shell-backend.c:597
 msgid "Source List"
 msgstr "LÃ¤hdeluettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
+#: ../modules/addressbook/e-book-shell-backend.c:598
 msgid "The registry of address books"
 msgstr "Luettelo osoitekirjoista"
 
-#: ../modules/addressbook/e-book-shell-content.c:313
+#: ../modules/addressbook/e-book-shell-content.c:364
 msgid "Current View"
 msgstr "Nykyinen nÃ¤kymÃ¤"
 
-#: ../modules/addressbook/e-book-shell-content.c:314
+#: ../modules/addressbook/e-book-shell-content.c:365
 msgid "The currently selected address book view"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-content.c:323
+#: ../modules/addressbook/e-book-shell-content.c:374
 msgid "Previewed Contact"
 msgstr "Esikatseltu yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-content.c:324
+#: ../modules/addressbook/e-book-shell-content.c:375
 msgid "The contact being shown in the preview pane"
 msgstr "Yhteystietojen esikatselupaneelissa nÃ¤ytettÃ¤vÃ¤ yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-content.c:333
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:630
-#: ../modules/mail/e-mail-shell-content.c:716
+#: ../modules/addressbook/e-book-shell-content.c:384
+#: ../modules/calendar/e-memo-shell-content.c:617
+#: ../modules/calendar/e-task-shell-content.c:639
+#: ../modules/mail/e-mail-shell-content.c:688
 msgid "Preview is Visible"
 msgstr "Esikatselu on nÃ¤kyvissÃ¤"
 
-#: ../modules/addressbook/e-book-shell-content.c:334
-#: ../modules/calendar/e-memo-shell-content.c:608
-#: ../modules/calendar/e-task-shell-content.c:631
-#: ../modules/mail/e-mail-shell-content.c:717
+#: ../modules/addressbook/e-book-shell-content.c:385
+#: ../modules/calendar/e-memo-shell-content.c:618
+#: ../modules/calendar/e-task-shell-content.c:640
+#: ../modules/mail/e-mail-shell-content.c:689
 msgid "Whether the preview pane is visible"
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ esikatselupaneeli"
 
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
-#: ../modules/mail/e-mail-shell-migrate.c:1105
-msgid "Migrating..."
-msgstr "SiirretÃ¤Ã¤n..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
-#: ../modules/mail/e-mail-shell-migrate.c:1178
-#, c-format
-msgid "Migrating '%s':"
-msgstr "SiirretÃ¤Ã¤n  \"%s\":"
-
 #: ../modules/addressbook/e-book-shell-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP-palvelimet"
@@ -13913,357 +14352,334 @@ msgstr ""
 "\n"
 "Odota kÃ¤rsivÃ¤llisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
 
-#: ../modules/addressbook/e-book-shell-sidebar.c:173
-#: ../modules/calendar/e-cal-shell-sidebar.c:561
-#: ../modules/calendar/e-memo-shell-sidebar.c:528
-#: ../modules/calendar/e-task-shell-sidebar.c:526
+#: ../modules/addressbook/e-book-shell-sidebar.c:181
+#: ../modules/calendar/e-cal-shell-sidebar.c:794
+#: ../modules/calendar/e-memo-shell-sidebar.c:689
+#: ../modules/calendar/e-task-shell-sidebar.c:689
 msgid "Source Selector Widget"
 msgstr "LÃ¤hteen valintaikkuna"
 
-#: ../modules/addressbook/e-book-shell-sidebar.c:174
+#: ../modules/addressbook/e-book-shell-sidebar.c:182
 msgid "This widget displays groups of address books"
 msgstr "TÃ¤mÃ¤ elementti nÃ¤yttÃ¤ osoitekirjaryhmiÃ¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:596
+#: ../modules/addressbook/e-book-shell-view-actions.c:262
+#: ../modules/addressbook/e-book-shell-view-actions.c:539
+msgid "Save as vCard"
+msgstr "Tallenna vCard-muodossa"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:662
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pioi kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:598
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 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:603
-msgid "Del_ete Address Book"
-msgstr "_Poista osoitekirja"
+#: ../modules/addressbook/e-book-shell-view-actions.c:669
+msgid "D_elete Address Book"
+msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:605
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "Delete the selected address book"
 msgstr "Poista valittu osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:610
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
 msgid "Mo_ve All Contacts To..."
 msgstr "Sii_rrÃ¤ kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:612
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 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:617
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:624
+#: ../modules/addressbook/e-book-shell-view-actions.c:690
 msgid "Address _Book Properties"
 msgstr "Osoite_kirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:626
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Show properties of the selected address book"
 msgstr "NÃ¤ytÃ¤ valitun osoitekirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:631
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
-#: ../modules/calendar/e-task-shell-view-actions.c:756
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "_Rename..."
 msgstr "_NimeÃ¤ uudestaan..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:633
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
 msgid "Rename the selected address book"
 msgstr "_NimeÃ¤ valittu osoitekirja uudestaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:638
+#: ../modules/addressbook/e-book-shell-view-actions.c:704
 msgid "S_ave Address Book as vCard"
 msgstr "T_allenna osoitekirja VCardina"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:640
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Tallenna yhteystiedot valitussa osoitekirjassa VCardina"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:647
+#: ../modules/addressbook/e-book-shell-view-actions.c:713
 msgid "Stop loading"
 msgstr "KeskeytÃ¤ lataaminen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:654
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
-msgid "Copy the selection"
-msgstr "Kopioi valinta"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:661
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
-msgid "Cut the selection"
-msgstr "Leikkaa valinta"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:668
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
-msgid "Paste the clipboard"
-msgstr "LiitÃ¤ leikepÃ¶ytÃ¤"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#: ../modules/addressbook/e-book-shell-view-actions.c:718
 msgid "_Copy Contact To..."
 msgstr "_Kopioi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:675
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "Copy selected contacts to another address book"
 msgstr "Kopioi valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:725
 msgid "_Delete Contact"
 msgstr "_Poista yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
-msgid "Delete selected contacts"
-msgstr "Poista valitut yhteystiedot"
+#: ../modules/addressbook/e-book-shell-view-actions.c:732
+msgid "_Find in Contact..."
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
+msgid "Search for text in the displayed contact"
+msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:739
 msgid "_Forward Contact..."
 msgstr "_VÃ¤litÃ¤ yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "Send selected contacts to another person"
 msgstr "LÃ¤hetÃ¤ valitut yhteystiedot toiselle henkilÃ¶lle"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:746
 msgid "_Move Contact To..."
 msgstr "_Siirry yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "Move selected contacts to another address book"
 msgstr "SiirrÃ¤ valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:753
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:760
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-msgid "_Open"
-msgstr "_Avaa"
+#: ../modules/addressbook/e-book-shell-view-actions.c:767
+msgid "_Open Contact"
+msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "View the current contact"
 msgstr "Katsele nykyistÃ¤ yhteystietoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save selected contacts as a vCard"
-msgstr "Tallenna valitut yhteystiedot VCardina"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
-msgid "Select all contacts"
-msgstr "Valitse kaikki yhteystiedot"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:774
 msgid "_Send Message to Contact..."
 msgstr "LÃ¤hetÃ¤ _viesti henkilÃ¶lle..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "Send a message to the selected contacts"
 msgstr "LÃ¤hetÃ¤ viesti valituille  henkilÃ¶ille"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
-#: ../modules/calendar/e-task-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
-#: ../modules/calendar/e-memo-shell-view-actions.c:675
-#: ../modules/calendar/e-task-shell-view-actions.c:828
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:761
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/addressbook/e-book-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:821
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:765
+#: ../modules/addressbook/e-book-shell-view-actions.c:803
 msgid "_Properties"
 msgstr "_Ominaisuudet..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Contact _Preview"
 msgstr "Yhteystiedon _esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
 msgid "Show contact preview window"
 msgstr "NÃ¤ytÃ¤ yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:1360
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "_Classic View"
 msgstr "_Perinteinen nÃ¤kymÃ¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "Show contact preview below the contact list"
 msgstr "NÃ¤ytÃ¤ yhteystiedon esikatselu yhteystietoluettelon alla"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:933
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:897
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen nÃ¤kymÃ¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "Show contact preview alongside the contact list"
 msgstr "NÃ¤ytÃ¤ yhteystiedon esikatselu yhteystietoluettelon vieressÃ¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:859
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/calendar/e-cal-shell-view-actions.c:1614
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Any Category"
 msgstr "MikÃ¤ tahansa luokka"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:866
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
-#: ../modules/calendar/e-memo-shell-view-actions.c:785
-#: ../modules/calendar/e-task-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:1628
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Unmatched"
 msgstr "TÃ¤smÃ¤Ã¤mÃ¤ttÃ¶mÃ¤t"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
-msgid "Print selected contacts"
-msgstr "Tulosta valitut yhteystiedot"
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../shell/e-shell-content.c:438
+msgid "Advanced Search"
+msgstr "Oma haku"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+msgid "Print all shown contacts"
+msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Preview the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
-#: ../modules/addressbook/e-book-shell-view.c:322
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
+msgid "Print selected contacts"
+msgstr "Tulosta valitut yhteystiedot"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
+msgid "Save as vCard..."
+msgstr "Tallenna vCard-muodossa..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
+msgid "Save selected contacts as a vCard"
+msgstr "Tallenna valitut yhteystiedot VCardina"
+
+#: ../modules/addressbook/e-book-shell-view.c:341
 msgid "_Forward Contacts"
 msgstr "_VÃ¤litÃ¤ yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view.c:324
+#: ../modules/addressbook/e-book-shell-view.c:343
 msgid "_Forward Contact"
 msgstr "_VÃ¤litÃ¤ yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view.c:355
+#: ../modules/addressbook/e-book-shell-view.c:374
 msgid "_Send Message to Contacts"
 msgstr "LÃ¤hetÃ¤ _viesti henkilÃ¶ille"
 
-#: ../modules/addressbook/e-book-shell-view.c:357
+#: ../modules/addressbook/e-book-shell-view.c:376
 msgid "_Send Message to List"
 msgstr "LÃ¤hetÃ¤ _viesti listalle"
 
-#: ../modules/addressbook/e-book-shell-view.c:359
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contact"
 msgstr "LÃ¤hetÃ¤ _viesti henkilÃ¶lle"
 
-#: ../modules/addressbook/eab-composer-util.c:139
+#: ../modules/addressbook/eab-composer-util.c:137
 msgid "Multiple vCards"
 msgstr "Useita vCard-tiedostoja"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:145
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard %s"
 
-#: ../modules/addressbook/eab-composer-util.c:159
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
 #, c-format
 msgid "Contact information"
 msgstr "Yhteystiedot"
 
-#: ../modules/addressbook/eab-composer-util.c:188
+#: ../modules/addressbook/eab-composer-util.c:186
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
 
-#: ../modules/addressbook/ldap-config.glade.h:1
+#: ../modules/addressbook/ldap-config.ui.h:1
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "3268"
+msgstr "3268"
+
+#: ../modules/addressbook/ldap-config.ui.h:3
+msgid "389"
+msgstr "389"
 
-#: ../modules/addressbook/ldap-config.glade.h:5
+#: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
-#: ../modules/addressbook/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>Todennus</b>"
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "636"
+msgstr "636"
 
-#: ../modules/addressbook/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>Noudetaan</b>"
-
-#: ../modules/addressbook/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>EtsitÃ¤Ã¤n</b>"
-
-#: ../modules/addressbook/ldap-config.glade.h:10
-msgid ""
-"Anonymously\n"
-"Using email address\n"
-"Using distinguished name (DN)"
-msgstr ""
-"Anonyymi\n"
-"kÃ¤ytÃ¤ sÃ¤hkÃ¶postiosoitetta\n"
-"kÃ¤ytÃ¤ yksilÃ¶llistÃ¤ nimeÃ¤ (DN)"
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Anonymously"
+msgstr "Anonyymisti"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.glade.h:14
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "B_rowse this book until limit reached"
 msgstr "S_elaa tÃ¤tÃ¤ kirjaa, kunnes raja tulee vastaan"
 
-#: ../modules/addressbook/ldap-config.glade.h:16
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution kÃ¤yttÃ¤Ã¤ tÃ¤tÃ¤ sÃ¤hkÃ¶postiosoitetta sinun todentamiseksesi "
-"palvelimelle."
-
-#: ../modules/addressbook/ldap-config.glade.h:18
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "Lo_gin:"
 msgstr "_Kirjautuminen:"
 
-#: ../modules/addressbook/ldap-config.glade.h:19
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"Yksi taso\n"
-"Alipuu"
-
-#: ../modules/addressbook/ldap-config.glade.h:21
-msgid ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
-msgstr ""
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:12
+msgid "One"
+msgstr "Yksi"
 
-#: ../modules/addressbook/ldap-config.glade.h:24
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search Filter"
 msgstr "Hakusuodatin"
 
-#: ../modules/addressbook/ldap-config.glade.h:25
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _base:"
 msgstr "Haku_pohja:"
 
-#: ../modules/addressbook/ldap-config.glade.h:26
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid "Search _filter:"
 msgstr "Hakusuodatin:"
 
-#: ../modules/addressbook/ldap-config.glade.h:27
-#, fuzzy
+#: ../modules/addressbook/ldap-config.ui.h:17
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14271,72 +14687,52 @@ msgstr ""
 "Hakusuodatin mÃ¤Ã¤rittÃ¤Ã¤ etsittÃ¤vien kohteiden tyypin hakua varten. Jos "
 "asetusta ei muuteta, etsitÃ¤Ã¤n oletuksena \"person\"-tyypin kohderyhmÃ¤stÃ¤."
 
-#: ../modules/addressbook/ldap-config.glade.h:28
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "Sub"
+msgstr "Ali"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "Supported Search Bases"
 msgstr "Tuetut hakupohjat"
 
-#: ../modules/addressbook/ldap-config.glade.h:29
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"Hakupohja on yksilÃ¶llinen nimi (DN) kentÃ¤lle, josta hakusi alkavat. Jos "
-"jÃ¤tÃ¤t tÃ¤mÃ¤n tyhjÃ¤ksi, haku alkaa hakemistopuun juuresta."
-
-#: ../modules/addressbook/ldap-config.glade.h:30
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"TÃ¤mÃ¤ kenttÃ¤ on LDAP-palvelimen koko nimi, esimerkiksi \"ldap.mycompany.com"
-"\"."
-
-#: ../modules/addressbook/ldap-config.glade.h:31
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"Suurin sallittu noudettavien korttien mÃ¤Ã¤rÃ¤ noutokertaa kohti. TÃ¤mÃ¤n arvon "
-"asettaminen liian suureksi hidastaa osoitekirjan kÃ¤yttÃ¶Ã¤."
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using distinguished name (DN)"
+msgstr "KÃ¤ytetÃ¤Ã¤n yksilÃ¶llistÃ¤ nimeÃ¤ (DN)"
 
-#: ../modules/addressbook/ldap-config.glade.h:32
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"TÃ¤mÃ¤ on nimi, jolla tÃ¤mÃ¤ palvelin nÃ¤kyy Evolutionin kansiolistoissa. SitÃ¤ "
-"kÃ¤ytetÃ¤Ã¤n ainoastaan listoilla nÃ¤yttÃ¤miseen."
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "Using email address"
+msgstr "KÃ¤ytetÃ¤Ã¤n sÃ¤hkÃ¶postiosoitetta"
 
-#: ../modules/addressbook/ldap-config.glade.h:33
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: ../modules/addressbook/ldap-config.glade.h:34
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Find Possible Search Bases"
 msgstr "Etsi mahdolliset hakupohjat"
 
-#: ../modules/addressbook/ldap-config.glade.h:35
+#: ../modules/addressbook/ldap-config.ui.h:26
 msgid "_Login method:"
 msgstr "_KirjautumismenetelmÃ¤:"
 
-#: ../modules/addressbook/ldap-config.glade.h:37
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../modules/addressbook/ldap-config.glade.h:38
+#: ../modules/addressbook/ldap-config.ui.h:29
 msgid "_Search scope:"
 msgstr "_Hakualue:"
 
-#: ../modules/addressbook/ldap-config.glade.h:40
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
 msgstr "_Aikakatkaisu:"
 
-#: ../modules/addressbook/ldap-config.glade.h:41
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "_Use secure connection:"
 msgstr "_KÃ¤ytÃ¤ salattua yhteyttÃ¤:"
 
-#: ../modules/addressbook/ldap-config.glade.h:42
+#: ../modules/addressbook/ldap-config.ui.h:33
 msgid "cards"
 msgstr "kortteja"
 
@@ -14361,69 +14757,69 @@ msgid "I_mport to Tasks"
 msgstr "_Tuo t_ehtÃ¤viin"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-backend.c:126
 #: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-backend.c:113
 #: ../modules/calendar/e-task-shell-migrate.c:535
 msgid "On The Web"
 msgstr "Verkossa"
 
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-backend.c:128
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "SÃ¤Ã¤"
 
-#: ../modules/calendar/e-cal-shell-backend.c:238
+#: ../modules/calendar/e-cal-shell-backend.c:254
 #: ../modules/calendar/e-cal-shell-migrate.c:483
 msgid "Birthdays & Anniversaries"
 msgstr "SyntymÃ¤- ja vuosipÃ¤ivÃ¤t"
 
-#: ../modules/calendar/e-cal-shell-backend.c:424
+#: ../modules/calendar/e-cal-shell-backend.c:458
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:426
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:431
+#: ../modules/calendar/e-cal-shell-backend.c:465
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Koko pÃ¤ivÃ¤n tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:433
+#: ../modules/calendar/e-cal-shell-backend.c:467
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko pÃ¤ivÃ¤n tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:438
+#: ../modules/calendar/e-cal-shell-backend.c:472
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../modules/calendar/e-cal-shell-backend.c:440
+#: ../modules/calendar/e-cal-shell-backend.c:474
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-backend.c:482
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:450
-#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+#: ../modules/calendar/e-cal-shell-backend.c:484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:485
-#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../modules/calendar/e-cal-shell-backend.c:519
+#: ../plugins/itip-formatter/itip-formatter.c:2658
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtÃ¤vÃ¤t"
 
-#: ../modules/calendar/e-cal-shell-backend.c:759
+#: ../modules/calendar/e-cal-shell-backend.c:816
 msgid "The registry of calendars"
 msgstr ""
 
@@ -14434,8 +14830,8 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutionin kalenterikansioiden sijainti ja rakenne on muuttunut versiosta 1."
-"x\n"
+"Evolutionin kalenterikansioiden sijainti ja rakenne on muuttunut versiosta "
+"1.x\n"
 "\n"
 "Odota kÃ¤rsivÃ¤llisesti, kun Evolution konvertoi kansioitasi..."
 
@@ -14450,12 +14846,13 @@ msgstr ""
 #. FIXME: domain/code
 #: ../modules/calendar/e-cal-shell-migrate.c:693
 #, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Kalenterin '%s' muunnos epÃ¤onnistui"
+msgid "Unable to migrate calendar '%s'"
+msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:152
-#: ../modules/calendar/e-memo-shell-sidebar.c:149
-#: ../modules/calendar/e-task-shell-sidebar.c:147
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
+#, c-format
 msgid ""
 "Error on %s\n"
 "%s"
@@ -14463,37 +14860,50 @@ msgstr ""
 "Virhe kohteessa %s:\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:188
+#: ../modules/calendar/e-cal-shell-sidebar.c:228
 msgid "Loading calendars"
 msgstr "Ladataan kalentereita"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:428
+#: ../modules/calendar/e-cal-shell-sidebar.c:632
+msgid "New Calendar..."
+msgstr "Uusi kalenteri..."
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:647
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:551
+#: ../modules/calendar/e-cal-shell-sidebar.c:774
 msgid "Date Navigator Widget"
 msgstr "PÃ¤ivÃ¤mÃ¤Ã¤rÃ¤valitsin"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:552
+#: ../modules/calendar/e-cal-shell-sidebar.c:775
 msgid "This widget displays a miniature calendar"
 msgstr "TÃ¤mÃ¤ elementti nÃ¤yttÃ¤Ã¤ pienen kalenterin"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:562
+#: ../modules/calendar/e-cal-shell-sidebar.c:784
+msgid "Default Calendar Client"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:785
+msgid "Default client for calendar operations"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:795
 msgid "This widget displays groups of calendars"
 msgstr "TÃ¤mÃ¤ elementti nÃ¤yttÃ¤Ã¤ kalenteriryhmÃ¤n"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:723
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:983
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Avataan kalenteria %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
 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 "
@@ -14504,534 +14914,547 @@ 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:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:334
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:516
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../plugins/google-account-setup/google-source.c:741
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "pÃ¤ivÃ¤"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:551
+#: ../modules/calendar/e-cal-shell-view-actions.c:534
 msgid "Copying Items"
 msgstr "Kopioidaan tiedostoja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
 msgid "Moving Items"
 msgstr "SiirretÃ¤Ã¤n kohteita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1091
-msgid "Save As..."
-msgstr "Tallenna nimellÃ¤..."
+#. 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:1098
+msgid "event"
+msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1173
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../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:503
+#: ../modules/calendar/e-task-shell-view-actions.c:620
+msgid "Save as iCalendar"
+msgstr "Tallenna iCalendar-muodossa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1189
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
+msgid "D_elete Calendar"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+msgid "Delete the selected calendar"
+msgstr "Poista valittu kalenteri"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Go Back"
 msgstr "Siirry takaisin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "Go Forward"
 msgstr "Siirry eteenpÃ¤in"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1201
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Select _Today"
 msgstr "Valitse _tÃ¤mÃ¤ pÃ¤ivÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1203
+#: ../modules/calendar/e-cal-shell-view-actions.c:1279
 msgid "Select today"
 msgstr "Valitse tÃ¤mÃ¤ pÃ¤ivÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1208
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Select _Date"
 msgstr "Valitse _pÃ¤ivÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1286
 msgid "Select a specific date"
 msgstr "Valitse tietty pÃ¤ivÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1229
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "Purg_e"
 msgstr "TyhjennÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1231
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1238
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+msgid "Re_fresh"
+msgstr "Vi_rkistÃ¤"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+msgid "Refresh the selected calendar"
+msgstr "PÃ¤ivitÃ¤ valittu kalenteri"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Rename the selected calendar"
 msgstr "NimeÃ¤ valittu kalenteri uudestaan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Show _Only This Calendar"
 msgstr "NÃ¤ytÃ¤ _vain tÃ¤mÃ¤ kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
-msgid "Delete the appointment"
-msgstr "Poista tapaaminen"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+msgid "_Delete Appointment"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+msgid "Delete selected appointments"
+msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
 msgid "Delete This _Occurrence"
 msgstr "Poista tÃ¤mÃ¤ _tapahtumakerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
-msgid "Delete _All Occurrences"
-msgstr "Poista _kaikki tapahtumakerrat"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+msgid "Delete All Occ_urrences"
+msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Delete all occurrences"
 msgstr "Poista kaikki esiintymÃ¤t"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "New All Day _Event..."
 msgstr "Uusi koko pÃ¤_ivÃ¤n tapahtuma..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Create a new all day event"
 msgstr "Luo uusi koko pÃ¤ivÃ¤n tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
-#: ../modules/calendar/e-cal-shell-view-memopad.c:301
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:375
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
-#: ../modules/calendar/e-task-shell-view-actions.c:721
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../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:577
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Forward as iCalendar..."
 msgstr "_VÃ¤litÃ¤ iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "New _Meeting..."
 msgstr "Uusi _kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Create a new meeting"
 msgstr "Luo uusi kokous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Mo_ve to Calendar..."
 msgstr "_SiirrÃ¤ kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tÃ¤mÃ¤ kerta _siirrettÃ¤vÃ¤ksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "View the current appointment"
 msgstr "NÃ¤ytÃ¤ valittu tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+msgid "Save as iCalendar..."
+msgstr "Tallenna iCalendar-muodossa..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "_Schedule Meeting..."
 msgstr "_JÃ¤rjestÃ¤ kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+msgid "Converts an appointment to a meeting"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+msgid "Conv_ert to Appointment..."
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+msgid "Converts a meeting to an appointment"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1569
 msgid "Day"
 msgstr "PÃ¤ivÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
 msgid "Show one day"
 msgstr "NÃ¤ytÃ¤ yksi pÃ¤ivÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1576
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
 msgid "Show as list"
 msgstr "NÃ¤ytÃ¤ luettelona"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1585
 msgid "Show one month"
 msgstr "NÃ¤ytÃ¤ yksi kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Week"
 msgstr "Viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1527
+#: ../modules/calendar/e-cal-shell-view-actions.c:1592
 msgid "Show one week"
 msgstr "NÃ¤ytÃ¤ yksi viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
-msgid "Work Week"
-msgstr "TyÃ¶viikko"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1599
 msgid "Show one work week"
 msgstr "NÃ¤ytÃ¤ yksi tyÃ¶viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1542
-msgid "Active Appointements"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
+msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1621
 msgid "Next 7 Days' Appointments"
 msgstr "Seuraavien 7 pÃ¤ivÃ¤n tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
-#: ../modules/calendar/e-memo-shell-view-actions.c:802
-#: ../modules/calendar/e-task-shell-view-actions.c:1002
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Description contains"
 msgstr "Kuvaus sisÃ¤ltÃ¤Ã¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
-#: ../modules/calendar/e-memo-shell-view-actions.c:809
-#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Summary contains"
 msgstr "Yhteenveto sisÃ¤ltÃ¤Ã¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1599
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
 msgid "Print this calendar"
 msgstr "Tulosta tÃ¤mÃ¤ kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1606
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Preview the calendar to be printed"
 msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1751
 msgid "Go To"
 msgstr "Siirry"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:76
-#: ../modules/calendar/e-memo-shell-view-actions.c:96
-msgid "Deleting selected memos..."
-msgstr "Poista valitut muistilaput..."
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
-msgid "Copy selected memo"
-msgstr "Kopioi valittu muistilappu"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:282
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
-msgid "Cut selected memo"
-msgstr "Leikkaa valittu muistilappu"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:289
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-msgid "Paste memo from the clipboard"
-msgstr "LiitÃ¤ muistilappu leikepÃ¶ydÃ¤ltÃ¤"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:294
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
-msgid "_Delete Memo"
-msgstr "_Poista muistilappu"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
-msgid "Delete selected memos"
-msgstr "Poista valitut muistilaput"
+#. 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:501
+msgid "memo"
+msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:308
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "New _Memo"
 msgstr "_Uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:310
-#: ../modules/calendar/e-memo-shell-backend.c:318
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:315
-#: ../modules/calendar/e-memo-shell-view-actions.c:652
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "_Open Memo"
 msgstr "_Avaa muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "View the selected memo"
 msgstr "NÃ¤ytÃ¤ valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:322
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
-#: ../modules/calendar/e-task-shell-view-actions.c:798
+#: ../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:647
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:341
-#: ../modules/calendar/e-memo-shell-view-actions.c:835
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:423
-#: ../modules/calendar/e-memo-shell-view.c:223
-msgid "Delete Memo"
-msgid_plural "Delete Memos"
-msgstr[0] "Poista muistilappu"
-msgstr[1] "Poista muistilaput"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
-#: ../modules/calendar/e-task-shell-view-actions.c:127
-msgid "Deleting selected tasks..."
-msgstr "Poistetaan valiittuja tehtÃ¤viÃ¤...."
+#. Translators: Default filename part saving a task to a file when
+#. * 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:618
+msgid "task"
+msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-view-actions.c:686
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:680
 msgid "_Assign Task"
 msgstr "_Anna tehtÃ¤vÃ¤ksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-view-actions.c:695
-msgid "Copy selected tasks"
-msgstr "Kopioi valitut tehtÃ¤vÃ¤t"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:702
-msgid "Cut selected tasks"
-msgstr "Leikkaa valitut tehtÃ¤vÃ¤t"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
-#: ../modules/calendar/e-task-shell-view-actions.c:709
-msgid "Paste tasks from the clipboard"
-msgstr "LiitÃ¤ tehtÃ¤vÃ¤t leikepÃ¶ydÃ¤ltÃ¤"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:714
-msgid "_Delete Task"
-msgstr "_Poista tehtÃ¤vÃ¤"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../modules/calendar/e-task-shell-view-actions.c:716
-msgid "Delete selected tasks"
-msgstr "Poista valitut tehtÃ¤vÃ¤t"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Mark selected tasks as complete"
 msgstr "Merkitse valitut tehtÃ¤vÃ¤t valmistuneiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
-msgid "_Mar_k as Incomplete"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskenerÃ¤iseksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Mark selected tasks as incomplete"
 msgstr "Merkitse valitut tehtÃ¤vÃ¤t keskenerÃ¤isiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "New _Task"
 msgstr "Uusi _tehtÃ¤vÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:398
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Create a new task"
 msgstr "Luo uusi tehtÃ¤vÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
-#: ../modules/calendar/e-task-shell-view-actions.c:791
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "_Open Task"
 msgstr "Avaa _tehtÃ¤vÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "View the selected task"
 msgstr "NÃ¤ytÃ¤ valitut tehtÃ¤vÃ¤t"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
 msgid "_Save as iCalendar..."
 msgstr "_Tallenna iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:429
-#: ../modules/calendar/e-task-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:1006
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtÃ¤vÃ¤"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:534
-#: ../modules/calendar/e-task-shell-view.c:350
-msgid "Delete Task"
-msgid_plural "Delete Tasks"
-msgstr[0] "Poista tehtÃ¤vÃ¤"
-msgstr[1] "Poista tehtÃ¤vÃ¤t"
-
-#: ../modules/calendar/e-memo-shell-backend.c:316
+#: ../modules/calendar/e-memo-shell-backend.c:318
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:323
+#: ../modules/calendar/e-memo-shell-backend.c:325
+msgctxt "New"
 msgid "_Shared Memo"
-msgstr "_Jaettu muistilappu"
+msgstr ""
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:327
 msgid "Create a new shared memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:333
+#: ../modules/calendar/e-memo-shell-backend.c:335
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Mui_stilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:583
+#: ../modules/calendar/e-memo-shell-backend.c:588
 msgid "The registry of memo lists"
 msgstr "Rekisteri muistilappuluetteloista"
 
-#: ../modules/calendar/e-memo-shell-content.c:598
+#: ../modules/calendar/e-memo-shell-content.c:608
 msgid "The memo table model"
 msgstr "Muistilappujen taulumalli"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:185
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "Ladataan muistilappuja"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:399
+#: ../modules/calendar/e-memo-shell-sidebar.c:571
 msgid "Memo List Selector"
 msgstr "Muistilappuluetteloiden valitsin"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:529
+#: ../modules/calendar/e-memo-shell-sidebar.c:679
+msgid "Default Memo Client"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:680
+msgid "Default client for memo operations"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:690
 msgid "This widget displays groups of memo lists"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Avataan muistilappuja sijainnista %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
-#: ../modules/calendar/e-memo-shell-view-actions.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
+msgid "_Delete Memo"
+msgstr "_Poista muistilappu"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
+msgid "_Find in Memo..."
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
+msgid "Search for text in the displayed memo"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+msgid "D_elete Memo List"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "Delete the selected memo list"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+msgid "Refresh the selected memo list"
+msgstr ""
+
+#: ../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:638
+#: ../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:740
+#: ../modules/calendar/e-memo-shell-view-actions.c:705
 msgid "Memo _Preview"
 msgstr "Muistilapun _esikatselu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:707
 msgid "Show memo preview pane"
 msgstr "NÃ¤ytÃ¤ muistilapun esikatselupaneeli"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:763
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview below the memo list"
 msgstr "NÃ¤ytÃ¤ muistilapun esikatselu muistilappuluettelon alla"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:770
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview alongside the memo list"
 msgstr "NÃ¤ytÃ¤ muistilapun esikatselu muistilappuluettelon vieressÃ¤"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
 msgid "Print the list of memos"
 msgstr "Tulosta luettelo muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Preview the list of memos to be printed"
 msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:412
+#: ../modules/calendar/e-memo-shell-view-private.c:416
 #, 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:416
-#: ../modules/calendar/e-task-shell-view-private.c:510
+#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-task-shell-view-private.c:569
 #, c-format
 msgid "%d selected"
 msgstr ", %d valittu"
 
-#: ../modules/calendar/e-memo-shell-view.c:221
+#: ../modules/calendar/e-memo-shell-view.c:223
 msgid "Delete Memos"
 msgstr "Poista muistilaput"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view.c:225
+msgid "Delete Memo"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-backend.c:322
 msgctxt "New"
 msgid "_Task"
 msgstr "_TehtÃ¤vÃ¤"
 
-#: ../modules/calendar/e-task-shell-backend.c:327
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "TehtÃ¤vÃ¤ksi_anto"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:331
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtÃ¤vÃ¤ksianto"
 
-#: ../modules/calendar/e-task-shell-backend.c:337
+#: ../modules/calendar/e-task-shell-backend.c:339
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Te_htÃ¤vÃ¤lista"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "Create a new task list"
 msgstr "Luo uusi tehtÃ¤vÃ¤lista"
 
-#: ../modules/calendar/e-task-shell-backend.c:593
+#: ../modules/calendar/e-task-shell-backend.c:598
 msgid "The registry of task lists"
 msgstr "Rekisteri tehtÃ¤vÃ¤listoista"
 
-#: ../modules/calendar/e-task-shell-content.c:621
+#: ../modules/calendar/e-task-shell-content.c:630
 msgid "The task table model"
 msgstr "TehtÃ¤vien taulumalli"
 
@@ -15042,40 +15465,49 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutionin tehtÃ¤vÃ¤kansioiden sijainti ja rakenne on muuttunut versiosta 1."
-"x\n"
+"Evolutionin tehtÃ¤vÃ¤kansioiden sijainti ja rakenne on muuttunut versiosta "
+"1.x\n"
 "\n"
-"Odota kÃ¤rsivÃ¤llisesti, kun Evolution konvertoi kansioitas..."
+"Odota kÃ¤rsivÃ¤llisesti, kun Evolution konvertoi kansioitasi..."
 
 #. FIXME: domain/code
 #: ../modules/calendar/e-task-shell-migrate.c:620
 #, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "TehtÃ¤vien '%s' muunnos epÃ¤onnistui"
+msgid "Unable to migrate tasks '%s'"
+msgstr ""
 
-#: ../modules/calendar/e-task-shell-sidebar.c:183
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "Ladataan tehtÃ¤viÃ¤"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:397
+#: ../modules/calendar/e-task-shell-sidebar.c:571
 msgid "Task List Selector"
 msgstr "TehtÃ¤vienluetteloiden valitsin"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:527
+#: ../modules/calendar/e-task-shell-sidebar.c:679
+msgid "Default Task Client"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-sidebar.c:680
+msgid "Default client for task operations"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-sidebar.c:690
 msgid "This widget displays groups of task lists"
 msgstr "TÃ¤mÃ¤ elementti nÃ¤yttÃ¤ ryhmiÃ¤ tehtÃ¤vÃ¤listaluetteloista"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:680
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtÃ¤vÃ¤t %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
 msgid "Print Tasks"
 msgstr "Tulosta tehtÃ¤vÃ¤t"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:562
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15087,634 +15519,606 @@ msgstr ""
 "\n"
 "Valmis poistaa nÃ¤mÃ¤ tehtÃ¤vÃ¤t?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:728
+#: ../modules/calendar/e-task-shell-view-actions.c:687
+msgid "_Delete Task"
+msgstr "_Poista tehtÃ¤vÃ¤"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:694
+msgid "_Find in Task..."
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-view-actions.c:696
+msgid "Search for text in the displayed task"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "Copy..."
 msgstr "Kopioi..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:715
+msgid "D_elete Task List"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-view-actions.c:717
+msgid "Delete the selected task list"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "_New Task List"
 msgstr "_Uusi tehtÃ¤vÃ¤lista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:738
+msgid "Refresh the selected task list"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Rename the selected task list"
 msgstr "NimeÃ¤ valittu tehtÃ¤vÃ¤luettelo uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-view-actions.c:750
 msgid "Show _Only This Task List"
 msgstr "NÃ¤ytÃ¤ _vain tÃ¤mÃ¤ tehtÃ¤vÃ¤lista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:777
+#: ../modules/calendar/e-task-shell-view-actions.c:764
 msgid "Mar_k as Incomplete"
 msgstr "_Merkitse keskenerÃ¤iseksi"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:807
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "Delete completed tasks"
 msgstr "Poista valmistuneet tehtÃ¤vÃ¤t"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:869
 msgid "Task _Preview"
 msgstr "TehtÃ¤vien _esikatselu"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:871
 msgid "Show task preview pane"
 msgstr "NÃ¤ytÃ¤ tehtÃ¤vien esikatselupaneeli"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 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:935
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 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:943
+#: ../modules/calendar/e-task-shell-view-actions.c:907
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtÃ¤vÃ¤t"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtÃ¤vÃ¤t"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Next 7 Days' Tasks"
 msgstr "Seuraavien 7 pÃ¤ivÃ¤n tehtÃ¤vÃ¤t"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtÃ¤vÃ¤t"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Tasks with Attachments"
 msgstr "TehtÃ¤vÃ¤t, joissa on liitteitÃ¤"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-task-shell-view-actions.c:992
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtÃ¤vÃ¤lista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtÃ¤vistÃ¤"
 
-#: ../modules/calendar/e-task-shell-view-private.c:506
+#: ../modules/calendar/e-task-shell-view-private.c:463
+msgid "Expunging"
+msgstr "Poistetaan poistettuja"
+
+#: ../modules/calendar/e-task-shell-view-private.c:565
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tehtÃ¤vÃ¤"
 msgstr[1] "%d tehtÃ¤vÃ¤Ã¤"
 
-#: ../modules/calendar/e-task-shell-view.c:348
+#: ../modules/calendar/e-task-shell-view.c:351
 msgid "Delete Tasks"
 msgstr "Poiista tehtÃ¤viÃ¤"
 
+#: ../modules/calendar/e-task-shell-view.c:353
+msgid "Delete Task"
+msgstr ""
+
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:335
 #, c-format
 msgid "%d attached messages"
 msgstr "%d liitetty viesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:174
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:90
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-backend.c:168
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_SÃ¤hkÃ¶postiviesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:176
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:184
+#: ../modules/mail/e-mail-shell-backend.c:178
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "SÃ¤hkÃ¶posti_kansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:186
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgid "Create a new mail folder"
 msgstr "Luo uusi sÃ¤hkÃ¶postikansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:199
 msgid "Mail Accounts"
 msgstr "SÃ¤hkÃ¶postitilit"
 
-#: ../modules/mail/e-mail-shell-backend.c:221
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Mail Preferences"
+msgstr "SÃ¤hkÃ¶postin asetukset"
+
+#: ../modules/mail/e-mail-shell-backend.c:215
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:229
+#: ../modules/mail/e-mail-shell-backend.c:223
 msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
-#. green
-#: ../modules/mail/e-mail-shell-migrate.c:958
-msgid "To Do"
-msgstr "TehtÃ¤vÃ¤Ã¤"
-
-#. blue
-#: ../modules/mail/e-mail-shell-migrate.c:959
-msgid "Later"
-msgstr "MyÃ¶hemmin"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1138
-msgid "Migration"
-msgstr "Siirto"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1588
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Kansiota '%s' ei voi luoda: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1616
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Kansiota %s ei voi kopioidaan kohtaan %s: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1811
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "SÃ¤hkÃ¶postin lÃ¤pikÃ¤ynti kohteesta '%s' epÃ¤onnistui: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1817
-#: ../modules/mail/e-mail-shell-migrate.c:2914
-msgid "Migrating Folders"
-msgstr "SiirretÃ¤Ã¤n kansiota"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1818
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../modules/mail/e-mail-shell-content.c:678
+msgid "Group by Threads"
 msgstr ""
-"Evolutionin sÃ¤hkÃ¶postikansioiden sijainti ja rakenne on muuttunut versiosta "
-"Evolution 1.x.\n"
-"\n"
-"Odota kÃ¤rsivÃ¤llisesti, ettÃ¤ Evolution muuntaa kansioitasi..."
-
-#: ../modules/mail/e-mail-shell-migrate.c:2021
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Vanhaa POP keep-on-server tietoa '%s' ei voi avata: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2037
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "POP3 keep-on-server tietojen hakemistoa '%s' ei voi luoda: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2069
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "POP3 keep-on-server tietoa `%s' ei voi kopioida: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2540
-#: ../modules/mail/e-mail-shell-migrate.c:2554
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Paikallista sÃ¤hkÃ¶postitilaa '%s' ei voi luoda: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2915
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin sÃ¤hkÃ¶postikansioiden yhteenvedon esitys on siirretty sqlite-"
-"tietokantaan version 2.24 jÃ¤lkeen.\n"
-"\n"
-"Odota kÃ¤rsivÃ¤llisesti, ettÃ¤ Evolution muuntaa kansioiden tietoja..."
-
-#: ../modules/mail/e-mail-shell-migrate.c:3012
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Paikallisia sÃ¤hkÃ¶postikansioita ei voi luoda paikkaan '%s': %s"
 
-#: ../modules/mail/e-mail-shell-migrate.c:3030
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+#: ../modules/mail/e-mail-shell-content.c:679
+msgid "Whether to group messages by threads"
 msgstr ""
-"Asetuksia ei voi lukea aikaisemmasta Evolutionin asennuksesta, evolution/"
-"config.xmldb' on joko vaurioitunut tai puuttuu."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../modules/mail/e-mail-shell-view.c:418
+#: ../modules/mail/e-mail-shell-view-actions.c:859
+#: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_Poista tili kÃ¤ytÃ¶stÃ¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:861
 msgid "Disable this account"
 msgstr "Poista tÃ¤mÃ¤ tili kÃ¤ytÃ¶stÃ¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:868
+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:873
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunÃ¤kymÃ¤ haun perusteella..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:880
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
-msgid "Download messages of accounts and folders marked for offline"
-msgstr "Nouda viestit verkottomaan kÃ¤yttÃ¶Ã¶n merkityiltÃ¤ tileiltÃ¤ ja kansioista"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
-msgid "Empty _Trash"
-msgstr "_TyhjennÃ¤ roskakori"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
-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:882
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennÃ¤ lÃ¤htevien kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:896
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 msgid "Permanently remove this folder"
 msgstr "Poista tÃ¤mÃ¤ kansio pysyvÃ¤sti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1081
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:910
 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:1088
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#: ../modules/mail/e-mail-shell-view-actions.c:922
 msgid "_Move Folder To..."
 msgstr "_SiirrÃ¤ kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1097
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Move the selected folder into another folder"
 msgstr "SiirrÃ¤ valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1102
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1104
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1111
+#: ../modules/mail/e-mail-shell-view-actions.c:938
 msgid "Change the properties of this folder"
 msgstr "Vaihda tÃ¤mÃ¤n kansion ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1118
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 msgid "Refresh the folder"
 msgstr "VirkistÃ¤ kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1125
+#: ../modules/mail/e-mail-shell-view-actions.c:952
 msgid "Change the name of this folder"
 msgstr "Muuta tÃ¤mÃ¤n kansion nimeÃ¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
-msgid "Select _All Messages"
-msgstr "Valitse k_aikki viestit"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1132
-msgid "Select all visible messages"
-msgstr "Valitse kaikki nÃ¤kyvÃ¤t viestit"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1137
+#: ../modules/mail/e-mail-shell-view-actions.c:957
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_sÃ¤ie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
+#: ../modules/mail/e-mail-shell-view-actions.c:959
 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:1144
+#: ../modules/mail/e-mail-shell-view-actions.c:964
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_sÃ¤ie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tÃ¤mÃ¤n kansion tilaus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:978
+msgid "Empty _Trash"
+msgstr "_TyhjennÃ¤ roskakori"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:980
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "_New Label"
 msgstr "_uusi merkintÃ¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "N_one"
 msgstr "Ei _mitÃ¤Ã¤n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1172
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "Hide _Read Messages"
 msgstr "Piilota _luetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1174
+#: ../modules/mail/e-mail-shell-view-actions.c:1003
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Piilota kaikki luetut viestit vÃ¤liaikaisesti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
+#: ../modules/mail/e-mail-shell-view-actions.c:1008
 msgid "Hide S_elected Messages"
 msgstr "Piilota _valitut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1181
+#: ../modules/mail/e-mail-shell-view-actions.c:1010
 msgid "Temporarily hide the selected messages"
 msgstr "Piilota valitut viestit vÃ¤liaikaisesti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1186
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "Show Hidde_n Messages"
 msgstr "NÃ¤ytÃ¤ piil_otetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1017
 msgid "Show messages that have been temporarily hidden"
 msgstr "NÃ¤ytÃ¤ viestit jotka on vÃ¤liaikaisesti piilotettu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Cancel the current mail operation"
 msgstr "Peruuta nykyinen postioperaatio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _sÃ¤ikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisÃ¤ikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki sÃ¤ikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisÃ¤ikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
 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:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunÃ¤kymien mÃ¤Ã¤rittelyjÃ¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "_Subscriptions..."
 msgstr "_Tilaukset..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 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:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "_Label"
 msgstr "_MerkintÃ¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
 msgid "Hide _Deleted Messages"
 msgstr "Piilota _poistetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Piilota poistetut viestit sen sijaan, ettÃ¤ ne nÃ¤ytettÃ¤isiin yliviivattuina"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Show Message _Preview"
 msgstr "NÃ¤ytÃ¤ viestin _esikatselu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1333
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "Show message preview pane"
 msgstr "NÃ¤ytÃ¤ viestin esikatseluikkuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1339
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "_Group By Threads"
 msgstr "Ryhmittele _sÃ¤ikeittÃ¤in"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1341
+#: ../modules/mail/e-mail-shell-view-actions.c:1170
 msgid "Threaded message list"
 msgstr "SÃ¤ikeistetty viestiluettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1362
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Show message preview below the message list"
 msgstr "NÃ¤ytÃ¤ viestin esikatselu viestiluettelon alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
 msgid "Show message preview alongside the message list"
 msgstr "NÃ¤ytÃ¤ viestin esikatselu viestiluettelon vieressÃ¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Important Messages"
 msgstr "TÃ¤rkeÃ¤t viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden pÃ¤ivÃ¤n viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivÃ¤t ole roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1405
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitÃ¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1241
 msgid "No Label"
 msgstr "Ei merkintÃ¤Ã¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1419
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1426
+#: ../modules/mail/e-mail-shell-view-actions.c:1255
 msgid "Recent Messages"
 msgstr "ViimeisimmÃ¤t viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1478
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoiteeet sisÃ¤ltÃ¤vÃ¤t"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1488
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1495
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1502
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../modules/mail/e-mail-shell-view-private.c:726
+#: ../modules/mail/e-mail-shell-view-private.c:889
 #, 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:737
+#: ../modules/mail/e-mail-shell-view-private.c:900
 #, 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:743
-#: ../modules/mail/e-mail-shell-view-private.c:750
+#: ../modules/mail/e-mail-shell-view-private.c:906
+#: ../modules/mail/e-mail-shell-view-private.c:913
 #, 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:756
+#: ../modules/mail/e-mail-shell-view-private.c:919
 #, 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:762
+#: ../modules/mail/e-mail-shell-view-private.c:925
 #, 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:768
+#: ../modules/mail/e-mail-shell-view-private.c:931
 #, 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:780
+#: ../modules/mail/e-mail-shell-view-private.c:943
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:783
+#: ../modules/mail/e-mail-shell-view-private.c:946
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiÃ¤"
 
-#: ../modules/mail/e-mail-shell-view.c:416
+#: ../modules/mail/e-mail-shell-view.c:548
+msgid "All Account Search"
+msgstr "Etsi kaikilta tileiltÃ¤"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "Haku tileiltÃ¤"
+
+#: ../modules/mail/e-mail-shell-view.c:873
 msgid "Proxy _Logout"
 msgstr "Kirjaudu _pois vÃ¤limuistista"
 
-#: ../modules/mail/em-composer-prefs.c:478
+#: ../modules/mail/em-composer-prefs.c:479
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Every time"
 msgstr "Joka kerta"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:99
 msgid "Once per day"
 msgstr "Kerran pÃ¤ivÃ¤ssÃ¤"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:100
 msgid "Once per week"
 msgstr "Kerran viikossa"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:101
 msgid "Once per month"
 msgstr "Kerran kuussa"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:223
 msgid "Add Custom Junk Header"
 msgstr "LisÃ¤Ã¤ oma roskapostiotsake"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:227
 msgid "Header Name:"
 msgstr "_Otsakkeen nimi:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:228
 msgid "Header Value Contains:"
 msgstr "Otsakkeen arvo sisÃ¤ltÃ¤Ã¤:"
 
-#: ../modules/mail/em-mailer-prefs.c:326
-#: ../widgets/table/e-table-click-to-add.c:500
+#: ../modules/mail/em-mailer-prefs.c:327
+#: ../widgets/table/e-table-click-to-add.c:504
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "YlÃ¤tunniste:"
 
-#: ../modules/mail/em-mailer-prefs.c:330
+#: ../modules/mail/em-mailer-prefs.c:331
 msgid "Contains Value"
 msgstr "SisÃ¤ltÃ¤Ã¤ arvon"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:777
+#: ../modules/mail/em-mailer-prefs.c:724 ../modules/mail/em-mailer-prefs.c:795
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s-lisÃ¤osa on kÃ¤ytettÃ¤vissÃ¤ ja ohjelma on asennettu."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:786
+#: ../modules/mail/em-mailer-prefs.c:732 ../modules/mail/em-mailer-prefs.c:804
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s-lisÃ¤osa ei ole kÃ¤ytettÃ¤vissÃ¤. Tarkista ettÃ¤ sen paketti on asennettu."
 
-#: ../modules/mail/em-mailer-prefs.c:752
-msgid "No Junk plugin available"
-msgstr "RoskapostilisÃ¤osaa ei ole saatavilla"
+#: ../modules/mail/em-mailer-prefs.c:768
+msgid "No junk plugin available"
+msgstr ""
+
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+#: ../modules/mail/em-mailer-prefs.c:1153
+msgid "_Table column:"
+msgstr ""
+
+#. 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:1155
+msgid "_Date header:"
+msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:1140
-msgid "Date header:"
-msgstr "PÃ¤ivÃ¤mÃ¤Ã¤rÃ¤otsikko:"
+#: ../modules/mail/em-mailer-prefs.c:1156
+msgid "Show _original header value"
+msgstr ""
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -15722,7 +16126,7 @@ msgstr "Hei Python"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
-msgstr "Pythonin liittÃ¤nnÃ¤islataimen testit"
+msgstr "Pythonin liitÃ¤nnÃ¤islataimen testit"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
 msgid "Python Test Plugin"
@@ -15752,17 +16156,12 @@ msgid ""
 "body."
 msgstr "Luettelo vihjeistÃ¤, joita liitemuistuttaja etsii viestin rungosta."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:378
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "Avainsanat"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "Liitemuistuttaja"
-
-#: ../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."
@@ -15770,21 +16169,25 @@ 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
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
 msgstr "ViestissÃ¤ ei ole liitteitÃ¤"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../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:5
+#: ../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
+msgid "Attachment Reminder"
+msgstr "Liitemuistuttaja"
+
 #: ../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 ""
+msgstr "Muistuttaa, jos unohdit lisÃ¤tÃ¤ liitteen viestiin."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid "Inline Audio"
@@ -15794,167 +16197,168 @@ msgstr "SisÃ¤kkÃ¤iset Ã¤Ã¤net"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Soita Ã¤Ã¤niliitteet suoraan sÃ¤hkÃ¶postiviesteistÃ¤."
 
-#: ../plugins/backup-restore/backup-restore.c:143
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "Valitse Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../plugins/backup-restore/backup-restore.c:168
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "KÃ¤ynnistÃ¤ Evolution _uudestaan varmuuskopioinnin jÃ¤lkeen"
 
-#: ../plugins/backup-restore/backup-restore.c:198
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../plugins/backup-restore/backup-restore.c:219
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "KÃ¤ynnistÃ¤ Evolution _uudestaan varmuuskopioinnin jÃ¤lkeen"
 
-#: ../plugins/backup-restore/backup-restore.c:293
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:290
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
-"Voit palauttaa evolutionin varmuuskopioista. NÃ¤in pystyt palauttamaan kaikki "
-"sÃ¤hkÃ¶postit, kalenterit, tehtÃ¤vÃ¤t, muistiot ja osoitekirjat.\n"
-"Palautus palauttaa myÃ¶s kaikki asetukset, sÃ¤hkÃ¶postisuotimet jne."
+"Voit palauttaa tiedot Evolutioniin varmuuskopiotiedostosta. Varmuuskopiosta "
+"voi palauttaa kaikki sÃ¤hkÃ¶postit, kalenterit, tehtÃ¤vÃ¤t, muistiot ja "
+"osoitekirjat. Palautus palauttaa myÃ¶s kaikki asetukset, sÃ¤hkÃ¶postisuotimet "
+"jne."
 
-#: ../plugins/backup-restore/backup-restore.c:300
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
-msgstr "_Palauta Evolution varmuuskopiotiedostosta"
+msgstr "_Palauta tiedot Evolutioniin varmuuskopiotiedostosta"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Valitse palautettava Evolution-varmuuskopio:"
 
-#: ../plugins/backup-restore/backup-restore.c:310
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../plugins/backup-restore/backup-restore.c:318
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Restore from backup"
 msgstr "Palauta varmuuskopio"
 
-#: ../plugins/backup-restore/backup-restore.c:354
+#: ../plugins/backup-restore/backup-restore.c:353
 msgid "_Backup Settings..."
 msgstr "_Varmuuskopioi asetukset..."
 
-#: ../plugins/backup-restore/backup-restore.c:356
+#: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "Varmuuskopioi Evolutionin tiedot ja asetukset arkistotiedostoon"
 
-#: ../plugins/backup-restore/backup-restore.c:361
+#: ../plugins/backup-restore/backup-restore.c:360
 msgid "R_estore Settings..."
 msgstr "_Palauta asetukset..."
 
-#: ../plugins/backup-restore/backup-restore.c:363
+#: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Palauta Evolutionin tietoja ja asetuksia arkistotiedostosta"
 
-#: ../plugins/backup-restore/backup.c:62
+#: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
 msgstr "Varmuuskopioi Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:64
+#: ../plugins/backup-restore/backup.c:65
 msgid "Restore Evolution directory"
 msgstr "Palauta Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:67
 msgid "Check Evolution Backup"
 msgstr "Tarkista evolutionin varmuuskopio"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:69
 msgid "Restart Evolution"
 msgstr "KÃ¤ynnistÃ¤ Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:71
 msgid "With Graphical User Interface"
 msgstr "Graafisen kÃ¤yttÃ¶liittymÃ¤n kanssa"
 
-#: ../plugins/backup-restore/backup.c:188
-#: ../plugins/backup-restore/backup.c:250
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "Sammutetaan Evolutionia"
 
-#: ../plugins/backup-restore/backup.c:195
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "Varmuuskopioidaan Evolutionin tilejÃ¤ ja asetuksia"
 
-#: ../plugins/backup-restore/backup.c:201
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varmuuskopioidaan Evolutionin tietoja (viestejÃ¤, yhteystietoja, "
 "kalentereita, tehtÃ¤viÃ¤ ja muistioita)"
 
-#: ../plugins/backup-restore/backup.c:212
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "Varmuuskopio on valmis"
 
-#: ../plugins/backup-restore/backup.c:217
-#: ../plugins/backup-restore/backup.c:238
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "KÃ¤ynnistetÃ¤Ã¤n Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:255
 msgid "Backup current Evolution data"
 msgstr "Varmuuskopioi tÃ¤mÃ¤nhetkiset Evolutionin tiedot"
 
-#: ../plugins/backup-restore/backup.c:259
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "Puretaan tiedostoja varmuuskopiosta"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "Ladataan Evolutionin asetuksia"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "Poistetaan varmuuskopioinnin vÃ¤liaikaistiedostoja"
 
-#: ../plugins/backup-restore/backup.c:280
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "Tarkistetaan paikalliset lÃ¤hteet"
 
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:428
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varmuuskopioidaan kansioon %s"
 
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:433
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Palautetaan kansiosta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Backup"
 msgstr "Evolutionin varmuuskopiointi"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:488
 msgid "Backing up Evolution Data"
 msgstr "Varmuuskopioidaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:489
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Odota, ettÃ¤ Evolution ottaa varmuuskopion tiedoistasi."
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:491
 msgid "Restoring Evolution Data"
 msgstr "Palautetaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:492
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Odota, ettÃ¤ Evolution palauttaa tietosi."
 
-#: ../plugins/backup-restore/backup.c:511
-msgid "This may take a while depending on the amount of data in your account."
+#: ../plugins/backup-restore/backup.c:510
+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Ã¤."
 
@@ -16019,35 +16423,35 @@ msgstr ""
 "kaikki ikkunat ennen jatkamista. Voit asetta evolutionin kÃ¤ynnistymÃ¤Ã¤n "
 "automaattisesti, kun varmuuskopiointi on pÃ¤Ã¤ttynyt."
 
-#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "LisÃ¤Ã¤ lÃ¤hettÃ¤jÃ¤ _osoitekirjaan lÃ¤hetettÃ¤essÃ¤ viestejÃ¤"
 
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "PikaviestinnÃ¤n yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:746
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "YhdistÃ¤ yhteystiedot ja kuvat pidginin tuttavalistasta"
 
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "YhdistÃ¤ tiedot _tuttavalistasta"
 
@@ -16056,7 +16460,6 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-#, fuzzy
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
@@ -16064,31 +16467,38 @@ msgid ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
+"Huolehtii tylsistÃ¤ osoitekirjan hallintatehtÃ¤vistÃ¤.\n"
+"\n"
 "LisÃ¤Ã¤ nimet ja sÃ¤hkÃ¶postiosoitteet automaattisesti osoitekirjaan, kun "
 "vastaat viesteihin. LiittÃ¤Ã¤ myÃ¶s IM-yhteystiedot tuttavalistoiltasi."
 
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:159
+#, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr ""
+
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Tapahtui virhe kÃ¤ynnistettÃ¤essÃ¤ %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:191
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-lapsiprosessi ei vastaa, tapetaan..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:193
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Bogofilter-lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:216
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Putki bogofilterille epÃ¤onnistui, virhekoodi: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:399
 msgid "Convert message text to _Unicode"
 msgstr "Muunna viestin teksti _Unicode-muotoon"
 
@@ -16116,72 +16526,157 @@ msgstr "Bogofilter-asetukset"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Suodata roskaposteja bogofilterillÃ¤."
 
-#: ../plugins/caldav/caldav-source.c:64
-msgid "CalDAV"
-msgstr "CalDAV"
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
 
-#: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:171
+#: ../plugins/caldav/caldav-browse-server.c:334
+#: ../plugins/caldav/caldav-browse-server.c:585
+msgid "Failed to parse server response."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+msgid "Events"
+msgstr "Tapahtumat"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+msgid "User's calendars"
+msgstr "KÃ¤yttÃ¤jÃ¤n kalenteri"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+msgid "Failed to get server URL."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:627
+#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:1272
+msgid "Searching for user's calendars..."
+msgstr "EtsitÃ¤Ã¤n kÃ¤yttÃ¤jÃ¤n kalentereja..."
+
+#: ../plugins/caldav/caldav-browse-server.c:666
+msgid "Could not find any user calendar."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "Aiempi yritys epÃ¤onnistui: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, c-format
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+msgid "Searching folder content..."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+msgid "List of available calendars:"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+msgid "Supports"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, c-format
+msgid "Failed to create thread: %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:390
-#: ../plugins/google-account-setup/google-contacts-source.c:303
+#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "KÃ¤ytÃ¤ _SSLÃ¤Ã¤"
 
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-file/calendar-file.c:274
-#: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:499
-#: ../plugins/google-account-setup/google-contacts-source.c:322
-#: ../plugins/google-account-setup/google-source.c:717
+#: ../plugins/caldav/caldav-source.c:228
+msgid "Brows_e server for a calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/google-account-setup/google-contacts-source.c:323
+#: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
 msgstr "Vi_rkistÃ¤:"
 
-#: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:517
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-#: ../plugins/google-account-setup/google-source.c:742
-msgid "weeks"
-msgstr "viikkoa"
-
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
-msgstr ""
+msgstr "LisÃ¤Ã¤ CalDAV-tuki Evolutioniin."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV Support"
 msgstr "CalDAV-tuki"
 
-#: ../plugins/calendar-file/calendar-file.c:208
+#: ../plugins/calendar-file/calendar-file.c:112
 msgid "_Customize options"
 msgstr "_Muokkausvalinnat"
 
-#: ../plugins/calendar-file/calendar-file.c:227
+#: ../plugins/calendar-file/calendar-file.c:131
 msgid "File _name:"
 msgstr "_Tiedostonimi:"
 
-#: ../plugins/calendar-file/calendar-file.c:231
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "Choose calendar file"
 msgstr "Valitse kalenteritiedosto"
 
-#: ../plugins/calendar-file/calendar-file.c:279
+#: ../plugins/calendar-file/calendar-file.c:183
 msgid "On open"
 msgstr "Avattaessa"
 
-#: ../plugins/calendar-file/calendar-file.c:280
+#: ../plugins/calendar-file/calendar-file.c:184
 msgid "On file change"
 msgstr "Tiedoston muuttuessa"
 
-#: ../plugins/calendar-file/calendar-file.c:281
+#: ../plugins/calendar-file/calendar-file.c:185
 msgid "Periodically"
 msgstr "Toistuvasti"
 
-#: ../plugins/calendar-file/calendar-file.c:308
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "Force read _only"
 msgstr "Pakota vain _luku"
 
@@ -16193,11 +16688,11 @@ msgstr "LisÃ¤Ã¤ paikallisia kalentereita Evolutioniin."
 msgid "Local Calendars"
 msgstr "Paikalliset kalenterit"
 
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_Secure connection"
 msgstr "_Salattu yhteys"
 
-#: ../plugins/calendar-http/calendar-http.c:455
+#: ../plugins/calendar-http/calendar-http.c:186
 msgid "Userna_me:"
 msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
@@ -16249,26 +16744,50 @@ msgstr "SÃ¤Ã¤: ukkosmyrskyjÃ¤"
 msgid "Select a location"
 msgstr "Valitse sijainti"
 
-#: ../plugins/calendar-weather/calendar-weather.c:597
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:371
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:446
 msgid "_Units:"
 msgstr "_YksikkÃ¶:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:604
+#: ../plugins/calendar-weather/calendar-weather.c:453
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrinen (Celsiusta, cm jne.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:605
+#: ../plugins/calendar-weather/calendar-weather.c:454
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheitia, tuumia jne.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Add weather calendars to Evolution."
-msgstr ""
+msgstr "LisÃ¤Ã¤ sÃ¤Ã¤kalenterit Evolutioniin."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "SÃ¤Ã¤kalenterit"
 
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+msgid "Contacts map"
+msgstr ""
+
+#: ../plugins/contacts-map/contacts-map.c:56
+msgid "Show a map of all the contacts"
+msgstr ""
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr ""
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+msgid "Map for contacts"
+msgstr ""
+
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Tarkista onko Evolution sÃ¤hkÃ¶postin oletusohjelma"
@@ -16291,19 +16810,23 @@ msgstr "SÃ¤hkÃ¶postin oletusohjelma"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Haluatko kÃ¤yttÃ¤Ã¤ Evolutionia oletuksena sÃ¤hkÃ¶postin kÃ¤sittelyyn?"
 
-#: ../plugins/default-source/default-source.c:80
+#: ../plugins/default-source/default-source.c:75
 msgid "Mark as _default address book"
 msgstr "Merkitse _oletusosoitekirjaksi"
 
-#: ../plugins/default-source/default-source.c:101
+#: ../plugins/default-source/default-source.c:88
+msgid "A_utocomplete with this address book"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
 msgstr "Merkitse _oletuskalenteriksi"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:98
 msgid "Mark as _default task list"
 msgstr "Merkitse _oletustehtÃ¤vÃ¤listaksi"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:99
 msgid "Mark as _default memo list"
 msgstr "Merkitse _oletusmuistiolistaksi"
 
@@ -16313,7 +16836,7 @@ msgstr "OletuslÃ¤hteet"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid "Mark your preferred address book and calendar as default."
-msgstr ""
+msgstr "Merkitse haluamasi osoitekirja ja kalenteri oletusarvoisiksi."
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
@@ -16327,43 +16850,42 @@ msgid ""
 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 otsakken sisÃ¤ltÃ¶, eroteltuna \";\"-merkeillÃ¤."
+"nimi, \"=\"-merkki ja otsakkeen sisÃ¤ltÃ¶, eroteltuna \";\"-merkeillÃ¤."
 
-#: ../plugins/email-custom-header/email-custom-header.c:332
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "Turvallisuus:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:337
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "Ei luokiteltu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "Suojattu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Secret"
 msgstr "Salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "ErittÃ¤in salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:583
+#. 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
+#: ../plugins/email-custom-header/email-custom-header.c:379
+msgctxt "email-custom-header"
+msgid "None"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "_Omat otsakkeet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:905
-msgid "Key"
-msgstr "Avaimet"
-
-#: ../plugins/email-custom-header/email-custom-header.c:916
-#: ../plugins/templates/templates.c:384
-msgid "Values"
-msgstr "Arvot"
-
 #. 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.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16371,6 +16893,15 @@ msgstr ""
 "Omien otsakeavainten mÃ¤Ã¤rittelyssÃ¤ kÃ¤ytetty muoto on seuraava:\n"
 "Omien otsakenimien avainarvot eroteltuna merkillÃ¤ \";\"."
 
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "Avaimet"
+
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "Arvot"
+
 #. 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:2
 msgid "Add custom headers to outgoing mail messages."
@@ -16380,962 +16911,19 @@ msgstr "LisÃ¤Ã¤ oma otsake lÃ¤hteviin viesteihin."
 msgid "Custom Header"
 msgstr "Omat otsakkeet"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "Omat sÃ¤hkÃ¶postiotsakkeet"
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Avaa muiden kÃ¤yttÃ¤jien kansioita"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Tili:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Kansion nimi:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "_KÃ¤yttÃ¤jÃ¤:"
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "Turvallinen salasana"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr "YhdistÃ¤ Exchange-palvelimelle kÃ¤yttÃ¤en turvallista salasanaa (NTLM)."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "SelvÃ¤kielinen salasana"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"YhdistÃ¤ Exchange-palvelimelle kÃ¤yttÃ¤en tavallista selvÃ¤kielistÃ¤ salasanaa."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-msgid "Out Of Office"
-msgstr "Poissa konttorilta"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
-msgid ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-msgstr ""
-"Alla mÃ¤Ã¤ritelty viesti lÃ¤hetÃ¤Ã¤n automaattisesti jokaiselle \n"
-"henkilÃ¶lle, joka lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia sinulle kun et ole tavoitettavissa."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:290
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am out of the office"
-msgstr "En ole tavoitettavissa"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:294
-msgid "I am in the office"
-msgstr "Olen tavoitettavissa"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:340
-msgid "Change the password for Exchange account"
-msgstr "SyÃ¶tÃ¤ Exchange-tilin salasana"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:342
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "Vaihda salasana"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
-msgid "Manage the delegate settings for Exchange account"
-msgstr "Muokkaa Exchange-tilin valtuutusasetuksia"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Delegation Assistant"
-msgstr "Valtuutuksen apulainen"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Miscelleneous"
-msgstr "Sekalaiset"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:371
-msgid "View the size of all Exchange folders"
-msgstr "NÃ¤ytÃ¤ kaikkien Exchange-kansioiden koko"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:373
-msgid "Folders Size"
-msgstr "Kansioiden koko"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:380
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "Exchangen asetukset"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:726
-msgid "_OWA URL:"
-msgstr "_OWA URL:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:752
-msgid "A_uthenticate"
-msgstr "K_irjautuminen"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:774
-msgid "Mailbox name is _different than user name"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:787
-msgid "_Mailbox:"
-msgstr "_SÃ¤hkÃ¶postikansio:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1001
-msgid "_Authentication Type"
-msgstr "_Tunnistautumistapa"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1130
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s kt"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1132
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 kt"
-
-#. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "Koko:"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution on yhteydettÃ¶mÃ¤ssÃ¤ tilassa. Et voi luoda tai muokata kansioita.\n"
-"Avaa verkkoyhteydet, jotta voit suorittaa nÃ¤itÃ¤ toimintoja."
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"Nykyinen salasana ei vastaa tilisi olemassaolevaa salasanaa. SyÃ¶tÃ¤ oikea "
-"salasana."
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "Salasanat eivÃ¤t ole samat. SyÃ¶tÃ¤ salasanat uudestaan."
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "Varmista salasana:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "Nykyinen salasana:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "Uusi salasana:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "Salasanasi on vanhentunut. Ole hyvÃ¤ ja vaihda salasanasi nyt."
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:657
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "Salasanasi vanhenee seuraavan %d pÃ¤ivÃ¤n kuluessa"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:142
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
-msgid "Custom"
-msgstr "Oma nÃ¤kymÃ¤"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:168
-msgid "Editor (read, create, edit)"
-msgstr "Muokkaaja (kirjoita, luo, muokkaa)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:172
-msgid "Author (read, create)"
-msgstr "Kirjoittaja (lue, luo)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:176
-msgid "Reviewer (read-only)"
-msgstr "Tarkastaja (vain luku)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:225
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Delegate Permissions"
-msgstr "Valtuutettujen oikeudet"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:236
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
-#, c-format
-msgid "Permissions for %s"
-msgstr "Oikeudet kÃ¤yttÃ¤jÃ¤lle %s"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:326
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"Evolution lÃ¤hetti tÃ¤mÃ¤n viestin automaattisesti kertoakseen, ettÃ¤ sinut on "
-"merkitty valtuutetuksi. Voit nyt lÃ¤hettÃ¤Ã¤ viestejÃ¤ puolestani."
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:331
-msgid "You have been given the following permissions on my folders:"
-msgstr "Sinulle on annettu seuraavat oikeudet kansioihini:"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:351
-msgid "You are also permitted to see my private items."
-msgstr "Sinulla on myÃ¶s lupa katsoa yksityisiÃ¤ tietojani."
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
-msgid "However you are not permitted to see my private items."
-msgstr "Sinulla ei kuitenkaan ole lupaa katsoa yksityisiÃ¤ tietojani."
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:390
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "Sinut on nimetty kÃ¤yttÃ¤jÃ¤n %s valtuutetuksi"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:416
-msgid "Delegate To"
-msgstr "Valtuuta henkilÃ¶"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:581
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "Poistetaanko valtuutus %s?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:698
-msgid "Could not access Active Directory"
-msgstr "Active Directorya ei voi avata"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:710
-msgid "Could not find self in Active Directory"
-msgstr "Omia tietoja ei lÃ¶ytynyt Active DirectorystÃ¤"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:723
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "Valtuutettua %s ei lÃ¶ytynyt Active DirectorystÃ¤"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:735
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "Valtuutettua %s ei voi poista"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-msgid "Could not update list of delegates."
-msgstr "Valtuutettujen listaa ei voi pÃ¤ivittÃ¤Ã¤."
-
-#: ../plugins/exchange-operations/exchange-delegates.c:813
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "Valtuutettua %s ei voi lisÃ¤tÃ¤"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:980
-msgid "Error reading delegates list."
-msgstr "Virhe luettaessa listaa valtuutetuista."
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-msgid "C_alendar:"
-msgstr "K_alenteri:"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Co_ntacts:"
-msgstr "Y_hteystiedot: "
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "Valtuutetut"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Permissions for"
-msgstr "Oikeudet kohteelle"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr ""
-"NÃ¤mÃ¤ kÃ¤yttÃ¤jÃ¤t voivat lÃ¤hettÃ¤Ã¤ puolestasi sÃ¤hkÃ¶postia ja\n"
-"lukea kansioitasi niillÃ¤ oikeuksilla, jotka heille myÃ¶nnÃ¤t."
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "_Valtuutettu voi nÃ¤hdÃ¤ yksityisiÃ¤ kohteita"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "_Saapuneet:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "_Yhteenveto oikeuksista"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks:"
-msgstr "_TehtÃ¤vÃ¤t:"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "Oikeudet..."
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "Kansion nimi"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "Kansion koko"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-msgid "User"
-msgstr "KÃ¤yttÃ¤jÃ¤"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Tilaa muiden kÃ¤yttÃ¤jien kansioita"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "Exchangen kansiopuu"
-
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#: ../plugins/exchange-operations/exchange-folder.c:243
-msgid "Unsubscribe Folder..."
-msgstr "Peru kansion tilaus..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "Perutaanko todella kansion \"%s\" tilaus?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "Peru \"%s\" tilaus"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Tilasi on tÃ¤llÃ¤ hetkellÃ¤ \"Poissa konttorilta\"</b>\n"
-"\n"
-"Haluatko muuttaa tilasi tilaan \"Konttorilla\"?"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Poissa konttorilta-viesti:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Tila:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>Alla mÃ¤Ã¤ritelty viesti lÃ¤hetetÃ¤Ã¤n automaattisesti jokaiselle "
-"henkilÃ¶lle, joka lÃ¤hettÃ¤Ã¤\n"
-"sinulle sÃ¤hkÃ¶postia kun olet poissa konttorilta.</small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Olen tÃ¤llÃ¤ hetkellÃ¤ konttorilla"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Olen tÃ¤llÃ¤ hetkellÃ¤ poissa konttorilta"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Ei, Ã¤lÃ¤ muuta tilaa"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "\"Poissa konttorilta\"-apulainen"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "KyllÃ¤, vaihda tila"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "Salasanan vanhentumisvaroitus..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "Salasanasi vanhenee seuraavan 7 pÃ¤ivÃ¤n kuluessa..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "_Vaihda salasana"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
-msgid "(Permission denied.)"
-msgstr "(Lupa evÃ¤tty.)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-msgid "Add User:"
-msgstr "LisÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤:"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:932
-#: ../plugins/groupwise-features/share-folder.c:713
-msgid "Add User"
-msgstr "LisÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>Oikeudet</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "Ei voi poistaa"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "Ei voi muokata"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "Luo kohteita"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "Luo alikansioita"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "Poista kohteita"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "Poista omat kohdat"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "Muokkaa kohtia"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "Muokkaa omia kohtia"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "Kansion sisÃ¤ltÃ¶"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "Kansion omistaja"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "Kansio nÃ¤kyvissÃ¤"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "Luetut kohdat"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "Rooli: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>Viestin asetukset</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>Seuranta-asetukset</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "Exchangen lÃ¤hetysasetukset"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "TÃ¤rk_eys: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"Tavallinen\n"
-"Korkea\n"
-"Matala"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"Tavallinen\n"
-"HenkilÃ¶kohtainen\n"
-"Yksityinen\n"
-"Luottamuksellinen"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "PyydÃ¤ \"_toimitettu\"-kuittausta tÃ¤lle viestille"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "PyydÃ¤ \"_luettu\"-kuittausta tÃ¤lle viestille"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "LÃ¤hetÃ¤ valtuutettuna"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "_Herkkyys: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "_KÃ¤yttÃ¤jÃ¤"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:131
-msgid "Select User"
-msgstr "Valitse kÃ¤yttÃ¤jÃ¤"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:169
-msgid "Address Book..."
-msgstr "Osoitekirja..."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "Tilaa muiden kÃ¤yttÃ¤jien yhteystietoja"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "Tilaa toisen kÃ¤yttÃ¤jÃ¤n kalenteri"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "Activates the Evolution-Exchange extension package."
-msgstr ""
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "Exchange-toiminnot"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr ""
-"VÃ¤lilehteÃ¤ \"Exchange-asetukset\" ei voi avata yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "Salasanaa ei voi vaihtaa asetusongelmien takia."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "Kansioita ei voi nÃ¤yttÃ¤Ã¤."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "ToimenpidettÃ¤ ei voi suorittaa."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"Muutokset Exchange-tilin \"{0}\" asetuksiin tulevat voimaan, kun olet "
-"sulkenut ja kÃ¤ynnistynyt Evolutionin uudestaan."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "Palvelimelle tunnistautuminen epÃ¤onnistui."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "Salasanan vaihto epÃ¤onnistui."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"Exchange tiliÃ¤ ei voi mÃ¤Ã¤ritellÃ¤, koska tapahtui\n"
-"tuntematon virhe. Tarkista URL, kÃ¤yttÃ¤jÃ¤tunnus ja\n"
-"salasana ja yritÃ¤ uudestaan."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "Exchange-palvelimeen ei saatu yhteyttÃ¤."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "Palvelimeen {0} ei saatu yhteyttÃ¤."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "Kansion oikeuksia valtuutetuille ei voi selvittÃ¤Ã¤."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "Exchange Web Storage SystemiÃ¤ ei lÃ¶ytynyt."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "Palvelinta {0} ei lÃ¶ytynyt."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ {0} ei voi merkitÃ¤ valtuutetuksi"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "Kansion oikeuksia ei voi lukea"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "Kansion oikeuksia ei voi lukea."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "\"Poissa konttorilta\"-tilaa ei voi lukea."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "Kansion oikeuksia ei voi pÃ¤ivittÃ¤Ã¤."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "\"Poissa konttorilta\"-tilaa ei voi pÃ¤ivittÃ¤Ã¤."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr ""
-"Evolution vaatii uudelleenkÃ¤ynnistyksen tilatun kÃ¤yttÃ¤jÃ¤n postilaatikon "
-"lataamiseksi"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "Exchange-tili on yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-msgstr ""
-"Exchange Connector vaatii pÃ¤Ã¤syÃ¤ tiettyihin\n"
-"Exchange-palvelimen toimintoihin, jotka nÃ¤yttÃ¤vÃ¤t\n"
-"olevan joko poistettu kÃ¤ytÃ¶stÃ¤ tai estetty. TÃ¤mÃ¤ on usein\n"
-"vahinko. Exchange-yllÃ¤pitÃ¤jÃ¤si tÃ¤ytyy ottaa nÃ¤mÃ¤ ominaisuudet\n"
-"kÃ¤yttÃ¶Ã¶n, jotta voit kÃ¤yttÃ¤Ã¤ Exchange Connectoria.\n"
-"\n"
-"Exchange-yllÃ¤pitÃ¤jÃ¤si voi lukea ongelman ratkaisuun liittyviÃ¤\n"
-"ohjeita allaolevasta osoitteesta:\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "Valtuutuslistan pÃ¤ivitys epÃ¤onnistui:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "Kansio on jo olemassa"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "Kansiota ei ole olemassa"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "Kansio on yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-msgid "Generic error"
-msgstr "Yleinen virhe"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "Yhteinen luettelopalvelin ei ole kÃ¤ytettÃ¤vissÃ¤"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
-"Jos OWA on kÃ¤ytÃ¶ssÃ¤ eri polussa tÃ¤ytyy se mÃ¤Ã¤ritellÃ¤ erikseen tilin "
-"asetuksissa."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "SÃ¤hkÃ¶postit kÃ¤yttÃ¤jÃ¤lle {0} eivÃ¤t ole tÃ¤llÃ¤ palvelimella."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "Tarkista ettÃ¤ URL on oikein ja yritÃ¤ uudestaan."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
-"Tarkista ettÃ¤ palvelimen nimi on kirjoitettu oikein ja yritÃ¤ uudestaan."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr ""
-"Tarkista ettÃ¤ kÃ¤yttÃ¤jÃ¤tunnus ja salasana ovat oikein ja yritÃ¤ uudestaan."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "YhteistÃ¤ luettelopalvelinta ei ole mÃ¤Ã¤ritelty tÃ¤lle tilille."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "KÃ¤yttÃ¤jÃ¤llÃ¤ {0} ei ole postilaatikkoa palvelimella {1}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ {0} ei ole olemassa"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "Salasanan vaihto onnistui."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr "Anna valtuuttajan tunniste tai poista lÃ¤hetÃ¤ valtuutettuna -asetus."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "Varmista, ettÃ¤ yhteisen luettelopalvelimen nimi on oikein."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "KÃ¤ynnistÃ¤ Evolution uudestaan, jotta muutokset tulevat voimaan"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "Valitse kÃ¤yttÃ¤jÃ¤."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "Palvelin hylkÃ¤si salasanan, koska se on liian yksinkertainen."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "Exchange-tili poistetaan kÃ¤ytÃ¶stÃ¤ kun suljet evolutionin"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "Exchange-tili poistetaan, kun suljet Evolutionin"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "Exchange-palvelin ei ole yhteensopiva Exchange Connectorin kanssa."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"Palvelimen versio on Exchange 5.5. Exchange Connector \n"
-"tukee ainoastaan versioita Microsoft Exchange 2000 ja 2003."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-msgstr ""
-"TÃ¤mÃ¤ luultavasti tarkoittaa, ettÃ¤ palvelin vaatii\n"
-"sinua syÃ¶ttÃ¤mÃ¤Ã¤n Windowsin aluenimen\n"
-"osana kÃ¤yttÃ¤jÃ¤tunnusta (esim. &quot;ALUENIMI\\kÃ¤yttÃ¤jÃ¤&quot;).\n"
-"Voi myÃ¶s olla ettÃ¤ syÃ¶tit vÃ¤Ã¤rÃ¤n salasanan."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "YritÃ¤ uudestaan eri salasanalla."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ ei voi lisÃ¤tÃ¤ pÃ¤Ã¤sylistalle:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "Valtuutuslistan muokkaus epÃ¤onnistui."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "Tuntematon virhe etsittÃ¤essÃ¤ {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/mail-to-task/mail-to-task.c:623
-#: ../plugins/mail-to-task/mail-to-task.c:838
-msgid "Unknown error."
-msgstr "Tuntematon virhe."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "Tuntematon tyyppi"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "Toimenpide ei ole tuettu"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr ""
-"SÃ¤hkÃ¶postisi tallennukseen varattu tila tÃ¤llÃ¤ palvelimella alkaa loppua."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr ""
-"Sinulla on lupa lÃ¤hettÃ¤Ã¤ viestejÃ¤ toisten puolesta vain yhden valtuuttajan "
-"nimissÃ¤ kerrallaan."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "Et voi valtuuttaa itseÃ¤si."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "SÃ¤hkÃ¶postillesi varattu tila tÃ¤llÃ¤ palvelimella on loppu."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "Voit mÃ¤Ã¤ritellÃ¤ vain yhden Exchange-tilin."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr ""
-"KÃ¤ytÃ¤t tÃ¤llÃ¤ hetkellÃ¤ {0} kt. YritÃ¤ vapauttaa tilaa poistamalla joitain "
-"viestejÃ¤."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr ""
-"KÃ¤ytÃ¤t tÃ¤llÃ¤ hetkellÃ¤ {0} kt. Et voi lÃ¤hettÃ¤Ã¤ tai vastaanottaa sÃ¤hkÃ¶postia."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"KÃ¤ytÃ¤t tÃ¤llÃ¤ hetkellÃ¤ {0} kt. Et voi lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia ennen kuin olet "
-"vapauttanut tilaa poistamalla joitain tallennettuja viestejÃ¤."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "Salasanasi on vanhentunut."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} ei voi lisÃ¤tÃ¤ pÃ¤Ã¤sylistalle"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} on jo valtuutettu"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} on jo listalla"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "Tilaa muiden kÃ¤yttÃ¤jien tehtÃ¤viÃ¤"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "Tarkista kansion oikeudet"
-
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
+"KÃ¤ynnistÃ¤ muokkain automaattisesti, kun nappia painetaan viestin muokkaimessa"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 #: ../plugins/external-editor/external-editor.c:119
 msgid "Automatically launch when a new mail is edited"
-msgstr ""
+msgstr "KÃ¤ynnistÃ¤ automaattisesti uutta viestiÃ¤ muokattaessa"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
@@ -17357,8 +16945,8 @@ msgstr ""
 "Emacsia varten kÃ¤ytÃ¤ arvoa \"xemacs\"\n"
 "VI:tÃ¤ varten kÃ¤ytÃ¤ arvoa \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:353
-#: ../plugins/external-editor/external-editor.c:355
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
 msgid "Compose in External Editor"
 msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
 
@@ -17395,6 +16983,8 @@ msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 msgstr ""
+"Ulkoinen muokkain on vielÃ¤ kÃ¤ynnissÃ¤. Viestin lÃ¤hetysikkunaa ei voi sulkea "
+"ennen kuin ulkoinen muokkain on kÃ¤ynnissÃ¤."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
@@ -17404,48 +16994,77 @@ msgstr ""
 "LisÃ¤osien asetuksissa mÃ¤Ã¤riteltyÃ¤ ulkoista muokkainta ei voi kÃ¤ynnistÃ¤Ã¤. "
 "YritÃ¤ kÃ¤yttÃ¤Ã¤ muuta komentoa."
 
-#: ../plugins/face/face.c:58
-msgid "Select a (48*48) png of size < 700bytes"
-msgstr "Valitse (48x48) png-tiedosto, jonka koko on < 700 tavua"
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.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 ""
 
-#: ../plugins/face/face.c:68
-msgid "PNG files"
-msgstr "PNG-tiedostot"
+#: ../plugins/face/face.c:286
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+msgstr ""
 
-#: ../plugins/face/face.c:125
-msgid "_Face"
-msgstr "_Kasvokuva"
+#: ../plugins/face/face.c:296
+msgid "Image files"
+msgstr "Kuvatiedostot"
+
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr ""
+
+#: ../plugins/face/face.c:415
+msgid "Include _Face"
+msgstr ""
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-#, fuzzy
-msgid ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
-"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
-"sent messages."
+msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
-"LiittÃ¤Ã¤ kasvokuvaotsakkeen lÃ¤hteviin viesteihin. KÃ¤yttÃ¤jien tÃ¤ytyy ensin "
-"mÃ¤Ã¤ritellÃ¤ 48x48-pisteen png-kuva. Kuva tallennetaan base64-muodossa ja "
-"tallennetaan tiedostoon ~/.evolution/faces. TÃ¤tÃ¤ kuvaa kÃ¤ytetÃ¤Ã¤n jatkossa "
-"lÃ¤hetettÃ¤vissÃ¤ viesteissÃ¤."
 
-#: ../plugins/google-account-setup/google-contacts-source.c:51
-#: ../plugins/google-account-setup/google-source.c:81
-msgid "Google"
-msgstr "Google"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr ""
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "Valitse kuva kokoa 48 * 48"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "Tiedostoa ei voi lukea"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid ""
+"The file you selected does not look like a valid .png image. Error: {0}"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-contacts-source.c:273
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
 msgid "<b>Server</b>"
 msgstr "<b>Palvelin</b>"
 
-#: ../plugins/google-account-setup/google-source.c:517
+#: ../plugins/google-account-setup/google-source.c:439
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "SyÃ¶tÃ¤ salasana kÃ¤yttÃ¤jÃ¤lle %s tilattujen kalentereiden kÃ¤yttÃ¶Ã¤ varten."
+msgstr ""
+"SyÃ¶tÃ¤ salasana kÃ¤yttÃ¤jÃ¤lle %s tilattujen kalentereiden kÃ¤yttÃ¶Ã¤ varten."
 
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17454,11 +17073,17 @@ msgstr ""
 "Ei voi lukea tietoja Googlen palvelimelta.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:758
+#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/mail-to-task/mail-to-task.c:727
+#: ../plugins/mail-to-task/mail-to-task.c:943
+msgid "Unknown error."
+msgstr "Tuntematon virhe."
+
+#: ../plugins/google-account-setup/google-source.c:631
 msgid "Cal_endar:"
 msgstr "_Kalenteri:"
 
-#: ../plugins/google-account-setup/google-source.c:793
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Retrieve _list"
 msgstr "Nouda _luettelo"
 
@@ -17470,24 +17095,44 @@ msgstr "LisÃ¤Ã¤ google-kalentereita Evolutioniin."
 msgid "Google Calendars"
 msgstr "Google-kalenterit"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
 msgid "Checklist"
 msgstr "Muistilista"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr ""
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "Uusi _jaettu kansio..."
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "Groupwise-tilin mÃ¤Ã¤rittely"
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "VÃ¤limuistin kirjautuminen..."
+
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "Roskapostin asetukset..."
 
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "Seuraa viestin tilaa..."
+
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "Peru viesti"
+
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "HyvÃ¤ksy alustavasti"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "LÃ¤hetÃ¤ kokous uudestaan..."
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: ../plugins/groupwise-features/install-shared.c:218
+#: ../plugins/groupwise-features/install-shared.c:227
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17510,74 +17155,69 @@ msgstr ""
 "\n"
 "\n"
 "Asenna jaettu kansio napsauttamalla \"Toteuta\"\n"
+"\n"
 
-#: ../plugins/groupwise-features/install-shared.c:230
+#: ../plugins/groupwise-features/install-shared.c:239
 msgid "Install the shared folder"
 msgstr "Asenna jaettu kansio"
 
-#: ../plugins/groupwise-features/install-shared.c:234
+#: ../plugins/groupwise-features/install-shared.c:243
 msgid "Shared Folder Installation"
 msgstr "Jaetun kansion asennus"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "Roskapostin asetukset"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Roskapostin asetukset"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "Roskapostin asetukset..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>Roskapostilista:</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "SÃ¤hkÃ¶posti:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+msgid "Junk List:"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "Ã?lÃ¤ _kÃ¤ytÃ¤"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_KÃ¤ytÃ¤"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "_Roskapostilista"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../plugins/groupwise-features/mail-retract.c:52
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "Viestin peruminen"
 
-#: ../plugins/groupwise-features/mail-retract.c:57
-#, fuzzy
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
 msgstr ""
-"Viestin peruminen voi poistaa sen vastaanottajan postilaatikosta. Haluatko "
-"varmasti yrittÃ¤Ã¤ perua viestin?"
 
-#: ../plugins/groupwise-features/mail-retract.c:76
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "Viestin peruminen onnistui"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retract Mail"
-msgstr "Peru viesti"
+#: ../plugins/groupwise-features/mail-send-options.c:202
+msgid "Insert Send options"
+msgstr "LisÃ¤Ã¤ lÃ¤hetysvaihtoehtoja"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
@@ -17600,7 +17240,8 @@ msgid "The server did not allow the selected message to be retracted."
 msgstr "Palvelin ei sallinut valitun viestin perumista."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgid ""
+"Account &quot;{0}&quot; already exists. Please check your folder tree."
 msgstr "Tili &quot;{1}&quot; on jo olemassa. Tarkista kansiopuusi."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
@@ -17672,13 +17313,15 @@ msgstr "TÃ¤mÃ¤ on toistuva tapaaminen"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
 msgid "This will create a new meeting using the existing meeting details."
-msgstr ""
+msgstr "TÃ¤mÃ¤ luo uuden kokouksen kÃ¤yttÃ¤en olemassaolevan kokouksen tietoja."
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
 msgid ""
 "This will create a new meeting with the existing meeting details. The "
 "recurrence rule needs to be re-entered."
 msgstr ""
+"TÃ¤mÃ¤ luo uuden kokouksen olemassaolevan kokouksen tiedoilla. Kokouksen "
+"toistuvuus-sÃ¤Ã¤nnÃ¶t tÃ¤ytyy syÃ¶ttÃ¤Ã¤ uudestaan."
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
@@ -17690,256 +17333,220 @@ msgstr "Haluatko hyvÃ¤ksyÃ¤ tÃ¤mÃ¤n?"
 msgid "Would you like to decline it?"
 msgstr "Haluatko estÃ¤Ã¤ tÃ¤mÃ¤n?"
 
-#: ../plugins/groupwise-features/process-meeting.c:53
-msgid "Accept Tentatively"
-msgstr "HyvÃ¤ksy alustavasti"
-
-#: ../plugins/groupwise-features/process-meeting.c:319
-msgid "Rese_nd Meeting..."
-msgstr "LÃ¤hetÃ¤ kokous uudestaan..."
-
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>KÃ¤yttÃ¤jÃ¤t:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_Muokkaa huomautusviestiÃ¤"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "_Yhteystiedot..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:514
-msgid "Message"
-msgstr "Viesti"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "Jaetun kansion huomautus"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Osallistujat saavat seuraavan huomautuksen.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Ei jaettu"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "_Jaettu henkilÃ¶ille ..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "_Jako"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>Nimi</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "PÃ¤Ã¤syoikeudet"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "LisÃ¤Ã¤/Muokkaa"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
-msgid "Appointments"
-msgstr "Tapaamiset"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "Yh_teystiedot"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "Muokkaa _kansioita/asetuksia/sÃ¤Ã¤ntÃ¶jÃ¤"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "Luetut viestit merkitty _yksityisiksi"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "Muistilaput"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "Tilaa hÃ¤_lytykseni"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "Tilaa h_uomautukseni"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "_Kirjoita"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "_Luku"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "VÃ¤limuisti"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Tilin nimi</b>"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "VÃ¤limuistiin kirjautuminen"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:488
-#: ../plugins/groupwise-features/send-options.c:86
+#: ../plugins/groupwise-features/proxy-login.c:210
+#: ../plugins/groupwise-features/proxy-login.c:253
+#: ../plugins/groupwise-features/proxy.c:495
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSyÃ¶tÃ¤ salasana palvelulle %s (kÃ¤yttÃ¤jÃ¤ %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:513
-msgid "_Proxy Login..."
-msgstr "VÃ¤limuistin kirjautuminen..."
-
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "VÃ¤limuistin vÃ¤lilehti on kÃ¤ytettÃ¤vissÃ¤ vain, jos tilin verkkoyhteydet ovat "
 "auki."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "VÃ¤limuisti on kÃ¤ytettÃ¤vissÃ¤ vain jos tili on kÃ¤ytÃ¶ssÃ¤."
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "LisÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "LÃ¤hetyksen lisÃ¤asetukset"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "KÃ¤yttÃ¤jÃ¤t"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "SyÃ¶tÃ¤ kÃ¤yttÃ¤jÃ¤t ja aseta oikeudet"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "Uusi _jaettu kansio..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:448
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "Oma huomautus"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
-msgstr "LisÃ¤Ã¤ "
+msgstr "LisÃ¤Ã¤   "
 
-#: ../plugins/groupwise-features/share-folder.c:759
-msgid "Modify"
-msgstr "Muokkaa"
-
-#: ../plugins/groupwise-features/status-track.c:94
+#: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "Viestin tila"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:108
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: ../plugins/groupwise-features/status-track.c:122
+#: ../plugins/groupwise-features/status-track.c:154
 msgid "From:"
 msgstr "LÃ¤hettÃ¤jÃ¤:"
 
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:169
 msgid "Creation date:"
 msgstr "LuontipÃ¤ivÃ¤:"
 
-#: ../plugins/groupwise-features/status-track.c:176
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Recipient: "
 msgstr "Vastaanottaja: "
 
-#: ../plugins/groupwise-features/status-track.c:183
+#: ../plugins/groupwise-features/status-track.c:216
 msgid "Delivered: "
 msgstr "Toimitettu: "
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Opened: "
 msgstr "Avattu: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Accepted: "
 msgstr "HyvÃ¤ksytty: "
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Deleted: "
 msgstr "Poistettu: "
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Declined: "
 msgstr "HylÃ¤tty: "
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Completed: "
 msgstr "Valmistunut: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:247
 msgid "Undelivered: "
 msgstr "Ei lÃ¤hetetty: "
 
-#: ../plugins/groupwise-features/status-track.c:238
-msgid "Track Message Status..."
-msgstr "Seuraa viestin tilaa..."
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
-msgstr ""
+msgstr "LisÃ¤Ã¤ Hula-tuki Evolutioniin."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Support"
+msgstr "Hula-tuki"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:331
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Omat otsakkeet"
 
-#: ../plugins/imap-features/imap-headers.c:344
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP-otsakkeet"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>Omat otsakkeet</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP-otsakkeet</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Tavalliset ja _postituslistojen otsakkeet (oletus)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -17949,7 +17556,7 @@ msgstr ""
 "lisÃ¤ksi.\n"
 "Voit ohittaa tÃ¤mÃ¤n, jos valitset \"Kaikki otsakkeet\"."
 
-#: ../plugins/imap-features/imap-headers.glade.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -17957,7 +17564,7 @@ msgstr ""
 "Valitse IMAP-otsakkeiden asetukset.\n"
 "MitÃ¤ enemmÃ¤n otsakkeita noudat, sitÃ¤ kauemmin niiden nouto kestÃ¤Ã¤."
 
-#: ../plugins/imap-features/imap-headers.glade.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -17965,187 +17572,154 @@ msgstr ""
 "_Perusotsakkeet (nopein)\n"
 "KÃ¤ytÃ¤ tÃ¤tÃ¤, jos sinulla ei ole otsakkeisiin perustuvia postituslistasuotimia"
 
-#: ../plugins/imap-features/imap-headers.glade.h:10
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
 msgstr "Nouda _kaikki otsakkeet"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "Fine-tune your IMAP accounts."
-msgstr ""
+msgstr "HienosÃ¤Ã¤dÃ¤ IMAP-tilien asetuksia."
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP-ominaisuudet"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "Laitteistorajapinta HAL ei ole ladattu"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"Palvelu \"hald\" vaaditaan, mutta se ei ole pÃ¤Ã¤llÃ¤. Ota palvelu kÃ¤yttÃ¶Ã¶n ja "
-"aja ohjelma uudestaan, tai ota yhteyttÃ¤ yllÃ¤pitÃ¤jÃ¤Ã¤si."
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
-msgid "Search for an iPod failed"
-msgstr "iPodia ei lÃ¶ytynyt"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Evolution ei lÃ¶ytÃ¤nyt iPodia, jonka kanssa synkronoidaan. Joko se ei ole "
-"liitetty tietokoneseen tai se ei ole pÃ¤Ã¤llÃ¤."
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:163
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar muoto (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize to iPod"
-msgstr "_Synkronoi iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize your data with your Apple iPod."
-msgstr "_Synkronoi tietosi Apple iPodiin."
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod-synkronointi"
-
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Kalenterin \"%s\" lataus epÃ¤onnistui"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Kalenterin \"%s\" sisÃ¤ltÃ¤mÃ¤ tapaaminen on ristiriidassa tÃ¤mÃ¤n kokouksen "
 "kanssa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:688
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tapaaminen lÃ¶ytyi kalenterista \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:762
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find any calendars"
 msgstr "YhtÃ¤kÃ¤Ã¤n kalenteria ei lÃ¶ydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:769
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this meeting in any calendar"
 msgstr "TÃ¤tÃ¤ kokousta ei lÃ¶ydy mistÃ¤Ã¤n kalenterista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:773
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this task in any task list"
 msgstr "TÃ¤tÃ¤ tehtÃ¤vÃ¤Ã¤ ei lÃ¶ydy mistÃ¤Ã¤n tehtÃ¤vÃ¤listasta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find this memo in any memo list"
 msgstr "TÃ¤tÃ¤ muistilappua ei lÃ¶ydy mistÃ¤Ã¤n muistilappuluettelosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:848
+#: ../plugins/itip-formatter/itip-formatter.c:873
 msgid "Opening the calendar. Please wait.."
 msgstr "Avataan kalenteria, odota hetki..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:851
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Searching for an existing version of this appointment"
 msgstr "EtsitÃ¤Ã¤n olemassaolevia versioita tapaamisesta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1033
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kohtaa ei voi lÃ¤hettÃ¤Ã¤ kalenteriin \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "LÃ¤hetetty kalenteriin \"%s\" hyvÃ¤ksyttynÃ¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1136
+#: ../plugins/itip-formatter/itip-formatter.c:1160
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "LÃ¤hetetty kalenteriin \"%s\" alustavana"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1141
+#: ../plugins/itip-formatter/itip-formatter.c:1165
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "LÃ¤hetetty kalenteriin \"%s\" hylÃ¤ttynÃ¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1146
+#: ../plugins/itip-formatter/itip-formatter.c:1170
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "LÃ¤hetetty kalenteriin \"%s\" peruttuna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "JÃ¤rjestÃ¤jÃ¤ on poistanut valtuutuksen %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 msgid "Sent a cancelation notice to the delegate"
 msgstr "LÃ¤hetettiin perumisilmoitus valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lÃ¤hettÃ¤Ã¤ valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1357
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "LÃ¤snÃ¤olon tilaa ei voi pÃ¤ivittÃ¤Ã¤ virheellisen tilan takia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1386
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "LÃ¤snÃ¤olijaa ei voi pÃ¤ivittÃ¤Ã¤. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1390
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "Attendee status updated"
 msgstr "LÃ¤snÃ¤olon tila pÃ¤ivitetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1443
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lÃ¤hetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Task information sent"
 msgstr "TehtÃ¤vÃ¤n tiedot lÃ¤hetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lÃ¤hetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1431
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lÃ¤hettÃ¤Ã¤, koska kokousta ei lÃ¶ydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1434
+#: ../plugins/itip-formatter/itip-formatter.c:1461
 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1464
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Muistilapun tietoja ei voitu lÃ¤hettÃ¤Ã¤, koska muistilappua ei lÃ¶ydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1505
-#: ../plugins/itip-formatter/itip-formatter.c:1516
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1529
+msgid "calendar.ics"
+msgstr "kalenteri.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1534
+msgid "Save Calendar"
+msgstr "Tallenna kalenteri"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1506
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18153,15 +17727,15 @@ msgstr ""
 "Viesti vÃ¤ittÃ¤Ã¤ sisÃ¤ltÃ¤vÃ¤nsÃ¤ kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
-#: ../plugins/itip-formatter/itip-formatter.c:1585
-#: ../plugins/itip-formatter/itip-formatter.c:1677
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisÃ¤ltÃ¶ ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1558
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1678
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18169,11 +17743,11 @@ msgstr ""
 "Viesti sisÃ¤ltÃ¤Ã¤ kalenterin, mutta kalenterissa ei ole tapahtumia, tehtÃ¤viÃ¤ "
 "tai vapaa/varattu-tietoja."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "LiitetyssÃ¤ kalenterissa on useita kohtia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18181,216 +17755,216 @@ msgstr ""
 "Jos haluat kÃ¤sitellÃ¤ kaikki nÃ¤mÃ¤ kohdat, tiedosto tÃ¤ytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2447
 msgid "This meeting recurs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2347
+#: ../plugins/itip-formatter/itip-formatter.c:2450
 msgid "This task recurs"
 msgstr "TehtÃ¤vÃ¤ on toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2350
+#: ../plugins/itip-formatter/itip-formatter.c:2453
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2583
+#: ../plugins/itip-formatter/itip-formatter.c:2683
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2593
-#: ../plugins/itip-formatter/itip-formatter.c:2626
+#: ../plugins/itip-formatter/itip-formatter.c:2693
+#: ../plugins/itip-formatter/itip-formatter.c:2726
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2708
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitÃ¤Ã¤n pÃ¤Ã¤llekkÃ¤isiÃ¤ kokouksia"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M"
 msgstr "TÃ¤nÃ¤Ã¤n %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %H:%M:%S"
 msgstr "TÃ¤nÃ¤Ã¤n %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:213
 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.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:241
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:260
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:269
 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.
-#: ../plugins/itip-formatter/itip-view.c:270
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e"
 msgstr "+%Ana %d. %Bn %Y"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M"
 msgstr "+%Ana %d. %Bn klo %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %H:%M:%S"
 msgstr "+%Ana %d. %Bn klo %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M %p"
 msgstr "+%Ana %d. %Bn klo %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "+%Ana %d. %Bn klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y"
 msgstr "%Ana %d. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Ana %d. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Ana %d. %Bta %Y klo %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Ana %d. %Bta %Y klo %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:330
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %d. %Bta %Y klo %l.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Vastaa henkilÃ¶n <b>%s</b> puolesta"
 
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Vastaanotettu henkilÃ¶n <b>%s</b> puolesta"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot:"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegoi seuraavan kokouksen sinulle:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:372
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> pyytÃ¤Ã¤ lÃ¤snÃ¤oloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> pyytÃ¤Ã¤ lÃ¤snÃ¤oloasi seuraavassa kokouksessa:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> toivoo lisÃ¤ystÃ¤nsÃ¤ olemassaolevaan kokoukseen %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> toivoo lisÃ¤ystÃ¤Ã¤n olemassaolevaan kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18398,88 +17972,89 @@ msgid ""
 msgstr ""
 "<b>%s</b> %s kautta pyytÃ¤Ã¤ viimeisimpiÃ¤ tietoja seuraavasta kokouksesta:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> toivoo saavansa viimeisimmÃ¤t tiedot seuraavasta kokouksesta:"
+msgstr ""
+"<b>%s</b> toivoo saavansa viimeisimmÃ¤t tiedot seuraavasta kokouksesta:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> %s kautta lÃ¤hetti takaisin seuraavan kokousvastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> lÃ¤hetti takaisin seuraavan kokousvastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> perui seuraavan kokouksen %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> on perunut seuraavan tapaamisen."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> kieltÃ¤ytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> kieltÃ¤ytyi seuraavista kokousmuutoksista."
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> julkaisi %s:n kautta seuraavat tehtÃ¤vÃ¤t:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> julkaisi seuraavat tehtÃ¤vÃ¤t:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> pyytÃ¤Ã¤ %s:n suorittamaan seuraavat tehtÃ¤vÃ¤t:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:460
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> antoi sinulle tehtÃ¤vÃ¤n %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> antoi sinulle tehtÃ¤vÃ¤n:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> toivoo lisÃ¤ystÃ¤Ã¤n olemassaolevaan tehtÃ¤vÃ¤Ã¤n %s:n kautta"
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> toivoo lisÃ¤ystÃ¤Ã¤n olemassaolevaan tehtÃ¤vÃ¤Ã¤n:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18488,7 +18063,7 @@ msgstr ""
 "<b>%s</b> %s kautta toivoo saavansa viimeisimmÃ¤t tiedot seuraavista "
 "tyÃ¶tehtÃ¤vistÃ¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18496,175 +18071,194 @@ msgid ""
 msgstr ""
 "<b>%s</b> toivoo saavansa viimeisimmÃ¤t tiedot seuraavista tyÃ¶tehtÃ¤vistÃ¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> lÃ¤hetti takaisin %s kautta seuraavan annetun tehtÃ¤vÃ¤n vastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> lÃ¤hetti takaisin seuraavan annetun tehtÃ¤vÃ¤n vastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> on perunut seuraavan annetun tehtÃ¤vÃ¤n %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> on perunut seuraavan annetun tehtÃ¤vÃ¤n:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> %s kautta ehdottaa seuraavia muutoksia annettuun tehtÃ¤vÃ¤Ã¤n:"
+msgstr ""
+"<b>%s</b> %s kautta ehdottaa seuraavia muutoksia annettuun tehtÃ¤vÃ¤Ã¤n:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ehdottaa seuraavia muutoksia annettuun tehtÃ¤vÃ¤Ã¤n:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> kieltÃ¤ytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> on kieltÃ¤ytynyt seuraavasta annetusta tehtÃ¤vÃ¤stÃ¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> julkaisi seuraavan muistilapun:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> haluaa lisÃ¤tÃ¤ olemassaolevaan muistilappuun %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> haluaa lisÃ¤tÃ¤ olemassaolevaan muistilappuun:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> perui seuraavan jaetun muistilapun %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> on perunut seuraavan jaetun muistilapun:"
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:686
+msgid "Start day:"
+msgstr "AloituspÃ¤ivÃ¤:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1045
+msgid "Start time:"
+msgstr "Alkamisaika:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "End day:"
+msgstr "PÃ¤Ã¤ttymispÃ¤ivÃ¤:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1056
+msgid "End time:"
+msgstr "Loppumisaika:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:869
 msgid "_Decline"
 msgstr "_HylkÃ¤Ã¤"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Accept"
 msgstr "H_yvÃ¤ksy"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "_HylkÃ¤Ã¤ kaikki"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "_HyvÃ¤ksy kaikki"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "_LÃ¤hetÃ¤ tiedot"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "_PÃ¤ivitÃ¤ lÃ¤snÃ¤olijan tila"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "_PÃ¤ivitÃ¤"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Start time:"
-msgstr "Alkamisaika:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "End time:"
-msgstr "Loppumisaika:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1076
+#: ../plugins/itip-formatter/itip-view.c:1130
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _reply to sender"
 msgstr "_Vastaa lÃ¤hettÃ¤jÃ¤lle"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1145
 msgid "Send _updates to attendees"
 msgstr "LÃ¤hetÃ¤ _pÃ¤ivitykset osallistujille"
 
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "Show time as _free"
 msgstr "NÃ¤ytÃ¤ aika _vapaana"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1166
 msgid "_Preserve my reminder"
-msgstr "_SÃ¤ilytÃ¤ oma muistitus"
+msgstr "_SÃ¤ilytÃ¤ oma muistutus"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "_Inherit reminder"
-msgstr "_Peri muistututs"
+msgstr "_Peri muistutus"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1915
+msgid "_Tasks:"
+msgstr "_TehtÃ¤vÃ¤t:"
+
+#: ../plugins/itip-formatter/itip-view.c:1917
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
@@ -18732,7 +18326,8 @@ msgstr "Soita Ã¤Ã¤nitiedosto uuden sÃ¤hkÃ¶postin saapuessa."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "Soita teeman Ã¤Ã¤nitiedosto viestin saapuessa, jos ei olla piippaustilassa."
+msgstr ""
+"Soita teeman Ã¤Ã¤nitiedosto viestin saapuessa, jos ei olla piippaustilassa."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
@@ -18747,7 +18342,8 @@ msgid "Sound file name to be played."
 msgstr "Soitettavan Ã¤Ã¤nitiedoston nimi."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgid ""
+"Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Soitettava Ã¤Ã¤nitiedosto, kun uusia viestejÃ¤ saapuu (jos ei piippaustilassa)."
 
@@ -18757,7 +18353,8 @@ msgstr "KÃ¤ytÃ¤ Ã¤Ã¤niteemaa"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
-msgstr "Soitetaanko Ã¤Ã¤nitiedosto vai piipataanko uuden sÃ¤hkÃ¶postin saapuessa."
+msgstr ""
+"Soitetaanko Ã¤Ã¤nitiedosto vai piipataanko uuden sÃ¤hkÃ¶postin saapuessa."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
@@ -18771,16 +18368,16 @@ msgstr "Vilkkuuko uudesta sÃ¤hkÃ¶postista ilmoittava kuvake."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Huomautetaanko uusista viesteistÃ¤ vain saapuvien kansiossa."
 
-#: ../plugins/mail-notification/mail-notification.c:292
+#: ../plugins/mail-notification/mail-notification.c:355
 msgid "Evolution's Mail Notification"
 msgstr "Evolutionin viestihuomautus"
 
-#: ../plugins/mail-notification/mail-notification.c:313
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Mail Notification Properties"
 msgstr "SÃ¤hkÃ¶postihuomautuksen ominaisuudet"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:422
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:506
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18795,55 +18392,67 @@ msgstr[1] ""
 "%d uutta viestiÃ¤\n"
 "kansiossa %s."
 
-#: ../plugins/mail-notification/mail-notification.c:427
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:517
+#, c-format
+msgid "From: %s"
+msgstr ""
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:529
+#, c-format
+msgid "Subject: %s"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:538
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "%d uusi viesti vastaanotettu."
 msgstr[1] "%d uutta viestiÃ¤ vastaanotettu."
 
-#: ../plugins/mail-notification/mail-notification.c:444
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:558
+#: ../plugins/mail-notification/mail-notification.c:563
 msgid "New email"
 msgstr "Uusi sÃ¤hkÃ¶posti"
 
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:617
 msgid "Show icon in _notification area"
 msgstr "NÃ¤ytÃ¤ kuvake _ilmoitusalueella"
 
-#: ../plugins/mail-notification/mail-notification.c:534
+#: ../plugins/mail-notification/mail-notification.c:645
 msgid "B_link icon in notification area"
 msgstr "_Vilkuta kuvaketta ilmoitusalueella"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:655
 msgid "Popup _message together with the icon"
 msgstr "NÃ¤ytÃ¤ viesti _ponnahdusikkunassa kuvakkeen lisÃ¤ksi"
 
-#: ../plugins/mail-notification/mail-notification.c:723
+#: ../plugins/mail-notification/mail-notification.c:840
 msgid "_Play sound when new messages arrive"
 msgstr "_Soita Ã¤Ã¤niÃ¤ uuden sÃ¤hkÃ¶postin saapuessa"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:869
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../plugins/mail-notification/mail-notification.c:765
+#: ../plugins/mail-notification/mail-notification.c:882
 msgid "Use sound _theme"
 msgstr "KÃ¤ytÃ¤ Ã¤Ã¤ni_teemaa"
 
-#: ../plugins/mail-notification/mail-notification.c:784
+#: ../plugins/mail-notification/mail-notification.c:901
 msgid "Play _file:"
 msgstr "So_ita tiedosto:"
 
-#: ../plugins/mail-notification/mail-notification.c:795
+#: ../plugins/mail-notification/mail-notification.c:912
 msgid "Select sound file"
 msgstr "Valitse Ã¤Ã¤nitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:853
+#: ../plugins/mail-notification/mail-notification.c:970
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistÃ¤ _vain saapuvien kansiossa"
 
-#: ../plugins/mail-notification/mail-notification.c:862
+#: ../plugins/mail-notification/mail-notification.c:979
 msgid "Generate a _D-Bus message"
 msgstr "Luo D-Bus-viesti"
 
@@ -18855,46 +18464,64 @@ msgstr "Huomautus uusista viesteistÃ¤"
 msgid "Notifies you when new mail messages arrive."
 msgstr "Huomauttaa uusien viestien saapumisesta."
 
-#: ../plugins/mail-to-task/mail-to-task.c:394
+#. 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:166
+#, c-format
+msgid "Created from a mail by %s"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:498
 #, c-format
 msgid ""
 "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:397
+#: ../plugins/mail-to-task/mail-to-task.c:501
 #, c-format
 msgid ""
 "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:400
+#: ../plugins/mail-to-task/mail-to-task.c:504
 #, c-format
 msgid ""
 "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:417
+#: ../plugins/mail-to-task/mail-to-task.c:521
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
 msgstr ""
+"Valittu kalenteri sisÃ¤ltÃ¤Ã¤ jo joitain tapahtumia annetuista sÃ¤hkÃ¶posteista. "
+"Haluatko silti luoda uusia tapahtumia?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:420
+#: ../plugins/mail-to-task/mail-to-task.c:524
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
 msgstr ""
+"Valittu tehtÃ¤vÃ¤lista sisÃ¤ltÃ¤Ã¤ jo joitain tehtÃ¤viÃ¤ annetuista sÃ¤hkÃ¶posteista. "
+"Haluatko silti luoda uusia tehtÃ¤viÃ¤?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:423
+#: ../plugins/mail-to-task/mail-to-task.c:527
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
 msgstr ""
+"Valittu muistilappulista sisÃ¤ltÃ¤Ã¤ jo joitain muistilappuja annetuista "
+"sÃ¤hkÃ¶posteista. Haluatko silti luoda uusia muistilappuja?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:441
+#: ../plugins/mail-to-task/mail-to-task.c:545
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18902,9 +18529,13 @@ msgid_plural ""
 "Selected calendar contains events for the given mails already. Would you "
 "like to create new events anyway?"
 msgstr[0] ""
+"Valittu kalenteri sisÃ¤ltÃ¤Ã¤ jo tapahtuman tÃ¤lle sÃ¤hkÃ¶postille. Haluatko silti "
+"luoda uuden tapahtuman?"
 msgstr[1] ""
+"Valittu kalenteri sisÃ¤ltÃ¤Ã¤ jo tapahtumia tÃ¤lle sÃ¤hkÃ¶postille. Haluatko silti "
+"luoda uudet tapahtumat?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:447
+#: ../plugins/mail-to-task/mail-to-task.c:551
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18912,9 +18543,13 @@ msgid_plural ""
 "Selected task list contains tasks for the given mails already. Would you "
 "like to create new tasks anyway?"
 msgstr[0] ""
+"Valittu tehtÃ¤vÃ¤lista sisÃ¤ltÃ¤Ã¤ jo tehtÃ¤vÃ¤n tÃ¤lle sÃ¤hkÃ¶postille. Haluatko "
+"silti luoda uuden tehtÃ¤vÃ¤n?"
 msgstr[1] ""
+"Valittu tehtÃ¤vÃ¤luettelo sisÃ¤ltÃ¤Ã¤ jo tehtÃ¤viÃ¤ tÃ¤lle sÃ¤hkÃ¶postille. Haluatko "
+"silti luoda uudet tehtÃ¤vÃ¤t?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:453
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18922,27 +18557,31 @@ msgid_plural ""
 "Selected memo list contains memos for the given mails already. Would you "
 "like to create new memos anyway?"
 msgstr[0] ""
+"Valittu muistilappuluettelo sisÃ¤ltÃ¤Ã¤ jo muistilapun tÃ¤lle sÃ¤hkÃ¶postille. "
+"Haluatko silti luoda uuden muistilapun?"
 msgstr[1] ""
+"Valittu muistilappuluettelo sisÃ¤ltÃ¤Ã¤ jo muistilappuja nÃ¤ille sÃ¤hkÃ¶posteille. "
+"Haluatko silti luoda uudet muistilaput?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:512
+#: ../plugins/mail-to-task/mail-to-task.c:616
 msgid "[No Summary]"
 msgstr "[Ei yhteenvetoa]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:523
+#: ../plugins/mail-to-task/mail-to-task.c:627
 msgid "Invalid object returned from a server"
-msgstr ""
+msgstr "Palvelin palautti virheellisen olion"
 
-#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/mail-to-task/mail-to-task.c:698
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Tapahtui virhe kÃ¤siteltÃ¤essÃ¤: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:727
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:630
+#: ../plugins/mail-to-task/mail-to-task.c:734
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18950,7 +18589,7 @@ msgstr ""
 "Valittu lÃ¤hde on vain luettavissa, joten et voi luoda siihen tapahtumia. "
 "Valitse joku toinen lÃ¤hde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:633
+#: ../plugins/mail-to-task/mail-to-task.c:737
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18958,7 +18597,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:636
+#: ../plugins/mail-to-task/mail-to-task.c:740
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18966,40 +18605,40 @@ 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:838
+#: ../plugins/mail-to-task/mail-to-task.c:943
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "LÃ¤hdeluetteloa ei voi avata: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:957
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create an _Event"
 msgstr "Luo t_apahtuma"
 
-#: ../plugins/mail-to-task/mail-to-task.c:959
+#: ../plugins/mail-to-task/mail-to-task.c:1064
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistÃ¤"
 
-#: ../plugins/mail-to-task/mail-to-task.c:964
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:966
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistÃ¤"
 
-#: ../plugins/mail-to-task/mail-to-task.c:971
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a _Task"
 msgstr "Luo _tehtÃ¤vÃ¤"
 
-#: ../plugins/mail-to-task/mail-to-task.c:973
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a new task from the selected message"
 msgstr "Luo uusi tehtÃ¤vÃ¤ valitusta viestistÃ¤"
 
-#: ../plugins/mail-to-task/mail-to-task.c:981
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../plugins/mail-to-task/mail-to-task.c:983
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistÃ¤"
 
@@ -19007,55 +18646,55 @@ msgstr "Luo uusi kokous valitusta viestistÃ¤"
 msgid "Convert a mail message to a task."
 msgstr "Muunna valittu viesti tehtÃ¤vÃ¤ksi."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:276
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
 msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:278
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
 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:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
 msgid "Get List _Usage Information"
 msgstr "NÃ¤ytÃ¤ tietoja listan _kÃ¤ytÃ¶stÃ¤"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
 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:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
 msgid "Contact List _Owner"
 msgstr "Ota yhteyttÃ¤ listan _omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
 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:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
 msgid "_Post Message to List"
 msgstr "_LÃ¤hetÃ¤ viesti listalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
 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:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
 msgid "_Subscribe to List"
 msgstr "_Tilaa lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
 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:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
 msgid "_Unsubscribe from List"
 msgstr "Per_u listan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
 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:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
 msgid "Mailing _List"
 msgstr "Postitus_lista"
 
@@ -19146,27 +18785,27 @@ msgstr "_Muokkaa viestiÃ¤"
 msgid "_Send message"
 msgstr "_LÃ¤hetÃ¤ viesti"
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "Merkitse viestit myÃ¶s alikansioissa?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:45
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 msgstr ""
 "Haluatko merkitÃ¤ viestit luetuksi vain nykyisessÃ¤ kansiossa vai myÃ¶s "
-"kaikissai sen alikansioissa?"
+"kaikissa sen alikansioissa?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:172
+#: ../plugins/mark-all-read/mark-all-read.c:174
 msgid "In Current Folder and _Subfolders"
 msgstr "NykyisessÃ¤ kansiossa ja alikan_sioissa"
 
-#: ../plugins/mark-all-read/mark-all-read.c:186
+#: ../plugins/mark-all-read/mark-all-read.c:188
 msgid "In Current _Folder Only"
 msgstr "Vain nykyisessÃ¤ _kansiossa"
 
-#: ../plugins/mark-all-read/mark-all-read.c:297
+#: ../plugins/mark-all-read/mark-all-read.c:415
 msgid "Mark Me_ssages as Read"
 msgstr "Merkitse vie_stit luetuiksi"
 
@@ -19191,10 +18830,6 @@ msgstr "LisÃ¤osien hallinta"
 msgid "Author(s)"
 msgstr "Kirjoittaja(t)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "Asetukset"
-
 #: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
@@ -19228,21 +18863,41 @@ msgstr "Suosi raakatekstiÃ¤"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr ""
+msgstr "NÃ¤ytÃ¤ viestit raakatekstinÃ¤, vaikka ne sisÃ¤ltÃ¤isivÃ¤t HTML-sisÃ¤ltÃ¶Ã¤."
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "NÃ¤ytÃ¤ HTML:Ã¤Ã¤, jos se on saatavilla"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "NÃ¤ytÃ¤ mieluummin raakatekstiÃ¤"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
-msgstr "NÃ¤ytÃ¤ ainoastaan raakatekstiÃ¤"
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid "Show plain text if present"
+msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid "Only ever show plain text"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "HTML-_tila"
 
@@ -19252,7 +18907,7 @@ msgstr "Evolutionin profiloija"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Profile data events in Evolution (for developers only)."
-msgstr ""
+msgstr "Profiloi Evolutionin data-tapahtumia (vain kehittÃ¤jille)."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19266,35 +18921,37 @@ msgstr "Outlookin PST-tuoja"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlookin omat kansiot (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:298
+#: ../plugins/pst-import/pst-importer.c:299
 msgid "_Mail"
 msgstr "_SÃ¤hkÃ¶posti"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "_Osoitekirja"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:323
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "_Tapaamiset"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_TehtÃ¤vÃ¤t"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:335
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "_PÃ¤ivÃ¤kirjamerkinnÃ¤t"
 
-#: ../plugins/pst-import/pst-importer.c:350
+#: ../plugins/pst-import/pst-importer.c:351
 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:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "Kalenterien julkaisu"
 
@@ -19306,197 +18963,196 @@ msgstr "Sijainnit"
 msgid "Publish calendars to the web."
 msgstr "Julkaise kalenterit verkossa."
 
-#: ../plugins/publish-calendar/publish-calendar.c:94
-#: ../plugins/publish-calendar/publish-calendar.c:336
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ei voitu avata %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:96
+#: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Ei voitu avata kohdetta %s: tuntematon virhe"
 
-#: ../plugins/publish-calendar/publish-calendar.c:116
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Virhe julkaistaessa kohteeseen %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:118
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Julkaisu kohteeseen %s onnistui"
 
-#: ../plugins/publish-calendar/publish-calendar.c:163
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Kohteen %s liittÃ¤minen epÃ¤onnistui."
 
-#: ../plugins/publish-calendar/publish-calendar.c:623
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "KÃ¤_ytÃ¤"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "Haluatko varmasti poistaa tÃ¤mÃ¤n sijainnin?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:937
+#. 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:1051
 msgid "Could not create publish thread."
 msgstr "JulkaisusÃ¤iettÃ¤ ei voitu luoda."
 
-#: ../plugins/publish-calendar/publish-calendar.c:944
+#: ../plugins/publish-calendar/publish-calendar.c:1059
 msgid "_Publish Calendar Information"
 msgstr "Julkaise kalenteritietoja"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">Sijainti</span>"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">LÃ¤hteet</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
 msgstr ""
-"PÃ¤ivittÃ¤in\n"
-"Viikoittain\n"
-"KÃ¤sin (toimintovalikosta)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "KÃ¤_ytÃ¤"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (sisÃ¤Ã¤nkirjautumisen vaativa)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "P_ortti:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "Julkinen FTP"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "Julkaisupaikka"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "Julkaisutiheys:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"Suojattu FTP (SSH)\n"
-"Julkinen FTP\n"
-"FTP (vaatii kirjautumisen)\n"
-"Windows-jako\n"
-"WebDAV (HTTP)\n"
-"Suojattu WebDAV (HTTPS)\n"
-"Oma sijainti"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "Palvelun _tyyppi:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
-msgstr "_Kesto: "
+msgstr "_Kesto:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "Windows-jako"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "_Tiedosto:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "_Julkaise muodossa:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"pÃ¤ivÃ¤Ã¤\n"
-"\viikkoa\n"
-"kuukautta"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:32
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"Vapaa/Varattu"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
+"Kalenteria ei voitu julkaista: kalenterin taustaohjelmaa ei enÃ¤Ã¤ ole olemassa"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
 msgstr "Uusi sijainti"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:480
 msgid "Edit Location"
 msgstr "Muokkaa sijaintia"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:127
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Spamassassinia ei lÃ¶ytynyt, paluukoodi: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:135
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:143
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Putken luonti epÃ¤onnistui: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:182
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Virhe forkkauksen jÃ¤lkeen: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:237
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassinin lapsiprosessi ei vastaa, tapetaan..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:239
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Spamassassinin lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:248
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "Putki spamassassinille epÃ¤onnnistui, virhekoodi: %d"
+msgstr "Putki spamassassinille epÃ¤onnistui, virhekoodi: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:511
 #, c-format
-msgid "SpamAssassin is not available."
-msgstr "Spamassassin ei ole saatavilla."
+msgid "SpamAssassin is not available. Please install it first."
+msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "TÃ¤mÃ¤ tekee Spamassassinista luotettavamman, mutta hitaamman"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:938
 msgid "I_nclude remote tests"
 msgstr "LisÃ¤Ã¤ myÃ¶s etÃ¤testit"
 
@@ -19512,82 +19168,86 @@ msgstr "Spamassassin-roskapostisuodatin"
 msgid "SpamAssassin Options"
 msgstr "Spamassassin-valitsimet"
 
-#.
+#. 
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:159
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:355
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "Kuvauslista"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "Luokkalista"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "Kommenttilista"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "Yhteystietolista"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "Alkaa"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "PÃ¤Ã¤ttyy"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "prosenttia valmiina"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "Osanottajalista"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "Muokattu"
 
-#: ../plugins/save-calendar/csv-format.c:522
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV-muodon _lisÃ¤asetukset"
 
-#: ../plugins/save-calendar/csv-format.c:529
+#: ../plugins/save-calendar/csv-format.c:537
 msgid "Prepend a _header"
 msgstr "LisÃ¤Ã¤ otsake _ennen"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:546
 msgid "_Value delimiter:"
 msgstr "_Arvojen erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "_Record delimiter:"
 msgstr "_Kenttien erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "_Encapsulate values with:"
 msgstr "_Kapsuloi arvot kÃ¤yttÃ¤en:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Pilkulla erotettu muoto (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar muoto (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Tallenna valittu"
@@ -19596,16 +19256,16 @@ msgstr "Tallenna valittu"
 msgid "Save a calendar or task list to disk."
 msgstr "Tallenna kalenteri tai tehtÃ¤vÃ¤lista levylle."
 
-#.
+#. 
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * 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:149
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:371
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF-muoto (.rdf)"
 
@@ -19617,15 +19277,15 @@ msgstr "_Muoto:"
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
-#: ../plugins/save-calendar/save-calendar.c:323
+#: ../plugins/save-calendar/save-calendar.c:325
 msgid "Save the selected calendar to disk"
 msgstr "Tallenna valittu kalenteri levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:358
+#: ../plugins/save-calendar/save-calendar.c:356
 msgid "Save the selected memo list to disk"
 msgstr "Tallenna valittu muistilappu levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:393
+#: ../plugins/save-calendar/save-calendar.c:387
 msgid "Save the selected task list to disk"
 msgstr "Tallenna valittu tehtÃ¤vÃ¤lista levylle."
 
@@ -19637,49 +19297,47 @@ msgstr "Ohjaa tilin asetusten mÃ¤Ã¤rittelyssÃ¤ ensikÃ¤ynnistyksellÃ¤."
 msgid "Setup Assistant"
 msgstr "Asetusapulainen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:119
 msgid "Evolution Setup Assistant"
 msgstr "Evolutionin asetusapulainen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:92
+#: ../plugins/startup-wizard/startup-wizard.c:124
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../plugins/startup-wizard/startup-wizard.c:97
+#: ../plugins/startup-wizard/startup-wizard.c:127
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Tervetuloa Evolutioniin. Seuraaviksi kysyttÃ¤vien tietojen avulla Evolution "
-"voi ottaa yhteyttÃ¤ sÃ¤hkÃ¶postitileihisi ja tuoda tietoja muista ohjelmista.\n"
+"Tervetuloa Evolutioniin. Seuraavaksi kysyttÃ¤vien tietojen avulla Evolution "
+"ottaa yhteyttÃ¤ sÃ¤hkÃ¶postitileihisi ja tuo tarvittavia tietoja muista "
+"sovelluksista.\n"
 "\n"
-"Jatka napista \"Seuraava\". "
+"Jatka painamalla \"EteenpÃ¤in\"-painiketta. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../shell/e-shell-importer.c:129
+#: ../plugins/startup-wizard/startup-wizard.c:162
+#: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../shell/e-shell-importer.c:396
+#: ../plugins/startup-wizard/startup-wizard.c:177
+#: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:167
+#: ../plugins/startup-wizard/startup-wizard.c:194
 msgid "Importing files"
 msgstr "Tiedostojen tuonti"
 
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:519
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:257
 msgid "Importing data."
 msgstr "Tuodaan tietoja."
 
-#: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:538
+#: ../plugins/startup-wizard/startup-wizard.c:259
 msgid "Please wait"
 msgstr "Odota, ole hyvÃ¤"
 
@@ -19712,21 +19370,21 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Pohjiin perustuva mallilisÃ¤osa"
 
-#: ../plugins/templates/templates.c:634
+#: ../plugins/templates/templates.c:617
 msgid "No Title"
 msgstr "Ei otsikkoa"
 
-#: ../plugins/templates/templates.c:705
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../plugins/templates/templates.c:707
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr ""
+msgstr "Pura Microsoft Outlookin lÃ¤hettÃ¤mÃ¤t TNEF-liitteet (winmail.dat)."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Decoder"
@@ -19776,11 +19434,11 @@ msgstr "WebDAV-yhteystiedot"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_VÃ¤ltÃ¤ IfMatch-komentoa (vaaditaan apache-versiolle < 2.2.8)"
 
@@ -19821,130 +19479,142 @@ msgid "Default window width"
 msgstr "Ikkunan oletusleveys"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "MÃ¤Ã¤rittÃ¤Ã¤ vÃ¤lipalvelinasetukset avattaessa HTTP- tai HTTPS-yhteyksiÃ¤ "
 "verkkoon."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "HTTP-vÃ¤lipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "HTTP-vÃ¤lipalvelimen salasana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "HTTP-vÃ¤lipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "HTTP-vÃ¤lipalvelimen kÃ¤yttÃ¤jÃ¤tunnus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 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."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+"username is retrieved from the "
+"\"/apps/evolution/shell/network_config/authentication_user\" GConf key, and "
+"the password is retrieved from either gnome-keyring or the "
+"~/.gnome2_private/Evolution password file."
 msgstr ""
 "Jos tosi, vaativat yhteyden vÃ¤lipalvelimelle tunnistautumisen. "
-"KÃ¤yttÃ¤jÃ¤tunnus otetaan avaimesta \"/apps/evolution/shell/network_config/"
-"authentication_user\" ja salasana luetaan joko gnome-keyring -avainrenkaasta "
-"tai tiedostosta ~/.gnome2_private/Evolution."
+"KÃ¤yttÃ¤jÃ¤tunnus otetaan avaimesta "
+"\"/apps/evolution/shell/network_config/authentication_user\" ja salasana "
+"luetaan joko gnome-keyring -avainrenkaasta tai tiedostosta "
+"~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
 msgstr "LiitenÃ¤kymÃ¤n oletusarvo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Initial file chooser folder"
 msgstr "Tiedostovalitsimen oletuskansio"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
-msgstr ""
+msgstr "GtkFileChooser-ikkunoiden oletuskansio."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 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Ã¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "Viimeksi pÃ¤ivitetty konfiguraation versio"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 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"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "VÃ¤lipalvelimen ohittavat palvelimet"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-vÃ¤lipalvelimelle yhteyttÃ¤ otettaessa kÃ¤ytettÃ¤vÃ¤ salasana."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "VÃ¤lipalvelimen asetustila"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "SOCKS-vÃ¤lipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "SOCKS-vÃ¤lipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "Salatun HTTP-vÃ¤lipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "Salatun HTTP-vÃ¤lipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
+"configuration\" and \"use proxy configuration provided in the autoconfig "
+"url\" respectively."
 msgstr ""
 "Valitse vÃ¤lipalvelimen asetustila. Tuetut arvot ovat 0, 1, 2, ja 3, jotka "
 "tarkoittavat arvoja \"kÃ¤ytÃ¤ jÃ¤rjestelmÃ¤n asetuksia\", \"ei vÃ¤lipalvelinta\", "
 "\"aseta vÃ¤lipalvelin kÃ¤sin\" ja \"kÃ¤ytÃ¤ automaattimÃ¤Ã¤rittelyn URL:issa "
 "annettua mÃ¤Ã¤rittelyÃ¤\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "Sivupaneeli on nÃ¤kyvissÃ¤"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "Ohita kehitysversiovaroitus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:327
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:349
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "Tilarivi on nÃ¤kyvissÃ¤"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19952,71 +19622,74 @@ msgstr ""
 "Evolutionin konfiguraatioversio, major/minor/configuration tasoilla "
 "(esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
 msgstr "PÃ¤Ã¤ikkunan X-koordinaatin oletusarvo."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default Y coordinate for the main window."
 msgstr "PÃ¤Ã¤ikkunan Y-koordinaatin oletusarvo."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "PÃ¤Ã¤ikkunan oletuskorkeus pikseleinÃ¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "PÃ¤Ã¤ikkunan oletusleveys pikseleinÃ¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "Sivupaneelin oletusleveys pikseleinÃ¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
+"The last upgraded configuration version of Evolution, with "
+"major/minor/configuration level (for example \"2.6.0\")."
 msgstr ""
-"Viimeisin pÃ¤ivitetty Evolutionin konfiguraatioversio, major/minor/"
-"configuration tasoilla (esimerkiksi \"2.6.0\")."
+"Viimeisin pÃ¤ivitetty Evolutionin konfiguraatioversio, "
+"major/minor/configuration tasoilla (esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr "Verkkonimi, jota kÃ¤ytetÃ¤Ã¤n HTTP-vÃ¤lipalvelimena."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Verkkonimi, jota kÃ¤ytetÃ¤Ã¤n HTTPS-vÃ¤lipalvelimena."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
 msgstr "Verkkonimi, jota kÃ¤ytetÃ¤Ã¤n SOCKS-vÃ¤lipalvelimena."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
+"The port on the machine defined by "
+"\"/apps/evolution/shell/network_config/http_host\" that you proxy through."
 msgstr ""
-"Portti, jonka kautta kÃ¤ytetÃ¤Ã¤n avaimessa \"/apps/evolution/shell/"
-"network_config/http_host\" mÃ¤Ã¤riteltyÃ¤ vÃ¤lipalvelinta."
+"Portti, jonka kautta kÃ¤ytetÃ¤Ã¤n avaimessa "
+"\"/apps/evolution/shell/network_config/http_host\" mÃ¤Ã¤riteltyÃ¤ "
+"vÃ¤lipalvelinta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
+"The port on the machine defined by "
+"\"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
 msgstr ""
-"Portti, jonka kautta kÃ¤ytetÃ¤Ã¤n avaimessa \"/apps/evolution/shell/"
-"network_config/secure_host\" mÃ¤Ã¤riteltyÃ¤ vÃ¤lipalvelinta."
+"Portti, jonka kautta kÃ¤ytetÃ¤Ã¤n avaimessa "
+"\"/apps/evolution/shell/network_config/secure_host\" mÃ¤Ã¤riteltyÃ¤ "
+"vÃ¤lipalvelinta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
+"The port on the machine defined by "
+"\"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
 msgstr ""
-"Portti, jonka kautta kÃ¤ytetÃ¤Ã¤n avaimessa \"/apps/evolution/shell/"
-"network_config/socks_host\" mÃ¤Ã¤riteltyÃ¤ vÃ¤lipalvelinta."
+"Portti, jonka kautta kÃ¤ytetÃ¤Ã¤n avaimessa "
+"\"/apps/evolution/shell/network_config/socks_host\" mÃ¤Ã¤riteltyÃ¤ "
+"vÃ¤lipalvelinta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20026,7 +19699,7 @@ msgstr ""
 "\"toolbar\". Jos \"toolbar\" on valittu, kÃ¤ytetÃ¤Ã¤n tyÃ¶kalupalkissa Gnomen "
 "asetusta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20036,269 +19709,204 @@ msgstr ""
 "TÃ¤mÃ¤ avain sisÃ¤ltÃ¤Ã¤ luettelon palvelimista, johon otetaan yhteys suoraan "
 "ilman vÃ¤lipalvelinta (jos mÃ¤Ã¤ritelty). Arvot voivat olla verkkonimi, "
 "aluenimiÃ¤ muodossa *.foo.com, IP-osoitteita (sekÃ¤ IPv4 ettÃ¤ IPv6) tai "
-"verkkopeitteitÃ¤ (jotain tyyliin 192.168.0.0.24)."
+"verkkopeitteitÃ¤ (jotain tyyliin 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "TyÃ¶kalupalkki on nÃ¤kyvissÃ¤"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "URL that provides proxy configuration values."
 msgstr "VÃ¤lipalvelimen asetustietoja tarjoava URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr "KÃ¤ytÃ¤ HTTP-vÃ¤lipalvelinta"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-vÃ¤lipalvelimelle tunnistautumiseen kÃ¤ytetty kÃ¤yttÃ¤jÃ¤tunnus."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Whether Evolution will start up in offline mode instead of online mode."
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid ""
+"Whether Evolution will start up in offline mode instead of online mode."
 msgstr "KÃ¤ynnistetÃ¤Ã¤nkÃ¶ Evolution verkkoyhteyksillÃ¤ vai ilman."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
 msgstr "Onko ikkuna suurennettu."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ sivupaneeli."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ tilarivi."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ tyÃ¶kalupalkki."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Piilotetaanko varoitusikkuna Evolutionin kehitysversion kÃ¤ytÃ¶stÃ¤ vai ei."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ ikkunan napit."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "Ikkunan painikkeiden tyyli"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit nÃ¤ytetÃ¤Ã¤n"
 
+#: ../shell/e-shell-content.c:499 ../shell/e-shell-content.c:500
+msgid "Searches"
+msgstr "Haut"
+
+#: ../shell/e-shell-content.c:541
+msgid "Save Search"
+msgstr "Tallenna haku"
+
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
 #. Translators: The "Show:" label precedes a combo box that
 #. * 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-content.c:867
+#: ../shell/e-shell-searchbar.c:920
 msgid "Sho_w:"
 msgstr "NÃ¤_ytÃ¤:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:892
+#: ../shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr "_Etsi:"
 
-#. Scope Combo Widgets
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:934
+#: ../shell/e-shell-searchbar.c:1012
 msgid "i_n"
-msgstr " lÃ¤_hteestÃ¤ "
-
-#: ../shell/e-shell-content.c:1357
-msgid "Advanced Search"
-msgstr "Oma haku"
-
-#: ../shell/e-shell-content.c:1414 ../shell/e-shell-content.c:1415
-msgid "Searches"
-msgstr "Haut"
-
-#: ../shell/e-shell-content.c:1460
-msgid "Save Search"
-msgstr "Tallenna haku"
-
-#: ../shell/e-shell-importer.c:119
-msgid "Choose the type of importer to run:"
-msgstr "Valitse suoritettavan tuojan tyyppi:"
-
-#: ../shell/e-shell-importer.c:122
-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."
-
-#: ../shell/e-shell-importer.c:126
-msgid "Choose the destination for this import"
-msgstr "Valitse tÃ¤mÃ¤n tuonnin kohde"
-
-#: ../shell/e-shell-importer.c:132
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-"Evolution tarkisti tuotavat asetukset seuraavista ohjelmista:\n"
-"Pine, Netscape, Elm, iCalendar. MitÃ¤Ã¤n asetuksia, jotka voitaisiin\n"
-"tuoda Evolutioniin, ei lÃ¶ytynyt. Jos haluat yrittÃ¤Ã¤ uudestaan, valitse\n"
-"\"Takaisin\".\n"
-
-#: ../shell/e-shell-importer.c:263
-msgid "F_ilename:"
-msgstr "_Tiedostonimi:"
-
-#: ../shell/e-shell-importer.c:268
-msgid "Select a file"
-msgstr "Valitse tiedosto"
-
-#: ../shell/e-shell-importer.c:277
-msgid "File _type:"
-msgstr "Tiedoston _tyyppi:"
-
-#: ../shell/e-shell-importer.c:329
-msgid "Import data and settings from _older programs"
-msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
-
-#: ../shell/e-shell-importer.c:332
-msgid "Import a _single file"
-msgstr "Tuo _yksi tiedosto"
-
-#: ../shell/e-shell-importer.c:692 ../shell/e-shell-importer.c:706
-msgid "Evolution Import Assistant"
-msgstr "Evolutionin tuoden asetukset"
-
-#: ../shell/e-shell-importer.c:701
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
-msgstr ""
-"Tervetuloa Evolutionin tuontiapulaiseen.\n"
-"TÃ¤llÃ¤ apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
-"Evolutionin kÃ¤yttÃ¶Ã¶n."
-
-#: ../shell/e-shell-importer.c:720
-msgid "Importer Type"
-msgstr "Tuojan tyyppi"
-
-#: ../shell/e-shell-importer.c:733
-msgid "Select Information to Import"
-msgstr "Valitse tuotavat tiedot"
-
-#: ../shell/e-shell-importer.c:745
-msgid "Select a File"
-msgstr "Valitse tiedosto"
-
-#: ../shell/e-shell-importer.c:754
-msgid "Import Location"
-msgstr "Tuo sijainti"
-
-#: ../shell/e-shell-importer.c:760
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
-
-#: ../shell/e-shell-importer.c:764
-msgid "Import File"
-msgstr "Tuo tiedosto"
+msgstr "lÃ¤_hteestÃ¤"
 
-#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: ../shell/e-shell-switcher.c:446
+#: ../shell/e-shell-switcher.c:463
 msgid "Toolbar Style"
 msgstr "_TyÃ¶kalupalkin tyyli"
 
-#: ../shell/e-shell-switcher.c:447
+#: ../shell/e-shell-switcher.c:464
 msgid "The switcher's toolbar style"
 msgstr "Vaihtimen tyÃ¶kalupalkin tyyli"
 
-#: ../shell/e-shell-switcher.c:463
+#: ../shell/e-shell-switcher.c:480 ../shell/e-shell-window.c:820
 msgid "Toolbar Visible"
 msgstr "TyÃ¶kalupalkki nÃ¤kyvissÃ¤"
 
-#: ../shell/e-shell-switcher.c:464
+#: ../shell/e-shell-switcher.c:481
 msgid "Whether the switcher is visible"
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ valitsin"
 
-#: ../shell/e-shell-view.c:485
+#: ../shell/e-shell-utils.c:253
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
+
+#: ../shell/e-shell-utils.c:255
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
+
+#: ../shell/e-shell-utils.c:276
+msgid "All Files (*)"
+msgstr "Kaikki tiedostot (*)"
+
+#: ../shell/e-shell-view.c:807
 msgid "Switcher Action"
 msgstr "Vaihtimen toiminto"
 
-#: ../shell/e-shell-view.c:486
+#: ../shell/e-shell-view.c:808
 msgid "The switcher action for this shell view"
 msgstr "TÃ¤mÃ¤n kuorinÃ¤kymÃ¤n vaihtimen toiminto"
 
-#: ../shell/e-shell-view.c:501
+#: ../shell/e-shell-view.c:823
 msgid "Page Number"
 msgstr "Sivunumero"
 
-#: ../shell/e-shell-view.c:502
+#: ../shell/e-shell-view.c:824
 msgid "The notebook page number of the shell view"
 msgstr "TÃ¤mÃ¤n kuorinÃ¤kymÃ¤ vÃ¤lilehden sivunumero"
 
-#: ../shell/e-shell-view.c:520
-msgid "The title of the shell view"
-msgstr "KuorinÃ¤kymÃ¤n otsikko"
+#: ../shell/e-shell-view.c:840
+msgid "Search Rule"
+msgstr ""
+
+#: ../shell/e-shell-view.c:841
+msgid "Criteria for the current search results"
+msgstr ""
 
-#: ../shell/e-shell-view.c:535
+#: ../shell/e-shell-view.c:856
 msgid "The EShellBackend for this shell view"
 msgstr "TÃ¤mÃ¤n kuorinÃ¤kymÃ¤n EShellBackend"
 
-#: ../shell/e-shell-view.c:550
+#: ../shell/e-shell-view.c:871
 msgid "Shell Content Widget"
 msgstr "Kuoren sisÃ¤ltÃ¶elementti"
 
-#: ../shell/e-shell-view.c:551
+#: ../shell/e-shell-view.c:872
 msgid "The content widget appears in a shell window's right pane"
 msgstr "SisÃ¤ltÃ¶elementti nÃ¤ytetÃ¤Ã¤n kuori-ikkunan oikeana paneelina"
 
-#: ../shell/e-shell-view.c:567
+#: ../shell/e-shell-view.c:888
 msgid "Shell Sidebar Widget"
 msgstr "Kuoren sivupalkkielementti"
 
-#: ../shell/e-shell-view.c:568
+#: ../shell/e-shell-view.c:889
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr "Sivupalkkielementti nÃ¤ytetÃ¤Ã¤n kuori-ikkunan vasempana paneelina"
 
-#: ../shell/e-shell-view.c:583
+#: ../shell/e-shell-view.c:904
 msgid "Shell Taskbar Widget"
 msgstr "Kuoren tehtÃ¤vÃ¤listaelementti"
 
-#: ../shell/e-shell-view.c:584
+#: ../shell/e-shell-view.c:905
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr "TehtÃ¤vÃ¤listaelementti nÃ¤ytetÃ¤Ã¤n kuori-ikkunan alaosassa"
 
-#: ../shell/e-shell-view.c:599
+#: ../shell/e-shell-view.c:920
 msgid "Shell Window"
 msgstr "Kuoren ikkuna"
 
-#: ../shell/e-shell-view.c:600
+#: ../shell/e-shell-view.c:921
 msgid "The window to which the shell view belongs"
 msgstr "Ikkuna, johon kuorinÃ¤kymÃ¤ kuuluu"
 
-#: ../shell/e-shell-view.c:615
+#: ../shell/e-shell-view.c:937
+msgid "The key file holding widget state data"
+msgstr ""
+
+#: ../shell/e-shell-view.c:952
+msgid "The title of the shell view"
+msgstr "KuorinÃ¤kymÃ¤n otsikko"
+
+#: ../shell/e-shell-view.c:966
 msgid "Current View ID"
 msgstr "Nykyisen nÃ¤kymÃ¤n tunniste"
 
-#: ../shell/e-shell-view.c:616
+#: ../shell/e-shell-view.c:967
 msgid "The current GAL view ID"
 msgstr "Nykyisen GAL-nÃ¤kymÃ¤n tunniste"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:644
+#: ../shell/e-shell-window-actions.c:647
 msgid "translator-credits"
 msgstr ""
 "Ilkka Tuohela, 2002-2009\n"
@@ -20306,362 +19914,435 @@ msgstr ""
 "Sami Pesonen, 2001-2003\n"
 "Jarkko Ranta, 2000-2001\n"
 "\n"
-"http://gnome.fi/";
-
-#: ../shell/e-shell-window-actions.c:655
+"http://gnome.fi/\n";
+"\n"
+"Launchpad Contributions:\n"
+"  Antti Kajander https://launchpad.net/~antti-kajander\n";
+"  Christian Hellberg https://launchpad.net/~christian-hellberg\n";
+"  Elias Julkunen https://launchpad.net/~eliasj\n";
+"  Glome https://launchpad.net/~markus-ilmola\n";
+"  Heikki Kulhia https://launchpad.net/~hessuk\n";
+"  Heikki MÃ¤ntysaari https://launchpad.net/~heikki-mantysaari\n";
+"  Ilari Oras https://launchpad.net/~ilarioras\n";
+"  Ilkka Tuohela https://launchpad.net/~hile\n";
+"  Jiri GrÃ¶nroos https://launchpad.net/~jiri-gronroos\n";
+"  Jussi Aalto https://launchpad.net/~jtaalto\n";
+"  Marko Kervinen https://launchpad.net/~jadawin\n";
+"  T Kortehisto https://launchpad.net/~temakort\n";
+"  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
+"  papukaija https://launchpad.net/~papukaija";
+
+#: ../shell/e-shell-window-actions.c:658
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1233
 msgid "Bug Buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../shell/e-shell-window-actions.c:1254
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../shell/e-shell-window-actions.c:1356
+#: ../shell/e-shell-window-actions.c:1352
 msgid "GNOME Pilot is not installed."
 msgstr "Gnome-pilotia ei ole asennettu."
 
-#: ../shell/e-shell-window-actions.c:1358
+#: ../shell/e-shell-window-actions.c:1354
 msgid "GNOME Pilot could not be run."
 msgstr "Gnome-pilotia ei voitu suorittaa."
 
-#: ../shell/e-shell-window-actions.c:1452
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Show information about Evolution"
 msgstr "NÃ¤ytÃ¤ tietoja Evolutionista"
 
-#: ../shell/e-shell-window-actions.c:1457
+#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1467
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1464
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Contents"
 msgstr "_SisÃ¤ltÃ¶"
 
-#: ../shell/e-shell-window-actions.c:1466
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin kÃ¤yttÃ¤jÃ¤opas"
 
-#: ../shell/e-shell-window-actions.c:1471
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Avaa usein kysyttyjen kysymysten www-sivu"
 
-#: ../shell/e-shell-window-actions.c:1478
+#: ../shell/e-shell-window-actions.c:1509
 msgid "_Forget Passwords"
 msgstr "_Unohda salasanat"
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Forget all remembered passwords"
 msgstr "Unohda kaikki tallennetut salasanat"
 
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1516
 msgid "I_mport..."
 msgstr "_Tuo..."
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1523
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tÃ¤lle nÃ¤kymÃ¤lle"
 
-#: ../shell/e-shell-window-actions.c:1501
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
-#: ../shell/e-shell-window-actions.c:1506
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Show Evolution's shortcut keys"
 msgstr "NÃ¤ytÃ¤ Evolutionin pikanÃ¤ppÃ¤imet"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Advanced Search..."
 msgstr "_Oma haku..."
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Construct a more advanced search"
 msgstr "Luo monimutkaisempi haku"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Clear the current search parameters"
 msgstr "TyhjennÃ¤ nykyiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1572
 msgid "_Edit Saved Searches..."
 msgstr "_Muokkaa tallennettuja hakuja..."
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1574
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiÃ¤ napsauttamalla tÃ¤stÃ¤"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1550
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Execute the current search parameters"
 msgstr "Suorita tÃ¤mÃ¤nhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1555
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Save Search..."
 msgstr "_Tallenna haku..."
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Save the current search parameters"
 msgstr "Tallenna tÃ¤mÃ¤nhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Send / _Receive"
 msgstr "LÃ¤hetÃ¤ ja _vastaanota"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1609
 msgid "Send queued items and retrieve new items"
 msgstr "LÃ¤hetÃ¤ jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../shell/e-shell-window-actions.c:1569
+#: ../shell/e-shell-window-actions.c:1614
 msgid "Submit _Bug Report..."
 msgstr "LÃ¤hetÃ¤ _vikailmoitus..."
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1616
 msgid "Submit a bug report using Bug Buddy"
 msgstr "LÃ¤hetÃ¤ vikailmoitus kÃ¤yttÃ¤en Bug BuddyÃ¤"
 
-#: ../shell/e-shell-window-actions.c:1576
-msgid "_Synchronization Options..."
-msgstr "_Synkronointiasetukset..."
+#: ../shell/e-shell-window-actions.c:1621
+msgid "GNOME Pilot _Synchronization..."
+msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1578
-msgid "Set up Pilot configuration"
-msgstr "Muokkaa Pilotin asetuksia"
+#: ../shell/e-shell-window-actions.c:1623
+msgid "Set up GNOME Pilot configuration"
+msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1583
+#: ../shell/e-shell-window-actions.c:1628
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1630
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1637
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1620
+#: ../shell/e-shell-window-actions.c:1665
 msgid "Lay_out"
 msgstr "_Asettelu"
 
-#: ../shell/e-shell-window-actions.c:1627
+#: ../shell/e-shell-window-actions.c:1672
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../shell/e-shell-window-actions.c:1634
+#: ../shell/e-shell-window-actions.c:1679
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../shell/e-shell-window-actions.c:1641
+#: ../shell/e-shell-window-actions.c:1686
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../shell/e-shell-window-actions.c:1655
+#: ../shell/e-shell-window-actions.c:1700
 msgid "_Window"
-msgstr "_Ikkuna "
+msgstr "_Ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1729
 msgid "Show Side _Bar"
 msgstr "NÃ¤ytÃ¤ sivu_palkki"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1731
 msgid "Show the side bar"
 msgstr "NÃ¤ytÃ¤ sivupalkki"
 
-#: ../shell/e-shell-window-actions.c:1673
-msgid "Show _Status Bar"
-msgstr "NÃ¤ytÃ¤ _tilarivi"
-
-#: ../shell/e-shell-window-actions.c:1675
-msgid "Show the status bar"
-msgstr "NÃ¤ytÃ¤ tilarivi"
-
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Show _Buttons"
 msgstr "NÃ¤ytÃ¤ _painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1683
+#: ../shell/e-shell-window-actions.c:1739
 msgid "Show the switcher buttons"
 msgstr "NÃ¤ytÃ¤ vaihtimen painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1745
+msgid "Show _Status Bar"
+msgstr "NÃ¤ytÃ¤ _tilarivi"
+
+#: ../shell/e-shell-window-actions.c:1747
+msgid "Show the status bar"
+msgstr "NÃ¤ytÃ¤ tilarivi"
+
+#: ../shell/e-shell-window-actions.c:1753
 msgid "Show _Tool Bar"
 msgstr "NÃ¤ytÃ¤ tyÃ¶_kalupalkki"
 
-#: ../shell/e-shell-window-actions.c:1691
-msgid "Show the toolbar"
-msgstr "NÃ¤ytÃ¤ tyÃ¶kalupalkki"
+#: ../shell/e-shell-window-actions.c:1755
+msgid "Show the tool bar"
+msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1777
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Display window buttons with icons only"
 msgstr "NÃ¤ytÃ¤ ikkunan napit ainoastaan kuvakkeina"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1784
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1786
 msgid "Display window buttons with text only"
 msgstr "NÃ¤ytÃ¤ ikkunan napit ainoastaan tekstinÃ¤"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1793
 msgid "Display window buttons with icons and text"
 msgstr "NÃ¤ytÃ¤ ikkunan napit kuvakkeina ja tekstinÃ¤"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Tool_bar Style"
 msgstr "_TyÃ¶kalupalkin tyyli"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1800
 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:1744
+#: ../shell/e-shell-window-actions.c:1808
 msgid "Define Views..."
 msgstr "MÃ¤Ã¤rittele nÃ¤kymÃ¤t..."
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Create or edit views"
 msgstr "Luo tai muokkaa nÃ¤kymiÃ¤"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Save Custom View..."
 msgstr "Tallenna oma nÃ¤kymÃ¤..."
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu nÃ¤kymÃ¤"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1824
 msgid "C_urrent View"
 msgstr "N_ykyinen nÃ¤kymÃ¤"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1834
 msgid "Custom View"
 msgstr "Oma nÃ¤kymÃ¤"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1836
 msgid "Current view is a customized view"
 msgstr "Nykyinen nÃ¤kymÃ¤ tai muokattu nÃ¤kymÃ¤"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1846
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../shell/e-shell-window-actions.c:2054
+#: ../shell/e-shell-window-actions.c:2228
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../shell/e-shell-window-actions.c:2257
+#: ../shell/e-shell-window-actions.c:2441
 msgid "Execute these search parameters"
 msgstr "Suorita nÃ¤mÃ¤ hakuehdot"
 
-#: ../shell/e-shell-window-private.c:252
-msgid "New"
-msgstr "Uusi"
-
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:569
+#: ../shell/e-shell-window-private.c:575
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - evolution"
 
-#: ../shell/e-shell-window.c:292
+#: ../shell/e-shell-window.c:414
+msgid "New"
+msgstr "Uusi"
+
+#: ../shell/e-shell-window.c:696
 msgid "Active Shell View"
 msgstr "Aktiivinen tulkkinÃ¤kymÃ¤"
 
-#: ../shell/e-shell-window.c:293
+#: ../shell/e-shell-window.c:697
 msgid "Name of the active shell view"
 msgstr "Aktiivisen tulkkinÃ¤kymÃ¤n nimi"
 
-#: ../shell/e-shell-window.c:307
+#: ../shell/e-shell-window.c:712
+msgid "The shell window's EFocusTracker"
+msgstr ""
+
+#: ../shell/e-shell-window.c:726 ../shell/e-shell.c:883
+msgid "Geometry"
+msgstr ""
+
+#: ../shell/e-shell-window.c:727 ../shell/e-shell.c:884
+msgid "Initial window geometry string"
+msgstr ""
+
+#: ../shell/e-shell-window.c:742
 msgid "Safe Mode"
 msgstr "Turvallinen tila"
 
-#: ../shell/e-shell-window.c:308
+#: ../shell/e-shell-window.c:743
 msgid "Whether the shell window is in safe mode"
 msgstr "Onko tulkki-ikkuna turvallisessa tilassa"
 
-#: ../shell/e-shell-window.c:339
+#: ../shell/e-shell-window.c:774
+msgid "Sidebar Visible"
+msgstr ""
+
+#: ../shell/e-shell-window.c:775
+msgid "Whether the shell window's side bar is visible"
+msgstr ""
+
+#: ../shell/e-shell-window.c:789
+msgid "Switcher Visible"
+msgstr ""
+
+#: ../shell/e-shell-window.c:790
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr ""
+
+#: ../shell/e-shell-window.c:805
+msgid "Taskbar Visible"
+msgstr ""
+
+#: ../shell/e-shell-window.c:806
+msgid "Whether the shell window's task bar is visible"
+msgstr ""
+
+#: ../shell/e-shell-window.c:821
+msgid "Whether the shell window's tool bar is visible"
+msgstr ""
+
+#: ../shell/e-shell-window.c:835
 msgid "UI Manager"
 msgstr "UI-hallinta"
 
-#: ../shell/e-shell-window.c:340
+#: ../shell/e-shell-window.c:836
 msgid "The shell window's GtkUIManager"
 msgstr "Tulkki-ikkunan GtkUIManager"
 
-#: ../shell/e-shell.c:207
+#: ../shell/e-shell.c:224
 msgid "Preparing to go offline..."
 msgstr "Valmistellaan verkotonta tilaa..."
 
-#: ../shell/e-shell.c:261
+#: ../shell/e-shell.c:274
 msgid "Preparing to go online..."
 msgstr "Valmistellaan verkkoyhteydellistÃ¤ tilaa..."
 
-#: ../shell/e-shell.c:324
+#: ../shell/e-shell.c:342
 msgid "Preparing to quit..."
 msgstr "Valmistellaan sulkemista..."
 
-#: ../shell/e-shell.c:688
+#: ../shell/e-shell.c:899
+msgid "Module Directory"
+msgstr ""
+
+#: ../shell/e-shell.c:900
+msgid "The directory from which to load EModules"
+msgstr ""
+
+#: ../shell/e-shell.c:915
 msgid "Network Available"
 msgstr "Verkko kÃ¤ytettÃ¤vissÃ¤"
 
-#: ../shell/e-shell.c:689
+#: ../shell/e-shell.c:916
 msgid "Whether the network is available"
 msgstr "Onko verkko kÃ¤ytettÃ¤vissÃ¤"
 
-#: ../shell/e-shell.c:704 ../widgets/misc/e-online-button.c:130
+#: ../shell/e-shell.c:931 ../widgets/misc/e-online-button.c:134
 msgid "Online"
 msgstr "Verkossa"
 
-#: ../shell/e-shell.c:705
+#: ../shell/e-shell.c:932
 msgid "Whether the shell is online"
 msgstr "Onko tulkki verkossa"
 
+#: ../shell/e-shell.c:947
+msgid "Shell Settings"
+msgstr "Kuoren asetukset"
+
+#: ../shell/e-shell.c:948
+msgid "Application-wide settings"
+msgstr "Ohjelmanlaajuiset asetukset"
+
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:176
+#: ../shell/main.c:179
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20697,7 +20378,7 @@ msgstr ""
 "Toivomme ettÃ¤ nautit kovan tyÃ¶mme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyÃ¶hÃ¶n!\n"
 
-#: ../shell/main.c:200
+#: ../shell/main.c:203
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20705,43 +20386,60 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:207
+#: ../shell/main.c:210
 msgid "Do not tell me again"
 msgstr "Ã?lÃ¤ kerro tÃ¤tÃ¤ uudestaan"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:345
 msgid "Start Evolution activating the specified component"
 msgstr "KÃ¤ynnistÃ¤ Evolution aktivoimalla mÃ¤Ã¤ritelty komponentti"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:347
+msgid "Apply the given geometry to the main window"
+msgstr ""
+
+#: ../shell/main.c:351
 msgid "Start in online mode"
 msgstr "KÃ¤ynnistÃ¤ verkkoyhteydet auki"
 
-#: ../shell/main.c:332
-msgid "Forcibly shut down all Evolution components"
-msgstr "Sulje kaikki Evolutionin osat vÃ¤kisin"
+#: ../shell/main.c:353
+msgid "Start in \"express\" mode"
+msgstr ""
+
+#: ../shell/main.c:356
+msgid "Forcibly shut down Evolution"
+msgstr ""
 
-#: ../shell/main.c:336
+#: ../shell/main.c:360
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tuo tiedot vÃ¤kisin uudestaan Evolution 1.4:stÃ¤"
 
-#: ../shell/main.c:339
+#: ../shell/main.c:363
 msgid "Send the debugging output of all components to a file."
 msgstr "LÃ¤hetÃ¤ testitulosteet kaikista komponenteista tiedostoon."
 
-#: ../shell/main.c:341
+#: ../shell/main.c:365
 msgid "Disable loading of any plugins."
 msgstr "Ã?lÃ¤ lataa mitÃ¤Ã¤n lisÃ¤osia."
 
-#: ../shell/main.c:343
+#: ../shell/main.c:367
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "Poista sÃ¤hkÃ¶postien, yhteystietojen ja tehtÃ¤vien esikatselu kÃ¤ytÃ¶stÃ¤."
+msgstr ""
+"Poista sÃ¤hkÃ¶postien, yhteystietojen ja tehtÃ¤vien esikatselu kÃ¤ytÃ¶stÃ¤."
+
+#: ../shell/main.c:371
+msgid "Import URIs or file names given as rest of arguments."
+msgstr ""
+
+#: ../shell/main.c:373
+msgid "Request a running Evolution process to quit"
+msgstr ""
 
-#: ../shell/main.c:494
+#: ../shell/main.c:496
 msgid "- The Evolution PIM and Email Client"
 msgstr ", sÃ¤hkÃ¶posti- ja ajanhallintaohjelma"
 
-#: ../shell/main.c:518
+#: ../shell/main.c:556
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20803,20 +20501,20 @@ msgstr ""
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the "
+"&quot;evolution&quot; directory will be removed permanently. If you choose "
+"to keep this data, then you may manually remove the contents of "
+"&quot;evolution&quot; at your convenience.\n"
 msgstr ""
 "Evolutionin edellinen versio tallensi tiedot eri paikkaan.\n"
 "\n"
-"Jos pÃ¤Ã¤tÃ¤t poistaa nÃ¤mÃ¤ tiedot, poistetaan hakemisto &quot;evolutio&quot; "
+"Jos pÃ¤Ã¤tÃ¤t poistaa nÃ¤mÃ¤ tiedot, poistetaan hakemisto &quot;evolution&quot; "
 "sisÃ¤ltÃ¶ineen pysyvÃ¤sti. Jos pÃ¤Ã¤tÃ¤t pitÃ¤Ã¤ nÃ¤mÃ¤ tiedot, voit itse poistaa "
 "hakemiston &quot;evolution&quot; myÃ¶hemmin.\n"
 
 #: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
-msgstr "PÃ¤ivitys edellisestÃ¤ versiosta epÃ¤onnistui: "
+msgstr "PÃ¤ivitys edellisestÃ¤ versiosta epÃ¤onnistui:"
 
 #: ../shell/shell.error.xml.h:19
 msgid ""
@@ -20852,8 +20550,7 @@ msgid ""
 msgstr ""
 "{0}\n"
 "\n"
-"Jos pÃ¤Ã¤tÃ¤t jatkaa, et ehkÃ¤ pÃ¤Ã¤se kÃ¤siksi joihinkin vanhoista "
-"tiedoistasi.\n"
+"Jos pÃ¤Ã¤tÃ¤t jatkaa, et ehkÃ¤ pÃ¤Ã¤se kÃ¤siksi joihinkin vanhoista tiedoistasi.\n"
 
 #: ../shell/test/e-test-shell-backend.c:60
 msgctxt "New"
@@ -20908,35 +20605,35 @@ msgstr "Asiakirja-URIa ei voi vÃ¤littÃ¤Ã¤ \"Type-Link\"-tyÃ¶pÃ¶ytÃ¤linkille"
 msgid "Not a launchable item"
 msgstr "Kohde ei ole kÃ¤ynnistettÃ¤vÃ¤"
 
-#: ../smclient/eggsmclient.c:225
+#: ../smclient/eggsmclient.c:227
 msgid "Disable connection to session manager"
 msgstr "EstÃ¤ yhteys istunnonhallintaan"
 
-#: ../smclient/eggsmclient.c:228
+#: ../smclient/eggsmclient.c:230
 msgid "Specify file containing saved configuration"
 msgstr "Anna tallennetut asetukset sisÃ¤ltÃ¤vÃ¤ tiedosto"
 
-#: ../smclient/eggsmclient.c:228
+#: ../smclient/eggsmclient.c:230
 msgid "FILE"
 msgstr "TIEDOSTO"
 
-#: ../smclient/eggsmclient.c:231
+#: ../smclient/eggsmclient.c:233
 msgid "Specify session management ID"
 msgstr "Anna istunnonhallinnan tunniste"
 
-#: ../smclient/eggsmclient.c:231
+#: ../smclient/eggsmclient.c:233
 msgid "ID"
 msgstr "TUNNISTE"
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 msgid "Session management options:"
 msgstr "Istunnonhallinnan valitsimet:"
 
-#: ../smclient/eggsmclient.c:253
+#: ../smclient/eggsmclient.c:255
 msgid "Show session management options"
 msgstr "NÃ¤ytÃ¤ istunnonhallinnan valinnat"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20947,7 +20644,7 @@ msgstr ""
 "\n"
 "Muokkaa luotettavuusasetuksia:"
 
-#: ../smime/gui/cert-trust-dialog.c:150
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20956,7 +20653,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:154
+#: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20965,67 +20662,67 @@ 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/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:384
-#: ../smime/gui/certificate-manager.c:612
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
-#: ../smime/gui/certificate-manager.c:152
-#: ../smime/gui/certificate-manager.c:399
-#: ../smime/gui/certificate-manager.c:626
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:489
-#: ../smime/gui/certificate-manager.c:714
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: ../smime/gui/certificate-manager.c:285
-#: ../smime/gui/certificate-manager.c:507
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "KÃ¤yttÃ¶tarkoitus"
 
-#: ../smime/gui/certificate-manager.c:294 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: ../smime/gui/certificate-manager.c:302
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "VanhenemispÃ¤ivÃ¤"
 
-#: ../smime/gui/certificate-manager.c:393
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "Kaikki sÃ¤hkÃ¶postivarmennetiedostot"
 
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "SÃ¤hkÃ¶postiosoite"
 
-#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
-#: ../smime/gui/certificate-manager.c:1052
+#: ../smime/gui/certificate-manager.c:1058
 msgid "Certificates"
 msgstr "Varmenteet"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Varmenteen katselin: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "SyÃ¶tÃ¤ salasana '%s':lle"
+msgid "Enter the password for '%s'"
+msgstr ""
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -21037,7 +20734,7 @@ msgid "Enter new password"
 msgstr "SyÃ¶tÃ¤ uusi salasana"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21046,7 +20743,7 @@ msgstr ""
 "MyÃ¶nnetty:\n"
 "  KÃ¤yttÃ¶Ã¶n: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21055,384 +20752,368 @@ msgstr ""
 "MyÃ¶ntÃ¤jÃ¤:\n"
 " KÃ¤yttÃ¶: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "Valitse varmenne"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Ei varmenteen osa>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>Varmenteen kentÃ¤t</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>Varmenteen hierarkia</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>KentÃ¤n arvo</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>SormenjÃ¤ljet</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>MyÃ¶ntÃ¤jÃ¤</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>Saaja:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>TÃ¤mÃ¤ varmenne on varmennettu seuraaviin kÃ¤yttÃ¶tarkoituksiin:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>Kelvollisuus</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "Varmentajat"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "Varmuuskopioi"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "Varmuuskopioi kaikki"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr ""
-"Ennen kuin luotat tÃ¤hÃ¤n CA:han missÃ¤Ã¤ tarkoituksessa, tulisi sinun tutkia "
+"Ennen kuin luotat tÃ¤hÃ¤n CA:han missÃ¤Ã¤n tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "Varmenne"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "Varmentajan luottamus"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Fields"
+msgstr ""
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate Hierarchy"
+msgstr ""
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "Varmenteen yksityiskohdat"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "Varmennetaulu"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "Julkinen nimi (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "Tuttavien varmenteet"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ã?lÃ¤ luota tÃ¤mÃ¤n varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
-msgstr "Vain tyhmÃ¤ ikkuna"
-
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "Varmenteen luottamuksen asetukset"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "SÃ¤hkÃ¶postin vastaanottajan varmenne"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "SÃ¤hkÃ¶postin allekirjoittajan varmenne"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "Vanhenee"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "Field Value"
+msgstr ""
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Fingerprints"
+msgstr ""
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "Tuo"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued By"
+msgstr ""
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "MyÃ¶nnetty"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Issued To"
+msgstr ""
+
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "MD5 sormenjÃ¤lki"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "Organisaatio (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "OrganisaatioyksikkÃ¶ (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sormenjÃ¤lki"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL-asiakkaan varmenne"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL-palvelimen varmenne"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:35
+msgid "This certificate has been verified for the following uses:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "Luota tÃ¤mÃ¤n varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:37
 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.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "Luota tÃ¤hÃ¤n CA:han ohjelmistokehittÃ¤jien tunnistamisessa."
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "Luota tÃ¤hÃ¤n CA:han www-sivustojen tunnistamisessa."
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:40
+msgid "Validity"
+msgstr ""
+
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "NÃ¤ytÃ¤"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
-msgstr "Seuraavien organsiaatioiden varmenteet varmentavat identiteettisi:"
+msgstr "Seuraavien organisaatioiden varmenteet varmentavat identiteettisi:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr "Seuraavat varmentajat voidaan tunnistaa tallentamistasi varmenteista:"
+msgstr ""
+"Seuraavat varmentajat voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Seuraavat henkilÃ¶t voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "Omat varmenteet"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "_Muokkaa CA:n luottamusta"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:686
 msgid "Certificate already exists"
 msgstr "Varmenne on jo olemassa"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "Allekirjoita"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "Salaa"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "Versio"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "Versio 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "Versio 3"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA-salauksella"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 RSA-salauksella"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA-salauksella"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-salaus"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "Varmenneavaimen kÃ¤yttÃ¶"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "Netscape-varmenteen tyyppi"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "Varmentajan avaintunniste"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Kohteen tunniste (%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "Algoritmin tunniste"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "Algoritmin parametrit"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "Aiheen julkisen avaimen tiedot"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "Aiheen julkisen avaimen algoritmi"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "Kohteen julkinen avain"
 
-#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "Virhe: laajennosta ei voi kÃ¤sitellÃ¤"
 
-#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "Kohteen allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "SSL-varmenteiden varmentaja"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "SÃ¤hkÃ¶postivarmenteiden varmentaja"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "Allekirjoitus"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "KiistÃ¤mÃ¤ttÃ¶myys"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "Avaimen salakoodaus"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "Tiedon salakoodaus"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "Avaimen sopimus"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "Varmenteen allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "CRL allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "Ei-kriittinen"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "Laajennokset"
 
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "Varmenteen allekirjoitusalgoritmi"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "MyÃ¶ntÃ¤jÃ¤"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "MyÃ¶ntÃ¤jÃ¤n yksilÃ¶llinen ID"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "Kohteen yksilÃ¶llinen tunniste"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "Varmenteen allekirjoituksen arvo"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "PKCS 12 tiedoston salasana"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "SyÃ¶tÃ¤ salasana PKCS12 tiedostolle:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "Tuotu varmenne"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "Komentoa %s ei voitu suorittaa: %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "Sammutetaan %s (%s)\n"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Yrityksen mukaan"
@@ -21483,7 +21164,7 @@ msgstr "_Aiheen mukaan"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
-msgstr "_Vastaus viestiin-lipun mukaan"
+msgstr "_Vastaus viestiin -lipun mukaan"
 
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
@@ -21506,31 +21187,27 @@ msgid "With _Status"
 msgstr "_Tilan kanssa"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>AikavyÃ¶hykkeet</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>_Valinta/</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "Valitse _aikavyÃ¶hyke"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "AikavyÃ¶hykkeet"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
-msgstr "AikavyÃ¶hykkeen valinnnan pudotusvalikko"
+msgstr "AikavyÃ¶hykkeen valinnan pudotusvalikko"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21540,30 +21217,32 @@ msgstr ""
 "aikavyÃ¶hyke.\n"
 "Loitonna kartalla oikealla hiiren napilla."
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr ""
+
 #: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Kokoelma"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:332
+#: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "MÃ¤Ã¤rittele nÃ¤kymÃ¤t - %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:340
+#: ../widgets/menus/gal-define-views-dialog.c:342
 msgid "Define Views"
 msgstr "MÃ¤Ã¤rittele nÃ¤kymÃ¤t"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "MÃ¤Ã¤rittele %s nÃ¤kymÃ¤t"
 
-#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "Taulu"
 
@@ -21571,35 +21250,35 @@ msgstr "Taulu"
 msgid "Instance"
 msgstr "Tapahtumiskerta"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Tallenna nykyinen nÃ¤kymÃ¤"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "Luo uusi _nÃ¤kymÃ¤"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva nÃ¤kymÃ¤"
 
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "Tehdas"
 
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "MÃ¤Ã¤rittele uusi nÃ¤kymÃ¤"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "Uuden nÃ¤kymÃ¤n nimi:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "NÃ¤kymÃ¤n tyyppi"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "NÃ¤kymÃ¤n tyyppi:"
 
@@ -21623,30 +21302,6 @@ msgstr "Toiminto"
 msgid "A GtkRadioAction"
 msgstr "GtkRadioAction"
 
-#. Translators: This is a cancelled activity.
-#: ../widgets/misc/e-activity.c:224
-#, c-format
-msgid "%s (cancelled)"
-msgstr "%s (peruttu)"
-
-#. Translators: This is a completed activity.
-#: ../widgets/misc/e-activity.c:227
-#, c-format
-msgid "%s (completed)"
-msgstr "%s (valmis)"
-
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../widgets/misc/e-activity.c:231
-#, c-format
-msgid "%s..."
-msgstr "%s..."
-
-#: ../widgets/misc/e-activity.c:236
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d %% valmiina)"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
@@ -21659,6 +21314,11 @@ msgstr "_Tiedostonimi:"
 msgid "MIME Type:"
 msgstr "MIME-tyyppi"
 
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "_Ehdota liitteen automaattista nÃ¤yttÃ¤mistÃ¤"
+
 #: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "Ei voitu asettaa taustakuvaksi"
@@ -21681,42 +21341,45 @@ msgstr "_LÃ¤hetÃ¤..."
 msgid "Send the selected attachments somewhere"
 msgstr "LÃ¤hetÃ¤ valitut liitteet jonnekin"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "Ladataan"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "Tallennetaan"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
+msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show Attachment _Bar"
+msgstr "NÃ¤ytÃ¤ _liitepalkki"
+
+#: ../widgets/misc/e-attachment-paned.c:605
 msgid "Show _Attachment Bar"
 msgstr "NÃ¤ytÃ¤ _liitepalkki"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "LisÃ¤Ã¤ liite"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "A_ttach"
 msgstr "Lii_tÃ¤"
 
-#: ../widgets/misc/e-attachment-store.c:607
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Tallenna liite"
 msgstr[1] "Tallenna liitteet"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:636
-#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
 msgid "attachment.dat"
 msgstr "liite.dat"
 
@@ -21736,64 +21399,73 @@ msgstr "_Piilota"
 msgid "_View Inline"
 msgstr "NÃ¤ytÃ¤ _sisÃ¤kkÃ¤isesti"
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:639
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Avaa ohjelmassa \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:642
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Avaa tÃ¤mÃ¤ liite ohjelmalla %s"
 
-#: ../widgets/misc/e-attachment.c:990
+#. To Translators: This text is set as a description of an attached
+#. * 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.
+#: ../widgets/misc/e-attachment.c:1002
 msgid "Attached message"
 msgstr "Liitetty viesti"
 
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
 msgid "A load operation is already in progress"
 msgstr "Lataus on jo kÃ¤ynnissÃ¤"
 
-#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 msgid "A save operation is already in progress"
 msgstr "Tallennus on jo kÃ¤ynnissÃ¤"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1920
 #, c-format
 msgid "Could not load '%s'"
 msgstr "%s ei voitu ladata"
 
-#: ../widgets/misc/e-attachment.c:1926
+#: ../widgets/misc/e-attachment.c:1923
 #, c-format
 msgid "Could not load the attachment"
 msgstr "LiitettÃ¤ ei voitu avata"
 
-#: ../widgets/misc/e-attachment.c:2190
+#: ../widgets/misc/e-attachment.c:2199
 #, c-format
 msgid "Could not open '%s'"
 msgstr "%s ei voitu avata"
 
-#: ../widgets/misc/e-attachment.c:2193
+#: ../widgets/misc/e-attachment.c:2202
 #, c-format
 msgid "Could not open the attachment"
 msgstr "LiitettÃ¤ ei voitu avata"
 
-#: ../widgets/misc/e-attachment.c:2635
+#: ../widgets/misc/e-attachment.c:2637
 msgid "Attachment contents not loaded"
 msgstr "Liitteen sisÃ¤ltÃ¶Ã¤ ei ladattu"
 
-#: ../widgets/misc/e-attachment.c:2712
+#: ../widgets/misc/e-attachment.c:2713
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Tiedostoa \"%s\" ei voitu tallentaa"
 
-#: ../widgets/misc/e-attachment.c:2715
+#: ../widgets/misc/e-attachment.c:2716
 #, c-format
 msgid "Could not save the attachment"
 msgstr "LiitettÃ¤ ei voitu tallentaa"
 
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../widgets/misc/e-buffer-tagger.c:363
+msgid "Ctrl-click to open a link"
+msgstr ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1253
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21801,58 +21473,58 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
+#: ../widgets/text/e-text.c:3400
 msgid "Fill color"
 msgstr "TÃ¤ytÃ¶n vÃ¤ri"
 
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
+#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
+#: ../widgets/text/e-text.c:3414
 msgid "GDK fill color"
 msgstr "GDK:n tÃ¤yttÃ¶vÃ¤ri"
 
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
+#: ../widgets/text/e-text.c:3421
 msgid "Fill stipple"
 msgstr "TÃ¤ytÃ¶n kuviopeite"
 
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:513
+#: ../widgets/misc/e-canvas-background.c:514
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:520
+#: ../widgets/misc/e-canvas-background.c:521
 msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:2884
 msgid "Minimum width"
 msgstr "Minimileveys"
 
 #: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:2885
 msgid "Minimum Width"
 msgstr "Minimileveys"
 
@@ -21872,49 +21544,144 @@ msgstr "SyÃ¶tÃ¤ kÃ¤ytettÃ¤vÃ¤ merkistÃ¶"
 msgid "Other..."
 msgstr "Muut..."
 
-#: ../widgets/misc/e-dateedit.c:408
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "PÃ¤ivÃ¤ys ja aika"
 
-#: ../widgets/misc/e-dateedit.c:428
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "TekstikenttÃ¤ pÃ¤ivÃ¤yksen syÃ¶ttÃ¶Ã¶n"
 
-#: ../widgets/misc/e-dateedit.c:450
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Paina tÃ¤stÃ¤ nÃ¤yttÃ¤Ã¤ksesi kalenterin"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "YhdistelmÃ¤valitsin ajan valitsemiseen"
 
-#: ../widgets/misc/e-dateedit.c:568
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../widgets/misc/e-dateedit.c:574
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_TÃ¤nÃ¤Ã¤n"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:582
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Ei mitÃ¤Ã¤n"
 
-#: ../widgets/misc/e-dateedit.c:1675
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1918
+msgctxt "date"
+msgid "None"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "Virheellinen pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤"
 
-#: ../widgets/misc/e-dateedit.c:1705
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-import-assistant.c:238
+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."
+
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "_Tiedostonimi:"
+
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "Valitse tiedosto"
+
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "Tiedoston _tyyppi:"
+
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "Valitse tÃ¤mÃ¤n tuonnin kohde"
+
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "Valitse suoritettavan tuojan tyyppi:"
+
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
+
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "Tuo _yksi tiedosto"
+
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr ""
+
+#: ../widgets/misc/e-import-assistant.c:516
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "Evolutionin tuoden asetukset"
+
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "Tuo sijainti"
+
+#: ../widgets/misc/e-import-assistant.c:1207
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Tervetuloa Evolutionin tuontiapulaiseen.\n"
+"TÃ¤llÃ¤ apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
+"Evolutionin kÃ¤yttÃ¶Ã¶n."
+
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "Tuojan tyyppi"
+
+#: ../widgets/misc/e-import-assistant.c:1232
+msgid "Select Information to Import"
+msgstr "Valitse tuotavat tiedot"
+
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "Valitse tiedosto"
+
+#: ../widgets/misc/e-import-assistant.c:1255
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
+
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+msgid "Import Data"
+msgstr ""
+
+#: ../widgets/misc/e-map.c:629
 msgid "World Map"
 msgstr "Maailmankartta"
 
-#: ../widgets/misc/e-map.c:607
+#: ../widgets/misc/e-map.c:631
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21924,60 +21691,115 @@ msgstr ""
 
 #: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr "Evolution on verkossa. Katkaise verkkoyhteydet napsauttamalla napista."
+msgstr ""
+"Evolution on verkossa. Katkaise verkkoyhteydet napsauttamalla napista."
 
 #: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr "Evolution ei ole verkossa. Avaa verkkoyhteydet napsauttamalla napista."
+msgstr ""
+"Evolution ei ole verkossa. Avaa verkkoyhteydet napsauttamalla napista."
 
 #: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution ei ole verkossa, koska verkko ei ole kÃ¤ytettÃ¤vissÃ¤."
 
-#: ../widgets/misc/e-online-button.c:131
+#: ../widgets/misc/e-online-button.c:135
 msgid "The button state is online"
 msgstr "Napin tila on verkossa"
 
-#: ../widgets/misc/e-paned.c:180
+#: ../widgets/misc/e-paned.c:306
 msgid "Horizontal Position"
 msgstr "Vaakasijainti"
 
-#: ../widgets/misc/e-paned.c:181
+#: ../widgets/misc/e-paned.c:307
 msgid "Pane position when oriented horizontally"
 msgstr "Paneelin sijainti sen ollessa vaaka-asennossa"
 
-#: ../widgets/misc/e-paned.c:192
+#: ../widgets/misc/e-paned.c:318
 msgid "Vertical Position"
 msgstr "Pystysijainti"
 
-#: ../widgets/misc/e-paned.c:193
+#: ../widgets/misc/e-paned.c:319
 msgid "Pane position when oriented vertically"
 msgstr "Paneelin sijainti sen ollessa pystyasennossa"
 
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../widgets/misc/e-paned.c:330
+msgid "Proportion"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:331
+msgid "Proportion of the 2nd pane size"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:342
+msgid "Fixed Resize"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:343
+msgid "Keep the 2nd pane fixed during resize"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Synkronoi:"
 
-#: ../widgets/misc/e-pilot-settings.c:107
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "Synkronisoi yksityiset tietueet:"
 
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "Synkronointiluokat:"
 
-#: ../widgets/misc/e-popup-action.c:173
-msgid "Source Action"
-msgstr "LÃ¤hteen toiminto"
-
-#: ../widgets/misc/e-popup-action.c:174
-msgid "The source action to proxy"
-msgstr "VÃ¤litettÃ¤vÃ¤ lÃ¤hteen toiminto"
-
-#: ../widgets/misc/e-preferences-window.c:216
+#: ../widgets/misc/e-preferences-window.c:266
 msgid "Evolution Preferences"
 msgstr "Evolutionin asetukset"
 
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "Osumia: %d"
+
+#: ../widgets/misc/e-search-bar.c:558
+msgid "Close the find bar"
+msgstr "Sulje hakupalkki"
+
+#: ../widgets/misc/e-search-bar.c:566
+msgid "Fin_d:"
+msgstr "Et_si:"
+
+#: ../widgets/misc/e-search-bar.c:578
+msgid "Clear the search"
+msgstr "TyhjennÃ¤ hakukenttÃ¤"
+
+#: ../widgets/misc/e-search-bar.c:601
+msgid "_Previous"
+msgstr "_Edellinen"
+
+#: ../widgets/misc/e-search-bar.c:607
+msgid "Find the previous occurrence of the phrase"
+msgstr "Etsi lauseen edellinen esiintymÃ¤"
+
+#: ../widgets/misc/e-search-bar.c:617
+msgid "_Next"
+msgstr "_Seuraava"
+
+#: ../widgets/misc/e-search-bar.c:623
+msgid "Find the next occurrence of the phrase"
+msgstr "Etsi lauseen seuraava esiintymÃ¤"
+
+#: ../widgets/misc/e-search-bar.c:633
+msgid "Mat_ch case"
+msgstr "Huomioi _kirjainkoko"
+
+#: ../widgets/misc/e-search-bar.c:661
+msgid "Reached bottom of page, continued from top"
+msgstr "Saavutettiin sivun loppu, jatketaan alusta"
+
+#: ../widgets/misc/e-search-bar.c:683
+msgid "Reached top of page, continued from bottom"
+msgstr "Saavutettiin sivun alku, jatketaan lopusta"
+
 #: ../widgets/misc/e-selection-model-array.c:593
 #: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
@@ -21988,167 +21810,152 @@ msgstr "Kohdistimen rivi"
 msgid "Cursor Column"
 msgstr "Kohdistimen sarake"
 
-#: ../widgets/misc/e-selection-model.c:208
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Sorter"
 msgstr "JÃ¤rjestÃ¤jÃ¤"
 
-#: ../widgets/misc/e-selection-model.c:215
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Selection Mode"
 msgstr "Valintatila"
 
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:231
 msgid "Cursor Mode"
 msgstr "Kohdistintila"
 
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Milloin _poistettu:"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>Perilletoimituksen asetukset</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>Vastaukset</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>Palauta huomautus</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>Tilan seuranta</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "Poista lÃ¤hetetty _automaattisesti"
 
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "Luo lÃ¤hetyskohde, jonka tietoja seurataan"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "_Toimitettu ja avattu"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "_Yleisasetukset"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
+#: ../widgets/misc/e-send-options.ui.h:10
+msgid "Mail Receipt"
 msgstr ""
-"Ei mitÃ¤Ã¤n\n"
-"Vastaanottaja"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
+#: ../widgets/misc/e-send-options.ui.h:12
+msgid "Proprietary"
 msgstr ""
-"Tavallinen\n"
-"Kaupallinen\n"
-"Luottamuksellinen\n"
-"Salainen\n"
-"ErittÃ¤in salainen\n"
-"Ainoastaan sinulle"
 
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "R_eply requested"
 msgstr "V_astausta pyydetty"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "Return Notification"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Sta_tus Tracking"
 msgstr "_Tilan seuranta"
 
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
+#: ../widgets/misc/e-send-options.ui.h:19
+msgid "Standard"
 msgstr ""
-"MÃ¤Ã¤rittelemÃ¤tÃ¶n\n"
-"Korkea\n"
-"Normaali\n"
-"Matala"
 
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.ui.h:20
+msgid "Status Tracking"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Top Secret"
+msgstr "ErittÃ¤in salainen"
+
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "When acce_pted:"
-msgstr "Milloin hy_vÃ¤ksytty: "
+msgstr "Milloin hy_vÃ¤ksytty:"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "When co_mpleted:"
 msgstr "Milloin val_mistuu:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When decli_ned:"
-msgstr "Milloin h_ylÃ¤tty: "
+msgstr "Milloin h_ylÃ¤tty:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Wi_thin"
 msgstr "S_isÃ¤llÃ¤"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "_After:"
 msgstr "_JÃ¤lkeen:"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "_All information"
 msgstr "_Kaikki tiedot"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_Classification:"
 msgstr "Lu_okittelu:"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_Delay message delivery"
 msgstr "_ViivÃ¤stÃ¤ viestin toimitusta"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Delivered"
 msgstr "_Toimitettu"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Set expiration date"
 msgstr "Aseta _erÃ¤pÃ¤ivÃ¤"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Until:"
 msgstr "_Kunnes:"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_When convenient"
 msgstr "Milloin _sopii"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_When opened:"
 msgstr "_Milloin avattu:"
 
-#: ../widgets/misc/e-signature-editor.c:130
-#: ../widgets/misc/e-signature-editor.c:489
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:39
+msgctxt "send-options"
+msgid "None"
+msgstr ""
+
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
 #: ../widgets/misc/e-signature-manager.c:349
 #: ../widgets/misc/e-signature-script-dialog.c:218
 msgid "Unnamed"
 msgstr "NimeÃ¤mÃ¤tÃ¶n"
 
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../widgets/misc/e-signature-editor.c:210
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../widgets/misc/e-signature-editor.c:361
+#: ../widgets/misc/e-signature-editor.c:389
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../widgets/misc/e-signature-editor.c:376
+#: ../widgets/misc/e-signature-editor.c:404
 msgid "_Signature Name:"
 msgstr "Allekirjoituk_sen nimi:"
 
@@ -22182,61 +21989,60 @@ msgstr "_Skripti:"
 msgid "Script file must be executable."
 msgstr "Skriptitiedoston tulee olla suoritettavissa."
 
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Napsauta tÃ¤stÃ¤ avataksesi URLin"
 
-#: ../widgets/misc/e-web-view.c:305
+#: ../widgets/misc/e-web-view.c:364
+msgid "_Copy Link Location"
+msgstr "_Kopioi linkin sijainti"
+
+#: ../widgets/misc/e-web-view.c:366
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepÃ¶ydÃ¤lle"
 
-#: ../widgets/misc/e-web-view.c:315
+#: ../widgets/misc/e-web-view.c:374
+msgid "_Open Link in Browser"
+msgstr "_Avaa linkki selaimessa"
+
+#: ../widgets/misc/e-web-view.c:376
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../widgets/misc/e-web-view.c:323
+#: ../widgets/misc/e-web-view.c:384
 msgid "_Copy Email Address"
 msgstr "_Kopioi sÃ¤hkÃ¶postiosoite"
 
-#: ../widgets/misc/e-web-view.c:325
-msgid "Copy the email address to the clipboard"
-msgstr "Kopioi sÃ¤hkÃ¶postiosoite leikepÃ¶ydÃ¤lle"
-
-#: ../widgets/misc/e-web-view.c:332
-msgid "Send a mail message to this address"
-msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postiviesti tÃ¤hÃ¤n osoitteeseen"
-
-#: ../widgets/misc/e-web-view.c:574
-#, c-format
-msgid "Click to mail %s"
-msgstr "Napsauta lÃ¤hettÃ¤Ã¤ksesi %s"
+#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1039
+msgid "Select all text and images"
+msgstr ""
 
-#: ../widgets/misc/e-web-view.c:576 ../widgets/misc/e-web-view.c:578
-#: ../widgets/misc/e-web-view.c:580
+#: ../widgets/misc/e-web-view.c:804 ../widgets/misc/e-web-view.c:806
+#: ../widgets/misc/e-web-view.c:808
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../widgets/misc/e-web-view.c:582
+#: ../widgets/misc/e-web-view.c:810
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai nÃ¤yttÃ¤Ã¤ksesi osoitteet"
 
-#: ../widgets/misc/e-web-view.c:584
+#: ../widgets/misc/e-web-view.c:812
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../widgets/misc/ea-calendar-item.c:295
-#: ../widgets/misc/ea-calendar-item.c:301
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
 msgid "%d %B %Y"
 msgstr "%d. %Bta %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:303
+#: ../widgets/misc/ea-calendar-item.c:311
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalenteri vÃ¤liltÃ¤ %s - %s"
 
-#: ../widgets/misc/ea-calendar-item.c:338
+#: ../widgets/misc/ea-calendar-item.c:347
 msgid "evolution calendar item"
 msgstr "evolutionin kalenterin kohta"
 
@@ -22244,15 +22050,21 @@ msgstr "evolutionin kalenterin kohta"
 msgid "popup list"
 msgstr "ponnahduslista"
 
-#: ../widgets/table/e-cell-date-edit.c:296
+#: ../widgets/table/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "Nyt"
 
+#. Translators: "None" as a label of a button to unset date in a date table cell
 #: ../widgets/table/e-cell-date-edit.c:320
+msgctxt "table-date"
+msgid "None"
+msgstr ""
+
+#: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:846
+#: ../widgets/table/e-cell-date-edit.c:878
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
@@ -22261,160 +22073,156 @@ msgstr "Ajan tulee olla muodossa: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosenttiarvon tulee olla vÃ¤lillÃ¤ 0 - 100"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-pixbuf.c:357
 msgid "Selected Column"
 msgstr "Valittu sarake"
 
-#: ../widgets/table/e-cell-pixbuf.c:367
+#: ../widgets/table/e-cell-pixbuf.c:364
 msgid "Focused Column"
 msgstr "Kohdistettu sarake"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
 msgid "Unselected Column"
 msgstr "Valitsematon sarake"
 
-#: ../widgets/table/e-cell-text.c:1788
+#: ../widgets/table/e-cell-text.c:1631
 msgid "Strikeout Column"
 msgstr "Yliviivattu sarake"
 
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1638
 msgid "Underline Column"
 msgstr "Alleviivaa sarake"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1645
 msgid "Bold Column"
 msgstr "Vahva sarake"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1652
 msgid "Color Column"
 msgstr "VÃ¤rillinen sarake"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1666
 msgid "BG Color Column"
 msgstr "Taustan vÃ¤rinen sarake"
 
-#: ../widgets/table/e-table-click-to-add.c:578
+#: ../widgets/table/e-table-click-to-add.c:586
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
 msgid "click to add"
 msgstr "lisÃ¤Ã¤ napsauttamalla"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "Tila"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(nouseva)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(laskeva)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "Ei jÃ¤rjestetty"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "Ei ryhmitystÃ¤"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "NÃ¤ytÃ¤ kentÃ¤t"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "Valittavat kentÃ¤t"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "Valittavat kentÃ¤t:"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "TyhjennÃ¤ merkki"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "TyhjennÃ¤ k_aikki"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Descending"
 msgstr "Laskeva"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "Ryhmittele kentÃ¤n mukaan"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "SiirrÃ¤ _alas"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "SiirrÃ¤ _ylÃ¶s"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "NÃ¤ytÃ¤ _kenttÃ¤ nÃ¤kymÃ¤ssÃ¤"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "NÃ¤ytÃ¤ k_enttÃ¤ nÃ¤kymÃ¤ssÃ¤"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "NÃ¤ytÃ¤ kenttÃ¤ _nÃ¤kymÃ¤ssÃ¤"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "JÃ¤rjestÃ¤"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "JÃ¤rjestÃ¤ kentÃ¤n mukaan"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "sitten"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "_NÃ¤ytettÃ¤vÃ¤t kentÃ¤t..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "_Ryhmittele..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "_NÃ¤ytÃ¤ kenttÃ¤ nÃ¤kymÃ¤ssÃ¤"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "_NÃ¤ytÃ¤ kentÃ¤t jÃ¤rjestyksessÃ¤:"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "_JÃ¤rjestÃ¤..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "LisÃ¤Ã¤ sarake..."
-
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "KentÃ¤n valinta"
+msgid "Add a Column"
+msgstr ""
 
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22422,202 +22230,206 @@ msgstr ""
 "LisÃ¤Ã¤ sarake taulukkoon raahaamalla se kohtaan,\n"
 "johon haluat sen ilmestyvÃ¤n."
 
-#: ../widgets/table/e-table-group-container.c:341
+#: ../widgets/table/e-table-group-container.c:342
 #, 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)"
 
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:348
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
 msgid "Alternating Row Colors"
 msgstr "Vaihtelevat rivien vÃ¤rit"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
+#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
 msgid "Horizontal Draw Grid"
 msgstr "Vaakasuuntainen piirtoristikko"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
+#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
 msgid "Vertical Draw Grid"
 msgstr "Pystysuuntainen piirtoristikko"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
+#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
 msgid "Draw focus"
 msgstr "Piirron kohdistin"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
 msgid "Cursor mode"
 msgstr "Kursorin tila"
 
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
 msgid "Selection model"
 msgstr "Valintamalli"
 
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
+#: ../widgets/table/e-tree.c:3368
 msgid "Length Threshold"
 msgstr "Pituuden raja-arvo"
 
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
-#: ../widgets/table/e-tree.c:3366
+#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
+#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
+#: ../widgets/table/e-tree.c:3400
 msgid "Uniform row height"
 msgstr "YhtenÃ¤inen rivinkorkeus"
 
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-container.c:989
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "JÃ¤Ã¤dytetty"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistÃ¤ nÃ¤kymÃ¤Ã¤"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1508
 msgid "Sort _Ascending"
 msgstr "jÃ¤rjestÃ¤ _nousevasti"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1511
 msgid "Sort _Descending"
 msgstr "JÃ¤rjestÃ¤ _laskevasti"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1514
 msgid "_Unsort"
 msgstr "Poista _jÃ¤rjestys"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1517
 msgid "Group By This _Field"
 msgstr "Ryhmittele tÃ¤mÃ¤n _kentÃ¤n mukaan"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1520
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1524
 msgid "Remove This _Column"
 msgstr "Poista tÃ¤mÃ¤ sa_rake"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1527
 msgid "Add a C_olumn..."
 msgstr "LisÃ¤Ã¤ sarake..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1534
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "Format Column_s..."
 msgstr "Muotoile _sarakkeet..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Custo_mize Current View..."
 msgstr "_Mukauta nykyistÃ¤ nÃ¤kymÃ¤Ã¤..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "_Sort By"
 msgstr "_JÃ¤rjestystapa"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1618
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
 msgid "Table header"
 msgstr "Taulukon otsikko"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
 msgid "Table model"
 msgstr "Taulumalli"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
 msgid "Cursor row"
 msgstr "Kohdistimen rivi"
 
-#: ../widgets/table/e-table-sorter.c:172
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Tietoja jÃ¤rjestyksestÃ¤"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
+#: ../widgets/table/e-tree.c:3407
 msgid "Always search"
 msgstr "Etsi aina"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3360
 msgid "Use click to add"
 msgstr "LisÃ¤Ã¤ napsauttamalla"
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Puu"
+#: ../widgets/table/e-table.c:3374
+msgid "Vertical Row Spacing"
+msgstr ""
 
-#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-table.c:3375
+msgid ""
+"Vertical space between rows. It is added to top and to bottom of a row"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
 msgid "ETree table adapter"
 msgstr "ETree-taulukon adapteri"
 
-#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3413
 msgid "Retro Look"
 msgstr "Retro-ulkoasu"
 
-#: ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-tree.c:3414
 msgid "Draw lines and +/- expanders."
 msgstr "PiirrÃ¤ viivat ja +/- laajentimet."
 
-#: ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-tree.c:3420
 msgid "Expander Size"
 msgstr "Laajentimen koko"
 
-#: ../widgets/table/e-tree.c:3387
+#: ../widgets/table/e-tree.c:3421
 msgid "Size of the expander arrow"
 msgstr "Laajennusnuolen koko"
 
@@ -22663,7 +22475,7 @@ msgstr "piilota"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "piilota tÃ¤mÃ¤n solun sisÃ¤ltÃ¤vÃ¤ ETreen rivi"
 
-#: ../widgets/table/gal-a11y-e-cell.c:120
+#: ../widgets/table/gal-a11y-e-cell.c:119
 msgid "Table Cell"
 msgstr "Taulukon solu"
 
@@ -22671,1618 +22483,1716 @@ msgstr "Taulukon solu"
 msgid "click"
 msgstr "napsauta"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
 msgid "sort"
 msgstr "jÃ¤rjestÃ¤"
 
-#: ../widgets/text/e-text.c:2719
+#: ../widgets/text/e-text.c:2486
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/text/e-text.c:2498
 msgid "Input Methods"
 msgstr "SyÃ¶temenetelmÃ¤t"
 
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
 msgid "Event Processor"
 msgstr "Tapahtumaprosessori"
 
-#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
 msgid "Text"
 msgstr "Teksti"
 
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
 msgid "Bold"
 msgstr "Vahva"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
 msgid "Strikeout"
 msgstr "Yliviivattu"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
 msgid "Anchor"
 msgstr "Ankkuri"
 
-#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
 msgid "Justification"
 msgstr "Asemointi"
 
-#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
 msgid "Clip Width"
 msgstr "Leikkeen leveys"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
 msgid "Clip Height"
 msgstr "Leikkeen korkeus"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
 msgid "Clip"
 msgstr "Leike"
 
-#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
 msgid "Fill clip rectangle"
 msgstr "TÃ¤ytÃ¤ leikkauksen suorakulmio"
 
-#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
 msgid "X Offset"
 msgstr "X-offset"
 
-#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
 msgid "Y Offset"
 msgstr "Y-offset"
 
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
 msgid "Text width"
 msgstr "Tekstin leveys"
 
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
 msgid "Text height"
 msgstr "Tekstin korkeus"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
 msgid "Use ellipsis"
 msgstr "KÃ¤ytÃ¤ ellipsejÃ¤"
 
-#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
 msgid "Ellipsis"
 msgstr "Ellipsit"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
 msgid "Line wrap"
 msgstr "Rivitys"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
 msgid "Break characters"
 msgstr "Katkaisevat merkit"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
 msgid "Max lines"
 msgstr "RivejÃ¤ enintÃ¤Ã¤n"
 
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
 msgid "Draw borders"
 msgstr "PiirrÃ¤ reunat"
 
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
 msgid "Allow newlines"
 msgstr "Salli rivinvaihdot"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
 msgid "Draw background"
 msgstr "PiirrÃ¤ tausta"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
 msgid "Draw button"
 msgstr "PiirrÃ¤ nappi"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
 msgid "Cursor position"
 msgstr "Kohdistimen sijainti"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
 msgid "IM Context"
 msgstr "IM-konteksti"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
-#~ msgid "search bar"
-#~ msgstr "hakupalkki"
-
-#~ msgid "evolution calendar search bar"
-#~ msgstr "evolutionin kalenterin hakupalkki"
-
-#~ msgid "Combo Button"
-#~ msgstr "yhdistelmÃ¤painike"
-
-#~ msgid "Activate Default"
-#~ msgstr "KÃ¤ytÃ¤ oletuksia"
-
-#~ msgid "Popup Menu"
-#~ msgstr "Ponnahdusvalikko"
+#: ../debian/signature.py:8
+msgid "Sent from Ubuntu"
+msgstr ""
 
-#~ msgid "Toggle Attachment Bar"
-#~ msgstr "NÃ¤ytÃ¤ tai piilota liitepalkki"
+#: ../debian/evolution-mail.desktop.in.h:1
+msgid "Evolution Mail"
+msgstr "Evolution-sÃ¤hkÃ¶posti"
 
-#~ msgid "activate"
-#~ msgstr "ota kÃ¤yttÃ¶Ã¶n"
+#: ../debian/evolution-mail.desktop.in.h:2
+msgid "Read and write emails"
+msgstr "Lue ja kirjoita sÃ¤hkÃ¶posteja"
 
-#~ msgid "C_ontacts"
-#~ msgstr "_Yhteystiedot"
+#~ msgid "Save Memo"
+#~ msgstr "Tallenna muistilappu"
 
-#~ msgid "Configure autocomplete here"
-#~ msgstr "MÃ¤Ã¤rittele automaattinen tÃ¤ydennys"
+#~ msgid "Create a new address book folder"
+#~ msgstr "Luo uusi osoitekirjakansio"
 
-#~ msgid "Evolution Address Book"
-#~ msgstr "Evolutionin osoitekirja"
+#~ msgid "Error loading address book."
+#~ msgstr "Virhe ladattaessa osoitekirjaa."
 
-#~ msgid "Evolution Address Book address popup"
-#~ msgstr "Evolutionin osoitekirjan osoiteponnahdusikkuna"
+#~ msgid "Save Task"
+#~ msgstr "Tallenna tehtÃ¤vÃ¤"
 
-#~ msgid "Evolution Address Book address viewer"
-#~ msgstr "Evolutionin osoitekirjan osoitteiden katselin"
+#~ msgid "Save Appointment"
+#~ msgstr "Tallenna tapaaminen"
 
-#~ msgid "Evolution Address Book card viewer"
-#~ msgstr "Evolutionin osoitekirjan kortinkatselin"
+#, c-format
+#~ msgid "SpamAssassin is not available."
+#~ msgstr "Spamassassin ei ole saatavilla."
 
-#~ msgid "Evolution Address Book component"
-#~ msgstr "Evolutionin osoitekirjan komponentti"
+#~ msgid "Python Loader"
+#~ msgstr "Python-latain"
 
-#~ msgid "Evolution S/MIME Certificate Management Control"
-#~ msgstr "Evolution S/MIME-varmenteiden hallintatyÃ¶kalu"
+#~ msgid "Evolution requires a restart to load the subscribed user's mailbox"
+#~ msgstr ""
+#~ "Evolution vaatii uudelleenkÃ¤ynnistyksen tilatun kÃ¤yttÃ¤jÃ¤n postilaatikon "
+#~ "lataamiseksi"
 
-#~ msgid "Evolution folder settings configuration control"
-#~ msgstr "Evolution kansioasetusten mÃ¤Ã¤rittelyjen ohjain"
+#~ msgid "User"
+#~ msgstr "KÃ¤yttÃ¤jÃ¤"
 
-#~ msgid "Manage your S/MIME certificates here"
-#~ msgstr "Hallitse S/Mime-varmenteita"
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "Aihe tai vastaanottaja sisÃ¤ltÃ¤Ã¤"
 
-#~ msgid "Failed upgrading Address Book settings or folders."
-#~ msgstr "Osoitekirjan asetusten tai kansioiden pÃ¤ivitys epÃ¤onnistui."
+#, c-format
+#~ msgid "Retrieving quota information for folder %s"
+#~ msgstr "Noudetaan kansion %s levytilatietoja"
 
-#~ msgid "Rename the \"%s\" folder to:"
-#~ msgstr "NimeÃ¤ \"%s\" uudestaan: "
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">VÃ¤lipalvelinasetukset</span>"
 
-#~ msgid "Rename Folder"
-#~ msgstr "NimeÃ¤ kansio uudestaan"
+#~ msgid "<b>Sender Photograph</b>"
+#~ msgstr "<b>LÃ¤hettÃ¤jÃ¤n valokuva</b>"
 
-#~ msgid "Save As vCard..."
-#~ msgstr "Tallenna vCard-muodossa..."
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "Evolutionin verkkoyhteyden asetukset"
 
-#~ msgid "Contact Source Selector"
-#~ msgstr "Yhteystietojen lÃ¤hdevalinta"
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "MÃ¤Ã¤rittele verkkoyhteysasetukset tÃ¤stÃ¤"
 
 #~ msgid ""
-#~ "Position of the vertical pane, between the card and list views and the "
-#~ "preview pane, in pixels."
+#~ "A label having the same tag already exists on the server. Please rename your "
+#~ "label."
 #~ msgstr ""
-#~ "Vaakapaneelin sijainti pikseleinÃ¤  kortti- listanÃ¤kymÃ¤n ja "
-#~ "esikatselupaneelin vÃ¤lissÃ¤."
-
-#~ msgid "Look up in address books"
-#~ msgstr "_Etsi osoitekirjoista"
-
-#~ msgid "3268"
-#~ msgstr "3268"
-
-#~ msgid "389"
-#~ msgstr "389"
-
-#~ msgid "636"
-#~ msgstr "636"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tyyppi:</b>"
-
-#~ msgid "Add Address Book"
-#~ msgstr "LisÃ¤Ã¤ osoitekirja"
-
-#~ msgid "Anonymously"
-#~ msgstr "Anonyymisti"
-
-#~ msgid "Basic"
-#~ msgstr "YleistÃ¤"
-
-#~ msgid "Distinguished name"
-#~ msgstr "YksikÃ¤sitteinen nimi"
-
-#~ msgid "Email address"
-#~ msgstr "SÃ¤hkÃ¶postiosoite"
-
-#~ msgid "Find Possible Search Bases"
-#~ msgstr "Etsi mahdolliset hakupohjat"
-
-#~ msgid "Search filter"
-#~ msgstr "Hakusuodatin"
-
-#~ msgid "Sub"
-#~ msgstr "Ali"
-
-#~ msgid "Using email address"
-#~ msgstr "KÃ¤ytetÃ¤Ã¤n sÃ¤hkÃ¶postiosoitetta"
-
-#~ msgid "Whenever Possible"
-#~ msgstr "Milloin mahdollista"
-
-#~ msgid "_Add Address Book"
-#~ msgstr "_LisÃ¤Ã¤ osoitekirja"
-
-#~ msgid "MSN Messenger"
-#~ msgstr "MSN Messenger"
-
-#~ msgid "Novell GroupWise"
-#~ msgstr "Novell GroupWise"
-
-#~ msgid "Novell Groupwise"
-#~ msgstr "Novell Groupwise"
+#~ "Samanniminen merkintÃ¤ on jo tallennettu palvelimelle. NimeÃ¤ merkintÃ¤ "
+#~ "uudestaan."
 
-#~ msgid "_Notes:"
-#~ msgstr "_Huomioita:"
+#~ msgid "Component"
+#~ msgstr "Komponentti"
 
-#~ msgid "United States"
-#~ msgstr "Yhdysvallat"
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "_TehtÃ¤vÃ¤lista"
 
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "Muistilappu_lista"
 
-#~ msgid "Albania"
-#~ msgstr "Albania"
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "Evolution S/MIME-varmenteiden hallintatyÃ¶kalu"
 
-#~ msgid "Algeria"
-#~ msgstr "Algeria"
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "Evolutionin osoitekirjan osoiteponnahdusikkuna"
 
-#~ msgid "American Samoa"
-#~ msgstr "Amerikkalainen Samoa"
+#~ msgid "Default width of the message window."
+#~ msgstr "Viesti-ikkunan oletusleveys."
 
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
+#~ msgid "Default height of the message window."
+#~ msgstr "Viesti-ikkunan oletuskorkeus."
 
-#~ msgid "Angola"
-#~ msgstr "Angola"
+#~ msgid "Search Folder source"
+#~ msgstr "HakunÃ¤kymÃ¤n lÃ¤hde"
 
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
+#~ msgid "Add address"
+#~ msgstr "LisÃ¤Ã¤ osoite"
 
-#~ msgid "Antarctica"
-#~ msgstr "EtelÃ¤manner"
+#~ msgid "Save Message..."
+#~ msgstr "Tallenna viesti..."
 
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua ja Barbuda"
+#~ msgid "message"
+#~ msgstr "viesti"
 
-#~ msgid "Argentina"
-#~ msgstr "Argentiina"
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "Suodata _postituslistan mukaan"
 
-#~ msgid "Armenia"
-#~ msgstr "Armenia"
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "Suodata _vastaanottajien mukaan"
 
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "Suodata _lÃ¤hettÃ¤jÃ¤n mukaan"
 
-#~ msgid "Australia"
-#~ msgstr "Australia"
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "Suodata a_iheen mukaan"
 
-#~ msgid "Austria"
-#~ msgstr "ItÃ¤valta"
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "HakunÃ¤kymÃ¤ _vastaanottajien perusteella"
 
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbaidzan"
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "HakunÃ¤kymÃ¤ _lÃ¤hettÃ¤jÃ¤n perusteella"
 
-#~ msgid "Bahamas"
-#~ msgstr "Bahamasaaret"
+#~ msgid "_Mailbox:"
+#~ msgstr "_SÃ¤hkÃ¶postikansio:"
 
-#~ msgid "Bahrain"
-#~ msgstr "Bahrain"
+#, c-format
+#~ msgid "untitled_image.%s"
+#~ msgstr "nimetÃ¶n_kuva.%s"
 
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesh"
+#~ msgid "_Add "
+#~ msgstr "_LisÃ¤Ã¤ "
 
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
+#~ msgid "<b>_Selection</b>"
+#~ msgstr "<b>_Valinta/</b>"
 
-#~ msgid "Belarus"
-#~ msgstr "Valko-VenÃ¤jÃ¤"
+#, c-format
+#~ msgid "Shutting down %s (%s)\n"
+#~ msgstr "Sammutetaan %s (%s)\n"
 
-#~ msgid "Belgium"
-#~ msgstr "Belgia"
+#~ msgid "Evolution Information"
+#~ msgstr "Evolutionin tiedot"
 
-#~ msgid "Belize"
-#~ msgstr "Belize"
+#~ msgid "Paste messages from the clipboard"
+#~ msgstr "LiitÃ¤ viestit leikepÃ¶ydÃ¤ltÃ¤"
 
-#~ msgid "Benin"
-#~ msgstr "Benin"
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>MyÃ¶ntÃ¤jÃ¤</b>"
 
-#~ msgid "Bermuda"
-#~ msgstr "Bermudasaaret"
+#~ msgid "Tree"
+#~ msgstr "Puu"
 
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
+#~ msgid "Add a column..."
+#~ msgstr "LisÃ¤Ã¤ sarake..."
 
-#~ msgid "Bolivia"
-#~ msgstr "Bolivia"
+#~ msgid ""
+#~ "Undefined\n"
+#~ "High\n"
+#~ "Standard\n"
+#~ "Low"
+#~ msgstr ""
+#~ "MÃ¤Ã¤rittelemÃ¤tÃ¶n\n"
+#~ "Korkea\n"
+#~ "Normaali\n"
+#~ "Matala"
 
-#~ msgid "Bosnia And Herzegowina"
-#~ msgstr "Bosnia-Hertsegovina"
+#~ msgid ""
+#~ "Normal\n"
+#~ "Proprietary\n"
+#~ "Confidential\n"
+#~ "Secret\n"
+#~ "Top Secret\n"
+#~ "For Your Eyes Only"
+#~ msgstr ""
+#~ "Tavallinen\n"
+#~ "Kaupallinen\n"
+#~ "Luottamuksellinen\n"
+#~ "Salainen\n"
+#~ "ErittÃ¤in salainen\n"
+#~ "Ainoastaan sinulle"
 
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
+#~ msgid ""
+#~ "None\n"
+#~ "Mail Receipt"
+#~ msgstr ""
+#~ "Ei mitÃ¤Ã¤n\n"
+#~ "Vastaanottaja"
 
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvet-saari"
+#~ msgid "<b>Status Tracking</b>"
+#~ msgstr "<b>Tilan seuranta</b>"
 
-#~ msgid "Brazil"
-#~ msgstr "Brasilia"
+#~ msgid "<b>Return Notification</b>"
+#~ msgstr "<b>Palauta huomautus</b>"
 
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "BrittilÃ¤inen Intian valtameren alue"
+#~ msgid "<b>Replies</b>"
+#~ msgstr "<b>Vastaukset</b>"
 
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei Darussalam"
+#~ msgid "<b>Delivery Options</b>"
+#~ msgstr "<b>Perilletoimituksen asetukset</b>"
 
-#~ msgid "Bulgaria"
-#~ msgstr "Bulgaria"
+#~ msgid "Item ID"
+#~ msgstr "Kohteen ID"
 
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
+#~ msgid "_Clear"
+#~ msgstr "_TyhjennÃ¤"
 
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
+#~ msgid "Search"
+#~ msgstr "Etsi"
 
-#~ msgid "Cambodia"
-#~ msgstr "Kambodza"
+#~ msgid "Column width"
+#~ msgstr "Sarakkeen leveys"
 
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
+#~ msgid "Reflow model"
+#~ msgstr "Uudelleenvirtauksen malli"
 
-#~ msgid "Canada"
-#~ msgstr "Kanada"
+#~ msgid "Empty message"
+#~ msgstr "TyhjÃ¤ viesti"
 
-#~ msgid "Cape Verde"
-#~ msgstr "Kap Verde"
+#~ msgid "Choose Image"
+#~ msgstr "Valitse kuva"
 
-#~ msgid "Cayman Islands"
-#~ msgstr "Caymansaaret"
+#~ msgid "_Searches"
+#~ msgstr "_Haut"
 
-#~ msgid "Central African Republic"
-#~ msgstr "Keski-Afrikan Tasavalta"
+#, c-format
+#~ msgid "Unknown character set: %s"
+#~ msgstr "Tuntematon merkistÃ¶: %s"
 
-#~ msgid "Chad"
-#~ msgstr "Tsad"
+#~ msgid "Save Custom View"
+#~ msgstr "Tallenna oma nÃ¤kymÃ¤"
 
-#~ msgid "Chile"
-#~ msgstr "Chile"
+#~ msgid "<b>Time Zones</b>"
+#~ msgstr "<b>AikavyÃ¶hykkeet</b>"
 
-#~ msgid "China"
-#~ msgstr "Kiina"
+#~ msgid "_Synchronization Options..."
+#~ msgstr "_Synkronointiasetukset..."
 
-#~ msgid "Christmas Island"
-#~ msgstr "Joulusaaret"
+#~ msgid "_Quit"
+#~ msgstr "_Lopeta"
 
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kookos(Keeling)-saaret"
+#~ msgid "_Hide Buttons"
+#~ msgstr "_Piilota napit"
 
-#~ msgid "Colombia"
-#~ msgstr "Kolumbia"
+#~ msgid "_About"
+#~ msgstr "_Tietoja"
 
-#~ msgid "Comoros"
-#~ msgstr "Komorit"
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "NÃ¤ytÃ¤ tai piilota tilarivi"
 
-#~ msgid "Congo"
-#~ msgstr "Kongo"
+#~ msgid "View/Hide the Side Bar"
+#~ msgstr "NÃ¤ytÃ¤ tai piilota sivupalkki"
 
-#~ msgid "Congo, The Democratic Republic Of The"
-#~ msgstr "Kongon demokraattinen tasavalta"
+#~ msgid "Toggle whether we are working offline."
+#~ msgstr "MÃ¤Ã¤ritÃ¤, tyÃ¶skennellÃ¤Ã¤nkÃ¶ poissa linjoilta."
 
-#~ msgid "Cook Islands"
-#~ msgstr "Cookinsaaret"
+#~ msgid "Submit Bug Report"
+#~ msgstr "LÃ¤hetÃ¤ vikailmoitus"
 
-#~ msgid "Costa Rica"
-#~ msgstr "Costa Rica"
+#~ msgid "Set up Pilot configuration"
+#~ msgstr "Muokkaa Pilotin asetuksia"
 
-#~ msgid "Cote d'Ivoire"
-#~ msgstr "Norsunluurannikko"
+#~ msgid "Send / Receive"
+#~ msgstr "LÃ¤hetÃ¤ / Vastaanota"
 
-#~ msgid "Croatia"
-#~ msgstr "Kroatia"
+#~ msgid "Prefere_nces"
+#~ msgstr "As_etukset"
 
-#~ msgid "Cuba"
-#~ msgstr "Kuuba"
+#~ msgid "Page Set_up..."
+#~ msgstr "Sivun as_etukset..."
 
-#~ msgid "Cyprus"
-#~ msgstr "Kypros"
+#~ msgid "Hide window buttons"
+#~ msgstr "Piilota ikkunan napit"
 
-#~ msgid "Czech Republic"
-#~ msgstr "TÅ¡ekki"
+#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgstr ""
+#~ "Unohda muistetut salasanat siten, ettÃ¤ ne kysytÃ¤Ã¤n tarvittaessa uudestaan"
 
-#~ msgid "Denmark"
-#~ msgstr "Tanska"
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "Muuta tyÃ¶kalupalkin nÃ¤kyvyyttÃ¤"
 
-#~ msgid "Djibouti"
-#~ msgstr "Djibouti"
+#~ msgid "About Evolution..."
+#~ msgstr "Tietoja Evolutionista..."
 
-#~ msgid "Dominica"
-#~ msgstr "Dominica"
+#~ msgid "Show task preview window"
+#~ msgstr "NÃ¤ytÃ¤ tehtÃ¤vien esikatseluruutu"
 
-#~ msgid "Dominican Republic"
-#~ msgstr "Dominikaaninen Tasavalta"
+#~ msgid "Mar_k as Complete"
+#~ msgstr "Merkitse _valmiiksi"
 
-#~ msgid "Ecuador"
-#~ msgstr "Ecuador"
+#~ msgid "Cut selected tasks"
+#~ msgstr "Leikkaa valitut tehtÃ¤vÃ¤t"
 
-#~ msgid "Egypt"
-#~ msgstr "Egypti"
+#~ msgid "Copy selected tasks"
+#~ msgstr "Kopioi valitut tehtÃ¤vÃ¤t"
 
-#~ msgid "El Salvador"
-#~ msgstr "El Salvador"
+#~ msgid "_Security"
+#~ msgstr "Turvalli_suus"
 
-#~ msgid "Equatorial Guinea"
-#~ msgstr "PÃ¤ivÃ¤ntasaajan Guinea"
+#~ msgid "_From Field"
+#~ msgstr "_LÃ¤hettÃ¤jÃ¤-kenttÃ¤"
 
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ LÃ¤hettÃ¤jÃ¤-kenttÃ¤"
 
-#~ msgid "Estonia"
-#~ msgstr "Viro"
+#~ msgid "Paste memo from the clipboard"
+#~ msgstr "LiitÃ¤ muistilappu leikepÃ¶ydÃ¤ltÃ¤"
 
-#~ msgid "Ethiopia"
-#~ msgstr "Etiopia"
+#~ msgid "Cut selected memo"
+#~ msgstr "Leikkaa valittu muistilappu"
 
-#~ msgid "Falkland Islands"
-#~ msgstr "Falklandsaaret"
+#~ msgid "Copy selected memo"
+#~ msgstr "Kopioi valittu muistilappu"
 
-#~ msgid "Faroe Islands"
-#~ msgstr "FÃ¤rsaaret"
+#~ msgid "Main toolbar"
+#~ msgstr "PÃ¤Ã¤tyÃ¶kalupalkki"
 
-#~ msgid "Fiji"
-#~ msgstr "Fidzi"
+#~ msgid "_Save Message..."
+#~ msgstr "_Tallenna viesti..."
 
-#~ msgid "Finland"
-#~ msgstr "Suomi"
+#~ msgid "Select all the text in a message"
+#~ msgstr "Valitse kaikki teksti viestistÃ¤"
 
-#~ msgid "France"
-#~ msgstr "Ranska"
+#~ msgid "Select _All Text"
+#~ msgstr "Valitse k_aikki teksti"
 
-#~ msgid "French Guiana"
-#~ msgstr "Ranskan Guiana"
+#~ msgid "Not Junk"
+#~ msgstr "Ei roskapostia"
 
-#~ msgid "French Polynesia"
-#~ msgstr "Polynesia"
+#~ msgid "Cut selected messages to the clipboard"
+#~ msgstr "Leikkaa valitut viestit leikepÃ¶ydÃ¤lle"
 
-#~ msgid "French Southern Territories"
-#~ msgstr "Ranskan etelÃ¤iset alueet"
+#~ msgid "Copy selected messages to the clipboard"
+#~ msgstr "Kopioi valitut viestit leikepÃ¶ydÃ¤lle"
 
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
+#~ msgid "Select all and only the messages that are not currently selected"
+#~ msgstr "Poista kaikki viestit, jotka eivÃ¤t ole juuri nyt valittu"
 
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
+#~ msgid "Select _All Messages"
+#~ msgstr "Valitse k_aikki viestit"
 
-#~ msgid "Georgia"
-#~ msgstr "Georgia"
+#~ msgid "Paste message(s) from the clipboard"
+#~ msgstr "LiitÃ¤ viestit leikepÃ¶ydÃ¤ltÃ¤"
 
-#~ msgid "Germany"
-#~ msgstr "Saksa"
+#~ msgid "Cut selected message(s) to the clipboard"
+#~ msgstr "Leikkaa valitut viestit leikepÃ¶ydÃ¤lle"
 
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
+#~ msgid "Copy selected message(s) to the clipboard"
+#~ msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltar"
+#~ msgid "_Debug Logs"
+#~ msgstr "_VianetsintÃ¤lokit"
 
-#~ msgid "Greece"
-#~ msgstr "Kreikka"
+#~ msgid "View the debug console for log messages"
+#~ msgstr "NÃ¤ytÃ¤ lokiviestit vianetsintÃ¤konsolissa"
 
-#~ msgid "Greenland"
-#~ msgstr "GrÃ¶nlanti"
+#~ msgid "Show message preview side-by-side with the message list"
+#~ msgstr "NÃ¤ytÃ¤ viestin esikatselu viestiluettelon vieressÃ¤"
 
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
+#~ msgid "Close"
+#~ msgstr "Sulje"
 
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
+#~ msgid "Paste text from the clipboard"
+#~ msgstr "LiitÃ¤ tekstiÃ¤ leikepÃ¶ydÃ¤ltÃ¤"
 
-#~ msgid "Guam"
-#~ msgstr "Guam"
+#~ msgid "Cut selected text to the clipboard"
+#~ msgstr "_Kopioi valittu teksti leikepÃ¶ydÃ¤lle"
 
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
+#~ msgid "Copy selected text to the clipboard"
+#~ msgstr "Kopioi valittu teksti leikepÃ¶ydÃ¤lle"
 
-#~ msgid "Guernsey"
-#~ msgstr "Guernsey"
+#~ msgid "Show the working week"
+#~ msgstr "NÃ¤ytÃ¤ tyÃ¶viikko"
 
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
+#~ msgid "Delete the appointment"
+#~ msgstr "Poista tapaaminen"
 
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea Bissau"
+#~ msgid "Delete _all Occurrences"
+#~ msgstr "Poista k_aikki tapahtumakerrat"
 
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
+#~ msgid "_Save Folder Contacts As VCard"
+#~ msgstr "Tallenna kansion yhteystiedot VCardina"
 
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
+#~ msgid "_Save Contact as VCard..."
+#~ msgstr "_Tallenna yhteystieto VCardina..."
 
-#~ msgid "Heard And McDonald Islands"
-#~ msgstr "Heard ja McDonaldinsaaret"
+#~ msgid "_Rename"
+#~ msgstr "_NimeÃ¤ uudestaan"
 
-#~ msgid "Holy See"
-#~ msgstr "PyhÃ¤ meri"
+#~ msgid "_Move Folder Contacts To"
+#~ msgstr "_SiirrÃ¤ kansion sisÃ¤ltÃ¶..."
 
-#~ msgid "Honduras"
-#~ msgstr "Honduras"
+#~ msgid "_Copy Folder Contacts To"
+#~ msgstr "_Kopioi kansion yhteystiedot..."
 
-#~ msgid "Hong Kong"
-#~ msgstr "Hong Kong"
+#~ msgid "Stop"
+#~ msgstr "PysÃ¤ytÃ¤"
 
-#~ msgid "Hungary"
-#~ msgstr "Unkari"
+#~ msgid "St_op"
+#~ msgstr "Py_sÃ¤ytÃ¤"
 
-#~ msgid "Iceland"
-#~ msgstr "Islanti"
+#~ msgid "Send message to contact"
+#~ msgstr "LÃ¤hetÃ¤ viesti henkilÃ¶lle"
 
-#~ msgid "India"
-#~ msgstr "Intia"
+#~ msgid "Select all contacts"
+#~ msgstr "Valitse kaikki yhteystiedot"
 
-#~ msgid "Indonesia"
-#~ msgstr "Indonesia"
+#~ msgid "Select _All"
+#~ msgstr "Valitse _kaikki"
 
-#~ msgid "Iran"
-#~ msgstr "Iran"
+#~ msgid "Save as VCard..."
+#~ msgstr "Tallenna VCardina..."
 
-#~ msgid "Iraq"
-#~ msgstr "Irak"
+#~ msgid "Paste"
+#~ msgstr "LiitÃ¤"
 
-#~ msgid "Ireland"
-#~ msgstr "Irlanti"
+#~ msgid "Move to Folder..."
+#~ msgstr "SiirrÃ¤ kansioon..."
 
-#~ msgid "Isle of Man"
-#~ msgstr "Mansaari"
+#~ msgid "Forward Contact"
+#~ msgstr "VÃ¤litÃ¤ yhteystieto eteenpÃ¤in"
 
-#~ msgid "Israel"
-#~ msgstr "Israel"
+#~ msgid "Del_ete Address Book"
+#~ msgstr "_Poista osoitekirja"
 
-#~ msgid "Italy"
-#~ msgstr "Italia"
+#~ msgid "Cut"
+#~ msgstr "Leikkaa"
 
-#~ msgid "Jamaica"
-#~ msgstr "Jamaika"
+#~ msgid "Copy to Folder..."
+#~ msgstr "Kopioi kansioon..."
 
-#~ msgid "Japan"
-#~ msgstr "Japani"
+#~ msgid "Copy"
+#~ msgstr "Kopioi"
 
-#~ msgid "Jersey"
-#~ msgstr "Jersey"
+#, c-format
+#~ msgid "Could not execute '%s': %s\n"
+#~ msgstr "Komentoa %s ei voitu suorittaa: %s\n"
 
-#~ msgid "Jordan"
-#~ msgstr "Jordania"
+#~ msgid "Dummy window only"
+#~ msgstr "Vain tyhmÃ¤ ikkuna"
 
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazakstan"
+#~ msgid "<b>Validity</b>"
+#~ msgstr "<b>Kelvollisuus</b>"
 
-#~ msgid "Kenya"
-#~ msgstr "Kenia"
+#~ msgid "<b>This certificate has been verified for the following uses:</b>"
+#~ msgstr "<b>TÃ¤mÃ¤ varmenne on varmennettu seuraaviin kÃ¤yttÃ¶tarkoituksiin:</b>"
 
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>Saaja:</b>"
 
-#~ msgid "Korea, Democratic People's Republic Of"
-#~ msgstr "Korean demokraattinen kansantasavalta"
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>SormenjÃ¤ljet</b>"
 
-#~ msgid "Korea, Republic Of"
-#~ msgstr "Korean tasavalta"
+#~ msgid "<b>Field Value</b>"
+#~ msgstr "<b>KentÃ¤n arvo</b>"
 
-#~ msgid "Kuwait"
-#~ msgstr "Kuwait"
+#~ msgid "<b>Certificate Hierarchy</b>"
+#~ msgstr "<b>Varmenteen hierarkia</b>"
 
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgisia"
+#~ msgid "<b>Certificate Fields</b>"
+#~ msgstr "<b>Varmenteen kentÃ¤t</b>"
 
-#~ msgid "Laos"
-#~ msgstr "Laos"
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Click help for details."
+#~ msgstr ""
+#~ "JÃ¤rjestelmÃ¤si kokoonpano ei vastaa Evolutionin asetuksiasi:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Valitse Ohje saadaksesi lisÃ¤tietoja"
 
-#~ msgid "Latvia"
-#~ msgstr "Latvia"
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\n"
+#~ "Click help for details"
+#~ msgstr "Valitse Ohje saadaksesi lisÃ¤tietoja"
 
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
+#~ msgid "Evolution can not start."
+#~ msgstr "Evolution ei kÃ¤ynnisty."
 
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
+#~ msgid "Forcibly shut down all Evolution components"
+#~ msgstr "Sulje kaikki Evolutionin osat vÃ¤kisin"
 
-#~ msgid "Liberia"
-#~ msgstr "Liberia"
+#~ msgid "Import File"
+#~ msgstr "Tuo tiedosto"
 
-#~ msgid "Libya"
-#~ msgstr "Libya"
+#~ msgid "New Test"
+#~ msgstr "Uusi testi"
 
-#~ msgid "Liechtenstein"
-#~ msgstr "Liechtenstein"
+#~ msgid "Configuration Database not found"
+#~ msgstr "Asetustietokantaa ei lÃ¶ytynyt"
 
-#~ msgid "Lithuania"
-#~ msgstr "Liettua"
+#~ msgid "Cannot register on OAF"
+#~ msgstr "OAF:ia ei voidaan rekisterÃ¶idÃ¤"
 
-#~ msgid "Luxembourg"
-#~ msgstr "Luxemburg"
+#~ msgid "Invalid arguments"
+#~ msgstr "VirheellisiÃ¤ argumentteja"
 
-#~ msgid "Macao"
-#~ msgstr "Macao"
+#~ msgid "Evolution is in the process of going offline."
+#~ msgstr "Evolution siirtyy yhteydettÃ¶mÃ¤Ã¤n tilaan."
 
-#~ msgid "Macedonia"
-#~ msgstr "Makedonia"
+#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#~ msgstr "Gnomen Pilot-tyÃ¶kalut eivÃ¤t ole asennettuina tÃ¤hÃ¤n jÃ¤rjestelmÃ¤Ã¤n."
 
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
+#~ msgid ""
+#~ "Evolution checked for settings to import from the following\n"
+#~ "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+#~ "settings found. If you would like to\n"
+#~ "try again, please click the \"Back\" button.\n"
+#~ msgstr ""
+#~ "Evolution tarkisti tuotavat asetukset seuraavista ohjelmista:\n"
+#~ "Pine, Netscape, Elm, iCalendar. MitÃ¤Ã¤n asetuksia, jotka voitaisiin\n"
+#~ "tuoda Evolutioniin, ei lÃ¶ytynyt. Jos haluat yrittÃ¤Ã¤ uudestaan, valitse\n"
+#~ "\"Takaisin\".\n"
 
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
+#~ msgid "Click OK to close these connections and go offline"
+#~ msgstr ""
+#~ "Valitse OK sulkeaksesi nÃ¤mÃ¤ yhteydet ja siirtyÃ¤ksesi yhteydettÃ¶mÃ¤Ã¤n tilaan"
 
-#~ msgid "Malaysia"
-#~ msgstr "Malesia"
+#~ msgid "Active Connections"
+#~ msgstr "Aktiiviset yhteydet"
 
-#~ msgid "Maldives"
-#~ msgstr "Malediivit"
+#~ msgid "<b>Active Connections</b>"
+#~ msgstr "<b>Aktiiviset yhteydet</b>"
 
-#~ msgid "Mali"
-#~ msgstr "Mali"
+#~ msgid "Evolution Test component"
+#~ msgstr "Evolutionin testikomponentti"
 
-#~ msgid "Malta"
-#~ msgstr "Malta"
+#~ msgid "Evolution Test"
+#~ msgstr "Evolution testi"
 
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallinsaaret"
+#~ msgid "Evolution Shell Config factory"
+#~ msgstr "Evolution-kuoren asetustehdas"
 
-#~ msgid "Martinique"
-#~ msgstr "Martinique"
+#~ msgid "Evolution Shell"
+#~ msgstr "Evolution-kuori"
 
-#~ msgid "Mauritania"
-#~ msgstr "Mauritania"
+#~ msgid "Save"
+#~ msgstr "Tallenna"
 
-#~ msgid "Mauritius"
-#~ msgstr "Mauritius"
+#~ msgid ""
+#~ "iCal\n"
+#~ "Free/Busy"
+#~ msgstr ""
+#~ "iCal\n"
+#~ "Vapaa/Varattu"
 
-#~ msgid "Mexico"
-#~ msgstr "Meksiko"
+#~ msgid ""
+#~ "Daily\n"
+#~ "Weekly\n"
+#~ "Manual (via Actions menu)"
+#~ msgstr ""
+#~ "PÃ¤ivittÃ¤in\n"
+#~ "Viikoittain\n"
+#~ "KÃ¤sin (toimintovalikosta)"
 
-#~ msgid "Micronesia"
-#~ msgstr "Mikronesia"
+#~ msgid "<span weight=\"bold\">Sources</span>"
+#~ msgstr "<span weight=\"bold\">LÃ¤hteet</span>"
 
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Moldova"
+#~ msgid "<span weight=\"bold\">Location</span>"
+#~ msgstr "<span weight=\"bold\">Sijainti</span>"
 
-#~ msgid "Monaco"
-#~ msgstr "Monaco"
+#, c-format
+#~ msgid "Enter the password for `%s'"
+#~ msgstr "SyÃ¶tÃ¤ salasana '%s':lle"
 
-#~ msgid "Mongolia"
-#~ msgstr "Mongolia"
+#~ msgid "Only ever show PLAIN"
+#~ msgstr "NÃ¤ytÃ¤ ainoastaan raakatekstiÃ¤"
 
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
+#~ msgid "Prefer PLAIN"
+#~ msgstr "NÃ¤ytÃ¤ mieluummin raakatekstiÃ¤"
 
-#~ msgid "Morocco"
-#~ msgstr "Marokko"
+#~ msgid "_Make available for offline use"
+#~ msgstr "_Kopioi kÃ¤ytettÃ¤vÃ¤ksi yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#~ msgid "Mozambique"
-#~ msgstr "Mosambik"
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "_Ã?lÃ¤ kopioi kÃ¤ytettÃ¤vÃ¤ksi yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "_Peru listan tilaus"
 
-#~ msgid "Namibia"
-#~ msgstr "Namibia"
+#~ msgid "_Subscribe to list"
+#~ msgstr "_Tilaa lista"
 
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
+#~ msgid "_Post message to list"
+#~ msgstr "_LÃ¤hetÃ¤ viesti listalle"
 
-#~ msgid "Nepal"
-#~ msgstr "Nepali"
+#~ msgid "Contact list _owner"
+#~ msgstr "Ota yhteyttÃ¤ listan _omistajaan"
 
-#~ msgid "Netherlands"
-#~ msgstr "Alankomaat"
+#~ msgid "Pl_ay"
+#~ msgstr "_Soita"
 
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Alankomaiden Antillit"
+#~ msgid "Specify _filename:"
+#~ msgstr "Anna _tiedostonimi:"
 
-#~ msgid "New Caledonia"
-#~ msgstr "Uusi Kaledonia"
+#~ msgid "iPod Synchronization"
+#~ msgstr "iPod-synkronointi"
 
-#~ msgid "New Zealand"
-#~ msgstr "Uusi-Seelanti"
+#~ msgid "Synchronize to iPod"
+#~ msgstr "_Synkronoi iPod"
 
-#~ msgid "Nicaragua"
-#~ msgstr "Nicaragua"
+#~ msgid "Search for an iPod failed"
+#~ msgstr "iPodia ei lÃ¶ytynyt"
 
-#~ msgid "Niger"
-#~ msgstr "Niger"
+#~ msgid ""
+#~ "The \"hald\" service is required but not currently running. Please enable "
+#~ "the service and rerun this program, or contact your system administrator."
+#~ msgstr ""
+#~ "Palvelu \"hald\" vaaditaan, mutta se ei ole pÃ¤Ã¤llÃ¤. Ota palvelu kÃ¤yttÃ¶Ã¶n ja "
+#~ "aja ohjelma uudestaan, tai ota yhteyttÃ¤ yllÃ¤pitÃ¤jÃ¤Ã¤si."
 
-#~ msgid "Nigeria"
-#~ msgstr "Nigeria"
+#~ msgid "Hardware Abstraction Layer not loaded"
+#~ msgstr "Laitteistorajapinta HAL ei ole ladattu"
 
-#~ msgid "Niue"
-#~ msgstr "Niue"
+#~ msgid "_Import"
+#~ msgstr "_Tuo"
 
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolkinsaari"
+#~ msgid "<b>IMAP Headers</b>"
+#~ msgstr "<b>IMAP-otsakkeet</b>"
 
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Pohjois-Mariaanit"
+#~ msgid "<b>Custom Headers</b>"
+#~ msgstr "<b>Omat otsakkeet</b>"
 
-#~ msgid "Norway"
-#~ msgstr "Norja"
+#~ msgid "<b>Name</b>"
+#~ msgstr "<b>Nimi</b>"
 
-#~ msgid "Oman"
-#~ msgstr "Oman"
+#~ msgid "<b>Junk List:</b>"
+#~ msgstr "<b>Roskapostilista:</b>"
 
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
+#~ msgid "Unsubscribe Folders"
+#~ msgstr "Peru kansioiden tilauksia"
 
-#~ msgid "Palau"
-#~ msgstr "Palau"
+#~ msgid "_Face"
+#~ msgstr "_Kasvokuva"
 
-#~ msgid "Palestinian Territory"
-#~ msgstr "Palestiinalainen alue"
+#~ msgid "PNG files"
+#~ msgstr "PNG-tiedostot"
 
-#~ msgid "Panama"
-#~ msgstr "Panama"
+#~ msgid "Select a (48*48) png of size < 700bytes"
+#~ msgstr "Valitse (48x48) png-tiedosto, jonka koko on < 700 tavua"
 
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Uusi-Guinea"
+#~ msgid "Check folder permissions"
+#~ msgstr "Tarkista kansion oikeudet"
 
-#~ msgid "Paraguay"
-#~ msgstr "Paraguay"
+#~ msgid "Subscribe to Other User's Tasks"
+#~ msgstr "Tilaa muiden kÃ¤yttÃ¤jien tehtÃ¤viÃ¤"
 
-#~ msgid "Peru"
-#~ msgstr "Peru"
+#~ msgid "{0} is already in the list"
+#~ msgstr "{0} on jo listalla"
 
-#~ msgid "Philippines"
-#~ msgstr "Filippiinit"
+#~ msgid "{0} is already a delegate"
+#~ msgstr "{0} on jo valtuutettu"
 
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn"
+#~ msgid "{0} cannot be added to an access control list"
+#~ msgstr "{0} ei voi lisÃ¤tÃ¤ pÃ¤Ã¤sylistalle"
 
-#~ msgid "Poland"
-#~ msgstr "Puola"
+#~ msgid "Your password has expired."
+#~ msgstr "Salasanasi on vanhentunut."
 
-#~ msgid "Portugal"
-#~ msgstr "Portugal"
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to send mail until you "
+#~ "clear up some space by deleting some mail."
+#~ msgstr ""
+#~ "KÃ¤ytÃ¤t tÃ¤llÃ¤ hetkellÃ¤ {0} kt. Et voi lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia ennen kuin olet "
+#~ "vapauttanut tilaa poistamalla joitain tallennettuja viestejÃ¤."
 
-#~ msgid "Puerto Rico"
-#~ msgstr "Puerto Rico"
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to either send or "
+#~ "receive mail now."
+#~ msgstr ""
+#~ "KÃ¤ytÃ¤t tÃ¤llÃ¤ hetkellÃ¤ {0} kt. Et voi lÃ¤hettÃ¤Ã¤ tai vastaanottaa sÃ¤hkÃ¶postia."
 
-#~ msgid "Qatar"
-#~ msgstr "Qatar"
+#~ msgid ""
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting some "
+#~ "mail."
+#~ msgstr ""
+#~ "KÃ¤ytÃ¤t tÃ¤llÃ¤ hetkellÃ¤ {0} kt. YritÃ¤ vapauttaa tilaa poistamalla joitain "
+#~ "viestejÃ¤."
 
-#~ msgid "Reunion"
-#~ msgstr "RÃ©union"
+#~ msgid "You may only configure a single Exchange account."
+#~ msgstr "Voit mÃ¤Ã¤ritellÃ¤ vain yhden Exchange-tilin."
 
-#~ msgid "Romania"
-#~ msgstr "Romania"
+#~ msgid "You have exceeded your quota for storing mail on this server."
+#~ msgstr "SÃ¤hkÃ¶postillesi varattu tila tÃ¤llÃ¤ palvelimella on loppu."
 
-#~ msgid "Russian Federation"
-#~ msgstr "VenÃ¤jÃ¤"
+#~ msgid "You cannot make yourself your own delegate"
+#~ msgstr "Et voi valtuuttaa itseÃ¤si."
 
-#~ msgid "Rwanda"
-#~ msgstr "Ruanda"
+#~ msgid ""
+#~ "You are permitted to send a message on behalf of only one delegator at a "
+#~ "time."
+#~ msgstr ""
+#~ "Sinulla on lupa lÃ¤hettÃ¤Ã¤ viestejÃ¤ toisten puolesta vain yhden valtuuttajan "
+#~ "nimissÃ¤ kerrallaan."
 
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Saint Kitts ja Nevis"
+#~ msgid "You are nearing your quota available for storing mail on this server."
+#~ msgstr ""
+#~ "SÃ¤hkÃ¶postisi tallennukseen varattu tila tÃ¤llÃ¤ palvelimella alkaa loppua."
 
-#~ msgid "Saint Lucia"
-#~ msgstr "Saint Lucia"
+#~ msgid "Unsupported operation"
+#~ msgstr "Toimenpide ei ole tuettu"
 
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "Saint Vincent ja Grenadiinit"
+#~ msgid "Unknown type"
+#~ msgstr "Tuntematon tyyppi"
 
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
+#~ msgid "Unknown error looking up {0}"
+#~ msgstr "Tuntematon virhe etsittÃ¤essÃ¤ {0}"
 
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
+#~ msgid "Unable to edit delegates."
+#~ msgstr "Valtuutuslistan muokkaus epÃ¤onnistui."
 
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "SÃ£o TomÃ© ja Principe"
+#~ msgid "Unable to add user to access control list:"
+#~ msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ ei voi lisÃ¤tÃ¤ pÃ¤Ã¤sylistalle:"
 
-#~ msgid "Saudi Arabia"
-#~ msgstr "Saudi Arabia"
+#~ msgid "Try again with a different password."
+#~ msgstr "YritÃ¤ uudestaan eri salasanalla."
 
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
+#~ msgid ""
+#~ "The server is running Exchange 5.5. Exchange Connector \n"
+#~ "supports Microsoft Exchange 2000 and 2003 only."
+#~ msgstr ""
+#~ "Palvelimen versio on Exchange 5.5. Exchange Connector \n"
+#~ "tukee ainoastaan versioita Microsoft Exchange 2000 ja 2003."
 
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "Serbia ja Montenegro"
+#~ msgid "The Exchange server is not compatible with Exchange Connector."
+#~ msgstr "Exchange-palvelin ei ole yhteensopiva Exchange Connectorin kanssa."
 
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
+#~ msgid "The Exchange account will be removed when you quit Evolution"
+#~ msgstr "Exchange-tili poistetaan, kun suljet Evolutionin"
 
-#~ msgid "Singapore"
-#~ msgstr "Singapore"
+#~ msgid "The Exchange account will be disabled when you quit Evolution"
+#~ msgstr "Exchange-tili poistetaan kÃ¤ytÃ¶stÃ¤ kun suljet evolutionin"
 
-#~ msgid "Slovakia"
-#~ msgstr "Slovakia"
+#~ msgid "Server rejected password because it is too weak."
+#~ msgstr "Palvelin hylkÃ¤si salasanan, koska se on liian yksinkertainen."
 
-#~ msgid "Slovenia"
-#~ msgstr "Slovenia"
+#~ msgid "Please select a user."
+#~ msgstr "Valitse kÃ¤yttÃ¤jÃ¤."
 
-#~ msgid "Solomon Islands"
-#~ msgstr "Salomonsaaret"
+#~ msgid "Please restart Evolution for changes to take effect"
+#~ msgstr "KÃ¤ynnistÃ¤ Evolution uudestaan, jotta muutokset tulevat voimaan"
 
-#~ msgid "Somalia"
-#~ msgstr "Somalia"
+#~ msgid "Please make sure the Global Catalog Server name is correct."
+#~ msgstr "Varmista, ettÃ¤ yhteisen luettelopalvelimen nimi on oikein."
 
-#~ msgid "South Africa"
-#~ msgstr "EtelÃ¤-Afrikka"
+#~ msgid ""
+#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+#~ msgstr "Anna valtuuttajan tunniste tai poista lÃ¤hetÃ¤ valtuutettuna -asetus."
 
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "EtelÃ¤-Georgia ja EtelÃ¤iset Sandwichsaaret"
+#~ msgid "Password successfully changed."
+#~ msgstr "Salasanan vaihto onnistui."
 
-#~ msgid "Spain"
-#~ msgstr "Espanja"
+#~ msgid "No such user {0}"
+#~ msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ {0} ei ole olemassa"
 
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
+#~ msgid "No mailbox for user {0} on {1}."
+#~ msgstr "KÃ¤yttÃ¤jÃ¤llÃ¤ {0} ei ole postilaatikkoa palvelimella {1}."
 
-#~ msgid "St. Helena"
-#~ msgstr "Saint Helena"
+#~ msgid "No Global Catalog server configured for this account."
+#~ msgstr "YhteistÃ¤ luettelopalvelinta ei ole mÃ¤Ã¤ritelty tÃ¤lle tilille."
 
-#~ msgid "St. Pierre And Miquelon"
-#~ msgstr "Saint-Pierre ja Miquelon"
+#~ msgid "Make sure the username and password are correct and try again."
+#~ msgstr ""
+#~ "Tarkista ettÃ¤ kÃ¤yttÃ¤jÃ¤tunnus ja salasana ovat oikein ja yritÃ¤ uudestaan."
 
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
+#~ msgid "Make sure the server name is spelled correctly and try again."
+#~ msgstr ""
+#~ "Tarkista ettÃ¤ palvelimen nimi on kirjoitettu oikein ja yritÃ¤ uudestaan."
 
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
+#~ msgid "Make sure the URL is correct and try again."
+#~ msgstr "Tarkista ettÃ¤ URL on oikein ja yritÃ¤ uudestaan."
 
-#~ msgid "Svalbard And Jan Mayen Islands"
-#~ msgstr "Svalbard ja Jan Mayen"
+#~ msgid "Mailbox for {0} is not on this server."
+#~ msgstr "SÃ¤hkÃ¶postit kÃ¤yttÃ¤jÃ¤lle {0} eivÃ¤t ole tÃ¤llÃ¤ palvelimella."
 
-#~ msgid "Swaziland"
-#~ msgstr "Swazimaa"
+#~ msgid ""
+#~ "If OWA is running on a different path, you must specify that in the account "
+#~ "configuration dialog."
+#~ msgstr ""
+#~ "Jos OWA on kÃ¤ytÃ¶ssÃ¤ eri polussa tÃ¤ytyy se mÃ¤Ã¤ritellÃ¤ erikseen tilin "
+#~ "asetuksissa."
 
-#~ msgid "Sweden"
-#~ msgstr "Ruotsi"
+#~ msgid "Global Catalog Server is not reachable"
+#~ msgstr "Yhteinen luettelopalvelin ei ole kÃ¤ytettÃ¤vissÃ¤"
 
-#~ msgid "Switzerland"
-#~ msgstr "Sveitsi"
+#~ msgid "Generic error"
+#~ msgstr "Yleinen virhe"
 
-#~ msgid "Syria"
-#~ msgstr "Syyria"
+#~ msgid "Folder offline"
+#~ msgstr "Kansio on yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#~ msgid "Taiwan"
-#~ msgstr "Taiwan"
+#~ msgid "Folder does not exist"
+#~ msgstr "Kansiota ei ole olemassa"
 
-#~ msgid "Tajikistan"
-#~ msgstr "Tadkistan"
+#~ msgid "Folder already exists"
+#~ msgstr "Kansio on jo olemassa"
 
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tansania"
+#~ msgid "Failed to update delegates:"
+#~ msgstr "Valtuutuslistan pÃ¤ivitys epÃ¤onnistui:"
 
-#~ msgid "Thailand"
-#~ msgstr "Thaimaa"
+#~ msgid ""
+#~ "Exchange Connector requires access to certain\n"
+#~ "functionality on the Exchange Server that appears\n"
+#~ "to be disabled or blocked. (This is usually \n"
+#~ "unintentional.) Your Exchange Administrator will \n"
+#~ "need to enable this functionality in order for \n"
+#~ "you to be able to use Evolution Exchange Connector.\n"
+#~ "\n"
+#~ "For information to provide to your Exchange \n"
+#~ "administrator, please follow the link below:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+#~ msgstr ""
+#~ "Exchange Connector vaatii pÃ¤Ã¤syÃ¤ tiettyihin\n"
+#~ "Exchange-palvelimen toimintoihin, jotka nÃ¤yttÃ¤vÃ¤t\n"
+#~ "olevan joko poistettu kÃ¤ytÃ¶stÃ¤ tai estetty. TÃ¤mÃ¤ on usein\n"
+#~ "vahinko. Exchange-yllÃ¤pitÃ¤jÃ¤si tÃ¤ytyy ottaa nÃ¤mÃ¤ ominaisuudet\n"
+#~ "kÃ¤yttÃ¶Ã¶n, jotta voit kÃ¤yttÃ¤Ã¤ Exchange Connectoria.\n"
+#~ "\n"
+#~ "Exchange-yllÃ¤pitÃ¤jÃ¤si voi lukea ongelman ratkaisuun liittyviÃ¤\n"
+#~ "ohjeita allaolevasta osoitteesta:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
 
-#~ msgid "Timor-Leste"
-#~ msgstr "Timor-Leste"
+#~ msgid "Exchange Account is offline."
+#~ msgstr "Exchange-tili on yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#~ msgid "Togo"
-#~ msgstr "Togo"
+#~ msgid "Could not update out-of-office state"
+#~ msgstr "\"Poissa konttorilta\"-tilaa ei voi pÃ¤ivittÃ¤Ã¤."
 
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
+#~ msgid "Could not update folder permissions."
+#~ msgstr "Kansion oikeuksia ei voi pÃ¤ivittÃ¤Ã¤."
 
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
+#~ msgid "Could not read out-of-office state"
+#~ msgstr "\"Poissa konttorilta\"-tilaa ei voi lukea."
 
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad ja Tobago"
+#~ msgid "Could not read folder permissions."
+#~ msgstr "Kansion oikeuksia ei voi lukea."
 
-#~ msgid "Tunisia"
-#~ msgstr "Tunisia"
+#~ msgid "Could not read folder permissions"
+#~ msgstr "Kansion oikeuksia ei voi lukea"
 
-#~ msgid "Turkey"
-#~ msgstr "Turkki"
+#~ msgid "Could not make {0} a delegate"
+#~ msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ {0} ei voi merkitÃ¤ valtuutetuksi"
 
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
+#~ msgid "Could not locate server {0}."
+#~ msgstr "Palvelinta {0} ei lÃ¶ytynyt."
 
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Turks- ja Caicossaaret"
+#~ msgid "Could not find Exchange Web Storage System."
+#~ msgstr "Exchange Web Storage SystemiÃ¤ ei lÃ¶ytynyt."
 
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
+#~ msgid "Could not determine folder permissions for delegates."
+#~ msgstr "Kansion oikeuksia valtuutetuille ei voi selvittÃ¤Ã¤."
 
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
+#~ msgid "Could not connect to server {0}."
+#~ msgstr "Palvelimeen {0} ei saatu yhteyttÃ¤."
 
-#~ msgid "Ukraine"
-#~ msgstr "Ukraina"
+#~ msgid "Could not connect to Exchange server."
+#~ msgstr "Exchange-palvelimeen ei saatu yhteyttÃ¤."
 
-#~ msgid "United Arab Emirates"
-#~ msgstr "Yhdistyneet arabiemiirikunnat"
+#~ msgid ""
+#~ "Could not configure Exchange account because \n"
+#~ "an unknown error occurred. Check the URL, \n"
+#~ "username, and password, and try again."
+#~ msgstr ""
+#~ "Exchange tiliÃ¤ ei voi mÃ¤Ã¤ritellÃ¤, koska tapahtui\n"
+#~ "tuntematon virhe. Tarkista URL, kÃ¤yttÃ¤jÃ¤tunnus ja\n"
+#~ "salasana ja yritÃ¤ uudestaan."
 
-#~ msgid "United Kingdom"
-#~ msgstr "Iso-Britannia"
+#~ msgid "Could not change password."
+#~ msgstr "Salasanan vaihto epÃ¤onnistui."
 
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Yhdysvaltain pienet erillissaaret"
+#~ msgid "Could not authenticate to server."
+#~ msgstr "Palvelimelle tunnistautuminen epÃ¤onnistui."
 
-#~ msgid "Uruguay"
-#~ msgstr "Uruguay"
+#~ msgid ""
+#~ "Changes to options for Exchange account \"{0}\" will only take effect after "
+#~ "restarting Evolution."
+#~ msgstr ""
+#~ "Muutokset Exchange-tilin \"{0}\" asetuksiin tulevat voimaan, kun olet "
+#~ "sulkenut ja kÃ¤ynnistynyt Evolutionin uudestaan."
 
-#~ msgid "Uzbekistan"
-#~ msgstr "Uzbekistan"
+#~ msgid "Cannot perform the operation."
+#~ msgstr "ToimenpidettÃ¤ ei voi suorittaa."
 
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
+#~ msgid "Cannot display folders."
+#~ msgstr "Kansioita ei voi nÃ¤yttÃ¤Ã¤."
 
-#~ msgid "Venezuela"
-#~ msgstr "Venezuela"
+#~ msgid "Cannot change password due to configuration problems."
+#~ msgstr "Salasanaa ei voi vaihtaa asetusongelmien takia."
 
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
+#~ msgid "Exchange Operations"
+#~ msgstr "Exchange-toiminnot"
 
-#~ msgid "Virgin Islands, British"
-#~ msgstr "BrittilÃ¤iset Neitsytsaaret"
+#~ msgid "Subscribe to Other User's Calendar"
+#~ msgstr "Tilaa toisen kÃ¤yttÃ¤jÃ¤n kalenteri"
 
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Yhdysvaltain Neitsytsaaret"
+#~ msgid "Subscribe to Other User's Contacts"
+#~ msgstr "Tilaa muiden kÃ¤yttÃ¤jien yhteystietoja"
 
-#~ msgid "Wallis And Futuna Islands"
-#~ msgstr "Wallis ja Futuna"
+#~ msgid "Address Book..."
+#~ msgstr "Osoitekirja..."
 
-#~ msgid "Western Sahara"
-#~ msgstr "LÃ¤nsi-Sahara"
+#~ msgid "Select User"
+#~ msgstr "Valitse kÃ¤yttÃ¤jÃ¤"
 
-#~ msgid "Yemen"
-#~ msgstr "Jemen"
+#~ msgid "_User"
+#~ msgstr "_KÃ¤yttÃ¤jÃ¤"
 
-#~ msgid "Zambia"
-#~ msgstr "Sambia"
+#~ msgid "_Sensitivity: "
+#~ msgstr "_Herkkyys: "
 
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
+#~ msgid "Send as Delegate"
+#~ msgstr "LÃ¤hetÃ¤ valtuutettuna"
 
-#~ msgid "AOL Instant Messenger"
-#~ msgstr "AOL pikaviestin"
+#~ msgid "Request a _read receipt for this message"
+#~ msgstr "PyydÃ¤ \"_luettu\"-kuittausta tÃ¤lle viestille"
 
-#~ msgid "Yahoo Messenger"
-#~ msgstr "Yahoo -pikaviestin"
+#~ msgid "Request a _delivery receipt for this message"
+#~ msgstr "PyydÃ¤ \"_toimitettu\"-kuittausta tÃ¤lle viestille"
 
-#~ msgid "Gadu-Gadu Messenger"
-#~ msgstr "Gadu-Gadu -pikaviestin"
+#~ msgid ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Private\n"
+#~ "Confidential"
+#~ msgstr ""
+#~ "Tavallinen\n"
+#~ "HenkilÃ¶kohtainen\n"
+#~ "Yksityinen\n"
+#~ "Luottamuksellinen"
 
-#~ msgid "Service"
-#~ msgstr "Palvelu"
+#~ msgid ""
+#~ "Normal\n"
+#~ "High\n"
+#~ "Low"
+#~ msgstr ""
+#~ "Tavallinen\n"
+#~ "Korkea\n"
+#~ "Matala"
 
-#~ msgid "Username"
-#~ msgstr "KÃ¤yttÃ¤jÃ¤tunnus"
+#~ msgid "I_mportance: "
+#~ msgstr "TÃ¤rk_eys: "
 
-#~ msgid "Address _2:"
-#~ msgstr "Osoite _2:"
+#~ msgid "Exchange - Send Options"
+#~ msgstr "Exchangen lÃ¤hetysasetukset"
 
-#~ msgid "Ci_ty:"
-#~ msgstr "_Kaupunki:"
+#~ msgid "<b>Tracking Options</b>"
+#~ msgstr "<b>Seuranta-asetukset</b>"
 
-#~ msgid "Countr_y:"
-#~ msgstr "M_aa:"
+#~ msgid "<b>Message Settings</b>"
+#~ msgstr "<b>Viestin asetukset</b>"
 
-#~ msgid "Full Address"
-#~ msgstr "_Osoite:"
+#~ msgid "Role: "
+#~ msgstr "Rooli: "
 
-#~ msgid "_ZIP Code:"
-#~ msgstr "Po_stinumero:"
+#~ msgid "Read items"
+#~ msgstr "Luetut kohdat"
 
-#~ msgid "Dr."
-#~ msgstr "Tr."
+#~ msgid "Folder visible"
+#~ msgstr "Kansio nÃ¤kyvissÃ¤"
 
-#~ msgid "Esq."
-#~ msgstr "Esq."
+#~ msgid "Folder owner"
+#~ msgstr "Kansion omistaja"
 
-#~ msgid "I"
-#~ msgstr "I"
+#~ msgid "Folder contact"
+#~ msgstr "Kansion sisÃ¤ltÃ¶"
 
-#~ msgid "II"
-#~ msgstr "II"
+#~ msgid "Edit Own Items"
+#~ msgstr "Muokkaa omia kohtia"
 
-#~ msgid "III"
-#~ msgstr "III"
+#~ msgid "Edit Any Items"
+#~ msgstr "Muokkaa kohtia"
 
-#~ msgid "Jr."
-#~ msgstr "Jr."
+#~ msgid "Delete Own Items"
+#~ msgstr "Poista omat kohdat"
 
-#~ msgid "Miss"
-#~ msgstr "Neiti"
+#~ msgid "Delete Any Items"
+#~ msgstr "Poista kohteita"
 
-#~ msgid "Mr."
-#~ msgstr "Hra."
+#~ msgid "Create subfolders"
+#~ msgstr "Luo alikansioita"
 
-#~ msgid "Mrs."
-#~ msgstr "Rva."
+#~ msgid "Create items"
+#~ msgstr "Luo kohteita"
 
-#~ msgid "Ms."
-#~ msgstr "Nti."
+#~ msgid "Cannot Edit"
+#~ msgstr "Ei voi muokata"
 
-#~ msgid "Sr."
-#~ msgstr "Hr."
+#~ msgid "Cannot Delete"
+#~ msgstr "Ei voi poistaa"
 
-#~ msgid "Add IM Account"
-#~ msgstr "LisÃ¤Ã¤ pikaviestitili"
+#~ msgid "<b>Permissions</b>"
+#~ msgstr "<b>Oikeudet</b>"
 
-#~ msgid "_Account name:"
-#~ msgstr "_Tilin nimi:"
+#~ msgid "Add User:"
+#~ msgstr "LisÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤:"
 
-#~ msgid "_IM Service:"
-#~ msgstr "_Pikaviestipalvelu:"
+#~ msgid "(Permission denied.)"
+#~ msgstr "(Lupa evÃ¤tty.)"
 
-#~ msgid "Name begins with"
-#~ msgstr "Nimi alkaa"
+#~ msgid "_Change Password"
+#~ msgstr "_Vaihda salasana"
 
-#~ msgid "_Print"
-#~ msgstr "_Tulosta"
+#~ msgid "Your password will expire in 7 days..."
+#~ msgstr "Salasanasi vanhenee seuraavan 7 pÃ¤ivÃ¤n kuluessa..."
 
-#~ msgid "Cop_y to Address Book..."
-#~ msgstr "_Kopioi osoitekirjaan..."
+#~ msgid "Password Expiry Warning..."
+#~ msgstr "Salasanan vanhentumisvaroitus..."
 
-#~ msgid "Mo_ve to Address Book..."
-#~ msgstr "_SiirrÃ¤ osoitekirjaan..."
+#~ msgid "Yes, Change Status"
+#~ msgstr "KyllÃ¤, vaihda tila"
 
-#~ msgid "Cu_t"
-#~ msgstr "_Leikkaa"
+#~ msgid "Out of Office Assistant"
+#~ msgstr "\"Poissa konttorilta\"-apulainen"
 
-#~ msgid "_Copy"
-#~ msgstr "_Kopioi"
+#~ msgid "No, Don't Change Status"
+#~ msgstr "Ei, Ã¤lÃ¤ muuta tilaa"
 
-#~ msgid "P_aste"
-#~ msgstr "L_iitÃ¤"
+#~ msgid "I am currently out of the office"
+#~ msgstr "Olen tÃ¤llÃ¤ hetkellÃ¤ poissa konttorilta"
 
-#~ msgid "Querying Address Book..."
-#~ msgstr "EtsitÃ¤Ã¤n osoitekirjasta..."
+#~ msgid "I am currently in the office"
+#~ msgstr "Olen tÃ¤llÃ¤ hetkellÃ¤ konttorilla"
 
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 pt. Tahoma"
+#~ msgid ""
+#~ "<small>The message specified below will be automatically sent to each person "
+#~ "who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+#~ msgstr ""
+#~ "<small>Alla mÃ¤Ã¤ritelty viesti lÃ¤hetetÃ¤Ã¤n automaattisesti jokaiselle "
+#~ "henkilÃ¶lle, joka lÃ¤hettÃ¤Ã¤\n"
+#~ "sinulle sÃ¤hkÃ¶postia kun olet poissa konttorilta.</small>"
 
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 pt. Tahoma"
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>Tila:</b>"
 
-#~ msgid "Blank forms at end:"
-#~ msgstr "TyhjiÃ¤ kaavakkeita lopussa:"
+#~ msgid "<b>Out of Office Message:</b>"
+#~ msgstr "<b>Poissa konttorilta-viesti:</b>"
 
-#~ msgid "Body"
-#~ msgstr "Runko"
+#~ msgid ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+#~ msgstr ""
+#~ "<b>Tilasi on tÃ¤llÃ¤ hetkellÃ¤ \"Poissa konttorilta\"</b>\n"
+#~ "\n"
+#~ "Haluatko muuttaa tilasi tilaan \"Konttorilla\"? "
 
-#~ msgid "Bottom:"
-#~ msgstr "Ala:"
+#, c-format
+#~ msgid "Unsubscribe from \"%s\""
+#~ msgstr "Peru \"%s\" tilaus"
 
-#~ msgid "Dimensions:"
-#~ msgstr "Mitat:"
+#, c-format
+#~ msgid "Really unsubscribe from folder \"%s\"?"
+#~ msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
-#~ msgid "F_ont..."
-#~ msgstr "_Kirjasin..."
+#~ msgid "Unsubscribe Folder..."
+#~ msgstr "Peru kansion tilaus..."
 
-#~ msgid "Fonts"
-#~ msgstr "Kirjasinlajit"
+#~ msgid "Exchange Folder Tree"
+#~ msgstr "Exchangen kansiopuu"
 
-#~ msgid "Footer:"
-#~ msgstr "Alatunniste:"
+#~ msgid "Subscribe to Other User's Folder"
+#~ msgstr "Tilaa muiden kÃ¤yttÃ¤jien kansioita"
 
-#~ msgid "Header/Footer"
-#~ msgstr "YlÃ¤-/Alatunniste"
+#~ msgid "Folder Size"
+#~ msgstr "Kansion koko"
 
-#~ msgid "Headings"
-#~ msgstr "Otsakkeet"
+#~ msgid "Folder Name"
+#~ msgstr "Kansion nimi"
 
-#~ msgid "Headings for each letter"
-#~ msgstr "Joka kirjeen otsakkeet"
+#~ msgid "Permissions..."
+#~ msgstr "Oikeudet..."
 
-#~ msgid "Height:"
-#~ msgstr "Korkeus:"
+#~ msgid "_Summarize permissions"
+#~ msgstr "_Yhteenveto oikeuksista"
 
-#~ msgid "Immediately follow each other"
-#~ msgstr "Seuraa vÃ¤littÃ¶mÃ¤sti toisiaan"
+#~ msgid "_Inbox:"
+#~ msgstr "_Saapuneet:"
 
-#~ msgid "Include:"
-#~ msgstr "SisÃ¤istÃ¤:"
+#~ msgid "_Delegate can see private items"
+#~ msgstr "_Valtuutettu voi nÃ¤hdÃ¤ yksityisiÃ¤ kohteita"
 
-#~ msgid "Landscape"
-#~ msgstr "Vaaka"
+#~ msgid ""
+#~ "These users will be able to send mail on your behalf\n"
+#~ "and access your folders with the permissions you give them."
+#~ msgstr ""
+#~ "NÃ¤mÃ¤ kÃ¤yttÃ¤jÃ¤t voivat lÃ¤hettÃ¤Ã¤ puolestasi sÃ¤hkÃ¶postia ja\n"
+#~ "lukea kansioitasi niillÃ¤ oikeuksilla, jotka heille myÃ¶nnÃ¤t."
 
-#~ msgid "Left:"
-#~ msgstr "Vasen:"
+#~ msgid "Delegates"
+#~ msgstr "Valtuutetut"
 
-#~ msgid "Letter tabs on side"
-#~ msgstr "Kirje tabulaattorit sivulla"
+#~ msgid "Co_ntacts:"
+#~ msgstr "Y_hteystiedot:"
 
-#~ msgid "Margins"
-#~ msgstr "Reunukset"
+#~ msgid "C_alendar:"
+#~ msgstr "K_alenteri:"
 
-#~ msgid "Number of columns:"
-#~ msgstr "Sarakkeiden mÃ¤Ã¤rÃ¤:"
+#~ msgid "Error reading delegates list."
+#~ msgstr "Virhe luettaessa listaa valtuutetuista."
 
-#~ msgid "Options"
-#~ msgstr "Asetukset"
+#, c-format
+#~ msgid "Could not add delegate %s"
+#~ msgstr "Valtuutettua %s ei voi lisÃ¤tÃ¤"
 
-#~ msgid "Orientation"
-#~ msgstr "Suunta"
+#~ msgid "Could not update list of delegates."
+#~ msgstr "Valtuutettujen listaa ei voi pÃ¤ivittÃ¤Ã¤."
 
-#~ msgid "Page"
-#~ msgstr "Sivu"
+#, c-format
+#~ msgid "Could not remove delegate %s"
+#~ msgstr "Valtuutettua %s ei voi poista"
 
-#~ msgid "Page Setup:"
-#~ msgstr "Sivun asetukset:"
+#, c-format
+#~ msgid "Could not find delegate %s in Active Directory"
+#~ msgstr "Valtuutettua %s ei lÃ¶ytynyt Active DirectorystÃ¤"
 
-#~ msgid "Paper"
-#~ msgstr "Paperi"
+#~ msgid "Could not find self in Active Directory"
+#~ msgstr "Omia tietoja ei lÃ¶ytynyt Active DirectorystÃ¤"
 
-#~ msgid "Paper source:"
-#~ msgstr "PaperilÃ¤hde:"
+#~ msgid "Could not access Active Directory"
+#~ msgstr "Active Directorya ei voi avata"
 
-#~ msgid "Portrait"
-#~ msgstr "Pysty"
+#, c-format
+#~ msgid "Remove the delegate %s?"
+#~ msgstr "Poistetaanko valtuutus %s?"
 
-#~ msgid "Preview:"
-#~ msgstr "Esikatselu:"
+#~ msgid "Delegate To"
+#~ msgstr "Valtuuta henkilÃ¶"
 
-#~ msgid "Print using gray shading"
-#~ msgstr "Tulosta kÃ¤yttÃ¤en harmaata varjostusta"
+#, c-format
+#~ msgid "You have been designated as a delegate for %s"
+#~ msgstr "Sinut on nimetty kÃ¤yttÃ¤jÃ¤n %s valtuutetuksi"
 
-#~ msgid "Reverse on even pages"
-#~ msgstr "Peilikuvareunukset"
+#~ msgid "However you are not permitted to see my private items."
+#~ msgstr "Sinulla ei kuitenkaan ole lupaa katsoa yksityisiÃ¤ tietojani."
 
-#~ msgid "Right:"
-#~ msgstr "Oikea:"
+#~ msgid "You are also permitted to see my private items."
+#~ msgstr "Sinulla on myÃ¶s lupa katsoa yksityisiÃ¤ tietojani."
 
-#~ msgid "Sections:"
-#~ msgstr "Osiot:"
+#~ msgid "You have been given the following permissions on my folders:"
+#~ msgstr "Sinulle on annettu seuraavat oikeudet kansioihini:"
 
-#~ msgid "Start on a new page"
-#~ msgstr "Aloita uudelta sivulta"
+#~ msgid ""
+#~ "This message was sent automatically by Evolution to inform you that you have "
+#~ "been designated as a delegate. You can now send messages on my behalf."
+#~ msgstr ""
+#~ "Evolution lÃ¤hetti tÃ¤mÃ¤n viestin automaattisesti kertoakseen, ettÃ¤ sinut on "
+#~ "merkitty valtuutetuksi. Voit nyt lÃ¤hettÃ¤Ã¤ viestejÃ¤ puolestani."
 
-#~ msgid "Style name:"
-#~ msgstr "Tyylin nimi:"
+#, c-format
+#~ msgid "Permissions for %s"
+#~ msgstr "Oikeudet kÃ¤yttÃ¤jÃ¤lle %s"
 
-#~ msgid "Top:"
-#~ msgstr "YlÃ¤:"
+#~ msgid "Delegate Permissions"
+#~ msgstr "Valtuutettujen oikeudet"
 
-#~ msgid "Width:"
-#~ msgstr "Leveys:"
+#~ msgid "Reviewer (read-only)"
+#~ msgstr "Tarkastaja (vain luku)"
 
-#~ msgid "_Font..."
-#~ msgstr "_Kirjasin..."
+#~ msgid "Author (read, create)"
+#~ msgstr "Kirjoittaja (lue, luo)"
 
-#~ msgid "Configure your timezone, Calendar and Task List here "
-#~ msgstr "MÃ¤Ã¤rittele aikavyÃ¶hykkeesi, kalenteri ja tehtÃ¤vÃ¤listasi"
+#~ msgid "Editor (read, create, edit)"
+#~ msgstr "Muokkaaja (kirjoita, luo, muokkaa)"
 
-#~ msgid "Evolution Calendar and Tasks"
-#~ msgstr "Evolutionin kalenteri ja tehtÃ¤vÃ¤t"
+#~ msgid "Custom"
+#~ msgstr "Oma nÃ¤kymÃ¤"
 
-#~ msgid "Evolution Calendar configuration control"
-#~ msgstr "Evolution kalenterin mÃ¤Ã¤rittely"
+#, c-format
+#~ msgid "Your password will expire in the next %d days"
+#~ msgstr "Salasanasi vanhenee seuraavan %d pÃ¤ivÃ¤n kuluessa"
 
-#~ msgid "Evolution Calendar scheduling message viewer"
-#~ msgstr "Evolution kalenterin ajanvarausviestien katselin"
+#~ msgid "Your current password has expired. Please change your password now."
+#~ msgstr "Salasanasi on vanhentunut. Ole hyvÃ¤ ja vaihda salasanasi nyt."
 
-#~ msgid "Evolution Calendar/Task editor"
-#~ msgstr "Evolutionin kalenterin/tehtÃ¤vien muokkain"
+#~ msgid "New Password:"
+#~ msgstr "Uusi salasana:"
 
-#~ msgid "Evolution's Calendar component"
-#~ msgstr "Evolutionin kalenterin komponentti"
+#~ msgid "Current Password:"
+#~ msgstr "Nykyinen salasana:"
 
-#~ msgid "Evolution's Memos component"
-#~ msgstr "Evolutionin muistilappukomponentti"
+#~ msgid "Confirm Password:"
+#~ msgstr "Varmista salasana:"
 
-#~ msgid "Evolution's Tasks component"
-#~ msgstr "Evolutionin tehtÃ¤vien komponentti"
+#~ msgid "The two passwords do not match. Please re-enter the passwords."
+#~ msgstr "Salasanat eivÃ¤t ole samat. SyÃ¶tÃ¤ salasanat uudestaan."
 
-#~ msgid "Memo_s"
-#~ msgstr "Mui_stilaput"
+#~ msgid ""
+#~ "The current password does not match the existing password for your account. "
+#~ "Please enter the correct password"
+#~ msgstr ""
+#~ "Nykyinen salasana ei vastaa tilisi olemassaolevaa salasanaa. SyÃ¶tÃ¤ oikea "
+#~ "salasana."
 
-#~ msgid "_Calendars"
-#~ msgstr "_Kalenterit"
+#, c-format
+#~ msgid "0 KB"
+#~ msgstr "0 kt"
 
-#~ msgid "Evolution Calendar alarm notification service"
-#~ msgstr "Evolutionin kalenterin hÃ¤lytyspalvelu"
+#, c-format
+#~ msgid "%s KB"
+#~ msgstr "%s kt"
 
-#~ msgid "minute"
-#~ msgid_plural "minutes"
-#~ msgstr[0] "minuutti"
-#~ msgstr[1] "minuuttia"
+#~ msgid "A_uthenticate"
+#~ msgstr "K_irjautuminen"
 
-#~ msgid "Start time"
-#~ msgstr "Alkamisaika"
+#~ msgid "_OWA URL:"
+#~ msgstr "_OWA URL:"
 
-#~ msgid "Dismiss _All"
-#~ msgstr "HylkÃ¤Ã¤ _kaikki"
+#~ msgid "Exchange Settings"
+#~ msgstr "Exchangen asetukset"
 
-#~ msgid "Snooze _time:"
-#~ msgstr "Torkkumisaika:"
+#~ msgid "Folders Size"
+#~ msgstr "Kansioiden koko"
 
-#~ msgid "_Dismiss"
-#~ msgstr "_HylkÃ¤Ã¤"
+#~ msgid "View the size of all Exchange folders"
+#~ msgstr "NÃ¤ytÃ¤ kaikkien Exchange-kansioiden koko"
 
-#~ msgid "_Snooze"
-#~ msgstr "_Torku"
+#~ msgid "Miscelleneous"
+#~ msgstr "Sekalaiset"
 
-#~ msgid "location of appointment"
-#~ msgstr "tapaamisen sijainti"
+#~ msgid "Delegation Assistant"
+#~ msgstr "Valtuutuksen apulainen"
 
-#~ msgid "No summary available."
-#~ msgstr "Ei yhteenvetoa saatavilla"
+#~ msgid "Manage the delegate settings for Exchange account"
+#~ msgstr "Muokkaa Exchange-tilin valtuutusasetuksia"
 
-#~ msgid "No description available."
-#~ msgstr "Ei kuvausta saatavilla"
+#~ msgid "Change Password"
+#~ msgstr "Vaihda salasana"
 
-#~ msgid "No location information available."
-#~ msgstr "Ei sijaintitietoja saatavilla"
+#~ msgid "Change the password for Exchange account"
+#~ msgstr "SyÃ¶tÃ¤ Exchange-tilin salasana"
 
-#~ msgid "You have %d alarms"
-#~ msgstr "Sinulla on %d hÃ¤lytystÃ¤"
+#~ msgid "I am in the office"
+#~ msgstr "Olen tavoitettavissa"
 
-#~ msgid ""
-#~ "Evolution does not support calendar reminders with\n"
-#~ "email notifications yet, but this reminder was\n"
-#~ "configured to send an email.  Evolution will display\n"
-#~ "a normal reminder dialog box instead."
-#~ msgstr ""
-#~ "Evolution ei vielÃ¤ tue kalenterin muistutuksia, joissa on\n"
-#~ "sÃ¤hkÃ¶postihuomautus, mutta tÃ¤mÃ¤ muistutus oli mÃ¤Ã¤ritelty\n"
-#~ "lÃ¤hettÃ¤mÃ¤Ã¤n sÃ¤hkÃ¶postia. Evolution nÃ¤yttÃ¤Ã¤ sen sijaan\n"
-#~ "tavallisen huomautusikkunan."
+#~ msgid "I am out of the office"
+#~ msgstr "En ole tavoitettavissa"
 
 #~ msgid ""
-#~ "An Evolution Calendar reminder is about to trigger. This reminder is "
-#~ "configured to run the following program:\n"
-#~ "\n"
-#~ "        %s\n"
-#~ "\n"
-#~ "Are you sure you want to run this program?"
+#~ "The message specified below will be automatically sent to \n"
+#~ "each person who sends mail to you while you are out of the office."
 #~ msgstr ""
-#~ "Evolution kalenterin muistutus laukeaa nyt. Muistutus on mÃ¤Ã¤ritelty "
-#~ "suorittamaan seuraavan ohjelman:\n"
-#~ "\n"
-#~ "         %s\n"
-#~ "\n"
-#~ "Haluatko varmasti suorittaa tÃ¤mÃ¤n ohjelman?"
+#~ "Alla mÃ¤Ã¤ritelty viesti lÃ¤hetÃ¤Ã¤n automaattisesti jokaiselle \n"
+#~ "henkilÃ¶lle, joka lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia sinulle kun et ole tavoitettavissa."
 
-#~ msgid "Do not ask me about this program again."
-#~ msgstr "Ã?lÃ¤ kysy tÃ¤stÃ¤ ohjelmasta enÃ¤Ã¤ uudestaan"
-
-#~ msgid "Could not initialize Bonobo"
-#~ msgstr "Bonobon alustus ei onnistunut"
+#~ msgid "Out Of Office"
+#~ msgstr "Poissa konttorilta"
 
 #~ msgid ""
-#~ "Could not create the alarm notify service factory, maybe it's already "
-#~ "running..."
+#~ "This option will connect to the Exchange server using standard plaintext "
+#~ "password authentication."
 #~ msgstr ""
-#~ "HÃ¤lytysten huomautuspalvelun tehdasta ei voi luoda, ehkÃ¤ se oli jo "
-#~ "kÃ¤ynnissÃ¤?"
+#~ "YhdistÃ¤ Exchange-palvelimelle kÃ¤yttÃ¤en tavallista selvÃ¤kielistÃ¤ salasanaa."
 
-#~ msgid "invalid time"
-#~ msgstr "epÃ¤kelpo aika"
+#~ msgid "Plaintext Password"
+#~ msgstr "SelvÃ¤kielinen salasana"
 
 #~ msgid ""
-#~ "Position of the vertical pane, between the task list and the task preview "
-#~ "pane, in pixels."
-#~ msgstr ""
-#~ "Vaakapaneelin sijainti pikseleinÃ¤, tehtÃ¤vÃ¤listan ja tehtÃ¤vÃ¤n esikatselun "
-#~ "vÃ¤lissÃ¤."
+#~ "This option will connect to the Exchange server using secure password (NTLM) "
+#~ "authentication."
+#~ msgstr "YhdistÃ¤ Exchange-palvelimelle kÃ¤yttÃ¤en turvallista salasanaa (NTLM)."
 
-#~ msgid "Whether to use daylight savings time while displaying events."
-#~ msgstr "KÃ¤ytetÃ¤Ã¤nkÃ¶ kesÃ¤aikaa nÃ¤ytettÃ¤essÃ¤ tapahtumia."
+#~ msgid "Secure Password"
+#~ msgstr "Turvallinen salasana"
 
-#~ msgid "daylight savings time"
-#~ msgstr "kesÃ¤aika"
+#~ msgid "_User:"
+#~ msgstr "_KÃ¤yttÃ¤jÃ¤:"
 
-#~ msgid "Category is"
-#~ msgstr "Luokka on"
-
-#~ msgid "Comment contains"
-#~ msgstr "Kommentti sisÃ¤ltÃ¤Ã¤"
+#~ msgid "_Account:"
+#~ msgstr "_Tili:"
 
-#~ msgid "Location contains"
-#~ msgstr "Sijainti sisÃ¤ltÃ¤Ã¤"
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Avaa muiden kÃ¤yttÃ¤jien kansioita"
 
-#~ msgid "_Make available for offline use"
-#~ msgstr "_Kopioi kÃ¤ytettÃ¤vÃ¤ksi yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
+#~ msgid "Querying server"
+#~ msgstr "KysytÃ¤Ã¤n palvelimelta"
 
-#~ msgid "_Do not make available for offline use"
-#~ msgstr "_Ã?lÃ¤ kopioi kÃ¤ytettÃ¤vÃ¤ksi yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
+#~ msgid "Mark all messages as read"
+#~ msgstr "Merkitse kaikki viestit luetuiksi"
 
-#~ msgid "Failed upgrading calendars."
-#~ msgstr "Kalenterien pÃ¤ivitys epÃ¤onnistui."
+#~ msgid "Discard changes?"
+#~ msgstr "HylkÃ¤Ã¤ muutokset?"
 
-#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
-#~ msgstr ""
-#~ "Kalenterin \"%s\" avaus tehtÃ¤vien ja kokousten luontia varten epÃ¤onnistui"
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "Poistetaanko viestit hakunÃ¤kymÃ¤ssÃ¤?"
 
-#~ msgid "There is no calendar available for creating events and meetings"
-#~ msgstr "TehtÃ¤vien ja kokousten luontia varten ei lÃ¶ydy kalenteria"
+#~ msgid "Delete account?"
+#~ msgstr "Poista tili?"
 
-#~ msgid "New appointment"
-#~ msgstr "Uusi tapaaminen"
+#, c-format
+#~ msgid "Invalid folder: `%s'"
+#~ msgstr "Virheellinen kansio: ' %s'"
 
-#~ msgid "New meeting"
-#~ msgstr "Uusi tapaaminen"
+#, c-format
+#~ msgid "Trying to movemail a non-mbox source `%s'"
+#~ msgstr "Yritettiin 'movemail':ia lÃ¤hteelle '%s', joka ei ole tyyppiÃ¤ mbox"
 
-#~ msgid "New all day appointment"
-#~ msgstr "Uusi koko pÃ¤ivÃ¤n tapaaminen"
+#, c-format
+#~ msgid "Could not create spool directory `%s': %s"
+#~ msgstr "Saapuvien kansiota '%s' ei voi luoda: %s"
 
-#~ msgid "New calendar"
-#~ msgstr "Uusi kalenteri"
+#, c-format
+#~ msgid "Reconnecting to %s"
+#~ msgstr "Otetaan uudestaan yhteyttÃ¤ kohteeseen %s"
 
-#~ msgid "Error while opening the calendar"
-#~ msgstr "Virhe avattaessa kalenteria"
+#, c-format
+#~ msgid "Disconnecting from %s"
+#~ msgstr "YhteyttÃ¤ %s katkaistaan"
 
-#~ msgid "Method not supported when opening the calendar"
-#~ msgstr "MenetelmÃ¤ ei ollut tuettu avattaessa kalenteria"
+#~ msgid "Expunging folder"
+#~ msgstr "Poistetaan poistettuja kansiosta"
 
-#~ msgid "Permission denied to open the calendar"
-#~ msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
+#~ msgid "Refreshing folder"
+#~ msgstr "VirkistetÃ¤Ã¤n kansiota"
 
-#~ msgid "Unknown error"
-#~ msgstr "Tuntematon virhe"
+#, c-format
+#~ msgid "Removing folder %s"
+#~ msgstr "Poistetaan kansiota %s"
 
-#~ msgid "after"
-#~ msgstr "jÃ¤lkeen"
+#, c-format
+#~ msgid "Opening store %s"
+#~ msgstr "Avataan tallennustilaa %s"
 
-#~ msgid "day(s)"
-#~ msgstr "pÃ¤ivÃ¤"
+#, c-format
+#~ msgid "Opening folder %s"
+#~ msgstr "Avataan kansiota %s"
 
-#~ msgid "end of appointment"
-#~ msgstr "tapaamisen pÃ¤Ã¤ttymistÃ¤"
+#, c-format
+#~ msgid "Copying messages to %s"
+#~ msgstr "Kopioidaan viestejÃ¤ kohteeseen %s"
 
-#~ msgid "hour(s)"
-#~ msgstr "tunti(a)"
+#, c-format
+#~ msgid "Moving messages to %s"
+#~ msgstr "SiirretÃ¤Ã¤n viestejÃ¤ kohteeseen %s"
 
-#~ msgid "minute(s)"
-#~ msgstr "minuutti(a)"
+#~ msgid "Saving message to folder"
+#~ msgstr "Tallennetaan viestiÃ¤ kansioon"
 
-#~ msgid "Adjust for daylight sa_ving time"
-#~ msgstr "SÃ¤Ã¤dÃ¤ _kesÃ¤ajan mukaan"
+#, c-format
+#~ msgid "Failed to append to local `Sent' folder: %s"
+#~ msgstr "Viestin lisÃ¤ys paikalliseen 'LÃ¤hetetyt'-kansioon epÃ¤onnistui: %s"
 
-#~ msgid "Attached message - %s"
-#~ msgstr "Liitetty viesti - %s"
+#, c-format
+#~ msgid ""
+#~ "Failed to append to %s: %s\n"
+#~ "Appending to local `Sent' folder instead."
+#~ msgstr ""
+#~ "LisÃ¤ys '%s':Ã¤Ã¤n epÃ¤onnistui: %s\n"
+#~ "LisÃ¤tÃ¤Ã¤n paikalliseen 'LÃ¤hetetyt' kansioon."
 
-#~ msgid "Cancel _Drag"
-#~ msgstr "Peruuta _raahaus"
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">Salaus</span>"
 
-#~ msgid "<b>%d</b> Attachment"
-#~ msgid_plural "<b>%d</b> Attachments"
-#~ msgstr[0] "<b>%d</b> liite"
-#~ msgstr[1] "<b>%d</b> liitettÃ¤"
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">Digitaalinen allekirjoitus</span>"
 
-#~ msgid "Hide Attachment _Bar"
-#~ msgstr "Piilota _liitepalkki"
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>HakunÃ¤kymien lÃ¤hteet</b>"
 
-#~ msgid "Show Attachment _Bar"
-#~ msgstr "NÃ¤ytÃ¤ _liitepalkki"
+#~ msgid "Signatures Table"
+#~ msgstr "Allekirjoitusten taulu"
 
-#~ msgid "Show Attachments"
-#~ msgstr "NÃ¤ytÃ¤ liitteet"
+#~ msgid "Message Composer"
+#~ msgstr "Viestin muokkain"
 
-#~ msgid "Press space key to toggle attachment bar"
-#~ msgstr "NÃ¤ytÃ¤ tai piilota liitepalkki vÃ¤lilyÃ¶nnillÃ¤"
+#~ msgid "Email Accounts"
+#~ msgstr "SÃ¤hkÃ¶postitilit"
 
-#~ msgid "_Add "
-#~ msgstr "_LisÃ¤Ã¤ "
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Balttilainen (ISO-8859-4)"
 
-#~ msgid "1 day before appointment"
-#~ msgstr "Yksi pÃ¤ivÃ¤ ennen tapaamista"
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Balttilainen (ISO-8859-13)"
 
-#~ msgid "1 hour before appointment"
-#~ msgstr "Yksi tunti ennen tapaamista"
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">TunnistautumismenetelmÃ¤</span>"
 
-#~ msgid "15 minutes before appointment"
-#~ msgstr "15 minuuttia ennen tapaamista"
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">Palvelimen asetukset</span>"
 
-#~ msgid "for"
-#~ msgstr "kesto"
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">LÃ¤hetetyt viestit ja luonnokset</span>"
 
-#~ msgid "<b>Att_endees</b>"
-#~ msgstr "<b>_LÃ¤snÃ¤olijat</b>"
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">Turvallisuus</span>"
 
-#~ msgid "C_hange Organizer"
-#~ msgstr "Vaihda _jÃ¤rjestÃ¤jÃ¤Ã¤"
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#~ msgid "Co_ntacts..."
-#~ msgstr "_Yhteystiedot..."
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">Vaadittavat tiedot</span>"
 
-#~ msgid "forever"
-#~ msgstr "ikuisesti"
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Tulostettavat kirjasimet</span>"
 
-#~ msgid "month(s)"
-#~ msgstr "kuukausi"
+#~ msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+#~ msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#~ msgid "week(s)"
-#~ msgstr "viikko"
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">Asetukset</span>"
 
-#~ msgid "year(s)"
-#~ msgstr "vuosi"
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">Valinnaiset tiedot</span>"
 
-#~ msgid "untitled_image.%s"
-#~ msgstr "nimetÃ¶n_kuva.%s"
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr "<span weight=\"bold\">Viestin vastaanottajat</span>"
 
-#~ msgid "_Save As..."
-#~ msgstr "Tallenna _nimellÃ¤..."
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">Kuvien lataus</span>"
 
-#~ msgid "_Save Selected"
-#~ msgstr "Tallenna _valitut"
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">MerkinnÃ¤t</span>"
 
-#~ msgid "P_rint..."
-#~ msgstr "T_ulosta..."
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">_NÃ¤ytettÃ¤vÃ¤t viestin otsakkeet</span>"
 
-#~ msgid "C_ut"
-#~ msgstr "L_eikkaa"
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">Oletustoimintatapa</span>"
 
-#~ msgid "_Paste"
-#~ msgstr "L_iitÃ¤"
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">Asetukset</span>"
 
-#~ msgid "_Forward as iCalendar"
-#~ msgstr "_VÃ¤litÃ¤ iCalendar-muodossa"
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">Viestien kirjoitus</span>"
 
-#~ msgid "_Mark Selected Tasks as Complete"
-#~ msgstr "_Merkitse valitut tehtÃ¤vÃ¤t valmiiksi"
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">Tunnistus</span>"
 
-#~ msgid "_Mark Selected Tasks as Incomplete"
-#~ msgstr "_Merkitse valitut tehtÃ¤vÃ¤t keskenerÃ¤isiksi"
+#~ msgid "<span weight=\"bold\">Account Information</span>"
+#~ msgstr "<span weight=\"bold\">Tilin tiedot</span>"
 
-#~ msgid "_Delete Selected Tasks"
-#~ msgstr "_Poista valitut tehtÃ¤vÃ¤t"
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>Kielet</b>"
 
-#~ msgid "Select T_oday"
-#~ msgstr "Valitse _tÃ¤mÃ¤ pÃ¤ivÃ¤"
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>YlÃ¤postituksen valinta</b> (ei suositeltu)"
 
-#~ msgid "_Select Date..."
-#~ msgstr "_Valitse pÃ¤ivÃ¤ys..."
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>Alle_kirjoitukset</b>"
 
-#~ msgid "Pri_nt..."
-#~ msgstr "T_ulosta..."
+#~ msgid "<b>SSL is not supported in this build of Evolution</b>"
+#~ msgstr "<b>SSL ei ole tuettu tÃ¤ssÃ¤ Evolutionin kÃ¤Ã¤nnÃ¶ksessÃ¤</b>"
 
-#~ msgid "_Delete Selected Memos"
-#~ msgstr "_Poista valitut muistilaput"
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "SÃ¤hkÃ¶postin asetusten tai kansioiden pÃ¤ivitys epÃ¤onnistui."
 
-#~ msgid "Completing tasks..."
-#~ msgstr "ViimeistellÃ¤Ã¤n tehtÃ¤viÃ¤..."
+#~ msgid "New Mail Folder"
+#~ msgstr "Uusi sÃ¤hkÃ¶postikansio"
 
-#~ msgid "Expunging"
-#~ msgstr "Poistetaan poistettuja"
+#~ msgid "New Mail Message"
+#~ msgstr "Uusi viesti"
 
-#~ msgid "_Custom View"
-#~ msgstr "_Oma nÃ¤kymÃ¤"
+#, c-format
+#~ msgid "Importing `%s'"
+#~ msgstr "Tuodaan '%s'"
 
-#~ msgid "_Save Custom View"
-#~ msgstr "_Tallenna oma nÃ¤kymÃ¤"
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "NÃ¤ytÃ¤ vierekkÃ¤istÃ¤, leveÃ¤Ã¤ asettelua"
 
-#~ msgid "_Define Views..."
-#~ msgstr "_MÃ¤Ã¤rittele nÃ¤kymÃ¤t..."
+#~ msgid "Thread the message-list"
+#~ msgstr "SÃ¤ikeistÃ¤ viestiluettelo"
 
-#~ msgid "Loading tasks at %s"
-#~ msgstr "Ladataan tehtÃ¤viÃ¤ %s"
+#~ msgid "Thread the message list."
+#~ msgstr "SÃ¤ikeistÃ¤ viestiluettelo"
 
-#~ msgid "Loading memos at %s"
-#~ msgstr "Ladataan muistilappuja lÃ¤hteestÃ¤ %s"
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr "Kysy vahvistus haluaako kÃ¤yttÃ¤jÃ¤ siirtyÃ¤ yhteydettÃ¶mÃ¤Ã¤n tilaan heti"
 
-#~ msgid "Purging"
-#~ msgstr "TyhjennetÃ¤Ã¤n"
+#~ msgid "Message Window default height"
+#~ msgstr "Viesti-ikkunan oletuskorkeus"
 
-#~ msgid "April"
-#~ msgstr "Huhtikuu"
+#~ msgid ""
+#~ "It disables/enables the repeated prompts to ask if offline sync is required "
+#~ "before going into offline mode."
+#~ msgstr ""
+#~ "Poistaa kÃ¤ytÃ¶stÃ¤ ominaisuuden, joka kysyy useita kertoja vaaditaanko "
+#~ "synkronointia yhteydettÃ¶mÃ¤Ã¤n tilaan siirryttÃ¤essÃ¤."
 
-#~ msgid "August"
-#~ msgstr "Elokuu"
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr ""
+#~ "Jos \"Esikatselu\"-paneeli on kÃ¤ytÃ¶ssÃ¤, se nÃ¤ytetÃ¤Ã¤n viestiluettelon "
+#~ "vieressÃ¤ eikÃ¤ alapuolella."
 
-#~ msgid "December"
-#~ msgstr "Joulukuu"
+#~ msgid "_Reply to sender"
+#~ msgstr "_Vastaa lÃ¤hettÃ¤jÃ¤lle"
 
-#~ msgid "February"
-#~ msgstr "Helmikuu"
+#, c-format
+#~ msgid "Unable to create local mail folders at `%s': %s"
+#~ msgstr "Paikallisia sÃ¤hkÃ¶postikansioita ei voi luoda paikkaan '%s': %s"
 
-#~ msgid "January"
-#~ msgstr "Tammikuu"
+#, c-format
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "Paikallista sÃ¤hkÃ¶postitilaa '%s' ei voi luoda: %s"
 
-#~ msgid "July"
-#~ msgstr "HeinÃ¤kuu"
+#, c-format
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "POP3 keep-on-server tietoa `%s' ei voi kopioida: %s"
 
-#~ msgid "June"
-#~ msgstr "KesÃ¤kuu"
+#, c-format
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "POP3 keep-on-server tietojen hakemistoa '%s' ei voi luoda: %s"
 
-#~ msgid "March"
-#~ msgstr "Maaliskuu"
+#, c-format
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "Vanhaa POP keep-on-server tietoa '%s' ei voi avata: %s"
 
-#~ msgid "May"
-#~ msgstr "Toukokuu"
+#, c-format
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "SÃ¤hkÃ¶postin lÃ¤pikÃ¤ynti kohteesta '%s' epÃ¤onnistui: %s"
 
-#~ msgid "November"
-#~ msgstr "Marraskuu"
+#, c-format
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "Kansiota %s ei voi kopioidaan kohtaan %s: %s"
 
-#~ msgid "October"
-#~ msgstr "Lokakuu"
+#, c-format
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "Kansiota '%s' ei voi luoda: %s"
 
-#~ msgid "September"
-#~ msgstr "Syyskuu"
+#~ msgid "Tag"
+#~ msgstr "MerkintÃ¤"
 
-#~ msgid "Failed upgrading memos."
-#~ msgstr "Muistilappujen pÃ¤ivitys epÃ¤onnistui."
+#~ msgid "Show _Original Size"
+#~ msgstr "NÃ¤ytÃ¤ alkuperÃ¤inen k_oko"
 
-#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
-#~ msgstr ""
-#~ "Muistilappulistaa '%s' ei voi avata uusien tapahtumien ja kokousten "
-#~ "lisÃ¤Ã¤mistÃ¤ varten"
+#~ msgid "_Fit to Width"
+#~ msgstr "Sovita _leveyteen"
 
-#~ msgid "There is no calendar available for creating memos"
-#~ msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "HakunÃ¤kymÃ¤ _aiheen perusteella"
 
-#~ msgid "New shared memo"
-#~ msgstr "Uusi jaettu muistilappu"
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "_Luo viestistÃ¤ sÃ¤Ã¤ntÃ¶"
 
-#~ msgctxt "New"
-#~ msgid "Memo li_st"
-#~ msgstr "Muistilappu_lista"
+#~ msgid "Cl_ear Flag"
+#~ msgstr "_Poista merkki"
 
-#~ msgid "Failed upgrading tasks."
-#~ msgstr "TehtÃ¤vÃ¤listan pÃ¤ivitys epÃ¤onnistui."
+#~ msgid "Fla_g Completed"
+#~ msgstr "_Merkitse valmiiksi"
 
-#~ msgid "Unable to open the task list '%s' for creating events and meetings"
-#~ msgstr ""
-#~ "TehtÃ¤vÃ¤listaa '%s' ei voi avata uusien tehtÃ¤vien ja tapaamisten tekemistÃ¤ "
-#~ "varten"
+#~ msgid "U_ndelete"
+#~ msgstr "_Palauta"
 
-#~ msgid "There is no calendar available for creating tasks"
-#~ msgstr "TehtÃ¤vien luomiseen tarvittavaa kalenteria ei ole saatavilla"
+#, c-format
+#~ msgid "Creating folder `%s'"
+#~ msgstr "Luodaan kansiota %s"
 
-#~ msgid "New task"
-#~ msgstr "Uusi tehtÃ¤vÃ¤"
+#~ msgid "_Move..."
+#~ msgstr "_SiirrÃ¤..."
 
-#~ msgid "New assigned task"
-#~ msgstr "Uusi tehtÃ¤vÃ¤ksianto"
+#~ msgid "Open in _New Window"
+#~ msgstr "Avaa _uudessa ikkunassa"
 
-#~ msgctxt "New"
-#~ msgid "Tas_k list"
-#~ msgstr "_TehtÃ¤vÃ¤lista"
+#~ msgid "_Move to Folder"
+#~ msgstr "_SiirrÃ¤ kansioon"
 
-#~ msgid "Could not open autosave file"
-#~ msgstr "Automaattitallennuksen tiedostoa ei voi avata"
+#~ msgid "_Copy to Folder"
+#~ msgstr "_Kopioi kansioon"
 
-#~ msgid "_Post-To Field"
-#~ msgstr "_Postitusosoite-kenttÃ¤ (Post-To)"
+#~ msgid "Signature(s)"
+#~ msgstr "Allekirjoitukset"
 
-#~ msgid "Toggles whether the Post-To field is displayed"
-#~ msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Postitusosoite-kenttÃ¤"
+#~ msgid "[Default]"
+#~ msgstr "[Oletus]"
 
-#~ msgid "_Subject Field"
-#~ msgstr "Ot_sikko-kenttÃ¤"
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "Evolutionin sÃ¤hkÃ¶postin asetukset"
 
-#~ msgid "Toggles whether the Subject field is displayed"
-#~ msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ otsikkokenttÃ¤"
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "Evolutionin viestimuokkaimen asetukset"
 
-#~ msgid "_To Field"
-#~ msgstr "_Vastaanottaja-kenttÃ¤"
+#~ msgid "Evolution Mail composer"
+#~ msgstr "Evolutionin sÃ¤hkÃ¶postin muokkain"
 
-#~ msgid "Toggles whether the To field is displayed"
-#~ msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Vastaanottaja-kenttÃ¤"
+#~ msgid "Evolution Mail component"
+#~ msgstr "Evolutionin sÃ¤hkÃ¶postikomponentti"
 
-#~ msgid "Component"
-#~ msgstr "Komponentti"
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "Evolutionin sÃ¤hkÃ¶postitilien asetukset"
 
-#~ msgid "Label name cannot be empty."
-#~ msgstr "MerkinnÃ¤lle tÃ¤ytyy antaa nimi."
+#~ msgid "Configure your email accounts here"
+#~ msgstr "MÃ¤Ã¤rittele sÃ¤hkÃ¶postitilisi tÃ¤stÃ¤"
 
-#~ msgid ""
-#~ "A label having the same tag already exists on the server. Please rename "
-#~ "your label."
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
 #~ msgstr ""
-#~ "Samanniminen merkintÃ¤ on jo tallennettu palvelimelle. NimeÃ¤ merkintÃ¤ "
-#~ "uudestaan."
-
-#~ msgid "ago"
-#~ msgstr "sitten"
-
-#~ msgid "months"
-#~ msgstr "kuukautta"
-
-#~ msgid "the time you specify"
-#~ msgstr "mÃ¤Ã¤rittelemÃ¤si aika"
-
-#~ msgid "years"
-#~ msgstr "vuotta"
+#~ "MÃ¤Ã¤rittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset tÃ¤stÃ¤"
 
 #~ msgid ""
 #~ "Configure mail preferences, including security and message display, here"
@@ -24290,878 +24200,953 @@ msgstr "Kahvan ponnahdusikkuna"
 #~ "MÃ¤Ã¤rittele sÃ¤hkÃ¶postiasetuksia mukaan lukien turva-asetukset ja viestin "
 #~ "nÃ¤yttÃ¶"
 
-#~ msgid "Configure spell-checking, signatures, and the message composer here"
-#~ msgstr ""
-#~ "MÃ¤Ã¤rittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset "
-#~ "tÃ¤stÃ¤"
-
-#~ msgid "Configure your email accounts here"
-#~ msgstr "MÃ¤Ã¤rittele sÃ¤hkÃ¶postitilisi tÃ¤stÃ¤"
-
-#~ msgid "Configure your network connection settings here"
-#~ msgstr "MÃ¤Ã¤rittele verkkoyhteysasetukset tÃ¤stÃ¤"
-
-#~ msgid "Evolution Mail"
-#~ msgstr "Evolution-sÃ¤hkÃ¶posti"
-
-#~ msgid "Evolution Mail accounts configuration control"
-#~ msgstr "Evolutionin sÃ¤hkÃ¶postitilien asetukset"
-
-#~ msgid "Evolution Mail component"
-#~ msgstr "Evolutionin sÃ¤hkÃ¶postikomponentti"
-
-#~ msgid "Evolution Mail composer"
-#~ msgstr "Evolutionin sÃ¤hkÃ¶postin muokkain"
-
-#~ msgid "Evolution Mail composer configuration control"
-#~ msgstr "Evolutionin viestimuokkaimen asetukset"
-
-#~ msgid "Evolution Mail preferences control"
-#~ msgstr "Evolutionin sÃ¤hkÃ¶postin asetukset"
-
-#~ msgid "Evolution Network configuration control"
-#~ msgstr "Evolutionin verkkoyhteyden asetukset"
-
-#~ msgid "[Default]"
-#~ msgstr "[Oletus]"
-
-#~ msgid "Signature(s)"
-#~ msgstr "Allekirjoitukset"
-
-#~ msgid "Account Search"
-#~ msgstr "Haku tileiltÃ¤"
-
-#~ msgid "All Account Search"
-#~ msgstr "Etsi kaikilta tileiltÃ¤"
-
-#~ msgid "_Copy to Folder"
-#~ msgstr "_Kopioi kansioon"
-
-#~ msgid "_Move to Folder"
-#~ msgstr "_SiirrÃ¤ kansioon"
-
-#~ msgid "Open in _New Window"
-#~ msgstr "Avaa _uudessa ikkunassa"
-
-#~ msgid "_Move..."
-#~ msgstr "_SiirrÃ¤..."
-
-#~ msgid "Re_fresh"
-#~ msgstr "Vi_rkistÃ¤"
-
-#~ msgid "_Unread Search Folder"
-#~ msgstr "_Lukemattomien hakukansio"
-
-#~ msgid "U_ndelete"
-#~ msgstr "_Palauta"
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "_Merkitse valmiiksi"
+#~ msgid "Rule name"
+#~ msgstr "SÃ¤Ã¤nnÃ¶n nimi"
 
-#~ msgid "Cl_ear Flag"
-#~ msgstr "_Poista merkki"
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>_SuodatinsÃ¤Ã¤nnÃ¶t</b>"
 
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "_Luo viestistÃ¤ sÃ¤Ã¤ntÃ¶"
+#~ msgid "Test"
+#~ msgstr "Testi"
 
-#~ msgid "Search Folder based on _Subject"
-#~ msgstr "HakunÃ¤kymÃ¤ _aiheen perusteella"
-
-#~ msgid "Search Folder based on Se_nder"
-#~ msgstr "HakunÃ¤kymÃ¤ _lÃ¤hettÃ¤jÃ¤n perusteella"
-
-#~ msgid "Search Folder based on _Recipients"
-#~ msgstr "HakunÃ¤kymÃ¤ _vastaanottajien perusteella"
-
-#~ msgid "Filter based on Sub_ject"
-#~ msgstr "Suodata a_iheen mukaan"
-
-#~ msgid "Filter based on Sen_der"
-#~ msgstr "Suodata _lÃ¤hettÃ¤jÃ¤n mukaan"
+#~ msgid "Choose a file"
+#~ msgstr "Valitse tiedosto"
 
-#~ msgid "Filter based on Re_cipients"
-#~ msgstr "Suodata _vastaanottajien mukaan"
-
-#~ msgid "Filter based on _Mailing List"
-#~ msgstr "Suodata _postituslistan mukaan"
-
-#~ msgid "Retrieving Message..."
-#~ msgstr "Noudetaan viestiÃ¤..."
-
-#~ msgid "C_all To..."
-#~ msgstr "_Soita..."
+#~ msgid "Label name cannot be empty."
+#~ msgstr "MerkinnÃ¤lle tÃ¤ytyy antaa nimi."
 
-#~ msgid "Completed on %B %d, %Y, %l:%M %p"
-#~ msgstr "Valmistui %B %d, %Y, %l.%M %p"
+#~ msgid "Overwrite file?"
+#~ msgstr "Kirjoita tiedoston yli?"
 
-#~ msgid "by %B %d, %Y, %l:%M %p"
-#~ msgstr "kirjoittanut %d %l.%M %p"
+#~ msgid "Evolution Query"
+#~ msgstr "Evolutionin kysely"
 
-#~ msgid "_Fit to Width"
-#~ msgstr "Sovita _leveyteen"
+#~ msgid "calendar information"
+#~ msgstr "Kalenterin tietoja"
 
-#~ msgid "Show _Original Size"
-#~ msgstr "NÃ¤ytÃ¤ alkuperÃ¤inen k_oko"
+#~ msgid "address card"
+#~ msgstr "osoitekortti"
 
-#~ msgid "_Save Selected..."
-#~ msgstr "_Tallenna valinta..."
+#~ msgid "You cannot attach the file `{0}' to this message."
+#~ msgstr "Et voi lisÃ¤tÃ¤ tiedostoa '{0}' tÃ¤hÃ¤n viestiin."
 
-#~ msgid "%d at_tachment"
-#~ msgid_plural "%d at_tachments"
-#~ msgstr[0] "%d lii_te"
-#~ msgstr[1] "%d lii_tettÃ¤"
+#~ msgid "Warning: Modified Message"
+#~ msgstr "Varoitus: Muutettu viesti"
 
-#~ msgid "S_ave"
-#~ msgstr "T_allenna"
+#~ msgid "Unfinished messages found"
+#~ msgstr "ViimeistelemÃ¤tÃ¶n viesti lÃ¶ytyi"
 
-#~ msgid "No Attachment"
-#~ msgstr "Ei liitteitÃ¤"
+#~ msgid ""
+#~ "To attach the contents of this directory, either attach the files in this "
+#~ "directory individually, or create an archive of the directory and attach it."
+#~ msgstr ""
+#~ "Jos haluat lisÃ¤tÃ¤ hakemiston sisÃ¤llÃ¶n, liitÃ¤ joko jokainen tiedosto "
+#~ "hakemistossa erikseen tai luo arkisto hakemistosta ja liitÃ¤ arkisto."
 
-#~ msgid " (%a, %R %Z)"
-#~ msgstr " (%a. %R %Z)"
+#~ 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Ã¤."
 
-#~ msgid " (%R %Z)"
-#~ msgstr " (%R %Z)"
+#~ msgid "Send options not available."
+#~ msgstr "LÃ¤hetysasetukset eivÃ¤t ole saatavilla."
 
-#~ msgid "Tag"
-#~ msgstr "MerkintÃ¤"
+#~ msgid "Directories can not be attached to Messages."
+#~ msgstr "Hakemistoja ei voi liittÃ¤Ã¤ viesteihin."
 
-#~ msgid "_Reply to sender"
-#~ msgstr "_Vastaa lÃ¤hettÃ¤jÃ¤lle"
+#~ msgid "Unable to retrieve message from editor"
+#~ msgstr "ViestiÃ¤ ei voi hakea muokkaimelta"
 
-#~ msgid "Add address"
-#~ msgstr "LisÃ¤Ã¤ osoite"
+#~ msgid "Hide _Attachment Bar"
+#~ msgstr "Piilota _liitepalkki"
 
-#~ msgid "Default height of the message window."
-#~ msgstr "Viesti-ikkunan oletuskorkeus."
+#~ msgid "New assigned task"
+#~ msgstr "Uusi tehtÃ¤vÃ¤ksianto"
 
-#~ msgid "Default width of the message window."
-#~ msgstr "Viesti-ikkunan oletusleveys."
+#~ msgid "New task"
+#~ msgstr "Uusi tehtÃ¤vÃ¤"
 
-#~ msgid ""
-#~ "Enable side bar search feature so that you can start interactive "
-#~ "searching by typing in the text. Use is that you can easily find a folder "
-#~ "in that side bar by just typing the folder name and the selection jumps "
-#~ "automatically to that folder."
-#~ msgstr ""
-#~ "Ota kÃ¤yttÃ¶Ã¶n sivupalkin hakutoiminto, jonka avulla voit aloittaa "
-#~ "interaktiivisen haun kirjoittamalla etsittÃ¤vÃ¤n tekstin. Voit kÃ¤yttÃ¤Ã¤ tÃ¤tÃ¤ "
-#~ "etsimÃ¤Ã¤n kansioita sivupaneelista kirjoittamalla kansion nimi, jolloin "
-#~ "valinta hyppÃ¤Ã¤ suoraan kansion kohdalle."
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "TehtÃ¤vien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#~ msgid ""
-#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
-#~ "vertically."
+#, c-format
+#~ msgid "Unable to open the task list '%s' for creating events and meetings"
 #~ msgstr ""
-#~ "Jos \"Esikatselu\"-paneeli on kÃ¤ytÃ¶ssÃ¤, se nÃ¤ytetÃ¤Ã¤n viestiluettelon "
-#~ "vieressÃ¤ eikÃ¤ alapuolella."
-
-#~ msgid "Message Window default height"
-#~ msgstr "Viesti-ikkunan oletuskorkeus"
+#~ "TehtÃ¤vÃ¤listaa '%s' ei voi avata uusien tehtÃ¤vien ja tapaamisten tekemistÃ¤ "
+#~ "varten"
 
-#~ msgid "Message Window default width"
-#~ msgstr "Viestiikkunan oletusleveys"
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "TehtÃ¤vÃ¤listan pÃ¤ivitys epÃ¤onnistui."
 
-#~ msgid "Use side-by-side or wide layout"
-#~ msgstr "NÃ¤ytÃ¤ vierekkÃ¤istÃ¤, leveÃ¤Ã¤ asettelua"
+#, c-format
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "TehtÃ¤vien '%s' muunnos epÃ¤onnistui"
 
-#~ msgid "View/Bcc menu item is checked"
-#~ msgstr "NÃ¤ytÃ¤/Bcc on valittu"
+#, c-format
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "Kalenterin '%s' muunnos epÃ¤onnistui"
 
-#~ msgid "View/Bcc menu item is checked."
-#~ msgstr "NÃ¤ytÃ¤/Bcc on valittu."
+#~ msgid "New shared memo"
+#~ msgstr "Uusi jaettu muistilappu"
 
-#~ msgid "View/Cc menu item is checked"
-#~ msgstr "NÃ¤ytÃ¤/Cc on valittu"
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#~ msgid "View/Cc menu item is checked."
-#~ msgstr "NÃ¤ytÃ¤/Cc on valittu."
+#, c-format
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr ""
+#~ "Muistilappulistaa '%s' ei voi avata uusien tapahtumien ja kokousten "
+#~ "lisÃ¤Ã¤mistÃ¤ varten"
 
-#~ msgid "View/From menu item is checked"
-#~ msgstr "NÃ¤ytÃ¤/LÃ¤hettÃ¤jÃ¤ on valittu."
+#~ msgid "Failed upgrading memos."
+#~ msgstr "Muistilappujen pÃ¤ivitys epÃ¤onnistui."
 
-#~ msgid "View/From menu item is checked."
-#~ msgstr "NÃ¤ytÃ¤/LÃ¤hettÃ¤jÃ¤ on valittu."
+#, c-format
+#~ msgid "Loading memos at %s"
+#~ msgstr "Ladataan muistilappuja lÃ¤hteestÃ¤ %s"
 
-#~ msgid "View/PostTo menu item is checked"
-#~ msgstr "NÃ¤ytÃ¤/LÃ¤hetÃ¤ ryhmÃ¤Ã¤n on valittu"
+#, c-format
+#~ msgid "Loading tasks at %s"
+#~ msgstr "Ladataan tehtÃ¤viÃ¤ %s"
 
-#~ msgid "View/PostTo menu item is checked."
-#~ msgstr "NÃ¤ytÃ¤/LÃ¤hetÃ¤ ryhmÃ¤Ã¤n on valittu"
+#, c-format
+#~ msgid "Loading appointments at %s"
+#~ msgstr "Ladataan tapaamisia %s"
 
-#~ msgid "View/ReplyTo menu item is checked"
-#~ msgstr "NÃ¤ytÃ¤/Vastausosoite on valittu"
+#~ msgid "_Define Views..."
+#~ msgstr "_MÃ¤Ã¤rittele nÃ¤kymÃ¤t..."
 
-#~ msgid "View/ReplyTo menu item is checked."
-#~ msgstr "NÃ¤ytÃ¤/Vastausosoite on valittu"
+#~ msgid "_Save Custom View"
+#~ msgstr "_Tallenna oma nÃ¤kymÃ¤"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Uusi viesti"
+#~ msgid "_Custom View"
+#~ msgstr "_Oma nÃ¤kymÃ¤"
 
-#~ msgid "New Mail Folder"
-#~ msgstr "Uusi sÃ¤hkÃ¶postikansio"
+#~ msgid "Completing tasks..."
+#~ msgstr "ViimeistellÃ¤Ã¤n tehtÃ¤viÃ¤..."
 
-#~ msgid "Failed upgrading Mail settings or folders."
-#~ msgstr "SÃ¤hkÃ¶postin asetusten tai kansioiden pÃ¤ivitys epÃ¤onnistui."
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "_Poista valitut muistilaput"
 
-#~ msgid "Baltic (ISO-8859-13)"
-#~ msgstr "Balttilainen (ISO-8859-13)"
+#~ msgid "Delete _All Occurrences"
+#~ msgstr "Poista _kaikki tapahtumakerrat"
 
-#~ msgid "Baltic (ISO-8859-4)"
-#~ msgstr "Balttilainen (ISO-8859-4)"
+#~ msgid "Pri_nt..."
+#~ msgstr "T_ulosta..."
 
-#~ msgid "Ch_eck for Supported Types "
-#~ msgstr "Tar_kista tuetut tyypit"
+#~ msgid "_Select Date..."
+#~ msgstr "_Valitse pÃ¤ivÃ¤ys..."
 
-#~ msgid "Do not quote"
-#~ msgstr "Ã?lÃ¤ lainaa"
+#~ msgid "Select T_oday"
+#~ msgstr "Valitse _tÃ¤mÃ¤ pÃ¤ivÃ¤"
 
-#~ msgid "Email Accounts"
-#~ msgstr "SÃ¤hkÃ¶postitilit"
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "_Merkitse valitut tehtÃ¤vÃ¤t keskenerÃ¤isiksi"
 
-#~ msgid "Inline (Outlook style)"
-#~ msgstr "SisÃ¤kkÃ¤inen alkuperÃ¤isviesti (Outlookin tapaan)"
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "_Merkitse valitut tehtÃ¤vÃ¤t valmiiksi"
 
-#~ msgid "Quoted"
-#~ msgstr "Lainattu"
+#~ msgid "_Forward as iCalendar"
+#~ msgstr "_VÃ¤litÃ¤ iCalendar-muodossa"
 
-#~ msgid "S_OCKS Host:"
-#~ msgstr "S_OCKS-palvelin:"
+#~ msgid "_Paste"
+#~ msgstr "L_iitÃ¤"
 
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Valitse luonnosten kansio"
+#~ msgid "C_ut"
+#~ msgstr "L_eikkaa"
 
-#~ msgid "Select Sent Folder"
-#~ msgstr "Valitse lÃ¤hetettyjen kansio"
+#~ msgid "P_rint..."
+#~ msgstr "T_ulosta..."
 
-#~ msgid "Signatures Table"
-#~ msgstr "Allekirjoitusten taulu"
+#~ msgid "_Save As..."
+#~ msgstr "Tallenna _nimellÃ¤..."
 
-#~ msgid "_Automatic proxy configuration URL:"
-#~ msgstr "_Automaattisten vÃ¤lipalvelinasetusten URL:"
+#~ msgid "Save As..."
+#~ msgstr "Tallenna nimellÃ¤..."
 
-#~ msgid "Case _sensitive"
-#~ msgstr "Kirjain_koolla on merkitystÃ¤"
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">Tila</span>"
 
-#~ msgid "F_ind:"
-#~ msgstr "_Etsi:"
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">LisÃ¤asetukset</span>"
 
-#~ msgid "Find in Message"
-#~ msgstr "Etsi viestistÃ¤"
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>Esikatselu</b>"
 
-#~ msgid "None Selected"
-#~ msgstr "Ei mitÃ¤Ã¤n valittuna"
+#~ msgid "<b>Exceptions</b>"
+#~ msgstr "<b>Poikkeukset</b>"
 
-#~ msgid "Subject or Recipients contains"
-#~ msgstr "Aihe tai vastaanottaja sisÃ¤ltÃ¤Ã¤"
+#~ msgid "Cancel _Drag"
+#~ msgstr "Peruuta _raahaus"
 
-#~ msgid "Provides core functionality for local address books."
-#~ msgstr "Tarjoaa paikallisten osoitekirjojen perustoiminnot."
+#~ msgid "Show week _numbers in date navigator"
+#~ msgstr "NÃ¤ytÃ¤ _viikkonumerot"
 
 #~ msgid ""
-#~ "Looks for clues in a message for mention of attachments and warns if the "
-#~ "attachment is missing"
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
 #~ msgstr ""
-#~ "Tunnistaa viesteistÃ¤ viitteitÃ¤ liitetiedostoista, ja varoittaa "
-#~ "puuttuvista liitetiedostoista"
+#~ "maanantai\n"
+#~ "tiistai\n"
+#~ "keskiviikko\n"
+#~ "torstai\n"
+#~ "perjantai\n"
+#~ "lauantai\n"
+#~ "sunnuntai"
 
 #~ msgid ""
-#~ "A formatter plugin which displays audio attachments inline and allows you "
-#~ "to play them directly from Evolution."
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
 #~ msgstr ""
-#~ "MuotoilulisÃ¤osa, joka esittÃ¤Ã¤ Ã¤Ã¤niliitteet sisÃ¤kkÃ¤isesti ja sallii niiden "
-#~ "soittamisen suoraan Evolutionista."
-
-#~ msgid "Audio inline plugin"
-#~ msgstr "Ã?Ã¤nensoiton lisÃ¤osa"
+#~ "minuuttia\n"
+#~ "tuntia\n"
+#~ "pÃ¤ivÃ¤Ã¤"
 
-#~ msgid "A plugin for backing up and restore Evolution data and settings."
-#~ msgstr "Varmuuskopioi ja palauta Evolutionin tietoja ja asetuksia."
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">TyÃ¶viikko</span>"
 
-#~ msgid "CalDAV Calendar sources"
-#~ msgstr "CalDAV-kalenterien lÃ¤hteet"
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">Aika</span>"
 
-#~ msgid "Provides core functionality for local calendars."
-#~ msgstr "Tarjoaa paikallisten kalenterien perustoiminnot."
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">TehtÃ¤vÃ¤lista</span>"
 
-#~ msgid "HTTP Calendars"
-#~ msgstr "HTTP-kalenterit"
+#~ msgid "<span weight=\"bold\">General</span>"
+#~ msgstr "<span weight=\"bold\">YleistÃ¤</span>"
 
-#~ msgid "Provides core functionality for webcal and http calendars."
-#~ msgstr "Tarjoaa webcal- ja http-kalentereiden perustoiminnot."
+#~ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+#~ msgstr "<span weight=\"bold\">Vapaa/varattu-tietojen oletuspalvelin</span>"
 
-#~ msgid "Provides core functionality for weather calendars."
-#~ msgstr "Tarjoaa sÃ¤Ã¤kalentereiden perustoiminnot."
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">HÃ¤lytykset</span>"
 
+#, no-c-format
 #~ msgid ""
-#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
-#~ "things to the clipboard."
+#~ "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 #~ msgstr ""
-#~ "TestilisÃ¤osa, joka tarjoaa ponnahdusikkunan jolla voit kopioida asioita "
-#~ "leikepÃ¶ydÃ¤lle."
-
-#~ msgid "Copy tool"
-#~ msgstr "KopiointityÃ¶kalu"
+#~ "<i>%u ja %d korvataan kÃ¤yttÃ¤jÃ¤llÃ¤ ja aluenimellÃ¤ sÃ¤hkÃ¶postiosoitteesta.</i>"
 
 #~ msgid ""
-#~ "Provides functionality for marking a calendar or an address book as the "
-#~ "default one."
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
 #~ msgstr ""
-#~ "Tarjoaa toiminallisuuden kalenterien tai osoitekirjojen merkitsemiseksi "
-#~ "oletusvalinnaksi."
+#~ "60 minuuttia\n"
+#~ "30 minuuttia\n"
+#~ "15 minuuttia\n"
+#~ "10 minuuttia\n"
+#~ "5 minuuttia"
 
-#~ msgid "S_pecify the mailbox name"
-#~ msgstr "_Anna sÃ¤hkÃ¶postikansion nimi"
+#~ msgid "Attach file(s)"
+#~ msgstr "LiitÃ¤ tiedosto(t)"
 
-#~ msgid ""
-#~ "A plugin that manages a collection of Exchange account specific "
-#~ "operations and features."
-#~ msgstr ""
-#~ "LisÃ¤osa, jolla voidaan hallita tiettyjÃ¤ Exchange-tiliin liittyviÃ¤ "
-#~ "toimintoja ja ominaisuuksia."
+#~ msgid "<b>Repeat</b>"
+#~ msgstr "<b>Toista</b>"
 
-#~ msgid "Compose messages using an external editor"
-#~ msgstr "Kirjoita viestit kÃ¤yttÃ¤en ulkoista muokkainta"
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>Asetukset</b>"
 
-#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
-#~ msgstr ""
-#~ "Sallii postikansioiden tilauksen perumisen sivupalkin kontekstivalikosta."
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>HÃ¤lytys</b>"
 
-#~ msgid "Unsubscribe Folders"
-#~ msgstr "Peru kansioiden tilauksia"
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 
-#~ msgid "A plugin to setup Google Calendar and Contacts."
-#~ msgstr "Google-kalenterin ja yhteystietojen lisÃ¤osa."
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "MenetelmÃ¤ ei ollut tuettu avattaessa kalenteria"
 
-#~ msgid "Google sources"
-#~ msgstr "Google-lÃ¤hteet"
+#~ msgid "Error while opening the calendar"
+#~ msgstr "Virhe avattaessa kalenteria"
 
-#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
-#~ msgstr "Groupwise-kalenterien ja yhteystietolÃ¤hteiden lisÃ¤osa."
+#~ msgid "New calendar"
+#~ msgstr "Uusi kalenteri"
 
-#~ msgid "A plugin to setup hula calendar sources."
-#~ msgstr "Hula-kalenterien lÃ¤hteiden mÃ¤Ã¤rittelyn lisÃ¤osa."
+#~ msgid "New all day appointment"
+#~ msgstr "Uusi koko pÃ¤ivÃ¤n tapaaminen"
 
-#~ msgid "Hula Account Setup"
-#~ msgstr "Hula-tilin asetukset"
+#~ msgid "New meeting"
+#~ msgstr "Uusi tapaaminen"
 
-#~ msgid "A plugin for the features in the IMAP accounts."
-#~ msgstr "LisÃ¤osa IMAP-tilien ominaisuuksille."
+#~ msgid "New appointment"
+#~ msgstr "Uusi tapaaminen"
 
-#~ msgid "_Import to Calendar"
-#~ msgstr "_Tuo kalenteriin"
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "TehtÃ¤vien ja kokousten luontia varten ei lÃ¶ydy kalenteria"
 
-#~ msgid "Import ICS"
-#~ msgstr "Tuo ICS-tiedosto"
+#, c-format
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr ""
+#~ "Kalenterin \"%s\" avaus tehtÃ¤vien ja kokousten luontia varten epÃ¤onnistui"
 
-#~ msgid "_Import"
-#~ msgstr "_Tuo"
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "Kalenterien pÃ¤ivitys epÃ¤onnistui."
 
-#~ msgid "Imports ICS attachments to calendar."
-#~ msgstr "Tuo ICS-liitteitÃ¤ kalenteriin."
+#~ msgid "Location contains"
+#~ msgstr "Sijainti sisÃ¤ltÃ¤Ã¤"
 
-#~ msgid ""
-#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
-#~ msgstr ""
-#~ "Synkronoi valitut tehtÃ¤vÃ¤t, muistilaput, kalenterit tai osoitekirjat "
-#~ "Apple iPodiin"
+#~ msgid "Comment contains"
+#~ msgstr "Kommentti sisÃ¤ltÃ¤Ã¤"
 
-#~ msgid "_Tasks :"
-#~ msgstr "_TehtÃ¤vÃ¤t :"
+#~ msgid "Category is"
+#~ msgstr "Luokka on"
 
-#~ msgid "Memos :"
-#~ msgstr "Muistilaput :"
+#~ msgid "Whether to show week numbers in the date navigator."
+#~ msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ viikkonumerot pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤selaimessa."
 
-#~ msgid "Allows disabling of accounts."
-#~ msgstr "Mahdollistaa tilien poistamisen kÃ¤ytÃ¶stÃ¤."
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "NÃ¤ytÃ¤ viikkonumerot pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤selaimessa"
 
-#~ msgid "Specify _filename:"
-#~ msgstr "Anna _tiedostonimi:"
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "NÃ¤ytÃ¤ esikatselupaneeli"
 
-#~ msgid "Pl_ay"
-#~ msgstr "_Soita"
+#~ msgid "Show the \"Preview\" pane"
+#~ msgstr "NÃ¤ytÃ¤ \"Esikatselu\"-paneeli"
 
 #~ msgid ""
-#~ "Generates a D-Bus message or notifies the user with an icon in "
-#~ "notification area and a notification message whenever a new message has "
-#~ "arrived."
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
 #~ msgstr ""
-#~ "Luo D-Bus-viestin, tai huomauttaa kÃ¤yttÃ¤jÃ¤Ã¤ ilmoitusalueen kuvakkeella "
-#~ "sekÃ¤ huomautusviestillÃ¤, kun uusia viestejÃ¤ saapuu."
+#~ "Vaakapaneelin sijainti pikseleinÃ¤, tehtÃ¤vÃ¤listan ja tehtÃ¤vÃ¤n esikatselun "
+#~ "vÃ¤lissÃ¤."
 
 #~ msgid ""
-#~ "A plugin which allows the creation of meetings from the contents of a "
-#~ "mail message."
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
 #~ msgstr ""
-#~ "LisÃ¤osa, jonka avulla voidaan luoda tapaamisia viestin sisÃ¤llÃ¶n "
-#~ "perusteella."
+#~ "HÃ¤lytysten huomautuspalvelun tehdasta ei voi luoda, ehkÃ¤ se oli jo kÃ¤ynnissÃ¤?"
 
-#~ msgid "Con_vert to Meeting"
-#~ msgstr "_Muuta kokoukseksi"
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "Bonobon alustus ei onnistunut"
 
-#~ msgid "Mail to meeting"
-#~ msgstr "SÃ¤hkÃ¶posti kokoukselle"
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "Evolutionin kalenterin hÃ¤lytyspalvelu"
 
-#~ msgid ""
-#~ "A plugin which allows the creation of tasks from the contents of a mail "
-#~ "message."
-#~ msgstr ""
-#~ "LisÃ¤osa, jonka avulla voidaan luoda tehtÃ¤viÃ¤ viestin sisÃ¤llÃ¶n perusteella."
+#~ msgid "Memo_s"
+#~ msgstr "Mui_stilaput"
 
-#~ msgid "Con_vert to Task"
-#~ msgstr "Muunna tehtÃ¤_vÃ¤ksi"
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "Evolutionin tehtÃ¤vien komponentti"
 
-#~ msgid "Mail to task"
-#~ msgstr "Viesti tehtÃ¤vÃ¤ksi"
+#~ msgid "Evolution's Memos component"
+#~ msgstr "Evolutionin muistilappukomponentti"
 
-#~ msgid "Contact list _owner"
-#~ msgstr "Ota yhteyttÃ¤ listan _omistajaan"
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "Evolutionin kalenterin komponentti"
 
-#~ msgid "Get list _archive"
-#~ msgstr "Nouda listan _arkisto"
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "Evolutionin kalenterin/tehtÃ¤vien muokkain"
 
-#~ msgid "Get list _usage information"
-#~ msgstr "NÃ¤ytÃ¤ listan _kÃ¤yttÃ¶tiedot"
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "Evolution kalenterin ajanvarausviestien katselin"
 
-#~ msgid "_Post message to list"
-#~ msgstr "_LÃ¤hetÃ¤ viesti listalle"
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "Evolution kalenterin mÃ¤Ã¤rittely"
 
-#~ msgid "_Subscribe to list"
-#~ msgstr "_Tilaa lista"
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "Evolutionin kalenteri ja tehtÃ¤vÃ¤t"
 
-#~ msgid "_Un-subscribe to list"
-#~ msgstr "_Peru listan tilaus"
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "MÃ¤Ã¤rittele aikavyÃ¶hykkeesi, kalenteri ja tehtÃ¤vÃ¤listasi "
 
-#~ msgid "Used for marking all the messages under a folder as read"
-#~ msgstr "KÃ¤ytetÃ¤Ã¤n merkitsemÃ¤Ã¤n kaikki kansion viestit luetuiksi"
+#~ msgid "Size:"
+#~ msgstr "Koko:"
 
-#~ msgid "A plugin which implements mono plugins."
-#~ msgstr "LisÃ¤osa, joka toteuttaa mono-lisÃ¤osat."
+#~ msgid "Querying Address Book..."
+#~ msgstr "EtsitÃ¤Ã¤n osoitekirjasta..."
 
-#~ msgid "Mono Loader"
-#~ msgstr "Mono-lataaja"
+#~ msgid "contact"
+#~ msgid_plural "contacts"
+#~ msgstr[0] "Yhteystieto"
+#~ msgstr[1] "Yhteystiedot"
 
-#~ msgid "A plugin for managing which plugins are enabled or disabled."
-#~ msgstr "LisÃ¤osa, jolla voidaan hallita muiden lisÃ¤osien kÃ¤yttÃ¶Ã¤."
+#~ msgid "Overwrite"
+#~ msgstr "Kirjoita yli"
 
+#, c-format
 #~ msgid ""
-#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
-#~ "to disable HTML messages.\n"
-#~ "\n"
-#~ "This plugin is unsupported demonstration code only.\n"
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
 #~ msgstr ""
-#~ "TestilisÃ¤osa, joka demonstroi muotoilija-lisÃ¤osaa, jolla  voit estÃ¤Ã¤ HTML-"
-#~ "sÃ¤hkÃ¶postit.\n"
-#~ "\n"
-#~ "TÃ¤mÃ¤ lisÃ¤osa on tukematonta demo-koodia.\n"
-
-#~ msgid "Writes a log of profiling data events."
-#~ msgstr "Kirjoittaa lokia profilointitiedon tapahtumista."
-
-#~ msgid "A plugin which loads other plugins written using Python."
-#~ msgstr "Muita pythonilla tehtyjÃ¤ lisÃ¤osia lataava lisÃ¤osa."
+#~ "%s on jo olemassa\n"
+#~ "Haluatko ylikirjoittaa?"
 
-#~ msgid "Python Loader"
-#~ msgstr "Python-latain"
-
-#~ msgid "SpamAssassin (built-in)"
-#~ msgstr "Spamassassin (sisÃ¤Ã¤nrakennettu)"
-
-#~ msgid ""
-#~ "Filters junk messages using SpamAssassin. This plugin requires "
-#~ "SpamAssassin to be installed."
-#~ msgstr ""
-#~ "Suodattaa roskapostia kÃ¤yttÃ¤en Spamassassinia. TÃ¤mÃ¤ lisÃ¤osa vaatii, ettÃ¤ "
-#~ "spamassassin on asennettu."
+#~ msgid "P_aste"
+#~ msgstr "L_iitÃ¤"
 
-#~ msgid "A plugin for saving all attachments or parts of a message at once."
-#~ msgstr "LisÃ¤osa kaikkien liitteiden tallentamiseen kerralla."
+#~ msgid "_Copy"
+#~ msgstr "_Kopioi"
 
-#~ msgid "Save Attachments..."
-#~ msgstr "Tallenna liitteet..."
+#~ msgid "Cu_t"
+#~ msgstr "_Leikkaa"
 
-#~ msgid "Save all attachments"
-#~ msgstr "Tallenna kaikki liitteet"
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "_SiirrÃ¤ osoitekirjaan..."
 
-#~ msgid "Select save base name"
-#~ msgstr "Valitse tallennuspaikan nimi"
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "_Kopioi osoitekirjaan..."
 
-#~ msgid "_Save to Disk"
-#~ msgstr "_Tallenna levylle"
+#~ msgid "_Print"
+#~ msgstr "_Tulosta"
 
-#~ msgid "Select one source"
-#~ msgstr "Valitse lÃ¤hde"
+#~ msgid "_Open"
+#~ msgstr "_Avaa"
 
-#~ msgid "Selects a single calendar or task source for viewing."
-#~ msgstr "Valitsee nÃ¤ytettÃ¤vÃ¤n kalenterin tai tehtÃ¤vÃ¤listaan."
+#~ msgid "Name begins with"
+#~ msgstr "Nimi alkaa"
 
-#~ msgid "Indicates if threading of messages should fall back to subject."
-#~ msgstr "Tulisiko viestien sÃ¤ikeistÃ¤misen palata aihejÃ¤rjestykseen."
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>JÃ¤senet</b>"
 
-#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-#~ msgstr "LisÃ¤osa, joka voita avata TNEF-liitteitÃ¤ ytnef-ohjelman avulla."
+#~ msgid "<b>Web Addresses</b>"
+#~ msgstr "<b>WWW-osoitteet</b>"
 
-#~ msgid "A plugin to setup WebDAV contacts."
-#~ msgstr "WebDAV-yhteystietojen lisÃ¤osa."
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>Puhelin</b>"
 
-#~ msgid "Evolution Shell"
-#~ msgstr "Evolution-kuori"
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>Muuta</b>"
 
-#~ msgid "Evolution Shell Config factory"
-#~ msgstr "Evolution-kuoren asetustehdas"
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>Sekalaiset</b>"
 
-#~ msgid "Evolution Test"
-#~ msgstr "Evolution testi"
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>TyÃ¶</b>"
 
-#~ msgid "Evolution Test component"
-#~ msgstr "Evolutionin testikomponentti"
+#~ msgid "<b>Instant Messaging</b>"
+#~ msgstr "<b>PikaviestintÃ¤</b>"
 
-#~ msgid "<b>Active Connections</b>"
-#~ msgstr "<b>Aktiiviset yhteydet</b>"
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>Koti</b>"
 
-#~ msgid "Active Connections"
-#~ msgstr "Aktiiviset yhteydet"
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>SÃ¤hkÃ¶postiosoite</b>"
 
-#~ msgid "Click OK to close these connections and go offline"
+#~ msgid ""
+#~ "This is the name for this server that will appear in your Evolution folder "
+#~ "list. It is for display purposes only. "
 #~ msgstr ""
-#~ "Valitse OK sulkeaksesi nÃ¤mÃ¤ yhteydet ja siirtyÃ¤ksesi yhteydettÃ¶mÃ¤Ã¤n tilaan"
-
-#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
-#~ msgstr "Gnomen Pilot-tyÃ¶kalut eivÃ¤t ole asennettuina tÃ¤hÃ¤n jÃ¤rjestelmÃ¤Ã¤n."
-
-#~ msgid "Error executing %s."
-#~ msgstr "Virhe suoritettaessa %s."
-
-#~ msgid "Work Offline"
-#~ msgstr "Katkaise verkkoyhteydet"
-
-#~ msgid "Evolution is in the process of going offline."
-#~ msgstr "Evolution siirtyy yhteydettÃ¶mÃ¤Ã¤n tilaan."
-
-#~ msgid "Unknown system error."
-#~ msgstr "Tuntematon jÃ¤rjestelmÃ¤virhe."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "VirheellisiÃ¤ argumentteja"
-
-#~ msgid "Cannot register on OAF"
-#~ msgstr "OAF:ia ei voidaan rekisterÃ¶idÃ¤"
+#~ "TÃ¤mÃ¤ on nimi, jolla tÃ¤mÃ¤ palvelin nÃ¤kyy Evolutionin kansiolistoissa. SitÃ¤ "
+#~ "kÃ¤ytetÃ¤Ã¤n ainoastaan listoilla nÃ¤yttÃ¤miseen. "
 
-#~ msgid "Configuration Database not found"
-#~ msgstr "Asetustietokantaa ei lÃ¶ytynyt"
-
-#~ msgid "New Test"
-#~ msgstr "Uusi testi"
+#~ msgid ""
+#~ "The search base is the distinguished name (DN) of the entry where your "
+#~ "searches will begin. If you leave this blank, the search will begin at the "
+#~ "root of the directory tree."
+#~ msgstr ""
+#~ "Hakupohja on yksilÃ¶llinen nimi (DN) kentÃ¤lle, josta hakusi alkavat. Jos "
+#~ "jÃ¤tÃ¤t tÃ¤mÃ¤n tyhjÃ¤ksi, haku alkaa hakemistopuun juuresta."
 
-#~ msgid "Cannot start Evolution"
-#~ msgstr "Evolutionia ei voitu kÃ¤ynnistÃ¤Ã¤"
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>EtsitÃ¤Ã¤n</b>"
 
-#~ msgid "Evolution can not start."
-#~ msgstr "Evolution ei kÃ¤ynnisty."
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>Todennus</b>"
 
 #~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration.\n"
-#~ "\n"
-#~ "Click help for details"
-#~ msgstr "Valitse Ohje saadaksesi lisÃ¤tietoja"
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Click help for details."
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
 #~ msgstr ""
-#~ "JÃ¤rjestelmÃ¤si kokoonpano ei vastaa Evolutionin asetuksiasi:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Valitse Ohje saadaksesi lisÃ¤tietoja"
-
-#~ msgid "Copy"
-#~ msgstr "Kopioi"
+#~ "Vaakapaneelin sijainti pikseleinÃ¤  kortti- listanÃ¤kymÃ¤n ja "
+#~ "esikatselupaneelin vÃ¤lissÃ¤."
 
-#~ msgid "Copy to Folder..."
-#~ msgstr "Kopioi kansioon..."
+#~ msgid "Contact Source Selector"
+#~ msgstr "Yhteystietojen lÃ¤hdevalinta"
 
-#~ msgid "Create a new address book folder"
-#~ msgstr "Luo uusi osoitekirjakansio"
+#~ msgid "Save As vCard..."
+#~ msgstr "Tallenna vCard-muodossa..."
 
-#~ msgid "Cut"
-#~ msgstr "Leikkaa"
+#~ msgid "Rename Folder"
+#~ msgstr "NimeÃ¤ kansio uudestaan"
 
-#~ msgid "Forward Contact"
-#~ msgstr "VÃ¤litÃ¤ yhteystieto eteenpÃ¤in"
+#, c-format
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "NimeÃ¤ \"%s\" uudestaan:"
 
-#~ msgid "Move to Folder..."
-#~ msgstr "SiirrÃ¤ kansioon..."
+#~ msgid "Base"
+#~ msgstr "Kanta"
 
-#~ msgid "Paste"
-#~ msgstr "LiitÃ¤"
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "Osoitekirjan asetusten tai kansioiden pÃ¤ivitys epÃ¤onnistui."
 
-#~ msgid "Save as VCard..."
-#~ msgstr "Tallenna VCardina..."
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "Evolution kansioasetusten mÃ¤Ã¤rittelyjen ohjain"
 
-#~ msgid "Select _All"
-#~ msgstr "Valitse _kaikki"
+#~ msgid "Evolution Address Book component"
+#~ msgstr "Evolutionin osoitekirjan komponentti"
 
-#~ msgid "Send message to contact"
-#~ msgstr "LÃ¤hetÃ¤ viesti henkilÃ¶lle"
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "Evolutionin osoitekirjan kortinkatselin"
 
-#~ msgid "St_op"
-#~ msgstr "Py_sÃ¤ytÃ¤"
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "Evolutionin osoitekirjan osoitteiden katselin"
 
-#~ msgid "Stop"
-#~ msgstr "PysÃ¤ytÃ¤"
+#~ msgid "Evolution Address Book"
+#~ msgstr "Evolutionin osoitekirja"
 
-#~ msgid "_Copy Folder Contacts To"
-#~ msgstr "_Kopioi kansion yhteystiedot..."
+#~ msgid "C_ontacts"
+#~ msgstr "_Yhteystiedot"
 
-#~ msgid "_Move Folder Contacts To"
-#~ msgstr "_SiirrÃ¤ kansion sisÃ¤ltÃ¶..."
+#~ msgid "Server Version"
+#~ msgstr "Palvelimen versio"
 
-#~ msgid "_Rename"
-#~ msgstr "_NimeÃ¤ uudestaan"
+#~ msgid "Popup Menu"
+#~ msgstr "Ponnahdusvalikko"
 
-#~ msgid "_Save Contact as VCard..."
-#~ msgstr "_Tallenna yhteystieto VCardina..."
+#~ msgid "Activate Default"
+#~ msgstr "KÃ¤ytÃ¤ oletuksia"
 
-#~ msgid "_Save Folder Contacts As VCard"
-#~ msgstr "Tallenna kansion yhteystiedot VCardina"
+#~ msgid "Combo Button"
+#~ msgstr "yhdistelmÃ¤painike"
 
-#~ msgid "Delete _all Occurrences"
-#~ msgstr "Poista k_aikki tapahtumakerrat"
+#~ msgid "evolution calendar search bar"
+#~ msgstr "evolutionin kalenterin hakupalkki"
 
-#~ msgid "Show the working week"
-#~ msgstr "NÃ¤ytÃ¤ tyÃ¶viikko"
+#~ msgid "search bar"
+#~ msgstr "hakupalkki"
 
-#~ msgid "View the debug console for log messages"
-#~ msgstr "NÃ¤ytÃ¤ lokiviestit vianetsintÃ¤konsolissa"
+#~ msgid "Field Chooser"
+#~ msgstr "KentÃ¤n valinta"
 
-#~ msgid "_Debug Logs"
-#~ msgstr "_VianetsintÃ¤lokit"
+#~ msgid "Unknown system error."
+#~ msgstr "Tuntematon jÃ¤rjestelmÃ¤virhe."
 
-#~ msgid "Show message preview side-by-side with the message list"
-#~ msgstr "NÃ¤ytÃ¤ viestin esikatselu viestiluettelon vieressÃ¤"
+#~ msgid "_Save to Disk"
+#~ msgstr "_Tallenna levylle"
 
-#~ msgid "Copy selected message(s) to the clipboard"
-#~ msgstr "Kopioi valitut viestit uuteen kansioon"
+#~ msgid "Permissions for"
+#~ msgstr "Oikeudet kohteelle"
 
-#~ msgid "Cut selected message(s) to the clipboard"
-#~ msgstr "Leikkaa valitut viestit leikepÃ¶ydÃ¤lle"
+#~ msgid "_Folder Name:"
+#~ msgstr "_Kansion nimi:"
 
-#~ msgid "Paste message(s) from the clipboard"
-#~ msgstr "LiitÃ¤ viestit leikepÃ¶ydÃ¤ltÃ¤"
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, "
+#~ "`evolution/config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "Asetuksia ei voi lukea aikaisemmasta Evolutionin asennuksesta, "
+#~ "evolution/config.xmldb' on joko vaurioitunut tai puuttuu."
 
-#~ msgid "Select all and only the messages that are not currently selected"
-#~ msgstr "Poista kaikki viestit, jotka eivÃ¤t ole juuri nyt valittu"
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "_Poista valitut tehtÃ¤vÃ¤t"
 
-#~ msgid "Cut selected messages to the clipboard"
-#~ msgstr "Leikkaa valitut viestit leikepÃ¶ydÃ¤lle"
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>Toistuvuus</b>"
 
-#~ msgid "Not Junk"
-#~ msgstr "Ei roskapostia"
+#~ msgid "_Calendars"
+#~ msgstr "_Kalenterit"
 
-#~ msgid "Paste messages from the clipboard"
-#~ msgstr "LiitÃ¤ viestit leikepÃ¶ydÃ¤ltÃ¤"
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>TyÃ¶</b>"
 
-#~ msgid "Pos_t New Message to Folder"
-#~ msgstr "L_isÃ¤Ã¤ uusi viesti kansioon"
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr ""
+#~ "Evolution kÃ¤yttÃ¤Ã¤ tÃ¤tÃ¤ sÃ¤hkÃ¶postiosoitetta sinun todentamiseksesi "
+#~ "palvelimelle."
 
-#~ msgid "Post a Repl_y"
-#~ msgstr "Postita _vastaus"
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "Hallitse S/Mime-varmenteita"
 
-#~ msgid "Post a message to a Public folder"
-#~ msgstr "Postita viesti julkiseen kansioon"
+#~ msgid "Look up in address books"
+#~ msgstr "_Etsi osoitekirjoista"
 
-#~ msgid "Post a reply to a message in a Public folder"
-#~ msgstr "Kirjoita vastine viestiin julkisessa kansiossa"
+#~ msgid "Show week number in Day and Work Week View"
+#~ msgstr "NÃ¤ytÃ¤ viikkonumerot pÃ¤ivÃ¤- ja tyÃ¶viikkonÃ¤kymissÃ¤"
 
-#~ msgid "_Save Message..."
-#~ msgstr "_Tallenna viesti..."
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ viikkonumerot pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤- ja tyÃ¶viikkonÃ¤kymissÃ¤."
 
-#~ msgid "Close"
-#~ msgstr "Sulje"
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "NÃ¤ytÃ¤ viikkonumero pÃ¤ivÃ¤- ja tyÃ¶viikkonÃ¤kymissÃ¤"
 
-#~ msgid "Main toolbar"
-#~ msgstr "PÃ¤Ã¤tyÃ¶kalupalkki"
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr ""
+#~ "LÃ¤hetysasetukset ovat kÃ¤ytettÃ¤vissÃ¤ vain Novell Groupwise- ja Microsoft "
+#~ "Exchange -tileille."
 
-#~ msgid "Mar_k as Complete"
-#~ msgstr "Merkitse _valmiiksi"
+#~ msgid "No Junk plugin available"
+#~ msgstr "RoskapostilisÃ¤osaa ei ole saatavilla"
 
-#~ msgid "Show task preview window"
-#~ msgstr "NÃ¤ytÃ¤ tehtÃ¤vien esikatseluruutu"
+#~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+#~ msgstr ""
+#~ "VÃ¤lilehteÃ¤ \"Exchange-asetukset\" ei voi avata yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
 
-#~ msgid "About Evolution..."
-#~ msgstr "Tietoja Evolutionista..."
+#~ msgid "GroupWise Account Setup"
+#~ msgstr "Groupwise-tilin mÃ¤Ã¤rittely"
 
-#~ msgid "Change the visibility of the toolbar"
-#~ msgstr "Muuta tyÃ¶kalupalkin nÃ¤kyvyyttÃ¤"
+#~ msgid "Mono Loader"
+#~ msgstr "Mono-lataaja"
 
-#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgid ""
+#~ "Secure FTP (SSH)\n"
+#~ "Public FTP\n"
+#~ "FTP (with login)\n"
+#~ "Windows share\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Secure WebDAV (HTTPS)\n"
+#~ "Custom Location"
 #~ msgstr ""
-#~ "Unohda muistetut salasanat siten, ettÃ¤ ne kysytÃ¤Ã¤n tarvittaessa uudestaan"
+#~ "Suojattu FTP (SSH)\n"
+#~ "Julkinen FTP\n"
+#~ "FTP (vaatii kirjautumisen)\n"
+#~ "Windows-jako\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Suojattu WebDAV (HTTPS)\n"
+#~ "Oma sijainti"
 
-#~ msgid "Hide window buttons"
-#~ msgstr "Piilota ikkunan napit"
+#~ msgid "A plugin which loads other plugins written using Python."
+#~ msgstr "Muita pythonilla tehtyjÃ¤ lisÃ¤osia lataava lisÃ¤osa."
 
-#~ msgid "Page Set_up..."
-#~ msgstr "Sivun as_etukset..."
+#~ msgid "Cannot start Evolution"
+#~ msgstr "Evolutionia ei voitu kÃ¤ynnistÃ¤Ã¤"
 
-#~ msgid "Prefere_nces"
-#~ msgstr "As_etukset"
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>Noudetaan</b>"
 
-#~ msgid "Send / Receive"
-#~ msgstr "LÃ¤hetÃ¤ / Vastaanota"
+#~ msgid ""
+#~ "This is the maximum number of entries to download. Setting this number to be "
+#~ "too large will slow down your address book."
+#~ msgstr ""
+#~ "Suurin sallittu noudettavien korttien mÃ¤Ã¤rÃ¤ noutokertaa kohti. TÃ¤mÃ¤n arvon "
+#~ "asettaminen liian suureksi hidastaa osoitekirjan kÃ¤yttÃ¶Ã¤."
 
-#~ msgid "Submit Bug Report"
-#~ msgstr "LÃ¤hetÃ¤ vikailmoitus"
+#~ msgid "_Unread Search Folder"
+#~ msgstr "_Lukemattomien hakukansio"
 
-#~ msgid "Toggle whether we are working offline."
-#~ msgstr "MÃ¤Ã¤ritÃ¤, tyÃ¶skennellÃ¤Ã¤nkÃ¶ poissa linjoilta."
+#, c-format
+#~ msgid "Retrieving `%s'"
+#~ msgstr "Noudetaan \"%s\""
 
-#~ msgid "View/Hide the Side Bar"
-#~ msgstr "NÃ¤ytÃ¤ tai piilota sivupalkki"
+#, c-format
+#~ msgid "Retrieving message %s"
+#~ msgstr "Noudetaan viestiÃ¤ %s"
 
-#~ msgid "View/Hide the Status Bar"
-#~ msgstr "NÃ¤ytÃ¤ tai piilota tilarivi"
+#~ msgid "Get list _archive"
+#~ msgstr "Nouda listan _arkisto"
 
-#~ msgid "Work _Offline"
-#~ msgstr "_Katkaise verkkoyhteydet"
+#~ msgid "Get list _usage information"
+#~ msgstr "NÃ¤ytÃ¤ listan _kÃ¤yttÃ¶tiedot"
 
-#~ msgid "_About"
-#~ msgstr "_Tietoja"
+#~ msgid ""
+#~ "Anonymously\n"
+#~ "Using email address\n"
+#~ "Using distinguished name (DN)"
+#~ msgstr ""
+#~ "Anonyymi\n"
+#~ "kÃ¤ytÃ¤ sÃ¤hkÃ¶postiosoitetta\n"
+#~ "kÃ¤ytÃ¤ yksilÃ¶llistÃ¤ nimeÃ¤ (DN)"
 
-#~ msgid "_Frequently Asked Questions"
-#~ msgstr "_Uaset kysytyt kysymykset"
+#~ msgid ""
+#~ "One\n"
+#~ "Sub"
+#~ msgstr ""
+#~ "Yksi taso\n"
+#~ "Alipuu"
 
-#~ msgid "_Hide Buttons"
-#~ msgstr "_Piilota napit"
+#~ msgid ""
+#~ "This is the full name of your LDAP server. For example, "
+#~ "\"ldap.mycompany.com\"."
+#~ msgstr ""
+#~ "TÃ¤mÃ¤ kenttÃ¤ on LDAP-palvelimen koko nimi, esimerkiksi \"ldap.mycompany.com\"."
 
-#~ msgid "_Quit"
-#~ msgstr "_Lopeta"
+#~ msgid "<b>Notes</b>"
+#~ msgstr "<b>Muistilaput</b>"
 
-#~ msgid "Save Custom View"
-#~ msgstr "Tallenna oma nÃ¤kymÃ¤"
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr."
+#~ msgstr ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr."
 
-#~ msgid "Attachment Bar"
-#~ msgstr "Liitepalkki"
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
 
-#~ msgid "Cannot attach file %s: %s"
-#~ msgstr "Tiedoston %s liittÃ¤minen epÃ¤onnistui: %s"
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr "Aseta tÃ¤mÃ¤, jos haluat kÃ¤yttÃ¤Ã¤ jÃ¤rjestelmÃ¤n aikavyÃ¶hykettÃ¤."
 
-#~ msgid "Cannot attach file %s: not a regular file"
-#~ msgstr "Tiedoston %s liittÃ¤minen epÃ¤onnistui: epÃ¤tavallinen tiedosto"
+#~ msgid ""
+#~ "before\n"
+#~ "after"
+#~ msgstr ""
+#~ "ennen\n"
+#~ "jÃ¤lkeen"
 
-#~ msgid "MIME type:"
-#~ msgstr "MIME-tyyppi:"
+#~ msgid ""
+#~ "minute(s)\n"
+#~ "hour(s)\n"
+#~ "day(s)"
+#~ msgstr ""
+#~ "minuuttia\n"
+#~ "tuntia\n"
+#~ "pÃ¤ivÃ¤Ã¤"
 
-#~ msgid "Suggest automatic display of attachment"
-#~ msgstr "Ehdota liitteen automaattista nÃ¤yttÃ¤mistÃ¤"
+#~ msgid ""
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days"
+#~ msgstr ""
+#~ "minuuttia\n"
+#~ "tuntia\n"
+#~ "pÃ¤ivÃ¤Ã¤"
 
-#~ msgid "Unknown character set: %s"
-#~ msgstr "Tuntematon merkistÃ¶: %s"
+#~ msgid ""
+#~ "start of appointment\n"
+#~ "end of appointment"
+#~ msgstr ""
+#~ "tapaamisen alku\n"
+#~ "tapaamisen loppu"
 
-#~ msgid "Expanded"
-#~ msgstr "Laajennettu"
+#~ msgid "<span weight=\"bold\">Alarms</span>"
+#~ msgstr "<span weight=\"bold\">HÃ¤lytykset</span>"
 
-#~ msgid "Whether or not the expander is expanded"
-#~ msgstr "Onko laajennin laajennettu"
+#~ msgid "<span weight=\"bold\">Date/Time Format</span>"
+#~ msgstr "<span weight=\"bold\">PÃ¤ivÃ¤ys- ja aikamuotoilu</span>"
 
-#~ msgid "Text of the expander's label"
-#~ msgstr "Laajentimen otsikon teksti"
+#~ msgid ""
+#~ "15 minutes before appointment\n"
+#~ "1 hour before appointment\n"
+#~ "1 day before appointment"
+#~ msgstr ""
+#~ "15 minuuttia ennen tapaamista\n"
+#~ "1 tunti ennen tapaamista\n"
+#~ "1 pÃ¤ivÃ¤ ennen tapaamista"
 
 #~ msgid ""
-#~ "If set, an underline in the text indicates the next character should be "
-#~ "used for the mnemonic accelerator key"
+#~ "a\n"
+#~ "b"
 #~ msgstr ""
-#~ "Jos asetettu, tarkoittaa alleviivaus tekstissÃ¤, ettÃ¤ seuraavaa merkkiÃ¤ "
-#~ "kÃ¤ytetÃ¤Ã¤n pikanÃ¤ppÃ¤imenÃ¤"
+#~ "a\n"
+#~ "b"
 
-#~ msgid "Space to put between the label and the child"
-#~ msgstr "Otsikon ja lapsen vÃ¤liin laitettava tila"
+#~ msgid ""
+#~ "for\n"
+#~ "until"
+#~ msgstr ""
+#~ "toista\n"
+#~ "kunnes"
 
-#~ msgid "Label widget"
-#~ msgstr "MerkintÃ¤-elementti"
+#~ msgid ""
+#~ "day(s)\n"
+#~ "week(s)\n"
+#~ "month(s)\n"
+#~ "year(s)"
+#~ msgstr ""
+#~ "pÃ¤ivÃ¤Ã¤\n"
+#~ "viikkoa\n"
+#~ "kuukautta\n"
+#~ "vuotta"
 
-#~ msgid "A widget to display in place of the usual expander label"
-#~ msgstr "Tavallisen laajennin-otsikin tilalla nÃ¤ytettÃ¤vÃ¤ elementti"
+#~ msgid ""
+#~ "for\n"
+#~ "until\n"
+#~ "forever"
+#~ msgstr ""
+#~ "toista\n"
+#~ "kunnes\n"
+#~ "pysyvÃ¤sti"
 
-#~ msgid "Indicator Spacing"
-#~ msgstr "Indikaattioen vÃ¤listys"
+#~ msgid ""
+#~ "High\n"
+#~ "Normal\n"
+#~ "Low\n"
+#~ "Undefined"
+#~ msgstr ""
+#~ "Korkea\n"
+#~ "Tavallinen\n"
+#~ "Matala\n"
+#~ "Ei mÃ¤Ã¤ritelty"
 
-#~ msgid "Spacing around expander arrow"
-#~ msgstr "Laajennusnuolen ympÃ¤rillÃ¤ oleva tila"
+#~ msgid ""
+#~ "Not Started\n"
+#~ "In Progress\n"
+#~ "Completed\n"
+#~ "Canceled"
+#~ msgstr ""
+#~ "Ei aloitettu\n"
+#~ "Kesken\n"
+#~ "Valmis\n"
+#~ "Peruttu"
 
-#~ msgid "_Searches"
-#~ msgstr "_Haut"
+#~ msgid ""
+#~ "January\n"
+#~ "February\n"
+#~ "March\n"
+#~ "April\n"
+#~ "May\n"
+#~ "June\n"
+#~ "July\n"
+#~ "August\n"
+#~ "September\n"
+#~ "October\n"
+#~ "November\n"
+#~ "December"
+#~ msgstr ""
+#~ "Tammikuu\n"
+#~ "Helmikuu\n"
+#~ "Maaliskuu\n"
+#~ "Huhtikuu\n"
+#~ "Toukokuu\n"
+#~ "KesÃ¤kuu\n"
+#~ "HeinÃ¤kuu\n"
+#~ "Elokuu\n"
+#~ "Syyskuu\n"
+#~ "Lokakuu\n"
+#~ "Marraskuu\n"
+#~ "Joulukuu"
 
-#~ msgid "Current Message"
-#~ msgstr "Valittu viesti"
+#~ msgid ""
+#~ "ago\n"
+#~ "in the future"
+#~ msgstr ""
+#~ "sitten\n"
+#~ "tulevaisuudessa"
 
-#~ msgid "Choose Image"
-#~ msgstr "Valitse kuva"
+#~ msgid ""
+#~ "seconds\n"
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days\n"
+#~ "weeks\n"
+#~ "months\n"
+#~ "years"
+#~ msgstr ""
+#~ "sekuntia\n"
+#~ "minuuttia\n"
+#~ "tuntia\n"
+#~ "pÃ¤ivÃ¤Ã¤\n"
+#~ "viikkoa\n"
+#~ "kuukautta\n"
+#~ "vuotta"
 
-#~ msgid "Empty message"
-#~ msgstr "TyhjÃ¤ viesti"
+#~ msgid ""
+#~ "the current time\n"
+#~ "the time you specify\n"
+#~ "a time relative to the current time"
+#~ msgstr ""
+#~ "tÃ¤mÃ¤nhetkinen aika\n"
+#~ "antamasi aika\n"
+#~ "aika suhteessa tÃ¤mÃ¤nhetkiseen aikaan"
 
-#~ msgid "Reflow model"
-#~ msgstr "Uudelleenvirtauksen malli"
+#~ msgid "Date header:"
+#~ msgstr "PÃ¤ivÃ¤mÃ¤Ã¤rÃ¤otsikko:"
 
-#~ msgid "Column width"
-#~ msgstr "Sarakkeen leveys"
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline\n"
+#~ "Quoted"
+#~ msgstr ""
+#~ "Liite\n"
+#~ "SisÃ¤kkÃ¤inen\n"
+#~ "Lainattu"
 
-#~ msgid "Search"
-#~ msgstr "Etsi"
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline (Outlook style)\n"
+#~ "Quoted\n"
+#~ "Do not quote"
+#~ msgstr ""
+#~ "Liite\n"
+#~ "SisÃ¤kkÃ¤inen (Outlookin tapaan)\n"
+#~ "Lainattu\n"
+#~ "Ã?lÃ¤ lainaa"
 
-#~ msgid "_Clear"
-#~ msgstr "_TyhjennÃ¤"
+#~ msgid ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+#~ msgstr ""
+#~ "Evolution on yhteydettÃ¶mÃ¤ssÃ¤ tilassa. Et voi luoda tai muokata kansioita.\n"
+#~ "Avaa verkkoyhteydet, jotta voit suorittaa nÃ¤itÃ¤ toimintoja."
 
-#~ msgid "Item ID"
-#~ msgstr "Kohteen ID"
+#~ msgid ""
+#~ "This probably means that your server requires \n"
+#~ "you to specify the Windows domain name \n"
+#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "Or you might have just typed your password wrong."
+#~ msgstr ""
+#~ "TÃ¤mÃ¤ luultavasti tarkoittaa, ettÃ¤ palvelin vaatii\n"
+#~ "sinua syÃ¶ttÃ¤mÃ¤Ã¤n Windowsin aluenimen\n"
+#~ "osana kÃ¤yttÃ¤jÃ¤tunnusta (esim. &quot;ALUENIMI\\kÃ¤yttÃ¤jÃ¤&quot;).\n"
+#~ "Voi myÃ¶s olla ettÃ¤ syÃ¶tit vÃ¤Ã¤rÃ¤n salasanan."
 
-#~ msgid "Edit Master Category List..."
-#~ msgstr "Muokkaa luokkien pÃ¤Ã¤listaa..."
+#~ msgid ""
+#~ "Attach a small picture of your face to outgoing messages.\n"
+#~ "\n"
+#~ "First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+#~ "encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+#~ "sent messages."
+#~ msgstr ""
+#~ "LiitÃ¤ pieni kuva kasviostasi lÃ¤hteviin viesteihin.\n"
+#~ "\n"
+#~ "KÃ¤yttÃ¤jien tÃ¤ytyy ensin mÃ¤Ã¤ritellÃ¤ 48x48-pisteen png-kuva. Kuva tallennetaan "
+#~ "base64-muodossa ja tallennetaan tiedostoon ~/.evolution/faces. TÃ¤tÃ¤ kuvaa "
+#~ "kÃ¤ytetÃ¤Ã¤n jatkossa lÃ¤hetettÃ¤vissÃ¤ viesteissÃ¤."
 
-#~ msgid "Item(s) belong to these _categories:"
-#~ msgstr "NÃ¤ihin _luokkiin kuuluvat kohdat:"
+#~ msgid "Synchronize your data with your Apple iPod."
+#~ msgstr "_Synkronoi tietosi Apple iPodiin."
 
-#~ msgid "_Available Categories:"
-#~ msgstr "Valittavat _luokat:"
+#~ msgid "Work Offline"
+#~ msgstr "Katkaise verkkoyhteydet"
 
-#~ msgid "categories"
-#~ msgstr "luokat"
+#~ msgid "Work _Offline"
+#~ msgstr "_Katkaise verkkoyhteydet"
 
-#~ msgid "%l:%M %p"
-#~ msgstr "%l.%M %p"
+#~ msgid "Mark the selected messasges as not being junk"
+#~ msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#~ msgid "DnD code"
-#~ msgstr "DnD-koodi"
+#~ msgid "Active Appointements"
+#~ msgstr "Aktiiviset tapaamiset"
 
-#~ msgid "Full Header"
-#~ msgstr "TÃ¤ysi otsake"
+#~ msgid "_Mar_k as Incomplete"
+#~ msgstr "_Merkitse keskenerÃ¤iseksi"
 
-#~ msgid "Font Description"
-#~ msgstr "Kirjasimen kuvaus"
+#~ msgid "_Shared Memo"
+#~ msgstr "_Jaettu muistilappu"
 
-#~ msgid ""
-#~ "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+#~ msgid "Download messages of accounts and folders marked for offline"
 #~ msgstr ""
-#~ "[Turvataso=HenkilÃ¶kohtainen;Luokittelematon;Suojattu;Luottamuksellinen;"
-#~ "Salainen;ErittÃ¤in salainen]"
-
-#~ msgid "Contact Print Style Editor Test"
-#~ msgstr "Yhteystiedon tulostustyylien muokkaimen testi"
-
-#~ msgid "Copyright (C) 2000, Ximian, Inc."
-#~ msgstr "TekijÃ¤noikeudet (C) 2000, Ximian, Inc."
+#~ "Nouda viestit verkottomaan kÃ¤yttÃ¶Ã¶n merkityiltÃ¤ tileiltÃ¤ ja kansioista"
 
-#~ msgid "This should test the contact print style editor widget"
+#~ msgid ""
+#~ "days\n"
+#~ "weeks\n"
+#~ "months"
 #~ msgstr ""
-#~ "TÃ¤mÃ¤n pitÃ¤isi testata yhteystiedon tulostustyylin muokkaimen widgettiÃ¤"
-
-#~ msgid "This should test the contact print code"
-#~ msgstr "TÃ¤mÃ¤n pitÃ¤isi testata yhteystiedon tulostuksen koodia"
+#~ "pÃ¤ivÃ¤Ã¤\n"
+#~ "iikkoa\n"
+#~ "kuukautta"
 
-#~ msgid "Error opening the FAQ webpage."
-#~ msgstr "Virhe avattaessa FAQ-sivua."
+#~ msgid "The source action to proxy"
+#~ msgstr "VÃ¤litettÃ¤vÃ¤ lÃ¤hteen toiminto"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]