[evolution-data-server] Updated Finnish translation



commit 62e43706875882262a1611a975867875b356585f
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Mon Mar 14 17:45:14 2016 +0000

    Updated Finnish translation

 po/fi.po | 3322 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1900 insertions(+), 1422 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index b795517..9fb0003 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,15 +7,15 @@
 # Gnome 2012-03 Finnish translation sprint participants:
 # Niklas Laxström
 # Timo Jyrinki <timo jyrinki iki fi>, 2012.
-# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2010, 2013, 2014.
+# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2010, 2013, 2014, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2014-09-07 09:52+0000\n"
-"PO-Revision-Date: 2014-09-07 19:06+0300\n"
+"POT-Creation-Date: 2016-03-14 06:13+0000\n"
+"PO-Revision-Date: 2016-03-14 19:44+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
 "Language: fi\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-POT-Import-Date: 2012-02-19 15:17:30+0000\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:120
 #, c-format
@@ -42,7 +42,7 @@ msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Lapsiprosessin \"%s\" luominen epäonnistui: %s"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:524
-#: ../addressbook/backends/file/e-book-backend-file.c:1253
+#: ../addressbook/backends/file/e-book-backend-file.c:1256
 msgid "No UID in the contact"
 msgstr "UID puuttuu yhteystiedosta"
 
@@ -56,128 +56,129 @@ msgid "Loading..."
 msgstr "Ladataan..."
 
 #: ../addressbook/backends/file/e-book-backend-file.c:992
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4360
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4357
 msgid "Searching..."
 msgstr "Etsitään..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1281
+#: ../addressbook/backends/file/e-book-backend-file.c:1284
 #, c-format
 msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr ""
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1472
-#: ../addressbook/backends/file/e-book-backend-file.c:1555
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
-#: ../addressbook/libedata-book/e-book-sqlite.c:6727
+#: ../addressbook/backends/file/e-book-backend-file.c:1475
+#: ../addressbook/backends/file/e-book-backend-file.c:1560
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
+#: ../addressbook/libedata-book/e-book-sqlite.c:7332
+#: ../addressbook/libedata-book/e-book-sqlite.c:7401
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "Yhteystietoa \"%s\" ei löydy"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1615
-#: ../addressbook/backends/file/e-book-backend-file.c:1696
+#: ../addressbook/backends/file/e-book-backend-file.c:1620
+#: ../addressbook/backends/file/e-book-backend-file.c:1701
 #, fuzzy, c-format
 #| msgid "Protocol not supported"
 msgid "Query '%s' not supported"
 msgstr "Protokolla ei ole tuettu"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1624
-#: ../addressbook/backends/file/e-book-backend-file.c:1705
-#, fuzzy, c-format
+#: ../addressbook/backends/file/e-book-backend-file.c:1629
+#: ../addressbook/backends/file/e-book-backend-file.c:1710
+#, c-format
 #| msgid "Invalid query: "
 msgid "Invalid Query '%s'"
-msgstr "Virheellinen haku: "
+msgstr "Virheellinen kysely '%s'"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1970
+#: ../addressbook/backends/file/e-book-backend-file.c:1975
 msgid "Requested to delete an unrelated cursor"
 msgstr ""
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2041
+#: ../addressbook/backends/file/e-book-backend-file.c:2046
 #, c-format
 msgid "Failed to rename old database from '%s' to '%s': %s"
 msgstr "Vanhan tietokannan '%s' nimen muuttaminen muotoon '%s' epäonnistui: %s"
 
 #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1174
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4250
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:867
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51
 #: ../addressbook/libebook-contacts/e-phone-number.c:56
 #: ../addressbook/libebook/e-book.c:1078
-#: ../addressbook/libebook/e-book-client.c:1882
-#: ../addressbook/libebook/e-book-client.c:2054
-#: ../addressbook/libebook/e-book-client.c:2267
-#: ../addressbook/libebook/e-book-client.c:2398
-#: ../addressbook/libebook/e-book-client.c:2557
-#: ../addressbook/libebook/e-book-client.c:2691
-#: ../addressbook/libebook/e-book-client.c:2822
-#: ../addressbook/libebook/e-book-client.c:2980
-#: ../addressbook/libebook/e-book-client.c:3175
-#: ../addressbook/libebook/e-book-client.c:3393
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:878
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:583
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:626
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
-#: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
-#: ../calendar/libecal/e-cal-client.c:3239
-#: ../calendar/libecal/e-cal-client.c:3412
-#: ../calendar/libecal/e-cal-client.c:3676
-#: ../calendar/libecal/e-cal-client.c:3917
-#: ../calendar/libecal/e-cal-client.c:4107
-#: ../calendar/libecal/e-cal-client.c:4299
-#: ../calendar/libecal/e-cal-client.c:4469
-#: ../calendar/libecal/e-cal-client.c:4638
-#: ../calendar/libecal/e-cal-client.c:4841
-#: ../calendar/libecal/e-cal-client.c:4991
-#: ../calendar/libecal/e-cal-client.c:5185
-#: ../calendar/libecal/e-cal-client.c:5338
-#: ../calendar/libecal/e-cal-client.c:5555
-#: ../calendar/libecal/e-cal-client.c:5709
-#: ../calendar/libecal/e-cal-client.c:5935
-#: ../calendar/libecal/e-cal-client.c:6131
-#: ../calendar/libecal/e-cal-client.c:6494
-#: ../calendar/libecal/e-cal-client.c:6708
-#: ../camel/providers/imapx/camel-imapx-command.c:645
-#: ../camel/providers/imapx/camel-imapx-server.c:4784
-#: ../camel/providers/imapx/camel-imapx-server.c:4793
-#: ../libedataserver/e-client.c:185
+#: ../addressbook/libebook/e-book-client.c:2131
+#: ../addressbook/libebook/e-book-client.c:2303
+#: ../addressbook/libebook/e-book-client.c:2516
+#: ../addressbook/libebook/e-book-client.c:2647
+#: ../addressbook/libebook/e-book-client.c:2806
+#: ../addressbook/libebook/e-book-client.c:2940
+#: ../addressbook/libebook/e-book-client.c:3071
+#: ../addressbook/libebook/e-book-client.c:3229
+#: ../addressbook/libebook/e-book-client.c:3424
+#: ../addressbook/libebook/e-book-client.c:3642
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:673
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:721
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
+#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
+#: ../calendar/libecal/e-cal-client.c:3520
+#: ../calendar/libecal/e-cal-client.c:3693
+#: ../calendar/libecal/e-cal-client.c:3957
+#: ../calendar/libecal/e-cal-client.c:4198
+#: ../calendar/libecal/e-cal-client.c:4388
+#: ../calendar/libecal/e-cal-client.c:4581
+#: ../calendar/libecal/e-cal-client.c:4790
+#: ../calendar/libecal/e-cal-client.c:4959
+#: ../calendar/libecal/e-cal-client.c:5162
+#: ../calendar/libecal/e-cal-client.c:5312
+#: ../calendar/libecal/e-cal-client.c:5506
+#: ../calendar/libecal/e-cal-client.c:5659
+#: ../calendar/libecal/e-cal-client.c:5876
+#: ../calendar/libecal/e-cal-client.c:6030
+#: ../calendar/libecal/e-cal-client.c:6256
+#: ../calendar/libecal/e-cal-client.c:6452
+#: ../calendar/libecal/e-cal-client.c:6815
+#: ../calendar/libecal/e-cal-client.c:7037
+#: ../camel/providers/imapx/camel-imapx-server.c:2979
+#: ../camel/providers/imapx/camel-imapx-server.c:2989
+#: ../camel/providers/imapx/camel-imapx-server.c:3001
+#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:828
+#: ../addressbook/backends/google/e-book-backend-google.c:781
 msgid "Querying for updated contacts…"
 msgstr "Haetaan päivittyneitä yhteystietoja..."
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1010
+#: ../addressbook/backends/google/e-book-backend-google.c:965
 msgid "Querying for updated groups…"
 msgstr "Haetaan päivittyneitä ryhmiä..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1757
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4997
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433
+#: ../addressbook/backends/google/e-book-backend-google.c:1748
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1503
 msgid "The backend does not support bulk additions"
 msgstr "Taustapalvelu ei tue massalisäyksiä"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1912
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5133
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545
+#: ../addressbook/backends/google/e-book-backend-google.c:1905
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1625
 msgid "The backend does not support bulk modifications"
 msgstr "Taustapalvelu ei tue massamuokkauksia"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2119
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645
+#: ../addressbook/backends/google/e-book-backend-google.c:2114
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1725
 msgid "The backend does not support bulk removals"
 msgstr "Taustapalvelu ei tue massapoistoja"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2239
+#: ../addressbook/backends/google/e-book-backend-google.c:2236
 msgid "Loading…"
 msgstr "Ladataan…"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1631
+#: ../addressbook/backends/google/e-book-google-utils.c:1653
 #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
@@ -186,163 +187,169 @@ msgid "Personal"
 msgstr "Henkilökohtainen"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1633
+#: ../addressbook/backends/google/e-book-google-utils.c:1655
 msgid "Friends"
 msgstr "Ystävät"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1635
+#: ../addressbook/backends/google/e-book-google-utils.c:1657
 msgid "Family"
 msgstr "Perhe"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1637
+#: ../addressbook/backends/google/e-book-google-utils.c:1659
 msgid "Coworkers"
 msgstr "Työkaverit"
 
 #. Translators: An error message shown to a user when trying to do an
 #. * operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:114
 msgid "Not connected"
 msgstr "Ei yhteyttä"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:901
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:892
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1024
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1016
 msgid "Reconnecting to LDAP server..."
 msgstr "Odotetaan uudelleen yhteyttä LDAP-palvelimeen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1155
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
 msgid "Invalid DN syntax"
 msgstr "Virheellinen DN-syntaksi"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1171
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4249
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP-virhe 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1783
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1775
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: ldap_first_entry palautti arvon NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2036
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2164
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2297
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2424
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2289
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4198
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4195
 msgid "Receiving LDAP search results..."
 msgstr "Vastaanotetaan LDAP-haun tuloksia..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4382
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4379
 msgid "Error performing search"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4515
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4512
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Ladataan yhteystietoja (%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5080
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5082
 msgid "Adding contact to LDAP server..."
 msgstr "Lisätään yhteystieto LDAP-palvelimelle..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5155
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5157
 msgid "Modifying contact from LDAP server..."
 msgstr "Muokataan yhteystietoa LDAP-palvelimella..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5221
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5223
 msgid "Removing contact from LDAP server..."
 msgstr "Poistetaan yhteystieto LDAP-palvelimelta..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5610
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "DN:n hakeminen käyttäjälle \"%s\" epäonnistui"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
+#: ../calendar/backends/http/e-cal-backend-http.c:512
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "Virheellinen URI: %s"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
 msgid "Loading Addressbook summary..."
 msgstr "Ladataan osoitekirjan yhteenvetoa..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
 #, c-format
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr ""
 "PROPFIND-toiminto webdav-palvelimella epäonnistui HTTP-tilakoodilla %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:883
 msgid "No response body in webdav PROPFIND result"
 msgstr "Vastausrunko puuttuu webdav-palvelimen vastauksesta PROPFIND-pyyntöön"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:944
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "Ladataan yhteystietoja (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1358
 msgid "Cannot transform SoupURI to string"
 msgstr ""
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1554
 #, fuzzy, c-format
 #| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "Resurssin \"%s\" luominen epäonnistui HTTP-statuskoodilla %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1656
 msgid "Contact on server changed -> not modifying"
 msgstr "Yhteystieto muuttui palvelimella -> ei muokata"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1664
 #, fuzzy, c-format
 #| msgid "Modify contact failed with HTTP status: %d (%s)"
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "Yhteystiedon muokkaaminen epäonnistui HTTP-tilakoodilla %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1757
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1773
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE epäonnistui HTTP-tilakoodilla %d"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
 #, fuzzy
 msgid "No such book"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:371
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../addressbook/libedata-book/e-data-book.c:384
 msgid "Contact not found"
 msgstr "Yhteystietoa ei löytynyt"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:372
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
+#: ../addressbook/libedata-book/e-data-book.c:385
 msgid "Contact ID already exists"
 msgstr "Yhteystiedon tunniste on jo olemassa"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
 msgid "No such source"
 msgstr "Lähdettä ei ole olemassa"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:48
+#: ../addressbook/libedata-book/e-data-book.c:401
 msgid "No space"
 msgstr "Ei tilaa"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:131
+#: ../addressbook/libebook-contacts/e-contact.c:130
 msgid "Unique ID"
 msgstr "Yksilöllinen tunniste"
 
@@ -350,12 +357,12 @@ msgstr "Yksilöllinen tunniste"
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook-contacts/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:135
 msgid "File Under"
 msgstr "Tallenna kohtaan"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:138
+#: ../addressbook/libebook-contacts/e-contact.c:137
 #, fuzzy
 msgid "Book UID"
 msgstr "Kirjan URI"
@@ -364,434 +371,435 @@ msgstr "Kirjan URI"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:143
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Given Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:146
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:146
 msgid "Nickname"
 msgstr "Lempinimi"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 1"
 msgstr "1. sähköposti"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 2"
 msgstr "2. sähköposti"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 3"
 msgstr "3. sähköposti"
 
-#: ../addressbook/libebook-contacts/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 4"
 msgstr "4. sähköposti"
 
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Home Address Label"
 msgstr "Kotiosoite"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Work Address Label"
 msgstr "Työosoite"
 
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Other Address Label"
 msgstr "Muu osoite"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:162
 msgid "Assistant Phone"
 msgstr "Apulaisen puhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Business Phone"
 msgstr "Työpuhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Fax"
 msgstr "Työ/faksi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Callback Phone"
 msgstr "Takaisinsoitto"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:173
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:173
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Pager"
 msgstr "Pager"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:182
+#: ../addressbook/libebook-contacts/e-contact.c:181
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:185
+#: ../addressbook/libebook-contacts/e-contact.c:184
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:185
 msgid "Organizational Unit"
 msgstr "Organisaatioyksikkö"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Office"
 msgstr "Asema"
 
-#: ../addressbook/libebook-contacts/e-contact.c:188
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Title"
 msgstr "Titteli"
 
-#: ../addressbook/libebook-contacts/e-contact.c:189
+#: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Role"
 msgstr "Rooli"
 
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:189
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../addressbook/libebook-contacts/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Assistant"
 msgstr "Apulainen"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Homepage URL"
 msgstr "Kotisivun URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Weblog URL"
 msgstr "Weblogin URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:198
+#: ../addressbook/libebook-contacts/e-contact.c:197
 msgid "Categories"
 msgstr "Ryhmät"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "Calendar URI"
 msgstr "Kalenterin URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Free/Busy URL"
 msgstr "Vapaa/varattu URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "ICS Calendar"
 msgstr "ICS-kalenteri"
 
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "Video Conferencing URL"
 msgstr "Videoneuvottelun URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:206
 msgid "Spouse's Name"
 msgstr "Puolison nimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "Note"
 msgstr "Huomio"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:210
 msgid "AIM Home Screen Name 1"
 msgstr "AIM-kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Home Screen Name 2"
 msgstr "AIM-kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Home Screen Name 3"
 msgstr "AIM-kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Work Screen Name 1"
 msgstr "AIM-työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "AIM Work Screen Name 2"
 msgstr "AIM-työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "AIM Work Screen Name 3"
 msgstr "AIM-työnimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise-kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise-kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise-kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise-työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise-työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-työnimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "Jabber Home ID 1"
 msgstr "Jabber koti ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Home ID 2"
 msgstr "Jabber koti ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Home ID 3"
 msgstr "Jabber koti ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Work ID 1"
 msgstr "Jabber työ ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "Jabber Work ID 2"
 msgstr "Jabber työ ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "Jabber Work ID 3"
 msgstr "Jabber työ ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!-kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!-kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!-kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!-työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!-työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!-työnimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "MSN Home Screen Name 1"
 msgstr "MSN-kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Home Screen Name 2"
 msgstr "MSN-kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Home Screen Name 3"
 msgstr "MSN-kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Work Screen Name 1"
 msgstr "MSN-työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:239
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "MSN Work Screen Name 2"
 msgstr "MSN-työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:240
+#: ../addressbook/libebook-contacts/e-contact.c:239
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../addressbook/libebook-contacts/e-contact.c:240
 msgid "ICQ Home ID 1"
 msgstr "ICQ koti ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Home ID 2"
 msgstr "ICQ koti ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:243
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Home ID 3"
 msgstr "ICQ koti ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:244
+#: ../addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Work ID 1"
 msgstr "ICQ työ ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../addressbook/libebook-contacts/e-contact.c:244
 msgid "ICQ Work ID 2"
 msgstr "ICQ työ ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "ICQ Work ID 3"
 msgstr "ICQ työ ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:248
 msgid "Last Revision"
 msgstr "Viimeisin tarkistettu versio"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook-contacts/e-contact.c:253
+#: ../addressbook/libebook-contacts/e-contact.c:252
 msgid "Name or Org"
 msgstr "Nimi tai Org"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:256
+#: ../addressbook/libebook-contacts/e-contact.c:255
 msgid "Address List"
 msgstr "Osoitelista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../addressbook/libebook-contacts/e-contact.c:256
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../addressbook/libebook-contacts/e-contact.c:259
+#: ../addressbook/libebook-contacts/e-contact.c:258
 msgid "Other Address"
 msgstr "Muu osoite"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:262
+#: ../addressbook/libebook-contacts/e-contact.c:261
 msgid "Category List"
 msgstr "Ryhmäluettelo"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:264
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Logo"
 msgstr "Logo"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:269
+#: ../libedataserverui/e-webdav-discover-widget.c:153
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Email List"
 msgstr "Sähköpostilista"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:274
+#: ../addressbook/libebook-contacts/e-contact.c:273
 msgid "AIM Screen Name List"
 msgstr "AIM näyttönimien lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../addressbook/libebook-contacts/e-contact.c:274
 msgid "GroupWise ID List"
 msgstr "GroupWise-ID-lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:276
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "Jabber ID List"
 msgstr "Jabber-ID-lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:277
+#: ../addressbook/libebook-contacts/e-contact.c:276
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo!-näyttönimien lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../addressbook/libebook-contacts/e-contact.c:277
 msgid "MSN Screen Name List"
 msgstr "MSN-näyttönimien lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:279
+#: ../addressbook/libebook-contacts/e-contact.c:278
 msgid "ICQ ID List"
 msgstr "ICQ ID lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:281
+#: ../addressbook/libebook-contacts/e-contact.c:280
 msgid "Wants HTML Mail"
 msgstr "Tahtoo HTML-postia"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * field describing whether it's a Contact list (list of email addresses) or a
 #. * regular contact for one person/organization/...
-#: ../addressbook/libebook-contacts/e-contact.c:286
+#: ../addressbook/libebook-contacts/e-contact.c:285
 msgid "List"
 msgstr "Lista"
 
@@ -799,25 +807,30 @@ msgstr "Lista"
 #. * used to determine whether when sending to Contact lists the addresses should be
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:290
 #, fuzzy
 msgid "List Shows Addresses"
 msgstr "Lista näytettävistä osoitteista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:292
 msgid "Birth Date"
 msgstr "Syntymäpäivä"
 
-#: ../addressbook/libebook-contacts/e-contact.c:294
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
+#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:948
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:296
 msgid "X.509 Certificate"
 msgstr "X.509-varmenne"
 
+#: ../addressbook/libebook-contacts/e-contact.c:297
+#| msgid "Certificate"
+msgid "PGP Certificate"
+msgstr "PGP-varmenne"
+
 #: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu koti ID 1"
@@ -919,8 +932,8 @@ msgstr "Google Talk -nimilista"
 msgid "Twitter Name List"
 msgstr "Twitter-nimilista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1654
-#: ../addressbook/libebook/e-destination.c:920
+#: ../addressbook/libebook-contacts/e-contact.c:1660
+#: ../addressbook/libebook/e-destination.c:918
 msgid "Unnamed List"
 msgstr "Nimeämätön lista"
 
@@ -929,7 +942,7 @@ msgid "The library was built without phone number support."
 msgstr ""
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:43
-msgid "The phone number parser reported an yet unkown error code."
+msgid "The phone number parser reported a yet unknown error code."
 msgstr ""
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:45
@@ -955,33 +968,39 @@ msgstr ""
 msgid "Text is too long for a phone number"
 msgstr ""
 
-#: ../addressbook/libebook/e-book-client.c:807
+#: ../addressbook/libebook/e-book-client.c:931
 #, fuzzy, c-format
 msgid "Unknown book property '%s'"
 msgstr "Tuntematon virhe: %s"
 
-#: ../addressbook/libebook/e-book-client.c:822
+#: ../addressbook/libebook/e-book-client.c:946
 #, fuzzy, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../addressbook/libebook/e-book-client.c:1207
-#: ../addressbook/libebook/e-book-client.c:1382
-#: ../addressbook/libebook/e-book-client.c:1649
-#: ../calendar/libecal/e-cal-client.c:1530
-#: ../calendar/libecal/e-cal-client.c:1712
+#: ../addressbook/libebook/e-book-client.c:1390
+#: ../addressbook/libebook/e-book-client.c:1621
+#: ../addressbook/libebook/e-book-client.c:1898
+#: ../calendar/libecal/e-cal-client.c:1717
+#: ../calendar/libecal/e-cal-client.c:1955
 #, fuzzy, c-format
 msgid "Unable to connect to '%s': "
 msgstr "Yhteyttä %s:ään ei voitu luoda: %s"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:899
-#: ../addressbook/libedata-book/e-book-sqlite.c:2163
+#: ../addressbook/libebook/e-book-client-view.c:870
+#: ../calendar/libecal/e-cal-client-view.c:681
+#, c-format
+msgid "Client disappeared"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
+#: ../addressbook/libedata-book/e-book-sqlite.c:2229
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1509
-#: ../addressbook/libedata-book/e-book-sqlite.c:1319
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../addressbook/libedata-book/e-book-sqlite.c:1368
 #, fuzzy
 #| msgid ""
 #| "Error executing search expression: %s:\n"
@@ -991,317 +1010,317 @@ msgstr ""
 "Virhe suoritettaessa hakulauseketta: %s:\n"
 "%s"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1554
-#: ../addressbook/libedata-book/e-book-sqlite.c:1803 ../camel/camel-db.c:545
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
+#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:751
 #, c-format
 msgid "Insufficient memory"
 msgstr "Muisti ei riitä"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1691
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1725
-#: ../addressbook/libedata-book/e-book-sqlite.c:557
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
+#: ../addressbook/libedata-book/e-book-sqlite.c:579
 #, c-format
 msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
 "string and string list field types are supported"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3065
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4161
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4169
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
-#: ../addressbook/libedata-book/e-book-sqlite.c:5385
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
+#: ../addressbook/libedata-book/e-book-sqlite.c:5807
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4304
 #, fuzzy, c-format
 #| msgid "Invalid query"
 msgid "Invalid Query"
 msgstr "Virheellinen kysely"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4320
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4328
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4389
-#: ../addressbook/libedata-book/e-data-book.c:383
-#: ../addressbook/libedata-book/e-data-book.c:1028
-#: ../calendar/libedata-cal/e-data-cal.c:420
-#: ../calendar/libedata-cal/e-data-cal.c:1307 ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4397
+#: ../addressbook/libedata-book/e-data-book.c:396
+#: ../addressbook/libedata-book/e-data-book.c:1146
+#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../calendar/libedata-cal/e-data-cal.c:1427 ../libedataserver/e-client.c:177
 #, c-format
 msgid "Invalid query"
 msgstr "Virheellinen kysely"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4432
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4440
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5255
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5263
 #, fuzzy, c-format
 #| msgid "Failed to remove file '%s': %s"
 msgid "Unable to remove the db file: errno %d"
 msgstr "Tiedoston \"%s\" poistaminen epäonnistui: %s"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6042
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6050
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6450
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6063
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6071
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6070
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
-#: ../addressbook/libedata-book/e-book-sqlite.c:7397
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../addressbook/libedata-book/e-book-sqlite.c:8106
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
 "the contact list"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
-#: ../addressbook/libedata-book/e-book-sqlite.c:7405
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
+#: ../addressbook/libedata-book/e-book-sqlite.c:8114
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
 "contact list"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:524
+#: ../addressbook/libedata-book/e-book-sqlite.c:545
 #, c-format
 msgid "Unsupported contact field '%d' specified in summary"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1876
+#: ../addressbook/libedata-book/e-book-sqlite.c:1925
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the 'folders' table first."
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5378
+#: ../addressbook/libedata-book/e-book-sqlite.c:5800
 #, fuzzy, c-format
 #| msgid "Invalid query: "
 msgid "Invalid query: %s"
 msgstr "Virheellinen haku: "
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5553
+#: ../addressbook/libedata-book/e-book-sqlite.c:5975
 #, fuzzy
 #| msgid "Invalid query: "
 msgid "Invalid query for EbSqlCursor"
 msgstr "Virheellinen haku: "
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7219
+#: ../addressbook/libedata-book/e-book-sqlite.c:7928
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7237
+#: ../addressbook/libedata-book/e-book-sqlite.c:7946
 msgid "Cannot sort by a field that is not a string type"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book.c:367
-#: ../calendar/libedata-cal/e-data-cal.c:401
+#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Success"
 msgstr "Valmis"
 
-#: ../addressbook/libedata-book/e-data-book.c:368
-#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:402
-#: ../libedataserver/e-client.c:139
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libecal/e-cal.c:2304 ../calendar/libedata-cal/e-data-cal.c:410
+#: ../libedataserver/e-client.c:144
 msgid "Backend is busy"
 msgstr "Taustajärjestelmä on käytössä"
 
-#: ../addressbook/libedata-book/e-data-book.c:369
-#: ../calendar/libedata-cal/e-data-cal.c:403 ../libedataserver/e-client.c:149
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:154
 msgid "Repository offline"
 msgstr "Lähde poissa käytöstä"
 
-#: ../addressbook/libedata-book/e-data-book.c:370
-#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:404
-#: ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/libecal/e-cal.c:2318 ../calendar/libedata-cal/e-data-cal.c:412
+#: ../libedataserver/e-client.c:161
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
-#: ../addressbook/libedata-book/e-data-book.c:373
-#: ../calendar/libedata-cal/e-data-cal.c:409
+#: ../addressbook/libedata-book/e-data-book.c:386
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Authentication Failed"
 msgstr "Tunnistus epäonnistui"
 
-#: ../addressbook/libedata-book/e-data-book.c:374
-#: ../calendar/libedata-cal/e-data-cal.c:410
+#: ../addressbook/libedata-book/e-data-book.c:387
+#: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Authentication Required"
 msgstr "Tunnistautuminen vaaditaan"
 
-#: ../addressbook/libedata-book/e-data-book.c:375
-#: ../calendar/libedata-cal/e-data-cal.c:411
+#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Unsupported field"
 msgstr "Kenttä ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
-#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:164
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:169
 msgid "Unsupported authentication method"
 msgstr "Tunnistautumismenetelmä ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:377
-#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:390
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:171
 msgid "TLS not available"
 msgstr "TLS ei käytettävissä"
 
-#: ../addressbook/libedata-book/e-data-book.c:378
+#: ../addressbook/libedata-book/e-data-book.c:391
 msgid "Address book does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
-#: ../addressbook/libedata-book/e-data-book.c:379
+#: ../addressbook/libedata-book/e-data-book.c:392
 msgid "Book removed"
 msgstr "Kirja poistettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:380
-#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Not available in offline mode"
 msgstr "Ei käytettävissä yhteydettömässä tilassa"
 
-#: ../addressbook/libedata-book/e-data-book.c:381
-#: ../calendar/libedata-cal/e-data-cal.c:418 ../libedataserver/e-client.c:168
+#: ../addressbook/libedata-book/e-data-book.c:394
+#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:173
 msgid "Search size limit exceeded"
 msgstr "Haun kokorajoitus ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:382
-#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:170
+#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:175
 msgid "Search time limit exceeded"
 msgstr "Haun aikaraja ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:384
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:174
+#: ../addressbook/libedata-book/e-data-book.c:397
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:179
 msgid "Query refused"
 msgstr "Kyselyä ei hyväksytty"
 
-#: ../addressbook/libedata-book/e-data-book.c:385
-#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:398
+#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:165
 msgid "Could not cancel"
 msgstr "Ei voi perua"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
 #. { OtherError,                       N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:387
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:400
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Invalid server version"
 msgstr "Virheellinen palvelimen versio"
 
-#: ../addressbook/libedata-book/e-data-book.c:389
-#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:425
-#: ../libedataserver/e-client.c:137
+#: ../addressbook/libedata-book/e-data-book.c:402
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:433
+#: ../libedataserver/e-client.c:142
 msgid "Invalid argument"
 msgstr "Virheellinen argumentti"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../addressbook/libedata-book/e-data-book.c:404
 #: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
-#: ../calendar/libecal/e-cal.c:1907 ../calendar/libecal/e-cal.c:2339
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:162
+#: ../calendar/libecal/e-cal.c:1909 ../calendar/libecal/e-cal.c:2341
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:167
 #, c-format
 msgid "Not supported"
 msgstr "Ei tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:180
+#: ../addressbook/libedata-book/e-data-book.c:405
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
 msgid "Backend is not opened yet"
 msgstr "Taustapalvelu ei vielä käynnissä"
 
-#: ../addressbook/libedata-book/e-data-book.c:393
-#: ../libedataserver/e-client.c:182
+#: ../addressbook/libedata-book/e-data-book.c:406
+#: ../libedataserver/e-client.c:187
 #, fuzzy
 #| msgid "Object not found"
 msgid "Object is out of sync"
 msgstr "Kohdetta ei löydy"
 
-#: ../addressbook/libedata-book/e-data-book.c:401
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:178
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:183
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: ../addressbook/libedata-book/e-data-book.c:1053
-#: ../calendar/libedata-cal/e-data-cal.c:1332
+#: ../addressbook/libedata-book/e-data-book.c:1171
+#: ../calendar/libedata-cal/e-data-cal.c:1452
 msgid "Invalid query: "
 msgstr "Virheellinen haku: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1272
+#: ../addressbook/libedata-book/e-data-book.c:1420
 msgid "Cannot open book: "
 msgstr "Kirjan avaaminen epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1309
+#: ../addressbook/libedata-book/e-data-book.c:1458
 msgid "Cannot refresh address book: "
 msgstr "Osoitekirjan päivitys epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1340
+#: ../addressbook/libedata-book/e-data-book.c:1497
 msgid "Cannot get contact: "
 msgstr "Yhteystiedon hakeminen epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1378
+#: ../addressbook/libedata-book/e-data-book.c:1546
 msgid "Cannot get contact list: "
 msgstr "Yhteystietoluettelon haku epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1430
+#: ../addressbook/libedata-book/e-data-book.c:1602
 #, fuzzy
 msgid "Cannot get contact list uids: "
 msgstr "Kansion %s säiliötä ei voitu hakea"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1477
+#: ../addressbook/libedata-book/e-data-book.c:1653
 msgid "Cannot add contact: "
 msgstr "Yhteystiedon lisäys epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1526
+#: ../addressbook/libedata-book/e-data-book.c:1706
 msgid "Cannot modify contacts: "
 msgstr "Yhteystietojen muokkaaminen epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1568
+#: ../addressbook/libedata-book/e-data-book.c:1759
 msgid "Cannot remove contacts: "
 msgstr "Yhteystietojen poisto epäonnistui: "
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:772
+#: ../addressbook/libedata-book/e-data-book-cursor.c:776
 msgid "Cursor does not support setting the search expression"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:855
+#: ../addressbook/libedata-book/e-data-book-cursor.c:859
 #, fuzzy
 #| msgid "Store does not support an INBOX"
 msgid "Cursor does not support step"
 msgstr "Kansio ei tue INBOXia"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:938
+#: ../addressbook/libedata-book/e-data-book-cursor.c:942
 #, fuzzy
 msgid "Cursor does not support alphabetic indexes"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
@@ -1318,53 +1337,38 @@ msgstr ""
 msgid "Alphabetic index was set for incorrect locale"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:289
-#: ../calendar/libedata-cal/e-data-cal-factory.c:285
-#, c-format
-msgid "No backend name in source '%s'"
-msgstr "Taustapalvelun nimeä ei löydy lähteestä \"%s\""
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:377
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
-#, c-format
-msgid "Missing source UID"
-msgstr "Lähteen UID puuttuu"
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:388
-#: ../calendar/libedata-cal/e-data-cal-factory.c:349
-#, c-format
-msgid "No such source for UID '%s'"
-msgstr "Lähdettä, jonka UID on \"%s\", ei löydy"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:581
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:671
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Palvelin ei ole tavoitettavissa (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:612
-#, c-format
-msgid "Failed to connect to a server using SSL: %s"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:702
+#, fuzzy, c-format
+#| msgid "Failed to connect to a server using SSL: %s"
+msgid "Failed to connect to a server using SSL/TLS: %s"
 msgstr "SSL-yhteyden muodostaminen palvelimeen epäonnistui: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:623
-#, c-format
-msgid "Unexpected HTTP status code %d returned (%s)"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:718
+#, fuzzy, c-format
+#| msgid "Unexpected HTTP status code %d returned (%s)"
+msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
 msgstr "Odottamaton HTTP-tilakoodi %d palautettiin (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:642
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:739
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV-taustapalvelua ei ole vielä ladattu"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1084
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1176
+#: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "Virheellinen uudelleenohjaus"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2887
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3033
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Paikallisen välimuistikansion \"%s\" luominen epäonnistui"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2939
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3116
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1373,355 +1377,351 @@ msgstr ""
 "Palvelimeen ei saatu yhteyttä, kalenteri avattiin vain-luku -tilassa.\n"
 "Virheviesti oli: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3973
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4211
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV ei tue massalisäyksiä"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4076
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4314
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV ei tue massamuokkauksia"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4252
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4595
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV ei tue massapoistoja"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4919
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5277
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalenteri ei tue Vapaa/Varattu -tiloja"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5286
 msgid "Schedule outbox url not found"
 msgstr ""
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5025
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5383
 msgid "Unexpected result in schedule-response"
 msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:895
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:950
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:931
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:986
 #, c-format
 msgid "Birthday: %s"
 msgstr "Syntymäpäivä: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1017
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Vuosipäivä: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:244
+#: ../calendar/backends/file/e-cal-backend-file.c:245
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Kalenteritietoja ei voi tallentaa: virheellinen URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
-#: ../calendar/backends/file/e-cal-backend-file.c:257
+#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
 msgid "Cannot save calendar data"
 msgstr "Kalenteritietoja ei voi tallentaa"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:491
-#, c-format
-msgid "Malformed URI: %s"
-msgstr "Virheellinen URI: %s"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:582
+#: ../calendar/backends/http/e-cal-backend-http.c:581
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Uudelleenohjaus virheelliseen URI:in"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:625
+#: ../calendar/backends/http/e-cal-backend-http.c:640
 #, c-format
 msgid "Bad file format."
 msgstr "Virheellinen tiedostomuoto."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:635
+#: ../calendar/backends/http/e-cal-backend-http.c:650
 #, c-format
 msgid "Not a calendar."
 msgstr "Ei kalenteri."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:925
-#: ../calendar/backends/weather/e-cal-backend-weather.c:536
+#: ../calendar/backends/http/e-cal-backend-http.c:954
+#: ../calendar/backends/weather/e-cal-backend-weather.c:709
 msgid "Could not create cache file"
 msgstr "Välimuistitiedostoa ei voitu luoda"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:174
+#: ../calendar/backends/weather/e-cal-backend-weather.c:195
 msgid "Could not retrieve weather data"
 msgstr "Säätietoja ei voitu hakea"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+#: ../calendar/backends/weather/e-cal-backend-weather.c:378
 msgid "Weather: Fog"
 msgstr "Sää: sumuista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:296
+#: ../calendar/backends/weather/e-cal-backend-weather.c:379
 msgid "Weather: Cloudy Night"
 msgstr "Sää: pilvinen yö"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:297
+#: ../calendar/backends/weather/e-cal-backend-weather.c:380
 msgid "Weather: Cloudy"
 msgstr "Sää: pilvistä"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:298
+#: ../calendar/backends/weather/e-cal-backend-weather.c:381
 msgid "Weather: Overcast"
 msgstr "Sää: poutaista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:299
+#: ../calendar/backends/weather/e-cal-backend-weather.c:382
 msgid "Weather: Showers"
 msgstr "Sää: sadekuuroja"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:300
+#: ../calendar/backends/weather/e-cal-backend-weather.c:383
 msgid "Weather: Snow"
 msgstr "Sää: sadetta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:301
+#: ../calendar/backends/weather/e-cal-backend-weather.c:384
 msgid "Weather: Clear Night"
 msgstr "Sää: kirkas yö"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:302
+#: ../calendar/backends/weather/e-cal-backend-weather.c:385
 msgid "Weather: Sunny"
 msgstr "Sää: Aurinkoista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:303
+#: ../calendar/backends/weather/e-cal-backend-weather.c:386
 msgid "Weather: Thunderstorms"
 msgstr "Sää: ukkosta"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:329
+#: ../calendar/backends/weather/e-cal-backend-weather.c:412
 #, c-format
 msgid "%.1f °F"
 msgstr "%.1f °F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:332
+#: ../calendar/backends/weather/e-cal-backend-weather.c:415
 #, c-format
 msgid "%.1f °C"
 msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../calendar/backends/weather/e-cal-backend-weather.c:335
+#: ../calendar/backends/weather/e-cal-backend-weather.c:418
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:341
+#: ../calendar/backends/weather/e-cal-backend-weather.c:424
 #, c-format
 msgid "%.1f"
 msgstr "%.1f"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:452
+#: ../calendar/backends/weather/e-cal-backend-weather.c:589
+#: ../calendar/backends/weather/e-cal-backend-weather.c:617
 msgid "Forecast"
 msgstr "Sääennuste"
 
-#: ../calendar/libecal/e-cal.c:2304
+#: ../calendar/libecal/e-cal.c:2306
 msgid "Repository is offline"
 msgstr "Varasto on yhteydettömässä tilassa"
 
-#: ../calendar/libecal/e-cal.c:2306 ../calendar/libecal/e-cal-client.c:263
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:266
 msgid "No such calendar"
 msgstr "Kalenteria ei ole olemassa"
 
-#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:265
-#: ../calendar/libedata-cal/e-data-cal.c:406
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Object not found"
 msgstr "Kohdetta ei löydy"
 
-#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:267
-#: ../calendar/libedata-cal/e-data-cal.c:407
+#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Invalid object"
 msgstr "Virheellinen kohde"
 
-#: ../calendar/libecal/e-cal.c:2312
+#: ../calendar/libecal/e-cal.c:2314
 msgid "URI not loaded"
 msgstr "URIa ei ole ladattu"
 
-#: ../calendar/libecal/e-cal.c:2314
+#: ../calendar/libecal/e-cal.c:2316
 msgid "URI already loaded"
 msgstr "URI on jo ladattu"
 
-#: ../calendar/libecal/e-cal.c:2318
+#: ../calendar/libecal/e-cal.c:2320
 msgid "Unknown User"
 msgstr "Tuntematon käyttäjä"
 
-#: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:271
-#: ../calendar/libedata-cal/e-data-cal.c:408
+#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:274
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Object ID already exists"
 msgstr "OID on jo olemassa"
 
-#: ../calendar/libecal/e-cal.c:2322
+#: ../calendar/libecal/e-cal.c:2324
 msgid "Protocol not supported"
 msgstr "Protokolla ei ole tuettu"
 
-#: ../calendar/libecal/e-cal.c:2324
+#: ../calendar/libecal/e-cal.c:2326
 msgid "Operation has been canceled"
 msgstr "Toimenpide on peruttu"
 
-#: ../calendar/libecal/e-cal.c:2326
+#: ../calendar/libecal/e-cal.c:2328
 msgid "Could not cancel operation"
 msgstr "Toimenpidettä ei voitu perua"
 
-#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:145
+#: ../calendar/libecal/e-cal.c:2330 ../libedataserver/e-client.c:150
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../calendar/libecal/e-cal.c:2330
-#: ../camel/providers/smtp/camel-smtp-transport.c:921
-#: ../libedataserver/e-client.c:147
+#: ../calendar/libecal/e-cal.c:2332
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+#: ../libedataserver/e-client.c:152
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: ../calendar/libecal/e-cal.c:2332
+#: ../calendar/libecal/e-cal.c:2334
 msgid "A D-Bus exception has occurred"
 msgstr "Tapahtui D-Bus-poikkeus"
 
-#: ../calendar/libecal/e-cal.c:2336
+#: ../calendar/libecal/e-cal.c:2338
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: ../calendar/libecal/e-cal-client.c:269
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libecal/e-cal-client.c:272
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unknown user"
 msgstr "Tuntematon käyttäjä"
 
-#: ../calendar/libecal/e-cal-client.c:273
-#: ../calendar/libedata-cal/e-data-cal.c:405
+#: ../calendar/libecal/e-cal-client.c:276
+#: ../calendar/libedata-cal/e-data-cal.c:413
 msgid "Invalid range"
 msgstr "Virheellinen alue"
 
-#: ../calendar/libecal/e-cal-client.c:936
+#: ../calendar/libecal/e-cal-client.c:1065
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Tuntematon kalenteriominaisuus '%s'"
 
-#: ../calendar/libecal/e-cal-client.c:951
+#: ../calendar/libecal/e-cal-client.c:1080
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Kalenteriominaisuuden '%s' arvon muuttaminen ei onnistu"
 
-#: ../calendar/libecal/e-cal-component.c:1348
+#: ../calendar/libecal/e-cal-component.c:1357
 msgid "Untitled appointment"
 msgstr "Nimeämätön tapaaminen"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4744
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4745
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4746
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4747
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4748
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4749
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4750
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4751
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4752
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4753
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4754
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4755
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4756
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4757
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4758
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4759
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4760
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4761
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4762
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4763
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4764
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4765
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4766
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4767
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4768
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4769
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4770
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4771
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4772
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4773
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4774
 msgid "31st"
 msgstr "31."
 
@@ -1746,83 +1746,83 @@ msgctxt "Priority"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:84
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1062
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1371
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1498
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1547
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1379
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1506
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1555
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ottaa yhden argumentin"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:91
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:673
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1378
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" olettaa ensimmäisen argumentin olevan merkkijonon"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
 #, fuzzy, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:173
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:262
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:324
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:823
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1069
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1447
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1505
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1554
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:263
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:824
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" olettaa ensimmäisen argumentin olevan muotoa time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:270
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:334
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:335
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" olettaa toisen argumentin olevan muotoa time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
 #, fuzzy, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "\"%s\" olettaa ensimmäisen argumentin olevan merkkijonon"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:255
 #, fuzzy, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:317
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:666
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:816
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1440
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:602
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:625
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:748
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:780
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1332
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:603
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:626
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:749
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:988
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1340
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" ei ota argumentteja"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:682
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:683
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" olettaa toisen argumentin olevan merkkijonon"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:713
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1833,12 +1833,12 @@ msgstr ""
 "\"description\", \"sijainti\", \"attendee\", \"organizer\" tai "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" tahtoo vähintään yhden argumentin"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:899
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:900
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1847,136 +1847,136 @@ msgstr ""
 "\"%s\" olettaa kaikkien argumenttien olevan merkkijonoja, tai yhden ja "
 "ainoastaan yhden olevan totuusarvoisen epätoden (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1395
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1403
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "\"%s\" olettaa ensimmäisen argumentin olevan ISO-8601 muotoinen päiväys"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1456
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1464
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" olettaa toisen argumentin olevan kokonaisluvun"
 
-#: ../calendar/libedata-cal/e-data-cal.c:412
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Unsupported method"
 msgstr "Menetelmä ei ole tuettu."
 
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Calendar does not exist"
 msgstr "Kalenteria ei ole olemassa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1503
+#: ../calendar/libedata-cal/e-data-cal.c:1645
 msgid "Cannot open calendar: "
 msgstr "Kalenterin avaus epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1540
+#: ../calendar/libedata-cal/e-data-cal.c:1682
 msgid "Cannot refresh calendar: "
 msgstr "Kalenterin päivitys epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1581
+#: ../calendar/libedata-cal/e-data-cal.c:1723
 #, fuzzy
 msgid "Cannot retrieve calendar object path: "
 msgstr "Kalenteritietoja ei voi tallentaa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1633
+#: ../calendar/libedata-cal/e-data-cal.c:1775
 #, fuzzy
 msgid "Cannot retrieve calendar object list: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1684
+#: ../calendar/libedata-cal/e-data-cal.c:1832
 #, fuzzy
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1727
+#: ../calendar/libedata-cal/e-data-cal.c:1882
 #, fuzzy
 msgid "Cannot create calendar object: "
 msgstr "Viestiä ei voi luoda: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1795
+#: ../calendar/libedata-cal/e-data-cal.c:1950
 #, fuzzy
 msgid "Cannot modify calendar object: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1873
+#: ../calendar/libedata-cal/e-data-cal.c:2028
 #, fuzzy
 msgid "Cannot remove calendar object: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1959
+#: ../calendar/libedata-cal/e-data-cal.c:2114
 #, fuzzy
 msgid "Cannot receive calendar objects: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2002
+#: ../calendar/libedata-cal/e-data-cal.c:2157
 #, fuzzy
 msgid "Cannot send calendar objects: "
 msgstr "Kalenteritietoja ei voi tallentaa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2054
+#: ../calendar/libedata-cal/e-data-cal.c:2209
 #, fuzzy
 msgid "Could not retrieve attachment uris: "
 msgstr "Tietoa ei voitu avata välimuistista: %s: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2099
+#: ../calendar/libedata-cal/e-data-cal.c:2254
 #, fuzzy
 msgid "Could not discard reminder: "
 msgstr "Kansiota ei voitu tallentaa: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2140
+#: ../calendar/libedata-cal/e-data-cal.c:2295
 #, fuzzy
 msgid "Could not retrieve calendar time zone: "
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2180
+#: ../calendar/libedata-cal/e-data-cal.c:2335
 #, fuzzy
 msgid "Could not add calendar time zone: "
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:204
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue allekirjoitusta"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:217
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue varmennusta"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:233
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue tiedon salausta"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:247
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue salauksen purkua"
 
-#: ../camel/camel-cipher-context.c:359
+#: ../camel/camel-cipher-context.c:363
 msgid "Signing message"
 msgstr "Allekirjoitetaan viestiä"
 
-#: ../camel/camel-cipher-context.c:649
+#: ../camel/camel-cipher-context.c:653
 msgid "Encrypting message"
 msgstr "Salataan viestiä"
 
-#: ../camel/camel-cipher-context.c:821
+#: ../camel/camel-cipher-context.c:825
 msgid "Decrypting message"
 msgstr "Puretaan viestin salausta"
 
@@ -1985,197 +1985,214 @@ msgstr "Puretaan viestin salausta"
 msgid "Unable to create cache path"
 msgstr "Välimuistipolun luonti epäonnistui"
 
-#: ../camel/camel-data-cache.c:449
+#: ../camel/camel-data-cache.c:457
 msgid "Empty cache file"
 msgstr ""
 
-#: ../camel/camel-data-cache.c:522
+#: ../camel/camel-data-cache.c:534
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Tietoa ei voitu avata välimuistista: %s: %s"
 
-#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:795
+#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
+#, c-format
+msgid "Could not rename '%s' to %s: %s"
+msgstr "Uudelleennimeäminen %s:stä %s:ksi epäonnistui: %s"
+
+#: ../camel/camel-filter-driver.c:934 ../camel/camel-filter-search.c:798
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Lapsiprosessin \"%s\" luominen epäonnistui: %s"
 
-#: ../camel/camel-filter-driver.c:962
+#: ../camel/camel-filter-driver.c:982
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Virheellinen viestivirta lähteestä %s: %s"
 
-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
+#: ../camel/camel-filter-driver.c:1189 ../camel/camel-filter-driver.c:1198
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1276
+#: ../camel/camel-filter-driver.c:1296
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1287
+#: ../camel/camel-filter-driver.c:1307
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1383
+#: ../camel/camel-filter-driver.c:1403
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu avata"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu käsitellä"
 
-#: ../camel/camel-filter-driver.c:1418
+#: ../camel/camel-filter-driver.c:1438
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiä %d (%d %%)"
 
-#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
+#: ../camel/camel-filter-driver.c:1447 ../camel/camel-filter-driver.c:1469
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
+#: ../camel/camel-filter-driver.c:1488 ../camel/camel-filter-driver.c:1602
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
+#: ../camel/camel-filter-driver.c:1493 ../camel/camel-filter-driver.c:1610
 msgid "Complete"
 msgstr "Valmis"
 
-#: ../camel/camel-filter-driver.c:1536
+#: ../camel/camel-filter-driver.c:1556
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestiä %d / %d"
 
-#: ../camel/camel-filter-driver.c:1554
+#: ../camel/camel-filter-driver.c:1574
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: ../camel/camel-filter-driver.c:1750 ../camel/camel-filter-driver.c:1777
+#: ../camel/camel-filter-driver.c:1769 ../camel/camel-filter-driver.c:1796
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "Suodattimen \"%s\" suorittaminen epäonnistui: "
 
-#: ../camel/camel-filter-driver.c:1767
+#: ../camel/camel-filter-driver.c:1786
 #, fuzzy, c-format
 #| msgid "Error parsing filter: %s: %s"
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1786
+#: ../camel/camel-filter-driver.c:1805
 #, fuzzy, c-format
 #| msgid "Error executing filter: %s: %s"
 msgid "Error executing filter '%s': %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../camel/camel-filter-search.c:136
+#: ../camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Viestiä ei voitu hakea."
 
-#: ../camel/camel-filter-search.c:535
+#: ../camel/camel-filter-search.c:538
 msgid "Invalid arguments to (system-flag)"
 msgstr "Virheellisiä argumentteja (system-flag)"
 
-#: ../camel/camel-filter-search.c:553
+#: ../camel/camel-filter-search.c:556
 msgid "Invalid arguments to (user-tag)"
 msgstr "Virheellisiä argumentteja (user-tag)"
 
-#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086
+#: ../camel/camel-filter-search.c:1068
+#, fuzzy
+#| msgid "Invalid arguments to (system-flag)"
+msgid "Invalid arguments to (message-location)"
+msgstr "Virheellisiä argumentteja (system-flag)"
+
+#: ../camel/camel-filter-search.c:1149 ../camel/camel-filter-search.c:1160
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 
-#: ../camel/camel-folder.c:323
+#: ../camel/camel-folder.c:326
 #, fuzzy, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "Etsitään muuttuneita viestejä kansiosta %s"
 msgstr[1] "Etsitään muuttuneita viestejä kansiosta %s"
 
-#: ../camel/camel-folder.c:363
+#: ../camel/camel-folder.c:366
 #, fuzzy, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "Etsitään muuttuneita viestejä kansiosta %s"
 msgstr[1] "Etsitään muuttuneita viestejä kansiosta %s"
 
-#: ../camel/camel-folder.c:411
+#: ../camel/camel-folder.c:414
 #, fuzzy, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "Suodatetaan uusia viestejä"
 msgstr[1] "Suodatetaan uusia viestejä"
 
-#: ../camel/camel-folder.c:1011
+#: ../camel/camel-folder.c:1020
 #: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Siirretään viestejä"
 
-#: ../camel/camel-folder.c:1014
+#: ../camel/camel-folder.c:1023
 msgid "Copying messages"
 msgstr "Kopioidaan viestejä"
 
-#: ../camel/camel-folder.c:1056
+#: ../camel/camel-folder.c:1065
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr ""
 
-#: ../camel/camel-folder.c:2862
+#: ../camel/camel-folder.c:1160
+#, fuzzy, c-format
+#| msgid "Opening folder '%s'"
+msgid "Filtering folder '%s'"
+msgstr "Avataan kansiota ”%s”"
+
+#: ../camel/camel-folder.c:2896
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Siivotaan poistettuja kansiosta ”%s”"
 
-#: ../camel/camel-folder.c:2990
+#: ../camel/camel-folder.c:3027
 #, fuzzy, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Haetaan POP-viestiä %d"
 
-#: ../camel/camel-folder.c:3181
+#: ../camel/camel-folder.c:3218
 #, fuzzy, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
 
-#: ../camel/camel-folder.c:3478
+#: ../camel/camel-folder.c:3515
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Päivitetään kansiota ”%s”"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941
+#: ../camel/camel-folder-search.c:915 ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) vaatii yhden totuusarvoisen tuloksen"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:976
+#: ../camel/camel-folder-search.c:992
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ei ole sallittu kohdan %s sisällä"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991
+#: ../camel/camel-folder-search.c:999 ../camel/camel-folder-search.c:1007
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) vaatii vertaustyypin merkkijonon"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1019
+#: ../camel/camel-folder-search.c:1035
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) olettaa tuloksena olevan taulukon"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1029
+#: ../camel/camel-folder-search.c:1045
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) vaatii kansion asettamisen"
 
-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
+#: ../camel/camel-folder-search.c:1963 ../camel/camel-folder-search.c:2132
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2184,7 +2201,7 @@ msgstr ""
 "Hakulauseketta ei voi tulkita: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121
+#: ../camel/camel-folder-search.c:1975 ../camel/camel-folder-search.c:2144
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2193,18 +2210,29 @@ msgstr ""
 "Virhe suoritettaessa hakulauseketta: %s:\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:721 ../camel/camel-gpg-context.c:726
-#: ../camel/camel-gpg-context.c:1383
+#: ../camel/camel-folder-summary.c:2156
+#, c-format
+msgid "Release unused memory for folder '%s'"
+msgstr ""
+
+#: ../camel/camel-folder-summary.c:2368
+#, fuzzy, c-format
+#| msgid "Updating folder '%s'"
+msgid "Update preview data for folder '%s'"
+msgstr "Päivitetään kansiota '%s'"
+
+#: ../camel/camel-gpg-context.c:770 ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:1442
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg:n suoritus epäonnistui: %s"
 
-#: ../camel/camel-gpg-context.c:726
-#: ../camel/providers/smtp/camel-smtp-transport.c:924
+#: ../camel/camel-gpg-context.c:775
+#: ../camel/providers/smtp/camel-smtp-transport.c:1130
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../camel/camel-gpg-context.c:791
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2215,24 +2243,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:876
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg käyttäjätunnisteen vihjeen tulkitseminen epäonnistui."
 
-#: ../camel/camel-gpg-context.c:852 ../camel/camel-gpg-context.c:867
+#: ../camel/camel-gpg-context.c:901 ../camel/camel-gpg-context.c:916
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg salalausepyynnön tulkinta epäonnistui."
 
-#: ../camel/camel-gpg-context.c:888
+#: ../camel/camel-gpg-context.c:937
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr "Tarvitset PIN-koodin avataksesi älykorttisi: \"%s\""
 
-#: ../camel/camel-gpg-context.c:892
+#: ../camel/camel-gpg-context.c:941
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2241,84 +2269,90 @@ msgstr ""
 "Tarvitse salalauseen avataksesi avaimen\n"
 "käyttäjälle: \"%s\""
 
-#: ../camel/camel-gpg-context.c:898
+#: ../camel/camel-gpg-context.c:947
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Odottamaton pyyntö GnuPG:ltä kohteelle \"%s\""
 
-#: ../camel/camel-gpg-context.c:910
+#: ../camel/camel-gpg-context.c:959
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:941 ../camel/camel-net-utils.c:524
+#: ../camel/camel-gpg-context.c:990 ../camel/camel-net-utils.c:524
 #: ../camel/providers/nntp/camel-nntp-summary.c:401
-#: ../libedataserver/e-client.c:158
+#: ../libedataserver/e-client.c:163
 #, c-format
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../camel/camel-gpg-context.c:962
+#: ../camel/camel-gpg-context.c:1011
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Salaisen avaimen avaus epäonnistui: 3 virheellistä salalausetta syötetty."
 
-#: ../camel/camel-gpg-context.c:975
+#: ../camel/camel-gpg-context.c:1024
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus GnuPG:ltä: %s"
 
-#: ../camel/camel-gpg-context.c:1106
+#: ../camel/camel-gpg-context.c:1162
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Salaus epäonnistui: kelvollisia vastaanottajia ei ole määritelty"
 
-#: ../camel/camel-gpg-context.c:1658 ../camel/camel-smime-context.c:844
+#: ../camel/camel-gpg-context.c:1761 ../camel/camel-smime-context.c:843
 #, fuzzy
 msgid "Could not generate signing data: "
 msgstr "Allekirjoitustietoa ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1920
-#: ../camel/camel-gpg-context.c:2030 ../camel/camel-gpg-context.c:2179
+#: ../camel/camel-gpg-context.c:1812 ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2163 ../camel/camel-gpg-context.c:2338
 msgid "Failed to execute gpg."
 msgstr "gpg:n suoritus epäonnistui."
 
-#: ../camel/camel-gpg-context.c:1791 ../camel/camel-gpg-context.c:1799
-#: ../camel/camel-gpg-context.c:1807 ../camel/camel-gpg-context.c:1827
-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
-#: ../camel/camel-smime-context.c:996
+#: ../camel/camel-gpg-context.c:1918 ../camel/camel-gpg-context.c:1926
+#: ../camel/camel-gpg-context.c:1934 ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
+#: ../camel/camel-smime-context.c:995
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1873
+#: ../camel/camel-gpg-context.c:2000
 #, fuzzy
 msgid "Cannot verify message signature: "
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1996
+#: ../camel/camel-gpg-context.c:2128
 #, fuzzy
 msgid "Could not generate encrypting data: "
 msgstr "Salaustieto ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:2049
+#: ../camel/camel-gpg-context.c:2203
 msgid "This is a digitally encrypted message part"
 msgstr "Digitaalisesti salattu viestin osa"
 
-#: ../camel/camel-gpg-context.c:2105 ../camel/camel-gpg-context.c:2114
-#: ../camel/camel-gpg-context.c:2137
+#: ../camel/camel-gpg-context.c:2262 ../camel/camel-gpg-context.c:2271
+#: ../camel/camel-gpg-context.c:2294
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Viestin salausta ei voi purkaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:2125
+#: ../camel/camel-gpg-context.c:2282
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-osan salauksen purku epäonnistui: protokollavirhe"
 
-#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1289
+#: ../camel/camel-gpg-context.c:2348
+#, fuzzy, c-format
+#| msgid "Failed to decrypt MIME part: protocol error"
+msgid "Failed to decrypt MIME part: Secret key not found"
+msgstr "MIME-osan salauksen purku epäonnistui: protokollavirhe"
+
+#: ../camel/camel-gpg-context.c:2384 ../camel/camel-smime-context.c:1288
 msgid "Encrypted content"
 msgstr "Salattu sisältö"
 
@@ -2368,56 +2402,56 @@ msgstr "\"%s\" ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
 msgid "Could not lock '%s'"
 msgstr "Lukitus epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:109
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Sähköpostitiedostoa %s ei voitu tarkistaa: %s"
-
-#: ../camel/camel-movemail.c:123
+#: ../camel/camel-movemail.c:101
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Sähköpostitiedostoa %s ei voitu avata: %s"
 
-#: ../camel/camel-movemail.c:133
+#: ../camel/camel-movemail.c:121
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Sähköpostitiedostoa %s ei voitu tarkistaa: %s"
+
+#: ../camel/camel-movemail.c:136
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Tilapäistä sähköpostitiedostoa %s ei voitu avata: %s"
 
-#: ../camel/camel-movemail.c:163
+#: ../camel/camel-movemail.c:166
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:197
+#: ../camel/camel-movemail.c:200
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Putken luonti epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:211
+#: ../camel/camel-movemail.c:214
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Haaroitus epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:249
+#: ../camel/camel-movemail.c:252
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Ohjelma movemail epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:250
+#: ../camel/camel-movemail.c:253
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
-#: ../camel/camel-movemail.c:277
+#: ../camel/camel-movemail.c:280
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Virhe luettaessa viestitiedostoa: %s"
 
-#: ../camel/camel-movemail.c:290
+#: ../camel/camel-movemail.c:293
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
 
-#: ../camel/camel-movemail.c:497 ../camel/camel-movemail.c:566
+#: ../camel/camel-movemail.c:500 ../camel/camel-movemail.c:569
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin väliaikaistiedostoa: %s"
@@ -2437,85 +2471,99 @@ msgstr "Ei allekirjoitusta saatavilla"
 msgid "parse error"
 msgstr "Virhe tulkittaessa"
 
-#: ../camel/camel-net-utils.c:706
+#: ../camel/camel-net-utils.c:708
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ratkaistaan: %s"
 
-#: ../camel/camel-net-utils.c:731
+#: ../camel/camel-net-utils.c:733
 msgid "Host lookup failed"
 msgstr "Palvelimen osoitteen haku epäonnistui"
 
-#: ../camel/camel-net-utils.c:737
+#: ../camel/camel-net-utils.c:739
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr ""
 
-#: ../camel/camel-net-utils.c:741
+#: ../camel/camel-net-utils.c:743
 #, fuzzy, c-format
 #| msgid "Host lookup failed: %s: %s"
 msgid "Host lookup '%s' failed: %s"
 msgstr "Palvelimen %s osoitteen haku epäonnistui: %s"
 
-#: ../camel/camel-offline-folder.c:90
-msgid "Downloading new messages for offline mode"
+#: ../camel/camel-offline-folder.c:93
+#, fuzzy, c-format
+#| msgid "Downloading new messages for offline mode"
+msgid "Downloading new messages for offline mode in '%s'"
 msgstr "Haetaan uusia viestejä yhteydettömään käyttöön"
 
-#: ../camel/camel-offline-folder.c:209
+#: ../camel/camel-offline-folder.c:160
+#, fuzzy, c-format
+#| msgid "Syncing messages in folder '%s' to disk"
+msgid "Storing changes in folder '%s'"
+msgstr "Synkronoidaan viestejä kansiossa %s levylle"
+
+#: ../camel/camel-offline-folder.c:262
+#, fuzzy, c-format
+#| msgid "Downloading new messages for offline mode"
+msgid "Checking download of new messages for offline in '%s'"
+msgstr "Haetaan uusia viestejä yhteydettömään käyttöön"
+
+#: ../camel/camel-offline-folder.c:375
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkronoidaan viestejä kansiossa %s levylle"
 
-#: ../camel/camel-offline-folder.c:266
+#: ../camel/camel-offline-folder.c:438
 #, fuzzy
 msgid "Copy folder content locally for _offline operation"
 msgstr "Kopioi kansion sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../camel/camel-provider.c:56
+#: ../camel/camel-provider.c:55
 msgid "Virtual folder email provider"
 msgstr "Virtuaalikansion sähköpostitarjoaja"
 
-#: ../camel/camel-provider.c:58
+#: ../camel/camel-provider.c:57
 msgid "For reading mail as a query of another set of folders"
 msgstr "Sähköpostien lukuun hakuna joukosta muita kansioita"
 
-#: ../camel/camel-provider.c:261
+#: ../camel/camel-provider.c:260
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Moduulin %s lataaminen epäonnistui: Järjestelmäsi ei tue moduulien "
 "lataamista."
 
-#: ../camel/camel-provider.c:270
+#: ../camel/camel-provider.c:269
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ei voitu ladata: %s"
 
-#: ../camel/camel-provider.c:279
+#: ../camel/camel-provider.c:278
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ei voitu ladata: moduulissa ei ole alustuskoodia"
 
-#: ../camel/camel-provider.c:427 ../camel/camel-session.c:424
+#: ../camel/camel-provider.c:424 ../camel/camel-session.c:421
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/camel-sasl-anonymous.c:33
-#: ../camel/providers/nntp/camel-nntp-provider.c:83
+#: ../camel/camel-sasl-anonymous.c:32
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid "Anonymous"
 msgstr "Anonyymi"
 
-#: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/camel-sasl-anonymous.c:34
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Tämä valitsin kirjautuu palvelimelle anonyymisti."
 
-#: ../camel/camel-sasl-anonymous.c:68
+#: ../camel/camel-sasl-anonymous.c:67
 #, c-format
 msgid "Authentication failed."
 msgstr "Todennus epäonnistui."
 
-#: ../camel/camel-sasl-anonymous.c:79
+#: ../camel/camel-sasl-anonymous.c:78
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2524,7 +2572,7 @@ msgstr ""
 "Virheellinen sähköpostiosoitteen seurantatieto:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:93
+#: ../camel/camel-sasl-anonymous.c:92
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2533,7 +2581,7 @@ msgstr ""
 "Virheellinen läpinäkyvän seurannan tieto:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:107
+#: ../camel/camel-sasl-anonymous.c:106
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2542,11 +2590,11 @@ msgstr ""
 "Virheellinen seurannan tieto:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:44
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:46
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2554,11 +2602,11 @@ msgstr ""
 "Tämä vaihtoehto yhdistää palvelimeen käyttäen turvallista CRAM-MD5 "
 "salasanaa, jos palvelin tukee tätä."
 
-#: ../camel/camel-sasl-digest-md5.c:57
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:59
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2566,47 +2614,52 @@ msgstr ""
 "Tämä vaihtoehto ottaa yhteyttä palvelimeen käyttäen turvallista DIGEST-MD5 "
 "salasanaa, jos palvelin tukee tätä."
 
-#: ../camel/camel-sasl-digest-md5.c:855
+#: ../camel/camel-sasl-digest-md5.c:854
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Palvelimen haaste liian pitkä (>2048 tavua)"
 
-#: ../camel/camel-sasl-digest-md5.c:866
+#: ../camel/camel-sasl-digest-md5.c:865
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Palvelimen haaste on virheellinen\n"
 
-#: ../camel/camel-sasl-digest-md5.c:874
+#: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "Palvelimen haaste sisälsi virheellisen \"Quality of Protection\" kentän"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:906
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Palvelimen vaste ei sisältänyt todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:928
+#: ../camel/camel-sasl-digest-md5.c:927
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Palvelimen vaste sisälsi vajaata todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:941
+#: ../camel/camel-sasl-digest-md5.c:940
 #, c-format
 msgid "Server response does not match"
 msgstr "Palvelimen vaste ei vastaa haluttua"
 
-#: ../camel/camel-sasl-gssapi.c:89
+#: ../camel/camel-sasl-gssapi.c:94
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:91
+#: ../camel/camel-sasl-gssapi.c:96
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Tämä vaihtoehto yhdistää palvelimeen käyttäen Kerberos 5 - tunnistautumista."
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:148
+#, c-format
+msgid "(Unknown GSSAPI mechanism code: %x)"
+msgstr ""
+
+#: ../camel/camel-sasl-gssapi.c:181
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2614,11 +2667,11 @@ msgstr ""
 "Annettu valtuustieto ei tue määriteltyä mekanismia, tai se on toteutukselle "
 "tuntematon."
 
-#: ../camel/camel-sasl-gssapi.c:139
+#: ../camel/camel-sasl-gssapi.c:186
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Määritelty target_name parametri oli väärin muotoiltu."
 
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2626,7 +2679,7 @@ msgstr ""
 "Määritelty target_name parametri sisälsi virheellisen tai tukemattoman "
 "tyyppisen nimen."
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:193
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2634,7 +2687,7 @@ msgstr ""
 "input_token sisältää eri kanavasidontoja kun mitä on määritelty "
 "input_chan_bindings parametrissa."
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:198
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2642,7 +2695,7 @@ msgstr ""
 "input_token sisältää virheellisen allekirjoituksen tai allekirjoituksen, "
 "jota ei voi varmentaa."
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:202
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2650,43 +2703,43 @@ msgstr ""
 "Annetut valtuustiedot eivät ole kelvollisia tämän tilan alustamisessa tai "
 "valtuustiedon kahva ei viitannut mihinkään valtuustietoihin."
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:207
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Määritelty tilakahva ei viittaa kelvolliseen tilaan."
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:210
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_check:ille tehdyt eheystarkistukset epäonnistuivat."
 
-#: ../camel/camel-sasl-gssapi.c:166
+#: ../camel/camel-sasl-gssapi.c:213
 msgid "The consistency checks performed on the credential failed."
 msgstr "Valtuustiedoille tehdyt eheystarkistukset epäonnistuivat."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:216
 msgid "The referenced credentials have expired."
 msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:354
-#: ../camel/camel-sasl-gssapi.c:402 ../camel/camel-sasl-gssapi.c:419
-#: ../camel/providers/smtp/camel-smtp-transport.c:622
+#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
+#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
-#: ../camel/camel-sasl-gssapi.c:431
+#: ../camel/camel-sasl-gssapi.c:482
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Turvakerros ei ole tuettu."
 
-#: ../camel/camel-sasl-login.c:38
+#: ../camel/camel-sasl-login.c:37
 msgid "Login"
 msgstr "Kirjautuminen"
 
-#: ../camel/camel-sasl-login.c:40 ../camel/camel-sasl-plain.c:44
+#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
 msgid "This option will connect to the server using a simple password."
 msgstr "Tämä valitsin yhdistää palvelimeen yksinkertaista salasanaa käyttäen."
 
-#: ../camel/camel-sasl-login.c:108
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Tuntematon todennustila."
@@ -2703,297 +2756,303 @@ msgstr ""
 "Tämä vaihtoehto yhdistää Windows-palvelimeen käyttäen NTLM/Secure Password "
 "tunnistautumista."
 
-#: ../camel/camel-sasl-plain.c:42
+#: ../camel/camel-sasl-plain.c:41
 msgid "PLAIN"
 msgstr "SELVÄKIELINEN"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:43
 msgid "POP before SMTP"
 msgstr "POP ennen SMTP:tä"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:45
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 "Tämä vaihtoehto tunnistautuu POP-yhteyteen, ennen kuin yrittää SMTP:n "
 "käyttöä."
 
-#: ../camel/camel-sasl-popb4smtp.c:82
+#: ../camel/camel-sasl-popb4smtp.c:83
 #, fuzzy
 msgid "POP Source UID"
 msgstr "POP:in lähde-URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:96
+#: ../camel/camel-sasl-popb4smtp.c:97
 #, fuzzy, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr ""
 "POP ennen SMTP:tä tunnistautuminen käyttäen tuntematonta siirtomenetelmää"
 
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
+#: ../camel/camel-sasl-popb4smtp.c:109 ../camel/camel-sasl-popb4smtp.c:118
 #, fuzzy, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP ennen SMTP:tä käyttäen lähdettä, joka ei ole POP"
 
-#: ../camel/camel-search-private.c:114
+#: ../camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Säännöllisen lausekkeen käännös epäonnistui: %s: %s"
 
-#: ../camel/camel-session.c:433
+#: ../camel/camel-session.c:430
 #, fuzzy, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/camel-session.c:502
-#: ../camel/providers/imapx/camel-imapx-server.c:4734
-#: ../camel/providers/pop3/camel-pop3-store.c:311
-#: ../camel/providers/pop3/camel-pop3-store.c:757
-#: ../camel/providers/smtp/camel-smtp-transport.c:515
+#: ../camel/camel-session.c:499
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:786
+#: ../camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "No support for %s authentication"
 msgstr "Tunnistautumismenetelmä %s ei ole tuettu"
 
-#: ../camel/camel-session.c:517
-#, fuzzy, c-format
+#: ../camel/camel-session.c:514
+#, c-format
 msgid "%s authentication failed"
-msgstr "Todennus epäonnistui"
+msgstr "%s-tunnistautuminen epäonnistui"
 
-#: ../camel/camel-session.c:586
+#: ../camel/camel-session.c:583
 msgid "Forwarding messages is not supported"
 msgstr "Viestien edelleenlähetystä ei tueta"
 
-#: ../camel/camel-smime-context.c:349 ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Varmennetta \"%s\":lle ei löydy"
 
-#: ../camel/camel-smime-context.c:377
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "CMS-viestiä ei voi luoda"
 
-#: ../camel/camel-smime-context.c:382
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voitu luoda"
 
-#: ../camel/camel-smime-context.c:388
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voi liittää"
 
-#: ../camel/camel-smime-context.c:395
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "CMS-tietoa ei voi liittää"
 
-#: ../camel/camel-smime-context.c:401
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "CMS-allekirjoitustietoa ei voitu luoda"
 
-#: ../camel/camel-smime-context.c:407
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "Varmenneketjua ei löydy"
 
-#: ../camel/camel-smime-context.c:413
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "CMS allekirjoitusaikaa ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:437 ../camel/camel-smime-context.c:452
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Salausvarmennetta kohteelle \"%s\" ei ole olemassa."
 
-#: ../camel/camel-smime-context.c:459
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs-attribuuttia ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs-attribuuttia ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:469
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "Salausvarmennetta ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:475
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "CMS allekirjoittajatietoa ei voi lisätä"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:507
 msgid "Unverified"
 msgstr "Varmistamaton"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:509
 msgid "Good signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:511
 msgid "Bad signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:513
 msgid "Content tampered with or altered in transit"
 msgstr "Sisältöä muutettu siirrettäessä"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:515
 msgid "Signing certificate not found"
 msgstr "Allekirjoitusvarmennetta ei löytynyt"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:517
 msgid "Signing certificate not trusted"
 msgstr "Allekirjoitusvarmenteeseen ei luoteta"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:519
 msgid "Signature algorithm unknown"
 msgstr "Allekirjoituksen algoritmi on tuntematon"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:521
 msgid "Signature algorithm unsupported"
 msgstr "Allekirjoituksen algoritmi ei ole tuettu"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:523
 msgid "Malformed signature"
 msgstr "Virhe allekirjoituksen muodossa"
 
-#: ../camel/camel-smime-context.c:526
+#: ../camel/camel-smime-context.c:525
 msgid "Processing error"
 msgstr "Virhe käsittelyssä"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:570
 msgid "No signed data in signature"
 msgstr "Allekirjoituksessa ei ole allekirjoitettua tietoa"
 
-#: ../camel/camel-smime-context.c:576
+#: ../camel/camel-smime-context.c:575
 msgid "Digests missing from enveloped data"
 msgstr "Viestin kuoresta ei ole tiivisteitä."
 
-#: ../camel/camel-smime-context.c:589 ../camel/camel-smime-context.c:600
+#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
 msgid "Cannot calculate digests"
 msgstr "Tiivisteitä ei voi laskea"
 
-#: ../camel/camel-smime-context.c:607 ../camel/camel-smime-context.c:611
+#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
 msgid "Cannot set message digests"
 msgstr "Viestin tiivisteitä ei voi asettaa"
 
-#: ../camel/camel-smime-context.c:621 ../camel/camel-smime-context.c:626
+#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
 msgid "Certificate import failed"
 msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../camel/camel-smime-context.c:636
+#: ../camel/camel-smime-context.c:635
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Viesti on itsessään varmenne, varmenteita ei voi tarkistaa"
 
-#: ../camel/camel-smime-context.c:639
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Viesti on itsessään varmenne, varmenteet tuotu ja tarkistettu"
 
-#: ../camel/camel-smime-context.c:643
+#: ../camel/camel-smime-context.c:642
 msgid "Cannot find signature digests"
 msgstr "Allekirjoitustiivisteitä ei löydy"
 
-#: ../camel/camel-smime-context.c:660
+#: ../camel/camel-smime-context.c:659
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allekirjoittaja: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:856 ../camel/camel-smime-context.c:1150
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1149
 msgid "Cannot create encoder context"
 msgstr "Kooderin kontekstia ei voi luoda"
 
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:861
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS-kooderiin ei voitu lisätä tietoa"
 
-#: ../camel/camel-smime-context.c:867 ../camel/camel-smime-context.c:1167
+#: ../camel/camel-smime-context.c:866 ../camel/camel-smime-context.c:1166
 msgid "Failed to encode data"
 msgstr "Tiedon koodaus epäonnistui"
 
-#: ../camel/camel-smime-context.c:1015 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
 msgid "Decoder failed"
 msgstr "Purkaja epäonnistui"
 
-#: ../camel/camel-smime-context.c:1084
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Yhteistä massasalausalgoritmia ei löydy"
 
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1091
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Lokeroa massasalausavaimelle ei voi varata"
 
-#: ../camel/camel-smime-context.c:1103
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Message"
 msgstr "CMS-viestiä ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1109
+#: ../camel/camel-smime-context.c:1108
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS-käärittyä tietoa ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1115
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS-käärittyä tietoa ei voi liittää"
 
-#: ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:1120
 msgid "Cannot attach CMS data object"
 msgstr "CMS tieto-oliota ei voi liittää"
 
-#: ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:1129
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1135
+#: ../camel/camel-smime-context.c:1134
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:1161
+#: ../camel/camel-smime-context.c:1160
 msgid "Failed to add data to encoder"
 msgstr "Tiedon lisäys koodaajaan epäonnistui"
 
-#: ../camel/camel-smime-context.c:1271
+#: ../camel/camel-smime-context.c:1270
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME purku: salauskontekstia ei löytynyt"
 
-#: ../camel/camel-store.c:1232
+#: ../camel/camel-store.c:1280
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Avataan kansiota ”%s”"
 
-#: ../camel/camel-store.c:1523
+#: ../camel/camel-store.c:1571
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Tutkitaan kansion ”%s” alikansioita"
 
-#: ../camel/camel-store.c:1551 ../camel/camel-store.c:1596
-#: ../camel/camel-vtrash-folder.c:46
+#: ../camel/camel-store.c:1599 ../camel/camel-store.c:1644
+#: ../camel/camel-vtrash-folder.c:45
 msgid "Trash"
 msgstr "Roskakori"
 
-#: ../camel/camel-store.c:1565 ../camel/camel-store.c:1613
-#: ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1613 ../camel/camel-store.c:1661
+#: ../camel/camel-vtrash-folder.c:47
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../camel/camel-store.c:2214
+#: ../camel/camel-store.c:2262
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
 
-#: ../camel/camel-store.c:2221
+#: ../camel/camel-store.c:2269
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Luodaan kansiota '%s'"
 
-#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410
-#: ../camel/providers/local/camel-maildir-store.c:321
+#: ../camel/camel-store.c:2446 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:346
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461
-#: ../camel/providers/local/camel-maildir-store.c:872
+#: ../camel/camel-store.c:2636 ../camel/camel-vee-store.c:461
+#: ../camel/providers/local/camel-maildir-store.c:914
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
 
-#: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
+#: ../camel/camel-stream.c:168
+#, fuzzy
+#| msgid "Cannot authenticate without a username"
+msgid "Cannot write with no base stream"
+msgstr "Tunnistautuminen ilman käyttäjätunnusta ei ole mahdollista"
+
+#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
 #, fuzzy, c-format
 #| msgid "Store root %s is not an absolute path"
 msgid "Stream type '%s' is not seekable"
@@ -3003,31 +3062,32 @@ msgstr "Säilön juuri %s ei ole absoluuttinen polku"
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr ""
 
-#: ../camel/camel-stream-null.c:76
+#: ../camel/camel-stream-null.c:74
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr ""
 
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:278
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: ../camel/camel-stream-process.c:285
+#: ../camel/camel-stream-process.c:283
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Komentoon \"%s\" liittyminen epäonnistui: %s"
 
 #: ../camel/camel-subscribable.c:273
-#, fuzzy, c-format
+#, c-format
 msgid "Subscribing to folder '%s'"
-msgstr "_Näytä ainoastaan tilatut kansiot"
+msgstr "Tilataan kansio '%s'"
 
 #: ../camel/camel-subscribable.c:442
 #, fuzzy, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "_Näytä ainoastaan tilatut kansiot"
 
-#: ../camel/camel-url.c:329
+#: ../camel/camel-url.c:327
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URLia \"%s\" ei voi tulkita"
@@ -3037,23 +3097,23 @@ msgstr "URLia \"%s\" ei voi tulkita"
 msgid "Updating folder '%s'"
 msgstr "Päivitetään kansiota '%s'"
 
-#: ../camel/camel-vee-folder.c:851 ../camel/camel-vee-folder.c:961
+#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:979
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Viestien kopioiminen tai siirtäminen ei onnistu virtuaalisiin kansioihin"
 
-#: ../camel/camel-vee-folder.c:884
+#: ../camel/camel-vee-folder.c:902
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Viestiä %s ei voitu löytää %s:stä"
 
-#: ../camel/camel-vee-folder.c:937
+#: ../camel/camel-vee-folder.c:955
 #, fuzzy, c-format
 msgid "Error storing '%s': "
 msgstr "Virhe tallennettaessa \"%s\": %s"
 
-#: ../camel/camel-vee-folder.c:1167
+#: ../camel/camel-vee-folder.c:1193
 msgid "Automatically _update on change in source folders"
 msgstr ""
 
@@ -3077,59 +3137,99 @@ msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
 msgid "Enable _Unmatched folder"
 msgstr ""
 
-#: ../camel/camel-vtrash-folder.c:47
+#: ../camel/camel-vee-store.c:1030
+#, fuzzy
+msgid "Updating Unmatched search folder"
+msgstr "Tallennetaan kansiota"
+
+#: ../camel/camel-vtrash-folder.c:46
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Viestejä ei voi kopioida roskakoriin"
 
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Viestejä ei voi kopioida roskapostikansioon"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:796
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:953
 #, fuzzy, c-format
-#| msgid "No provider available for protocol '%s'"
-msgid "No quota information available for folder '%s'"
-msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
+#| msgid "You must be working online to complete this operation"
+msgid "You must be working online to complete this operation (%s)"
+msgstr ""
+"Sinun täytyy olla yhteydellisessä tilassa suorittaaksesi tämän toiminnon "
+"loppuun"
+
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:961
+#: ../camel/providers/imapx/camel-imapx-server.c:3060
+#: ../camel/providers/nntp/camel-nntp-store.c:349
+#: ../camel/providers/nntp/camel-nntp-store.c:1291
+#: ../camel/providers/nntp/camel-nntp-store.c:2099
+#: ../camel/providers/nntp/camel-nntp-store.c:2243
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:632
+#: ../camel/providers/pop3/camel-pop3-folder.c:834
+#: ../camel/providers/pop3/camel-pop3-folder.c:1044
+#: ../camel/providers/pop3/camel-pop3-store.c:296
+#: ../camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:672
+#: ../camel/providers/pop3/camel-pop3-store.c:1103
+#: ../camel/providers/smtp/camel-smtp-transport.c:543
+#, c-format
+msgid "You must be working online to complete this operation"
+msgstr ""
+"Sinun täytyy olla yhteydellisessä tilassa suorittaaksesi tämän toiminnon "
+"loppuun"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:936
-#: ../camel/providers/imapx/camel-imapx-folder.c:1029
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1533
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1621
 #, c-format
 msgid "No destination folder specified"
 msgstr "Kohdekansiota ei määritelty"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:964
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1560
 #, fuzzy
 msgid "Unable to move junk messages"
 msgstr "Viestin haku epäonnistui: %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1057
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1655
 #, fuzzy
 msgid "Unable to move deleted messages"
 msgstr "Viestin haku epäonnistui: %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1374
-#: ../camel/providers/nntp/camel-nntp-folder.c:760
+#: ../camel/providers/imapx/camel-imapx-folder.c:702
+#, fuzzy, c-format
+#| msgid "No provider available for protocol '%s'"
+msgid "No quota information available for folder '%s'"
+msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:964
+#: ../camel/providers/nntp/camel-nntp-folder.c:765
 #, fuzzy
 msgid "Apply message _filters to this folder"
 msgstr "Viestejä ei voi kopioida roskakoriin"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1485
+#: ../camel/providers/imapx/camel-imapx-folder.c:975
+#, fuzzy
+msgid "Always check for _new mail in this folder"
+msgstr "Etsi aina uusia viestejä tästä kansiosta"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1088
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1494
+#: ../camel/providers/imapx/camel-imapx-folder.c:1097
 #, fuzzy, c-format
 msgid "Could not create cache for %s: "
 msgstr "Välimuistitiedostoa ei voitu luoda"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1709
+#: ../camel/providers/imapx/camel-imapx-folder.c:1295
 #, fuzzy, c-format
 #| msgid "No provider available for protocol '%s'"
 msgid "No IMAP mailbox available for folder '%s'"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/providers/imapx/camel-imapx-input-stream.c:93
+#: ../camel/providers/imapx/camel-imapx-input-stream.c:101
 #, c-format
 msgid "Source stream returned no data"
 msgstr ""
@@ -3155,7 +3255,6 @@ msgid "_Listen for server change notifications"
 msgstr "_Kuuntele palvelimen muutosilmoituksia"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
-#| msgid "Lost connection to IMAP server"
 msgid "Connection to Server"
 msgstr "Yhteys palvelimeen"
 
@@ -3164,7 +3263,7 @@ msgid "Numbe_r of concurrent connections to use"
 msgstr ""
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -3182,14 +3281,14 @@ msgstr "Nimiavaruus:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:77
 #: ../camel/providers/local/camel-local-provider.c:99
-#: ../camel/providers/nntp/camel-nntp-provider.c:39
+#: ../camel/providers/nntp/camel-nntp-provider.c:38
 msgid "Options"
 msgstr "Asetukset"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:41
+#: ../camel/providers/nntp/camel-nntp-provider.c:40
 msgid "Apply _filters to new messages in all folders"
 msgstr "_Käytä suodattimia uusille viesteille kaikissa kansioissa"
 
@@ -3203,11 +3302,15 @@ msgid "Check new messages for _Junk contents"
 msgstr "_Etsi roskapostia uusista viesteistä"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:72
-msgid "Only check for Junk messages in the IN_BOX folder"
+#, fuzzy
+#| msgid "Only check for Junk messages in the IN_BOX folder"
+msgid "Only check for Junk messages in the In_box folder"
 msgstr "Etsi roskapostia vain saapuvien kansiosta"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "Automatically synchroni_ze remote mail locally"
+#, fuzzy
+#| msgid "Automatically synchroni_ze remote mail locally"
+msgid "Synchroni_ze remote mail locally in all folders"
 msgstr "_Synkronoi sähköposti etäpalvelimelta automaattisesti"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
@@ -3215,8 +3318,9 @@ msgid "Default IMAP port"
 msgstr "IMAP:in oletusportti"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:81
-msgid "IMAP over SSL"
-msgstr "IMAP SSL:llä"
+#| msgid "IMAP over SSL"
+msgid "IMAP over TLS"
+msgstr "IMAP TLS:llä"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
@@ -3226,274 +3330,394 @@ msgstr "IMAP+"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Sähköpostien luku ja tallennus IMAP-palvelimilta."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1009
-#: ../camel/providers/imapx/camel-imapx-server.c:1016
-#, c-format
-msgid "Not authenticated"
-msgstr "Ei tunnistettu."
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1713
-msgid "Server disconnected"
-msgstr "Palvelin katkaisi yhteyden"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2205
+#: ../camel/providers/imapx/camel-imapx-server.c:1134
 #, fuzzy
 msgid "Error writing to cache stream"
 msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3565
+#: ../camel/providers/imapx/camel-imapx-server.c:2745
+#: ../camel/providers/imapx/camel-imapx-server.c:2832
+#: ../camel/providers/imapx/camel-imapx-server.c:3093
 #, fuzzy
-msgid "Error performing IDLE"
-msgstr "Virhe suoritettaessa hakua"
+msgid "Failed to get capabilities"
+msgstr "Välimuistiin tallennus epäonnistui %s: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4573
+#: ../camel/providers/imapx/camel-imapx-server.c:2764
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4574
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/imapx/camel-imapx-server.c:2765
+#: ../camel/providers/smtp/camel-smtp-transport.c:281
 msgid "STARTTLS not supported"
 msgstr "STARTTLS laajennos ei ole käytettävissä"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4634
+#: ../camel/providers/imapx/camel-imapx-server.c:2773
+msgid "Failed to issue STARTTLS"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2821
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "IMAP-palvelimeen %s yhdistäminen turvallisessa tilassa epäonnistui: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4723
+#: ../camel/providers/imapx/camel-imapx-server.c:2915
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP-palvelin %s ei tue tunnistautumismenetelmää %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4753
-#: ../camel/providers/nntp/camel-nntp-store.c:394
-#: ../camel/providers/nntp/camel-nntp-store.c:531
+#: ../camel/providers/imapx/camel-imapx-server.c:2946
+#: ../camel/providers/nntp/camel-nntp-store.c:400
+#: ../camel/providers/nntp/camel-nntp-store.c:542
 msgid "Cannot authenticate without a username"
 msgstr "Tunnistautuminen ilman käyttäjätunnusta ei ole mahdollista"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4762
-#: ../camel/providers/nntp/camel-nntp-store.c:540
-#: ../camel/providers/pop3/camel-pop3-store.c:678
-#: ../camel/providers/pop3/camel-pop3-store.c:699
+#: ../camel/providers/imapx/camel-imapx-server.c:2955
+#: ../camel/providers/nntp/camel-nntp-store.c:551
+#: ../camel/providers/pop3/camel-pop3-store.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:728
 #, fuzzy
 msgid "Authentication password not available"
 msgstr "Todennus epäonnistui"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4998
-#: ../camel/providers/imapx/camel-imapx-server.c:5057
+#: ../camel/providers/imapx/camel-imapx-server.c:2963
+#| msgid "Not authenticated"
+msgid "Failed to authenticate"
+msgstr "Tunnistautuminen epäonnistui"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3115
+msgid "Failed to issue NAMESPACE"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3133
+#, fuzzy
+msgid "Failed to enable QResync"
+msgstr "Välimuistiin tallennus epäonnistui %s: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3165
+#, fuzzy
+msgid "Failed to issue NOTIFY"
+msgstr "Virhe viestin %d kohdalla"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3624
+#| msgid "Failed to execute gpg."
+msgid "Failed to select mailbox"
+msgstr "Postilaatikon valinta epäonnistui"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3722
+#, fuzzy
+msgid "Cannot issue command, no stream available"
+msgstr "Palvelu ei ole saatavilla"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3985
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "Viestiä tunnisteella %s ei voi noutaa: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3986
+msgid "No such message available."
+msgstr "Tämä viesti ei ole saatavilla."
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4022
+#: ../camel/providers/imapx/camel-imapx-server.c:4047
+#: ../camel/providers/imapx/camel-imapx-server.c:4066
 msgid "Error fetching message"
 msgstr "Virhe viestiä noutaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5050
+#: ../camel/providers/imapx/camel-imapx-server.c:4059
 #, fuzzy
 msgid "Failed to close the tmp stream"
 msgstr "Tiedon koodaus epäonnistui"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5086
+#: ../camel/providers/imapx/camel-imapx-server.c:4090
 #, fuzzy
 msgid "Failed to copy the tmp file"
 msgstr "Välimuistiin tallennus epäonnistui %s: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5227
+#: ../camel/providers/imapx/camel-imapx-server.c:4253
 msgid "Error moving messages"
 msgstr "Virhe viestejä siirtäessä"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5231
+#: ../camel/providers/imapx/camel-imapx-server.c:4253
 msgid "Error copying messages"
 msgstr "Virhe viestejä kopioitaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5453
+#: ../camel/providers/imapx/camel-imapx-server.c:4437
+#: ../camel/providers/imapx/camel-imapx-server.c:4458
+#, fuzzy
+msgid "Cannot create spool file: "
+msgstr "Viestiä ei voi luoda: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4549
 #, fuzzy
 msgid "Error appending message"
 msgstr "Lähetetään viestiä"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5689
-msgid "Error fetching message headers"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-server.c:4639
+#, fuzzy
+msgid "Error performing NOOP"
+msgstr "Virhe suoritettaessa hakua"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5856
-msgid "Error retrieving message"
-msgstr "Virhe haettaessa viestiä"
+#: ../camel/providers/imapx/camel-imapx-server.c:4787
+#, fuzzy, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "Etsitään muuttuneita viestejä kansiosta %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5990
-#: ../camel/providers/imapx/camel-imapx-server.c:6219
+#: ../camel/providers/imapx/camel-imapx-server.c:4790
+#, fuzzy
+#| msgid "Error syncing changes"
+msgid "Error scanning changes"
+msgstr "Virhe muutoksia synkronoidessa"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4808
 #, fuzzy, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6042
-#, fuzzy, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "Etsitään muuttuneita viestejä kansiosta %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:4825
+#, fuzzy
+#| msgid "Error fetching message"
+msgid "Error fetching message info"
+msgstr "Virhe viestiä noutaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6094
-msgid "Error fetching new messages"
-msgstr "Virhe uusia viestejä noutaessa"
+#: ../camel/providers/imapx/camel-imapx-server.c:4887
+msgid "Error running STATUS"
+msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6367
-msgid "Error refreshing folder"
-msgstr "Virhe päivittäessä kansiota"
+#: ../camel/providers/imapx/camel-imapx-server.c:5370
+#: ../camel/providers/imapx/camel-imapx-server.c:5422
+msgid "Error syncing changes"
+msgstr "Virhe muutoksia synkronoidessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6517
+#: ../camel/providers/imapx/camel-imapx-server.c:5533
 #, fuzzy
 msgid "Error expunging message"
 msgstr "Poistetaan vanhoja viestejä pysyvästi"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6632
-#: ../camel/providers/imapx/camel-imapx-server.c:6657
+#: ../camel/providers/imapx/camel-imapx-server.c:5603
 msgid "Error fetching folders"
 msgstr "Virhe kansioita noutaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6737
+#: ../camel/providers/imapx/camel-imapx-server.c:5614
+#, fuzzy
+#| msgid "Error fetching folders"
+msgid "Error fetching subscribed folders"
+msgstr "Virhe kansioita noutaessa"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5636
 msgid "Error creating folder"
 msgstr "Virhe luotaessa kansiota"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6789
+#: ../camel/providers/imapx/camel-imapx-server.c:5692
 msgid "Error deleting folder"
 msgstr "Virhe kansiota poistaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6865
+#: ../camel/providers/imapx/camel-imapx-server.c:5738
 msgid "Error renaming folder"
 msgstr "Virhe kansion nimeä muutettaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6939
+#: ../camel/providers/imapx/camel-imapx-server.c:5770
 msgid "Error subscribing to folder"
 msgstr "Virhe kansiota tilatessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7005
+#: ../camel/providers/imapx/camel-imapx-server.c:5806
 #, fuzzy
 msgid "Error unsubscribing from folder"
 msgstr "_Näytä ainoastaan tilatut kansiot"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7067
+#: ../camel/providers/imapx/camel-imapx-server.c:5846
+msgid "IMAP server does not support quotas"
+msgstr "IMAP-palvelin ei tue quota-tilarajoja"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5858
 msgid "Error retrieving quota information"
 msgstr "Virhe haettaessa kiintiötietoja"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7119
+#: ../camel/providers/imapx/camel-imapx-server.c:5905
 msgid "Search failed"
 msgstr "Haku epäonnistui"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7181
+#. Blocks, until the DONE is issued or on inactivity timeout, error, ...
+#: ../camel/providers/imapx/camel-imapx-server.c:6023
 #, fuzzy
-msgid "Error performing NOOP"
+msgid "Error running IDLE"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7288
-msgid "Error syncing changes"
-msgstr "Virhe muutoksia synkronoidessa"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:8275
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "Viestiä tunnisteella %s ei voi noutaa: %s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:8276
-msgid "No such message available."
-msgstr "Tämä viesti ei ole saatavilla."
-
-#: ../camel/providers/imapx/camel-imapx-server.c:8483
-#: ../camel/providers/imapx/camel-imapx-server.c:8504
-#, fuzzy
-msgid "Cannot create spool file: "
-msgstr "Viestiä ei voi luoda: %s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:9256
-msgid "IMAP server does not support quotas"
-msgstr "IMAP-palvelin ei tue quota-tilarajoja"
-
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imapx/camel-imapx-store.c:223
+#: ../camel/providers/imapx/camel-imapx-store.c:224
 #: ../camel/providers/local/camel-maildir-folder.c:482
-#: ../camel/providers/local/camel-maildir-store.c:322
-#: ../camel/providers/local/camel-maildir-store.c:784
-#: ../camel/providers/local/camel-maildir-store.c:790
-#: ../camel/providers/local/camel-maildir-store.c:873
+#: ../camel/providers/local/camel-maildir-store.c:347
+#: ../camel/providers/local/camel-maildir-store.c:826
+#: ../camel/providers/local/camel-maildir-store.c:832
+#: ../camel/providers/local/camel-maildir-store.c:915
 #: ../camel/providers/local/camel-spool-store.c:393
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:758
+#: ../camel/providers/imapx/camel-imapx-store.c:765
 #, c-format
 msgid "IMAP server %s"
 msgstr "Imap-palvelin %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:761
+#: ../camel/providers/imapx/camel-imapx-store.c:768
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:836
-#: ../camel/providers/nntp/camel-nntp-provider.c:93
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "No IMAPx connection object provided"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-store.c:853
+#: ../camel/providers/nntp/camel-nntp-provider.c:92
+#: ../camel/providers/pop3/camel-pop3-provider.c:80
 msgid "Password"
 msgstr "Salasana"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:838
+#: ../camel/providers/imapx/camel-imapx-store.c:855
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen selväkielistä salasanaa käyttäen."
 
-#: ../camel/providers/imapx/camel-imapx-store.c:913
+#: ../camel/providers/imapx/camel-imapx-store.c:938
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1324
+#: ../camel/providers/imapx/camel-imapx-store.c:1381
 #, c-format
 msgid "No IMAP namespace for folder path '%s'"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1472
+#: ../camel/providers/imapx/camel-imapx-store.c:1642
+#: ../camel/providers/imapx/camel-imapx-store.c:1876
 #, fuzzy, c-format
-msgid "Retrieving folder list for %s"
+msgid "Retrieving folder list for '%s'"
 msgstr "Valmistellaan kansiota \"%s\" yhteydettömään tilaan"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1924
+#: ../camel/providers/imapx/camel-imapx-store.c:2093
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%c\""
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2689
-#: ../camel/providers/nntp/camel-nntp-store.c:1250
-#: ../camel/providers/pop3/camel-pop3-folder.c:450
-#: ../camel/providers/pop3/camel-pop3-folder.c:593
-#: ../camel/providers/pop3/camel-pop3-folder.c:789
-#: ../camel/providers/pop3/camel-pop3-folder.c:987
-#: ../camel/providers/pop3/camel-pop3-store.c:299
-#: ../camel/providers/pop3/camel-pop3-store.c:528
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-#: ../camel/providers/pop3/camel-pop3-store.c:668
-#: ../camel/providers/pop3/camel-pop3-store.c:1072
-#, c-format
-msgid "You must be working online to complete this operation"
+#: ../camel/providers/imapx/camel-imapx-store.c:2444
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Drafts"
+msgstr "[Gmail]/Luonnokset"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2445
+msgctxt "IMAPDefaults"
+msgid "Drafts"
+msgstr "Luonnokset"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2446
+msgctxt "IMAPDefaults"
+msgid "Draft"
+msgstr "Luonnos"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2449
+msgctxt "IMAPDefaults"
+msgid "Templates"
 msgstr ""
-"Sinun täytyy olla yhteydellisessä tilassa suorittaaksesi tämän toiminnon "
-"loppuun"
 
-#: ../camel/providers/local/camel-local-folder.c:195
+#: ../camel/providers/imapx/camel-imapx-store.c:2452
+msgctxt "IMAPDefaults"
+msgid "Archive"
+msgstr "Arkisto"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2455
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Sent Mail"
+msgstr "[Gmail]/Lähetetyt"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2456
+msgctxt "IMAPDefaults"
+msgid "Sent"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2457
+msgctxt "IMAPDefaults"
+msgid "Sent Items"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2460
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Spam"
+msgstr "[Gmail]/Roskaposti"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2461
+#, fuzzy
+#| msgid "Junk"
+msgctxt "IMAPDefaults"
+msgid "Junk"
+msgstr "Roskaposti"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2462
+#, fuzzy
+#| msgid "Email"
+msgctxt "IMAPDefaults"
+msgid "Junk E-mail"
+msgstr "Sähköposti"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2463
+#, fuzzy
+#| msgid "Email"
+msgctxt "IMAPDefaults"
+msgid "Junk Email"
+msgstr "Sähköposti"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2464
+msgctxt "IMAPDefaults"
+msgid "Spam"
+msgstr "Roskaposti"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2465
+#, fuzzy
+#| msgid "Mail"
+msgctxt "IMAPDefaults"
+msgid "Bulk Mail"
+msgstr "Sähköposti"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2468
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Trash"
+msgstr "[Gmail]/Roskakori"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2469
+#| msgid "Trash"
+msgctxt "IMAPDefaults"
+msgid "Trash"
+msgstr "Roskakori"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2470
+#| msgid "_Delete %s"
+msgctxt "IMAPDefaults"
+msgid "Deleted Items"
+msgstr "Poistetut kohteet"
+
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:205
-#: ../camel/providers/local/camel-local-folder.c:214
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "postilaatikko: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:223
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:500
+#: ../camel/providers/local/camel-local-folder.c:499
 #, fuzzy
 msgid "_Index message body data"
 msgstr "Indeksoi viestin rungon tiedot"
 
-#: ../camel/providers/local/camel-local-folder.c:730
+#: ../camel/providers/local/camel-local-folder.c:727
 #, fuzzy, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3526,16 +3750,16 @@ msgstr ""
 "Sähköpostin siirto paikallisista mbox-muotoisista saapuvien kansioista "
 "Evolutionin hallinnoimiin kansioihin."
 
-#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:79
 #: ../camel/providers/local/camel-local-provider.c:101
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Käytä suodattimia uusille viesteille saapuvien kansiossa"
 
-#: ../camel/providers/local/camel-local-provider.c:88
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Maildir-muotoisia sähköpostikansioita"
 
-#: ../camel/providers/local/camel-local-provider.c:89
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "Sähköpostin tallennus maildir-muotoisiin hakemistoihin paikallisesti."
 
@@ -3561,56 +3785,56 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Tavallinen Unixin mbox-muotoinen saapuvien hakemisto"
 
-#: ../camel/providers/local/camel-local-store.c:96
+#: ../camel/providers/local/camel-local-store.c:88
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: ../camel/providers/local/camel-local-store.c:221
-#: ../camel/providers/local/camel-local-store.c:381
-#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-local-store.c:213
+#: ../camel/providers/local/camel-local-store.c:373
+#: ../camel/providers/local/camel-maildir-store.c:123
 #: ../camel/providers/local/camel-mbox-store.c:572
 #: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Säilön juuri %s ei ole absoluuttinen polku"
 
-#: ../camel/providers/local/camel-local-store.c:230
+#: ../camel/providers/local/camel-local-store.c:222
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Säilön juuri %s ei ole tavallinen hakemisto"
 
-#: ../camel/providers/local/camel-local-store.c:242
-#: ../camel/providers/local/camel-local-store.c:252
-#: ../camel/providers/local/camel-local-store.c:394
-#: ../camel/providers/local/camel-maildir-store.c:156
+#: ../camel/providers/local/camel-local-store.c:234
+#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:386
+#: ../camel/providers/local/camel-maildir-store.c:165
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:289
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Paikallisissa säilöissä ei ole saapuvien viestien kansiota"
 
-#: ../camel/providers/local/camel-local-store.c:454
+#: ../camel/providers/local/camel-local-store.c:446
 #: ../camel/providers/local/camel-mbox-store.c:739
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Kansion sisällysluetteloa \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-local-store.c:474
 #: ../camel/providers/local/camel-mbox-store.c:769
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Kansion metadatatiedostoa \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-local-store.c:594
+#: ../camel/providers/local/camel-local-store.c:587
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Uudelleennimeäminen epäonnistui \"%s\": %s"
@@ -3644,74 +3868,81 @@ msgstr ""
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Viestiä ei voi lisätä maildir-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:130
-#: ../camel/providers/local/camel-maildir-store.c:149
-#: ../camel/providers/local/camel-maildir-store.c:881
+#: ../camel/providers/local/camel-maildir-store.c:131
+#: ../camel/providers/local/camel-maildir-store.c:931
+#, fuzzy, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot create folder containing '%s'"
+msgstr "Kansiota \"%s\" ei voi luoda: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:139
+#: ../camel/providers/local/camel-maildir-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:923
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Kansio %s on jo olemassa"
 
-#: ../camel/providers/local/camel-maildir-store.c:241
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/providers/local/camel-maildir-store.c:266
+#: ../camel/providers/local/camel-maildir-store.c:297
 #: ../camel/providers/local/camel-mbox-store.c:401
 #: ../camel/providers/local/camel-mbox-store.c:422
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:256
+#: ../camel/providers/local/camel-maildir-store.c:281
 #: ../camel/providers/local/camel-mbox-store.c:367
 #: ../camel/providers/local/camel-mh-store.c:523
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi hakea: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:262
+#: ../camel/providers/local/camel-maildir-store.c:287
 #: ../camel/providers/local/camel-mbox-store.c:377
 #: ../camel/providers/local/camel-mh-store.c:532
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Kansiota \"%s\" ei voi hakea: kansiota ei ole olemassa."
 
-#: ../camel/providers/local/camel-maildir-store.c:289
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "'Kansiota \"%s\" ei voi avata: ei maildir-muotoinen hakemisto."
 
-#: ../camel/providers/local/camel-maildir-store.c:353
-#: ../camel/providers/local/camel-maildir-store.c:393
+#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../camel/providers/local/camel-maildir-store.c:418
 #: ../camel/providers/local/camel-mh-store.c:676
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:355
+#: ../camel/providers/local/camel-maildir-store.c:380
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: ../camel/providers/local/camel-maildir-store.c:637
-#: ../camel/providers/local/camel-maildir-store.c:1095
+#: ../camel/providers/local/camel-maildir-store.c:666
+#: ../camel/providers/local/camel-maildir-store.c:1146
 #: ../camel/providers/local/camel-spool-store.c:212
 #: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voitu käydä läpi: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:465
-#: ../camel/providers/local/camel-maildir-summary.c:605
+#: ../camel/providers/local/camel-maildir-summary.c:476
+#: ../camel/providers/local/camel-maildir-summary.c:616
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-kansiota ei voi avata: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:596
+#: ../camel/providers/local/camel-maildir-summary.c:607
 msgid "Checking folder consistency"
 msgstr "Tarkastetaan kansion yhdenmukaisuutta"
 
-#: ../camel/providers/local/camel-maildir-summary.c:689
+#: ../camel/providers/local/camel-maildir-summary.c:707
 msgid "Checking for new messages"
 msgstr "Etsitään uusia viestejä"
 
-#: ../camel/providers/local/camel-maildir-summary.c:791
+#: ../camel/providers/local/camel-maildir-summary.c:810
 #: ../camel/providers/local/camel-mbox-summary.c:466
 #: ../camel/providers/local/camel-mbox-summary.c:687
 #: ../camel/providers/local/camel-mbox-summary.c:836
@@ -3801,11 +4032,6 @@ msgstr "Kansion nimi ei ole sallittu."
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Kohdetta \"%s\" ei voitu nimetä uudestaan: \"%s\": %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:906
-#, c-format
-msgid "Could not rename '%s' to %s: %s"
-msgstr "Uudelleennimeäminen %s:stä %s:ksi epäonnistui: %s"
-
 #: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -3816,7 +4042,7 @@ msgstr "Kansiota ei voitu avata: %s: %s"
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion tarkistus ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-mbox-summary.c:696
 #: ../camel/providers/local/camel-mbox-summary.c:845
 #: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
@@ -3998,76 +4224,78 @@ msgstr ""
 "Sähköpostiviestien kansiota %s ei voi synkronoida: %s\n"
 "Kansio saattaa olla vaurioitunut, kopio tallennettu tiedostoon \"%s\""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:222
-#: ../camel/providers/nntp/camel-nntp-folder.c:590
+#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:595
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Sisäinen virhe: UID on virheellisessä muodossa: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:292
 #: ../camel/providers/nntp/camel-nntp-folder.c:297
-#: ../camel/providers/pop3/camel-pop3-folder.c:546
-#: ../camel/providers/pop3/camel-pop3-folder.c:945
+#: ../camel/providers/nntp/camel-nntp-folder.c:302
+#: ../camel/providers/pop3/camel-pop3-folder.c:574
+#: ../camel/providers/pop3/camel-pop3-folder.c:1002
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:304
-#: ../camel/providers/nntp/camel-nntp-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:476
-#: ../camel/providers/pop3/camel-pop3-folder.c:536
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/nntp/camel-nntp-folder.c:309
+#: ../camel/providers/nntp/camel-nntp-folder.c:629
+#: ../camel/providers/pop3/camel-pop3-folder.c:478
+#: ../camel/providers/pop3/camel-pop3-folder.c:510
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:564
+#: ../camel/providers/pop3/camel-pop3-folder.c:583
 #, fuzzy, c-format
 msgid "Cannot get message %s: "
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
-#: ../camel/providers/nntp/camel-nntp-folder.c:436
+#: ../camel/providers/nntp/camel-nntp-folder.c:435
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Postitus epäonnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:503
+#: ../camel/providers/nntp/camel-nntp-folder.c:508
 msgid "Posting failed: "
 msgstr "Postitus epäonnistui: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:613
+#: ../camel/providers/nntp/camel-nntp-folder.c:618
 #, c-format
 msgid "This message is not currently available"
 msgstr "Tämä viesti ei ole juuri nyt saatavilla"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:722
+#: ../camel/providers/nntp/camel-nntp-folder.c:727
 #, c-format
-#| msgid "You cannot copy messages from a NNTP folder!"
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "Et voi kopioida viestejä NNTP-kansiosta"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:45
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "Näytä kansiot lyhyessä muodossa (esim. c.o.linux eikä comp.os.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:49
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "Näytä _tilauslomakkeessa suhteelliset kansionimet"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:54
 msgid "Default NNTP port"
 msgstr "NNTP:n oletusportti"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:56
-msgid "NNTP over SSL"
-msgstr "NNTP SSL:llä"
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#| msgid "NNTP over SSL"
+msgid "NNTP over TLS"
+msgstr "NNTP TLS:llä"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
 msgstr "Keskusteluryhmät"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:64
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "Tämän tarjoajan avulla voit lukea ja postittaa USENET-uutisryhmiin."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
 #, fuzzy
 #| msgid ""
 #| "This option will connect to the server using Kerberos 5 authentication."
@@ -4077,7 +4305,7 @@ msgid ""
 msgstr ""
 "Tämä vaihtoehto yhdistää palvelimeen käyttäen Kerberos 5 - tunnistautumista."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
+#: ../camel/providers/nntp/camel-nntp-provider.c:94
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4085,22 +4313,22 @@ msgstr ""
 "Tämä vaihtoehto tunnistautuu NNTP-palvelimelle käyttäen selväkielistä "
 "salasanaa."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:371
+#: ../camel/providers/nntp/camel-nntp-store.c:377
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Tervehdystä %s:stä ei voitu lukea: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:379
+#: ../camel/providers/nntp/camel-nntp-store.c:385
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-palvelin %s palautti virhekoodin %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:449
+#: ../camel/providers/nntp/camel-nntp-store.c:455
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET uutisryhmät palvelimelta %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1151
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4111,23 +4339,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1267
+#: ../camel/providers/nntp/camel-nntp-store.c:1308
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Et voi luoda kansioita uutisryhmien alle: tilaa sen sijaan ryhmiä."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:1324
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Et voi nimetä kansiota Uutisryhmissä."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1347
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Et voi poistaa kansiota uutisryhmistä: lopeta sen sijaan ryhmän tilaaminen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1516
+#: ../camel/providers/nntp/camel-nntp-store.c:1557
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4138,7 +4366,7 @@ msgstr ""
 "\n"
 "Uutisryhmää ei ole olemassa. Valittu kohta on luultavasti ylempi kansio."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1583
+#: ../camel/providers/nntp/camel-nntp-store.c:1624
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4149,16 +4377,16 @@ msgstr ""
 "\n"
 "Uutisryhmää ei ole olemassa!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2009
+#: ../camel/providers/nntp/camel-nntp-store.c:2050
 msgid "NNTP Command failed: "
 msgstr "NNTP-komento epäonnistui: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2106
+#: ../camel/providers/nntp/camel-nntp-store.c:2155
 #, c-format
 msgid "Not connected."
 msgstr "Ei yhteyttä."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2200
+#: ../camel/providers/nntp/camel-nntp-store.c:2257
 #, c-format
 msgid "No such folder: %s"
 msgstr "Kansiota ei ole: %s"
@@ -4184,83 +4412,84 @@ msgstr "Odottamaton palvelimen vastaus head:ilta: %s"
 msgid "Operation failed: %s"
 msgstr "Toiminto epäonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:359
-#: ../camel/providers/pop3/camel-pop3-folder.c:442
+#: ../camel/providers/pop3/camel-pop3-folder.c:357
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
 #, c-format
 msgid "No message with UID %s"
 msgstr "Ei viestejä tunnisteella %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:458
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestiä %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:547
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:598
+#: ../camel/providers/pop3/camel-pop3-folder.c:644
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:659
-#: ../camel/providers/pop3/camel-pop3-folder.c:662
-#: ../camel/providers/pop3/camel-pop3-folder.c:675
-#: ../camel/providers/pop3/camel-pop3-folder.c:688
-#: ../camel/providers/pop3/camel-pop3-folder.c:702
+#: ../camel/providers/pop3/camel-pop3-folder.c:703
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#: ../camel/providers/pop3/camel-pop3-folder.c:719
+#: ../camel/providers/pop3/camel-pop3-folder.c:732
+#: ../camel/providers/pop3/camel-pop3-folder.c:746
 #, fuzzy
 msgid "Cannot get POP summary: "
 msgstr "POP-yhteenvedon hakeminen ei onnistu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:766
+#: ../camel/providers/pop3/camel-pop3-folder.c:811
 msgid "Expunging old messages"
 msgstr "Poistetaan vanhoja viestejä pysyvästi"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:794
+#: ../camel/providers/pop3/camel-pop3-folder.c:839
 msgid "Expunging deleted messages"
 msgstr "Poistetaan poistetut viestit pysyvästi"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:37
+#: ../camel/providers/pop3/camel-pop3-provider.c:36
 #, fuzzy
 msgid "Message Storage"
 msgstr "Viestisäilö"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/pop3/camel-pop3-provider.c:38
 msgid "_Leave messages on server"
 msgstr "_Jätä viestit palvelimelle"
 
 #. Translators: '%s' is replaced with a widget, where user can
 #. * select how many days can be message left on the server.
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "Poista %s päivän kuluttua"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Disable _support for all POP3 extensions"
 msgstr "Poista _käytöstä tuki POP3-laajennoksille"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:52
 msgid "Default POP3 port"
 msgstr "POP3:n oletusportti"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
-msgid "POP3 over SSL"
-msgstr "POP3 SSL:llä"
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#| msgid "POP3 over SSL"
+msgid "POP3 over TLS"
+msgstr "POP3 TLS:llä"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:61
+#: ../camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:63
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Yhteyksien ottoon ja postien hakuun POP-palvelimilta."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4268,7 +4497,7 @@ msgstr ""
 "tämä vaihtoehto yhdistää POP-palvelimeen selväkielisellä salasanalla. Tämä "
 "on ainoa tapa, jota monet POP-palvelimet tukevat."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4279,66 +4508,59 @@ msgstr ""
 "palvelimilla, jotka väittävät sitä tukevansa."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:97
+#: ../camel/providers/pop3/camel-pop3-store.c:95
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:164
+#: ../camel/providers/pop3/camel-pop3-store.c:162
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP-palvelimelta %s ei saatu luettua kelvollista tervehdystä"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:179
+#: ../camel/providers/pop3/camel-pop3-store.c:177
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Yhdistäminen POP-palvelimeen %s turvallisessa tilassa epäonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:180
+#: ../camel/providers/pop3/camel-pop3-store.c:178
 msgid "STLS not supported by server"
 msgstr "Palvelin ei tue STLS-laajennosta"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:201
+#: ../camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:219
+#: ../camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Yhdistäminen POP-palvelimeen %s turvallisessa tilassa epäonnistui: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:360
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP-palvelimeen %s kirjautuminen epäonnistui: SASL protokollavirhe"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:382
+#: ../camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Tunnistautuminen POP-palvelimelle %s epäonnistui:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../camel/providers/pop3/camel-pop3-store.c:487
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3-palvelin %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:493
+#: ../camel/providers/pop3/camel-pop3-store.c:490
 #, fuzzy, c-format
 msgid "POP3 server for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:713
-#, c-format
-msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
-msgstr ""
-"POP-palvelimeen %s ei saatu yhteyttä:\tVastaanotettiin virheellinen APOP-"
-"tunniste. Voidaan epäillä yhteyden kaappaamista, ota yhteyttä ylläpitäjääsi."
-
-#: ../camel/providers/pop3/camel-pop3-store.c:768
+#: ../camel/providers/pop3/camel-pop3-store.c:702
+#: ../camel/providers/pop3/camel-pop3-store.c:715
+#: ../camel/providers/pop3/camel-pop3-store.c:797
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4347,31 +4569,40 @@ msgstr ""
 "Yhdistäminen POP-palvelimeen epäonnistui: %s\n"
 "Virhe lähetettäessä salasanaa: %s"
 
+#: ../camel/providers/pop3/camel-pop3-store.c:742
+#, c-format
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"POP-palvelimeen %s ei saatu yhteyttä:\tVastaanotettiin virheellinen APOP-"
+"tunniste. Voidaan epäillä yhteyden kaappaamista, ota yhteyttä ylläpitäjääsi."
+
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:783
+#: ../camel/providers/pop3/camel-pop3-store.c:812
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:865
+#: ../camel/providers/pop3/camel-pop3-store.c:896
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Kansiota \"%s\" ei ole olemassa."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:882
+#: ../camel/providers/pop3/camel-pop3-store.c:913
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:34
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
 #: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4379,303 +4610,310 @@ msgstr ""
 "Postin lähettäminen siirtämällä se \"sendmail\"-ohjelmalle paikallisessa "
 "järjestelmässä."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
 msgid "Mail delivery via the sendmail program"
 msgstr "Sähköpostin lähetys ohjelman sendmail avulla"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:137
 #, fuzzy, c-format
 #| msgid "Failed to retrieve message"
 msgid "Failed to read From address"
 msgstr "Viestiä ei voitu hakea."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:155
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:154
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:183
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Vastaanottajalistan tulkitseminen epäonnistui"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:200
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:199
 #, fuzzy, c-format
 #| msgid "Could not parse recipient list"
 msgid "Could not parse arguments"
 msgstr "Vastaanottajalistan tulkitseminen epäonnistui"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:231
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:230
 #, fuzzy, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "Putkea sendmailille ei voitu luoda: %s: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:256
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
 #, fuzzy, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "Sendmailia ei voi käynnistää: %s: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:305
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:304
 msgid "Could not send message: "
 msgstr "Viestin lähettäminen epäonnistui:"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:335
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:334
 #, fuzzy, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "Sendmail keskeytettiin signaaliin %s: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:345
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:344
 #, fuzzy, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "Komentoa %s ei voitu suorittaa: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:350
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:349
 #, fuzzy, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "Sendmail palautti arvon %d: sähköpostia ei lähetetty"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Default SMTP port"
 msgstr "SMTP:n oletusportti"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
-msgid "SMTP over SSL"
-msgstr "SMTP SSL:llä"
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#| msgid "SMTP over SSL"
+msgid "SMTP over TLS"
+msgstr "SMTP TLS:llä"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:42
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "Message submission port"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:48
+#: ../camel/providers/smtp/camel-smtp-provider.c:47
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:50
+#: ../camel/providers/smtp/camel-smtp-provider.c:49
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Sähköpostin lähetys ottamalla yhteyttä sähköpostipalvelimeen SMTP-"
 "protokollalla."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
 #, fuzzy
 msgid "Welcome response error: "
 msgstr "virhe tervetuloviestissä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Yhdistäminen SMTP-palvelimeen %s turvallisessa tilassa epäonnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:289
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:309
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:265
+#: ../camel/providers/smtp/camel-smtp-transport.c:328
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Yhdistäminen SMTP-palvelimeen %s turvallisessa tilassa epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:360
+#: ../camel/providers/smtp/camel-smtp-transport.c:442
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP postinvälitys %s:n kautta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:434
+#: ../camel/providers/smtp/camel-smtp-transport.c:582
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP-palvelin %s ei tue tunnistautumismenetelmää %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/smtp/camel-smtp-transport.c:663
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:547
-#: ../camel/providers/smtp/camel-smtp-transport.c:560
+#: ../camel/providers/smtp/camel-smtp-transport.c:699
+#, fuzzy
+#| msgid "AUTH command failed: "
+msgid "AUTH command failed: Not connected."
+msgstr "AUTH-komento epäonnistui: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "AUTH command failed: "
 msgstr "AUTH-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:888
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Viestiä ei voi lähettää: palveluun ei ole yhteyttä."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:708
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voi lähettää: lähettäjän osoite on epäkelpo."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:712
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:930
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Viestiä ei voi lähettää: vastaanottajia ei ole määritelty."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:945
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Viestiä ei voi lähettää: yksi tai useampi viallinen vastaanottaja"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:871
+#: ../camel/providers/smtp/camel-smtp-transport.c:1077
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksivirhe, tuntematon komento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:1079
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksivirhe parametreissa tai argumenteissa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "Command not implemented"
 msgstr "Komentoa ei ole toteutettu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:1083
 msgid "Command parameter not implemented"
 msgstr "Komennon parametria ei ole toteutettu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:1085
 msgid "System status, or system help reply"
 msgstr "Järjestelmän tila tai järjestelmän ohjevastaus"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:1087
 msgid "Help message"
 msgstr "Ohjeviesti"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:1089
 msgid "Service ready"
 msgstr "Palvelu valmis"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:1091
 msgid "Service closing transmission channel"
 msgstr "Palvelu sulkee siirtokanavaa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "Service not available, closing transmission channel"
 msgstr "Palvelu ei ole käytettävissä, suljetaan siirtokanava"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "Requested mail action okay, completed"
 msgstr "Pyydetty sähköpostikäsky ok, valmis"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 "Käyttäjä ei ole paikallinen, uudelleenohjaus osoitteeseen <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Pyydettyä sähköpostikäskyä ei suoritettu: postilaatikko ei käytettävissä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:1101
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Pyydettyä toimenpidettä ei suoritettu: postilaatikko ei käytettävissä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:1103
 msgid "Requested action aborted: error in processing"
 msgstr "Pyydetty toimenpide keskeytetty: virhe käsittelyssä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:1105
 msgid "User not local; please try <forward-path>"
 msgstr "Käyttäjä ei ole paikallinen: kokeile <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:901
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Pyydettyä toimenpidettä ei suoritettu: järjestelmän levytila ei riitä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:1109
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Pyydettyä toimenpidettä ei suoritettu: varattu levytila ylitetty"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:1111
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "Pyydettyä toimenpidettä ei suoritettu: postilaatikon nimi ei ole sallittu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:907
+#: ../camel/providers/smtp/camel-smtp-transport.c:1113
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Aloita sähköpostin kirjoittaminen: lopeta <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
 msgid "Transaction failed"
 msgstr "Tapahtuma epäonnistui"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:913
+#: ../camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "A password transition is needed"
 msgstr "Vaaditaan salasanatransaktio"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:915
+#: ../camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Authentication mechanism is too weak"
 msgstr "Todennusmenetelmä on liian heikko"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:917
+#: ../camel/providers/smtp/camel-smtp-transport.c:1123
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pyydetty todennusmenetelmä vaatii salausta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:919
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "Temporary authentication failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1207
+#: ../camel/providers/smtp/camel-smtp-transport.c:1415
 msgid "SMTP Greeting"
 msgstr "SMTP tervehdys"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1217
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#: ../camel/providers/smtp/camel-smtp-transport.c:1239
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
 msgid "HELO command failed: "
 msgstr "HELO-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:1329
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1520
+#: ../camel/providers/smtp/camel-smtp-transport.c:1534
+#: ../camel/providers/smtp/camel-smtp-transport.c:1543
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM -komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1366
+#: ../camel/providers/smtp/camel-smtp-transport.c:1571
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO -komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1383
-#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#: ../camel/providers/smtp/camel-smtp-transport.c:1596
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1436
-#: ../camel/providers/smtp/camel-smtp-transport.c:1447
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#: ../camel/providers/smtp/camel-smtp-transport.c:1517
-#: ../camel/providers/smtp/camel-smtp-transport.c:1537
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
-#: ../camel/providers/smtp/camel-smtp-transport.c:1560
+#: ../camel/providers/smtp/camel-smtp-transport.c:1668
+#: ../camel/providers/smtp/camel-smtp-transport.c:1679
+#: ../camel/providers/smtp/camel-smtp-transport.c:1690
+#: ../camel/providers/smtp/camel-smtp-transport.c:1752
+#: ../camel/providers/smtp/camel-smtp-transport.c:1770
+#: ../camel/providers/smtp/camel-smtp-transport.c:1783
+#: ../camel/providers/smtp/camel-smtp-transport.c:1791
 msgid "DATA command failed: "
 msgstr "DATA-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1585
-#: ../camel/providers/smtp/camel-smtp-transport.c:1600
-#: ../camel/providers/smtp/camel-smtp-transport.c:1609
+#: ../camel/providers/smtp/camel-smtp-transport.c:1817
+#: ../camel/providers/smtp/camel-smtp-transport.c:1831
+#: ../camel/providers/smtp/camel-smtp-transport.c:1839
 msgid "RSET command failed: "
 msgstr "RSET-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1634
-#: ../camel/providers/smtp/camel-smtp-transport.c:1648
-#: ../camel/providers/smtp/camel-smtp-transport.c:1655
+#: ../camel/providers/smtp/camel-smtp-transport.c:1865
+#: ../camel/providers/smtp/camel-smtp-transport.c:1877
+#: ../camel/providers/smtp/camel-smtp-transport.c:1883
 msgid "QUIT command failed: "
 msgstr "QUIT-komento epäonnistui: "
 
@@ -4710,6 +4948,20 @@ msgid ""
 "\"days\""
 msgstr ""
 
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
+msgid "Whether the migration of old setting was already done"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:2
+msgid "An absolute path where the gpg (or gpg2) binary is"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
+msgid ""
+"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it "
+"is searched for it. Change requires restart of the application."
+msgstr ""
+
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 #, fuzzy
 #| msgid "Proxy type to use"
@@ -4789,109 +5041,77 @@ msgstr "Porttinumero SOCKS-pyynnöille"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "Automaattisen välipalvelinmäärittelyn URL"
 
-#: ../libebackend/e-authentication-mediator.c:204
-#: ../libebackend/e-authentication-mediator.c:215
-#: ../libebackend/e-authentication-mediator.c:860
-#: ../libebackend/e-authentication-mediator.c:1197
-msgid "Bus name vanished (client terminated?)"
-msgstr ""
-
-#: ../libebackend/e-authentication-mediator.c:263
-msgid "No response from client"
-msgstr ""
-
-#: ../libebackend/e-authentication-mediator.c:333
-#: ../libebackend/e-authentication-mediator.c:344
-#: ../libebackend/e-authentication-mediator.c:854
-#: ../libebackend/e-authentication-mediator.c:1191
-#, fuzzy
-msgid "Client cancelled the operation"
-msgstr "Toimenpidettä ei voitu perua"
-
-#: ../libebackend/e-authentication-mediator.c:415
-msgid "Client reports password was rejected"
-msgstr ""
-
-#: ../libebackend/e-authentication-session.c:539
-msgid "Add this password to your keyring"
-msgstr "Lisää tämä salasana avainnippuusi"
-
-#: ../libebackend/e-authentication-session.c:649
-msgid "Password was incorrect"
-msgstr "Salasana oli väärin"
-
-#: ../libebackend/e-backend.c:408
-#, c-format
-msgid "%s does not support authentication"
-msgstr "%s ei tue tunnistautumista"
-
-#: ../libebackend/e-collection-backend.c:901
+#: ../libebackend/e-collection-backend.c:976
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr ""
 
-#: ../libebackend/e-collection-backend.c:960
+#: ../libebackend/e-collection-backend.c:1035
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr ""
 
-#: ../libebackend/e-data-factory.c:303
-#, fuzzy, c-format
-#| msgid "No backend name in source '%s'"
-msgid "No backend factory for hash key '%s'"
-msgstr "Taustapalvelun nimeä ei löydy lähteestä \"%s\""
+#: ../libebackend/e-data-factory.c:1294
+#, c-format
+msgid "Backend factory for source '%s' and extension '%s' cannot be found."
+msgstr ""
 
-#: ../libebackend/e-server-side-source.c:133
+#: ../libebackend/e-server-side-source.c:141
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:1022
-#: ../libedataserver/e-source.c:1394
+#: ../libebackend/e-server-side-source.c:466
+#, fuzzy
+#| msgid "Failed to get lock using fcntl(2): %s"
+msgid "Failed to lookup credentials: "
+msgstr "Lukitseminen käyttäen fcntl(2) kutsua epäonnistui: %s"
+
+#: ../libebackend/e-server-side-source.c:1391
+#: ../libedataserver/e-source.c:1595
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:1036
+#: ../libebackend/e-server-side-source.c:1405
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:1064
-#: ../libedataserver/e-source.c:1507
+#: ../libebackend/e-server-side-source.c:1433
+#: ../libedataserver/e-source.c:1708
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:1078
+#: ../libebackend/e-server-side-source.c:1447
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:1109
-#: ../libedataserver/e-source.c:1603
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026
+#: ../libebackend/e-server-side-source.c:1478
+#: ../libedataserver/e-source.c:1804
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
 #, fuzzy, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: ../libebackend/e-server-side-source.c:1456
+#: ../libebackend/e-server-side-source.c:1856
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "Tiedostolla tulee olla '.source'-pääte"
 
-#: ../libebackend/e-source-registry-server.c:531
-#: ../libedataserver/e-source-registry.c:1957
-#, fuzzy
-msgid "The user declined to authenticate"
-msgstr "Tunnistautuminen epäonnistui.\n"
-
-#: ../libebackend/e-source-registry-server.c:800
+#: ../libebackend/e-source-registry-server.c:319
 #, c-format
 msgid "UID '%s' is already in use"
-msgstr ""
+msgstr "UID '%s' on jo käytössä"
+
+#: ../libebackend/e-subprocess-factory.c:285
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr "Lähdettä, jonka UID on \"%s\", ei löydy"
 
 #: ../libebackend/e-user-prompter-server.c:305
 #, fuzzy, c-format
@@ -4899,256 +5119,221 @@ msgstr ""
 msgid "Extension dialog '%s' not found."
 msgstr "Yhteystietoa \"%s\" ei löydy"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Työ"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Kilpailu"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Suosikit"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Lahjat"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Tavoitteet"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Lomapäivä"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Lomakortit"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Tärkeät yhteystiedot"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideat"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "International"
 msgstr "Kansainväliset"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Avainasiakas"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Henkilökohtaiset"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Puhelut"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Tila"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategiat"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Toimittajat"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Aika ja kulut"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:71
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:71
+#: ../libedataserver/e-categories.c:72
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: ../libedataserver/e-client.c:141
+#: ../libedataserver/e-client.c:146
 msgid "Source not loaded"
 msgstr "Lähdettä ei ole ladattu"
 
-#: ../libedataserver/e-client.c:143
+#: ../libedataserver/e-client.c:148
 msgid "Source already loaded"
 msgstr "Lähde on jo ladattu"
 
 #. Translators: This means that the EClient does not
 #. * support offline mode, or it's not set to by a user,
 #. * thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:154
+#: ../libedataserver/e-client.c:159
 msgid "Offline unavailable"
 msgstr "Yhteydetön tila ei ole käytettävissä"
 
-#: ../libedataserver/e-client.c:176
+#: ../libedataserver/e-client.c:181
 msgid "D-Bus error"
 msgstr "D-Bus-virhe"
 
-#: ../libedataserver/e-source-authenticator.c:162
-msgid "Address book authentication request"
-msgstr "Osoitekirjan tunnistautumispyyntö"
-
-#: ../libedataserver/e-source-authenticator.c:167
-msgid "Calendar authentication request"
-msgstr "Kalenterin tunnistautumispyyntö"
-
-#: ../libedataserver/e-source-authenticator.c:171
-msgid "Mail authentication request"
-msgstr "Sähköpostin tunnistautumispyyntö"
-
-#. generic account prompt
-#: ../libedataserver/e-source-authenticator.c:174
-msgid "Authentication request"
-msgstr "Todennuspyyntö"
-
-#: ../libedataserver/e-source-authenticator.c:184
-#, c-format
-msgid "Please enter the password for address book \"%s\"."
-msgstr "Anna osoitekirjan \"%s\" salasana."
-
-#: ../libedataserver/e-source-authenticator.c:190
-#, c-format
-msgid "Please enter the password for calendar \"%s\"."
-msgstr "Anna kalenterin \"%s\" salasana."
-
-#: ../libedataserver/e-source-authenticator.c:196
-#, c-format
-msgid "Please enter the password for mail account \"%s\"."
-msgstr "Anna sähköpostitilin \"%s\" salasana."
-
-#: ../libedataserver/e-source-authenticator.c:202
-#, fuzzy, c-format
-msgid "Please enter the password for mail transport \"%s\"."
-msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
-
-#: ../libedataserver/e-source-authenticator.c:208
-#, fuzzy, c-format
-msgid "Please enter the password for memo list \"%s\"."
-msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
-
-#: ../libedataserver/e-source-authenticator.c:214
-#, fuzzy, c-format
-msgid "Please enter the password for task list \"%s\"."
-msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
-
-#: ../libedataserver/e-source-authenticator.c:220
-#, c-format
-msgid "Please enter the password for account \"%s\"."
-msgstr "Anna tilin \"%s\" salasana."
+#: ../libedataserver/e-client.c:2023
+msgid "Timeout was reached"
+msgstr ""
 
-#: ../libedataserver/e-source.c:768
+#: ../libedataserver/e-source.c:771
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr ""
 
-#: ../libedataserver/e-source.c:1174
+#: ../libedataserver/e-source.c:1375
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr ""
 
-#: ../libedataserver/e-source.c:1297
+#: ../libedataserver/e-source.c:1498
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr ""
 
-#: ../libedataserver/e-source.c:1910
+#: ../libedataserver/e-source.c:2194
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: ../libedataserver/e-source-mail-signature.c:485
-#, c-format
-msgid "Signature script must be a local file"
-msgstr ""
+#: ../libedataserver/e-source-credentials-provider-impl.c:41
+#, fuzzy
+#| msgid "Protocol not supported"
+msgid "Credentials lookup is not supported"
+msgstr "Protokolla ei ole tuettu"
 
-#: ../libedataserver/e-source-proxy.c:1646
-#, fuzzy, c-format
-#| msgid "Store does not support an INBOX"
-msgid "Source '%s' does not support proxy lookups"
-msgstr "Kansio ei tue INBOXia"
+#: ../libedataserver/e-source-credentials-provider-impl.c:54
+#, fuzzy
+#| msgid "Forwarding messages is not supported"
+msgid "Credentials store is not supported"
+msgstr "Viestien edelleenlähetystä ei tueta"
 
-#: ../libedataserver/e-source-webdav.c:1557
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr ""
-"SSL-varmenne osoitteelle '%s', jota käyttää osoitekirja '%s', ei ole "
-"luotettu. Hyväksytkö varmenteen?"
+#: ../libedataserver/e-source-credentials-provider-impl.c:65
+#, fuzzy
+#| msgid "Forwarding messages is not supported"
+msgid "Credentials delete is not supported"
+msgstr "Viestien edelleenlähetystä ei tueta"
 
-#: ../libedataserver/e-source-webdav.c:1566
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
-"wish to accept it?"
-msgstr ""
-"SSL-varmenne osoitteelle '%s', jota käyttää kalenteri '%s', ei ole luotettu. "
-"Hyväksytkö varmenteen?"
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
+#, fuzzy
+#| msgid "Unknown authentication state."
+msgid "Google authentication is not supported"
+msgstr "Tuntematon todennustila."
 
-#: ../libedataserver/e-source-webdav.c:1575
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
 #, c-format
-msgid ""
-"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr ""
+msgid "Source '%s' (%s) is not a valid Google source"
+msgstr "Lähde '%s' (%s) ei ole kelvollinen Google-lähde"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#, fuzzy
+#| msgid "Object not found"
+msgid "Google secret not found"
+msgstr "Kohdetta ei löydy"
+
+#: ../libedataserver/e-source-credentials-provider-impl-password.c:81
+#| msgid "Contact not found"
+msgid "Password not found"
+msgstr "Salasanaa ei löydy"
 
-#: ../libedataserver/e-source-webdav.c:1584
+#: ../libedataserver/e-source-mail-signature.c:481
 #, c-format
-msgid ""
-"SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
-"you wish to accept it?"
+msgid "Signature script must be a local file"
 msgstr ""
 
+#: ../libedataserver/e-source-proxy.c:1641
+#, fuzzy, c-format
+#| msgid "Store does not support an INBOX"
+msgid "Source '%s' does not support proxy lookups"
+msgstr "Kansio ei tue INBOXia"
+
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1961
+#: ../libedataserver/e-time-utils.c:1692 ../libedataserver/e-time-utils.c:1991
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %I.%M.%S %p"
 
@@ -5156,7 +5341,7 @@ msgstr "%a %d.%m.%Y %I.%M.%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1667 ../libedataserver/e-time-utils.c:1952
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1982
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
@@ -5164,7 +5349,7 @@ msgstr "%a %d.%m.%Y %H.%M.%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1957
+#: ../libedataserver/e-time-utils.c:1702 ../libedataserver/e-time-utils.c:1987
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %I.%M %p"
 
@@ -5172,78 +5357,78 @@ msgstr "%a %d.%m.%Y %I.%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1677 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1978
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1712
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1717
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1690 ../libedataserver/e-time-utils.c:1810
-#: ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1720 ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1973
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1697
+#: ../libedataserver/e-time-utils.c:1727
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I.%M.%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1701
+#: ../libedataserver/e-time-utils.c:1731
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H.%M.%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1706
+#: ../libedataserver/e-time-utils.c:1736
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %I.%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1711
+#: ../libedataserver/e-time-utils.c:1741
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1716
+#: ../libedataserver/e-time-utils.c:1746
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1721
+#: ../libedataserver/e-time-utils.c:1751
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1724 ../libedataserver/e-time-utils.c:1813
+#: ../libedataserver/e-time-utils.c:1754 ../libedataserver/e-time-utils.c:1843
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1884 ../libedataserver/e-time-utils.c:2005
+#: ../libedataserver/e-time-utils.c:1914 ../libedataserver/e-time-utils.c:2035
 msgid "%I:%M:%S %p"
 msgstr "%I.%M.%S %P"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1888 ../libedataserver/e-time-utils.c:1997
+#: ../libedataserver/e-time-utils.c:1918 ../libedataserver/e-time-utils.c:2027
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
@@ -5251,46 +5436,379 @@ msgstr "%H.%M.%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1893 ../libedataserver/e-time-utils.c:2002
+#: ../libedataserver/e-time-utils.c:1923 ../libedataserver/e-time-utils.c:2032
 msgid "%I:%M %p"
 msgstr "%I.%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1897 ../libedataserver/e-time-utils.c:1994
+#: ../libedataserver/e-time-utils.c:1927 ../libedataserver/e-time-utils.c:2024
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1901
+#: ../libedataserver/e-time-utils.c:1931
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1905
+#: ../libedataserver/e-time-utils.c:1935
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:130
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:364
+#: ../libedataserver/e-webdav-discover.c:484
+#: ../libedataserver/e-webdav-discover.c:493
+#, c-format
+msgid "HTTP Error: %s"
+msgstr "HTTP-virhe: %s"
+
+#: ../libedataserver/e-webdav-discover.c:523
+#, fuzzy
+#| msgid "Could not parse recipient list"
+msgid "Could not parse response"
+msgstr "Vastaanottajalistan tulkitseminen epäonnistui"
+
+#: ../libedataserver/e-webdav-discover.c:532
+msgid "Empty response"
+msgstr "Tyhjä vastaus"
+
+#: ../libedataserver/e-webdav-discover.c:540
+#, fuzzy
+#| msgid "Unexpected response from IMAP server: %s"
+msgid "Unexpected reply from server"
+msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
+
+#: ../libedataserverui/e-credentials-prompter.c:260
+#: ../libedataserverui/e-credentials-prompter.c:1563
+#: ../libedataserverui/e-credentials-prompter.c:1607
+#, fuzzy
+msgid "Credentials prompt was cancelled"
+msgstr "Toimenpide on peruttu"
+
+#: ../libedataserverui/e-credentials-prompter.c:664
 #, fuzzy, c-format
-#| msgid "No such source for UID '%s'"
-msgid "No such data source for UID '%s'"
-msgstr "Lähdettä, jonka UID on \"%s\", ei löydy"
+#| msgid "Store does not support an INBOX"
+msgid "Source '%s' doesn't support prompt for credentials"
+msgstr "Kansio ei tue INBOXia"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:440
+#, fuzzy, c-format
+#| msgid "Failed to open addressbook at '%s': %s"
+msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgstr "Osoitekirjan avaaminen kohteessa \"%s\" epäonnistui: %s"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:486
+msgid "Requesting access token, please wait..."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:588
+#, fuzzy
+#| msgid "Address book authentication request"
+msgid "Google Address book authentication request"
+msgstr "Osoitekirjan tunnistautumispyyntö"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:591
+#, fuzzy
+#| msgid "Calendar authentication request"
+msgid "Google Calendar authentication request"
+msgstr "Kalenterin tunnistautumispyyntö"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:594
+#, fuzzy
+#| msgid "Mail authentication request"
+msgid "Google Memo List authentication request"
+msgstr "Sähköpostin tunnistautumispyyntö"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:597
+#, fuzzy
+#| msgid "Mail authentication request"
+msgid "Google Task List authentication request"
+msgstr "Sähköpostin tunnistautumispyyntö"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:601
+#, fuzzy
+#| msgid "Mail authentication request"
+msgid "Google Mail authentication request"
+msgstr "Sähköpostin tunnistautumispyyntö"
+
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:604
+#| msgid "Calendar authentication request"
+msgid "Google account authentication request"
+msgstr "Google-tilin tunnistautumispyyntö"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:615
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"address book \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:619
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"calendar \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail account \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail transport \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"memo list \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"task list \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"account \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:683
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:232
+#: ../libedataserverui/e-trust-prompt.c:114
+#: ../libedataserverui/e-webdav-discover-widget.c:1063
+#| msgid "Canceled"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
+msgid "Address book authentication request"
+msgstr "Osoitekirjan tunnistautumispyyntö"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
+msgid "Calendar authentication request"
+msgstr "Kalenterin tunnistautumispyyntö"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
+msgid "Mail authentication request"
+msgstr "Sähköpostin tunnistautumispyyntö"
+
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
+msgid "Authentication request"
+msgstr "Todennuspyyntö"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "Anna osoitekirjan \"%s\" salasana."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "Anna kalenterin \"%s\" salasana."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "Anna sähköpostitilin \"%s\" salasana."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
+#, fuzzy, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
+#, fuzzy, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:142
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
+#, fuzzy, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "Anna tilin \"%s\" salasana."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
+#: ../libedataserverui/e-webdav-discover-widget.c:1064
+msgid "_OK"
+msgstr "_OK"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
+msgid "_User Name:"
+msgstr "_Käyttäjätunnus:"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
+#| msgid "Password"
+msgid "_Password:"
+msgstr "_Salasana:"
+
+#. Remember password check
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
+#| msgid "Add this password to your keyring"
+msgid "_Add this password to your keyring"
+msgstr "_Lisää tämä salasana avainnippuusi"
+
+#: ../libedataserverui/e-trust-prompt.c:113
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
+#, fuzzy
+#| msgid "Signing certificate not trusted"
+msgid "Certificate trust..."
+msgstr "Allekirjoitusvarmenteeseen ei luoteta"
+
+#: ../libedataserverui/e-trust-prompt.c:115
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
+msgid "_Reject"
+msgstr "_Hylkää"
+
+#: ../libedataserverui/e-trust-prompt.c:116
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
+msgid "Accept _Temporarily"
+msgstr "Hyväksy _väliaikaisesti"
+
+#: ../libedataserverui/e-trust-prompt.c:117
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
+msgid "_Accept Permanently"
+msgstr "_Hyväksy pysyvästi"
+
+#: ../libedataserverui/e-trust-prompt.c:188
+#: ../modules/trust-prompt/trust-prompt-gtk.c:159
+#, c-format
+#| msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr "SSL/TLS-varmenne '%s' ei ole luotettu. Haluatko hyväksyä sen?"
+
+#: ../libedataserverui/e-trust-prompt.c:210
+#: ../modules/trust-prompt/trust-prompt-gtk.c:174
+msgid "Reason:"
+msgstr "Syy:"
+
+#: ../libedataserverui/e-trust-prompt.c:213
+#| msgid "Other error"
+msgid "Detailed error:"
+msgstr "Yksityiskohtainen virhe:"
+
+#: ../libedataserverui/e-trust-prompt.c:275
+#: ../modules/trust-prompt/module-trust-prompt.c:82
+#, fuzzy
+#| msgid "Signing certificate not found"
+msgid "The signing certificate authority is not known."
+msgstr "Allekirjoitusvarmennetta ei löytynyt"
+
+#: ../libedataserverui/e-trust-prompt.c:277
+#: ../modules/trust-prompt/module-trust-prompt.c:84
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../libedataserverui/e-trust-prompt.c:279
+#: ../modules/trust-prompt/module-trust-prompt.c:86
+msgid "The certificate's activation time is still in the future."
+msgstr "Varmenteen aktivointiaika on tulevaisuudessa."
+
+#: ../libedataserverui/e-trust-prompt.c:281
+#: ../modules/trust-prompt/module-trust-prompt.c:88
+msgid "The certificate has expired."
+msgstr "Varmenne on vanhentunut."
+
+#: ../libedataserverui/e-trust-prompt.c:283
+#: ../modules/trust-prompt/module-trust-prompt.c:90
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
+msgstr ""
+
+#: ../libedataserverui/e-trust-prompt.c:285
+#: ../modules/trust-prompt/module-trust-prompt.c:92
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../libedataserverui/e-webdav-discover-widget.c:166
+#, fuzzy
+#| msgctxt "CategoryName"
+#| msgid "Suppliers"
+msgid "Supports"
+msgstr "Toimittajat"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:177
+#| msgid "sendmail"
+msgid "_User mail:"
+msgstr "_Käyttäjän sähköposti:"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:523
+#| msgid "Contacts"
+msgctxt "WebDAVDiscover"
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:524
+msgctxt "WebDAVDiscover"
+msgid "Events"
+msgstr ""
+
+#: ../libedataserverui/e-webdav-discover-widget.c:525
+msgctxt "WebDAVDiscover"
+msgid "Memos"
+msgstr ""
+
+#: ../libedataserverui/e-webdav-discover-widget.c:526
+#| msgid "Tasks"
+msgctxt "WebDAVDiscover"
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:825
+#, fuzzy
+#| msgid "Invalid Redirect URL"
+msgid "Invalid URL"
+msgstr "Virheellinen uudelleenohjaus"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:839
+msgid "User name not filled"
+msgstr ""
+
+#: ../libedataserverui/e-webdav-discover-widget.c:880
+#| msgid "Canceled"
+msgid "Cancel"
+msgstr "Peru"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:883
+#| msgid "Searching..."
+msgid "Searching server sources..."
+msgstr "Etsitään palvelinlähteitä..."
+
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:210
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain a password for '%s'"
 msgstr ""
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:218
-#, c-format
-msgid "Invalid password for '%s'"
-msgstr "Virheellinen salasana kohteelle '%s'"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:273
+#, fuzzy
+#| msgid "Failed to retrieve message"
+msgid "Failed to get password from GOA: "
+msgstr "Viestiä ei voitu hakea."
 
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:219
@@ -5328,92 +5846,34 @@ msgstr "Tiedon koodaus epäonnistui"
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr ""
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1235
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an access token for '%s'"
 msgstr ""
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
 #, fuzzy, c-format
 #| msgid "Failed to open addressbook at '%s': %s"
 msgid "Failed to obtain an access token for '%s': "
 msgstr "Osoitekirjan avaaminen kohteessa \"%s\" epäonnistui: %s"
 
-#: ../modules/google-backend/module-google-backend.c:205
-#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../modules/yahoo-backend/module-yahoo-backend.c:199
-msgid "Calendar"
-msgstr "Kalenteri"
-
-#: ../modules/google-backend/module-google-backend.c:279
+#: ../modules/google-backend/module-google-backend.c:568
 #: ../modules/yahoo-backend/module-yahoo-backend.c:226
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: ../modules/google-backend/module-google-backend.c:333
+#: ../modules/google-backend/module-google-backend.c:625
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:82
-#, fuzzy
-#| msgid "Signing certificate not found"
-msgid "The signing certificate authority is not known."
-msgstr "Allekirjoitusvarmennetta ei löytynyt"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:84
-msgid ""
-"The certificate does not match the expected identity of the site that it was "
-"retrieved from."
-msgstr ""
-
-#: ../modules/trust-prompt/module-trust-prompt.c:86
-msgid "The certificate's activation time is still in the future."
-msgstr "Varmenteen aktivointiaika on tulevaisuudessa."
-
-#: ../modules/trust-prompt/module-trust-prompt.c:88
-msgid "The certificate has expired."
-msgstr "Varmenne on vanhentunut."
-
-#: ../modules/trust-prompt/module-trust-prompt.c:90
-msgid ""
-"The certificate has been revoked according to the connection's certificate "
-"revocation list."
-msgstr ""
-
-#: ../modules/trust-prompt/module-trust-prompt.c:92
-msgid "The certificate's algorithm is considered insecure."
-msgstr ""
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:119
-#, fuzzy
-#| msgid "Signing certificate not trusted"
-msgid "Certificate trust..."
-msgstr "Allekirjoitusvarmenteeseen ei luoteta"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:120
-msgid "_Reject"
-msgstr "_Hylkää"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:121
-msgid "Accept _Temporarily"
-msgstr "Hyväksy _väliaikaisesti"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:122
-msgid "_Accept Permanently"
-msgstr "_Hyväksy pysyvästi"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:160
-#, c-format
-msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "SSL-varmenne '%s' ei ole luotettu. Haluatko hyväksyä sen?"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:175
-msgid "Reason:"
-msgstr "Syy:"
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../modules/yahoo-backend/module-yahoo-backend.c:199
+msgid "Calendar"
+msgstr "Kalenteri"
 
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
 msgid "Integrate your calendars"
@@ -5423,7 +5883,7 @@ msgstr "Integroi kalenterisi"
 msgid "Integrate your contacts"
 msgstr "Integroi yhteystietosi"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:256
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:272
 msgid "Signon service did not return a secret"
 msgstr ""
 
@@ -5455,7 +5915,7 @@ msgstr "Sähköposti"
 msgid "Integrate your mailboxes"
 msgstr "Integroi postilaatikkosi"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
@@ -5471,7 +5931,6 @@ msgstr ""
 
 #: ../modules/ubuntu-online-accounts/uoa-utils.c:101
 #: ../modules/ubuntu-online-accounts/uoa-utils.c:298
-#| msgid "Error parsing filter: %s: %s"
 msgid "Error parsing response as JSON: "
 msgstr "Virhe jäsentäessä vastausta JSON-muodossa: "
 
@@ -5488,7 +5947,6 @@ msgid "Didn't find 'emails.account' in JSON data"
 msgstr "JSON-datasta ei löytynyt kohtaa 'emails.account'"
 
 #: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
-#| msgid "Wants HTML Mail"
 msgid "Windows Live Mail"
 msgstr "Windows Live Mail"
 
@@ -5500,14 +5958,14 @@ msgstr "Yahoo!-kalenteri"
 msgid "Yahoo! Mail"
 msgstr "Yahoo!-sähköposti"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:30
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:38
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:32
 msgid "Keep running after the last client is closed"
 msgstr ""
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
 msgid "Wait running until at least one client is connected"
 msgstr ""
 
@@ -5548,7 +6006,7 @@ msgstr "Verkossa"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../services/evolution-source-registry/evolution-source-registry.c:38
+#: ../services/evolution-source-registry/evolution-source-registry.c:39
 msgid "Don't migrate user data from previous versions of Evolution"
 msgstr ""
 
@@ -5556,6 +6014,65 @@ msgstr ""
 msgid "_Dismiss"
 msgstr "_Hylkää"
 
+#~ msgid "No backend name in source '%s'"
+#~ msgstr "Taustapalvelun nimeä ei löydy lähteestä \"%s\""
+
+#~ msgid "Missing source UID"
+#~ msgstr "Lähteen UID puuttuu"
+
+#~ msgid "Server disconnected"
+#~ msgstr "Palvelin katkaisi yhteyden"
+
+#~ msgid "Error retrieving message"
+#~ msgstr "Virhe haettaessa viestiä"
+
+#~ msgid "Error fetching new messages"
+#~ msgstr "Virhe uusia viestejä noutaessa"
+
+#~ msgid "Error refreshing folder"
+#~ msgstr "Virhe päivittäessä kansiota"
+
+#, fuzzy
+#~ msgid "Client cancelled the operation"
+#~ msgstr "Toimenpidettä ei voitu perua"
+
+#~ msgid "Password was incorrect"
+#~ msgstr "Salasana oli väärin"
+
+#~ msgid "%s does not support authentication"
+#~ msgstr "%s ei tue tunnistautumista"
+
+#, fuzzy
+#~| msgid "No backend name in source '%s'"
+#~ msgid "No backend factory for hash key '%s'"
+#~ msgstr "Taustapalvelun nimeä ei löydy lähteestä \"%s\""
+
+#, fuzzy
+#~ msgid "The user declined to authenticate"
+#~ msgstr "Tunnistautuminen epäonnistui.\n"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by address book '%s', is not trusted. "
+#~ "Do you wish to accept it?"
+#~ msgstr ""
+#~ "SSL-varmenne osoitteelle '%s', jota käyttää osoitekirja '%s', ei ole "
+#~ "luotettu. Hyväksytkö varmenteen?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "SSL-varmenne osoitteelle '%s', jota käyttää kalenteri '%s', ei ole "
+#~ "luotettu. Hyväksytkö varmenteen?"
+
+#, fuzzy
+#~| msgid "No such source for UID '%s'"
+#~ msgid "No such data source for UID '%s'"
+#~ msgstr "Lähdettä, jonka UID on \"%s\", ei löydy"
+
+#~ msgid "Invalid password for '%s'"
+#~ msgstr "Virheellinen salasana kohteelle '%s'"
+
 #~ msgid "You may not import keys with this cipher"
 #~ msgstr "Et voi tuoda avaimia tällä salakirjoitusmenetelmällä"
 
@@ -5586,9 +6103,6 @@ msgstr "_Hylkää"
 #~ msgid "Preparing folder '%s' for offline"
 #~ msgstr "Valmistellaan kansiota \"%s\" yhteydettömään tilaan"
 
-#~ msgid "Canceled"
-#~ msgstr "Peruttu"
-
 #, fuzzy
 #~| msgid ""
 #~| "Alert from IMAP server %s %s:\n"
@@ -5615,10 +6129,6 @@ msgstr "_Hylkää"
 #~ msgid "The parent folder is not allowed to contain subfolders"
 #~ msgstr "Ylempi kansio ei voi sisältää alikansioita"
 
-#, fuzzy
-#~ msgid "Source stream unavailable"
-#~ msgstr "Palvelu ei ole saatavilla"
-
 #~ msgid "Resolving address"
 #~ msgstr "Etsitään osoitetta"
 
@@ -5806,9 +6316,6 @@ msgstr "_Hylkää"
 #~ msgid "Error: Unable to process extension"
 #~ msgstr "Saapuvien viestien kansiota ei voitu käsitellä"
 
-#~ msgid "Email"
-#~ msgstr "Sähköposti"
-
 #, fuzzy
 #~| msgid "Certificate import failed"
 #~ msgid "SSL Certificate Authority"
@@ -5827,9 +6334,6 @@ msgstr "_Hylkää"
 #~ msgid "%s = %s"
 #~ msgstr "%s = %s"
 
-#~ msgid "Certificate"
-#~ msgstr "Varmenne"
-
 #, fuzzy
 #~| msgid "Signature algorithm unknown"
 #~ msgid "Certificate Signature Algorithm"
@@ -6011,9 +6515,6 @@ msgstr "_Hylkää"
 #~ "Hälytys IMAP-palvelimelta %s %s:\n"
 #~ "%s"
 
-#~ msgid "Unexpected response from IMAP server: %s"
-#~ msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
-
 #~ msgid "IMAP command failed: %s"
 #~ msgstr "IMAP-komento epäonnistui: %s"
 
@@ -6026,10 +6527,6 @@ msgstr "_Hylkää"
 #~ msgid "Unexpected OK response from IMAP server: %s"
 #~ msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#, fuzzy
-#~ msgid "Always check for _new mail in this folder"
-#~ msgstr "Etsi aina uusia viestejä tästä kansiosta"
-
 #~ msgid "Could not create directory %s: %s"
 #~ msgstr "Hakemistoa %s ei voitu luoda: %s"
 
@@ -6066,10 +6563,6 @@ msgstr "_Hylkää"
 #~ msgstr "Viestin %s tallennus välimuistiin epäonnistui: %s"
 
 #, fuzzy
-#~ msgid "Failed to cache %s: "
-#~ msgstr "Välimuistiin tallennus epäonnistui %s: %s"
-
-#, fuzzy
 #~ msgid "Names_pace:"
 #~ msgstr "Nimiavaruus:"
 
@@ -6101,10 +6594,6 @@ msgstr "_Hylkää"
 #~ msgid "Could not connect to POP server %s"
 #~ msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
 
-#, fuzzy
-#~ msgid "Keyring operation was cancelled"
-#~ msgstr "Toimenpide on peruttu"
-
 #~ msgid "_Available Categories:"
 #~ msgstr "_Saatavilla olevat luokat:"
 
@@ -6186,9 +6675,6 @@ msgstr "_Hylkää"
 #~ msgid "_Edit %s"
 #~ msgstr "_Muokkaa %s"
 
-#~ msgid "_Delete %s"
-#~ msgstr "_Poista %s"
-
 #~ msgid "Keyring key is unusable: no user or host name"
 #~ msgstr ""
 #~ "Avainrenkaan avain ei ole käyttökelpoinen: ei ole käyttäjä tai verkkonimi"
@@ -6235,10 +6721,6 @@ msgstr "_Hylkää"
 #~ msgstr "Virheellinen lähde"
 
 #, fuzzy
-#~ msgid "Failed to find system book"
-#~ msgstr "Virhe viestin %d kohdalla"
-
-#, fuzzy
 #~ msgid "There was no source for UID '%s' stored in a source list."
 #~ msgstr "%s: gconf ei sisältänyt lähdettä uid:ille \"%s\""
 
@@ -6267,10 +6749,6 @@ msgstr "_Hylkää"
 #~ msgid "Invalid source type"
 #~ msgstr "Virheellinen lähde"
 
-#, fuzzy
-#~ msgid "Updating %s folder"
-#~ msgstr "Tallennetaan kansiota"
-
 #~ msgid "_Use custom command to connect to server"
 #~ msgstr "Käytä _omaa komentoa palvelimeen yhdistämiseen"
 



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