[evolution-data-server] Update Finnish translation

From: Translations User D-L <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Update Finnish translation
Date: Sun, 1 Mar 2020 08:50:07 +0000 (UTC)
commit 2144208391fcc831ece99fb8684558aaf9154a38
Author: Jiri GrÃ¶nroos <jiri gronroos iki fi>
Date:   Sun Mar 1 08:49:45 2020 +0000

    Update Finnish translation

 po/fi.po | 3451 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1747 insertions(+), 1704 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 898c8ddd5..ebf0b5b73 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution-data-server/";
 "issues\n"
-"POT-Creation-Date: 2018-07-17 12:28+0000\n"
-"PO-Revision-Date: 2018-08-18 16:11+0300\n"
+"POT-Creation-Date: 2020-02-04 09:37+0000\n"
+"PO-Revision-Date: 2020-03-01 10:49+0200\n"
 "Last-Translator: Jiri GrÃ¶nroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -24,168 +24,173 @@ 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: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.3\n"
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:220
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:221
 #, fuzzy, c-format
 #| msgid "Given URL â€œ%sâ€ doesnâ€™t reference CalDAV calendar"
 msgid "Given URL â€œ%sâ€ doesnâ€™t reference CardDAV address book"
 msgstr "Annettu osoite â€œ%sâ€ ei viittaa CalDAV-kalenteriin"
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:279
-#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1159
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4326
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:49
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:280
+#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1154
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4428
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:51
 #: ../src/addressbook/libebook-contacts/e-phone-number.c:54
-#: ../src/addressbook/libebook/e-book.c:1079
-#: ../src/addressbook/libebook/e-book-client.c:2130
-#: ../src/addressbook/libebook/e-book-client.c:2302
-#: ../src/addressbook/libebook/e-book-client.c:2515
-#: ../src/addressbook/libebook/e-book-client.c:2646
-#: ../src/addressbook/libebook/e-book-client.c:2805
-#: ../src/addressbook/libebook/e-book-client.c:2939
-#: ../src/addressbook/libebook/e-book-client.c:3070
-#: ../src/addressbook/libebook/e-book-client.c:3228
-#: ../src/addressbook/libebook/e-book-client.c:3423
-#: ../src/addressbook/libebook/e-book-client.c:3641
-#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:263
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:274
-#: ../src/calendar/backends/http/e-cal-backend-http.c:210
-#: ../src/calendar/libecal/e-cal.c:2334
-#: ../src/calendar/libecal/e-cal-client.c:277
-#: ../src/calendar/libecal/e-cal-client.c:3544
-#: ../src/calendar/libecal/e-cal-client.c:3717
-#: ../src/calendar/libecal/e-cal-client.c:3981
-#: ../src/calendar/libecal/e-cal-client.c:4222
-#: ../src/calendar/libecal/e-cal-client.c:4412
-#: ../src/calendar/libecal/e-cal-client.c:4605
-#: ../src/calendar/libecal/e-cal-client.c:4814
-#: ../src/calendar/libecal/e-cal-client.c:4983
-#: ../src/calendar/libecal/e-cal-client.c:5186
-#: ../src/calendar/libecal/e-cal-client.c:5336
-#: ../src/calendar/libecal/e-cal-client.c:5530
-#: ../src/calendar/libecal/e-cal-client.c:5683
-#: ../src/calendar/libecal/e-cal-client.c:5900
-#: ../src/calendar/libecal/e-cal-client.c:6054
-#: ../src/calendar/libecal/e-cal-client.c:6280
-#: ../src/calendar/libecal/e-cal-client.c:6476
-#: ../src/calendar/libecal/e-cal-client.c:6839
-#: ../src/calendar/libecal/e-cal-client.c:7061
-#: ../src/calendar/libedata-cal/e-cal-cache.c:1757
-#: ../src/camel/camel-filter-driver.c:1719
-#: ../src/camel/camel-filter-driver.c:1851
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3204
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3210
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3220
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3232
-#: ../src/camel/providers/nntp/camel-nntp-store.c:422
-#: ../src/libebackend/e-server-side-source.c:501
-#: ../src/libedataserver/e-client.c:188
-#: ../src/libedataserver/e-soup-session.c:1136
+#: ../src/addressbook/libebook/e-book.c:1070
+#: ../src/addressbook/libebook/e-book-client.c:2127
+#: ../src/addressbook/libebook/e-book-client.c:2305
+#: ../src/addressbook/libebook/e-book-client.c:2524
+#: ../src/addressbook/libebook/e-book-client.c:2661
+#: ../src/addressbook/libebook/e-book-client.c:2826
+#: ../src/addressbook/libebook/e-book-client.c:2966
+#: ../src/addressbook/libebook/e-book-client.c:3103
+#: ../src/addressbook/libebook/e-book-client.c:3266
+#: ../src/addressbook/libebook/e-book-client.c:3461
+#: ../src/addressbook/libebook/e-book-client.c:3679
+#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:873
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:264
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:288
+#: ../src/calendar/backends/http/e-cal-backend-http.c:313
+#: ../src/calendar/libecal/e-cal-client.c:257
+#: ../src/calendar/libecal/e-cal-client.c:3230
+#: ../src/calendar/libecal/e-cal-client.c:3403
+#: ../src/calendar/libecal/e-cal-client.c:3676
+#: ../src/calendar/libecal/e-cal-client.c:3914
+#: ../src/calendar/libecal/e-cal-client.c:4106
+#: ../src/calendar/libecal/e-cal-client.c:4289
+#: ../src/calendar/libecal/e-cal-client.c:4497
+#: ../src/calendar/libecal/e-cal-client.c:4674
+#: ../src/calendar/libecal/e-cal-client.c:4885
+#: ../src/calendar/libecal/e-cal-client.c:5041
+#: ../src/calendar/libecal/e-cal-client.c:5241
+#: ../src/calendar/libecal/e-cal-client.c:5407
+#: ../src/calendar/libecal/e-cal-client.c:5634
+#: ../src/calendar/libecal/e-cal-client.c:5794
+#: ../src/calendar/libecal/e-cal-client.c:6025
+#: ../src/calendar/libecal/e-cal-client.c:6224
+#: ../src/calendar/libecal/e-cal-client.c:6592
+#: ../src/calendar/libecal/e-cal-client.c:6816
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1799
+#: ../src/camel/camel-filter-driver.c:1712
+#: ../src/camel/camel-filter-driver.c:1844
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3256
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3262
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3272
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3284
+#: ../src/camel/providers/nntp/camel-nntp-store.c:419
+#: ../src/libebackend/e-server-side-source.c:498
+#: ../src/libedataserver/e-client.c:183
+#: ../src/libedataserver/e-soup-session.c:1224
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:204
-#: ../src/libedataserverui/e-reminders-widget.c:1780
+#: ../src/libedataserverui/e-reminders-widget.c:1788
 #: ../src/tools/list-sources/list-sources.c:429
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1036
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1192
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1077
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1294
 msgid "Server didnâ€™t return objectâ€™s href"
 msgstr ""
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1038
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1194
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1079
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1296
 msgid "Server didnâ€™t return objectâ€™s ETag"
 msgstr ""
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1040
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1081
 msgid "Received object is not a valid vCard"
 msgstr "Vastaanotettu objekti ei ole kelvollinen vCard"
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1147
-#: ../src/addressbook/backends/google/e-book-backend-google.c:1010
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1198
+msgid ""
+"Missing information about vCard URL, local cache is possibly incomplete or "
+"broken. Remove it, please."
+msgstr ""
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1201
+#: ../src/addressbook/backends/google/e-book-backend-google.c:988
 msgid "Object to save is not a valid vCard"
 msgstr "Tallennettava objekti ei ole kelvollinen vCard"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:120
+#: ../src/addressbook/backends/file/e-book-backend-file.c:117
 #, c-format
 msgid "Failed to remove file â€œ%sâ€: %s"
 msgstr "Tiedoston â€œ%sâ€ poistaminen epÃ¤onnistui: %s"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:148
+#: ../src/addressbook/backends/file/e-book-backend-file.c:145
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Kansion \"%s\" luominen epÃ¤onnistui: %s"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:419
+#: ../src/addressbook/backends/file/e-book-backend-file.c:416
 #, fuzzy, c-format
 msgid "Failed to create hardlink for resource â€œ%sâ€: %s"
 msgstr "Lapsiprosessin \"%s\" luominen epÃ¤onnistui: %s"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:524
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1260
+#: ../src/addressbook/backends/file/e-book-backend-file.c:521
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1265
 msgid "No UID in the contact"
 msgstr "UID puuttuu yhteystiedosta"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:856
+#: ../src/addressbook/backends/file/e-book-backend-file.c:858
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr ""
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:994
+#: ../src/addressbook/backends/file/e-book-backend-file.c:988
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:996
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4436
+#: ../src/addressbook/backends/file/e-book-backend-file.c:990
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4543
 msgid "Searching..."
 msgstr "EtsitÃ¤Ã¤n..."
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1288
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1293
 #, c-format
 msgid "Tried to modify contact â€œ%sâ€ with out of sync revision"
 msgstr ""
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1479
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1564
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7365
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7434
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1474
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1560
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3080
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7370
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7439
 #, c-format
 msgid "Contact â€œ%sâ€ not found"
 msgstr "Yhteystietoa â€œ%sâ€ ei lÃ¶ydy"
 
 #: ../src/addressbook/backends/file/e-book-backend-file.c:1624
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1705
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1707
 #, c-format
 msgid "Query â€œ%sâ€ not supported"
 msgstr "Kysely â€œ%sâ€ ei ole tuettu"
 
 #: ../src/addressbook/backends/file/e-book-backend-file.c:1633
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1714
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1716
 #, c-format
 msgid "Invalid Query â€œ%sâ€"
 msgstr "Virheellinen kysely â€œ%sâ€"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1979
-#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2015
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1965
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2037
 msgid "Requested to delete an unrelated cursor"
 msgstr ""
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:2050
+#: ../src/addressbook/backends/file/e-book-backend-file.c:2036
 #, c-format
 msgid "Failed to rename old database from â€œ%sâ€ to â€œ%sâ€: %s"
 msgstr "Vanhan tietokannan â€œ%sâ€ nimen muuttaminen muotoon â€œ%sâ€ epÃ¤onnistui: %s"
 
-#: ../src/addressbook/backends/google/e-book-backend-google.c:1066
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1044
 #, fuzzy
 #| msgid "Failed to authenticate on POP server %s: "
 msgid "Failed to create contact from returned server data"
 msgstr "Tunnistautuminen POP-palvelimelle %s epÃ¤onnistui:"
 
-#: ../src/addressbook/backends/google/e-book-backend-google.c:1082
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1060
 msgid "Server returned contact without UID"
 msgstr "Palvelin palautti yhteystiedon ilman UID:tÃ¤"
 
@@ -215,112 +220,130 @@ 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
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:112
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:109
 msgid "Not connected"
 msgstr "Ei yhteyttÃ¤"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:881
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:876
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr ""
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1005
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1000
 msgid "Reconnecting to LDAP server..."
 msgstr "Odotetaan uudelleen yhteyttÃ¤ LDAP-palvelimeen..."
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1140
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1135
 msgid "Invalid DN syntax"
 msgstr "Virheellinen DN-syntaksi"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1156
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4325
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1151
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4427
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP-virhe 0x%x (%s)"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1772
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2116
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2129
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1794
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2143
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2156
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: ldap_first_entry palautti arvon NULL"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2043
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2190
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2071
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2215
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr ""
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2335
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2474
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2358
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2496
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr ""
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4261
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2646
+msgid "LDAP contact lists cannot be empty."
+msgstr ""
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2684
+#, c-format
+msgid ""
+"Contact lists in LDAP address books require each member to be from the same "
+"LDAP address book, but one member could not be recognized."
+msgid_plural ""
+"Contact lists in LDAP address books require each member to be from the same "
+"LDAP address book, but %d members could not be recognized."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4366
 msgid "Receiving LDAP search results..."
 msgstr "Vastaanotetaan LDAP-haun tuloksia..."
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4462
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4569
 msgid "Error performing search"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4602
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4709
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Ladataan yhteystietoja (%d)..."
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5093
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4810
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:781
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:684
+msgid "Refreshingâ€¦"
+msgstr "PÃ¤ivitetÃ¤Ã¤nâ€¦"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5203
 msgid "The backend does not support bulk additions"
 msgstr "Taustapalvelu ei tue massalisÃ¤yksiÃ¤"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5176
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5294
 msgid "Adding contact to LDAP server..."
 msgstr "LisÃ¤tÃ¤Ã¤n yhteystieto LDAP-palvelimelle..."
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5233
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5356
 msgid "The backend does not support bulk modifications"
 msgstr "Taustapalvelu ei tue massamuokkauksia"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5255
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5378
 msgid "Modifying contact from LDAP server..."
 msgstr "Muokataan yhteystietoa LDAP-palvelimella..."
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5325
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5450
 msgid "Removing contact from LDAP server..."
 msgstr "Poistetaan yhteystieto LDAP-palvelimelta..."
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5743
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5860
 #, fuzzy, c-format
 #| msgid "Failed to get the DN for user '%s'"
 msgid "Failed to get the DN for user â€œ%sâ€"
 msgstr "DN:n hakeminen kÃ¤yttÃ¤jÃ¤lle \"%s\" epÃ¤onnistui"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:38
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:40
 #, fuzzy
 msgid "No such book"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:40
-#: ../src/addressbook/libedata-book/e-data-book.c:382
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:42
 msgid "Contact not found"
 msgstr "Yhteystietoa ei lÃ¶ytynyt"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:42
-#: ../src/addressbook/libedata-book/e-data-book.c:383
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:44
 msgid "Contact ID already exists"
 msgstr "Yhteystiedon tunniste on jo olemassa"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:44
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:46
 msgid "No such source"
 msgstr "LÃ¤hdettÃ¤ ei ole olemassa"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:46
-#: ../src/addressbook/libedata-book/e-data-book.c:399
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:48
 msgid "No space"
 msgstr "Ei tilaa"
 
 #. Dummy row as EContactField starts from 1
-#: ../src/addressbook/libebook-contacts/e-contact.c:128
+#: ../src/addressbook/libebook-contacts/e-contact.c:148
 msgid "Unique ID"
 msgstr "YksilÃ¶llinen tunniste"
 
@@ -328,12 +351,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.
-#: ../src/addressbook/libebook-contacts/e-contact.c:133
+#: ../src/addressbook/libebook-contacts/e-contact.c:153
 msgid "File Under"
 msgstr "Tallenna kohtaan"
 
 #. URI of the book to which the contact belongs to
-#: ../src/addressbook/libebook-contacts/e-contact.c:135
+#: ../src/addressbook/libebook-contacts/e-contact.c:155
 #, fuzzy
 msgid "Book UID"
 msgstr "Kirjan URI"
@@ -342,435 +365,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*)
-#: ../src/addressbook/libebook-contacts/e-contact.c:141
+#: ../src/addressbook/libebook-contacts/e-contact.c:161
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:142
+#: ../src/addressbook/libebook-contacts/e-contact.c:162
 msgid "Given Name"
 msgstr "Sukunimi"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:143
+#: ../src/addressbook/libebook-contacts/e-contact.c:163
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:144
+#: ../src/addressbook/libebook-contacts/e-contact.c:164
 msgid "Nickname"
 msgstr "Lempinimi"
 
 #. Email fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:147
+#: ../src/addressbook/libebook-contacts/e-contact.c:167
 msgid "Email 1"
 msgstr "1. sÃ¤hkÃ¶posti"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:148
+#: ../src/addressbook/libebook-contacts/e-contact.c:168
 msgid "Email 2"
 msgstr "2. sÃ¤hkÃ¶posti"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:149
+#: ../src/addressbook/libebook-contacts/e-contact.c:169
 msgid "Email 3"
 msgstr "3. sÃ¤hkÃ¶posti"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:150
+#: ../src/addressbook/libebook-contacts/e-contact.c:170
 msgid "Email 4"
 msgstr "4. sÃ¤hkÃ¶posti"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:152
+#: ../src/addressbook/libebook-contacts/e-contact.c:172
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. Address Labels
-#: ../src/addressbook/libebook-contacts/e-contact.c:155
+#: ../src/addressbook/libebook-contacts/e-contact.c:175
 msgid "Home Address Label"
 msgstr "Kotiosoite"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:156
+#: ../src/addressbook/libebook-contacts/e-contact.c:176
 msgid "Work Address Label"
 msgstr "TyÃ¶osoite"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:157
+#: ../src/addressbook/libebook-contacts/e-contact.c:177
 msgid "Other Address Label"
 msgstr "Muu osoite"
 
 #. Phone fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:160
+#: ../src/addressbook/libebook-contacts/e-contact.c:180
 msgid "Assistant Phone"
 msgstr "Apulaisen puhelin"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:161
+#: ../src/addressbook/libebook-contacts/e-contact.c:181
 msgid "Business Phone"
 msgstr "TyÃ¶puhelin"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:162
+#: ../src/addressbook/libebook-contacts/e-contact.c:182
 msgid "Business Phone 2"
 msgstr "TyÃ¶puhelin 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:163
+#: ../src/addressbook/libebook-contacts/e-contact.c:183
 msgid "Business Fax"
 msgstr "TyÃ¶/faksi"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:164
+#: ../src/addressbook/libebook-contacts/e-contact.c:184
 msgid "Callback Phone"
 msgstr "Takaisinsoitto"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:165
+#: ../src/addressbook/libebook-contacts/e-contact.c:185
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:166
+#: ../src/addressbook/libebook-contacts/e-contact.c:186
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:167
+#: ../src/addressbook/libebook-contacts/e-contact.c:187
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:168
+#: ../src/addressbook/libebook-contacts/e-contact.c:188
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:169
+#: ../src/addressbook/libebook-contacts/e-contact.c:189
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:170
+#: ../src/addressbook/libebook-contacts/e-contact.c:190
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:171
+#: ../src/addressbook/libebook-contacts/e-contact.c:191
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:172
+#: ../src/addressbook/libebook-contacts/e-contact.c:192
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:173
+#: ../src/addressbook/libebook-contacts/e-contact.c:193
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:174
+#: ../src/addressbook/libebook-contacts/e-contact.c:194
 msgid "Pager"
 msgstr "Pager"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:175
+#: ../src/addressbook/libebook-contacts/e-contact.c:195
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:176
+#: ../src/addressbook/libebook-contacts/e-contact.c:196
 msgid "Radio"
 msgstr "Radio"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:177
+#: ../src/addressbook/libebook-contacts/e-contact.c:197
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../src/addressbook/libebook-contacts/e-contact.c:179
+#: ../src/addressbook/libebook-contacts/e-contact.c:199
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:182
+#: ../src/addressbook/libebook-contacts/e-contact.c:202
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:183
+#: ../src/addressbook/libebook-contacts/e-contact.c:203
 msgid "Organizational Unit"
 msgstr "OrganisaatioyksikkÃ¶"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:184
+#: ../src/addressbook/libebook-contacts/e-contact.c:204
 msgid "Office"
 msgstr "Asema"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:185
+#: ../src/addressbook/libebook-contacts/e-contact.c:205
 msgid "Title"
 msgstr "Titteli"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:186
+#: ../src/addressbook/libebook-contacts/e-contact.c:206
 msgid "Role"
 msgstr "Rooli"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:187
+#: ../src/addressbook/libebook-contacts/e-contact.c:207
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:188
+#: ../src/addressbook/libebook-contacts/e-contact.c:208
 msgid "Assistant"
 msgstr "Apulainen"
 
 #. Web fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:191
+#: ../src/addressbook/libebook-contacts/e-contact.c:211
 msgid "Homepage URL"
 msgstr "Kotisivun URL"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:192
+#: ../src/addressbook/libebook-contacts/e-contact.c:212
 msgid "Weblog URL"
 msgstr "Weblogin URL"
 
 #. Contact categories
-#: ../src/addressbook/libebook-contacts/e-contact.c:195
+#: ../src/addressbook/libebook-contacts/e-contact.c:215
 msgid "Categories"
 msgstr "RyhmÃ¤t"
 
 #. Collaboration fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:198
+#: ../src/addressbook/libebook-contacts/e-contact.c:218
 msgid "Calendar URI"
 msgstr "Kalenterin URL"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:199
+#: ../src/addressbook/libebook-contacts/e-contact.c:219
 msgid "Free/Busy URL"
 msgstr "Vapaa/varattu URL"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:200
+#: ../src/addressbook/libebook-contacts/e-contact.c:220
 msgid "ICS Calendar"
 msgstr "ICS-kalenteri"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:201
+#: ../src/addressbook/libebook-contacts/e-contact.c:221
 msgid "Video Conferencing URL"
 msgstr "Videoneuvottelun URL"
 
 #. Misc fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:204
+#: ../src/addressbook/libebook-contacts/e-contact.c:224
 msgid "Spouseâ€™s Name"
 msgstr "Puolison nimi"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:205
+#: ../src/addressbook/libebook-contacts/e-contact.c:225
 msgid "Note"
 msgstr "Huomio"
 
 #. Instant messaging fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:208
+#: ../src/addressbook/libebook-contacts/e-contact.c:228
 msgid "AIM Home Screen Name 1"
 msgstr "AIM-kotinimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:209
+#: ../src/addressbook/libebook-contacts/e-contact.c:229
 msgid "AIM Home Screen Name 2"
 msgstr "AIM-kotinimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:210
+#: ../src/addressbook/libebook-contacts/e-contact.c:230
 msgid "AIM Home Screen Name 3"
 msgstr "AIM-kotinimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:211
+#: ../src/addressbook/libebook-contacts/e-contact.c:231
 msgid "AIM Work Screen Name 1"
 msgstr "AIM-tyÃ¶nimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:212
+#: ../src/addressbook/libebook-contacts/e-contact.c:232
 msgid "AIM Work Screen Name 2"
 msgstr "AIM-tyÃ¶nimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:213
+#: ../src/addressbook/libebook-contacts/e-contact.c:233
 msgid "AIM Work Screen Name 3"
 msgstr "AIM-tyÃ¶nimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:214
+#: ../src/addressbook/libebook-contacts/e-contact.c:234
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise-kotinimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:215
+#: ../src/addressbook/libebook-contacts/e-contact.c:235
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise-kotinimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:216
+#: ../src/addressbook/libebook-contacts/e-contact.c:236
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise-kotinimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:217
+#: ../src/addressbook/libebook-contacts/e-contact.c:237
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise-tyÃ¶nimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:218
+#: ../src/addressbook/libebook-contacts/e-contact.c:238
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise-tyÃ¶nimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:219
+#: ../src/addressbook/libebook-contacts/e-contact.c:239
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-tyÃ¶nimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:220
+#: ../src/addressbook/libebook-contacts/e-contact.c:240
 msgid "Jabber Home ID 1"
 msgstr "Jabber koti ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:221
+#: ../src/addressbook/libebook-contacts/e-contact.c:241
 msgid "Jabber Home ID 2"
 msgstr "Jabber koti ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:222
+#: ../src/addressbook/libebook-contacts/e-contact.c:242
 msgid "Jabber Home ID 3"
 msgstr "Jabber koti ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:223
+#: ../src/addressbook/libebook-contacts/e-contact.c:243
 msgid "Jabber Work ID 1"
 msgstr "Jabber tyÃ¶ ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:224
+#: ../src/addressbook/libebook-contacts/e-contact.c:244
 msgid "Jabber Work ID 2"
 msgstr "Jabber tyÃ¶ ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:225
+#: ../src/addressbook/libebook-contacts/e-contact.c:245
 msgid "Jabber Work ID 3"
 msgstr "Jabber tyÃ¶ ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:226
+#: ../src/addressbook/libebook-contacts/e-contact.c:246
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!-kotinimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:227
+#: ../src/addressbook/libebook-contacts/e-contact.c:247
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!-kotinimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:228
+#: ../src/addressbook/libebook-contacts/e-contact.c:248
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!-kotinimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:229
+#: ../src/addressbook/libebook-contacts/e-contact.c:249
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!-tyÃ¶nimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:230
+#: ../src/addressbook/libebook-contacts/e-contact.c:250
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!-tyÃ¶nimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:231
+#: ../src/addressbook/libebook-contacts/e-contact.c:251
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!-tyÃ¶nimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:232
+#: ../src/addressbook/libebook-contacts/e-contact.c:252
 msgid "MSN Home Screen Name 1"
 msgstr "MSN-kotinimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:233
+#: ../src/addressbook/libebook-contacts/e-contact.c:253
 msgid "MSN Home Screen Name 2"
 msgstr "MSN-kotinimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:234
+#: ../src/addressbook/libebook-contacts/e-contact.c:254
 msgid "MSN Home Screen Name 3"
 msgstr "MSN-kotinimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:235
+#: ../src/addressbook/libebook-contacts/e-contact.c:255
 msgid "MSN Work Screen Name 1"
 msgstr "MSN-tyÃ¶nimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:236
+#: ../src/addressbook/libebook-contacts/e-contact.c:256
 msgid "MSN Work Screen Name 2"
 msgstr "MSN-tyÃ¶nimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:237
+#: ../src/addressbook/libebook-contacts/e-contact.c:257
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:238
+#: ../src/addressbook/libebook-contacts/e-contact.c:258
 msgid "ICQ Home ID 1"
 msgstr "ICQ koti ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:239
+#: ../src/addressbook/libebook-contacts/e-contact.c:259
 msgid "ICQ Home ID 2"
 msgstr "ICQ koti ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:240
+#: ../src/addressbook/libebook-contacts/e-contact.c:260
 msgid "ICQ Home ID 3"
 msgstr "ICQ koti ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:241
+#: ../src/addressbook/libebook-contacts/e-contact.c:261
 msgid "ICQ Work ID 1"
 msgstr "ICQ tyÃ¶ ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:242
+#: ../src/addressbook/libebook-contacts/e-contact.c:262
 msgid "ICQ Work ID 2"
 msgstr "ICQ tyÃ¶ ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:243
+#: ../src/addressbook/libebook-contacts/e-contact.c:263
 msgid "ICQ Work ID 3"
 msgstr "ICQ tyÃ¶ ID 3"
 
 #. Last modified time
-#: ../src/addressbook/libebook-contacts/e-contact.c:246
+#: ../src/addressbook/libebook-contacts/e-contact.c:266
 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.
-#: ../src/addressbook/libebook-contacts/e-contact.c:250
+#: ../src/addressbook/libebook-contacts/e-contact.c:270
 msgid "Name or Org"
 msgstr "Nimi tai Org"
 
 #. Address fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:253
+#: ../src/addressbook/libebook-contacts/e-contact.c:273
 msgid "Address List"
 msgstr "Osoitelista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:254
+#: ../src/addressbook/libebook-contacts/e-contact.c:274
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:255
+#: ../src/addressbook/libebook-contacts/e-contact.c:275
 msgid "Work Address"
 msgstr "TyÃ¶osoite"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:256
+#: ../src/addressbook/libebook-contacts/e-contact.c:276
 msgid "Other Address"
 msgstr "Muu osoite"
 
 #. Contact categories
-#: ../src/addressbook/libebook-contacts/e-contact.c:259
+#: ../src/addressbook/libebook-contacts/e-contact.c:279
 msgid "Category List"
 msgstr "RyhmÃ¤luettelo"
 
 #. Photo/Logo
-#: ../src/addressbook/libebook-contacts/e-contact.c:262
+#: ../src/addressbook/libebook-contacts/e-contact.c:282
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:263
+#: ../src/addressbook/libebook-contacts/e-contact.c:283
 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
-#: ../src/addressbook/libebook-contacts/e-contact.c:267
+#: ../src/addressbook/libebook-contacts/e-contact.c:287
 #: ../src/libedataserverui/e-webdav-discover-widget.c:151
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:268
+#: ../src/addressbook/libebook-contacts/e-contact.c:288
 msgid "Email List"
 msgstr "SÃ¤hkÃ¶postilista"
 
 #. Instant messaging fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:271
+#: ../src/addressbook/libebook-contacts/e-contact.c:291
 msgid "AIM Screen Name List"
 msgstr "AIM nÃ¤yttÃ¶nimien lista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:272
+#: ../src/addressbook/libebook-contacts/e-contact.c:292
 msgid "GroupWise ID List"
 msgstr "GroupWise-ID-lista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:273
+#: ../src/addressbook/libebook-contacts/e-contact.c:293
 msgid "Jabber ID List"
 msgstr "Jabber-ID-lista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:274
+#: ../src/addressbook/libebook-contacts/e-contact.c:294
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo!-nÃ¤yttÃ¶nimien lista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:275
+#: ../src/addressbook/libebook-contacts/e-contact.c:295
 msgid "MSN Screen Name List"
 msgstr "MSN-nÃ¤yttÃ¶nimien lista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:276
+#: ../src/addressbook/libebook-contacts/e-contact.c:296
 msgid "ICQ ID List"
 msgstr "ICQ ID lista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:278
+#: ../src/addressbook/libebook-contacts/e-contact.c:298
 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/...
-#: ../src/addressbook/libebook-contacts/e-contact.c:283
+#: ../src/addressbook/libebook-contacts/e-contact.c:303
 msgid "List"
 msgstr "Lista"
 
@@ -778,132 +801,132 @@ 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.
-#: ../src/addressbook/libebook-contacts/e-contact.c:288
+#: ../src/addressbook/libebook-contacts/e-contact.c:308
 #, fuzzy
 msgid "List Shows Addresses"
 msgstr "Lista nÃ¤ytettÃ¤vistÃ¤ osoitteista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:290
+#: ../src/addressbook/libebook-contacts/e-contact.c:310
 msgid "Birth Date"
 msgstr "SyntymÃ¤pÃ¤ivÃ¤"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:291
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:936
+#: ../src/addressbook/libebook-contacts/e-contact.c:311
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:957
 msgid "Anniversary"
 msgstr "VuosipÃ¤ivÃ¤"
 
 #. Security fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:294
+#: ../src/addressbook/libebook-contacts/e-contact.c:314
 msgid "X.509 Certificate"
 msgstr "X.509-varmenne"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:295
+#: ../src/addressbook/libebook-contacts/e-contact.c:315
 msgid "PGP Certificate"
 msgstr "PGP-varmenne"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:297
+#: ../src/addressbook/libebook-contacts/e-contact.c:317
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu koti ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:298
+#: ../src/addressbook/libebook-contacts/e-contact.c:318
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu koti ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:299
+#: ../src/addressbook/libebook-contacts/e-contact.c:319
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu koti ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:300
+#: ../src/addressbook/libebook-contacts/e-contact.c:320
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu tyÃ¶ ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:301
+#: ../src/addressbook/libebook-contacts/e-contact.c:321
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu tyÃ¶ ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:302
+#: ../src/addressbook/libebook-contacts/e-contact.c:322
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu tyÃ¶ ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:303
+#: ../src/addressbook/libebook-contacts/e-contact.c:323
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID lista"
 
 #. Geo information
-#: ../src/addressbook/libebook-contacts/e-contact.c:306
+#: ../src/addressbook/libebook-contacts/e-contact.c:326
 msgid "Geographic Information"
 msgstr "Maantieteelliset tiedot"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:308
+#: ../src/addressbook/libebook-contacts/e-contact.c:328
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:310
+#: ../src/addressbook/libebook-contacts/e-contact.c:330
 msgid "Skype Home Name 1"
 msgstr "Skype-kotinimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:311
+#: ../src/addressbook/libebook-contacts/e-contact.c:331
 msgid "Skype Home Name 2"
 msgstr "Skype-kotinimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:312
+#: ../src/addressbook/libebook-contacts/e-contact.c:332
 msgid "Skype Home Name 3"
 msgstr "Skype-kotinimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:313
+#: ../src/addressbook/libebook-contacts/e-contact.c:333
 msgid "Skype Work Name 1"
 msgstr "Skype-tyÃ¶nimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:314
+#: ../src/addressbook/libebook-contacts/e-contact.c:334
 msgid "Skype Work Name 2"
 msgstr "Skype-tyÃ¶nimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:315
+#: ../src/addressbook/libebook-contacts/e-contact.c:335
 msgid "Skype Work Name 3"
 msgstr "Skype-tyÃ¶nimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:316
+#: ../src/addressbook/libebook-contacts/e-contact.c:336
 msgid "Skype Name List"
 msgstr "Skype-nimilista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:318
+#: ../src/addressbook/libebook-contacts/e-contact.c:338
 msgid "SIP address"
 msgstr "SIP-osoite"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:320
+#: ../src/addressbook/libebook-contacts/e-contact.c:340
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk -kotinimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:321
+#: ../src/addressbook/libebook-contacts/e-contact.c:341
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk -kotinimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:322
+#: ../src/addressbook/libebook-contacts/e-contact.c:342
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk -kotinimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:323
+#: ../src/addressbook/libebook-contacts/e-contact.c:343
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk -tyÃ¶nimi 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:324
+#: ../src/addressbook/libebook-contacts/e-contact.c:344
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk -tyÃ¶nimi 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:325
+#: ../src/addressbook/libebook-contacts/e-contact.c:345
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk -tyÃ¶nimi 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:326
+#: ../src/addressbook/libebook-contacts/e-contact.c:346
 msgid "Google Talk Name List"
 msgstr "Google Talk -nimilista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:328
+#: ../src/addressbook/libebook-contacts/e-contact.c:348
 msgid "Twitter Name List"
 msgstr "Twitter-nimilista"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:1658
-#: ../src/addressbook/libebook/e-destination.c:919
+#: ../src/addressbook/libebook-contacts/e-contact.c:1911
+#: ../src/addressbook/libebook/e-destination.c:914
 msgid "Unnamed List"
 msgstr "NimeÃ¤mÃ¤tÃ¶n lista"
 
@@ -938,40 +961,46 @@ msgstr "Teksti on liian lyhyt puhelinnumeroksi"
 msgid "Text is too long for a phone number"
 msgstr "Teksti on liian pitkÃ¤ puhelinnumeroksi"
 
-#: ../src/addressbook/libebook/e-book-client.c:929
+#: ../src/addressbook/libebook/e-book-client.c:927
 #, c-format
 msgid "Unknown book property â€œ%sâ€"
 msgstr "Tuntematon kirjan ominaisuus â€œ%sâ€"
 
-#: ../src/addressbook/libebook/e-book-client.c:944
+#: ../src/addressbook/libebook/e-book-client.c:942
 #, fuzzy, c-format
 msgid "Cannot change value of book property â€œ%sâ€"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../src/addressbook/libebook/e-book-client.c:1388
-#: ../src/addressbook/libebook/e-book-client.c:1619
-#: ../src/addressbook/libebook/e-book-client.c:1896
-#: ../src/calendar/libecal/e-cal-client.c:1715
-#: ../src/calendar/libecal/e-cal-client.c:1953
+#: ../src/addressbook/libebook/e-book-client.c:1384
+#: ../src/addressbook/libebook/e-book-client.c:1615
+#: ../src/addressbook/libebook/e-book-client.c:1892
+#: ../src/calendar/libecal/e-cal-client.c:1709
+#: ../src/calendar/libecal/e-cal-client.c:1947
 #, c-format
 msgid "Unable to connect to â€œ%sâ€: "
 msgstr "Ei voitu muodostaa yhteyttÃ¤ kohteeseen â€œ%sâ€: "
 
-#: ../src/addressbook/libebook/e-book-client-view.c:868
-#: ../src/calendar/libecal/e-cal-client-view.c:679
+#: ../src/addressbook/libebook/e-book-client-view.c:869
+#: ../src/calendar/libecal/e-cal-client-view.c:675
 #, c-format
 msgid "Client disappeared"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:2255
+#: ../src/addressbook/libedata-book/e-book-backend.c:3253
+#, fuzzy, c-format
+#| msgid "The backend does not support bulk removals"
+msgid "Addressbook backend does not support cursors"
+msgstr "Taustapalvelu ei tue massapoistoja"
+
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:899
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:2253
 #, c-format
 msgid "Error introspecting unknown summary field â€œ%sâ€"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../src/addressbook/libedata-book/e-book-cache.c:543
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1394
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1508
+#: ../src/addressbook/libedata-book/e-book-cache.c:549
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1392
 #, fuzzy
 #| msgid ""
 #| "Error executing search expression: %s:\n"
@@ -981,439 +1010,321 @@ msgstr ""
 "Virhe suoritettaessa hakulauseketta: %s:\n"
 "%s"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../src/addressbook/libedata-book/e-book-cache.c:4522
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1878
-#: ../src/camel/camel-db.c:820
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1553
+#: ../src/addressbook/libedata-book/e-book-cache.c:4586
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1876
+#: ../src/camel/camel-db.c:818
 #, c-format
 msgid "Insufficient memory"
 msgstr "Muisti ei riitÃ¤"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1690
 #, c-format
 msgid "Invalid contact field â€œ%dâ€ specified in summary"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
-#: ../src/addressbook/libedata-book/e-book-cache.c:366
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:605
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1724
+#: ../src/addressbook/libedata-book/e-book-cache.c:372
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:603
 #, c-format
 msgid ""
 "Contact field â€œ%sâ€ of type â€œ%sâ€ specified in summary, but only boolean, "
 "string and string list field types are supported"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4177
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3068
+#: ../src/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 ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4308
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4401
-#: ../src/addressbook/libedata-book/e-book-cache.c:3441
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5840
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
+#: ../src/addressbook/libedata-book/e-book-cache.c:3468
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5847
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4312
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4304
 #, c-format
 msgid "Invalid Query"
 msgstr "Virheellinen kysely"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4336
+#: ../src/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 ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4405
-#: ../src/addressbook/libedata-book/e-data-book.c:394
-#: ../src/addressbook/libedata-book/e-data-book.c:1144
-#: ../src/calendar/libedata-cal/e-data-cal.c:429
-#: ../src/calendar/libedata-cal/e-data-cal.c:1436
-#: ../src/libedataserver/e-client.c:175
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4397
+#: ../src/addressbook/libedata-book/e-data-book.c:868
+#: ../src/calendar/libedata-cal/e-data-cal.c:1143
+#: ../src/libedataserver/e-client.c:170
 #, c-format
 msgid "Invalid query"
 msgstr "Virheellinen kysely"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4448
+#: ../src/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 ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5271
+#: ../src/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"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6058
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6458
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6050
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6450
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6065
+#: ../src/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 ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6079
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6071
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6086
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
-#: ../src/addressbook/libedata-book/e-book-cache.c:5608
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8139
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../src/addressbook/libedata-book/e-book-cache.c:5797
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8144
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
 "the contact list"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6227
-#: ../src/addressbook/libedata-book/e-book-cache.c:5615
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8147
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
+#: ../src/addressbook/libedata-book/e-book-cache.c:5804
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8152
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
 "contact list"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:331
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:571
+#: ../src/addressbook/libedata-book/e-book-cache.c:337
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:569
 #, c-format
 msgid "Unsupported contact field â€œ%dâ€ specified in summary"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:3436
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5833
-#: ../src/calendar/libedata-cal/e-cal-cache.c:1621
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3314
+#: ../src/addressbook/libedata-book/e-book-cache.c:3463
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5840
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1654
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3518
 #, c-format
 msgid "Invalid query: %s"
 msgstr "Virheellinen kysely: %s"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:3606
+#: ../src/addressbook/libedata-book/e-book-cache.c:3648
 #, fuzzy
 #| msgid "Invalid query: "
 msgid "Invalid query for a book cursor"
 msgstr "Virheellinen haku: "
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:4526
+#: ../src/addressbook/libedata-book/e-book-cache.c:4590
 #: ../src/libebackend/e-cache.c:759
 #, c-format
 msgid "Canâ€™t open database %s: %s"
 msgstr "Tietokantaa %s ei voi avata: %s"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5129
-#: ../src/addressbook/libedata-book/e-book-cache.c:5181
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2730
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2793
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2964
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1342
-#: ../src/libebackend/e-cache.c:1374 ../src/libebackend/e-cache.c:2298
-#: ../src/libebackend/e-cache.c:2338
+#: ../src/addressbook/libedata-book/e-book-cache.c:5224
+#: ../src/addressbook/libedata-book/e-book-cache.c:5271
+#: ../src/addressbook/libedata-book/e-book-cache.c:5318
+#: ../src/addressbook/libedata-book/e-book-cache.c:5370
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2800
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2858
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2917
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2980
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3151
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1362
+#: ../src/libebackend/e-cache.c:1374 ../src/libebackend/e-cache.c:2352
+#: ../src/libebackend/e-cache.c:2392
 #, c-format
 msgid "Object â€œ%sâ€ not found"
 msgstr "Objektia â€œ%sâ€ ei lÃ¶ydy"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5241
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2855
+#: ../src/addressbook/libedata-book/e-book-cache.c:5430
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3042
 #, fuzzy, c-format
 #| msgid "Contact â€œ%sâ€ not found"
 msgid "Object with extra â€œ%sâ€ not found"
 msgstr "Yhteystietoa â€œ%sâ€ ei lÃ¶ydy"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5395
+#: ../src/addressbook/libedata-book/e-book-cache.c:5584
 msgid "At least one sort field must be specified to use a cursor"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5404
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7979
+#: ../src/addressbook/libedata-book/e-book-cache.c:5593
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7984
 msgid "Cannot sort by a field that is not a string type"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1050
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1063
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1073
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1085
 #, c-format
 msgid "Preloaded object for UID â€œ%sâ€ is invalid"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1058
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1071
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1081
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1093
 #, c-format
 msgid "Received object for UID â€œ%sâ€ is invalid"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1885
-#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2333
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3210
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1907
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2354
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3295
 #, fuzzy, c-format
 #| msgid "Failed to create child process '%s': %s"
 msgid "Failed to create cache â€œ%sâ€:"
 msgstr "Lapsiprosessin \"%s\" luominen epÃ¤onnistui: %s"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1951
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1949
 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 ""
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:6008
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:6015
 #, fuzzy
 #| msgid "Invalid query: "
 msgid "Invalid query for EbSqlCursor"
 msgstr "Virheellinen haku: "
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7961
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7966
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-data-book.c:378
-#: ../src/calendar/libedata-cal/e-data-cal.c:410
-msgid "Success"
-msgstr "Valmis"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:379
-#: ../src/calendar/libecal/e-cal.c:2302
-#: ../src/calendar/libedata-cal/e-data-cal.c:411
-#: ../src/libedataserver/e-client.c:142
-msgid "Backend is busy"
-msgstr "TaustajÃ¤rjestelmÃ¤ on kÃ¤ytÃ¶ssÃ¤"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:380
-#: ../src/calendar/libedata-cal/e-data-cal.c:412
-#: ../src/libedataserver/e-client.c:152
-msgid "Repository offline"
-msgstr "LÃ¤hde poissa kÃ¤ytÃ¶stÃ¤"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:381
-#: ../src/calendar/libecal/e-cal.c:2316
-#: ../src/calendar/libedata-cal/e-data-cal.c:413
-#: ../src/libedataserver/e-client.c:159
-msgid "Permission denied"
-msgstr "Lupa evÃ¤tty"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:384
-#: ../src/calendar/libedata-cal/e-data-cal.c:418
-msgid "Authentication Failed"
-msgstr "Tunnistus epÃ¤onnistui"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:385
-#: ../src/calendar/libedata-cal/e-data-cal.c:419
-msgid "Authentication Required"
-msgstr "Tunnistautuminen vaaditaan"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:386
-#: ../src/calendar/libedata-cal/e-data-cal.c:420
-msgid "Unsupported field"
-msgstr "KenttÃ¤ ei ole tuettu"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:387
-#: ../src/calendar/libedata-cal/e-data-cal.c:422
-#: ../src/libedataserver/e-client.c:167
-msgid "Unsupported authentication method"
-msgstr "TunnistautumismenetelmÃ¤ ei ole tuettu"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:388
-#: ../src/calendar/libedata-cal/e-data-cal.c:423
-#: ../src/libedataserver/e-client.c:169
-msgid "TLS not available"
-msgstr "TLS ei kÃ¤ytettÃ¤vissÃ¤"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:389
-msgid "Address book does not exist"
-msgstr "Osoitekirjaa ei ole olemassa"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:390
-msgid "Book removed"
-msgstr "Kirja poistettu"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:391
-#: ../src/calendar/libedata-cal/e-data-cal.c:426
-msgid "Not available in offline mode"
-msgstr "Ei kÃ¤ytettÃ¤vissÃ¤ yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:392
-#: ../src/calendar/libedata-cal/e-data-cal.c:427
-#: ../src/libedataserver/e-client.c:171
-msgid "Search size limit exceeded"
-msgstr "Haun kokorajoitus ylitettiin"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:393
-#: ../src/calendar/libedata-cal/e-data-cal.c:428
-#: ../src/libedataserver/e-client.c:173
-msgid "Search time limit exceeded"
-msgstr "Haun aikaraja ylitettiin"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:395
-#: ../src/calendar/libedata-cal/e-data-cal.c:430
-#: ../src/libedataserver/e-client.c:177
-msgid "Query refused"
-msgstr "KyselyÃ¤ ei hyvÃ¤ksytty"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:396
-#: ../src/calendar/libedata-cal/e-data-cal.c:431
-#: ../src/libedataserver/e-client.c:163
-msgid "Could not cancel"
-msgstr "Ei voi perua"
-
-#. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
-#. { OtherError,                       N_("Other error") },
-#: ../src/addressbook/libedata-book/e-data-book.c:398
-#: ../src/calendar/libedata-cal/e-data-cal.c:433
-msgid "Invalid server version"
-msgstr "Virheellinen palvelimen versio"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:400
-#: ../src/calendar/libecal/e-cal.c:2300
-#: ../src/calendar/libedata-cal/e-data-cal.c:434
-#: ../src/libedataserver/e-client.c:140
-msgid "Invalid argument"
-msgstr "Virheellinen argumentti"
-
-#. Translators: The string for NOT_SUPPORTED error
-#: ../src/addressbook/libedata-book/e-data-book.c:402
-#: ../src/calendar/libecal/e-cal.c:1057 ../src/calendar/libecal/e-cal.c:1425
-#: ../src/calendar/libecal/e-cal.c:1907 ../src/calendar/libecal/e-cal.c:2339
-#: ../src/calendar/libedata-cal/e-data-cal.c:436
-#: ../src/libedataserver/e-client.c:165
-#, c-format
-msgid "Not supported"
-msgstr "Ei tuettu"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:403
-#: ../src/calendar/libedata-cal/e-data-cal.c:437
-#: ../src/libedataserver/e-client.c:183
-msgid "Backend is not opened yet"
-msgstr "Taustapalvelu ei vielÃ¤ kÃ¤ynnissÃ¤"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:404
-#: ../src/libedataserver/e-client.c:185
-#, fuzzy
-#| msgid "Object not found"
-msgid "Object is out of sync"
-msgstr "Kohdetta ei lÃ¶ydy"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:412
-#: ../src/calendar/libedata-cal/e-data-cal.c:445
-#: ../src/libedataserver/e-client.c:181
-msgid "Other error"
-msgstr "Muu virhe"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:1169
-#: ../src/calendar/libedata-cal/e-data-cal.c:1461
+#: ../src/addressbook/libedata-book/e-data-book.c:893
+#: ../src/calendar/libedata-cal/e-data-cal.c:1168
 msgid "Invalid query: "
 msgstr "Virheellinen haku: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1418
+#: ../src/addressbook/libedata-book/e-data-book.c:1142
 msgid "Cannot open book: "
 msgstr "Kirjan avaaminen epÃ¤onnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1456
+#: ../src/addressbook/libedata-book/e-data-book.c:1180
 msgid "Cannot refresh address book: "
 msgstr "Osoitekirjan pÃ¤ivitys epÃ¤onnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1497
+#: ../src/addressbook/libedata-book/e-data-book.c:1221
 msgid "Cannot get contact: "
 msgstr "Yhteystiedon hakeminen epÃ¤onnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1546
+#: ../src/addressbook/libedata-book/e-data-book.c:1266
 msgid "Cannot get contact list: "
 msgstr "Yhteystietoluettelon haku epÃ¤onnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1602
+#: ../src/addressbook/libedata-book/e-data-book.c:1318
 #, 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
-#: ../src/addressbook/libedata-book/e-data-book.c:1653
+#: ../src/addressbook/libedata-book/e-data-book.c:1369
 msgid "Cannot add contact: "
 msgstr "Yhteystiedon lisÃ¤ys epÃ¤onnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1706
+#: ../src/addressbook/libedata-book/e-data-book.c:1420
 msgid "Cannot modify contacts: "
 msgstr "Yhteystietojen muokkaaminen epÃ¤onnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1759
+#: ../src/addressbook/libedata-book/e-data-book.c:1472
 msgid "Cannot remove contacts: "
 msgstr "Yhteystietojen poisto epÃ¤onnistui: "
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:777
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:771
 msgid "Cursor does not support setting the search expression"
 msgstr ""
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:864
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:858
 #, fuzzy
 #| msgid "Store does not support an INBOX"
 msgid "Cursor does not support step"
 msgstr "Kansio ei tue INBOXia"
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:940
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:934
 #, fuzzy
 msgid "Cursor does not support alphabetic indexes"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmÃ¤Ã¤ %s"
 
 #: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:92
-#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:266
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:260
 msgid "Unrecognized cursor origin"
 msgstr ""
 
 #: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:151
-#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:334
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:328
 msgid "Out of sync revision while moving cursor"
 msgstr ""
 
 #: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:222
-#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:428
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:422
 msgid "Alphabetic index was set for incorrect locale"
 msgstr ""
 
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:206
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:207
 #, c-format
 msgid "Given URL â€œ%sâ€ doesnâ€™t reference CalDAV calendar"
 msgstr "Annettu osoite â€œ%sâ€ ei viittaa CalDAV-kalenteriin"
 
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1783
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1431
+msgid ""
+"Missing information about component URL, local cache is possibly incomplete "
+"or broken. Remove it, please."
+msgstr ""
+
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1907
 #, fuzzy
 #| msgid "Failed to encode data"
 msgid "Failed to parse response data"
 msgstr "Tiedon koodaus epÃ¤onnistui"
 
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:938
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:959
 msgid "Birthday"
 msgstr "SyntymÃ¤pÃ¤ivÃ¤"
 
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:974
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:995
 #, c-format
 msgid "Birthday: %s"
 msgstr "SyntymÃ¤pÃ¤ivÃ¤: %s"
 
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1005
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1026
 #, c-format
 msgid "Anniversary: %s"
 msgstr "VuosipÃ¤ivÃ¤: %s"
 
+#: ../src/calendar/backends/file/e-cal-backend-file.c:43
+#, fuzzy
+#| msgid "Cannot get contact: "
+msgid "Cannot get URI"
+msgstr "Yhteystiedon hakeminen epÃ¤onnistui: "
+
 #: ../src/calendar/backends/file/e-cal-backend-file.c:243
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Kalenteritietoja ei voi tallentaa: virheellinen URI."
@@ -1423,353 +1334,326 @@ msgstr "Kalenteritietoja ei voi tallentaa: virheellinen URI."
 msgid "Cannot save calendar data"
 msgstr "Kalenteritietoja ei voi tallentaa"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:141
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1185
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1314
+#, fuzzy, c-format
+#| msgid "Cannot get folder: %s: %s"
+msgid "Cannot parse ISC file â€œ%sâ€"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1196
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1325
+#, c-format
+msgid "File â€œ%sâ€ is not a VCALENDAR component"
+msgstr "Tiedosto â€œ%sâ€ ei ole VCALENDAR-komponentti"
+
+#. FIXME This should be doable once all the recurid stuff is done
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3636
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3642
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3648
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3675
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:2531
+msgid "Unsupported method"
+msgstr "MenetelmÃ¤ ei ole tuettu"
+
+#: ../src/calendar/backends/http/e-cal-backend-http.c:227
 #, fuzzy
 #| msgid "URI not loaded"
 msgid "URI not set"
 msgstr "URIa ei ole ladattu"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:209
+#: ../src/calendar/backends/http/e-cal-backend-http.c:312
 #, fuzzy, c-format
 #| msgid "Malformed URI: %s"
 msgid "Malformed URI â€œ%sâ€: %s"
 msgstr "Virheellinen URI: %s"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:372
+#: ../src/calendar/backends/http/e-cal-backend-http.c:459
 #, c-format
 msgid "Bad file format."
 msgstr "Virheellinen tiedostomuoto."
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:381
+#: ../src/calendar/backends/http/e-cal-backend-http.c:468
 #, c-format
 msgid "Not a calendar."
 msgstr "Ei kalenteri."
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:196
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "SÃ¤Ã¤tietoja ei voitu hakea"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:379
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:349
 msgid "Weather: Fog"
 msgstr "SÃ¤Ã¤: sumuista"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:380
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:350
 msgid "Weather: Cloudy Night"
 msgstr "SÃ¤Ã¤: pilvinen yÃ¶"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:381
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:351
 msgid "Weather: Cloudy"
 msgstr "SÃ¤Ã¤: pilvistÃ¤"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:382
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:352
 msgid "Weather: Overcast"
 msgstr "SÃ¤Ã¤: poutaista"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:383
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:353
 msgid "Weather: Showers"
 msgstr "SÃ¤Ã¤: sadekuuroja"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:384
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:354
 msgid "Weather: Snow"
 msgstr "SÃ¤Ã¤: sadetta"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:385
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:355
 msgid "Weather: Clear Night"
 msgstr "SÃ¤Ã¤: kirkas yÃ¶"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:386
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:356
 msgid "Weather: Sunny"
 msgstr "SÃ¤Ã¤: Aurinkoista"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:387
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:357
 msgid "Weather: Thunderstorms"
 msgstr "SÃ¤Ã¤: ukkosta"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:413
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:383
 #, c-format
 msgid "%.1f Â°F"
 msgstr "%.1f Â°F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:416
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:386
 #, c-format
 msgid "%.1f Â°C"
 msgstr "%.1f Â°C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:419
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:389
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:425
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:395
 #, c-format
 msgid "%.1f"
 msgstr "%.1f"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:590
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:618
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:558
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:586
 msgid "Forecast"
 msgstr "SÃ¤Ã¤ennuste"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:710
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:682
 msgid "Could not create cache file"
 msgstr "VÃ¤limuistitiedostoa ei voitu luoda"
 
-#: ../src/calendar/libecal/e-cal.c:2304
-msgid "Repository is offline"
-msgstr "Varasto on yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:684
+#, fuzzy
+#| msgid "Could not create cache file"
+msgid "Could not create cache file: "
+msgstr "VÃ¤limuistitiedostoa ei voitu luoda"
 
-#: ../src/calendar/libecal/e-cal.c:2306
-#: ../src/calendar/libecal/e-cal-client.c:264
+#: ../src/calendar/libecal/e-cal-client.c:244
 msgid "No such calendar"
 msgstr "Kalenteria ei ole olemassa"
 
-#: ../src/calendar/libecal/e-cal.c:2308
-#: ../src/calendar/libecal/e-cal-client.c:266
-#: ../src/calendar/libedata-cal/e-data-cal.c:415
+#: ../src/calendar/libecal/e-cal-client.c:246
 msgid "Object not found"
 msgstr "Kohdetta ei lÃ¶ydy"
 
-#: ../src/calendar/libecal/e-cal.c:2310
-#: ../src/calendar/libecal/e-cal-client.c:268
-#: ../src/calendar/libedata-cal/e-data-cal.c:416
+#: ../src/calendar/libecal/e-cal-client.c:248
 msgid "Invalid object"
 msgstr "Virheellinen kohde"
 
-#: ../src/calendar/libecal/e-cal.c:2312
-msgid "URI not loaded"
-msgstr "URIa ei ole ladattu"
-
-#: ../src/calendar/libecal/e-cal.c:2314
-msgid "URI already loaded"
-msgstr "URI on jo ladattu"
-
-#: ../src/calendar/libecal/e-cal.c:2318
-msgid "Unknown User"
+#: ../src/calendar/libecal/e-cal-client.c:250
+msgid "Unknown user"
 msgstr "Tuntematon kÃ¤yttÃ¤jÃ¤"
 
-#: ../src/calendar/libecal/e-cal.c:2320
-#: ../src/calendar/libecal/e-cal-client.c:272
-#: ../src/calendar/libedata-cal/e-data-cal.c:417
+#: ../src/calendar/libecal/e-cal-client.c:252
 msgid "Object ID already exists"
 msgstr "OID on jo olemassa"
 
-#: ../src/calendar/libecal/e-cal.c:2322
-msgid "Protocol not supported"
-msgstr "Protokolla ei ole tuettu"
-
-#: ../src/calendar/libecal/e-cal.c:2324
-msgid "Operation has been cancelled"
-msgstr "Toimenpide on peruttu"
-
-#: ../src/calendar/libecal/e-cal.c:2326
-msgid "Could not cancel operation"
-msgstr "ToimenpidettÃ¤ ei voitu perua"
-
-#: ../src/calendar/libecal/e-cal.c:2328 ../src/libedataserver/e-client.c:148
-msgid "Authentication failed"
-msgstr "Todennus epÃ¤onnistui"
-
-#: ../src/calendar/libecal/e-cal.c:2330
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1124
-#: ../src/libedataserver/e-client.c:150
-msgid "Authentication required"
-msgstr "Todennus vaaditaan"
-
-#: ../src/calendar/libecal/e-cal.c:2332
-msgid "A D-Bus exception has occurred"
-msgstr "Tapahtui D-Bus-poikkeus"
-
-#: ../src/calendar/libecal/e-cal.c:2336
-msgid "No error"
-msgstr "Ei virhettÃ¤"
-
-#: ../src/calendar/libecal/e-cal-client.c:270
-#: ../src/calendar/libedata-cal/e-data-cal.c:425
-msgid "Unknown user"
-msgstr "Tuntematon kÃ¤yttÃ¤jÃ¤"
-
-#: ../src/calendar/libecal/e-cal-client.c:274
-#: ../src/calendar/libedata-cal/e-data-cal.c:414
+#: ../src/calendar/libecal/e-cal-client.c:254
 msgid "Invalid range"
 msgstr "Virheellinen alue"
 
-#: ../src/calendar/libecal/e-cal-client.c:1063
+#: ../src/calendar/libecal/e-cal-client.c:1073
 #, c-format
 msgid "Unknown calendar property â€œ%sâ€"
 msgstr "Tuntematon kalenteriominaisuus â€œ%sâ€"
 
-#: ../src/calendar/libecal/e-cal-client.c:1078
+#: ../src/calendar/libecal/e-cal-client.c:1088
 #, c-format
 msgid "Cannot change value of calendar property â€œ%sâ€"
 msgstr "Kalenteriominaisuuden â€œ%sâ€ arvon muuttaminen ei onnistu"
 
-#: ../src/calendar/libecal/e-cal-component.c:1330
+#: ../src/calendar/libecal/e-cal-component.c:716
 msgid "Untitled appointment"
 msgstr "NimeÃ¤mÃ¤tÃ¶n tapaaminen"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4751
+#: ../src/calendar/libecal/e-cal-recur.c:4883
 msgid "1st"
 msgstr "1."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4752
+#: ../src/calendar/libecal/e-cal-recur.c:4884
 msgid "2nd"
 msgstr "2."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4753
+#: ../src/calendar/libecal/e-cal-recur.c:4885
 msgid "3rd"
 msgstr "3."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4754
+#: ../src/calendar/libecal/e-cal-recur.c:4886
 msgid "4th"
 msgstr "4."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4755
+#: ../src/calendar/libecal/e-cal-recur.c:4887
 msgid "5th"
 msgstr "5."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4756
+#: ../src/calendar/libecal/e-cal-recur.c:4888
 msgid "6th"
 msgstr "6."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4757
+#: ../src/calendar/libecal/e-cal-recur.c:4889
 msgid "7th"
 msgstr "7."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4758
+#: ../src/calendar/libecal/e-cal-recur.c:4890
 msgid "8th"
 msgstr "8."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4759
+#: ../src/calendar/libecal/e-cal-recur.c:4891
 msgid "9th"
 msgstr "9."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4760
+#: ../src/calendar/libecal/e-cal-recur.c:4892
 msgid "10th"
 msgstr "10."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4761
+#: ../src/calendar/libecal/e-cal-recur.c:4893
 msgid "11th"
 msgstr "11."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4762
+#: ../src/calendar/libecal/e-cal-recur.c:4894
 msgid "12th"
 msgstr "12."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4763
+#: ../src/calendar/libecal/e-cal-recur.c:4895
 msgid "13th"
 msgstr "13."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4764
+#: ../src/calendar/libecal/e-cal-recur.c:4896
 msgid "14th"
 msgstr "14."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4765
+#: ../src/calendar/libecal/e-cal-recur.c:4897
 msgid "15th"
 msgstr "15."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4766
+#: ../src/calendar/libecal/e-cal-recur.c:4898
 msgid "16th"
 msgstr "16."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4767
+#: ../src/calendar/libecal/e-cal-recur.c:4899
 msgid "17th"
 msgstr "17."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4768
+#: ../src/calendar/libecal/e-cal-recur.c:4900
 msgid "18th"
 msgstr "18."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4769
+#: ../src/calendar/libecal/e-cal-recur.c:4901
 msgid "19th"
 msgstr "19."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4770
+#: ../src/calendar/libecal/e-cal-recur.c:4902
 msgid "20th"
 msgstr "20."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4771
+#: ../src/calendar/libecal/e-cal-recur.c:4903
 msgid "21st"
 msgstr "21."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4772
+#: ../src/calendar/libecal/e-cal-recur.c:4904
 msgid "22nd"
 msgstr "22."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4773
+#: ../src/calendar/libecal/e-cal-recur.c:4905
 msgid "23rd"
 msgstr "23."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4774
+#: ../src/calendar/libecal/e-cal-recur.c:4906
 msgid "24th"
 msgstr "24."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4775
+#: ../src/calendar/libecal/e-cal-recur.c:4907
 msgid "25th"
 msgstr "25."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4776
+#: ../src/calendar/libecal/e-cal-recur.c:4908
 msgid "26th"
 msgstr "26."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4777
+#: ../src/calendar/libecal/e-cal-recur.c:4909
 msgid "27th"
 msgstr "27."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4778
+#: ../src/calendar/libecal/e-cal-recur.c:4910
 msgid "28th"
 msgstr "28."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4779
+#: ../src/calendar/libecal/e-cal-recur.c:4911
 msgid "29th"
 msgstr "29."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4780
+#: ../src/calendar/libecal/e-cal-recur.c:4912
 msgid "30th"
 msgstr "30."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4781
+#: ../src/calendar/libecal/e-cal-recur.c:4913
 msgid "31st"
 msgstr "31."
 
-#: ../src/calendar/libecal/e-cal-recur.c:4940
+#: ../src/calendar/libecal/e-cal-recur.c:5058
 #, c-format
 msgid "every day forever"
 msgid_plural "every %d days forever"
 msgstr[0] "joka pÃ¤ivÃ¤ ikuisesti"
 msgstr[1] "joka %d pÃ¤ivÃ¤ ikuisesti"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4946
+#: ../src/calendar/libecal/e-cal-recur.c:5064
 #, c-format
 msgid "Every day forever"
 msgid_plural "Every %d days forever"
 msgstr[0] "Joka pÃ¤ivÃ¤ ikuisesti"
 msgstr[1] "Joka %d pÃ¤ivÃ¤ ikuisesti"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4954
+#: ../src/calendar/libecal/e-cal-recur.c:5072
 #, c-format
 msgid "every day"
 msgid_plural "every %d days"
 msgstr[0] "joka pÃ¤ivÃ¤"
 msgstr[1] "joka %d pÃ¤ivÃ¤"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4960
+#: ../src/calendar/libecal/e-cal-recur.c:5078
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Joka pÃ¤ivÃ¤"
 msgstr[1] "Joka %d pÃ¤ivÃ¤"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5050
+#: ../src/calendar/libecal/e-cal-recur.c:5164
 #, c-format
 msgid "every week"
 msgid_plural "every %d weeks"
 msgstr[0] "joka viikko"
 msgstr[1] "joka %d viikko"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5056
+#: ../src/calendar/libecal/e-cal-recur.c:5170
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -1781,556 +1665,556 @@ msgstr[1] "Joka %d viikko"
 #. with ", DAYNAME" or " and DAYNAME", thus it can be something like "on Monday and Tuesday"
 #. or "on Monday, Wednesday and Friday" or simply "on Saturday". The '%1$s' is replaced with
 #. the previously gathered text, while the '%2$s' is replaced with the text to append.
-#: ../src/calendar/libecal/e-cal-recur.c:5070
+#: ../src/calendar/libecal/e-cal-recur.c:5184
 #, c-format
 msgctxt "recur-description-dayname"
 msgid "%1$s%2$s"
 msgstr ""
 
-#: ../src/calendar/libecal/e-cal-recur.c:5087
+#: ../src/calendar/libecal/e-cal-recur.c:5201
 msgctxt "recur-description"
 msgid "on Sunday"
 msgstr "sunnuntaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5088
+#: ../src/calendar/libecal/e-cal-recur.c:5202
 msgctxt "recur-description"
 msgid ", Sunday"
 msgstr ", sunnuntai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5089
+#: ../src/calendar/libecal/e-cal-recur.c:5203
 msgctxt "recur-description"
 msgid " and Sunday"
 msgstr " ja sunnuntai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5092
+#: ../src/calendar/libecal/e-cal-recur.c:5206
 msgctxt "recur-description"
 msgid "on Monday"
 msgstr "maanantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5093
+#: ../src/calendar/libecal/e-cal-recur.c:5207
 msgctxt "recur-description"
 msgid ", Monday"
 msgstr ", maanantai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5094
+#: ../src/calendar/libecal/e-cal-recur.c:5208
 msgctxt "recur-description"
 msgid " and Monday"
 msgstr " ja maanantai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5097
+#: ../src/calendar/libecal/e-cal-recur.c:5211
 msgctxt "recur-description"
 msgid "on Tuesday"
 msgstr "tiistaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5098
+#: ../src/calendar/libecal/e-cal-recur.c:5212
 msgctxt "recur-description"
 msgid ", Tuesday"
 msgstr ", tiistai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5099
+#: ../src/calendar/libecal/e-cal-recur.c:5213
 msgctxt "recur-description"
 msgid " and Tuesday"
 msgstr " ja tiistai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5102
+#: ../src/calendar/libecal/e-cal-recur.c:5216
 msgctxt "recur-description"
 msgid "on Wednesday"
 msgstr "keskiviikkona"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5103
+#: ../src/calendar/libecal/e-cal-recur.c:5217
 msgctxt "recur-description"
 msgid ", Wednesday"
 msgstr ", keskiviikko"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5104
+#: ../src/calendar/libecal/e-cal-recur.c:5218
 msgctxt "recur-description"
 msgid " and Wednesday"
 msgstr " ja keskiviikko"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5107
+#: ../src/calendar/libecal/e-cal-recur.c:5221
 msgctxt "recur-description"
 msgid "on Thursday"
 msgstr "torstaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5108
+#: ../src/calendar/libecal/e-cal-recur.c:5222
 msgctxt "recur-description"
 msgid ", Thursday"
 msgstr ", torstai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5109
+#: ../src/calendar/libecal/e-cal-recur.c:5223
 msgctxt "recur-description"
 msgid " and Thursday"
 msgstr " ja torstai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5112
+#: ../src/calendar/libecal/e-cal-recur.c:5226
 msgctxt "recur-description"
 msgid "on Friday"
 msgstr "perjantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5113
+#: ../src/calendar/libecal/e-cal-recur.c:5227
 msgctxt "recur-description"
 msgid ", Friday"
 msgstr ", perjantai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5114
+#: ../src/calendar/libecal/e-cal-recur.c:5228
 msgctxt "recur-description"
 msgid " and Friday"
 msgstr " ja perjantai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5117
+#: ../src/calendar/libecal/e-cal-recur.c:5231
 msgctxt "recur-description"
 msgid "on Saturday"
 msgstr "lauantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5118
+#: ../src/calendar/libecal/e-cal-recur.c:5232
 msgctxt "recur-description"
 msgid ", Saturday"
 msgstr ", lauantai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5119
+#: ../src/calendar/libecal/e-cal-recur.c:5233
 msgctxt "recur-description"
 msgid " and Saturday"
 msgstr " ja lauantai"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5252
+#: ../src/calendar/libecal/e-cal-recur.c:5362
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "joka kuukausi"
 msgstr[1] "joka %d kuukausi"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5258
+#: ../src/calendar/libecal/e-cal-recur.c:5368
 #, c-format
 msgid "Every month"
 msgid_plural "Every %d months"
 msgstr[0] "Joka kuukausi"
 msgstr[1] "Joka %d kuukausi"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5268
-#: ../src/calendar/libecal/e-cal-recur.c:5589
+#: ../src/calendar/libecal/e-cal-recur.c:5378
+#: ../src/calendar/libecal/e-cal-recur.c:5699
 msgctxt "recur-description"
 msgid "on the last Sunday"
 msgstr "viimeisenÃ¤ sunnuntaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5271
-#: ../src/calendar/libecal/e-cal-recur.c:5439
+#: ../src/calendar/libecal/e-cal-recur.c:5381
+#: ../src/calendar/libecal/e-cal-recur.c:5549
 msgctxt "recur-description"
 msgid "on the last Monday"
 msgstr "viimeisenÃ¤ maanantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5274
-#: ../src/calendar/libecal/e-cal-recur.c:5464
+#: ../src/calendar/libecal/e-cal-recur.c:5384
+#: ../src/calendar/libecal/e-cal-recur.c:5574
 msgctxt "recur-description"
 msgid "on the last Tuesday"
 msgstr "viimeisenÃ¤ tiistaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5277
-#: ../src/calendar/libecal/e-cal-recur.c:5489
+#: ../src/calendar/libecal/e-cal-recur.c:5387
+#: ../src/calendar/libecal/e-cal-recur.c:5599
 msgctxt "recur-description"
 msgid "on the last Wednesday"
 msgstr "viimeisenÃ¤ keskiviikkona"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5280
-#: ../src/calendar/libecal/e-cal-recur.c:5514
+#: ../src/calendar/libecal/e-cal-recur.c:5390
+#: ../src/calendar/libecal/e-cal-recur.c:5624
 msgctxt "recur-description"
 msgid "on the last Thursday"
 msgstr "viimeisenÃ¤ torstaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5283
-#: ../src/calendar/libecal/e-cal-recur.c:5539
+#: ../src/calendar/libecal/e-cal-recur.c:5393
+#: ../src/calendar/libecal/e-cal-recur.c:5649
 msgctxt "recur-description"
 msgid "on the last Friday"
 msgstr "viimeisenÃ¤ perjantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5286
-#: ../src/calendar/libecal/e-cal-recur.c:5564
+#: ../src/calendar/libecal/e-cal-recur.c:5396
+#: ../src/calendar/libecal/e-cal-recur.c:5674
 msgctxt "recur-description"
 msgid "on the last Saturday"
 msgstr "viimeisenÃ¤ lauantaina"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5296
+#: ../src/calendar/libecal/e-cal-recur.c:5406
 msgctxt "recur-description"
 msgid "on the 1st day"
 msgstr "1. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5300
+#: ../src/calendar/libecal/e-cal-recur.c:5410
 msgctxt "recur-description"
 msgid "on the 2nd day"
 msgstr "2. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5304
+#: ../src/calendar/libecal/e-cal-recur.c:5414
 msgctxt "recur-description"
 msgid "on the 3rd day"
 msgstr "3. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5308
+#: ../src/calendar/libecal/e-cal-recur.c:5418
 msgctxt "recur-description"
 msgid "on the 4th day"
 msgstr "4. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5312
+#: ../src/calendar/libecal/e-cal-recur.c:5422
 msgctxt "recur-description"
 msgid "on the 5th day"
 msgstr "5. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5316
+#: ../src/calendar/libecal/e-cal-recur.c:5426
 msgctxt "recur-description"
 msgid "on the 6th day"
 msgstr "6. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5320
+#: ../src/calendar/libecal/e-cal-recur.c:5430
 msgctxt "recur-description"
 msgid "on the 7th day"
 msgstr "7. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5324
+#: ../src/calendar/libecal/e-cal-recur.c:5434
 msgctxt "recur-description"
 msgid "on the 8th day"
 msgstr "8. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5328
+#: ../src/calendar/libecal/e-cal-recur.c:5438
 msgctxt "recur-description"
 msgid "on the 9th day"
 msgstr "9. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5332
+#: ../src/calendar/libecal/e-cal-recur.c:5442
 msgctxt "recur-description"
 msgid "on the 10th day"
 msgstr "10. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5336
+#: ../src/calendar/libecal/e-cal-recur.c:5446
 msgctxt "recur-description"
 msgid "on the 11th day"
 msgstr "11. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5340
+#: ../src/calendar/libecal/e-cal-recur.c:5450
 msgctxt "recur-description"
 msgid "on the 12th day"
 msgstr "12. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5344
+#: ../src/calendar/libecal/e-cal-recur.c:5454
 msgctxt "recur-description"
 msgid "on the 13th day"
 msgstr "13. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5348
+#: ../src/calendar/libecal/e-cal-recur.c:5458
 msgctxt "recur-description"
 msgid "on the 14th day"
 msgstr "14. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5352
+#: ../src/calendar/libecal/e-cal-recur.c:5462
 msgctxt "recur-description"
 msgid "on the 15th day"
 msgstr "15. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5356
+#: ../src/calendar/libecal/e-cal-recur.c:5466
 msgctxt "recur-description"
 msgid "on the 16th day"
 msgstr "16. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5360
+#: ../src/calendar/libecal/e-cal-recur.c:5470
 msgctxt "recur-description"
 msgid "on the 17th day"
 msgstr "17. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5364
+#: ../src/calendar/libecal/e-cal-recur.c:5474
 msgctxt "recur-description"
 msgid "on the 18th day"
 msgstr "18. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5368
+#: ../src/calendar/libecal/e-cal-recur.c:5478
 msgctxt "recur-description"
 msgid "on the 19th day"
 msgstr "19. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5372
+#: ../src/calendar/libecal/e-cal-recur.c:5482
 msgctxt "recur-description"
 msgid "on the 20th day"
 msgstr "20. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5376
+#: ../src/calendar/libecal/e-cal-recur.c:5486
 msgctxt "recur-description"
 msgid "on the 21st day"
 msgstr "21. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5380
+#: ../src/calendar/libecal/e-cal-recur.c:5490
 msgctxt "recur-description"
 msgid "on the 22nd day"
 msgstr "22. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5384
+#: ../src/calendar/libecal/e-cal-recur.c:5494
 msgctxt "recur-description"
 msgid "on the 23rd day"
 msgstr "23. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5388
+#: ../src/calendar/libecal/e-cal-recur.c:5498
 msgctxt "recur-description"
 msgid "on the 24th day"
 msgstr "24. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5392
+#: ../src/calendar/libecal/e-cal-recur.c:5502
 msgctxt "recur-description"
 msgid "on the 25th day"
 msgstr "25. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5396
+#: ../src/calendar/libecal/e-cal-recur.c:5506
 msgctxt "recur-description"
 msgid "on the 26th day"
 msgstr "26. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5400
+#: ../src/calendar/libecal/e-cal-recur.c:5510
 msgctxt "recur-description"
 msgid "on the 27th day"
 msgstr "27. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5404
+#: ../src/calendar/libecal/e-cal-recur.c:5514
 msgctxt "recur-description"
 msgid "on the 28th day"
 msgstr "28. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5408
+#: ../src/calendar/libecal/e-cal-recur.c:5518
 msgctxt "recur-description"
 msgid "on the 29th day"
 msgstr "29. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5412
+#: ../src/calendar/libecal/e-cal-recur.c:5522
 msgctxt "recur-description"
 msgid "on the 30th day"
 msgstr "30. pÃ¤ivÃ¤nÃ¤"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5416
+#: ../src/calendar/libecal/e-cal-recur.c:5526
 msgctxt "recur-description"
 msgid "on the 31st day"
 msgstr "31. pÃ¤ivÃ¤nÃ¤"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5424
+#: ../src/calendar/libecal/e-cal-recur.c:5534
 msgctxt "recur-description"
 msgid "on the first Monday"
 msgstr "ensimmÃ¤isenÃ¤ maanantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5427
+#: ../src/calendar/libecal/e-cal-recur.c:5537
 msgctxt "recur-description"
 msgid "on the second Monday"
 msgstr "toisena maanantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5430
+#: ../src/calendar/libecal/e-cal-recur.c:5540
 msgctxt "recur-description"
 msgid "on the third Monday"
 msgstr "kolmantena maanantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5433
+#: ../src/calendar/libecal/e-cal-recur.c:5543
 msgctxt "recur-description"
 msgid "on the fourth Monday"
 msgstr "neljÃ¤ntenÃ¤ maanantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5436
+#: ../src/calendar/libecal/e-cal-recur.c:5546
 msgctxt "recur-description"
 msgid "on the fifth Monday"
 msgstr "viidentenÃ¤ maanantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5449
+#: ../src/calendar/libecal/e-cal-recur.c:5559
 msgctxt "recur-description"
 msgid "on the first Tuesday"
 msgstr "ensimmÃ¤isenÃ¤ tiistaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5452
+#: ../src/calendar/libecal/e-cal-recur.c:5562
 msgctxt "recur-description"
 msgid "on the second Tuesday"
 msgstr "toisena tiistaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5455
+#: ../src/calendar/libecal/e-cal-recur.c:5565
 msgctxt "recur-description"
 msgid "on the third Tuesday"
 msgstr "kolmantena tiistaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5458
+#: ../src/calendar/libecal/e-cal-recur.c:5568
 msgctxt "recur-description"
 msgid "on the fourth Tuesday"
 msgstr "neljÃ¤ntenÃ¤ tiistaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5461
+#: ../src/calendar/libecal/e-cal-recur.c:5571
 msgctxt "recur-description"
 msgid "on the fifth Tuesday"
 msgstr "viidentenÃ¤ tiistaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5474
+#: ../src/calendar/libecal/e-cal-recur.c:5584
 msgctxt "recur-description"
 msgid "on the first Wednesday"
 msgstr "ensimmÃ¤isenÃ¤ keskiviikkona"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5477
+#: ../src/calendar/libecal/e-cal-recur.c:5587
 msgctxt "recur-description"
 msgid "on the second Wednesday"
 msgstr "toisena keskiviikkona"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5480
+#: ../src/calendar/libecal/e-cal-recur.c:5590
 msgctxt "recur-description"
 msgid "on the third Wednesday"
 msgstr "kolmantena keskiviikkona"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5483
+#: ../src/calendar/libecal/e-cal-recur.c:5593
 msgctxt "recur-description"
 msgid "on the fourth Wednesday"
 msgstr "neljÃ¤ntenÃ¤ keskiviikkona"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5486
+#: ../src/calendar/libecal/e-cal-recur.c:5596
 msgctxt "recur-description"
 msgid "on the fifth Wednesday"
 msgstr "viidentenÃ¤ keskiviikkona"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5499
+#: ../src/calendar/libecal/e-cal-recur.c:5609
 msgctxt "recur-description"
 msgid "on the first Thursday"
 msgstr "ensimmÃ¤isenÃ¤ torstaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5502
+#: ../src/calendar/libecal/e-cal-recur.c:5612
 msgctxt "recur-description"
 msgid "on the second Thursday"
 msgstr "toisena torstaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5505
+#: ../src/calendar/libecal/e-cal-recur.c:5615
 msgctxt "recur-description"
 msgid "on the third Thursday"
 msgstr "kolmantena torstaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5508
+#: ../src/calendar/libecal/e-cal-recur.c:5618
 msgctxt "recur-description"
 msgid "on the fourth Thursday"
 msgstr "neljÃ¤ntenÃ¤ torstaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5511
+#: ../src/calendar/libecal/e-cal-recur.c:5621
 msgctxt "recur-description"
 msgid "on the fifth Thursday"
 msgstr "viidentenÃ¤ torstaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5524
+#: ../src/calendar/libecal/e-cal-recur.c:5634
 msgctxt "recur-description"
 msgid "on the first Friday"
 msgstr "ensimmÃ¤isenÃ¤ perjantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5527
+#: ../src/calendar/libecal/e-cal-recur.c:5637
 msgctxt "recur-description"
 msgid "on the second Friday"
 msgstr "toisena perjantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5530
+#: ../src/calendar/libecal/e-cal-recur.c:5640
 msgctxt "recur-description"
 msgid "on the third Friday"
 msgstr "kolmantena perjantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5533
+#: ../src/calendar/libecal/e-cal-recur.c:5643
 msgctxt "recur-description"
 msgid "on the fourth Friday"
 msgstr "neljÃ¤ntenÃ¤ perjantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5536
+#: ../src/calendar/libecal/e-cal-recur.c:5646
 msgctxt "recur-description"
 msgid "on the fifth Friday"
 msgstr "viidentenÃ¤ perjantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5549
+#: ../src/calendar/libecal/e-cal-recur.c:5659
 msgctxt "recur-description"
 msgid "on the first Saturday"
 msgstr "ensimmÃ¤isenÃ¤ lauantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5552
+#: ../src/calendar/libecal/e-cal-recur.c:5662
 msgctxt "recur-description"
 msgid "on the second Saturday"
 msgstr "toisena lauantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5555
+#: ../src/calendar/libecal/e-cal-recur.c:5665
 msgctxt "recur-description"
 msgid "on the third Saturday"
 msgstr "kolmantena lauantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5558
+#: ../src/calendar/libecal/e-cal-recur.c:5668
 msgctxt "recur-description"
 msgid "on the fourth Saturday"
 msgstr "neljÃ¤ntenÃ¤ lauantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5561
+#: ../src/calendar/libecal/e-cal-recur.c:5671
 msgctxt "recur-description"
 msgid "on the fifth Saturday"
 msgstr "viidentenÃ¤ lauantaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5574
+#: ../src/calendar/libecal/e-cal-recur.c:5684
 msgctxt "recur-description"
 msgid "on the first Sunday"
 msgstr "ensimmÃ¤isenÃ¤ sunnuntaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5577
+#: ../src/calendar/libecal/e-cal-recur.c:5687
 msgctxt "recur-description"
 msgid "on the second Sunday"
 msgstr "toisena sunnuntaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5580
+#: ../src/calendar/libecal/e-cal-recur.c:5690
 msgctxt "recur-description"
 msgid "on the third Sunday"
 msgstr "kolmantena sunnuntaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5583
+#: ../src/calendar/libecal/e-cal-recur.c:5693
 msgctxt "recur-description"
 msgid "on the fourth Sunday"
 msgstr "neljÃ¤ntenÃ¤ sunnuntaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5586
+#: ../src/calendar/libecal/e-cal-recur.c:5696
 msgctxt "recur-description"
 msgid "on the fifth Sunday"
 msgstr "viidentenÃ¤ sunnuntaina"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5615
+#: ../src/calendar/libecal/e-cal-recur.c:5725
 #, c-format
 msgid "every year forever"
 msgid_plural "every %d years forever"
 msgstr[0] "joka vuosi ikuisesti"
 msgstr[1] "joka %d vuosi ikuisesti"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5621
+#: ../src/calendar/libecal/e-cal-recur.c:5731
 #, c-format
 msgid "Every year forever"
 msgid_plural "Every %d years forever"
 msgstr[0] "Joka vuosi ikuisesti"
 msgstr[1] "Joka %d vuosi ikuisesti"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5629
+#: ../src/calendar/libecal/e-cal-recur.c:5739
 #, c-format
 msgid "every year"
 msgid_plural "every %d years"
 msgstr[0] "joka vuosi"
 msgstr[1] "joka %d vuosi"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5635
+#: ../src/calendar/libecal/e-cal-recur.c:5745
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -2340,7 +2224,7 @@ msgstr[1] "Joka %d vuosi"
 #. Translators: This is one of the last possible parts of a recurrence description.
 #. The text is appended at the end of the complete recurrence description, making it
 #. for example: "Every 3 days for 10 occurrences"
-#: ../src/calendar/libecal/e-cal-recur.c:5654
+#: ../src/calendar/libecal/e-cal-recur.c:5764
 #, c-format
 msgid "for one occurrence"
 msgid_plural "for %d occurrences"
@@ -2351,7 +2235,7 @@ msgstr[1] ""
 #. The '%s' is replaced with actual date, thus it can create something like
 #. "until Mon 15.1.2018". The text is appended at the end of the complete
 #. recurrence description, making it for example: "Every 3 days until Mon 15.1.2018"
-#: ../src/calendar/libecal/e-cal-recur.c:5689
+#: ../src/calendar/libecal/e-cal-recur.c:5795
 #, c-format
 msgctxt "recur-description"
 msgid "until %s"
@@ -2360,7 +2244,7 @@ msgstr "pÃ¤Ã¤ttyen %s"
 #. Translators: This is one of the last possible parts of a recurrence description.
 #. The text is appended at the end of the complete recurrence description, making it
 #. for example: "Every 2 months on Tuesday, Thursday and Friday forever"
-#: ../src/calendar/libecal/e-cal-recur.c:5695
+#: ../src/calendar/libecal/e-cal-recur.c:5801
 msgctxt "recur-description"
 msgid "forever"
 msgstr "ikuisesti"
@@ -2368,7 +2252,7 @@ msgstr "ikuisesti"
 #. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 weeks",
 #. the '%2$s' is like "on Tuesday and Friday" and the '%3$s' is like "for 10 occurrences", constructing
 #. together one sentence: "Every 2 weeks on Tuesday and Friday for 10 occurrences".
-#: ../src/calendar/libecal/e-cal-recur.c:5705
+#: ../src/calendar/libecal/e-cal-recur.c:5811
 #, c-format
 msgctxt "recur-description"
 msgid "%1$s %2$s %3$s"
@@ -2377,7 +2261,7 @@ msgstr ""
 #. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 days",
 #. the '%2$s' is like "for 10 occurrences", constructing together one sentence:
 #. "Every 2 days for 10 occurrences".
-#: ../src/calendar/libecal/e-cal-recur.c:5710
+#: ../src/calendar/libecal/e-cal-recur.c:5816
 #, c-format
 msgctxt "recur-description"
 msgid "%1$s %2$s"
@@ -2385,7 +2269,7 @@ msgstr ""
 
 #. Translators: This text is appended at the end of complete recur description using "%s%s" in
 #. context "recur-description"
-#: ../src/calendar/libecal/e-cal-recur.c:5726
+#: ../src/calendar/libecal/e-cal-recur.c:5832
 #, c-format
 msgid ", with one exception"
 msgid_plural ", with %d exceptions"
@@ -2395,33 +2279,33 @@ msgstr[1] ", %d poikkeuksella"
 #. Translators: This appends text like ", with 3 exceptions" at the end of complete recurrence description.
 #. The "%1$s" is replaced with the recurrence description, the "%2$s" with the text about exceptions.
 #. It will form something like: "Every 2 weeks on Tuesday and Friday for 10 occurrences, with 3 exceptions"
-#: ../src/calendar/libecal/e-cal-recur.c:5733
+#: ../src/calendar/libecal/e-cal-recur.c:5839
 #, c-format
 msgctxt "recur-description"
 msgid "%1$s%2$s"
 msgstr "%1$s%2$s"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5746
-#: ../src/calendar/libecal/e-cal-recur.c:5769
+#: ../src/calendar/libecal/e-cal-recur.c:5852
+#: ../src/calendar/libecal/e-cal-recur.c:5875
 msgctxt "recur-description"
 msgid "The meeting recurs"
 msgstr "Tapaaminen toistuu"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5748
-#: ../src/calendar/libecal/e-cal-recur.c:5771
+#: ../src/calendar/libecal/e-cal-recur.c:5854
+#: ../src/calendar/libecal/e-cal-recur.c:5877
 msgctxt "recur-description"
 msgid "The appointment recurs"
 msgstr "Tapaaminen toistuu"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5751
-#: ../src/calendar/libecal/e-cal-recur.c:5774
+#: ../src/calendar/libecal/e-cal-recur.c:5857
+#: ../src/calendar/libecal/e-cal-recur.c:5880
 msgctxt "recur-description"
 msgid "The task recurs"
 msgstr "TehtÃ¤vÃ¤ toistuu"
 
-#. if (icalcomponent_isa (icalcomp) == ICAL_VJOURNAL_COMPONENT)
-#: ../src/calendar/libecal/e-cal-recur.c:5753
-#: ../src/calendar/libecal/e-cal-recur.c:5776
+#. if (i_cal_component_isa (comp) == I_CAL_VJOURNAL_COMPONENT)
+#: ../src/calendar/libecal/e-cal-recur.c:5859
+#: ../src/calendar/libecal/e-cal-recur.c:5882
 msgctxt "recur-description"
 msgid "The memo recurs"
 msgstr ""
@@ -2430,62 +2314,62 @@ msgstr ""
 #. The '%1$s' is replaced with something like "The meeting recurs" and
 #. the '%2$s' with something like "every 2 days forever", thus forming
 #. sentence like "This meeting recurs every 2 days forever"
-#: ../src/calendar/libecal/e-cal-recur.c:5760
+#: ../src/calendar/libecal/e-cal-recur.c:5866
 #, c-format
 msgctxt "recur-description-prefix"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: ../src/calendar/libecal/e-cal-util.c:746
-#: ../src/calendar/libecal/e-cal-util.c:773
+#: ../src/calendar/libecal/e-cal-util.c:818
+#: ../src/calendar/libecal/e-cal-util.c:845
 msgctxt "Priority"
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/libecal/e-cal-util.c:748
-#: ../src/calendar/libecal/e-cal-util.c:775
+#: ../src/calendar/libecal/e-cal-util.c:820
+#: ../src/calendar/libecal/e-cal-util.c:847
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../src/calendar/libecal/e-cal-util.c:750
-#: ../src/calendar/libecal/e-cal-util.c:777
+#: ../src/calendar/libecal/e-cal-util.c:822
+#: ../src/calendar/libecal/e-cal-util.c:849
 msgctxt "Priority"
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
-#: ../src/calendar/libecal/e-cal-util.c:771
+#: ../src/calendar/libecal/e-cal-util.c:843
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "MÃ¤Ã¤rittÃ¤mÃ¤tÃ¶n"
 
-#: ../src/calendar/libecal/e-cal-util.c:813
-#: ../src/libedataserverui/e-reminders-widget.c:291
+#: ../src/calendar/libecal/e-cal-util.c:885
+#: ../src/libedataserverui/e-reminders-widget.c:292
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikko"
 msgstr[1] "%d viikkoa"
 
-#: ../src/calendar/libecal/e-cal-util.c:822
-#: ../src/libedataserverui/e-reminders-widget.c:287
+#: ../src/calendar/libecal/e-cal-util.c:894
+#: ../src/libedataserverui/e-reminders-widget.c:288
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d pÃ¤ivÃ¤"
 msgstr[1] "%d pÃ¤ivÃ¤Ã¤"
 
-#: ../src/calendar/libecal/e-cal-util.c:831
-#: ../src/libedataserverui/e-reminders-widget.c:283
+#: ../src/calendar/libecal/e-cal-util.c:903
+#: ../src/libedataserverui/e-reminders-widget.c:284
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../src/calendar/libecal/e-cal-util.c:840
-#: ../src/libedataserverui/e-reminders-widget.c:279
+#: ../src/calendar/libecal/e-cal-util.c:912
+#: ../src/libedataserverui/e-reminders-widget.c:280
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2493,23 +2377,22 @@ msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
 #. Translators: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../src/calendar/libecal/e-cal-util.c:845
+#: ../src/calendar/libecal/e-cal-util.c:917
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../src/calendar/libecal/e-reminder-watcher.c:2522
+#: ../src/calendar/libecal/e-reminder-watcher.c:2704
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
 #. Translators: The first %s is replaced with the time string,
 #. the second %s with a duration, and the third %s with an event location,
 #. making it something like: "24.1.2018 10:30 (30 minutes) Meeting room A1"
-#: ../src/calendar/libecal/e-reminder-watcher.c:2538
+#: ../src/calendar/libecal/e-reminder-watcher.c:2720
 #, c-format
-#| msgid "%s (%s)"
 msgctxt "overdue"
 msgid "%s (%s) %s"
 msgstr "%s (%s) %s"
@@ -2517,9 +2400,8 @@ msgstr "%s (%s) %s"
 #. Translators: The first %s is replaced with the time string,
 #. the second %s with a duration, making is something like:
 #. "24.1.2018 10:30 (30 minutes)"
-#: ../src/calendar/libecal/e-reminder-watcher.c:2543
+#: ../src/calendar/libecal/e-reminder-watcher.c:2725
 #, c-format
-#| msgid "%s (%s)"
 msgctxt "overdue"
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -2527,96 +2409,96 @@ msgstr "%s (%s)"
 #. Translators: The first %s is replaced with the time string,
 #. the second %s with an event location, making it something like:
 #. "24.1.2018 10:30 Meeting room A1"
-#: ../src/calendar/libecal/e-reminder-watcher.c:2548
+#: ../src/calendar/libecal/e-reminder-watcher.c:2730
 #, c-format
 msgctxt "overdue"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:83
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1086
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1399
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1526
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1575
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1104
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1443
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1570
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1619
 #, fuzzy, c-format
 #| msgid "\"%s\" expects one argument"
 msgid "â€œ%sâ€ expects one argument"
 msgstr "\"%s\" ottaa yhden argumentin"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:90
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:689
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1406
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1414
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:84
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:707
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1450
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1458
 #, fuzzy, c-format
 #| msgid "\"%s\" expects the first argument to be a string"
 msgid "â€œ%sâ€ expects the first argument to be a string"
 msgstr "\"%s\" olettaa ensimmÃ¤isen argumentin olevan merkkijonon"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:165
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:164
 #, fuzzy, c-format
 msgid "â€œ%sâ€ expects two or three arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:172
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:261
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:323
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:839
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1093
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1475
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1533
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1582
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:171
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:272
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:340
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:857
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1111
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1519
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1577
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1626
 #, fuzzy, c-format
 #| msgid "\"%s\" expects the first argument to be a time_t"
 msgid "â€œ%sâ€ expects the first argument to be a time_t"
 msgstr "\"%s\" olettaa ensimmÃ¤isen argumentin olevan muotoa time_t"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:181
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:269
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:848
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:180
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:350
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:866
 #, fuzzy, c-format
 #| msgid "\"%s\" expects the second argument to be a time_t"
 msgid "â€œ%sâ€ expects the second argument to be a time_t"
 msgstr "\"%s\" olettaa toisen argumentin olevan muotoa time_t"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:191
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, fuzzy, c-format
 msgid "â€œ%sâ€ expects the third argument to be a string"
 msgstr "\"%s\" olettaa ensimmÃ¤isen argumentin olevan merkkijonon"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:253
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:264
 #, fuzzy, c-format
 msgid "â€œ%sâ€ expects none or two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:316
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:682
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:832
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1468
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:700
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:850
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1512
 #, fuzzy, c-format
 #| msgid "\"%s\" expects two arguments"
 msgid "â€œ%sâ€ expects two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:615
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:638
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:764
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:796
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1005
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1038
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1360
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:639
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:662
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:782
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:814
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1023
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1056
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1404
 #, fuzzy, c-format
 #| msgid "\"%s\" expects no arguments"
 msgid "â€œ%sâ€ expects no arguments"
 msgstr "\"%s\" ei ota argumentteja"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:698
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:716
 #, fuzzy, c-format
 #| msgid "\"%s\" expects the second argument to be a string"
 msgid "â€œ%sâ€ expects the second argument to be a string"
 msgstr "\"%s\" olettaa toisen argumentin olevan merkkijonon"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:729
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:747
 #, fuzzy, c-format
 #| msgid ""
 #| "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -2631,13 +2513,13 @@ msgstr ""
 "\"description\", \"sijainti\", \"attendee\", \"organizer\" tai "
 "\"classification\""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:900
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:918
 #, fuzzy, c-format
 #| msgid "\"%s\" expects at least one argument"
 msgid "â€œ%sâ€ expects at least one argument"
 msgstr "\"%s\" tahtoo vÃ¤hintÃ¤Ã¤n yhden argumentin"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:915
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:933
 #, fuzzy, c-format
 #| msgid ""
 #| "\"%s\" expects all arguments to be strings or one and only one argument "
@@ -2649,189 +2531,183 @@ msgstr ""
 "\"%s\" olettaa kaikkien argumenttien olevan merkkijonoja, tai yhden ja "
 "ainoastaan yhden olevan totuusarvoisen epÃ¤toden (#f)"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1423
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1467
 #, fuzzy, c-format
 #| msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 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"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1484
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1528
 #, fuzzy, c-format
 #| msgid "\"%s\" expects the second argument to be an integer"
 msgid "â€œ%sâ€ expects the second argument to be an integer"
 msgstr "\"%s\" olettaa toisen argumentin olevan kokonaisluvun"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:1756
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1798
 #, c-format
 msgid "Failed to create SQLite function, error code â€œ%dâ€: %s"
 msgstr "Ei voitu luoda SQLite-funktiota, virhekoodi â€œ%dâ€: %s"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2728
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2791
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2798
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2856
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2915
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2978
 #, fuzzy, c-format
 #| msgid "Contact â€œ%sâ€ not found"
 msgid "Object â€œ%sâ€, â€œ%sâ€ not found"
 msgstr "Yhteystietoa â€œ%sâ€ ei lÃ¶ydy"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3531
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3757
 #, fuzzy
 #| msgid "Cannot add contact: "
 msgid "Cannot add timezone without tzid"
 msgstr "Yhteystiedon lisÃ¤ys epÃ¤onnistui: "
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3540
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3766
 #, fuzzy
 #| msgid "Cannot authenticate without a username"
 msgid "Cannot add timezone without component"
 msgstr "Tunnistautuminen ilman kÃ¤yttÃ¤jÃ¤tunnusta ei ole mahdollista"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3546
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3774
 #, fuzzy
 #| msgid "Cannot send message: one or more invalid recipients"
 msgid "Cannot add timezone with invalid component"
 msgstr "ViestiÃ¤ ei voi lÃ¤hettÃ¤Ã¤: yksi tai useampi viallinen vastaanottaja"
 
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1118
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1140
 #, c-format
 msgid "Received object for UID â€œ%sâ€ doesnâ€™t contain any expected component"
 msgstr ""
 
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:4037
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:4162
 msgid "attachment.dat"
 msgstr "liite.dat"
 
-#: ../src/calendar/libedata-cal/e-data-cal.c:421
-msgid "Unsupported method"
-msgstr "MenetelmÃ¤ ei ole tuettu."
-
-#: ../src/calendar/libedata-cal/e-data-cal.c:424
-msgid "Calendar does not exist"
-msgstr "Kalenteria ei ole olemassa"
-
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1655
+#: ../src/calendar/libedata-cal/e-data-cal.c:1362
 msgid "Cannot open calendar: "
 msgstr "Kalenterin avaus epÃ¤onnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1693
+#: ../src/calendar/libedata-cal/e-data-cal.c:1400
 msgid "Cannot refresh calendar: "
 msgstr "Kalenterin pÃ¤ivitys epÃ¤onnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1735
+#: ../src/calendar/libedata-cal/e-data-cal.c:1442
 #, fuzzy
 msgid "Cannot retrieve calendar object path: "
 msgstr "Kalenteritietoja ei voi tallentaa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1788
+#: ../src/calendar/libedata-cal/e-data-cal.c:1495
 #, fuzzy
 msgid "Cannot retrieve calendar object list: "
 msgstr "Kalenteria ei voi pÃ¤ivittÃ¤Ã¤"
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1846
+#: ../src/calendar/libedata-cal/e-data-cal.c:1553
 #, fuzzy
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Kalenteria ei voi pÃ¤ivittÃ¤Ã¤"
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1897
+#: ../src/calendar/libedata-cal/e-data-cal.c:1604
 msgid "Cannot create calendar object: "
 msgstr "Ei voida luoda kalenteriobjektia: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1966
+#: ../src/calendar/libedata-cal/e-data-cal.c:1673
 msgid "Cannot modify calendar object: "
 msgstr "Kalenteriobjektia ei voi muokata: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2045
+#: ../src/calendar/libedata-cal/e-data-cal.c:1752
 msgid "Cannot remove calendar object: "
 msgstr "Kalenteriobjektia ei voi poistaa: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2132
+#: ../src/calendar/libedata-cal/e-data-cal.c:1839
 msgid "Cannot receive calendar objects: "
 msgstr "Ei voida vastaanottaa kalenteriobjekteja: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2176
+#: ../src/calendar/libedata-cal/e-data-cal.c:1883
 msgid "Cannot send calendar objects: "
 msgstr "Kalenteriobjekteja ei voi lÃ¤hettÃ¤Ã¤: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2229
+#: ../src/calendar/libedata-cal/e-data-cal.c:1936
 #, 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
-#: ../src/calendar/libedata-cal/e-data-cal.c:2275
+#: ../src/calendar/libedata-cal/e-data-cal.c:1982
 #, fuzzy
 msgid "Could not discard reminder: "
 msgstr "Kansiota ei voitu tallentaa: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2317
+#: ../src/calendar/libedata-cal/e-data-cal.c:2024
 msgid "Could not retrieve calendar time zone: "
 msgstr "Ei voitu noutaa kalenterin aikavyÃ¶hykettÃ¤: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2358
+#: ../src/calendar/libedata-cal/e-data-cal.c:2065
 msgid "Could not add calendar time zone: "
 msgstr "Kalenterin aikavyÃ¶hykettÃ¤ ei voi lisÃ¤tÃ¤: "
 
-#: ../src/camel/camel-cipher-context.c:202
+#: ../src/camel/camel-cipher-context.c:198
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "TÃ¤mÃ¤ salakirjoitusmenetelmÃ¤ ei tue allekirjoitusta"
 
-#: ../src/camel/camel-cipher-context.c:215
+#: ../src/camel/camel-cipher-context.c:211
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "TÃ¤mÃ¤ salakirjoitusmenetelmÃ¤ ei tue varmennusta"
 
-#: ../src/camel/camel-cipher-context.c:231
+#: ../src/camel/camel-cipher-context.c:227
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "TÃ¤mÃ¤ salakirjoitusmenetelmÃ¤ ei tue tiedon salausta"
 
-#: ../src/camel/camel-cipher-context.c:245
+#: ../src/camel/camel-cipher-context.c:241
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "TÃ¤mÃ¤ salakirjoitusmenetelmÃ¤ ei tue salauksen purkua"
 
-#: ../src/camel/camel-cipher-context.c:362
+#: ../src/camel/camel-cipher-context.c:356
 msgid "Signing message"
 msgstr "Allekirjoitetaan viestiÃ¤"
 
-#: ../src/camel/camel-cipher-context.c:654
+#: ../src/camel/camel-cipher-context.c:648
 msgid "Encrypting message"
 msgstr "Salataan viestiÃ¤"
 
-#: ../src/camel/camel-cipher-context.c:827
+#: ../src/camel/camel-cipher-context.c:821
 msgid "Decrypting message"
 msgstr "Puretaan viestin salausta"
 
-#: ../src/camel/camel-data-cache.c:203
+#: ../src/camel/camel-data-cache.c:199
 #, c-format
 msgid "Unable to create cache path"
 msgstr "VÃ¤limuistipolun luonti epÃ¤onnistui"
 
-#: ../src/camel/camel-data-cache.c:532
+#: ../src/camel/camel-data-cache.c:528
 msgid "Empty cache file"
 msgstr ""
 
-#: ../src/camel/camel-data-cache.c:609
+#: ../src/camel/camel-data-cache.c:605
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Tietoa ei voitu avata vÃ¤limuistista: %s: %s"
 
-#: ../src/camel/camel-db.c:874
-#: ../src/camel/providers/local/camel-mbox-store.c:904
+#: ../src/camel/camel-db.c:872
+#: ../src/camel/providers/local/camel-mbox-store.c:913
 #, fuzzy, c-format
 #| msgid "Could not rename '%s' to %s: %s"
 msgid "Could not rename â€œ%sâ€ to %s: %s"
@@ -2840,125 +2716,125 @@ msgstr "UudelleennimeÃ¤minen %s:stÃ¤ %s:ksi epÃ¤onnistui: %s"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-filter-driver.c:262
+#: ../src/camel/camel-filter-driver.c:264
 #, fuzzy, c-format
 msgid "Transferring filtered messages in â€œ%s : %sâ€"
 msgstr "EtsitÃ¤Ã¤n muuttuneita viestejÃ¤ kansiosta %s"
 
-#: ../src/camel/camel-filter-driver.c:1127
-#: ../src/camel/camel-filter-search.c:930
+#: ../src/camel/camel-filter-driver.c:1120
+#: ../src/camel/camel-filter-search.c:934
 #, fuzzy, c-format
 #| msgid "Failed to create child process '%s': %s"
 msgid "Failed to create child process â€œ%sâ€: %s"
 msgstr "Lapsiprosessin \"%s\" luominen epÃ¤onnistui: %s"
 
-#: ../src/camel/camel-filter-driver.c:1175
+#: ../src/camel/camel-filter-driver.c:1168
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Virheellinen viestivirta lÃ¤hteestÃ¤ %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1396
-#: ../src/camel/camel-filter-driver.c:1409
+#: ../src/camel/camel-filter-driver.c:1389
+#: ../src/camel/camel-filter-driver.c:1402
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: ../src/camel/camel-filter-driver.c:1517
+#: ../src/camel/camel-filter-driver.c:1510
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jÃ¤sennettÃ¤essÃ¤ suodatinta: %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1528
+#: ../src/camel/camel-filter-driver.c:1521
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1626
+#: ../src/camel/camel-filter-driver.c:1619
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu avata"
 
-#: ../src/camel/camel-filter-driver.c:1638
+#: ../src/camel/camel-filter-driver.c:1631
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu kÃ¤sitellÃ¤"
 
-#: ../src/camel/camel-filter-driver.c:1669
+#: ../src/camel/camel-filter-driver.c:1662
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiÃ¤ %d (%d %%)"
 
-#: ../src/camel/camel-filter-driver.c:1678
-#: ../src/camel/camel-filter-driver.c:1701
+#: ../src/camel/camel-filter-driver.c:1671
+#: ../src/camel/camel-filter-driver.c:1694
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../src/camel/camel-filter-driver.c:1719
-#: ../src/camel/camel-filter-driver.c:1851
+#: ../src/camel/camel-filter-driver.c:1712
+#: ../src/camel/camel-filter-driver.c:1844
 #, fuzzy, c-format
 #| msgid "Failed to cache message %s: %s"
 msgid "Failed to transfer messages: %s"
 msgstr "Viestin %s tallennus vÃ¤limuistiin epÃ¤onnistui: %s"
 
-#: ../src/camel/camel-filter-driver.c:1729
-#: ../src/camel/camel-filter-driver.c:1865
+#: ../src/camel/camel-filter-driver.c:1722
+#: ../src/camel/camel-filter-driver.c:1858
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: ../src/camel/camel-filter-driver.c:1734
-#: ../src/camel/camel-filter-driver.c:1873
+#: ../src/camel/camel-filter-driver.c:1727
+#: ../src/camel/camel-filter-driver.c:1866
 msgid "Complete"
 msgstr "Valmis"
 
-#: ../src/camel/camel-filter-driver.c:1805
+#: ../src/camel/camel-filter-driver.c:1798
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestiÃ¤ %d / %d"
 
-#: ../src/camel/camel-filter-driver.c:1823
+#: ../src/camel/camel-filter-driver.c:1816
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: ../src/camel/camel-filter-driver.c:2033
-#: ../src/camel/camel-filter-driver.c:2057
+#: ../src/camel/camel-filter-driver.c:2026
+#: ../src/camel/camel-filter-driver.c:2050
 #, fuzzy, c-format
 #| msgid "Execution of filter '%s' failed: "
 msgid "Execution of filter â€œ%sâ€ failed: "
 msgstr "Suodattimen \"%s\" suorittaminen epÃ¤onnistui: "
 
-#: ../src/camel/camel-filter-driver.c:2047
+#: ../src/camel/camel-filter-driver.c:2040
 #, fuzzy, c-format
 #| msgid "Error parsing filter: %s: %s"
 msgid "Error parsing filter â€œ%sâ€: %s: %s"
 msgstr "Virhe jÃ¤sennettÃ¤essÃ¤ suodatinta: %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:2066
+#: ../src/camel/camel-filter-driver.c:2059
 #, fuzzy, c-format
 #| msgid "Error executing filter: %s: %s"
 msgid "Error executing filter â€œ%sâ€: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../src/camel/camel-filter-search.c:167
+#: ../src/camel/camel-filter-search.c:171
 msgid "Failed to retrieve message"
 msgstr "ViestiÃ¤ ei voitu hakea."
 
-#: ../src/camel/camel-filter-search.c:631
+#: ../src/camel/camel-filter-search.c:635
 msgid "Invalid arguments to (system-flag)"
 msgstr "VirheellisiÃ¤ argumentteja (system-flag)"
 
-#: ../src/camel/camel-filter-search.c:650
+#: ../src/camel/camel-filter-search.c:654
 msgid "Invalid arguments to (user-tag)"
 msgstr "VirheellisiÃ¤ argumentteja (user-tag)"
 
-#: ../src/camel/camel-filter-search.c:1232
+#: ../src/camel/camel-filter-search.c:1236
 #, fuzzy
 #| msgid "Invalid arguments to (system-flag)"
 msgid "Invalid arguments to (message-location)"
 msgstr "VirheellisiÃ¤ argumentteja (system-flag)"
 
-#: ../src/camel/camel-filter-search.c:1331
-#: ../src/camel/camel-filter-search.c:1342
+#: ../src/camel/camel-filter-search.c:1391
+#: ../src/camel/camel-filter-search.c:1402
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
@@ -2966,7 +2842,7 @@ msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:311
+#: ../src/camel/camel-folder.c:329
 #, fuzzy, c-format
 msgid "Learning new spam message in â€œ%s : %sâ€"
 msgid_plural "Learning new spam messages in â€œ%s : %sâ€"
@@ -2976,7 +2852,7 @@ msgstr[1] "EtsitÃ¤Ã¤n muuttuneita viestejÃ¤ kansiosta %s"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:354
+#: ../src/camel/camel-folder.c:372
 #, fuzzy, c-format
 msgid "Learning new ham message in â€œ%s : %sâ€"
 msgid_plural "Learning new ham messages in â€œ%s : %sâ€"
@@ -2986,26 +2862,26 @@ msgstr[1] "EtsitÃ¤Ã¤n muuttuneita viestejÃ¤ kansiosta %s"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:402
+#: ../src/camel/camel-folder.c:420
 #, fuzzy, c-format
 msgid "Filtering new message in â€œ%s : %sâ€"
 msgid_plural "Filtering new messages in â€œ%s : %sâ€"
 msgstr[0] "Suodatetaan uusia viestejÃ¤"
 msgstr[1] "Suodatetaan uusia viestejÃ¤"
 
-#: ../src/camel/camel-folder.c:1004
+#: ../src/camel/camel-folder.c:1064
 #: ../src/camel/providers/local/camel-maildir-folder.c:331
 msgid "Moving messages"
 msgstr "SiirretÃ¤Ã¤n viestejÃ¤"
 
-#: ../src/camel/camel-folder.c:1007
+#: ../src/camel/camel-folder.c:1067
 msgid "Copying messages"
 msgstr "Kopioidaan viestejÃ¤"
 
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:1052
+#: ../src/camel/camel-folder.c:1112
 #, fuzzy, c-format
 #| msgid "No provider available for protocol '%s'"
 msgid "Quota information not supported for folder â€œ%s : %sâ€"
@@ -3014,7 +2890,7 @@ msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:1154
+#: ../src/camel/camel-folder.c:1214
 #, c-format
 msgid "Filtering folder â€œ%s : %sâ€"
 msgstr "Suodatetaan kansiota â€œ%s : %sâ€"
@@ -3022,7 +2898,7 @@ msgstr "Suodatetaan kansiota â€œ%s : %sâ€"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:2987
+#: ../src/camel/camel-folder.c:3176
 #, fuzzy, c-format
 #| msgid "Expunging folder '%s'"
 msgid "Expunging folder â€œ%s : %sâ€"
@@ -3031,7 +2907,7 @@ msgstr "Siivotaan poistettuja kansiosta â€%sâ€"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3122
+#: ../src/camel/camel-folder.c:3311
 #, fuzzy, c-format
 msgid "Retrieving message â€œ%sâ€ in â€œ%s : %sâ€"
 msgstr "Haetaan POP-viestiÃ¤ %d"
@@ -3039,7 +2915,7 @@ msgstr "Haetaan POP-viestiÃ¤ %d"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3347
+#: ../src/camel/camel-folder.c:3536
 #, fuzzy, c-format
 msgid "Retrieving quota information for â€œ%s : %sâ€"
 msgstr "Haetaan yhteenvetoa uusista viesteistÃ¤ kansiossa %s"
@@ -3047,45 +2923,45 @@ msgstr "Haetaan yhteenvetoa uusista viesteistÃ¤ kansiossa %s"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3647
+#: ../src/camel/camel-folder.c:3836
 #, c-format
 msgid "Refreshing folder â€œ%s : %sâ€"
 msgstr "PÃ¤ivitetÃ¤Ã¤n kansiota â€œ%s : %sâ€"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:920
-#: ../src/camel/camel-folder-search.c:963
+#: ../src/camel/camel-folder-search.c:916
+#: ../src/camel/camel-folder-search.c:959
 #, 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
-#: ../src/camel/camel-folder-search.c:1001
+#: ../src/camel/camel-folder-search.c:997
 #, 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
-#: ../src/camel/camel-folder-search.c:1008
-#: ../src/camel/camel-folder-search.c:1016
+#: ../src/camel/camel-folder-search.c:1004
+#: ../src/camel/camel-folder-search.c:1012
 #, 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
-#: ../src/camel/camel-folder-search.c:1044
+#: ../src/camel/camel-folder-search.c:1040
 #, 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
-#: ../src/camel/camel-folder-search.c:1054
+#: ../src/camel/camel-folder-search.c:1050
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) vaatii kansion asettamisen"
 
-#: ../src/camel/camel-folder-search.c:2196
-#: ../src/camel/camel-folder-search.c:2370
+#: ../src/camel/camel-folder-search.c:2208
+#: ../src/camel/camel-folder-search.c:2382
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3094,8 +2970,8 @@ msgstr ""
 "Hakulauseketta ei voi tulkita: %s:\n"
 "%s"
 
-#: ../src/camel/camel-folder-search.c:2208
-#: ../src/camel/camel-folder-search.c:2382
+#: ../src/camel/camel-folder-search.c:2220
+#: ../src/camel/camel-folder-search.c:2394
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3107,30 +2983,30 @@ msgstr ""
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder-summary.c:1663
+#: ../src/camel/camel-folder-summary.c:1661
 #, fuzzy, c-format
 #| msgid "Cannot write offline journal for folder '%s': %s"
 msgid "Release unused memory for folder â€œ%s : %sâ€"
 msgstr "Kansion \"%s\" yhteydettÃ¶mÃ¤n tilan muutoslokia ei voi luoda: %s"
 
 #. Translators: The '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
-#: ../src/camel/camel-gpg-context.c:451
+#: ../src/camel/camel-gpg-context.c:447
 #, c-format
 msgid "Output from %s:"
 msgstr ""
 
-#: ../src/camel/camel-gpg-context.c:916 ../src/camel/camel-gpg-context.c:921
-#: ../src/camel/camel-gpg-context.c:1634
+#: ../src/camel/camel-gpg-context.c:912 ../src/camel/camel-gpg-context.c:917
+#: ../src/camel/camel-gpg-context.c:1658
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg:n suoritus epÃ¤onnistui: %s"
 
-#: ../src/camel/camel-gpg-context.c:921
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1127
+#: ../src/camel/camel-gpg-context.c:917
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/camel/camel-gpg-context.c:1033
+#: ../src/camel/camel-gpg-context.c:1029
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -3141,17 +3017,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/camel/camel-gpg-context.c:1069
+#: ../src/camel/camel-gpg-context.c:1065
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg kÃ¤yttÃ¤jÃ¤tunnisteen vihjeen tulkitseminen epÃ¤onnistui."
 
-#: ../src/camel/camel-gpg-context.c:1094 ../src/camel/camel-gpg-context.c:1109
+#: ../src/camel/camel-gpg-context.c:1090 ../src/camel/camel-gpg-context.c:1105
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg salalausepyynnÃ¶n tulkinta epÃ¤onnistui."
 
-#: ../src/camel/camel-gpg-context.c:1130
+#: ../src/camel/camel-gpg-context.c:1126
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -3160,7 +3036,7 @@ msgstr ""
 "Tarvitset PIN-koodin avataksesi\n"
 "Ã¤lykorttisi: â€œ%sâ€"
 
-#: ../src/camel/camel-gpg-context.c:1134
+#: ../src/camel/camel-gpg-context.c:1130
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -3169,104 +3045,104 @@ msgstr ""
 "Tarvitse salalauseen avataksesi avaimen\n"
 "kÃ¤yttÃ¤jÃ¤lle: â€œ%sâ€"
 
-#: ../src/camel/camel-gpg-context.c:1140
+#: ../src/camel/camel-gpg-context.c:1136
 #, fuzzy, c-format
 #| msgid "Unexpected request from GnuPG for '%s'"
 msgid "Unexpected request from GnuPG for â€œ%sâ€"
 msgstr "Odottamaton pyyntÃ¶ GnuPG:ltÃ¤ kohteelle \"%s\""
 
-#: ../src/camel/camel-gpg-context.c:1152
+#: ../src/camel/camel-gpg-context.c:1148
 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 ""
 
-#: ../src/camel/camel-gpg-context.c:1183 ../src/camel/camel-net-utils.c:522
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:405
-#: ../src/libedataserver/e-client.c:161
+#: ../src/camel/camel-gpg-context.c:1179 ../src/camel/camel-net-utils.c:522
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:399
+#: ../src/libedataserver/e-client.c:156
 #, c-format
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../src/camel/camel-gpg-context.c:1204
+#: ../src/camel/camel-gpg-context.c:1200
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Salaisen avaimen avaus epÃ¤onnistui: 3 virheellistÃ¤ salalausetta syÃ¶tetty."
 
-#: ../src/camel/camel-gpg-context.c:1217
+#: ../src/camel/camel-gpg-context.c:1213
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus GnuPG:ltÃ¤: %s"
 
-#: ../src/camel/camel-gpg-context.c:1333
+#: ../src/camel/camel-gpg-context.c:1330
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Salaus epÃ¤onnistui: kelvollisia vastaanottajia ei ole mÃ¤Ã¤ritelty"
 
 #. Translators: The first '%s' is replaced with the e-mail address, like '<user example com>';
 #. the second '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
-#: ../src/camel/camel-gpg-context.c:1346
+#: ../src/camel/camel-gpg-context.c:1343
 #, c-format
 msgid ""
 "Failed to encrypt: Invalid recipient %s specified. A common issue is that "
 "the %s doesnâ€™t have imported public key for this recipient."
 msgstr ""
 
-#: ../src/camel/camel-gpg-context.c:2145 ../src/camel/camel-smime-context.c:873
+#: ../src/camel/camel-gpg-context.c:2169 ../src/camel/camel-smime-context.c:869
 msgid "Could not generate signing data: "
 msgstr "Allekirjoitustietoa ei voitu luoda: "
 
-#: ../src/camel/camel-gpg-context.c:2196 ../src/camel/camel-gpg-context.c:2435
-#: ../src/camel/camel-gpg-context.c:2574 ../src/camel/camel-gpg-context.c:2751
+#: ../src/camel/camel-gpg-context.c:2220 ../src/camel/camel-gpg-context.c:2459
+#: ../src/camel/camel-gpg-context.c:2598 ../src/camel/camel-gpg-context.c:2775
 msgid "Failed to execute gpg."
 msgstr "gpg:n suoritus epÃ¤onnistui."
 
-#: ../src/camel/camel-gpg-context.c:2303 ../src/camel/camel-gpg-context.c:2311
-#: ../src/camel/camel-gpg-context.c:2319 ../src/camel/camel-gpg-context.c:2339
-#: ../src/camel/camel-smime-context.c:1002
-#: ../src/camel/camel-smime-context.c:1016
-#: ../src/camel/camel-smime-context.c:1025
+#: ../src/camel/camel-gpg-context.c:2327 ../src/camel/camel-gpg-context.c:2335
+#: ../src/camel/camel-gpg-context.c:2343 ../src/camel/camel-gpg-context.c:2363
+#: ../src/camel/camel-smime-context.c:1000
+#: ../src/camel/camel-smime-context.c:1014
+#: ../src/camel/camel-smime-context.c:1026
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../src/camel/camel-gpg-context.c:2385
+#: ../src/camel/camel-gpg-context.c:2409
 msgid "Cannot verify message signature: "
 msgstr "Viestin allekirjoitusta ei voi vahvistaa: "
 
-#: ../src/camel/camel-gpg-context.c:2533
+#: ../src/camel/camel-gpg-context.c:2557
 #, fuzzy
 msgid "Could not generate encrypting data: "
 msgstr "Salaustieto ei voitu luoda: %s"
 
-#: ../src/camel/camel-gpg-context.c:2614
+#: ../src/camel/camel-gpg-context.c:2638
 msgid "This is a digitally encrypted message part"
 msgstr "Digitaalisesti salattu viestin osa"
 
-#: ../src/camel/camel-gpg-context.c:2674 ../src/camel/camel-gpg-context.c:2683
-#: ../src/camel/camel-gpg-context.c:2706
+#: ../src/camel/camel-gpg-context.c:2698 ../src/camel/camel-gpg-context.c:2707
+#: ../src/camel/camel-gpg-context.c:2730
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Viestin salausta ei voi purkaa: virheellinen viestin muoto"
 
-#: ../src/camel/camel-gpg-context.c:2694
+#: ../src/camel/camel-gpg-context.c:2718
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-osan salauksen purku epÃ¤onnistui: protokollavirhe"
 
-#: ../src/camel/camel-gpg-context.c:2766
+#: ../src/camel/camel-gpg-context.c:2790
 #, c-format
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "MIME-osan salauksen purku epÃ¤onnistui: salaista avainta ei lÃ¶ytynyt"
 
-#: ../src/camel/camel-gpg-context.c:2803
+#: ../src/camel/camel-gpg-context.c:2827
 #, c-format
 msgid "GPG blob contains unencrypted text: %s"
 msgstr ""
 
-#: ../src/camel/camel-gpg-context.c:2805
-#: ../src/camel/camel-smime-context.c:1545
+#: ../src/camel/camel-gpg-context.c:2829
+#: ../src/camel/camel-smime-context.c:1546
 msgid "Encrypted content"
 msgstr "Salattu sisÃ¤ltÃ¶"
 
@@ -3372,19 +3248,19 @@ msgstr "Virhe kirjoitettaessa vÃ¤liaikaista viestitiedostoa: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin vÃ¤liaikaistiedostoa: %s"
 
-#: ../src/camel/camel-multipart-signed.c:277
-#: ../src/camel/camel-multipart-signed.c:430
+#: ../src/camel/camel-multipart-signed.c:273
+#: ../src/camel/camel-multipart-signed.c:426
 #, c-format
 msgid "No content available"
 msgstr "Ei sisÃ¤ltÃ¶Ã¤ saatavilla"
 
-#: ../src/camel/camel-multipart-signed.c:285
-#: ../src/camel/camel-multipart-signed.c:438
+#: ../src/camel/camel-multipart-signed.c:281
+#: ../src/camel/camel-multipart-signed.c:434
 #, c-format
 msgid "No signature available"
 msgstr "Ei allekirjoitusta saatavilla"
 
-#: ../src/camel/camel-multipart-signed.c:804
+#: ../src/camel/camel-multipart-signed.c:798
 #, c-format
 msgid "parse error"
 msgstr "Virhe tulkittaessa"
@@ -3409,15 +3285,15 @@ msgstr ""
 msgid "Host lookup â€œ%sâ€ failed: %s"
 msgstr "Palvelimen %s osoitteen haku epÃ¤onnistui: %s"
 
-#: ../src/camel/camel-network-service.c:1127
+#: ../src/camel/camel-network-service.c:1128
 #, c-format
-msgid "Checking reach-ability of account â€œ%sâ€"
+msgid "Checking reachability of account â€œ%sâ€"
 msgstr ""
 
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-offline-folder.c:125
+#: ../src/camel/camel-offline-folder.c:179
 #, fuzzy, c-format
 #| msgid "Downloading new messages for offline mode"
 msgid "Downloading new messages for offline mode in â€œ%s : %sâ€"
@@ -3426,7 +3302,7 @@ msgstr "Haetaan uusia viestejÃ¤ yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-offline-folder.c:221
+#: ../src/camel/camel-offline-folder.c:277
 #, fuzzy, c-format
 #| msgid "Syncing messages in folder '%s' to disk"
 msgid "Storing changes in folder â€œ%s : %sâ€"
@@ -3435,7 +3311,7 @@ msgstr "Synkronoidaan viestejÃ¤ kansiossa %s levylle"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-offline-folder.c:311
+#: ../src/camel/camel-offline-folder.c:370
 #, fuzzy, c-format
 #| msgid "Downloading new messages for offline mode"
 msgid "Checking download of new messages for offline in â€œ%s : %sâ€"
@@ -3444,7 +3320,7 @@ msgstr "Haetaan uusia viestejÃ¤ yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-offline-folder.c:428
+#: ../src/camel/camel-offline-folder.c:490
 #, fuzzy, c-format
 #| msgid "Syncing messages in folder '%s' to disk"
 msgid "Syncing messages in folder â€œ%s : %sâ€ to disk"
@@ -3455,18 +3331,18 @@ msgstr "Synkronoidaan viestejÃ¤ kansiossa %s levylle"
 #. The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/camel-offline-folder.c:491
+#: ../src/camel/camel-offline-folder.c:584
 #, fuzzy, c-format
 #| msgid "Syncing messages in folder '%s' to disk"
 msgid "Syncing message %d of %d in folder â€œ%s : %sâ€ to disk"
 msgstr "Synkronoidaan viestejÃ¤ kansiossa %s levylle"
 
-#: ../src/camel/camel-offline-folder.c:542
+#: ../src/camel/camel-offline-folder.c:643
 #, fuzzy
 msgid "Copy folder content locally for _offline operation"
 msgstr "Kopioi kansion sisÃ¤ltÃ¶ paikallisesti yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 
-#: ../src/camel/camel-offline-store.c:268
+#: ../src/camel/camel-offline-store.c:304
 #, fuzzy, c-format
 #| msgid "Syncing messages in folder '%s' to disk"
 msgid "Syncing messages in account â€œ%sâ€ to disk"
@@ -3497,7 +3373,7 @@ msgstr "%s ei voitu ladata: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ei voitu ladata: moduulissa ei ole alustuskoodia"
 
-#: ../src/camel/camel-provider.c:463 ../src/camel/camel-session.c:434
+#: ../src/camel/camel-provider.c:463 ../src/camel/camel-session.c:430
 #, fuzzy, c-format
 #| msgid "No provider available for protocol '%s'"
 msgid "No provider available for protocol â€œ%sâ€"
@@ -3517,7 +3393,10 @@ msgstr "TÃ¤mÃ¤ valitsin kirjautuu palvelimelle anonyymisti."
 msgid "Authentication failed."
 msgstr "Todennus epÃ¤onnistui."
 
-#: ../src/camel/camel-sasl-anonymous.c:81
+#. Translators: the 'trace information' term comes from https://tools.ietf.org/html/rfc4505
+#. In this case the user set to use an email address as the trace information,
+#. but the provided value is not a valid email address.
+#: ../src/camel/camel-sasl-anonymous.c:84
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -3526,7 +3405,10 @@ msgstr ""
 "Virheellinen sÃ¤hkÃ¶postiosoitteen seurantatieto:\n"
 "%s"
 
-#: ../src/camel/camel-sasl-anonymous.c:95
+#. Translators: the 'trace information' term comes from https://tools.ietf.org/html/rfc4505
+#. In this case the user set to use an opaque trace information,
+#. but the provided value looks like an email address.
+#: ../src/camel/camel-sasl-anonymous.c:101
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3535,20 +3417,15 @@ msgstr ""
 "Virheellinen lÃ¤pinÃ¤kyvÃ¤n seurannan tieto:\n"
 "%s"
 
-#: ../src/camel/camel-sasl-anonymous.c:109
-#, c-format
-msgid ""
-"Invalid trace information:\n"
-"%s"
-msgstr ""
-"Virheellinen seurannan tieto:\n"
-"%s"
+#: ../src/camel/camel-sasl-anonymous.c:115 ../src/libedataserver/e-client.c:135
+msgid "Invalid argument"
+msgstr "Virheellinen argumentti"
 
-#: ../src/camel/camel-sasl-cram-md5.c:41
+#: ../src/camel/camel-sasl-cram-md5.c:37
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../src/camel/camel-sasl-cram-md5.c:43
+#: ../src/camel/camel-sasl-cram-md5.c:39
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -3556,11 +3433,11 @@ msgstr ""
 "TÃ¤mÃ¤ valinta yhdistÃ¤Ã¤ palvelimeen kÃ¤yttÃ¤en turvallista CRAM-MD5-salasanaa, "
 "jos palvelin tukee tÃ¤tÃ¤."
 
-#: ../src/camel/camel-sasl-digest-md5.c:54
+#: ../src/camel/camel-sasl-digest-md5.c:50
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../src/camel/camel-sasl-digest-md5.c:56
+#: ../src/camel/camel-sasl-digest-md5.c:52
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -3568,62 +3445,61 @@ msgstr ""
 "TÃ¤mÃ¤ valinta ottaa yhteyttÃ¤ palvelimeen kÃ¤yttÃ¤en turvallista DIGEST-MD5-"
 "salasanaa, jos palvelin tukee tÃ¤tÃ¤."
 
-#: ../src/camel/camel-sasl-digest-md5.c:852
+#: ../src/camel/camel-sasl-digest-md5.c:848
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Palvelimen haaste liian pitkÃ¤ (>2048 tavua)"
 
-#: ../src/camel/camel-sasl-digest-md5.c:863
+#: ../src/camel/camel-sasl-digest-md5.c:859
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Palvelimen haaste on virheellinen\n"
 
-#: ../src/camel/camel-sasl-digest-md5.c:871
+#: ../src/camel/camel-sasl-digest-md5.c:867
 #, fuzzy, c-format
 #| msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgid "Server challenge contained invalid â€œQuality of Protectionâ€ token"
 msgstr ""
 "Palvelimen haaste sisÃ¤lsi virheellisen \"Quality of Protection\" kentÃ¤n"
 
-#: ../src/camel/camel-sasl-digest-md5.c:904
+#: ../src/camel/camel-sasl-digest-md5.c:900
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Palvelimen vaste ei sisÃ¤ltÃ¤nyt todennustietoa"
 
-#: ../src/camel/camel-sasl-digest-md5.c:925
+#: ../src/camel/camel-sasl-digest-md5.c:921
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Palvelimen vaste sisÃ¤lsi vajaata todennustietoa"
 
-#: ../src/camel/camel-sasl-digest-md5.c:938
+#: ../src/camel/camel-sasl-digest-md5.c:934
 #, c-format
 msgid "Server response does not match"
 msgstr "Palvelimen vaste ei vastaa haluttua"
 
-#: ../src/camel/camel-sasl-gssapi.c:92
+#: ../src/camel/camel-sasl-gssapi.c:88
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../src/camel/camel-sasl-gssapi.c:94
+#: ../src/camel/camel-sasl-gssapi.c:90
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "TÃ¤mÃ¤ vaihtoehto yhdistÃ¤Ã¤ palvelimeen kÃ¤yttÃ¤en Kerberos 5 -tunnistautumista."
 
-#: ../src/camel/camel-sasl-gssapi.c:149
+#: ../src/camel/camel-sasl-gssapi.c:145
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
-msgstr ""
+msgstr "(Tuntematon GSSAPI-mekanismikoodi: %x)"
 
 #. Translators: the first '%s' is replaced with a generic error message,
 #. the second '%s' is replaced with additional error information.
-#: ../src/camel/camel-sasl-gssapi.c:172 ../src/camel/camel-sasl-gssapi.c:244
+#: ../src/camel/camel-sasl-gssapi.c:168 ../src/camel/camel-sasl-gssapi.c:240
 #, c-format
-#| msgid "%s (%s)"
 msgctxt "gssapi_error"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/camel/camel-sasl-gssapi.c:194
+#: ../src/camel/camel-sasl-gssapi.c:190
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -3631,11 +3507,11 @@ msgstr ""
 "Annettu valtuustieto ei tue mÃ¤Ã¤riteltyÃ¤ mekanismia, tai se on toteutukselle "
 "tuntematon."
 
-#: ../src/camel/camel-sasl-gssapi.c:199
+#: ../src/camel/camel-sasl-gssapi.c:195
 msgid "The provided target_name parameter was ill-formed."
 msgstr "MÃ¤Ã¤ritelty target_name parametri oli vÃ¤Ã¤rin muotoiltu."
 
-#: ../src/camel/camel-sasl-gssapi.c:202
+#: ../src/camel/camel-sasl-gssapi.c:198
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -3643,7 +3519,7 @@ msgstr ""
 "MÃ¤Ã¤ritelty target_name parametri sisÃ¤lsi virheellisen tai tukemattoman "
 "tyyppisen nimen."
 
-#: ../src/camel/camel-sasl-gssapi.c:206
+#: ../src/camel/camel-sasl-gssapi.c:202
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -3651,7 +3527,7 @@ msgstr ""
 "input_token sisÃ¤ltÃ¤Ã¤ eri kanavasidontoja kun mitÃ¤ on mÃ¤Ã¤ritelty "
 "input_chan_bindings parametrissa."
 
-#: ../src/camel/camel-sasl-gssapi.c:211
+#: ../src/camel/camel-sasl-gssapi.c:207
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -3659,7 +3535,7 @@ msgstr ""
 "input_token sisÃ¤ltÃ¤Ã¤ virheellisen allekirjoituksen tai allekirjoituksen, "
 "jota ei voi varmentaa."
 
-#: ../src/camel/camel-sasl-gssapi.c:215
+#: ../src/camel/camel-sasl-gssapi.c:211
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -3667,36 +3543,36 @@ msgstr ""
 "Annetut valtuustiedot eivÃ¤t ole kelvollisia tÃ¤mÃ¤n tilan alustamisessa tai "
 "valtuustiedon kahva ei viitannut mihinkÃ¤Ã¤n valtuustietoihin."
 
-#: ../src/camel/camel-sasl-gssapi.c:220
+#: ../src/camel/camel-sasl-gssapi.c:216
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "MÃ¤Ã¤ritelty tilakahva ei viittaa kelvolliseen tilaan."
 
-#: ../src/camel/camel-sasl-gssapi.c:223
+#: ../src/camel/camel-sasl-gssapi.c:219
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_check:ille tehdyt eheystarkistukset epÃ¤onnistuivat."
 
-#: ../src/camel/camel-sasl-gssapi.c:226
+#: ../src/camel/camel-sasl-gssapi.c:222
 msgid "The consistency checks performed on the credential failed."
 msgstr "Valtuustiedoille tehdyt eheystarkistukset epÃ¤onnistuivat."
 
-#: ../src/camel/camel-sasl-gssapi.c:229
+#: ../src/camel/camel-sasl-gssapi.c:225
 msgid "The referenced credentials have expired."
 msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 
-#: ../src/camel/camel-sasl-gssapi.c:235 ../src/camel/camel-sasl-gssapi.c:439
-#: ../src/camel/camel-sasl-gssapi.c:489 ../src/camel/camel-sasl-gssapi.c:506
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:802
+#: ../src/camel/camel-sasl-gssapi.c:231 ../src/camel/camel-sasl-gssapi.c:435
+#: ../src/camel/camel-sasl-gssapi.c:485 ../src/camel/camel-sasl-gssapi.c:502
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:806
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
-#: ../src/camel/camel-sasl-gssapi.c:286
+#: ../src/camel/camel-sasl-gssapi.c:282
 #, fuzzy
 #| msgid "Could not parse response"
 msgid "Could not get session bus:"
 msgstr "Vastauksen tulkitseminen epÃ¤onnistui"
 
-#: ../src/camel/camel-sasl-gssapi.c:320
+#: ../src/camel/camel-sasl-gssapi.c:316
 #, c-format
 msgid ""
 "Cannot ask for Kerberos ticket. Obtain the ticket manually, like on command "
@@ -3704,29 +3580,29 @@ msgid ""
 "Kerberos account there. Reported error was: %s"
 msgstr ""
 
-#: ../src/camel/camel-sasl-gssapi.c:518
+#: ../src/camel/camel-sasl-gssapi.c:514
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Turvakerros ei ole tuettu."
 
-#: ../src/camel/camel-sasl-login.c:35
+#: ../src/camel/camel-sasl-login.c:31
 msgid "Login"
 msgstr "Kirjautuminen"
 
-#: ../src/camel/camel-sasl-login.c:37 ../src/camel/camel-sasl-plain.c:41
+#: ../src/camel/camel-sasl-login.c:33 ../src/camel/camel-sasl-plain.c:37
 msgid "This option will connect to the server using a simple password."
 msgstr "TÃ¤mÃ¤ valitsin yhdistÃ¤Ã¤ palvelimeen yksinkertaista salasanaa kÃ¤yttÃ¤en."
 
-#: ../src/camel/camel-sasl-login.c:105
+#: ../src/camel/camel-sasl-login.c:101
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Tuntematon todennustila."
 
-#: ../src/camel/camel-sasl-ntlm.c:44
+#: ../src/camel/camel-sasl-ntlm.c:40
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../src/camel/camel-sasl-ntlm.c:46
+#: ../src/camel/camel-sasl-ntlm.c:42
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -3734,33 +3610,33 @@ msgstr ""
 "TÃ¤mÃ¤ valinta yhdistÃ¤Ã¤ Windows-palvelimeen kÃ¤yttÃ¤en NTLM/Secure Password-"
 "tunnistautumista."
 
-#: ../src/camel/camel-sasl-plain.c:39
+#: ../src/camel/camel-sasl-plain.c:35
 msgid "PLAIN"
 msgstr "SELVÃ„KIELINEN"
 
-#: ../src/camel/camel-sasl-popb4smtp.c:41
+#: ../src/camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "POP ennen SMTP:tÃ¤"
 
-#: ../src/camel/camel-sasl-popb4smtp.c:43
+#: ../src/camel/camel-sasl-popb4smtp.c:39
 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Ã¶Ã¤."
 
-#: ../src/camel/camel-sasl-popb4smtp.c:81
+#: ../src/camel/camel-sasl-popb4smtp.c:77
 #, fuzzy
 msgid "POP Source UID"
 msgstr "POP:in lÃ¤hde-URI"
 
-#: ../src/camel/camel-sasl-popb4smtp.c:95
+#: ../src/camel/camel-sasl-popb4smtp.c:91
 #, fuzzy, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr ""
 "POP ennen SMTP:tÃ¤ tunnistautuminen kÃ¤yttÃ¤en tuntematonta siirtomenetelmÃ¤Ã¤"
 
-#: ../src/camel/camel-sasl-popb4smtp.c:107
-#: ../src/camel/camel-sasl-popb4smtp.c:116
+#: ../src/camel/camel-sasl-popb4smtp.c:103
+#: ../src/camel/camel-sasl-popb4smtp.c:112
 #, 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"
@@ -3803,303 +3679,303 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "SÃ¤Ã¤nnÃ¶llisen lausekkeen kÃ¤Ã¤nnÃ¶s epÃ¤onnistui: %s: %s"
 
-#: ../src/camel/camel-session.c:443
+#: ../src/camel/camel-session.c:439
 #, fuzzy, c-format
 msgid "Invalid GType registered for protocol â€œ%sâ€"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../src/camel/camel-session.c:512
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3153
-#: ../src/camel/providers/pop3/camel-pop3-store.c:306
-#: ../src/camel/providers/pop3/camel-pop3-store.c:790
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:670
+#: ../src/camel/camel-session.c:508
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3197
+#: ../src/camel/providers/pop3/camel-pop3-store.c:303
+#: ../src/camel/providers/pop3/camel-pop3-store.c:807
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:674
 #, c-format
 msgid "No support for %s authentication"
 msgstr "TunnistautumismenetelmÃ¤ %s ei ole tuettu"
 
-#: ../src/camel/camel-session.c:527
+#: ../src/camel/camel-session.c:523
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s-tunnistautuminen epÃ¤onnistui"
 
-#: ../src/camel/camel-session.c:596
+#: ../src/camel/camel-session.c:592
 msgid "Forwarding messages is not supported"
 msgstr "Viestien edelleenlÃ¤hetystÃ¤ ei tueta"
 
-#: ../src/camel/camel-smime-context.c:347
+#: ../src/camel/camel-smime-context.c:343
 #, fuzzy, c-format
 #| msgid "Cannot find certificate for '%s'"
 msgid "Cannot find certificate for â€œ%sâ€"
 msgstr "Varmennetta \"%s\":lle ei lÃ¶ydy"
 
-#: ../src/camel/camel-smime-context.c:375
+#: ../src/camel/camel-smime-context.c:371
 msgid "Cannot create CMS message"
 msgstr "CMS-viestiÃ¤ ei voi luoda"
 
-#: ../src/camel/camel-smime-context.c:380
+#: ../src/camel/camel-smime-context.c:376
 msgid "Cannot create CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voitu luoda"
 
-#: ../src/camel/camel-smime-context.c:386
+#: ../src/camel/camel-smime-context.c:382
 msgid "Cannot attach CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voi liittÃ¤Ã¤"
 
-#: ../src/camel/camel-smime-context.c:393
+#: ../src/camel/camel-smime-context.c:389
 msgid "Cannot attach CMS data"
 msgstr "CMS-tietoa ei voi liittÃ¤Ã¤"
 
-#: ../src/camel/camel-smime-context.c:399
+#: ../src/camel/camel-smime-context.c:395
 msgid "Cannot create CMS Signer information"
 msgstr "CMS-allekirjoitustietoa ei voitu luoda"
 
-#: ../src/camel/camel-smime-context.c:405
+#: ../src/camel/camel-smime-context.c:401
 msgid "Cannot find certificate chain"
 msgstr "Varmenneketjua ei lÃ¶ydy"
 
-#: ../src/camel/camel-smime-context.c:411
+#: ../src/camel/camel-smime-context.c:407
 msgid "Cannot add CMS Signing time"
 msgstr "CMS-allekirjoitusaikaa ei voi lisÃ¤tÃ¤"
 
-#: ../src/camel/camel-smime-context.c:435
-#: ../src/camel/camel-smime-context.c:450
+#: ../src/camel/camel-smime-context.c:431
+#: ../src/camel/camel-smime-context.c:446
 #, c-format
 msgid "Encryption certificate for â€œ%sâ€ does not exist"
-msgstr "Salausvarmennetta kohteelle â€œ%sâ€ ei ole olemassa."
+msgstr "Salausvarmennetta kohteelle â€œ%sâ€ ei ole olemassa"
 
-#: ../src/camel/camel-smime-context.c:457
+#: ../src/camel/camel-smime-context.c:453
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs-attribuuttia ei voi lisÃ¤tÃ¤"
 
-#: ../src/camel/camel-smime-context.c:462
+#: ../src/camel/camel-smime-context.c:458
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs -attribuuttia ei voi lisÃ¤tÃ¤"
 
-#: ../src/camel/camel-smime-context.c:467
+#: ../src/camel/camel-smime-context.c:463
 msgid "Cannot add encryption certificate"
 msgstr "Salausvarmennetta ei voi lisÃ¤tÃ¤"
 
-#: ../src/camel/camel-smime-context.c:473
+#: ../src/camel/camel-smime-context.c:469
 msgid "Cannot add CMS Signer information"
 msgstr "CMS-allekirjoittajatietoa ei voi lisÃ¤tÃ¤"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../src/camel/camel-smime-context.c:506
+#: ../src/camel/camel-smime-context.c:502
 msgid "Unverified"
 msgstr "Varmistamaton"
 
-#: ../src/camel/camel-smime-context.c:508
+#: ../src/camel/camel-smime-context.c:504
 msgid "Good signature"
 msgstr "HyvÃ¤ksytty allekirjoitus"
 
-#: ../src/camel/camel-smime-context.c:510
+#: ../src/camel/camel-smime-context.c:506
 msgid "Bad signature"
 msgstr "HylÃ¤tty allekirjoitus"
 
-#: ../src/camel/camel-smime-context.c:512
+#: ../src/camel/camel-smime-context.c:508
 msgid "Content tampered with or altered in transit"
 msgstr "SisÃ¤ltÃ¶Ã¤ muutettu siirrettÃ¤essÃ¤"
 
-#: ../src/camel/camel-smime-context.c:514
+#: ../src/camel/camel-smime-context.c:510
 msgid "Signing certificate not found"
 msgstr "Allekirjoitusvarmennetta ei lÃ¶ytynyt"
 
-#: ../src/camel/camel-smime-context.c:516
+#: ../src/camel/camel-smime-context.c:512
 msgid "Signing certificate not trusted"
 msgstr "Allekirjoitusvarmenteeseen ei luoteta"
 
-#: ../src/camel/camel-smime-context.c:518
+#: ../src/camel/camel-smime-context.c:514
 msgid "Signature algorithm unknown"
 msgstr "Allekirjoituksen algoritmi on tuntematon"
 
-#: ../src/camel/camel-smime-context.c:520
+#: ../src/camel/camel-smime-context.c:516
 msgid "Signature algorithm unsupported"
 msgstr "Allekirjoituksen algoritmi ei ole tuettu"
 
-#: ../src/camel/camel-smime-context.c:522
+#: ../src/camel/camel-smime-context.c:518
 msgid "Malformed signature"
 msgstr "Virhe allekirjoituksen muodossa"
 
-#: ../src/camel/camel-smime-context.c:524
+#: ../src/camel/camel-smime-context.c:520
 msgid "Processing error"
 msgstr "Virhe kÃ¤sittelyssÃ¤"
 
-#: ../src/camel/camel-smime-context.c:569
+#: ../src/camel/camel-smime-context.c:565
 msgid "No signed data in signature"
 msgstr "Allekirjoituksessa ei ole allekirjoitettua tietoa"
 
-#: ../src/camel/camel-smime-context.c:574
+#: ../src/camel/camel-smime-context.c:570
 msgid "Digests missing from enveloped data"
 msgstr "Viestin kuoresta ei ole tiivisteitÃ¤."
 
-#: ../src/camel/camel-smime-context.c:587
-#: ../src/camel/camel-smime-context.c:598
+#: ../src/camel/camel-smime-context.c:583
+#: ../src/camel/camel-smime-context.c:594
 msgid "Cannot calculate digests"
 msgstr "TiivisteitÃ¤ ei voi laskea"
 
+#: ../src/camel/camel-smime-context.c:601
 #: ../src/camel/camel-smime-context.c:605
-#: ../src/camel/camel-smime-context.c:609
 msgid "Cannot set message digests"
 msgstr "Viestin tiivisteitÃ¤ ei voi asettaa"
 
-#: ../src/camel/camel-smime-context.c:619
-#: ../src/camel/camel-smime-context.c:624
+#: ../src/camel/camel-smime-context.c:615
+#: ../src/camel/camel-smime-context.c:620
 msgid "Certificate import failed"
 msgstr "Varmenteen tuonti epÃ¤onnistui"
 
-#: ../src/camel/camel-smime-context.c:634
+#: ../src/camel/camel-smime-context.c:630
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Viesti on itsessÃ¤Ã¤n varmenne, varmenteita ei voi tarkistaa"
 
-#: ../src/camel/camel-smime-context.c:637
+#: ../src/camel/camel-smime-context.c:633
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Viesti on itsessÃ¤Ã¤n varmenne, varmenteet tuotu ja tarkistettu"
 
-#: ../src/camel/camel-smime-context.c:641
+#: ../src/camel/camel-smime-context.c:637
 msgid "Cannot find signature digests"
 msgstr "AllekirjoitustiivisteitÃ¤ ei lÃ¶ydy"
 
-#: ../src/camel/camel-smime-context.c:660
+#: ../src/camel/camel-smime-context.c:656
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allekirjoittaja: %s <%s>: %s\n"
 
-#: ../src/camel/camel-smime-context.c:885
-#: ../src/camel/camel-smime-context.c:1402
+#: ../src/camel/camel-smime-context.c:881
+#: ../src/camel/camel-smime-context.c:1403
 msgid "Cannot create encoder context"
 msgstr "Kooderin kontekstia ei voi luoda"
 
-#: ../src/camel/camel-smime-context.c:891
+#: ../src/camel/camel-smime-context.c:887
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS-kooderiin ei voitu lisÃ¤tÃ¤ tietoa"
 
-#: ../src/camel/camel-smime-context.c:896
-#: ../src/camel/camel-smime-context.c:1419
+#: ../src/camel/camel-smime-context.c:892
+#: ../src/camel/camel-smime-context.c:1420
 msgid "Failed to encode data"
 msgstr "Tiedon koodaus epÃ¤onnistui"
 
-#: ../src/camel/camel-smime-context.c:1044
-#: ../src/camel/camel-smime-context.c:1520
+#: ../src/camel/camel-smime-context.c:1045
+#: ../src/camel/camel-smime-context.c:1521
 msgid "Decoder failed"
 msgstr "Purkaja epÃ¤onnistui"
 
-#: ../src/camel/camel-smime-context.c:1296
+#: ../src/camel/camel-smime-context.c:1297
 #, fuzzy, c-format
 #| msgid "Cannot find certificate for '%s'"
 msgid "No valid or appropriate certificate for â€œ%sâ€ was found"
 msgstr "Varmennetta \"%s\":lle ei lÃ¶ydy"
 
-#: ../src/camel/camel-smime-context.c:1336
+#: ../src/camel/camel-smime-context.c:1337
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "YhteistÃ¤ massasalausalgoritmia ei lÃ¶ydy"
 
-#: ../src/camel/camel-smime-context.c:1344
+#: ../src/camel/camel-smime-context.c:1345
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Lokeroa massasalausavaimelle ei voi varata"
 
-#: ../src/camel/camel-smime-context.c:1355
+#: ../src/camel/camel-smime-context.c:1356
 msgid "Cannot create CMS Message"
 msgstr "CMS-viestiÃ¤ ei voi luoda"
 
-#: ../src/camel/camel-smime-context.c:1361
+#: ../src/camel/camel-smime-context.c:1362
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS-kÃ¤Ã¤rittyÃ¤ tietoa ei voi luoda"
 
-#: ../src/camel/camel-smime-context.c:1367
+#: ../src/camel/camel-smime-context.c:1368
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS-kÃ¤Ã¤rittyÃ¤ tietoa ei voi liittÃ¤Ã¤"
 
-#: ../src/camel/camel-smime-context.c:1373
+#: ../src/camel/camel-smime-context.c:1374
 msgid "Cannot attach CMS data object"
 msgstr "CMS-tieto-oliota ei voi liittÃ¤Ã¤"
 
-#: ../src/camel/camel-smime-context.c:1382
+#: ../src/camel/camel-smime-context.c:1383
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi luoda"
 
-#: ../src/camel/camel-smime-context.c:1387
+#: ../src/camel/camel-smime-context.c:1388
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi lisÃ¤tÃ¤"
 
-#: ../src/camel/camel-smime-context.c:1413
+#: ../src/camel/camel-smime-context.c:1414
 msgid "Failed to add data to encoder"
 msgstr "Tiedon lisÃ¤ys koodaajaan epÃ¤onnistui"
 
-#: ../src/camel/camel-smime-context.c:1527
+#: ../src/camel/camel-smime-context.c:1528
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME-purku: salauskontekstia ei lÃ¶ytynyt"
 
-#: ../src/camel/camel-store.c:1421
+#: ../src/camel/camel-store.c:1412
 #, c-format
 msgid "Opening folder â€œ%sâ€"
 msgstr "Avataan kansiota â€œ%sâ€"
 
-#: ../src/camel/camel-store.c:1718
+#: ../src/camel/camel-store.c:1709
 #, fuzzy, c-format
 #| msgid "Scanning folders in '%s'"
 msgid "Scanning folders in â€œ%sâ€"
 msgstr "Tutkitaan kansion â€%sâ€ alikansioita"
 
-#: ../src/camel/camel-store.c:1746 ../src/camel/camel-store.c:1791
+#: ../src/camel/camel-store.c:1737 ../src/camel/camel-store.c:1782
 #: ../src/camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Roskakori"
 
-#: ../src/camel/camel-store.c:1760 ../src/camel/camel-store.c:1808
+#: ../src/camel/camel-store.c:1751 ../src/camel/camel-store.c:1799
 #: ../src/camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../src/camel/camel-store.c:2413
+#: ../src/camel/camel-store.c:2404
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
 
-#: ../src/camel/camel-store.c:2420
+#: ../src/camel/camel-store.c:2411
 #, c-format
 msgid "Creating folder â€œ%sâ€"
 msgstr "Luodaan kansiota â€œ%sâ€"
 
-#: ../src/camel/camel-store.c:2598 ../src/camel/camel-vee-store.c:430
-#: ../src/camel/providers/local/camel-maildir-store.c:344
+#: ../src/camel/camel-store.c:2589 ../src/camel/camel-vee-store.c:426
+#: ../src/camel/providers/local/camel-maildir-store.c:340
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: ../src/camel/camel-store.c:2789 ../src/camel/camel-vee-store.c:481
-#: ../src/camel/providers/local/camel-maildir-store.c:912
+#: ../src/camel/camel-store.c:2780 ../src/camel/camel-vee-store.c:477
+#: ../src/camel/providers/local/camel-maildir-store.c:908
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeÃ¤minen ei onnistu: %s: virheellinen toiminto"
 
-#: ../src/camel/camel-stream.c:170
+#: ../src/camel/camel-stream.c:167
 #, fuzzy
 #| msgid "Cannot authenticate without a username"
 msgid "Cannot write with no base stream"
 msgstr "Tunnistautuminen ilman kÃ¤yttÃ¤jÃ¤tunnusta ei ole mahdollista"
 
-#: ../src/camel/camel-stream.c:290 ../src/camel/camel-stream.c:341
+#: ../src/camel/camel-stream.c:287 ../src/camel/camel-stream.c:338
 #, fuzzy, c-format
 #| msgid "Store root %s is not an absolute path"
 msgid "Stream type â€œ%sâ€ is not seekable"
 msgstr "SÃ¤ilÃ¶n juuri %s ei ole absoluuttinen polku"
 
-#: ../src/camel/camel-stream-filter.c:342
+#: ../src/camel/camel-stream-filter.c:339
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr ""
 
-#: ../src/camel/camel-stream-null.c:88
+#: ../src/camel/camel-stream-null.c:89
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr ""
 
-#: ../src/camel/camel-stream-process.c:284
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:717
+#: ../src/camel/camel-stream-process.c:282
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:721
 #, c-format
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: ../src/camel/camel-stream-process.c:289
+#: ../src/camel/camel-stream-process.c:287
 #, c-format
 msgid "Could not connect with command â€œ%sâ€: %s"
 msgstr "YhdistÃ¤minen komennolla â€œ%sâ€ epÃ¤onnistui: %s"
@@ -4125,7 +4001,7 @@ msgstr "URLia \"%s\" ei voi tulkita"
 msgid "Updating folder â€œ%sâ€"
 msgstr "PÃ¤ivitetÃ¤Ã¤n kansiota â€œ%sâ€"
 
-#: ../src/camel/camel-vee-folder.c:965 ../src/camel/camel-vee-folder.c:1082
+#: ../src/camel/camel-vee-folder.c:1185 ../src/camel/camel-vee-folder.c:1321
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
@@ -4135,42 +4011,48 @@ msgstr ""
 #. is replaced with an account name and the third â€œ%sâ€ is replaced with a full
 #. path name. The spaces around â€œ:â€ are intentional, as the whole â€œ%s : %sâ€ is
 #. meant as an absolute identification of the folder.
-#: ../src/camel/camel-vee-folder.c:1002
+#: ../src/camel/camel-vee-folder.c:1222
 #, fuzzy, c-format
 #| msgid "No such message %s in %s"
 msgid "No such message %s in â€œ%s : %sâ€"
 msgstr "ViestiÃ¤ %s ei voitu lÃ¶ytÃ¤Ã¤ %s:stÃ¤"
 
-#: ../src/camel/camel-vee-folder.c:1058
+#: ../src/camel/camel-vee-folder.c:1297
 #, fuzzy, c-format
 msgid "Error storing â€œ%sâ€: "
 msgstr "Virhe tallennettaessa \"%s\": %s"
 
-#: ../src/camel/camel-vee-folder.c:1308
+#: ../src/camel/camel-vee-folder.c:1487
+#, fuzzy, c-format
+#| msgid "Updating folder â€œ%sâ€"
+msgid "Updating search folder â€œ%sâ€"
+msgstr "PÃ¤ivitetÃ¤Ã¤n kansiota â€œ%sâ€"
+
+#: ../src/camel/camel-vee-folder.c:1545
 msgid "Automatically _update on change in source folders"
 msgstr ""
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../src/camel/camel-vee-store.c:38
+#: ../src/camel/camel-vee-store.c:34
 msgid "Unmatched"
 msgstr "Ei vastaavaa"
 
-#: ../src/camel/camel-vee-store.c:456
+#: ../src/camel/camel-vee-store.c:452
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: ../src/camel/camel-vee-store.c:491
+#: ../src/camel/camel-vee-store.c:487
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion nimeÃ¤minen ei onnistu: %s: kansiota ei lÃ¶ydy"
 
-#: ../src/camel/camel-vee-store.c:554
+#: ../src/camel/camel-vee-store.c:548
 msgid "Enable _Unmatched folder"
 msgstr ""
 
-#: ../src/camel/camel-vee-store.c:1109
+#: ../src/camel/camel-vee-store.c:1104
 #, fuzzy
 msgid "Updating Unmatched search folder"
 msgstr "Tallennetaan kansiota"
@@ -4183,7 +4065,7 @@ msgstr "ViestejÃ¤ ei voi kopioida roskakoriin"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ViestejÃ¤ ei voi kopioida roskapostikansioon"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:985
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:979
 #, fuzzy, c-format
 #| msgid "You must be working online to complete this operation"
 msgid "You must be working online to complete this operation (%s)"
@@ -4191,45 +4073,45 @@ msgstr ""
 "Sinun tÃ¤ytyy olla yhteydellisessÃ¤ tilassa suorittaaksesi tÃ¤mÃ¤n toiminnon "
 "loppuun"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:993
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3292
-#: ../src/camel/providers/nntp/camel-nntp-store.c:351
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1346
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2158
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2306
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:987
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3344
+#: ../src/camel/providers/nntp/camel-nntp-store.c:348
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1343
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2153
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2308
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:450
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:633
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:922
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:1136
-#: ../src/camel/providers/pop3/camel-pop3-store.c:294
-#: ../src/camel/providers/pop3/camel-pop3-store.c:529
-#: ../src/camel/providers/pop3/camel-pop3-store.c:577
-#: ../src/camel/providers/pop3/camel-pop3-store.c:672
-#: ../src/camel/providers/pop3/camel-pop3-store.c:1107
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:541
+#: ../src/camel/providers/pop3/camel-pop3-store.c:291
+#: ../src/camel/providers/pop3/camel-pop3-store.c:526
+#: ../src/camel/providers/pop3/camel-pop3-store.c:574
+#: ../src/camel/providers/pop3/camel-pop3-store.c:671
+#: ../src/camel/providers/pop3/camel-pop3-store.c:1122
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:545
 #, 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1620
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1716
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1614
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1710
 #, c-format
 msgid "No destination folder specified"
 msgstr "Kohdekansiota ei mÃ¤Ã¤ritelty"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1647
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1641
 #, fuzzy
 msgid "Unable to move junk messages"
 msgstr "Viestin haku epÃ¤onnistui: %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1750
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1744
 #, fuzzy
 msgid "Unable to move deleted messages"
 msgstr "Viestin haku epÃ¤onnistui: %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1818
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1812
 #, fuzzy
 msgid "Unable to move messages to Inbox"
 msgstr "Viestin haku epÃ¤onnistui: %s"
@@ -4237,7 +4119,7 @@ msgstr "Viestin haku epÃ¤onnistui: %s"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:758
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:766
 #, fuzzy, c-format
 #| msgid "No provider available for protocol '%s'"
 msgid "No quota information available for folder â€œ%s : %sâ€"
@@ -4247,27 +4129,27 @@ msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1025
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1033
 #, fuzzy, c-format
 #| msgid "Syncing messages in folder '%s' to disk"
 msgid "Removing stale cache files in folder â€œ%s : %sâ€"
 msgstr "Synkronoidaan viestejÃ¤ kansiossa %s levylle"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1119
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:841
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1125
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:835
 msgid "Apply message _filters to this folder"
 msgstr "Toteuta v_iestisuodattimet tÃ¤ssÃ¤ kansiossa"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1130
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1137
 msgid "Always check for _new mail in this folder"
 msgstr "Etsi aina uusia _viestejÃ¤ tÃ¤stÃ¤ kansiosta"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1243
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1252
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr ""
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1255
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1264
 #, fuzzy, c-format
 msgid "Could not create cache for %s: "
 msgstr "VÃ¤limuistitiedostoa ei voitu luoda"
@@ -4275,13 +4157,13 @@ msgstr "VÃ¤limuistitiedostoa ei voitu luoda"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1460
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1464
 #, fuzzy, c-format
 #| msgid "No provider available for protocol '%s'"
 msgid "No IMAP mailbox available for folder â€œ%s : %sâ€"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../src/camel/providers/imapx/camel-imapx-input-stream.c:102
+#: ../src/camel/providers/imapx/camel-imapx-input-stream.c:101
 #, c-format
 msgid "Source stream returned no data"
 msgstr ""
@@ -4314,24 +4196,28 @@ msgstr "Yhteys palvelimeen"
 msgid "Numbe_r of concurrent connections to use"
 msgstr ""
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:52
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Enable full folder update on _metered network"
+msgstr ""
+
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
 #: ../src/camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "Kansiot"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Show only subscribed folders"
 msgstr "_NÃ¤ytÃ¤ ainoastaan tilatut kansiot"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:57
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
 msgid "O_verride server-supplied folder namespace"
 msgstr "Ohita pal_velimen tarjoama kansioiden nimiavaruus"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:61
 msgid "Namespace:"
 msgstr "Nimiavaruus:"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:62
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:64
 #: ../src/camel/providers/local/camel-local-provider.c:37
 #: ../src/camel/providers/local/camel-local-provider.c:63
 #: ../src/camel/providers/local/camel-local-provider.c:84
@@ -4340,18 +4226,18 @@ msgstr "Nimiavaruus:"
 msgid "Options"
 msgstr "Asetukset"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:64
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:66
 #: ../src/camel/providers/local/camel-local-provider.c:39
 #: ../src/camel/providers/nntp/camel-nntp-provider.c:38
 msgid "Apply _filters to new messages in all folders"
 msgstr "_KÃ¤ytÃ¤ suodattimia uusille viesteille kaikissa kansioissa"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:66
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:68
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "KÃ¤ytÃ¤ suodattimia uusille viesteille saapuvien kansiossa tÃ¤llÃ¤ palvelimella"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:68
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:70
 #: ../src/camel/providers/local/camel-local-provider.c:41
 #: ../src/camel/providers/local/camel-local-provider.c:67
 #: ../src/camel/providers/local/camel-local-provider.c:88
@@ -4360,156 +4246,168 @@ msgstr ""
 msgid "Check new messages for _Junk contents"
 msgstr "_Etsi roskapostia uusista viesteistÃ¤"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:70
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:72
 #, 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:72
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:74
 #, 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:79
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:81
 msgid "Default IMAP port"
 msgstr "IMAP:in oletusportti"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:82
 msgid "IMAP over TLS"
 msgstr "IMAP TLS:llÃ¤"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:87
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:89
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "SÃ¤hkÃ¶postien luku ja tallennus IMAP-palvelimilta."
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:1139
+#: ../src/camel/providers/imapx/camel-imapx-server.c:1164
 #, fuzzy
 msgid "Error writing to cache stream"
 msgstr "Virhe kirjoitettaessa vÃ¤liaikaista viestitiedostoa: %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2968
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3056
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3325
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3012
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3100
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3377
 #, fuzzy
 msgid "Failed to get capabilities"
 msgstr "VÃ¤limuistiin tallennus epÃ¤onnistui %s: %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2987
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3031
 #, 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2988
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:279
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3032
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:283
 msgid "STARTTLS not supported"
 msgstr "STARTTLS laajennos ei ole kÃ¤ytettÃ¤vissÃ¤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2997
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3041
 msgid "Failed to issue STARTTLS"
-msgstr ""
+msgstr "STARTTLS epÃ¤onnistui"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3045
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3089
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "IMAP-palvelimeen %s yhdistÃ¤minen turvallisessa tilassa epÃ¤onnistui: "
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3140
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3184
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP-palvelin %s ei tue tunnistautumismenetelmÃ¤Ã¤ %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3171
-#: ../src/camel/providers/nntp/camel-nntp-store.c:457
-#: ../src/camel/providers/nntp/camel-nntp-store.c:599
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3210
+#, c-format
+msgid ""
+"Plaintext authentication disallowed on insecure connections. Change "
+"encryption to STARTTLS or TLS for account â€œ%sâ€."
+msgstr ""
+
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3223
+#: ../src/camel/providers/nntp/camel-nntp-store.c:454
+#: ../src/camel/providers/nntp/camel-nntp-store.c:596
 msgid "Cannot authenticate without a username"
 msgstr "Tunnistautuminen ilman kÃ¤yttÃ¤jÃ¤tunnusta ei ole mahdollista"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3180
-#: ../src/camel/providers/nntp/camel-nntp-store.c:608
-#: ../src/camel/providers/pop3/camel-pop3-store.c:690
-#: ../src/camel/providers/pop3/camel-pop3-store.c:728
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3232
+#: ../src/camel/providers/nntp/camel-nntp-store.c:605
+#: ../src/camel/providers/pop3/camel-pop3-store.c:707
+#: ../src/camel/providers/pop3/camel-pop3-store.c:745
 msgid "Authentication password not available"
 msgstr "Tunnistautumissalasanaa ei kÃ¤ytettÃ¤vissÃ¤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3188
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3240
 msgid "Failed to authenticate"
 msgstr "Tunnistautuminen epÃ¤onnistui"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3347
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3404
+#, fuzzy
+msgid "Failed to issue ENABLE UTF8=ACCEPT"
+msgstr "Virhe viestin %d kohdalla"
+
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3426
 msgid "Failed to issue NAMESPACE"
 msgstr ""
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3365
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3444
 #, fuzzy
 msgid "Failed to enable QResync"
 msgstr "VÃ¤limuistiin tallennus epÃ¤onnistui %s: %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3397
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3481
 #, fuzzy
 msgid "Failed to issue NOTIFY"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3876
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3960
 msgid "Failed to select mailbox"
 msgstr "Postilaatikon valinta epÃ¤onnistui"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3979
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4063
 #, fuzzy
 msgid "Cannot issue command, no stream available"
 msgstr "Palvelu ei ole saatavilla"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4245
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4329
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ViestiÃ¤ tunnisteella %s ei voi noutaa: %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4246
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4330
 msgid "No such message available."
 msgstr "TÃ¤mÃ¤ viesti ei ole saatavilla."
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4294
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4319
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4358
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4379
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4404
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4443
 msgid "Error fetching message"
 msgstr "Virhe viestiÃ¤ noutaessa"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4336
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5099
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4421
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5188
 msgid "Error performing NOOP"
 msgstr "Virhe suoritettaessa NOOP"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4351
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4436
 #, fuzzy
 msgid "Failed to close the tmp stream"
 msgstr "Tiedon koodaus epÃ¤onnistui"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4382
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4467
 #, fuzzy
 msgid "Failed to copy the tmp file"
 msgstr "VÃ¤limuistiin tallennus epÃ¤onnistui %s: %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4620
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4705
 msgid "Error moving messages"
 msgstr "Virhe viestejÃ¤ siirtÃ¤essÃ¤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4620
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4705
 msgid "Error copying messages"
 msgstr "Virhe viestejÃ¤ kopioitaessa"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4892
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4913
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4978
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4999
 #, fuzzy
 msgid "Cannot create spool file: "
 msgstr "ViestiÃ¤ ei voi luoda: %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4999
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5085
 #, fuzzy
 msgid "Error appending message"
 msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
@@ -4517,12 +4415,12 @@ msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5252
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5341
 #, fuzzy, c-format
 msgid "Scanning for changed messages in â€œ%s : %sâ€"
 msgstr "EtsitÃ¤Ã¤n muuttuneita viestejÃ¤ kansiosta %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5256
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5345
 #, fuzzy
 #| msgid "Error syncing changes"
 msgid "Error scanning changes"
@@ -4531,130 +4429,133 @@ msgstr "Virhe muutoksia synkronoidessa"
 #. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
 #. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
 #. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5277
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5366
 #, fuzzy, c-format
 msgid "Fetching summary information for new messages in â€œ%s : %sâ€"
 msgstr "Haetaan yhteenvetoa uusista viesteistÃ¤ kansiossa %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5295
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5394
 #, fuzzy
 #| msgid "Error fetching message"
 msgid "Error fetching message info"
 msgstr "Virhe viestiÃ¤ noutaessa"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5401
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5527
 msgid "Error running STATUS"
 msgstr "Virhe suorittaessa STATUS"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5947
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5977
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6012
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6101
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6156
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6220
 msgid "Error syncing changes"
 msgstr "Virhe muutoksia synkronoidessa"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6150
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6114
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6166
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6239
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6383
 #, fuzzy
 msgid "Error expunging message"
 msgstr "Poistetaan vanhoja viestejÃ¤ pysyvÃ¤sti"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6228
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6465
 msgid "Error fetching folders"
 msgstr "Virhe kansioita noutaessa"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6236
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6473
 msgid "Error fetching subscribed folders"
 msgstr "Virhe tilattuja kansioita noutaessa"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6291
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6530
 msgid "Error creating folder"
 msgstr "Virhe luotaessa kansiota"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6347
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6580
 msgid "Error deleting folder"
 msgstr "Virhe kansiota poistaessa"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6393
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6626
 msgid "Error renaming folder"
 msgstr "Virhe kansion nimeÃ¤ muutettaessa"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6425
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6658
 msgid "Error subscribing to folder"
 msgstr "Virhe kansiota tilatessa"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6461
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6694
 #, fuzzy
 msgid "Error unsubscribing from folder"
 msgstr "_NÃ¤ytÃ¤ ainoastaan tilatut kansiot"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6501
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6734
 msgid "IMAP server does not support quotas"
 msgstr "IMAP-palvelin ei tue quota-tilarajoja"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6513
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6746
 msgid "Error retrieving quota information"
 msgstr "Virhe haettaessa kiintiÃ¶tietoja"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6576
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6811
 msgid "Search failed"
 msgstr "Haku epÃ¤onnistui"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6694
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6939
 msgid "Error running IDLE"
 msgstr "Virhe suoritettaessa IDLE"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../src/camel/providers/imapx/camel-imapx-store.c:354
+#: ../src/camel/providers/imapx/camel-imapx-store.c:353
 #: ../src/camel/providers/local/camel-maildir-folder.c:476
-#: ../src/camel/providers/local/camel-maildir-store.c:345
-#: ../src/camel/providers/local/camel-maildir-store.c:824
-#: ../src/camel/providers/local/camel-maildir-store.c:830
-#: ../src/camel/providers/local/camel-maildir-store.c:913
-#: ../src/camel/providers/local/camel-spool-store.c:390
+#: ../src/camel/providers/local/camel-maildir-store.c:341
+#: ../src/camel/providers/local/camel-maildir-store.c:820
+#: ../src/camel/providers/local/camel-maildir-store.c:826
+#: ../src/camel/providers/local/camel-maildir-store.c:909
+#: ../src/camel/providers/local/camel-spool-store.c:386
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:957
+#: ../src/camel/providers/imapx/camel-imapx-store.c:956
 #, c-format
 msgid "IMAP server %s"
 msgstr "Imap-palvelin %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:960
+#: ../src/camel/providers/imapx/camel-imapx-store.c:959
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1051
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1050
 msgid "No IMAPx connection object provided"
 msgstr ""
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1068
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1067
 #: ../src/camel/providers/nntp/camel-nntp-provider.c:95
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:80
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:82
 msgid "Password"
 msgstr "Salasana"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1070
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1069
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen selvÃ¤kielistÃ¤ salasanaa kÃ¤yttÃ¤en."
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1157
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1156
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1622
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1620
 #, c-format
 msgid "No IMAP namespace for folder path â€œ%sâ€"
 msgstr ""
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1890
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2124
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1887
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2081
 #, fuzzy, c-format
 msgid "Retrieving folder list for â€œ%sâ€"
 msgstr "Valmistellaan kansiota \"%s\" yhteydettÃ¶mÃ¤Ã¤n tilaan"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2341
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2349
 #, 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â€"
@@ -4664,99 +4565,99 @@ msgstr "Kansion nimi â€œ%sâ€ ei ole kelvollinen koska se sisÃ¤ltÃ¤Ã¤ merkin â€œ
 #. version as well. It's always the folder name (eventually path) as provided by the server,
 #. when returned in given localization. it can be checked semi-easily in the case of
 #. the GMail variants, by changing the GMail interface language in the GMail Preferences.
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2718
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2744
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Drafts"
 msgstr "[Gmail]/Luonnokset"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2719
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2745
 msgctxt "IMAPDefaults"
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2720
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2746
 msgctxt "IMAPDefaults"
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2723
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2749
 msgctxt "IMAPDefaults"
 msgid "Templates"
 msgstr "Mallit"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2726
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2752
 msgctxt "IMAPDefaults"
 msgid "Archive"
 msgstr "Arkisto"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2729
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2755
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Sent Mail"
 msgstr "[Gmail]/LÃ¤hetetyt"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2730
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2756
 msgctxt "IMAPDefaults"
 msgid "Sent"
 msgstr "LÃ¤hetetyt"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2731
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2757
 msgctxt "IMAPDefaults"
 msgid "Sent Items"
 msgstr "LÃ¤hetetyt kohteet"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2732
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2758
 msgctxt "IMAPDefaults"
 msgid "Sent Messages"
 msgstr "LÃ¤hetetyt viestit"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2735
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2761
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Spam"
 msgstr "[Gmail]/Roskaposti"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2736
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2762
 msgctxt "IMAPDefaults"
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2737
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2763
 msgctxt "IMAPDefaults"
 msgid "Junk E-mail"
 msgstr "Roskaposti"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2738
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2764
 msgctxt "IMAPDefaults"
 msgid "Junk Email"
 msgstr "Roskaposti"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2739
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2765
 msgctxt "IMAPDefaults"
 msgid "Spam"
 msgstr "Roskaposti"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2740
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2766
 #, fuzzy
 #| msgid "Mail"
 msgctxt "IMAPDefaults"
 msgid "Bulk Mail"
 msgstr "SÃ¤hkÃ¶posti"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2743
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2769
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Trash"
 msgstr "[Gmail]/Roskakori"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2744
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2770
 msgctxt "IMAPDefaults"
 msgid "Trash"
 msgstr "Roskakori"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2745
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2771
 msgctxt "IMAPDefaults"
 msgid "Deleted Items"
 msgstr "Poistetut kohteet"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2746
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2772
 msgctxt "IMAPDefaults"
 msgid "Deleted Messages"
 msgstr "Poistetut viestit"
@@ -4765,7 +4666,7 @@ msgstr "Poistetut viestit"
 #. * for folders being under $HOME.  The first %s is replaced
 #. * with a relative path under $HOME, the second %s is
 #. * replaced with a protocol name, like mbox/maldir/...
-#: ../src/camel/providers/local/camel-local-folder.c:190
+#: ../src/camel/providers/local/camel-local-folder.c:186
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
@@ -4779,8 +4680,8 @@ msgstr "~%s (%s)"
 #. * folders being under /var/mail.  The first %s is replaced
 #. * with a relative path under /var/mail, the second %s is
 #. * replaced with a protocol name, like mbox/maldir/...
-#: ../src/camel/providers/local/camel-local-folder.c:200
-#: ../src/camel/providers/local/camel-local-folder.c:209
+#: ../src/camel/providers/local/camel-local-folder.c:196
+#: ../src/camel/providers/local/camel-local-folder.c:205
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "postilaatikko: %s (%s)"
@@ -4789,19 +4690,19 @@ msgstr "postilaatikko: %s (%s)"
 #. * The first %s is replaced with a folder's full path,
 #. * the second %s is replaced with a protocol name, like
 #. * mbox/maldir/...
-#: ../src/camel/providers/local/camel-local-folder.c:218
+#: ../src/camel/providers/local/camel-local-folder.c:214
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/camel/providers/local/camel-local-folder.c:511
+#: ../src/camel/providers/local/camel-local-folder.c:505
 msgid "_Index message body data"
 msgstr "_Indeksoi viestin rungon tiedot"
 
 #. Translators: The first %s is replaced with a message ID,
 #. * the second %s is replaced with the folder path,
 #. * the third %s is replaced with a detailed error string
-#: ../src/camel/providers/local/camel-local-folder.c:749
+#: ../src/camel/providers/local/camel-local-folder.c:744
 #, fuzzy, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -4875,62 +4776,61 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Tavallinen Unixin mbox-muotoinen saapuvien hakemisto"
 
-#: ../src/camel/providers/local/camel-local-store.c:86
+#: ../src/camel/providers/local/camel-local-store.c:82
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetÃ¤ seuraavaksi: %s: %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:168
+#: ../src/camel/providers/local/camel-local-store.c:164
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:211
-#: ../src/camel/providers/local/camel-local-store.c:371
-#: ../src/camel/providers/local/camel-maildir-store.c:121
-#: ../src/camel/providers/local/camel-mbox-store.c:570
-#: ../src/camel/providers/local/camel-spool-store.c:85
+#: ../src/camel/providers/local/camel-local-store.c:207
+#: ../src/camel/providers/local/camel-local-store.c:367
+#: ../src/camel/providers/local/camel-maildir-store.c:117
+#: ../src/camel/providers/local/camel-mbox-store.c:579
+#: ../src/camel/providers/local/camel-spool-store.c:81
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "SÃ¤ilÃ¶n juuri %s ei ole absoluuttinen polku"
 
-#: ../src/camel/providers/local/camel-local-store.c:220
+#: ../src/camel/providers/local/camel-local-store.c:216
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "SÃ¤ilÃ¶n juuri %s ei ole tavallinen hakemisto"
 
-#: ../src/camel/providers/local/camel-local-store.c:232
-#: ../src/camel/providers/local/camel-local-store.c:242
-#: ../src/camel/providers/local/camel-local-store.c:384
-#: ../src/camel/providers/local/camel-maildir-store.c:163
+#: ../src/camel/providers/local/camel-local-store.c:228
+#: ../src/camel/providers/local/camel-local-store.c:238
+#: ../src/camel/providers/local/camel-local-store.c:380
+#: ../src/camel/providers/local/camel-maildir-store.c:159
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:279
+#: ../src/camel/providers/local/camel-local-store.c:275
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Paikallisissa sÃ¤ilÃ¶issÃ¤ ei ole saapuvien viestien kansiota"
 
-#: ../src/camel/providers/local/camel-local-store.c:444
-#: ../src/camel/providers/local/camel-mbox-store.c:737
+#: ../src/camel/providers/local/camel-local-store.c:440
+#: ../src/camel/providers/local/camel-mbox-store.c:746
 #, fuzzy, c-format
 #| msgid "Could not delete folder index file '%s': %s"
 msgid "Could not delete folder index file â€œ%sâ€: %s"
 msgstr "Kansion sisÃ¤llysluetteloa \"%s\" ei voitu poistaa: %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:472
-#: ../src/camel/providers/local/camel-mbox-store.c:767
+#: ../src/camel/providers/local/camel-local-store.c:468
+#: ../src/camel/providers/local/camel-mbox-store.c:776
 #, fuzzy, c-format
 #| msgid "Could not delete folder meta file '%s': %s"
 msgid "Could not delete folder meta file â€œ%sâ€: %s"
 msgstr "Kansion metadatatiedostoa \"%s\" ei voitu poistaa: %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:585
-#, fuzzy, c-format
-#| msgid "Could not rename '%s': %s"
+#: ../src/camel/providers/local/camel-local-store.c:581
+#, c-format
 msgid "Could not rename â€œ%sâ€: %s"
-msgstr "UudelleennimeÃ¤minen epÃ¤onnistui \"%s\": %s"
+msgstr "UudelleennimeÃ¤minen epÃ¤onnistui â€œ%sâ€: %s"
 
 #: ../src/camel/providers/local/camel-maildir-folder.c:107
 #: ../src/camel/providers/local/camel-maildir-folder.c:345
@@ -4961,86 +4861,85 @@ msgstr ""
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ViestiÃ¤ ei voi lisÃ¤tÃ¤ maildir-kansioon: %s: %s"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:129
-#: ../src/camel/providers/local/camel-maildir-store.c:929
+#: ../src/camel/providers/local/camel-maildir-store.c:125
+#: ../src/camel/providers/local/camel-maildir-store.c:925
 #, fuzzy, c-format
 #| msgid "Cannot create folder '%s': %s"
 msgid "Cannot create folder containing â€œ%sâ€"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:137
-#: ../src/camel/providers/local/camel-maildir-store.c:156
-#: ../src/camel/providers/local/camel-maildir-store.c:921
+#: ../src/camel/providers/local/camel-maildir-store.c:133
+#: ../src/camel/providers/local/camel-maildir-store.c:152
+#: ../src/camel/providers/local/camel-maildir-store.c:917
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Kansio %s on jo olemassa"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:264
-#: ../src/camel/providers/local/camel-maildir-store.c:295
-#: ../src/camel/providers/local/camel-mbox-store.c:399
-#: ../src/camel/providers/local/camel-mbox-store.c:420
+#: ../src/camel/providers/local/camel-maildir-store.c:260
+#: ../src/camel/providers/local/camel-maildir-store.c:291
+#: ../src/camel/providers/local/camel-mbox-store.c:410
+#: ../src/camel/providers/local/camel-mbox-store.c:431
 #, c-format
 msgid "Cannot create folder â€œ%sâ€: %s"
 msgstr "Kansiota â€œ%sâ€ ei voi luoda:: %s"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:279
-#: ../src/camel/providers/local/camel-mbox-store.c:365
+#: ../src/camel/providers/local/camel-maildir-store.c:275
+#: ../src/camel/providers/local/camel-mbox-store.c:376
 #: ../src/camel/providers/local/camel-mh-store.c:519
 #, fuzzy, c-format
 #| msgid "Cannot get folder: %s: %s"
 msgid "Cannot get folder â€œ%sâ€: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:285
-#: ../src/camel/providers/local/camel-mbox-store.c:375
+#: ../src/camel/providers/local/camel-maildir-store.c:281
+#: ../src/camel/providers/local/camel-mbox-store.c:386
 #: ../src/camel/providers/local/camel-mh-store.c:528
 #, fuzzy, c-format
 #| msgid "Cannot get folder '%s': folder does not exist."
 msgid "Cannot get folder â€œ%sâ€: folder does not exist."
 msgstr "Kansiota \"%s\" ei voi hakea: kansiota ei ole olemassa."
 
-#: ../src/camel/providers/local/camel-maildir-store.c:312
+#: ../src/camel/providers/local/camel-maildir-store.c:308
 #, fuzzy, c-format
 #| msgid "Cannot get folder '%s': not a maildir directory."
 msgid "Cannot get folder â€œ%sâ€: not a maildir directory."
 msgstr "'Kansiota \"%s\" ei voi avata: ei maildir-muotoinen hakemisto."
 
-#: ../src/camel/providers/local/camel-maildir-store.c:376
-#: ../src/camel/providers/local/camel-maildir-store.c:416
+#: ../src/camel/providers/local/camel-maildir-store.c:372
+#: ../src/camel/providers/local/camel-maildir-store.c:412
 #: ../src/camel/providers/local/camel-mh-store.c:672
 #, c-format
-#| msgid "Could not delete folder '%s': %s"
 msgid "Could not delete folder â€œ%sâ€: %s"
 msgstr "Ei voitu poistaa kansiota â€œ%sâ€: %s"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:378
+#: ../src/camel/providers/local/camel-maildir-store.c:374
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:664
-#: ../src/camel/providers/local/camel-maildir-store.c:1144
-#: ../src/camel/providers/local/camel-spool-store.c:210
-#: ../src/camel/providers/local/camel-spool-store.c:229
+#: ../src/camel/providers/local/camel-maildir-store.c:660
+#: ../src/camel/providers/local/camel-maildir-store.c:1138
+#: ../src/camel/providers/local/camel-spool-store.c:206
+#: ../src/camel/providers/local/camel-spool-store.c:225
 #, fuzzy, c-format
 #| msgid "Could not scan folder '%s': %s"
 msgid "Could not scan folder â€œ%sâ€: %s"
 msgstr "Kansiota \"%s\" ei voitu kÃ¤ydÃ¤ lÃ¤pi: %s"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:457
-#: ../src/camel/providers/local/camel-maildir-summary.c:596
+#: ../src/camel/providers/local/camel-maildir-summary.c:450
+#: ../src/camel/providers/local/camel-maildir-summary.c:589
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-kansiota ei voi avata: %s: %s"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:587
+#: ../src/camel/providers/local/camel-maildir-summary.c:580
 msgid "Checking folder consistency"
 msgstr "Tarkastetaan kansion yhdenmukaisuutta"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:709
+#: ../src/camel/providers/local/camel-maildir-summary.c:702
 msgid "Checking for new messages"
 msgstr "EtsitÃ¤Ã¤n uusia viestejÃ¤"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:813
+#: ../src/camel/providers/local/camel-maildir-summary.c:806
 #: ../src/camel/providers/local/camel-mbox-summary.c:367
 #: ../src/camel/providers/local/camel-mbox-summary.c:585
 #: ../src/camel/providers/local/camel-mbox-summary.c:739
@@ -5068,35 +4967,35 @@ msgstr "Kansio nÃ¤yttÃ¤isi olevan peruuttamattomasti vaurioitunut."
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kansion \"%s\" lukkoa ei voi varata: %s"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:387
-#: ../src/camel/providers/local/camel-mbox-store.c:578
+#: ../src/camel/providers/local/camel-mbox-store.c:398
+#: ../src/camel/providers/local/camel-mbox-store.c:587
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "TÃ¤mÃ¤nnimistÃ¤ kansiota ei voi luoda."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:431
+#: ../src/camel/providers/local/camel-mbox-store.c:442
 #, fuzzy, c-format
 #| msgid "Cannot get folder '%s': not a regular file."
 msgid "Cannot get folder â€œ%sâ€: not a regular file."
 msgstr "Kansiota \"%s\" ei voitu avata: ei ole tavallinen tiedosto"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:594
+#: ../src/camel/providers/local/camel-mbox-store.c:603
 #, c-format
 msgid "Cannot create directory â€œ%sâ€: %s."
 msgstr "Ei voi luoda kansiota â€œ%sâ€: %s."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:606
+#: ../src/camel/providers/local/camel-mbox-store.c:615
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kansiota ei voi luoda: %s: %s"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:608
+#: ../src/camel/providers/local/camel-mbox-store.c:617
 msgid "Folder already exists"
 msgstr "Kansio on jo olemassa"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:648
-#: ../src/camel/providers/local/camel-mbox-store.c:661
-#: ../src/camel/providers/local/camel-mbox-store.c:690
+#: ../src/camel/providers/local/camel-mbox-store.c:657
+#: ../src/camel/providers/local/camel-mbox-store.c:670
+#: ../src/camel/providers/local/camel-mbox-store.c:699
 #, c-format
 msgid ""
 "Could not delete folder â€œ%sâ€:\n"
@@ -5105,33 +5004,32 @@ msgstr ""
 "Kansiota â€œ%sâ€ ei voitu poistaa:\n"
 "%s"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:671
+#: ../src/camel/providers/local/camel-mbox-store.c:680
 #, c-format
 msgid "â€œ%sâ€ is not a regular file."
 msgstr "â€œ%sâ€ ei ole tavallinen tiedosto."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:680
+#: ../src/camel/providers/local/camel-mbox-store.c:689
 #, c-format
 msgid "Folder â€œ%sâ€ is not empty. Not deleted."
 msgstr "Kansio â€œ%sâ€ ei ole tyhjÃ¤, sitÃ¤ ei poistettu."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:707
-#: ../src/camel/providers/local/camel-mbox-store.c:722
+#: ../src/camel/providers/local/camel-mbox-store.c:716
+#: ../src/camel/providers/local/camel-mbox-store.c:731
 #, fuzzy, c-format
 #| msgid "Could not delete folder summary file '%s': %s"
 msgid "Could not delete folder summary file â€œ%sâ€: %s"
 msgstr "Kansion yhteenvetotiedostoa \"%s\" ei voitu poistaa: %s"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:804
+#: ../src/camel/providers/local/camel-mbox-store.c:813
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Kansion nimi ei ole sallittu."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:820
-#, fuzzy, c-format
-#| msgid "Could not rename '%s': '%s': %s"
+#: ../src/camel/providers/local/camel-mbox-store.c:829
+#, c-format
 msgid "Could not rename â€œ%sâ€: â€œ%sâ€: %s"
-msgstr "Kohdetta \"%s\" ei voitu nimetÃ¤ uudestaan: \"%s\": %s"
+msgstr "Ei voitu nimetÃ¤ uudelleen â€œ%sâ€: â€œ%sâ€: %s"
 
 #: ../src/camel/providers/local/camel-mbox-summary.c:377
 #, c-format
@@ -5225,44 +5123,44 @@ msgstr "Kansiota â€œ%sâ€ ei voi luoda: %s"
 msgid "Cannot get folder â€œ%sâ€: not a directory."
 msgstr "Kansiota \"%s\" ei voi avata: se ei ole hakemisto."
 
-#: ../src/camel/providers/local/camel-mh-summary.c:238
+#: ../src/camel/providers/local/camel-mh-summary.c:232
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-kansion polku ei voi avata: %s: %s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:93
+#: ../src/camel/providers/local/camel-spool-store.c:89
 #, fuzzy, c-format
 #| msgid "Spool '%s' cannot be opened: %s"
 msgid "Spool â€œ%sâ€ cannot be opened: %s"
 msgstr "SÃ¤hkÃ¶postilÃ¤hdettÃ¤ \"%s\" ei voi avata: %s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:107
+#: ../src/camel/providers/local/camel-spool-store.c:103
 #, fuzzy, c-format
 #| msgid "Spool '%s' is not a regular file or directory"
 msgid "Spool â€œ%sâ€ is not a regular file or directory"
 msgstr "LÃ¤hde \"%s\" ei ole tavallinen tiedosto tai hakemisto"
 
-#: ../src/camel/providers/local/camel-spool-store.c:422
+#: ../src/camel/providers/local/camel-spool-store.c:418
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Saapuvan sÃ¤hkÃ¶postin tiedosto %s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:426
+#: ../src/camel/providers/local/camel-spool-store.c:422
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "SÃ¤hkÃ¶postilÃ¤hde %s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:429
+#: ../src/camel/providers/local/camel-spool-store.c:425
 #, fuzzy
 msgid "Invalid spool"
 msgstr "Virheellinen lÃ¤hde"
 
-#: ../src/camel/providers/local/camel-spool-store.c:478
+#: ../src/camel/providers/local/camel-spool-store.c:474
 #, c-format
 msgid "Folder â€œ%s/%sâ€ does not exist."
 msgstr "Kansiota â€œ%s/%sâ€ ei ole olemassa."
 
-#: ../src/camel/providers/local/camel-spool-store.c:491
+#: ../src/camel/providers/local/camel-spool-store.c:487
 #, c-format
 msgid ""
 "Could not open folder â€œ%sâ€:\n"
@@ -5271,12 +5169,12 @@ msgstr ""
 "Kansiota â€œ%sâ€ ei voi avata:\n"
 "%s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:497
+#: ../src/camel/providers/local/camel-spool-store.c:493
 #, c-format
 msgid "Folder â€œ%sâ€ does not exist."
 msgstr "Kansiota â€œ%sâ€ ei ole olemassa."
 
-#: ../src/camel/providers/local/camel-spool-store.c:505
+#: ../src/camel/providers/local/camel-spool-store.c:501
 #, c-format
 msgid ""
 "Could not create folder â€œ%sâ€:\n"
@@ -5285,22 +5183,22 @@ msgstr ""
 "Kansiota â€œ%sâ€ ei voi luoda:\n"
 "%s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:518
+#: ../src/camel/providers/local/camel-spool-store.c:514
 #, c-format
 msgid "â€œ%sâ€ is not a mailbox file."
 msgstr "â€œ%sâ€ ei ole mailbox-tiedosto."
 
-#: ../src/camel/providers/local/camel-spool-store.c:582
+#: ../src/camel/providers/local/camel-spool-store.c:578
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Kansio ei tue INBOXia"
 
-#: ../src/camel/providers/local/camel-spool-store.c:601
+#: ../src/camel/providers/local/camel-spool-store.c:597
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Saapuvan sÃ¤hkÃ¶postin kansioita ei voi poistaa"
 
-#: ../src/camel/providers/local/camel-spool-store.c:616
+#: ../src/camel/providers/local/camel-spool-store.c:612
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Saapuvan sÃ¤hkÃ¶postin kansioita ei voi uudelleennimetÃ¤"
@@ -5328,22 +5226,22 @@ msgstr ""
 "SÃ¤hkÃ¶postiviestien kansiota %s ei voi synkronoida: %s\n"
 "Kansio saattaa olla vaurioitunut, kopio tallennettu tiedostoon \"%s\""
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:219
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:636
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:215
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:632
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "SisÃ¤inen virhe: UID on virheellisessÃ¤ muodossa: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:287
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:292
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:283
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:288
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:575
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:1092
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:299
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:670
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:295
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:666
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:479
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:511
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:543
@@ -5353,22 +5251,22 @@ msgstr "Viestin %s hakeminen ei onnistu: %s"
 msgid "Cannot get message %s: "
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:428
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:434
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:424
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:430
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Postitus epÃ¤onnistui: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:486
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:482
 msgid "Posting failed: "
 msgstr "Postitus epÃ¤onnistui: "
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:659
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:655
 #, c-format
 msgid "This message is not currently available"
 msgstr "TÃ¤mÃ¤ viesti ei ole juuri nyt saatavilla"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:768
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:764
 #, c-format
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "Et voi kopioida viestejÃ¤ NNTP-kansiosta"
@@ -5419,39 +5317,39 @@ msgstr ""
 "TÃ¤mÃ¤ vaihtoehto tunnistautuu NNTP-palvelimelle kÃ¤yttÃ¤en selvÃ¤kielistÃ¤ "
 "salasanaa."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:379
+#: ../src/camel/providers/nntp/camel-nntp-store.c:376
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: "
 msgstr "TervehdystÃ¤ %s:stÃ¤ ei voitu lukea: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:391
+#: ../src/camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-palvelin %s palautti virhekoodin %d: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:410
+#: ../src/camel/providers/nntp/camel-nntp-store.c:407
 #, fuzzy, c-format
 #| msgid "Failed to authenticate on POP server %s: "
 msgid "Failed to issue STARTTLS for NNTP server %s: "
 msgstr "Tunnistautuminen POP-palvelimelle %s epÃ¤onnistui:"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:421
+#: ../src/camel/providers/nntp/camel-nntp-store.c:418
 #, c-format
 msgid "NNTP server %s doesnâ€™t support STARTTLS: %s"
 msgstr "NNTP-palvelin %s ei tue STARTTLS:Ã¤Ã¤: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:441
+#: ../src/camel/providers/nntp/camel-nntp-store.c:438
 #, fuzzy, c-format
 #| msgid "Failed to connect to SMTP server %s in secure mode: "
 msgid "Failed to connect to NNTP server %s in secure mode: "
 msgstr "YhdistÃ¤minen SMTP-palvelimeen %s turvallisessa tilassa epÃ¤onnistui: "
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:512
+#: ../src/camel/providers/nntp/camel-nntp-store.c:509
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET uutisryhmÃ¤t palvelimelta %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1248
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1245
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -5462,23 +5360,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1363
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1360
 #, 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Ã¤."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1379
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1376
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Et voi nimetÃ¤ kansiota UutisryhmissÃ¤."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1402
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1399
 #, 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."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1616
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1613
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -5489,7 +5387,7 @@ msgstr ""
 "\n"
 "UutisryhmÃ¤Ã¤ ei ole olemassa. Valittu kohta on luultavasti ylempi kansio."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1683
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1680
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -5500,48 +5398,49 @@ msgstr ""
 "\n"
 "UutisryhmÃ¤Ã¤ ei ole olemassa!"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2109
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2104
 msgid "NNTP Command failed: "
 msgstr "NNTP-komento epÃ¤onnistui: "
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2215
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2210
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2245
 #, c-format
 msgid "Not connected."
 msgstr "Ei yhteyttÃ¤."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2320
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2322
 #, c-format
 msgid "No such folder: %s"
 msgstr "Kansiota ei ole: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:195
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:340
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:189
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:334
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Etsii uusia viestejÃ¤"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:217
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:211
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Odottamaton palvelimen vastaus xover:ilta: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:361
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:355
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Odottamaton palvelimen vastaus head:ilta: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:410
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:404
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Toiminto epÃ¤onnistui: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:457
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:451
 #, fuzzy, c-format
 #| msgid "%s: Scanning new messages"
 msgid "%s: Scanning existing messages"
 msgstr "%s: Etsii uusia viestejÃ¤"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:470
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:464
 #, fuzzy, c-format
 #| msgid "Unexpected server response from xover: %s"
 msgid "Unexpected server response from listgroup: %s"
@@ -5610,23 +5509,27 @@ msgstr ""
 msgid "Disable _support for all POP3 extensions"
 msgstr "Poista _kÃ¤ytÃ¶stÃ¤ tuki POP3-laajennoksille"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:52
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:48
+msgid "Enable _UTF-8 extension, when the server supports it"
+msgstr "KÃ¤ytÃ¤ _UTF-8-laajennusta, kun palvelin tukee sitÃ¤"
+
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:54
 msgid "Default POP3 port"
 msgstr "POP3:n oletusportti"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:53
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP3 over TLS"
 msgstr "POP3 TLS:llÃ¤"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:60
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:62
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Yhteyksien ottoon ja postien hakuun POP-palvelimilta."
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:82
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -5634,7 +5537,7 @@ msgstr ""
 "tÃ¤mÃ¤ vaihtoehto yhdistÃ¤Ã¤ POP-palvelimeen selvÃ¤kielisellÃ¤ salasanalla. TÃ¤mÃ¤ "
 "on ainoa tapa, jota monet POP-palvelimet tukevat."
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:92
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:94
 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 "
@@ -5645,59 +5548,68 @@ msgstr ""
 "palvelimilla, jotka vÃ¤ittÃ¤vÃ¤t sitÃ¤ tukevansa."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../src/camel/providers/pop3/camel-pop3-store.c:93
+#: ../src/camel/providers/pop3/camel-pop3-store.c:90
 msgid ": "
 msgstr ": "
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:160
+#: ../src/camel/providers/pop3/camel-pop3-store.c:157
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP-palvelimelta %s ei saatu luettua kelvollista tervehdystÃ¤"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:175
+#: ../src/camel/providers/pop3/camel-pop3-store.c:172
 #, 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"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:176
+#: ../src/camel/providers/pop3/camel-pop3-store.c:173
 msgid "STLS not supported by server"
 msgstr "Palvelin ei tue STLS-laajennosta"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:197
+#: ../src/camel/providers/pop3/camel-pop3-store.c:194
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
-msgstr ""
+msgstr "Yhteys POP-palvelimeen %s epÃ¤onnistui suojatussa tilassa%s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:215
+#: ../src/camel/providers/pop3/camel-pop3-store.c:212
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "YhdistÃ¤minen POP-palvelimeen %s turvallisessa tilassa epÃ¤onnistui: "
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:357
+#: ../src/camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP-palvelimeen %s kirjautuminen epÃ¤onnistui: SASL protokollavirhe"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:379
+#: ../src/camel/providers/pop3/camel-pop3-store.c:376
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Tunnistautuminen POP-palvelimelle %s epÃ¤onnistui:"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:487
+#: ../src/camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3-palvelin %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:490
+#: ../src/camel/providers/pop3/camel-pop3-store.c:487
 #, fuzzy, c-format
 msgid "POP3 server for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:702
-#: ../src/camel/providers/pop3/camel-pop3-store.c:715
-#: ../src/camel/providers/pop3/camel-pop3-store.c:801
+#: ../src/camel/providers/pop3/camel-pop3-store.c:691
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error enabling UTF-8 mode: "
+msgstr ""
+"YhdistÃ¤minen POP-palvelimeen epÃ¤onnistui: %s\n"
+"Virhe lÃ¤hetettÃ¤essÃ¤ salasanaa: %s"
+
+#: ../src/camel/providers/pop3/camel-pop3-store.c:719
+#: ../src/camel/providers/pop3/camel-pop3-store.c:732
+#: ../src/camel/providers/pop3/camel-pop3-store.c:818
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5707,7 +5619,7 @@ msgstr ""
 "Virhe lÃ¤hetettÃ¤essÃ¤ salasanaa: %s"
 
 #. Translators: Do not translate APOP.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:742
+#: ../src/camel/providers/pop3/camel-pop3-store.c:759
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5718,22 +5630,22 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:816
+#: ../src/camel/providers/pop3/camel-pop3-store.c:833
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 msgstr ""
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:900
+#: ../src/camel/providers/pop3/camel-pop3-store.c:917
 #, c-format
 msgid "No such folder â€œ%sâ€."
 msgstr "Kansioita â€œ%sâ€ ei ole olemassa."
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:917
+#: ../src/camel/providers/pop3/camel-pop3-store.c:934
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
-msgstr ""
+msgstr "POP3 ei tue kansiohierarkiaa"
 
 #: ../src/camel/providers/sendmail/camel-sendmail-provider.c:31
 #: ../src/services/evolution-source-registry/builtin/sendmail.source.in.h:1
@@ -5794,7 +5706,7 @@ msgstr "Sendmailia ei voi kÃ¤ynnistÃ¤Ã¤: %s: sÃ¤hkÃ¶postia ei lÃ¤hetetty"
 
 #: ../src/camel/providers/sendmail/camel-sendmail-transport.c:301
 msgid "Could not send message: "
-msgstr "Viestin lÃ¤hettÃ¤minen epÃ¤onnistui:"
+msgstr "Viestin lÃ¤hettÃ¤minen epÃ¤onnistui: "
 
 #: ../src/camel/providers/sendmail/camel-sendmail-transport.c:343
 #, fuzzy, c-format
@@ -5833,226 +5745,231 @@ msgstr ""
 "SÃ¤hkÃ¶postin lÃ¤hetys ottamalla yhteyttÃ¤ sÃ¤hkÃ¶postipalvelimeen SMTP-"
 "protokollalla."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:235
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:242
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:237
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:244
 #, fuzzy
 msgid "Welcome response error: "
 msgstr "virhe tervetuloviestissÃ¤"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:278
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:282
 #, 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"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:287
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:300
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:307
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:291
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:304
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:311
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS-komento epÃ¤onnistui: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:326
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:330
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "YhdistÃ¤minen SMTP-palvelimeen %s turvallisessa tilassa epÃ¤onnistui: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:437
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:441
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:440
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:444
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP postinvÃ¤litys %s:n kautta"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:580
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:584
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP-palvelin %s ei tue tunnistautumismenetelmÃ¤Ã¤ %s"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:661
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "No SASL mechanism was specified"
-msgstr ""
+msgstr "SASL-mekanismia ei mÃ¤Ã¤ritetty"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:697
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:701
 msgid "AUTH command failed: Not connected."
 msgstr "AUTH-komento epÃ¤onnistui: Ei yhdistetty."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:704
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:718
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:734
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:708
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:722
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:738
 msgid "AUTH command failed: "
 msgstr "AUTH-komento epÃ¤onnistui: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:885
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:908
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ViestiÃ¤ ei voi lÃ¤hettÃ¤Ã¤: palveluun ei ole yhteyttÃ¤."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:894
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:917
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ViestiÃ¤ ei voi lÃ¤hettÃ¤Ã¤: lÃ¤hettÃ¤jÃ¤n osoite on epÃ¤kelpo."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:898
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:921
 msgid "Sending message"
 msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:927
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:950
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ViestiÃ¤ ei voi lÃ¤hettÃ¤Ã¤: vastaanottajia ei ole mÃ¤Ã¤ritelty."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:942
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:965
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ViestiÃ¤ ei voi lÃ¤hettÃ¤Ã¤: yksi tai useampi viallinen vastaanottaja"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1097
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksivirhe, tuntematon komento"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1076
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksivirhe parametreissa tai argumenteissa"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1078
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1101
 msgid "Command not implemented"
 msgstr "Komentoa ei ole toteutettu"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1080
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1103
 msgid "Command parameter not implemented"
 msgstr "Komennon parametria ei ole toteutettu"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1082
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1105
 msgid "System status, or system help reply"
 msgstr "JÃ¤rjestelmÃ¤n tila tai jÃ¤rjestelmÃ¤n ohjevastaus"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1084
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1107
 msgid "Help message"
 msgstr "Ohjeviesti"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1109
 msgid "Service ready"
 msgstr "Palvelu valmis"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1088
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1111
 msgid "Service closing transmission channel"
 msgstr "Palvelu sulkee siirtokanavaa"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1113
 msgid "Service not available, closing transmission channel"
 msgstr "Palvelu ei ole kÃ¤ytettÃ¤vissÃ¤, suljetaan siirtokanava"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1092
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1115
 msgid "Requested mail action okay, completed"
 msgstr "Pyydetty sÃ¤hkÃ¶postikÃ¤sky ok, valmis"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 "KÃ¤yttÃ¤jÃ¤ ei ole paikallinen, uudelleenohjaus osoitteeseen <forward-path>"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "PyydettyÃ¤ sÃ¤hkÃ¶postikÃ¤skyÃ¤ ei suoritettu: postilaatikko ei kÃ¤ytettÃ¤vissÃ¤"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1098
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "PyydettyÃ¤ toimenpidettÃ¤ ei suoritettu: postilaatikko ei kÃ¤ytettÃ¤vissÃ¤"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1123
 msgid "Requested action aborted: error in processing"
 msgstr "Pyydetty toimenpide keskeytetty: virhe kÃ¤sittelyssÃ¤"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "User not local; please try <forward-path>"
 msgstr "KÃ¤yttÃ¤jÃ¤ ei ole paikallinen: kokeile <forward-path>"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1104
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1127
 msgid "Requested action not taken: insufficient system storage"
 msgstr "PyydettyÃ¤ toimenpidettÃ¤ ei suoritettu: jÃ¤rjestelmÃ¤n levytila ei riitÃ¤"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1106
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "PyydettyÃ¤ toimenpidettÃ¤ ei suoritettu: varattu levytila ylitetty"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1108
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1131
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "PyydettyÃ¤ toimenpidettÃ¤ ei suoritettu: postilaatikon nimi ei ole sallittu"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1110
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1133
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Aloita sÃ¤hkÃ¶postin kirjoittaminen: lopeta <CRLF>.<CRLF>"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1135
 msgid "Transaction failed"
 msgstr "Tapahtuma epÃ¤onnistui"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1116
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1139
 msgid "A password transition is needed"
 msgstr "Vaaditaan salasanatransaktio"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1118
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1141
 msgid "Authentication mechanism is too weak"
 msgstr "TodennusmenetelmÃ¤ on liian heikko"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1143
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pyydetty todennusmenetelmÃ¤ vaatii salausta"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1145
 msgid "Temporary authentication failure"
 msgstr "VÃ¤liaikainen todennusvirhe"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1412
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1147
+#: ../src/libedataserver/e-client.c:145
+msgid "Authentication required"
+msgstr "Todennus vaaditaan"
+
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "SMTP Greeting"
 msgstr "SMTP tervehdys"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1421
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1434
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1446
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1459
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1466
 msgid "HELO command failed: "
 msgstr "HELO-komento epÃ¤onnistui: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1517
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1531
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1540
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1550
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1564
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1573
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM -komento epÃ¤onnistui: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1568
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1601
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO -komento epÃ¤onnistui: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1584
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1593
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1617
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1626
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> epÃ¤onnistui: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1667
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1678
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1689
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1738
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1756
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1769
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1777
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1700
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1711
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1722
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1805
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1823
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1836
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1844
 msgid "DATA command failed: "
 msgstr "DATA-komento epÃ¤onnistui: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1803
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1817
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1825
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1870
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1884
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1892
 msgid "RSET command failed: "
 msgstr "RSET-komento epÃ¤onnistui: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1851
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1863
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1869
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1918
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1930
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1936
 msgid "QUIT command failed: "
 msgstr "QUIT-komento epÃ¤onnistui: "
 
@@ -6140,19 +6057,19 @@ msgstr ""
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:19
 msgid "Show reminder notification for completed tasks"
-msgstr ""
+msgstr "NÃ¤ytÃ¤ muistutusilmoitus suoritetuista tehtÃ¤vistÃ¤"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:20
 msgid "Show reminder notification for past events"
-msgstr ""
+msgstr "NÃ¤ytÃ¤ muistutusilmoitus menneistÃ¤ tapahtumista"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:21
 msgid "The last used snooze time, in minutes"
-msgstr ""
+msgstr "Viimeksi kÃ¤ytetty torkkuaika, minuuteissa"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:22
 msgid "User-defined snooze times, in minutes"
-msgstr ""
+msgstr "KÃ¤yttÃ¤jÃ¤n mÃ¤Ã¤rittÃ¤mÃ¤t torkkuajat, minuuteissa"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
 msgid "Whether the migration of old setting was already done"
@@ -6235,6 +6152,54 @@ msgid ""
 "from â€œcaldav.company.comâ€ host"
 msgstr ""
 
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:14
+msgid ""
+"An OAuth2 client ID to use to connect to Google servers, instead of the one "
+"provided during build time"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:15
+msgid ""
+"User-specified OAuth2 client ID for Google servers. Empty string means to "
+"use the one provided during build time. Change of this requires restart."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:16
+msgid ""
+"An OAuth2 client secret to use to connect to Google servers, instead of the "
+"one provided during build time"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:17
+msgid ""
+"User-specified OAuth2 client secret for Google servers. Empty string means "
+"to use the one provided during build time. Change of this requires restart."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:18
+msgid ""
+"An OAuth2 client ID to use to connect to Outlook servers, instead of the one "
+"provided during build time"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:19
+msgid ""
+"User-specified OAuth2 client ID for Outlook servers. Empty string means to "
+"use the one provided during build time. Change of this requires restart."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:20
+msgid ""
+"An OAuth2 client secret to use to connect to Outlook servers, instead of the "
+"one provided during build time"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:21
+msgid ""
+"User-specified OAuth2 client secret for Outlook servers. Empty string means "
+"to use the one provided during build time. Change of this requires restart."
+msgstr ""
+
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 #, fuzzy
 #| msgid "Proxy type to use"
@@ -6332,108 +6297,107 @@ msgstr "Muisti on loppu"
 msgid "Can not make parent directory: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: ../src/libebackend/e-collection-backend.c:1008
+#: ../src/libebackend/e-collection-backend.c:1069
 #, c-format
 msgid "%s does not support creating remote resources"
-msgstr ""
+msgstr "%s ei tue etÃ¤resurssien luomista"
 
-#: ../src/libebackend/e-collection-backend.c:1067
+#: ../src/libebackend/e-collection-backend.c:1128
 #, c-format
 msgid "%s does not support deleting remote resources"
-msgstr ""
+msgstr "%s ei tue etÃ¤resurssien poistamista"
+
+#: ../src/libebackend/e-data-factory.c:1428
+#: ../src/libebackend/e-subprocess-factory.c:288
+#, fuzzy, c-format
+#| msgid "No such source for UID '%s'"
+msgid "No such source for UID â€œ%sâ€"
+msgstr "LÃ¤hdettÃ¤, jonka UID on \"%s\", ei lÃ¶ydy"
 
-#: ../src/libebackend/e-data-factory.c:1492
+#: ../src/libebackend/e-data-factory.c:1588
 #, c-format
 msgid "Backend factory for source â€œ%sâ€ and extension â€œ%sâ€ cannot be found."
 msgstr ""
 
-#: ../src/libebackend/e-server-side-source.c:142
+#: ../src/libebackend/e-server-side-source.c:139
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr ""
 
-#: ../src/libebackend/e-server-side-source.c:470
+#: ../src/libebackend/e-server-side-source.c:467
 #, 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"
 
-#: ../src/libebackend/e-server-side-source.c:1395
-#: ../src/libedataserver/e-source.c:1583
+#: ../src/libebackend/e-server-side-source.c:1392
+#: ../src/libedataserver/e-source.c:1591
 #, fuzzy, c-format
 msgid "Data source â€œ%sâ€ does not support creating remote resources"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmÃ¤Ã¤ %s"
 
-#: ../src/libebackend/e-server-side-source.c:1409
+#: ../src/libebackend/e-server-side-source.c:1406
 #, c-format
 msgid ""
 "Data source â€œ%sâ€ has no collection backend to create the remote resource"
 msgstr ""
 
-#: ../src/libebackend/e-server-side-source.c:1437
-#: ../src/libedataserver/e-source.c:1696
+#: ../src/libebackend/e-server-side-source.c:1434
+#: ../src/libedataserver/e-source.c:1704
 #, fuzzy, c-format
 msgid "Data source â€œ%sâ€ does not support deleting remote resources"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmÃ¤Ã¤ %s"
 
-#: ../src/libebackend/e-server-side-source.c:1451
+#: ../src/libebackend/e-server-side-source.c:1448
 #, c-format
 msgid ""
 "Data source â€œ%sâ€ has no collection backend to delete the remote resource"
 msgstr ""
 
-#: ../src/libebackend/e-server-side-source.c:1482
-#: ../src/libedataserver/e-source.c:1792
-#: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080
+#: ../src/libebackend/e-server-side-source.c:1479
+#: ../src/libedataserver/e-source.c:1800
 #, fuzzy, c-format
 msgid "Data source â€œ%sâ€ does not support OAuth 2.0 authentication"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmÃ¤Ã¤ %s"
 
-#: ../src/libebackend/e-server-side-source.c:1860
+#: ../src/libebackend/e-server-side-source.c:1861
 #, c-format
 msgid "File must have a â€œ.sourceâ€ extension"
 msgstr "Tiedostolla tulee olla â€œ.sourceâ€-pÃ¤Ã¤te"
 
-#: ../src/libebackend/e-source-registry-server.c:322
+#: ../src/libebackend/e-source-registry-server.c:318
 #, c-format
 msgid "UID â€œ%sâ€ is already in use"
 msgstr "UID â€œ%sâ€ on jo kÃ¤ytÃ¶ssÃ¤"
 
-#: ../src/libebackend/e-source-registry-server.c:447
+#: ../src/libebackend/e-source-registry-server.c:443
 #, fuzzy, c-format
 #| msgid "Cannot find certificate for '%s'"
 msgid "Cannot find corresponding collection backend for source â€œ%sâ€"
 msgstr "Varmennetta \"%s\":lle ei lÃ¶ydy"
 
-#: ../src/libebackend/e-source-registry-server.c:451
+#: ../src/libebackend/e-source-registry-server.c:447
 #, fuzzy, c-format
 #| msgid "Source â€œ%sâ€ (%s) is not a valid OAuth2 source"
 msgid "Source â€œ%sâ€ is not a collection source"
 msgstr "LÃ¤hde â€œ%sâ€ (%s) ei ole kelvollinen OAuth2-lÃ¤hde"
 
-#: ../src/libebackend/e-source-registry-server.c:457
+#: ../src/libebackend/e-source-registry-server.c:453
 #, c-format
-#| msgid "Cannot find certificate for '%s'"
 msgid "Cannot find source â€œ%sâ€"
 msgstr "LÃ¤hdettÃ¤ â€œ%sâ€ ei lÃ¶ydy"
 
-#: ../src/libebackend/e-subprocess-factory.c:281
+#: ../src/libebackend/e-subprocess-factory.c:276
 #, c-format
 msgid "Module â€œ%sâ€ for source UID â€œ%sâ€ cannot be loaded"
 msgstr ""
 
-#: ../src/libebackend/e-subprocess-factory.c:293
-#, fuzzy, c-format
-#| msgid "No such source for UID '%s'"
-msgid "No such source for UID â€œ%sâ€"
-msgstr "LÃ¤hdettÃ¤, jonka UID on \"%s\", ei lÃ¶ydy"
-
-#: ../src/libebackend/e-subprocess-factory.c:302
+#: ../src/libebackend/e-subprocess-factory.c:297
 #, fuzzy, c-format
 msgid "Failed to create backend of type â€œ%sâ€ for source UID â€œ%sâ€"
 msgstr "Lapsiprosessin \"%s\" luominen epÃ¤onnistui: %s"
 
-#: ../src/libebackend/e-user-prompter-server.c:304
+#: ../src/libebackend/e-user-prompter-server.c:301
 #, fuzzy, c-format
 #| msgid "Contact '%s' not found"
 msgid "Extension dialog â€œ%sâ€ not found."
@@ -6551,60 +6515,123 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: ../src/libedataserver/e-client.c:144
+#: ../src/libedataserver/e-client.c:137
+msgid "Backend is busy"
+msgstr "TaustajÃ¤rjestelmÃ¤ on kÃ¤ytÃ¶ssÃ¤"
+
+#: ../src/libedataserver/e-client.c:139
 msgid "Source not loaded"
 msgstr "LÃ¤hdettÃ¤ ei ole ladattu"
 
-#: ../src/libedataserver/e-client.c:146
+#: ../src/libedataserver/e-client.c:141
 msgid "Source already loaded"
 msgstr "LÃ¤hde on jo ladattu"
 
+#: ../src/libedataserver/e-client.c:143
+msgid "Authentication failed"
+msgstr "Todennus epÃ¤onnistui"
+
+#: ../src/libedataserver/e-client.c:147
+msgid "Repository offline"
+msgstr "LÃ¤hde poissa kÃ¤ytÃ¶stÃ¤"
+
 #. 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.
-#: ../src/libedataserver/e-client.c:157
+#: ../src/libedataserver/e-client.c:152
 msgid "Offline unavailable"
 msgstr "YhteydetÃ¶n tila ei ole kÃ¤ytettÃ¤vissÃ¤"
 
-#: ../src/libedataserver/e-client.c:179
+#: ../src/libedataserver/e-client.c:154
+msgid "Permission denied"
+msgstr "Lupa evÃ¤tty"
+
+#: ../src/libedataserver/e-client.c:158
+msgid "Could not cancel"
+msgstr "Ei voi perua"
+
+#: ../src/libedataserver/e-client.c:160
+msgid "Not supported"
+msgstr "Ei tuettu"
+
+#: ../src/libedataserver/e-client.c:162
+msgid "Unsupported authentication method"
+msgstr "TunnistautumismenetelmÃ¤ ei ole tuettu"
+
+#: ../src/libedataserver/e-client.c:164
+msgid "TLS not available"
+msgstr "TLS ei kÃ¤ytettÃ¤vissÃ¤"
+
+#: ../src/libedataserver/e-client.c:166
+msgid "Search size limit exceeded"
+msgstr "Haun kokorajoitus ylitettiin"
+
+#: ../src/libedataserver/e-client.c:168
+msgid "Search time limit exceeded"
+msgstr "Haun aikaraja ylitettiin"
+
+#: ../src/libedataserver/e-client.c:172
+msgid "Query refused"
+msgstr "KyselyÃ¤ ei hyvÃ¤ksytty"
+
+#: ../src/libedataserver/e-client.c:174
 msgid "D-Bus error"
 msgstr "D-Bus-virhe"
 
-#: ../src/libedataserver/e-client.c:2021
+#: ../src/libedataserver/e-client.c:176
+msgid "Other error"
+msgstr "Muu virhe"
+
+#: ../src/libedataserver/e-client.c:178
+msgid "Backend is not opened yet"
+msgstr "Taustapalvelu ei vielÃ¤ kÃ¤ynnissÃ¤"
+
+#: ../src/libedataserver/e-client.c:180
+#, fuzzy
+#| msgid "Object not found"
+msgid "Object is out of sync"
+msgstr "Kohdetta ei lÃ¶ydy"
+
+#: ../src/libedataserver/e-client.c:2042
 msgid "Timeout was reached"
 msgstr ""
 
+#: ../src/libedataserver/e-oauth2-service.c:919
+#, fuzzy
+#| msgid "Failed on message %d"
+msgid "Malformed, no message body set"
+msgstr "Virhe viestin %d kohdalla"
+
 #. Translators: The first %s is a display name of the source, the second is its UID and
 #. the third is the name of the OAuth service.
-#: ../src/libedataserver/e-oauth2-service.c:1208
+#: ../src/libedataserver/e-oauth2-service.c:1203
 #, fuzzy, c-format
 #| msgid "Source â€œ%sâ€ (%s) is not a valid Google source"
 msgid "Source â€œ%sâ€ (%s) is not valid for â€œ%sâ€ OAuth2 service"
 msgstr "LÃ¤hde â€œ%sâ€ (%s) ei ole kelvollinen Google-lÃ¤hde"
 
-#: ../src/libedataserver/e-oauth2-service.c:1223
+#: ../src/libedataserver/e-oauth2-service.c:1218
 msgid "OAuth2 secret not found"
 msgstr "OAuth2-salaisuutta ei lÃ¶ytynyt"
 
-#: ../src/libedataserver/e-oauth2-service.c:1411
+#: ../src/libedataserver/e-oauth2-service.c:1413
 #, c-format
-#| msgid "Unexpected OK response from IMAP server: %s"
 msgid "Received incorrect response from server â€œ%sâ€."
 msgstr "Vastaanotettiin virheellinen vastaus palvelimelta â€œ%sâ€."
 
-#: ../src/libedataserver/e-oauth2-service.c:1420
+#: ../src/libedataserver/e-oauth2-service.c:1422
 #, fuzzy
 #| msgid "Failed to open addressbook at '%s': %s"
 msgid "Failed to refresh access token. Sign to the server again, please."
 msgstr "Osoitekirjan avaaminen kohteessa \"%s\" epÃ¤onnistui: %s"
 
 #. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../src/libedataserver/e-oauth2-service.c:1462
+#: ../src/libedataserver/e-oauth2-service.c:1464
 #, c-format
 msgid "Source â€œ%sâ€ (%s) is not a valid OAuth2 source"
 msgstr "LÃ¤hde â€œ%sâ€ (%s) ei ole kelvollinen OAuth2-lÃ¤hde"
 
-#: ../src/libedataserver/e-oauth2-service.c:1535
+#: ../src/libedataserver/e-oauth2-service.c:1538
 msgid ""
 "The access token is expired and it failed to refresh it. Sign to the server "
 "again, please."
@@ -6622,31 +6649,31 @@ msgctxt "OAuth2Service"
 msgid "Outlook"
 msgstr "Outlook"
 
-#: ../src/libedataserver/e-soup-session.c:861
+#: ../src/libedataserver/e-soup-session.c:949
 msgid "Operation was cancelled"
 msgstr "Toimenpide peruttiin"
 
-#: ../src/libedataserver/e-soup-session.c:867
+#: ../src/libedataserver/e-soup-session.c:955
 #, c-format
 msgid "Failed with HTTP error %d: %s"
 msgstr "EpÃ¤onnistui HTTP-virheellÃ¤ %d: %s"
 
-#: ../src/libedataserver/e-source.c:772
+#: ../src/libedataserver/e-source.c:769
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr ""
 
-#: ../src/libedataserver/e-source.c:1363
+#: ../src/libedataserver/e-source.c:1371
 #, c-format
 msgid "Data source â€œ%sâ€ is not removable"
 msgstr ""
 
-#: ../src/libedataserver/e-source.c:1486
+#: ../src/libedataserver/e-source.c:1494
 #, c-format
 msgid "Data source â€œ%sâ€ is not writable"
 msgstr ""
 
-#: ../src/libedataserver/e-source.c:2173
+#: ../src/libedataserver/e-source.c:2201
 msgid "Unnamed"
 msgstr "NimeÃ¤mÃ¤tÃ¶n"
 
@@ -6672,12 +6699,12 @@ msgstr "Viestien edelleenlÃ¤hetystÃ¤ ei tueta"
 msgid "Password not found"
 msgstr "Salasanaa ei lÃ¶ydy"
 
-#: ../src/libedataserver/e-source-mail-signature.c:483
+#: ../src/libedataserver/e-source-mail-signature.c:477
 #, c-format
 msgid "Signature script must be a local file"
 msgstr ""
 
-#: ../src/libedataserver/e-source-proxy.c:1642
+#: ../src/libedataserver/e-source-proxy.c:1650
 #, fuzzy, c-format
 #| msgid "Store does not support an INBOX"
 msgid "Source â€œ%sâ€ does not support proxy lookups"
@@ -6822,18 +6849,18 @@ msgstr "%H%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../src/libedataserver/e-webdav-session.c:670
+#: ../src/libedataserver/e-webdav-session.c:726
 msgid "Cannot determine destination URL without WebDAV extension"
 msgstr ""
 
-#: ../src/libedataserver/e-webdav-session.c:955
+#: ../src/libedataserver/e-webdav-session.c:991
 #, c-format
 msgid ""
 "The server responded with an HTML page, which can mean thereâ€™s an error on "
 "the server or with the client request. The used URI was: %s"
 msgstr ""
 
-#: ../src/libedataserver/e-webdav-session.c:957
+#: ../src/libedataserver/e-webdav-session.c:993
 #, c-format
 msgid ""
 "The server responded with an HTML page, which can mean thereâ€™s an error on "
@@ -6845,7 +6872,7 @@ msgstr ""
 #. The '%d' is replaced with actual HTTP status code.
 #. The second '%s' is replaced with a reason phrase of the error (user readable text).
 #. The last '%s' is replaced with detailed error text, as returned by the server.
-#: ../src/libedataserver/e-webdav-session.c:978
+#: ../src/libedataserver/e-webdav-session.c:1014
 #, c-format
 msgid "%s: HTTP error code %d (%s): %s"
 msgstr "%s: HTTP-virhekoodi %d (%s): %s"
@@ -6853,7 +6880,7 @@ msgstr "%s: HTTP-virhekoodi %d (%s): %s"
 #. Translators: The '%d' is replaced with actual HTTP status code.
 #. The '%s' is replaced with a reason phrase of the error (user readable text).
 #. The last '%s' is replaced with detailed error text, as returned by the server.
-#: ../src/libedataserver/e-webdav-session.c:986
+#: ../src/libedataserver/e-webdav-session.c:1022
 #, c-format
 msgid "Failed with HTTP error code %d (%s): %s"
 msgstr "EpÃ¤onnistui HTTP-virhekoodilla %d (%s): %s"
@@ -6862,178 +6889,178 @@ msgstr "EpÃ¤onnistui HTTP-virhekoodilla %d (%s): %s"
 #. by the caller, which can be in a form: "Failed with something".
 #. The '%d' is replaced with actual HTTP status code.
 #. The second '%s' is replaced with a reason phrase of the error (user readable text).
-#: ../src/libedataserver/e-webdav-session.c:1001
+#: ../src/libedataserver/e-webdav-session.c:1037
 #, c-format
 msgid "%s: HTTP error code %d (%s)"
 msgstr "%s: HTTP-virhekoodi %d (%s)"
 
 #. Translators: The '%d' is replaced with actual HTTP status code.
 #. The '%s' is replaced with a reason phrase of the error (user readable text).
-#: ../src/libedataserver/e-webdav-session.c:1007
+#: ../src/libedataserver/e-webdav-session.c:1043
 #, c-format
 msgid "Failed with HTTP error code %d (%s)"
 msgstr "EpÃ¤onnistui HTTP-virhekoodilla %d (%s)"
 
-#: ../src/libedataserver/e-webdav-session.c:1257
+#: ../src/libedataserver/e-webdav-session.c:1338
 #, fuzzy
 #| msgid "Failed to encode data"
 msgid "Failed to post data"
 msgstr "Tiedon koodaus epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:1350
-#: ../src/libedataserver/e-webdav-session.c:1425
-#: ../src/libedataserver/e-webdav-session.c:1529
-#: ../src/libedataserver/e-webdav-session.c:2778
-#: ../src/libedataserver/e-webdav-session.c:4030
+#: ../src/libedataserver/e-webdav-session.c:1475
+#: ../src/libedataserver/e-webdav-session.c:1552
+#: ../src/libedataserver/e-webdav-session.c:1658
+#: ../src/libedataserver/e-webdav-session.c:2932
+#: ../src/libedataserver/e-webdav-session.c:4220
 #, fuzzy
 msgid "Failed to get input XML content"
 msgstr "Tiedon koodaus epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:1361
+#: ../src/libedataserver/e-webdav-session.c:1486
 msgid "Failed to get properties"
 msgstr "Ominaisuuksien saaminen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:1435
+#: ../src/libedataserver/e-webdav-session.c:1562
 msgid "Failed to update properties"
 msgstr "Ominaisuuksien pÃ¤ivittÃ¤minen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:1539
+#: ../src/libedataserver/e-webdav-session.c:1668
 #, fuzzy
 msgid "Failed to issue REPORT"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../src/libedataserver/e-webdav-session.c:1598
+#: ../src/libedataserver/e-webdav-session.c:1729
 msgid "Failed to create collection"
 msgstr "Kokoelman luominen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:1689
-#: ../src/libedataserver/e-webdav-session.c:1843
+#: ../src/libedataserver/e-webdav-session.c:1822
+#: ../src/libedataserver/e-webdav-session.c:1983
 #, fuzzy
 #| msgid "Failed to retrieve message"
 msgid "Failed to get XML request content"
 msgstr "ViestiÃ¤ ei voitu hakea."
 
-#: ../src/libedataserver/e-webdav-session.c:1701
+#: ../src/libedataserver/e-webdav-session.c:1834
 msgid "Failed to create address book"
 msgstr "Osoitekirjan luominen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:1856
+#: ../src/libedataserver/e-webdav-session.c:1996
 msgid "Failed to create calendar"
 msgstr "Kalenterin luominen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:1988
-#: ../src/libedataserver/e-webdav-session.c:1999
+#: ../src/libedataserver/e-webdav-session.c:2130
+#: ../src/libedataserver/e-webdav-session.c:2141
 msgid "Failed to read resource"
 msgstr "Resurssin lukeminen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:2148
+#: ../src/libedataserver/e-webdav-session.c:2290
 #, fuzzy
 #| msgid "Forwarding messages is not supported"
 msgid "Cannot rewind input stream: Not supported"
 msgstr "Viestien edelleenlÃ¤hetystÃ¤ ei tueta"
 
-#: ../src/libedataserver/e-webdav-session.c:2311
 #: ../src/libedataserver/e-webdav-session.c:2455
+#: ../src/libedataserver/e-webdav-session.c:2601
 #, fuzzy
 #| msgid "Failed to encode data"
 msgid "Failed to put data"
 msgstr "Tiedon koodaus epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:2330
-#: ../src/libedataserver/e-webdav-session.c:2463
+#: ../src/libedataserver/e-webdav-session.c:2474
+#: ../src/libedataserver/e-webdav-session.c:2609
 #, fuzzy, c-format
 #| msgid "Failed to add data to encoder"
 msgid "Failed to put data to server, error code %d (%s)"
 msgstr "Tiedon lisÃ¤ys koodaajaan epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:2555
+#: ../src/libedataserver/e-webdav-session.c:2703
 msgid "Failed to delete resource"
 msgstr "Resurssin poistaminen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:2622
+#: ../src/libedataserver/e-webdav-session.c:2772
 msgid "Failed to copy resource"
 msgstr "Resurssin kopioiminen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:2684
+#: ../src/libedataserver/e-webdav-session.c:2836
 msgid "Failed to move resource"
 msgstr "Resurssin siirtÃ¤minen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:2789
+#: ../src/libedataserver/e-webdav-session.c:2943
 msgid "Failed to lock resource"
 msgstr "Resurssin lukitseminen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:2803
-#: ../src/libedataserver/e-webdav-session.c:3005
+#: ../src/libedataserver/e-webdav-session.c:2957
+#: ../src/libedataserver/e-webdav-session.c:3163
 msgid "Expected application/xml response, but none returned"
 msgstr ""
 
-#: ../src/libedataserver/e-webdav-session.c:2806
-#: ../src/libedataserver/e-webdav-session.c:3008
+#: ../src/libedataserver/e-webdav-session.c:2960
+#: ../src/libedataserver/e-webdav-session.c:3166
 #, c-format
 msgid "Expected application/xml response, but %s returned"
 msgstr ""
 
-#: ../src/libedataserver/e-webdav-session.c:2818
-#: ../src/libedataserver/e-webdav-session.c:3021
+#: ../src/libedataserver/e-webdav-session.c:2972
+#: ../src/libedataserver/e-webdav-session.c:3179
 #, fuzzy
 #| msgid "Failed to encode data"
 msgid "Failed to parse XML data"
 msgstr "Tiedon koodaus epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:2897
+#: ../src/libedataserver/e-webdav-session.c:3053
 #, fuzzy
 #| msgid "Failed to retrieve message"
 msgid "Failed to refresh lock"
 msgstr "ViestiÃ¤ ei voitu hakea."
 
-#: ../src/libedataserver/e-webdav-session.c:2956
+#: ../src/libedataserver/e-webdav-session.c:3114
 msgid "Failed to unlock"
 msgstr "Lukituksen avaaminen epÃ¤onnistui"
 
-#: ../src/libedataserver/e-webdav-session.c:2993
+#: ../src/libedataserver/e-webdav-session.c:3151
 #, fuzzy, c-format
 #| msgid "Unexpected HTTP status code %d returned (%s)"
 msgid "Expected multistatus response, but %d returned (%s)"
 msgstr "Odottamaton HTTP-tilakoodi %d palautettiin (%s)"
 
-#: ../src/libedataserver/e-webdav-session.c:4040
+#: ../src/libedataserver/e-webdav-session.c:4230
 #, fuzzy
 #| msgid "Failed to get lock using fcntl(2): %s"
 msgid "Failed to get access control list"
 msgstr "Lukitseminen kÃ¤yttÃ¤en fcntl(2) kutsua epÃ¤onnistui: %s"
 
-#: ../src/libedataserver/e-webdav-session.c:4781
+#: ../src/libedataserver/e-webdav-session.c:4981
 msgid "Cannot store protected nor inherited Access Control Entry."
 msgstr ""
 
-#: ../src/libedataserver/e-webdav-session.c:4788
+#: ../src/libedataserver/e-webdav-session.c:4988
 msgid "Provided invalid principal kind for Access Control Entry."
 msgstr ""
 
-#: ../src/libedataserver/e-webdav-session.c:4795
+#: ../src/libedataserver/e-webdav-session.c:4995
 msgid "Cannot store property-based Access Control Entry."
 msgstr ""
 
-#: ../src/libedataserver/e-webdav-session.c:4802
+#: ../src/libedataserver/e-webdav-session.c:5002
 msgid "Access Control Entry can be only to Grant or Deny, but not None."
 msgstr ""
 
-#: ../src/libedataserver/e-webdav-session.c:4810
+#: ../src/libedataserver/e-webdav-session.c:5010
 msgid "Access Control Entry can be only to Grant or Deny, but not both."
 msgstr ""
 
-#: ../src/libedataserver/e-webdav-session.c:4869
+#: ../src/libedataserver/e-webdav-session.c:5069
 msgid "Access Control Entry privilege cannot be NULL."
 msgstr ""
 
-#: ../src/libedataserverui/e-credentials-prompter.c:258
-#: ../src/libedataserverui/e-credentials-prompter.c:1576
-#: ../src/libedataserverui/e-credentials-prompter.c:1620
+#: ../src/libedataserverui/e-credentials-prompter.c:259
+#: ../src/libedataserverui/e-credentials-prompter.c:1692
+#: ../src/libedataserverui/e-credentials-prompter.c:1736
 #, fuzzy
 msgid "Credentials prompt was cancelled"
 msgstr "Toimenpide on peruttu"
 
-#: ../src/libedataserverui/e-credentials-prompter.c:662
+#: ../src/libedataserverui/e-credentials-prompter.c:775
 #, fuzzy, c-format
 #| msgid "Store does not support an INBOX"
 msgid "Source â€œ%sâ€ doesnâ€™t support prompt for credentials"
@@ -7175,13 +7202,17 @@ msgid ""
 "account â€œ%sâ€."
 msgstr "Kirjaudu %s-tilillesi ja hyvÃ¤ksy ehdot kÃ¤yttÃ¤Ã¤ksesi tiliÃ¤si â€œ%sâ€."
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:602
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:605
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:230
 #: ../src/libedataserverui/e-trust-prompt.c:112
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1061
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1083
 msgid "_Cancel"
 msgstr "_Peru"
 
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:679
+msgid "URL:"
+msgstr ""
+
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:132
 msgid "Address book authentication request"
 msgstr "Osoitekirjan tunnistautumispyyntÃ¶"
@@ -7235,7 +7266,7 @@ msgid "Please enter the password for account â€œ%sâ€."
 msgstr "Anna tilin â€œ%sâ€ salasana."
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:231
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1062
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1084
 msgid "_OK"
 msgstr "_OK"
 
@@ -7252,92 +7283,90 @@ msgstr "_Salasana:"
 msgid "_Add this password to your keyring"
 msgstr "_LisÃ¤Ã¤ tÃ¤mÃ¤ salasana avainnippuusi"
 
-#: ../src/libedataserverui/e-reminders-widget.c:225
+#: ../src/libedataserverui/e-reminders-widget.c:226
 msgid "Add custom timeâ€¦"
-msgstr ""
+msgstr "LisÃ¤Ã¤ mukautettu aikaâ€¦"
 
-#: ../src/libedataserverui/e-reminders-widget.c:229
+#: ../src/libedataserverui/e-reminders-widget.c:230
 msgid "Clear custom times"
-msgstr ""
+msgstr "TyhjennÃ¤ mukautetut ajat"
 
-#: ../src/libedataserverui/e-reminders-widget.c:277
+#: ../src/libedataserverui/e-reminders-widget.c:278
 msgctxt "overdue"
 msgid "now"
 msgstr "nyt"
 
-#: ../src/libedataserverui/e-reminders-widget.c:295
+#: ../src/libedataserverui/e-reminders-widget.c:296
 #, c-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d vuosi"
+msgstr[1] "%d vuotta"
 
-#: ../src/libedataserverui/e-reminders-widget.c:301
+#: ../src/libedataserverui/e-reminders-widget.c:302
 msgctxt "overdue"
 msgid "overdue"
 msgstr ""
 
-#: ../src/libedataserverui/e-reminders-widget.c:912
+#: ../src/libedataserverui/e-reminders-widget.c:922
 #, fuzzy, c-format
 #| msgid "Failed to create child process '%s': %s"
 msgid "Failed to launch URI â€œ%sâ€:"
 msgstr "Lapsiprosessin \"%s\" luominen epÃ¤onnistui: %s"
 
-#: ../src/libedataserverui/e-reminders-widget.c:953
+#: ../src/libedataserverui/e-reminders-widget.c:963
 msgid "Failed to dismiss reminder:"
 msgstr "Muistutuksen hylkÃ¤Ã¤minen epÃ¤onnistui:"
 
-#: ../src/libedataserverui/e-reminders-widget.c:974
+#: ../src/libedataserverui/e-reminders-widget.c:984
 #, fuzzy
 msgid "Failed to dismiss all:"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1110
+#: ../src/libedataserverui/e-reminders-widget.c:1120
 msgid "Set a custom snooze time for"
-msgstr ""
+msgstr "Aseta mukautettu torkkuaika, jonka kesto on"
 
 #. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where 
the text in "[]" means a separate widget
-#: ../src/libedataserverui/e-reminders-widget.c:1123
+#: ../src/libedataserverui/e-reminders-widget.c:1133
 msgctxt "reminders-snooze"
 msgid "da_ys"
-msgstr ""
+msgstr "_pÃ¤ivÃ¤Ã¤"
 
 #. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where 
the text in "[]" means a separate widget
-#: ../src/libedataserverui/e-reminders-widget.c:1139
+#: ../src/libedataserverui/e-reminders-widget.c:1149
 msgctxt "reminders-snooze"
 msgid "_hours"
-msgstr ""
+msgstr "_tuntia"
 
 #. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where 
the text in "[]" means a separate widget
-#: ../src/libedataserverui/e-reminders-widget.c:1155
+#: ../src/libedataserverui/e-reminders-widget.c:1165
 msgctxt "reminders-snooze"
 msgid "_minutes"
-msgstr ""
+msgstr "_minuuttia"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1161
+#: ../src/libedataserverui/e-reminders-widget.c:1171
 msgid "_Add Snooze time"
 msgstr "_LisÃ¤Ã¤ torkkuaika"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1428
+#: ../src/libedataserverui/e-reminders-widget.c:1438
 #: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
 msgid "_Dismiss"
 msgstr "_HylkÃ¤Ã¤"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1429
-#| msgid "_Dismiss"
+#: ../src/libedataserverui/e-reminders-widget.c:1439
 msgid "Dismiss _All"
 msgstr "Hylk_Ã¤Ã¤ kaikki"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1431
+#: ../src/libedataserverui/e-reminders-widget.c:1441
 msgid "_Snooze"
 msgstr "_Torkku"
 
 #: ../src/libedataserverui/e-trust-prompt.c:111
 #: ../src/modules/trust-prompt/trust-prompt-gtk.c:117
-#, fuzzy
 #| msgid "Signing certificate not trusted"
 msgid "Certificate trust..."
-msgstr "Allekirjoitusvarmenteeseen ei luoteta"
+msgstr "Varmenteen luotto..."
 
 #: ../src/libedataserverui/e-trust-prompt.c:113
 #: ../src/modules/trust-prompt/trust-prompt-gtk.c:118
@@ -7371,10 +7400,8 @@ msgstr "Yksityiskohtainen virhe:"
 
 #: ../src/libedataserverui/e-trust-prompt.c:273
 #: ../src/modules/trust-prompt/module-trust-prompt.c:80
-#, fuzzy
-#| msgid "Signing certificate not found"
 msgid "The signing certificate authority is not known."
-msgstr "Allekirjoitusvarmennetta ei lÃ¶ytynyt"
+msgstr "Varmenteen allekirjoittajataho ei ole tunnettu."
 
 #: ../src/libedataserverui/e-trust-prompt.c:275
 #: ../src/modules/trust-prompt/module-trust-prompt.c:82
@@ -7385,10 +7412,8 @@ msgstr ""
 
 #: ../src/libedataserverui/e-trust-prompt.c:277
 #: ../src/modules/trust-prompt/module-trust-prompt.c:84
-#, fuzzy
-#| msgid "The certificate's activation time is still in the future."
 msgid "The certificateâ€™s activation time is still in the future."
-msgstr "Varmenteen aktivointiaika on tulevaisuudessa."
+msgstr "Varmenteen aktivointiaika on yhÃ¤ tulevaisuudessa."
 
 #: ../src/libedataserverui/e-trust-prompt.c:279
 #: ../src/modules/trust-prompt/module-trust-prompt.c:86
@@ -7404,10 +7429,8 @@ msgstr ""
 
 #: ../src/libedataserverui/e-trust-prompt.c:283
 #: ../src/modules/trust-prompt/module-trust-prompt.c:90
-#, fuzzy
-#| msgid "The certificate's activation time is still in the future."
 msgid "The certificateâ€™s algorithm is considered insecure."
-msgstr "Varmenteen aktivointiaika on tulevaisuudessa."
+msgstr "Varmenteen algoritmia ei mielletÃ¤ turvalliseksi."
 
 #: ../src/libedataserverui/e-webdav-discover-widget.c:164
 #, fuzzy
@@ -7420,35 +7443,35 @@ msgstr "Toimittajat"
 msgid "_User mail:"
 msgstr "_KÃ¤yttÃ¤jÃ¤n sÃ¤hkÃ¶posti:"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:521
+#: ../src/libedataserverui/e-webdav-discover-widget.c:524
 msgctxt "WebDAVDiscover"
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:522
+#: ../src/libedataserverui/e-webdav-discover-widget.c:525
 msgctxt "WebDAVDiscover"
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:523
+#: ../src/libedataserverui/e-webdav-discover-widget.c:526
 msgctxt "WebDAVDiscover"
 msgid "Memos"
 msgstr ""
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:524
+#: ../src/libedataserverui/e-webdav-discover-widget.c:527
 msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "TehtÃ¤vÃ¤t"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:834
+#: ../src/libedataserverui/e-webdav-discover-widget.c:849
 msgid "Invalid URL"
 msgstr "Virheellinen osoite"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:875
+#: ../src/libedataserverui/e-webdav-discover-widget.c:895
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:878
+#: ../src/libedataserverui/e-webdav-discover-widget.c:898
 msgid "Searching server sources..."
 msgstr "EtsitÃ¤Ã¤n palvelinlÃ¤hteitÃ¤..."
 
@@ -7499,119 +7522,24 @@ msgstr "Tiedon koodaus epÃ¤onnistui"
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr ""
 
-#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1405
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1426
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an access token for â€œ%sâ€"
 msgstr ""
 
-#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1455
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1476
 #, 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"
 
-#: ../src/modules/google-backend/module-google-backend.c:589
-#: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../src/modules/google-backend/module-google-backend.c:632
 #: ../src/services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../src/modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../src/tools/list-sources/list-sources.c:148
-msgid "Calendar"
-msgstr "Kalenteri"
-
-#: ../src/modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
-msgid "Integrate your calendars"
-msgstr "Integroi kalenterisi"
-
-#: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
-msgid "Integrate your contacts"
-msgstr "Integroi yhteystietosi"
-
-#: ../src/modules/ubuntu-online-accounts/e-signon-session-password.c:273
-msgid "Signon service did not return a secret"
-msgstr ""
-
-#: ../src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
-msgid "Evolution Data Server"
-msgstr "Evolution-datapalvelin"
-
-#: ../src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
-msgid "Required to have EDS appear in UOA"
-msgstr ""
-
-#: ../src/modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
-msgid "Google Calendar"
-msgstr "Google-kalenteri"
-
-#: ../src/modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
-msgid "Google Contacts"
-msgstr "Google-yhteystiedot"
-
-#: ../src/modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
-msgid "GMail"
-msgstr "GMail"
-
-#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
-msgid "Mail"
-msgstr "SÃ¤hkÃ¶posti"
-
-#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
-msgid "Integrate your mailboxes"
-msgstr "Integroi postilaatikkosi"
-
-#: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1061
-#, c-format
-msgid ""
-"Cannot find a corresponding account service in the accounts database from "
-"which to obtain an access token for â€œ%sâ€"
-msgstr ""
-
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:85
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:282
-#, c-format
-msgid ""
-"Expected status 200 when requesting your identity, instead got status %d (%s)"
-msgstr ""
-
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:102
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:299
-msgid "Error parsing response as JSON: "
-msgstr "Virhe jÃ¤sentÃ¤essÃ¤ vastausta JSON-muodossa: "
-
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:120
-#, fuzzy
-#| msgid "Didn't find 'email' in JSON data"
-msgid "Didnâ€™t find â€œemailâ€ in JSON data"
-msgstr "JSON-datasta ei lÃ¶ytynyt kohtaa 'email'"
-
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:317
-#, fuzzy
-#| msgid "Didn't find 'id' in JSON data"
-msgid "Didnâ€™t find â€œidâ€ in JSON data"
-msgstr "JSON-datasta ei lÃ¶ytynyt kohtaa 'id'"
-
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:322
-#, fuzzy
-#| msgid "Didn't find 'emails.account' in JSON data"
-msgid "Didnâ€™t find â€œemails.accountâ€ in JSON data"
-msgstr "JSON-datasta ei lÃ¶ytynyt kohtaa 'emails.account'"
-
-#: ../src/modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
-msgid "Windows Live Mail"
-msgstr "Windows Live Mail"
-
-#: ../src/modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
-msgid "Yahoo! Calendar"
-msgstr "Yahoo!-kalenteri"
-
-#: ../src/modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
-msgid "Yahoo! Mail"
-msgstr "Yahoo!-sÃ¤hkÃ¶posti"
-
 #: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
 #: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:40
 #: ../src/services/evolution-user-prompter/evolution-user-prompter.c:33
@@ -7630,26 +7558,26 @@ msgid ""
 "disable, any other value is to use compile-time option"
 msgstr ""
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:223
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:250
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:755
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:964
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:292
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:320
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:831
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:1040
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:362
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:432
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:363
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:433
 msgid "_No"
 msgstr "_Ei"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:364
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:434
 msgid "_Yes"
 msgstr "_KyllÃ¤"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:368
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:438
 #, c-format
 msgid ""
 "A calendar reminder is about to trigger. This reminder is configured to run "
@@ -7660,31 +7588,33 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:382
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:453
 msgid "Do not ask me about this program again"
-msgstr ""
+msgstr "Ã„lÃ¤ kysy uudestaan tÃ¤stÃ¤ ohjelmasta"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:660
-msgid "Display reminders in notification area _only"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:736
+#, fuzzy
+#| msgid "Display reminders in notification area _only"
+msgid "Display Reminders window with _notifications"
 msgstr "NÃ¤_ytÃ¤ muistutukset vain ilmoitusalueella"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:661
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:737
 msgid "Keep reminder notification window always on _top"
 msgstr "PidÃ¤ muistutusilmoitusikkuna aina _pÃ¤Ã¤llimmÃ¤isenÃ¤"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:662
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:738
 msgid "Display reminders for _completed tasks"
 msgstr "_NÃ¤ytÃ¤ muistutukset valmistuneista tehtÃ¤vistÃ¤"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:663
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:739
 msgid "Display reminders for _past events"
 msgstr "NÃ¤ytÃ¤ _muistutukset menneistÃ¤ tapahtumista"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:677
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:753
 msgid "Reminders Options:"
 msgstr "Muistutusvalinnat:"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:771
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:847
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -7833,6 +7763,10 @@ msgstr "Kokoelma/Ubuntu-verkkotilit"
 msgid "Address Book"
 msgstr "Osoitekirja"
 
+#: ../src/tools/list-sources/list-sources.c:148
+msgid "Calendar"
+msgstr "Kalenteri"
+
 #: ../src/tools/list-sources/list-sources.c:149
 #, fuzzy
 #| msgid "Category List"
@@ -7953,6 +7887,118 @@ msgstr "Yhteyden muodostaminen palvelimeen SSL/TLS:Ã¤Ã¤ kÃ¤yttÃ¤en epÃ¤onnistui:
 msgid "No sources had been found\n"
 msgstr "LÃ¤hteitÃ¤ ei oltu lÃ¶ydetty\n"
 
+#~ msgid "Success"
+#~ msgstr "Valmis"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "Tunnistus epÃ¤onnistui"
+
+#~ msgid "Authentication Required"
+#~ msgstr "Tunnistautuminen vaaditaan"
+
+#~ msgid "Unsupported field"
+#~ msgstr "KenttÃ¤ ei ole tuettu"
+
+#~ msgid "Address book does not exist"
+#~ msgstr "Osoitekirjaa ei ole olemassa"
+
+#~ msgid "Book removed"
+#~ msgstr "Kirja poistettu"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "Ei kÃ¤ytettÃ¤vissÃ¤ yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
+
+#~ msgid "Invalid server version"
+#~ msgstr "Virheellinen palvelimen versio"
+
+#~ msgid "Repository is offline"
+#~ msgstr "Varasto on yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
+
+#~ msgid "URI not loaded"
+#~ msgstr "URIa ei ole ladattu"
+
+#~ msgid "URI already loaded"
+#~ msgstr "URI on jo ladattu"
+
+#~ msgid "Unknown User"
+#~ msgstr "Tuntematon kÃ¤yttÃ¤jÃ¤"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "Protokolla ei ole tuettu"
+
+#~ msgid "Operation has been cancelled"
+#~ msgstr "Toimenpide on peruttu"
+
+#~ msgid "Could not cancel operation"
+#~ msgstr "ToimenpidettÃ¤ ei voitu perua"
+
+#~ msgid "A D-Bus exception has occurred"
+#~ msgstr "Tapahtui D-Bus-poikkeus"
+
+#~ msgid "No error"
+#~ msgstr "Ei virhettÃ¤"
+
+#~ msgid "Calendar does not exist"
+#~ msgstr "Kalenteria ei ole olemassa"
+
+#~ msgid ""
+#~ "Invalid trace information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Virheellinen seurannan tieto:\n"
+#~ "%s"
+
+#~ msgid "Integrate your calendars"
+#~ msgstr "Integroi kalenterisi"
+
+#~ msgid "Integrate your contacts"
+#~ msgstr "Integroi yhteystietosi"
+
+#~ msgid "Evolution Data Server"
+#~ msgstr "Evolution-datapalvelin"
+
+#~ msgid "Google Calendar"
+#~ msgstr "Google-kalenteri"
+
+#~ msgid "Google Contacts"
+#~ msgstr "Google-yhteystiedot"
+
+#~ msgid "GMail"
+#~ msgstr "GMail"
+
+#~ msgid "Mail"
+#~ msgstr "SÃ¤hkÃ¶posti"
+
+#~ msgid "Integrate your mailboxes"
+#~ msgstr "Integroi postilaatikkosi"
+
+#~ msgid "Error parsing response as JSON: "
+#~ msgstr "Virhe jÃ¤sentÃ¤essÃ¤ vastausta JSON-muodossa: "
+
+#, fuzzy
+#~| msgid "Didn't find 'email' in JSON data"
+#~ msgid "Didnâ€™t find â€œemailâ€ in JSON data"
+#~ msgstr "JSON-datasta ei lÃ¶ytynyt kohtaa 'email'"
+
+#, fuzzy
+#~| msgid "Didn't find 'id' in JSON data"
+#~ msgid "Didnâ€™t find â€œidâ€ in JSON data"
+#~ msgstr "JSON-datasta ei lÃ¶ytynyt kohtaa 'id'"
+
+#, fuzzy
+#~| msgid "Didn't find 'emails.account' in JSON data"
+#~ msgid "Didnâ€™t find â€œemails.accountâ€ in JSON data"
+#~ msgstr "JSON-datasta ei lÃ¶ytynyt kohtaa 'emails.account'"
+
+#~ msgid "Windows Live Mail"
+#~ msgstr "Windows Live Mail"
+
+#~ msgid "Yahoo! Calendar"
+#~ msgstr "Yahoo!-kalenteri"
+
+#~ msgid "Yahoo! Mail"
+#~ msgstr "Yahoo!-sÃ¤hkÃ¶posti"
+
 #~| msgid "Forwarding messages is not supported"
 #~ msgid "Credentials required"
 #~ msgstr "Kirjautumistiedot vaaditaan"
@@ -7995,9 +8041,6 @@ msgstr "LÃ¤hteitÃ¤ ei oltu lÃ¶ydetty\n"
 #~ msgid "Querying for updated groupsâ€¦"
 #~ msgstr "Haetaan pÃ¤ivittyneitÃ¤ ryhmiÃ¤..."
 
-#~ msgid "The backend does not support bulk removals"
-#~ msgstr "Taustapalvelu ei tue massapoistoja"
-
 #~ msgid "Loadingâ€¦"
 #~ msgstr "Ladataanâ€¦"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]