[evolution-data-server] Finnish translation update by Jiri Grönroos



commit d74074f5d473d54a1519579806e4c32d9b2b53ab
Author: Ville-Pekka Vainio <vpvainio iki fi>
Date:   Sat Mar 23 19:34:14 2013 +0200

    Finnish translation update by Jiri Grönroos

 po/fi.po | 3845 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 2199 insertions(+), 1646 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index cb69d4b..2a36a02 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,19 +3,20 @@
 # Jarkko Ranta <jjranta cc joensuu fi> 2000-2001,
 # Sami Pesonen <sampeson iki fi> 2001-2003.
 # Ilkka Tuohela <hile iki fi> 2003-2008.
-# Jiri Grönroos, 2010.
-# Timo Jyrinki <timo jyrinki iki fi>, 2012.
 #
 # Gnome 2012-03 Finnish translation sprint participants:
 # Jiri Grönroos
 # Niklas Laxström
+# Jiri Grönroos, 2010, 2013.
+# Timo Jyrinki <timo jyrinki iki fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-26 11:36+0300\n"
-"PO-Revision-Date: 2012-09-26 11:37+0300\n"
-"Last-Translator: Timo Jyrinki <timo jyrinki iki fi>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2013-03-17 14:48+0000\n"
+"PO-Revision-Date: 2013-03-23 15:06+0200\n"
+"Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -23,293 +24,300 @@ 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: MediaWiki 1.20alpha (r113129); Translate 2012-03-02\n"
-
-#: ../addressbook/backends/file/e-book-backend-file.c:116
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1232
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4785
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:931
-#: ../addressbook/libebook/e-book-client.c:106
-#: ../addressbook/libedata-book/e-data-book.c:432
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:570
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
-#: ../calendar/libecal/e-cal.c:4033 ../calendar/libecal/e-cal-client.c:148
-#: ../camel/camel-imapx-command.c:594
-#: ../camel/providers/imap/camel-imap-command.c:525
-#: ../camel/providers/imap/camel-imap-store.c:469
-#: ../libedataserver/e-client.c:165
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
+"X-Generator: Lokalize 1.5\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:141
+#: ../addressbook/backends/file/e-book-backend-file.c:114
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "Tiedoston \"%s\" poistaminen epäonnistui: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:164
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:616
+#: ../addressbook/backends/file/e-book-backend-file.c:138
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Kansion \"%s\" luominen epäonnistui: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:459
+#: ../addressbook/backends/file/e-book-backend-file.c:385
 #, fuzzy, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Lapsiprosessin \"%s\" luominen epäonnistui: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:561
-#: ../addressbook/backends/file/e-book-backend-file.c:1127
+#: ../addressbook/backends/file/e-book-backend-file.c:487
+#: ../addressbook/backends/file/e-book-backend-file.c:911
 msgid "No UID in the contact"
 msgstr "UID puuttuu yhteystiedosta"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1569
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508
+#: ../addressbook/backends/file/e-book-backend-file.c:757
+#, c-format
+msgid "Conflicting UIDs found in added contacts"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:844
+#: ../addressbook/backends/file/e-book-backend-file.c:1038
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2615
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "Yhteystietoa \"%s\" ei löydy"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:940
+#, c-format
+msgid "Tried to modify contact '%s' with out of sync revision"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1089
+#: ../addressbook/backends/file/e-book-backend-file.c:1139
+#, fuzzy, c-format
+#| msgid "Protocol not supported"
+msgid "Query '%s' not supported"
+msgstr "Protokolla ei ole tuettu"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1098
+#: ../addressbook/backends/file/e-book-backend-file.c:1148
+#, fuzzy, c-format
+#| msgid "Invalid query: "
+msgid "Invalid Query '%s'"
+msgstr "Virheellinen haku: "
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1248
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1572
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
+#: ../addressbook/backends/file/e-book-backend-file.c:1250
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4963
 msgid "Searching..."
 msgstr "Etsitään..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2115
-#, c-format
-msgid "Failed to build summary for an address book %s"
-msgstr "Yhteenvedon luominen osoitekirjalle %s epäonnistui."
+#: ../addressbook/backends/file/e-book-backend-file.c:1568
+#, c-format
+#| msgid "Could not rename folder %s to %s: %s"
+msgid "Failed to rename old database from '%s' to '%s': %s"
+msgstr "Vanhan tietokannan '%s' nimen muuttaminen muotoon '%s' epäonnistui: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1222
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4858
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:338
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
+#: ../addressbook/libebook-contacts/e-phone-number.c:58
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:562
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:592
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
+#: ../calendar/libecal/e-cal.c:2339 ../calendar/libecal/e-cal-client.c:275
+#: ../camel/camel-imapx-command.c:596 ../libedataserver/e-client.c:179
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:645
+#: ../addressbook/backends/google/e-book-backend-google.c:649
 msgid "Querying for updated contacts…"
 msgstr "Haetaan päivittyneitä yhteystietoja..."
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:782
+#: ../addressbook/backends/google/e-book-backend-google.c:786
 msgid "Querying for updated groups…"
 msgstr "Haetaan päivittyneitä ryhmiä..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1202
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+#: ../addressbook/backends/google/e-book-backend-google.c:1235
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1653
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:389
 msgid "The backend does not support bulk additions"
 msgstr "Taustapalvelu ei tue massalisäyksiä"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1234
+#: ../addressbook/backends/google/e-book-backend-google.c:1267
 msgid "Creating new contact…"
 msgstr "Luodaan uutta yhteystietoa..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1323
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+#: ../addressbook/backends/google/e-book-backend-google.c:1358
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:506
 msgid "The backend does not support bulk removals"
 msgstr "Taustapalvelu ei tue massapoistoja"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1351
+#: ../addressbook/backends/google/e-book-backend-google.c:1386
 msgid "Deleting contact…"
 msgstr "Poistetaan yhteystietoa..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1601
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
+#: ../addressbook/backends/google/e-book-backend-google.c:1640
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2319
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:567
 msgid "The backend does not support bulk modifications"
 msgstr "Taustapalvelu ei tue massamuokkauksia"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1639
+#: ../addressbook/backends/google/e-book-backend-google.c:1678
 msgid "Modifying contact…"
 msgstr "Muokataan yhteystietoa..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1809
+#: ../addressbook/backends/google/e-book-backend-google.c:1849
 msgid "Loading…"
 msgstr "Ladataan…"
 
-#: ../addressbook/backends/google/e-book-google-utils.c:1562
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1602
+#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1563
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1604
 msgid "Friends"
 msgstr "Ystävät"
 
-#. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1564
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1606
 msgid "Family"
 msgstr "Perhe"
 
-#. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1565
+#. System Group: Coworkers
+#: ../addressbook/backends/google/e-book-google-utils.c:1608
 msgid "Coworkers"
 msgstr "Työkaverit"
 
-#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book 
which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
+#. Translators: An error message shown to a user when trying to do an
+#. * operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
 msgid "Not connected"
 msgstr "Ei yhteyttä"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
-msgid "Using Distinguished Name (DN)"
-msgstr "Käytetään yksilöllöistä nimeä (DN)"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
-msgid "Using Email Address"
-msgstr "Käytetään sähköpostiosoitetta"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:950
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1073
 msgid "Reconnecting to LDAP server..."
 msgstr "Odotetaan uudelleen yhteyttä LDAP-palvelimeen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1203
 msgid "Invalid DN syntax"
 msgstr "Virheellinen DN-syntaksi"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1231
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4784
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1219
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4857
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP-virhe 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1737
 msgid "Adding contact to LDAP server..."
 msgstr "Lisätään yhteystieto LDAP-palvelimelle..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1875
 msgid "Removing contact from LDAP server..."
 msgstr "Poistetaan yhteystieto LDAP-palvelimelta..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2022
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2405
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: ldap_first_entry palautti arvon NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2265
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2456
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2272
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2474
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2341
 msgid "Modifying contact from LDAP server..."
 msgstr "Muokataan yhteystietoa LDAP-palvelimella..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2673
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2886
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2703
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2935
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4806
 msgid "Receiving LDAP search results..."
 msgstr "Vastaanotetaan LDAP-haun tuloksia..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4985
 msgid "Error performing search"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5108
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Haetaan yhteystietoja (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5571
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "DN:n hakeminen käyttäjälle \"%s\" epäonnistui"
 
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:645
-#, c-format
-msgid "Failed to open addressbook at '%s': %s"
-msgstr "Osoitekirjan avaaminen kohteessa \"%s\" epäonnistui: %s"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
-#, c-format
-msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:420
+#, fuzzy, c-format
+#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "Resurssin \"%s\" luominen epäonnistui HTTP-statuskoodilla %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:522
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE epäonnistui HTTP-tilakoodilla %d"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
 msgid "Contact on server changed -> not modifying"
 msgstr "Yhteystieto muuttui palvelimella -> ei muokata"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515
-#, c-format
-msgid "Modify contact failed with HTTP status: %d (%s)"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:597
+#, fuzzy, c-format
+#| msgid "Modify contact failed with HTTP status: %d (%s)"
+msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "Yhteystiedon muokkaaminen epäonnistui HTTP-tilakoodilla %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1007
 msgid "Loading Addressbook summary..."
 msgstr "Ladataan osoitekirjan yhteenvetoa..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026
 #, c-format
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr ""
 "PROPFIND-toiminto webdav-palvelimella epäonnistui HTTP-tilakoodilla %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1051
 msgid "No response body in webdav PROPFIND result"
 msgstr "Vastausrunko puuttuu webdav-palvelimen vastauksesta PROPFIND-pyyntöön"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1083
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "Ladataan yhteystietoja (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1416
 msgid "Cannot transform SoupURI to string"
 msgstr ""
 
-#: ../addressbook/libebook/e-book-client.c:95
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24
 #, fuzzy
 msgid "No such book"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
+#: ../addressbook/libedata-book/e-data-book.c:797
 msgid "Contact not found"
 msgstr "Yhteystietoa ei löytynyt"
 
-#: ../addressbook/libebook/e-book-client.c:99
-#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
+#: ../addressbook/libedata-book/e-data-book.c:798
 msgid "Contact ID already exists"
 msgstr "Yhteystiedon tunniste on jo olemassa"
 
-#: ../addressbook/libebook/e-book-client.c:101
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30
 msgid "No such source"
 msgstr "Lähdettä ei ole olemassa"
 
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
+#: ../addressbook/libedata-book/e-data-book.c:814
 msgid "No space"
 msgstr "Ei tilaa"
 
-#: ../addressbook/libebook/e-book-client.c:488
-#, fuzzy
-msgid "Failed to run book factory"
-msgstr "Tiedon koodaus epäonnistui"
-
-#: ../addressbook/libebook/e-book-client.c:2244
-#: ../calendar/libecal/e-cal-client.c:4602
-#, fuzzy
-msgid "Cannot get connection to view"
-msgstr "Kansion %s säiliötä ei voitu hakea"
-
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook-contacts/e-contact.c:120
 msgid "Unique ID"
 msgstr "Yksilöllinen tunniste"
 
@@ -317,12 +325,12 @@ msgstr "Yksilöllinen tunniste"
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook-contacts/e-contact.c:125
 msgid "File Under"
 msgstr "Tallenna kohtaan"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook-contacts/e-contact.c:127
 #, fuzzy
 msgid "Book UID"
 msgstr "Kirjan URI"
@@ -331,435 +339,434 @@ msgstr "Kirjan URI"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook-contacts/e-contact.c:133
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook-contacts/e-contact.c:134
 msgid "Given Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:135
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook-contacts/e-contact.c:136
 msgid "Nickname"
 msgstr "Lempinimi"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook-contacts/e-contact.c:139
 msgid "Email 1"
 msgstr "1. sähköposti"
 
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook-contacts/e-contact.c:140
 msgid "Email 2"
 msgstr "2. sähköposti"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:141
 msgid "Email 3"
 msgstr "3. sähköposti"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook-contacts/e-contact.c:142
 msgid "Email 4"
 msgstr "4. sähköposti"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook-contacts/e-contact.c:147
 msgid "Home Address Label"
 msgstr "Kotiosoite"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook-contacts/e-contact.c:148
 msgid "Work Address Label"
 msgstr "Työosoite"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Other Address Label"
 msgstr "Muu osoite"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Assistant Phone"
 msgstr "Apulaisen puhelin"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook-contacts/e-contact.c:153
 msgid "Business Phone"
 msgstr "Työpuhelin"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Business Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:155
 msgid "Business Fax"
 msgstr "Työ/faksi"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:156
 msgid "Callback Phone"
 msgstr "Takaisinsoitto"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:160
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:161
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:162
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Pager"
 msgstr "Pager"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../addressbook/libebook/e-contact.c:176
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Organizational Unit"
 msgstr "Organisaatioyksikkö"
 
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Office"
 msgstr "Asema"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Title"
 msgstr "Titteli"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Role"
 msgstr "Rooli"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook-contacts/e-contact.c:180
 msgid "Assistant"
 msgstr "Apulainen"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook-contacts/e-contact.c:183
 msgid "Homepage URL"
 msgstr "Kotisivun URL"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook-contacts/e-contact.c:184
 msgid "Weblog URL"
 msgstr "Weblogin URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:188
-#: ../libedataserverui/e-categories-dialog.c:90
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Categories"
 msgstr "Ryhmät"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Calendar URI"
 msgstr "Kalenterin URL"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook-contacts/e-contact.c:191
 msgid "Free/Busy URL"
 msgstr "Vapaa/varattu URL"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:192
 msgid "ICS Calendar"
 msgstr "ICS-kalenteri"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Video Conferencing URL"
 msgstr "Videoneuvottelun URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook-contacts/e-contact.c:196
 msgid "Spouse's Name"
 msgstr "Puolison nimi"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook-contacts/e-contact.c:197
 msgid "Note"
 msgstr "Huomio"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "AIM Home Screen Name 1"
 msgstr "AIM-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "AIM Home Screen Name 2"
 msgstr "AIM-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "AIM Home Screen Name 3"
 msgstr "AIM-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "AIM Work Screen Name 1"
 msgstr "AIM-työnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:204
 msgid "AIM Work Screen Name 2"
 msgstr "AIM-työnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:205
 msgid "AIM Work Screen Name 3"
 msgstr "AIM-työnimi 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:206
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:208
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:209
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise-työnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:210
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise-työnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-työnimi 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "Jabber Home ID 1"
 msgstr "Jabber koti ID 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "Jabber Home ID 2"
 msgstr "Jabber koti ID 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "Jabber Home ID 3"
 msgstr "Jabber koti ID 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "Jabber Work ID 1"
 msgstr "Jabber työ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "Jabber Work ID 2"
 msgstr "Jabber työ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "Jabber Work ID 3"
 msgstr "Jabber työ ID 3"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!-työnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!-työnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!-työnimi 3"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "MSN Home Screen Name 1"
 msgstr "MSN-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "MSN Home Screen Name 2"
 msgstr "MSN-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "MSN Home Screen Name 3"
 msgstr "MSN-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "MSN Work Screen Name 1"
 msgstr "MSN-työnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "MSN Work Screen Name 2"
 msgstr "MSN-työnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "ICQ Home ID 1"
 msgstr "ICQ koti ID 1"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "ICQ Home ID 2"
 msgstr "ICQ koti ID 2"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "ICQ Home ID 3"
 msgstr "ICQ koti ID 3"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "ICQ Work ID 1"
 msgstr "ICQ työ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "ICQ Work ID 2"
 msgstr "ICQ työ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "ICQ Work ID 3"
 msgstr "ICQ työ ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "Last Revision"
 msgstr "Viimeisin tarkistettu versio"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "Name or Org"
 msgstr "Nimi tai Org"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "Address List"
 msgstr "Osoitelista"
 
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook-contacts/e-contact.c:246
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook-contacts/e-contact.c:247
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:248
 msgid "Other Address"
 msgstr "Muu osoite"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook-contacts/e-contact.c:251
 msgid "Category List"
 msgstr "Ryhmäluettelo"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook-contacts/e-contact.c:254
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook-contacts/e-contact.c:255
 msgid "Logo"
 msgstr "Logo"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook-contacts/e-contact.c:259
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook-contacts/e-contact.c:260
 msgid "Email List"
 msgstr "Sähköpostilista"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook-contacts/e-contact.c:263
 msgid "AIM Screen Name List"
 msgstr "AIM näyttönimien lista"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:264
 msgid "GroupWise ID List"
-msgstr "GroupWise ID lista"
+msgstr "GroupWise-ID-lista"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Jabber ID List"
-msgstr "Jabber ID lista"
+msgstr "Jabber-ID-lista"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook-contacts/e-contact.c:266
 msgid "Yahoo! Screen Name List"
-msgstr "Yahoo! näyttönimien lista"
+msgstr "Yahoo!-näyttönimien lista"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook-contacts/e-contact.c:267
 msgid "MSN Screen Name List"
-msgstr "MSN näyttönimien lista"
+msgstr "MSN-näyttönimien lista"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook-contacts/e-contact.c:268
 msgid "ICQ ID List"
 msgstr "ICQ ID lista"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Wants HTML Mail"
 msgstr "Tahtoo HTML-postia"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * field describing whether it's a Contact list (list of email addresses) or a
 #. * regular contact for one person/organization/...
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "List"
 msgstr "Lista"
 
@@ -767,405 +774,468 @@ msgstr "Lista"
 #. * used to determine whether when sending to Contact lists the addresses should be
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook-contacts/e-contact.c:280
 #, fuzzy
 msgid "List Shows Addresses"
 msgstr "Lista näytettävistä osoitteista"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook-contacts/e-contact.c:282
 msgid "Birth Date"
 msgstr "Syntymäpäivä"
 
-#: ../addressbook/libebook/e-contact.c:284
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
+#: ../addressbook/libebook-contacts/e-contact.c:283
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:875
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook-contacts/e-contact.c:286
 msgid "X.509 Certificate"
 msgstr "X.509-varmenne"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:288
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu koti ID 1"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook-contacts/e-contact.c:289
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu koti ID 2"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:290
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu koti ID 3"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:291
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu työ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:292
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu työ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:293
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu työ ID 3"
 
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook-contacts/e-contact.c:294
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID lista"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook-contacts/e-contact.c:297
 msgid "Geographic Information"
 msgstr "Maantieteelliset tiedot"
 
-#: ../addressbook/libebook/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../addressbook/libebook/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Skype Home Name 1"
 msgstr "Skype-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:303
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Skype Home Name 2"
 msgstr "Skype-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Skype Home Name 3"
 msgstr "Skype-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Skype Work Name 1"
 msgstr "Skype-työnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:306
+#: ../addressbook/libebook-contacts/e-contact.c:305
 msgid "Skype Work Name 2"
 msgstr "Skype-työnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:306
 msgid "Skype Work Name 3"
 msgstr "Skype-työnimi 3"
 
-#: ../addressbook/libebook/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:307
 msgid "Skype Name List"
-msgstr "Skypenimien luettelo"
+msgstr "Skype-nimilista"
 
-#: ../addressbook/libebook/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:309
 msgid "SIP address"
 msgstr "SIP-osoite"
 
-#: ../addressbook/libebook/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:311
 msgid "Google Talk Home Name 1"
-msgstr "Google Talk koti nimi 1"
+msgstr "Google Talk -kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:313
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Google Talk Home Name 2"
-msgstr "Google Talk koti nimi 2"
+msgstr "Google Talk -kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Google Talk Home Name 3"
-msgstr "Google Talk koti nimi 3"
+msgstr "Google Talk -kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Google Talk Work Name 1"
-msgstr "Google Talk työ nimi 1"
+msgstr "Google Talk -työnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Google Talk Work Name 2"
-msgstr "Google Talk työ nimi 2"
+msgstr "Google Talk -työnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Google Talk Work Name 3"
-msgstr "Google Talk työ nimi 3"
+msgstr "Google Talk -työnimi 3"
 
-#: ../addressbook/libebook/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Google Talk Name List"
-msgstr "Google Talk nimilista"
+msgstr "Google Talk -nimilista"
 
-#: ../addressbook/libebook/e-contact.c:320
-#, fuzzy
+#: ../addressbook/libebook-contacts/e-contact.c:319
 msgid "Twitter Name List"
-msgstr "Skypenimien luettelo"
+msgstr "Twitter-nimilista"
 
-#: ../addressbook/libebook/e-contact.c:1623
-#: ../addressbook/libebook/e-destination.c:879
+#: ../addressbook/libebook-contacts/e-contact.c:1624
+#: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "Nimeämätön lista"
 
-#: ../addressbook/libedata-book/e-book-backend.c:17
-msgid "Cannot process, book backend is opening"
+#: ../addressbook/libebook-contacts/e-phone-number.c:43
+msgid "The library was built without phone number support."
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:45
+msgid "The phone number parser reported an yet unkown error code."
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:47
+msgid "Not a phone number"
+msgstr "Ei puhelinnumero"
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#, fuzzy
+#| msgid "Invalid range"
+msgid "Invalid country calling code"
+msgstr "Virheellinen alue"
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:51
+msgid ""
+"Remaining text after the country calling code is too short for a phone number"
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:53
+msgid "Text is too short for a phone number"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend.c:90
+#: ../addressbook/libebook-contacts/e-phone-number.c:55
+msgid "Text is too long for a phone number"
+msgstr ""
+
+#: ../addressbook/libebook/e-book-client.c:659
+#: ../addressbook/libedata-book/e-book-backend.c:120
 #, fuzzy, c-format
 msgid "Unknown book property '%s'"
 msgstr "Tuntematon virhe: %s"
 
-#: ../addressbook/libedata-book/e-book-backend.c:107
+#: ../addressbook/libebook/e-book-client.c:674
 #, fuzzy, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
-#: ../camel/camel-db.c:503
+#: ../addressbook/libebook/e-book-client.c:985
+#: ../addressbook/libebook/e-book-client.c:1158
+#: ../calendar/libecal/e-cal-client.c:1502
+#: ../calendar/libecal/e-cal-client.c:1682
+#, fuzzy, c-format
+msgid "Unable to connect to '%s': "
+msgstr "Yhteyttä %s:ään ei voitu luoda: %s"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:752
+#, c-format
+msgid "Error introspecting unknown summary field '%s'"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1241
+#: ../camel/camel-db.c:544
 #, c-format
 msgid "Insufficient memory"
 msgstr "Muisti ei riitä"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1374
 #, c-format
-msgid "Contact '%s' not found"
-msgstr "Yhteystietoa \"%s\" ei löydy"
+msgid "Invalid contact field '%d' specified in summary"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1408
+#, c-format
+msgid ""
+"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"string and string list field types are supported"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2603
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3644
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. vcards cannot be returned."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3770
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3851
+#, c-format
+msgid "Query contained unsupported elements"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3774
+#, fuzzy, c-format
+#| msgid "Invalid query"
+msgid "Invalid Query"
+msgstr "Virheellinen kysely"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3798
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. Hence only summary query is "
+"supported."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3855
+#: ../addressbook/libedata-book/e-data-book.c:669
+#: ../addressbook/libedata-book/e-data-book.c:809
+#: ../calendar/libedata-cal/e-data-cal.c:612
+#: ../calendar/libedata-cal/e-data-cal.c:771 ../libedataserver/e-client.c:166
+#, c-format
+msgid "Invalid query"
+msgstr "Virheellinen kysely"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897
+#, c-format
+msgid ""
+"Full vcards are not stored in cache. Hence only summary query is supported."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4598
+#, fuzzy, c-format
+#| msgid "Failed to remove file '%s': %s"
+msgid "Unable to remove the db file: errno %d"
+msgstr "Tiedoston \"%s\" poistaminen epäonnistui: %s"
+
+#: ../addressbook/libedata-book/e-book-backend-sync.c:179
+#: ../calendar/libedata-cal/e-cal-backend-sync.c:182
+#, fuzzy
+msgid "Clients cannot set backend properties"
+msgstr "Kalenteritietoja ei voi tallentaa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../addressbook/libedata-book/e-data-book.c:214
-#: ../addressbook/libedata-book/e-data-book.c:724
+#. Translators: This is a prefix to a detailed error message *
+#.
+#: ../addressbook/libedata-book/e-data-book.c:691
+#: ../calendar/libedata-cal/e-data-cal.c:635
 msgid "Invalid query: "
 msgstr "Virheellinen haku: "
 
-#: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../addressbook/libedata-book/e-data-book.c:793
+#: ../calendar/libedata-cal/e-data-cal.c:752
 msgid "Success"
 msgstr "Valmis"
 
-#: ../addressbook/libedata-book/e-data-book.c:303
-#: ../calendar/libecal/e-cal.c:4001 ../calendar/libedata-cal/e-data-cal.c:416
-#: ../libedataserver/e-client.c:122
+#: ../addressbook/libedata-book/e-data-book.c:794
+#: ../calendar/libecal/e-cal.c:2307 ../calendar/libedata-cal/e-data-cal.c:753
+#: ../libedataserver/e-client.c:133
 msgid "Backend is busy"
 msgstr "Taustajärjestelmä on käytössä"
 
-#: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:795
+#: ../calendar/libedata-cal/e-data-cal.c:754 ../libedataserver/e-client.c:143
 msgid "Repository offline"
 msgstr "Lähde poissa käytöstä"
 
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4015 ../calendar/libedata-cal/e-data-cal.c:418
-#: ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:796
+#: ../calendar/libecal/e-cal.c:2321 ../calendar/libedata-cal/e-data-cal.c:755
+#: ../libedataserver/e-client.c:150
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
-#: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../addressbook/libedata-book/e-data-book.c:799
+#: ../calendar/libedata-cal/e-data-cal.c:760
 msgid "Authentication Failed"
 msgstr "Tunnistus epäonnistui"
 
-#: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:800
+#: ../calendar/libedata-cal/e-data-cal.c:761
 msgid "Authentication Required"
 msgstr "Tunnistautuminen vaaditaan"
 
-#: ../addressbook/libedata-book/e-data-book.c:310
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../addressbook/libedata-book/e-data-book.c:801
+#: ../calendar/libedata-cal/e-data-cal.c:762
 msgid "Unsupported field"
 msgstr "Kenttä ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:802
+#: ../calendar/libedata-cal/e-data-cal.c:764 ../libedataserver/e-client.c:158
 msgid "Unsupported authentication method"
 msgstr "Tunnistautumismenetelmä ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:803
+#: ../calendar/libedata-cal/e-data-cal.c:765 ../libedataserver/e-client.c:160
 msgid "TLS not available"
 msgstr "TLS ei käytettävissä"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../addressbook/libedata-book/e-data-book.c:804
 msgid "Address book does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../addressbook/libedata-book/e-data-book.c:805
 msgid "Book removed"
 msgstr "Kirja poistettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../addressbook/libedata-book/e-data-book.c:806
+#: ../calendar/libedata-cal/e-data-cal.c:768
 msgid "Not available in offline mode"
 msgstr "Ei käytettävissä yhteydettömässä tilassa"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:807
+#: ../calendar/libedata-cal/e-data-cal.c:769 ../libedataserver/e-client.c:162
 msgid "Search size limit exceeded"
 msgstr "Haun kokorajoitus ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:808
+#: ../calendar/libedata-cal/e-data-cal.c:770 ../libedataserver/e-client.c:164
 msgid "Search time limit exceeded"
 msgstr "Haun aikaraja ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
-msgid "Invalid query"
-msgstr "Virheellinen kysely"
-
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:810
+#: ../calendar/libedata-cal/e-data-cal.c:772 ../libedataserver/e-client.c:168
 msgid "Query refused"
 msgstr "Kyselyä ei hyväksytty"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:811
+#: ../calendar/libedata-cal/e-data-cal.c:773 ../libedataserver/e-client.c:154
 msgid "Could not cancel"
 msgstr "Ei voi perua"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
 #. { OtherError,                       N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../addressbook/libedata-book/e-data-book.c:813
+#: ../calendar/libedata-cal/e-data-cal.c:775
 msgid "Invalid server version"
 msgstr "Virheellinen palvelimen versio"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libecal/e-cal.c:3999 ../calendar/libedata-cal/e-data-cal.c:439
-#: ../libedataserver/e-client.c:120
+#: ../addressbook/libedata-book/e-data-book.c:815
+#: ../calendar/libecal/e-cal.c:2305 ../calendar/libedata-cal/e-data-cal.c:776
+#: ../libedataserver/e-client.c:131
 msgid "Invalid argument"
 msgstr "Virheellinen argumentti"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4038 ../calendar/libedata-cal/e-data-cal.c:441
-#: ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:817
+#: ../calendar/libecal/e-cal.c:1064 ../calendar/libecal/e-cal.c:1432
+#: ../calendar/libecal/e-cal.c:1912 ../calendar/libecal/e-cal.c:2344
+#: ../calendar/libedata-cal/e-data-cal.c:778 ../libedataserver/e-client.c:156
+#, c-format
 msgid "Not supported"
 msgstr "Ei tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:818
+#: ../calendar/libedata-cal/e-data-cal.c:779 ../libedataserver/e-client.c:174
 msgid "Backend is not opened yet"
 msgstr "Taustapalvelu ei vielä käynnissä"
 
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal-client.c:619
-#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
-msgid "Other error"
-msgstr "Muu virhe"
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:542
-#: ../addressbook/libedata-book/e-data-book.c:909
-msgid "Cannot get contact: "
-msgstr "Yhteystiedon hakeminen epäonnistui: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:567
-#: ../addressbook/libedata-book/e-data-book.c:592
+#: ../addressbook/libedata-book/e-data-book.c:819
+#: ../libedataserver/e-client.c:176
 #, fuzzy
-msgid "Empty query: "
-msgstr "Tyhjä kysely"
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:617
-#: ../addressbook/libedata-book/e-data-book.c:1007
-msgid "Cannot add contact: "
-msgstr "Yhteystiedon lisäys epäonnistui: "
+#| msgid "Object not found"
+msgid "Object is out of sync"
+msgstr "Kohdetta ei löydy"
 
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:642
-#: ../addressbook/libedata-book/e-data-book.c:1041
-msgid "Cannot modify contacts: "
-msgstr "Yhteystietojen muokkaaminen epäonnistui: "
+#: ../addressbook/libedata-book/e-data-book.c:827
+#: ../calendar/libedata-cal/e-data-cal.c:787 ../libedataserver/e-client.c:172
+msgid "Other error"
+msgstr "Muu virhe"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:796
+#: ../addressbook/libedata-book/e-data-book.c:1133
 msgid "Cannot open book: "
 msgstr "Kirjan avaaminen epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:812
-msgid "Cannot remove book: "
-msgstr "Kirjan poistaminen epäonnistui: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:839
+#: ../addressbook/libedata-book/e-data-book.c:1217
 msgid "Cannot refresh address book: "
 msgstr "Osoitekirjan päivitys epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:865
-#, fuzzy
-msgid "Cannot get backend property: "
-msgstr "Viestiä ei voi luoda: %s"
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:890
-#: ../calendar/libedata-cal/e-data-cal.c:1016
-#, fuzzy
-msgid "Cannot set backend property: "
-msgstr "Kalenteritietoja ei voi tallentaa"
+#: ../addressbook/libedata-book/e-data-book.c:1298
+msgid "Cannot get contact: "
+msgstr "Yhteystiedon hakeminen epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:927
+#: ../addressbook/libedata-book/e-data-book.c:1364
 msgid "Cannot get contact list: "
 msgstr "Yhteystietoluettelon haku epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:1456
 #, fuzzy
 msgid "Cannot get contact list uids: "
 msgstr "Kansion %s säiliötä ei voitu hakea"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1066
+#: ../addressbook/libedata-book/e-data-book.c:1536
+msgid "Cannot add contact: "
+msgstr "Yhteystiedon lisäys epäonnistui: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1599
+msgid "Cannot modify contacts: "
+msgstr "Yhteystietojen muokkaaminen epäonnistui: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1640
 msgid "Cannot remove contacts: "
 msgstr "Yhteystietojen poisto epäonnistui: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:103
-#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#: ../addressbook/libedata-book/e-data-book-factory.c:94
+#: ../calendar/libedata-cal/e-data-cal-factory.c:97
 #, c-format
 msgid "No backend name in source '%s'"
 msgstr "Taustapalvelun nimeä ei löydy lähteestä \"%s\""
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:115
-#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#: ../addressbook/libedata-book/e-data-book-factory.c:185
+#: ../calendar/libedata-cal/e-data-cal-factory.c:191
 #, c-format
-msgid "Invalid backend name '%s' in source '%s'"
-msgstr "Virheellinen taustapalvelun nimi \"%s\" lähteessä \"%s\""
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:319
-#: ../calendar/libedata-cal/e-data-cal-factory.c:230
 msgid "Missing source UID"
 msgstr "Lähteen UID puuttuu"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#: ../addressbook/libedata-book/e-data-book-factory.c:196
+#: ../calendar/libedata-cal/e-data-cal-factory.c:201
 #, c-format
 msgid "No such source for UID '%s'"
 msgstr "Lähdettä, jonka UID on \"%s\", ei löydy"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:560
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Palvelin ei ole tavoitettavissa (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:598
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:590
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "SSL-yhteyden muodostaminen palvelimeen epäonnistui: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
-msgid ""
-"Failed to connect to a server using SSL. One possible reason is an invalid "
-"certificate being used by the server. If this is expected, like self-signed "
-"certificate being used on the server, then disable certificate validity "
-"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
-msgstr ""
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:601
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "Odottamaton HTTP-tilakoodi %d palautettiin (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:620
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV-taustapalvelua ei ole vielä ladattu"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1009
 msgid "Invalid Redirect URL"
 msgstr "Virheellinen uudelleenohjaus"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2722
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2491
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2849
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1174,470 +1244,439 @@ msgstr ""
 "Palvelimeen ei saatu yhteyttä, kalenteri avattiin vain-luku -tilassa.\n"
 "Virheviesti oli: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2663
-msgid "Cannot create local store"
-msgstr "Paikallisen tallennustilan luominen epäonnistui"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2801
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Paikallisen välimuistikansion \"%s\" luominen epäonnistui"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2683
-#, fuzzy
-msgid "Could not create synch slave thread"
-msgstr "Välimuistitiedostoa ei voitu luoda"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3677
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3893
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV ei tue massalisäyksiä"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3779
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3996
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV ei tue massamuokkauksia"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3947
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4165
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV ei tue massapoistoja"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4606
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4837
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalenteri ei tue Vapaa/Varattu -tiloja"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4614
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4846
 msgid "Schedule outbox url not found"
 msgstr ""
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4713
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4945
 msgid "Unexpected result in schedule-response"
 msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:877
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:913
 #, c-format
 msgid "Birthday: %s"
 msgstr "Syntymäpäivä: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:944
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Vuosipäivä: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:235
+#: ../calendar/backends/file/e-cal-backend-file.c:243
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Kalenteritietoja ei voi tallentaa: virheellinen URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:242
-#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:250
+#: ../calendar/backends/file/e-cal-backend-file.c:256
 msgid "Cannot save calendar data"
 msgstr "Kalenteritietoja ei voi tallentaa"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:482
+#: ../calendar/backends/http/e-cal-backend-http.c:477
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "Virheellinen URI: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:543
+#: ../calendar/backends/http/e-cal-backend-http.c:568
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Uudelleenohjaus virheelliseen URI:in"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:580
+#: ../calendar/backends/http/e-cal-backend-http.c:605
 #, c-format
 msgid "Bad file format."
 msgstr "Virheellinen tiedostomuoto."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:590
+#: ../calendar/backends/http/e-cal-backend-http.c:615
 #, c-format
 msgid "Not a calendar."
 msgstr "Ei kalenteri."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:887
-#: ../calendar/backends/http/e-cal-backend-http.c:891
-#: ../calendar/backends/weather/e-cal-backend-weather.c:511
+#: ../calendar/backends/http/e-cal-backend-http.c:926
+#: ../calendar/backends/weather/e-cal-backend-weather.c:514
 msgid "Could not create cache file"
 msgstr "Välimuistitiedostoa ei voitu luoda"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:171
+#: ../calendar/backends/weather/e-cal-backend-weather.c:173
 msgid "Could not retrieve weather data"
 msgstr "Säätietoja ei voitu hakea"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:276
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Fog"
 msgstr "Sää: sumuista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Cloudy Night"
 msgstr "Sää: pilvinen yö"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Cloudy"
 msgstr "Sää: pilvistä"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Overcast"
 msgstr "Sää: poutaista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Showers"
 msgstr "Sää: sadekuuroja"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Snow"
 msgstr "Sää: sadetta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Clear Night"
 msgstr "Sää: kirkas yö"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Sunny"
 msgstr "Sää: Aurinkoista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Thunderstorms"
 msgstr "Sää: ukkosta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:408
+#: ../calendar/backends/weather/e-cal-backend-weather.c:410
 msgid "Forecast"
 msgstr "Sääennuste"
 
-#: ../calendar/libecal/e-cal.c:4003
+#: ../calendar/libecal/e-cal.c:2309
 msgid "Repository is offline"
 msgstr "Varasto on yhteydettömässä tilassa"
 
-#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135
+#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:262
 msgid "No such calendar"
 msgstr "Kalenteria ei ole olemassa"
 
-#: ../calendar/libecal/e-cal.c:4007 ../calendar/libecal/e-cal-client.c:137
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:264
+#: ../calendar/libedata-cal/e-data-cal.c:757
 msgid "Object not found"
 msgstr "Kohdetta ei löydy"
 
-#: ../calendar/libecal/e-cal.c:4009 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libecal/e-cal.c:2315 ../calendar/libecal/e-cal-client.c:266
+#: ../calendar/libedata-cal/e-data-cal.c:758
 msgid "Invalid object"
 msgstr "Virheellinen kohde"
 
-#: ../calendar/libecal/e-cal.c:4011
+#: ../calendar/libecal/e-cal.c:2317
 msgid "URI not loaded"
 msgstr "URIa ei ole ladattu"
 
-#: ../calendar/libecal/e-cal.c:4013
+#: ../calendar/libecal/e-cal.c:2319
 msgid "URI already loaded"
 msgstr "URI on jo ladattu"
 
-#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libecal/e-cal.c:2323
 msgid "Unknown User"
 msgstr "Tuntematon käyttäjä"
 
-#: ../calendar/libecal/e-cal.c:4019 ../calendar/libecal/e-cal-client.c:143
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../calendar/libecal/e-cal.c:2325 ../calendar/libecal/e-cal-client.c:270
+#: ../calendar/libedata-cal/e-data-cal.c:759
 msgid "Object ID already exists"
 msgstr "OID on jo olemassa"
 
-#: ../calendar/libecal/e-cal.c:4021
+#: ../calendar/libecal/e-cal.c:2327
 msgid "Protocol not supported"
 msgstr "Protokolla ei ole tuettu"
 
-#: ../calendar/libecal/e-cal.c:4023
+#: ../calendar/libecal/e-cal.c:2329
 msgid "Operation has been canceled"
 msgstr "Toimenpide on peruttu"
 
-#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libecal/e-cal.c:2331
 msgid "Could not cancel operation"
 msgstr "Toimenpidettä ei voitu perua"
 
-#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:2333 ../libedataserver/e-client.c:139
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../calendar/libecal/e-cal.c:4029
-#: ../camel/providers/smtp/camel-smtp-transport.c:857
-#: ../libedataserver/e-client.c:130
+#: ../calendar/libecal/e-cal.c:2335
+#: ../camel/providers/smtp/camel-smtp-transport.c:923
+#: ../libedataserver/e-client.c:141
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: ../calendar/libecal/e-cal.c:4031
-#, fuzzy
+#: ../calendar/libecal/e-cal.c:2337
 msgid "A D-Bus exception has occurred"
-msgstr "Tapahtui CORBA-poikkeus"
+msgstr "Tapahtui D-Bus-poikkeus"
 
-#: ../calendar/libecal/e-cal.c:4035
+#: ../calendar/libecal/e-cal.c:2341
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libecal/e-cal-client.c:268
+#: ../calendar/libedata-cal/e-data-cal.c:767
 msgid "Unknown user"
 msgstr "Tuntematon käyttäjä"
 
-#: ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal-client.c:272
+#: ../calendar/libedata-cal/e-data-cal.c:756
 msgid "Invalid range"
 msgstr "Virheellinen alue"
 
-#: ../calendar/libecal/e-cal-client.c:610
-#, fuzzy
-msgid "Failed to run calendar factory"
-msgstr "Tiedon koodaus epäonnistui"
+#: ../calendar/libecal/e-cal-client.c:936
+#: ../calendar/libedata-cal/e-cal-backend.c:204
+#, c-format
+msgid "Unknown calendar property '%s'"
+msgstr "Tuntematon kalenteriominaisuus '%s'"
 
-#: ../calendar/libecal/e-cal-component.c:1339
+#: ../calendar/libecal/e-cal-client.c:951
+#, c-format
+msgid "Cannot change value of calendar property '%s'"
+msgstr "Kalenteriominaisuuden '%s' arvon muuttaminen ei onnistu"
+
+#: ../calendar/libecal/e-cal-component.c:1340
 msgid "Untitled appointment"
 msgstr "Nimeämätön tapaaminen"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:4036
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4017
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
+#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734
 msgctxt "Priority"
 msgid "High"
 msgstr "Korkea"
 
-#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
+#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
+#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738
 msgctxt "Priority"
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:721
+#: ../calendar/libecal/e-cal-util.c:732
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:36
-#, fuzzy
-msgid "Cannot process, calendar backend is opening"
-msgstr "Kalenteria ei voi päivittää"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:135
-#, fuzzy, c-format
-msgid "Unknown calendar property '%s'"
-msgstr "Tuntematon virhe: %s"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:152
-#, fuzzy, c-format
-msgid "Cannot change value of calendar property '%s'"
-msgstr "Viestiä ei voi luoda: %s"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
-#, c-format
-msgid "\"%s\" expects no arguments"
-msgstr "\"%s\" ei ota argumentteja"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ottaa yhden argumentin"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" olettaa ensimmäisen argumentin olevan merkkijonon"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
-#, c-format
-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr ""
-"\"%s\" olettaa ensimmäisen argumentin olevan ISO-8601 muotoinen päiväys"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
-#, c-format
-msgid "\"%s\" expects two arguments"
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
+#, fuzzy, c-format
+msgid "\"%s\" expects two or three arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" olettaa ensimmäisen argumentin olevan muotoa time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
-#, c-format
-msgid "\"%s\" expects the second argument to be an integer"
-msgstr "\"%s\" olettaa toisen argumentin olevan kokonaisluvun"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
-#, fuzzy, c-format
-msgid "\"%s\" expects two or three arguments"
-msgstr "\"%s\" olettaa kahta argumenttia"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" olettaa toisen argumentin olevan muotoa time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186
 #, fuzzy, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "\"%s\" olettaa ensimmäisen argumentin olevan merkkijonon"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248
 #, fuzzy, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434
+#, c-format
+msgid "\"%s\" expects two arguments"
+msgstr "\"%s\" olettaa kahta argumenttia"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326
+#, c-format
+msgid "\"%s\" expects no arguments"
+msgstr "\"%s\" ei ota argumentteja"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" olettaa toisen argumentin olevan merkkijonon"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1648,12 +1687,12 @@ msgstr ""
 "\"description\", \"sijainti\", \"attendee\", \"organizer\" tai "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" tahtoo vähintään yhden argumentin"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1662,157 +1701,158 @@ msgstr ""
 "\"%s\" olettaa kaikkien argumenttien olevan merkkijonoja, tai yhden ja "
 "ainoastaan yhden olevan totuusarvoisen epätoden (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389
+#, c-format
+msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
+msgstr ""
+"\"%s\" olettaa ensimmäisen argumentin olevan ISO-8601 muotoinen päiväys"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450
+#, c-format
+msgid "\"%s\" expects the second argument to be an integer"
+msgstr "\"%s\" olettaa toisen argumentin olevan kokonaisluvun"
+
+#: ../calendar/libedata-cal/e-data-cal.c:763
 msgid "Unsupported method"
 msgstr "Menetelmä ei ole tuettu."
 
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:766
 msgid "Calendar does not exist"
 msgstr "Kalenteria ei ole olemassa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:909
+#: ../calendar/libedata-cal/e-data-cal.c:1237
 msgid "Cannot open calendar: "
 msgstr "Kalenterin avaus epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:934
-msgid "Cannot remove calendar: "
-msgstr "Kalenterin poisto epäonnistui: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:961
+#: ../calendar/libedata-cal/e-data-cal.c:1298
 msgid "Cannot refresh calendar: "
 msgstr "Kalenterin päivitys epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
+#: ../calendar/libedata-cal/e-data-cal.c:1337
 #, fuzzy
 msgid "Cannot retrieve backend property: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1045
+#: ../calendar/libedata-cal/e-data-cal.c:1395
 #, fuzzy
 msgid "Cannot retrieve calendar object path: "
 msgstr "Kalenteritietoja ei voi tallentaa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1075
+#: ../calendar/libedata-cal/e-data-cal.c:1441
 #, fuzzy
 msgid "Cannot retrieve calendar object list: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1104
+#: ../calendar/libedata-cal/e-data-cal.c:1494
 #, fuzzy
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1142
+#: ../calendar/libedata-cal/e-data-cal.c:1535
 #, fuzzy
 msgid "Cannot create calendar object: "
 msgstr "Viestiä ei voi luoda: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1177
+#: ../calendar/libedata-cal/e-data-cal.c:1604
 #, fuzzy
 msgid "Cannot modify calendar object: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1217
+#: ../calendar/libedata-cal/e-data-cal.c:1666
 #, fuzzy
 msgid "Cannot remove calendar object: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1727
 #, fuzzy
 msgid "Cannot receive calendar objects: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1285
+#: ../calendar/libedata-cal/e-data-cal.c:1768
 #, fuzzy
 msgid "Cannot send calendar objects: "
 msgstr "Kalenteritietoja ei voi tallentaa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1317
+#: ../calendar/libedata-cal/e-data-cal.c:1828
 #, fuzzy
 msgid "Could not retrieve attachment uris: "
 msgstr "Tietoa ei voitu avata välimuistista: %s: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1345
+#: ../calendar/libedata-cal/e-data-cal.c:1878
 #, fuzzy
 msgid "Could not discard reminder: "
 msgstr "Kansiota ei voitu tallentaa: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1374
+#: ../calendar/libedata-cal/e-data-cal.c:1917
 #, fuzzy
 msgid "Could not get calendar view path: "
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1404
+#: ../calendar/libedata-cal/e-data-cal.c:1963
 #, fuzzy
 msgid "Could not retrieve calendar time zone: "
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1430
+#: ../calendar/libedata-cal/e-data-cal.c:2007
 #, fuzzy
 msgid "Could not add calendar time zone: "
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:220
-#, fuzzy, c-format
-msgid "Invalid call"
-msgstr "Virheellinen alue"
-
-#: ../camel/camel-cipher-context.c:206
+#: ../camel/camel-cipher-context.c:208
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue allekirjoitusta"
 
-#: ../camel/camel-cipher-context.c:219
+#: ../camel/camel-cipher-context.c:221
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue varmennusta"
 
-#: ../camel/camel-cipher-context.c:235
+#: ../camel/camel-cipher-context.c:237
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue tiedon salausta"
 
-#: ../camel/camel-cipher-context.c:249
+#: ../camel/camel-cipher-context.c:251
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue salauksen purkua"
 
-#: ../camel/camel-cipher-context.c:262
+#: ../camel/camel-cipher-context.c:264
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Et voi tuoda avaimia tällä salakirjoitusmenetelmällä"
 
-#: ../camel/camel-cipher-context.c:276
+#: ../camel/camel-cipher-context.c:278
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Et voi viedä avaimia tällä salakirjoitusmenetelmällä"
 
-#: ../camel/camel-cipher-context.c:817
+#: ../camel/camel-cipher-context.c:819
 msgid "Signing message"
 msgstr "Allekirjoitetaan viestiä"
 
-#: ../camel/camel-cipher-context.c:1058
+#: ../camel/camel-cipher-context.c:1060
 msgid "Encrypting message"
 msgstr "Salataan viestiä"
 
-#: ../camel/camel-cipher-context.c:1185
+#: ../camel/camel-cipher-context.c:1187
 msgid "Decrypting message"
 msgstr "Puretaan viestin salausta"
 
@@ -1841,8 +1881,7 @@ msgstr ""
 "Myöhempiä toimenpiteitä tällä palvelimella ei toisteta, kun otat\n"
 "uudelleen yhteyttää verkkoon."
 
-#: ../camel/camel-disco-diary.c:271
-#: ../camel/providers/imap/camel-imap-journal.c:312
+#: ../camel/camel-disco-diary.c:279
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1853,7 +1892,7 @@ msgstr ""
 "%s\n"
 "Tähän kansioon tehtyjä muutoksia ei tahdisteta uudestaan."
 
-#: ../camel/camel-disco-diary.c:315
+#: ../camel/camel-disco-diary.c:326
 msgid "Resynchronizing with server"
 msgstr "Uudelleentahdistetaan palvelimen kanssa"
 
@@ -1861,33 +1900,29 @@ msgstr "Uudelleentahdistetaan palvelimen kanssa"
 msgid "Downloading new messages for offline mode"
 msgstr "Haetaan uusia viestejä yhteydettömään käyttöön"
 
-#: ../camel/camel-disco-folder.c:420
+#: ../camel/camel-disco-folder.c:422
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Valmistellaan kansiota \"%s\" yhteydettömään tilaan"
 
-#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334
+#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336
 #, fuzzy
 msgid "Copy folder content locally for _offline operation"
 msgstr "Kopioi kansion sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413
-#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482
-#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:614
-#: ../camel/camel-imapx-folder.c:648 ../camel/camel-imapx-folder.c:688
-#: ../camel/camel-imapx-folder.c:724 ../camel/camel-imapx-store.c:276
-#: ../camel/camel-imapx-store.c:1398 ../camel/camel-imapx-store.c:1487
-#: ../camel/camel-imapx-store.c:1536
-#: ../camel/providers/imap/camel-imap-store.c:1270
-#: ../camel/providers/imap/camel-imap-store.c:2033
-#: ../camel/providers/imap/camel-imap-store.c:2509
-#: ../camel/providers/imap/camel-imap-store.c:3289
-#: ../camel/providers/pop3/camel-pop3-folder.c:531
-#: ../camel/providers/pop3/camel-pop3-folder.c:674
-#: ../camel/providers/pop3/camel-pop3-folder.c:874
-#: ../camel/providers/pop3/camel-pop3-folder.c:1074
-#: ../camel/providers/pop3/camel-pop3-store.c:408
-#: ../camel/providers/pop3/camel-pop3-store.c:831
+#: ../camel/camel-disco-store.c:475 ../camel/camel-imapx-folder.c:478
+#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553
+#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748
+#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993
+#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:368
+#: ../camel/camel-imapx-store.c:1573 ../camel/camel-imapx-store.c:1662
+#: ../camel/camel-imapx-store.c:1711
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:677
+#: ../camel/providers/pop3/camel-pop3-folder.c:906
+#: ../camel/providers/pop3/camel-pop3-folder.c:1106
+#: ../camel/providers/pop3/camel-pop3-store.c:472
+#: ../camel/providers/pop3/camel-pop3-store.c:896
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr ""
@@ -1899,7 +1934,7 @@ msgstr ""
 msgid "Canceled"
 msgstr "Peruttu"
 
-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Lapsiprosessin \"%s\" luominen epäonnistui: %s"
@@ -1909,190 +1944,208 @@ msgstr "Lapsiprosessin \"%s\" luominen epäonnistui: %s"
 msgid "Invalid message stream received from %s: %s"
 msgstr "Virheellinen viestivirta lähteestä %s: %s"
 
-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
+#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1179
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761
+#: ../camel/camel-filter-driver.c:1277
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774
+#: ../camel/camel-filter-driver.c:1288
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1383
+#: ../camel/camel-filter-driver.c:1384
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu avata"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu käsitellä"
 
-#: ../camel/camel-filter-driver.c:1415
+#: ../camel/camel-filter-driver.c:1419
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiä %d (%d %%)"
 
-#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
+#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1450
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
+#: ../camel/camel-filter-driver.c:1469 ../camel/camel-filter-driver.c:1583
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
+#: ../camel/camel-filter-driver.c:1474 ../camel/camel-filter-driver.c:1591
 msgid "Complete"
 msgstr "Valmis"
 
-#: ../camel/camel-filter-driver.c:1529
+#: ../camel/camel-filter-driver.c:1537
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestiä %d / %d"
 
-#: ../camel/camel-filter-driver.c:1547
+#: ../camel/camel-filter-driver.c:1555
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
+#: ../camel/camel-filter-driver.c:1751 ../camel/camel-filter-driver.c:1785
+#, fuzzy, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Execution of filter '%s' failed: "
+msgstr "Virhe suoritettaessa suodatinta: %s: %s"
+
+#: ../camel/camel-filter-driver.c:1775
+#, fuzzy, c-format
+#| msgid "Error parsing filter: %s: %s"
+msgid "Error parsing filter '%s': %s: %s"
+msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
+
+#: ../camel/camel-filter-driver.c:1794
+#, fuzzy, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Error executing filter '%s': %s: %s"
+msgstr "Virhe suoritettaessa suodatinta: %s: %s"
+
 #: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "Viestiä ei voitu hakea."
 
-#: ../camel/camel-filter-search.c:512
+#: ../camel/camel-filter-search.c:537
 msgid "Invalid arguments to (system-flag)"
 msgstr "Virheellisiä argumentteja (system-flag)"
 
-#: ../camel/camel-filter-search.c:530
+#: ../camel/camel-filter-search.c:555
 msgid "Invalid arguments to (user-tag)"
 msgstr "Virheellisiä argumentteja (user-tag)"
 
-#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
+#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:291
 #, fuzzy, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "Etsitään muuttuneita viestejä kansiosta %s"
 msgstr[1] "Etsitään muuttuneita viestejä kansiosta %s"
 
-#: ../camel/camel-folder.c:310
+#: ../camel/camel-folder.c:331
 #, fuzzy, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "Etsitään muuttuneita viestejä kansiosta %s"
 msgstr[1] "Etsitään muuttuneita viestejä kansiosta %s"
 
-#: ../camel/camel-folder.c:358
+#: ../camel/camel-folder.c:379
 #, fuzzy, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "Suodatetaan uusia viestejä"
 msgstr[1] "Suodatetaan uusia viestejä"
 
-#: ../camel/camel-folder.c:930
+#: ../camel/camel-folder.c:953
 #: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "Siirretään viestejä"
 
-#: ../camel/camel-folder.c:933
+#: ../camel/camel-folder.c:956
 msgid "Copying messages"
 msgstr "Kopioidaan viestejä"
 
-#: ../camel/camel-folder.c:1253
+#: ../camel/camel-folder.c:1276
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr ""
 
-#: ../camel/camel-folder.c:3372
+#: ../camel/camel-folder.c:3509
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Siivotaan poistettuja kansiosta ”%s”"
 
-#: ../camel/camel-folder.c:3604
+#: ../camel/camel-folder.c:3741
 #, fuzzy, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Haetaan POP-viestiä %d"
 
-#: ../camel/camel-folder.c:3755
+#: ../camel/camel-folder.c:3892
 #, fuzzy, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
 
-#: ../camel/camel-folder.c:3987
+#: ../camel/camel-folder.c:4124
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Päivitetään kansiota ”%s”"
 
-#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Hakulauseketta ei voi tulkita: %s:\n"
-"%s"
-
-#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Virhe suoritettaessa hakulauseketta: %s:\n"
-"%s"
-
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
+#: ../camel/camel-folder-search.c:838 ../camel/camel-folder-search.c:881
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) vaatii yhden totuusarvoisen tuloksen"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:932
+#: ../camel/camel-folder-search.c:916
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ei ole sallittu kohdan %s sisällä"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:923 ../camel/camel-folder-search.c:931
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) vaatii vertaustyypin merkkijonon"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:959
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) olettaa tuloksena olevan taulukon"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:985
+#: ../camel/camel-folder-search.c:969
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) vaatii kansion asettamisen"
 
-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
-#: ../camel/camel-gpg-context.c:1331
+#: ../camel/camel-folder-search.c:1862 ../camel/camel-folder-search.c:2029
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Hakulauseketta ei voi tulkita: %s:\n"
+"%s"
+
+#: ../camel/camel-folder-search.c:1874 ../camel/camel-folder-search.c:2041
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Virhe suoritettaessa hakulauseketta: %s:\n"
+"%s"
+
+#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696
+#: ../camel/camel-gpg-context.c:1359
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg:n suoritus epäonnistui: %s"
 
-#: ../camel/camel-gpg-context.c:668
-#: ../camel/providers/smtp/camel-smtp-transport.c:860
+#: ../camel/camel-gpg-context.c:696
+#: ../camel/providers/smtp/camel-smtp-transport.c:926
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../camel/camel-gpg-context.c:733
+#: ../camel/camel-gpg-context.c:761
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2103,24 +2156,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:769
+#: ../camel/camel-gpg-context.c:797
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg käyttäjätunnisteen vihjeen tulkitseminen epäonnistui."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg salalausepyynnön tulkinta epäonnistui."
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr "Tarvitset PIN-koodin avataksesi älykorttisi: \"%s\""
 
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:862
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2129,379 +2182,382 @@ msgstr ""
 "Tarvitse salalauseen avataksesi avaimen\n"
 "käyttäjälle: \"%s\""
 
-#: ../camel/camel-gpg-context.c:840
+#: ../camel/camel-gpg-context.c:868
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Odottamaton pyyntö GnuPG:ltä kohteelle \"%s\""
 
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:880
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:883 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
 #: ../camel/providers/nntp/camel-nntp-summary.c:388
-#: ../libedataserver/e-client.c:140
+#: ../libedataserver/e-client.c:152
 #, c-format
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../camel/camel-gpg-context.c:904
+#: ../camel/camel-gpg-context.c:932
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Salaisen avaimen avaus epäonnistui: 3 virheellistä salalausetta syötetty."
 
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:945
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus GnuPG:ltä: %s"
 
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:1076
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Salaus epäonnistui: kelvollisia vastaanottajia ei ole määritelty"
 
-#: ../camel/camel-gpg-context.c:1595 ../camel/camel-smime-context.c:832
+#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846
 #, fuzzy
 msgid "Could not generate signing data: "
 msgstr "Allekirjoitustietoa ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:1644 ../camel/camel-gpg-context.c:1848
-#: ../camel/camel-gpg-context.c:1958 ../camel/camel-gpg-context.c:2105
-#: ../camel/camel-gpg-context.c:2205 ../camel/camel-gpg-context.c:2253
+#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879
+#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136
+#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284
 msgid "Failed to execute gpg."
 msgstr "gpg:n suoritus epäonnistui."
 
-#: ../camel/camel-gpg-context.c:1723 ../camel/camel-gpg-context.c:1731
-#: ../camel/camel-gpg-context.c:1739 ../camel/camel-gpg-context.c:1759
-#: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973
-#: ../camel/camel-smime-context.c:982
+#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790
+#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
+#: ../camel/camel-smime-context.c:996
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1801
+#: ../camel/camel-gpg-context.c:1832
 #, fuzzy
 msgid "Cannot verify message signature: "
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1924
+#: ../camel/camel-gpg-context.c:1955
 #, fuzzy
 msgid "Could not generate encrypting data: "
 msgstr "Salaustieto ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:1977
+#: ../camel/camel-gpg-context.c:2008
 msgid "This is a digitally encrypted message part"
 msgstr "Digitaalisesti salattu viestin osa"
 
-#: ../camel/camel-gpg-context.c:2035 ../camel/camel-gpg-context.c:2044
-#: ../camel/camel-gpg-context.c:2067
+#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075
+#: ../camel/camel-gpg-context.c:2098
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Viestin salausta ei voi purkaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:2055
+#: ../camel/camel-gpg-context.c:2086
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-osan salauksen purku epäonnistui: protokollavirhe"
 
-#: ../camel/camel-gpg-context.c:2146 ../camel/camel-smime-context.c:1273
+#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1287
 msgid "Encrypted content"
 msgstr "Salattu sisältö"
 
-#: ../camel/camel-imapx-folder.c:104
+#: ../camel/camel-imapx-folder.c:710
+#, fuzzy, c-format
+#| msgid "No provider available for protocol '%s'"
+msgid "No quota information available for folder '%s'"
+msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
+
+#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882
 #, c-format
-msgid "Could not create folder summary for %s"
-msgstr ""
+msgid "No destination folder specified"
+msgstr "Kohdekansiota ei määritelty"
 
-#: ../camel/camel-imapx-folder.c:112
-#, fuzzy, c-format
-msgid "Could not create cache for %s: "
-msgstr "Välimuistitiedostoa ei voitu luoda"
+#: ../camel/camel-imapx-folder.c:828
+#, fuzzy
+msgid "Unable to move junk messages"
+msgstr "Viestin haku epäonnistui: %s"
+
+#: ../camel/camel-imapx-folder.c:901
+#, fuzzy
+msgid "Unable to move deleted messages"
+msgstr "Viestin haku epäonnistui: %s"
 
-#: ../camel/camel-imapx-folder.c:794
-#: ../camel/providers/imap/camel-imap-folder.c:367
+#: ../camel/camel-imapx-folder.c:1119
 #: ../camel/providers/nntp/camel-nntp-folder.c:738
 #, fuzzy
 msgid "Apply message _filters to this folder"
 msgstr "Viestejä ei voi kopioida roskakoriin"
 
-#: ../camel/camel-imapx-server.c:1094
-#, fuzzy
+#: ../camel/camel-imapx-folder.c:1228
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr ""
+
+#: ../camel/camel-imapx-folder.c:1236
+#, fuzzy, c-format
+msgid "Could not create cache for %s: "
+msgstr "Välimuistitiedostoa ei voitu luoda"
+
+#: ../camel/camel-imapx-server.c:1279
 msgid "Server disconnected"
-msgstr "Palvelin katkaisi yhteyden odottamatta"
+msgstr "Palvelin katkaisi yhteyden"
 
-#: ../camel/camel-imapx-server.c:1549
+#: ../camel/camel-imapx-server.c:1787
 #, fuzzy
-msgid "Error writing to cache stream: "
+msgid "Error writing to cache stream"
 msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
 
-#: ../camel/camel-imapx-server.c:2500
+#: ../camel/camel-imapx-server.c:2994
 #, c-format
 msgid "Not authenticated"
 msgstr "Ei tunnistettu."
 
-#: ../camel/camel-imapx-server.c:2580
+#: ../camel/camel-imapx-server.c:3072
 #, fuzzy
 msgid "Error performing IDLE"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../camel/camel-imapx-server.c:3462
-#: ../camel/providers/imap/camel-imap-store.c:414
-#: ../camel/providers/imap/camel-imap-store.c:468
+#: ../camel/camel-imapx-server.c:4029
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %s"
 
-#: ../camel/camel-imapx-server.c:3463
-#: ../camel/providers/imap/camel-imap-store.c:415
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/camel-imapx-server.c:4030
+#: ../camel/providers/smtp/camel-smtp-transport.c:208
 msgid "STARTTLS not supported"
 msgstr "STARTTLS laajennos ei ole käytettävissä"
 
-#: ../camel/camel-imapx-server.c:3502
-#: ../camel/providers/imap/camel-imap-store.c:440
+#: ../camel/camel-imapx-server.c:4069
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr ""
 "IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %s"
 
-#: ../camel/camel-imapx-server.c:3580
-#: ../camel/providers/imap/camel-imap-store.c:749
+#: ../camel/camel-imapx-server.c:4149
 #, fuzzy, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: ../camel/camel-imapx-server.c:3591 ../camel/camel-session.c:494
-#: ../camel/providers/imap/camel-imap-store.c:1174
-#: ../camel/providers/pop3/camel-pop3-store.c:259
-#: ../camel/providers/pop3/camel-pop3-store.c:587
-#: ../camel/providers/smtp/camel-smtp-transport.c:467
+#: ../camel/camel-imapx-server.c:4160 ../camel/camel-session.c:495
+#: ../camel/providers/pop3/camel-pop3-store.c:272
+#: ../camel/providers/pop3/camel-pop3-store.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:517
 #, fuzzy, c-format
 msgid "No support for %s authentication"
 msgstr "Varmennusmenetelmä %s ei ole tuettu"
 
-#: ../camel/camel-imapx-server.c:3610
-#: ../camel/providers/imap/camel-imap-store.c:1142
-#: ../camel/providers/nntp/camel-nntp-store.c:502
+#: ../camel/camel-imapx-server.c:4179
+#: ../camel/providers/nntp/camel-nntp-store.c:362
+#: ../camel/providers/nntp/camel-nntp-store.c:562
 #, fuzzy
 msgid "Cannot authenticate without a username"
 msgstr "Tunnistautuminen palvelimelle epäonnistui: %s"
 
-#: ../camel/camel-imapx-server.c:3619
-#: ../camel/providers/imap/camel-imap-store.c:1150
-#: ../camel/providers/nntp/camel-nntp-store.c:511
-#: ../camel/providers/pop3/camel-pop3-store.c:512
-#: ../camel/providers/pop3/camel-pop3-store.c:532
+#: ../camel/camel-imapx-server.c:4188
+#: ../camel/providers/nntp/camel-nntp-store.c:571
+#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:599
 #, fuzzy
 msgid "Authentication password not available"
 msgstr "Todennus epäonnistui"
 
-#: ../camel/camel-imapx-server.c:3821
+#: ../camel/camel-imapx-server.c:4396
 #, fuzzy
 msgid "Error fetching message"
 msgstr "Salataan viestiä"
 
-#: ../camel/camel-imapx-server.c:3903
+#: ../camel/camel-imapx-server.c:4478
 #, fuzzy
 msgid "Failed to copy the tmp file"
 msgstr "Välimuistiin tallennus epäonnistui %s: %s"
 
-#: ../camel/camel-imapx-server.c:3917
+#: ../camel/camel-imapx-server.c:4492
 #, fuzzy
 msgid "Failed to close the tmp stream"
 msgstr "Tiedon koodaus epäonnistui"
 
-#: ../camel/camel-imapx-server.c:4015
+#: ../camel/camel-imapx-server.c:4613
 #, fuzzy
 msgid "Error copying messages"
 msgstr "Kopioidaan viestejä"
 
-#: ../camel/camel-imapx-server.c:4150
+#: ../camel/camel-imapx-server.c:4779
 #, fuzzy
 msgid "Error appending message"
 msgstr "Lähetetään viestiä"
 
-#: ../camel/camel-imapx-server.c:4333
+#: ../camel/camel-imapx-server.c:4978
 msgid "Error fetching message headers"
 msgstr ""
 
-#: ../camel/camel-imapx-server.c:4468
+#: ../camel/camel-imapx-server.c:5129
 msgid "Error retrieving message"
 msgstr "Virhe haettaessa viestiä"
 
-#: ../camel/camel-imapx-server.c:4590 ../camel/camel-imapx-server.c:4783
+#: ../camel/camel-imapx-server.c:5260 ../camel/camel-imapx-server.c:5488
 #, fuzzy, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
 
-#: ../camel/camel-imapx-server.c:4641
+#: ../camel/camel-imapx-server.c:5324
 #, fuzzy, c-format
 msgid "Scanning for changed messages in '%s'"
 msgstr "Etsitään muuttuneita viestejä kansiosta %s"
 
-#: ../camel/camel-imapx-server.c:4684
+#: ../camel/camel-imapx-server.c:5377
 #, fuzzy
 msgid "Error fetching new messages"
 msgstr "Etsitään uusia viestejä"
 
-#: ../camel/camel-imapx-server.c:4874
+#: ../camel/camel-imapx-server.c:5590
 #, fuzzy
 msgid "Error while fetching messages"
 msgstr "Varmistetaan viestiä"
 
-#: ../camel/camel-imapx-server.c:4882 ../camel/camel-imapx-server.c:4918
+#: ../camel/camel-imapx-server.c:5598 ../camel/camel-imapx-server.c:5631
 #, fuzzy, c-format
 msgid "Fetching summary information for %d message in '%s'"
 msgid_plural "Fetching summary information for %d messages in '%s'"
 msgstr[0] "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
 msgstr[1] "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
 
-#: ../camel/camel-imapx-server.c:5043 ../camel/camel-imapx-server.c:5079
+#: ../camel/camel-imapx-server.c:5767 ../camel/camel-imapx-server.c:5797
 #, fuzzy
 msgid "Error refreshing folder"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../camel/camel-imapx-server.c:5172
+#: ../camel/camel-imapx-server.c:5921
 #, fuzzy
 msgid "Error expunging message"
 msgstr "Poistetaan vanhoja viestejä pysyvästi"
 
-#: ../camel/camel-imapx-server.c:5269
+#: ../camel/camel-imapx-server.c:6032
 #, fuzzy
 msgid "Error fetching folders"
 msgstr "Tallennetaan kansiota"
 
-#: ../camel/camel-imapx-server.c:5348
+#: ../camel/camel-imapx-server.c:6114
 #, fuzzy
 msgid "Error subscribing to folder"
 msgstr "_Näytä ainoastaan tilatut kansiot"
 
-#: ../camel/camel-imapx-server.c:5409
+#: ../camel/camel-imapx-server.c:6179
 msgid "Error creating folder"
 msgstr "Virhe luotaessa kansiota"
 
-#: ../camel/camel-imapx-server.c:5458
-#, fuzzy
+#: ../camel/camel-imapx-server.c:6233
 msgid "Error deleting folder"
-msgstr "Tallennetaan kansiota"
+msgstr "Virhe kansiota poistaessa"
 
-#: ../camel/camel-imapx-server.c:5519
-#, fuzzy
+#: ../camel/camel-imapx-server.c:6307
 msgid "Error renaming folder"
-msgstr "Tallennetaan kansiota"
+msgstr "Virhe kansion nimeä muutettaessa"
+
+#: ../camel/camel-imapx-server.c:6382
+#, fuzzy
+msgid "Error retrieving quota information"
+msgstr "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
+
+#: ../camel/camel-imapx-server.c:6447
+#| msgid "Decoder failed"
+msgid "Search failed"
+msgstr "Haku epäonnistui"
 
-#: ../camel/camel-imapx-server.c:5580
+#: ../camel/camel-imapx-server.c:6510
 #, fuzzy
 msgid "Error performing NOOP"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../camel/camel-imapx-server.c:5676
+#: ../camel/camel-imapx-server.c:6619
 msgid "Error syncing changes"
-msgstr ""
+msgstr "Virhe muutoksia synkronoidessa"
 
-#: ../camel/camel-imapx-server.c:6447
-#: ../camel/providers/imap/camel-imap-folder.c:3531
+#: ../camel/camel-imapx-server.c:7431
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Viestiä tunnisteella %s ei voi noutaa: %s"
 
-#: ../camel/camel-imapx-server.c:6448
-#: ../camel/providers/imap/camel-imap-folder.c:3532
+#: ../camel/camel-imapx-server.c:7432
 msgid "No such message available."
 msgstr "Tämä viesti ei ole saatavilla."
 
-#: ../camel/camel-imapx-server.c:6603 ../camel/camel-imapx-server.c:6618
+#: ../camel/camel-imapx-server.c:7590 ../camel/camel-imapx-server.c:7605
 #, fuzzy
 msgid "Cannot create spool file: "
 msgstr "Viestiä ei voi luoda: %s"
 
-#: ../camel/camel-imapx-store.c:157
-#: ../camel/providers/imap/camel-imap-store.c:827
+#: ../camel/camel-imapx-server.c:8347
+msgid "IMAP server does not support quotas"
+msgstr "IMAP-palvelin ei tue quota-tilarajoja"
+
+#: ../camel/camel-imapx-store.c:249
 #, c-format
 msgid "IMAP server %s"
 msgstr "Imap-palvelin %s"
 
-#: ../camel/camel-imapx-store.c:160
-#: ../camel/providers/imap/camel-imap-store.c:830
+#: ../camel/camel-imapx-store.c:252
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#: ../camel/camel-imapx-store.c:251
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-imapx-store.c:343
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
 #: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid "Password"
 msgstr "Salasana"
 
-#: ../camel/camel-imapx-store.c:253
-#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/camel-imapx-store.c:345
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen selväkielistä salasanaa käyttäen."
 
-#: ../camel/camel-imapx-store.c:351
-#: ../camel/providers/imap/camel-imap-store.c:2064
-#: ../camel/providers/imap/camel-imap-store.c:2262
+#: ../camel/camel-imapx-store.c:453
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:376 ../camel/camel-imapx-store.c:866
-#: ../camel/providers/imap/camel-imap-store.c:275
-#: ../camel/providers/imap/camel-imap-store.c:2684
+#: ../camel/camel-imapx-store.c:478 ../camel/camel-imapx-store.c:968
 #: ../camel/providers/local/camel-maildir-folder.c:473
-#: ../camel/providers/local/camel-maildir-store.c:307
-#: ../camel/providers/local/camel-maildir-store.c:699
-#: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-maildir-store.c:789
+#: ../camel/providers/local/camel-maildir-store.c:316
+#: ../camel/providers/local/camel-maildir-store.c:750
+#: ../camel/providers/local/camel-maildir-store.c:756
+#: ../camel/providers/local/camel-maildir-store.c:840
 #: ../camel/providers/local/camel-spool-store.c:393
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: ../camel/camel-imapx-store.c:1099
+#: ../camel/camel-imapx-store.c:1212
 #, fuzzy, c-format
 msgid "Retrieving folder list for %s"
 msgstr "Valmistellaan kansiota \"%s\" yhteydettömään tilaan"
 
-#: ../camel/camel-imapx-store.c:1203
-#: ../camel/providers/nntp/camel-nntp-store.c:1771
-#, c-format
-msgid "No such folder: %s"
-msgstr "Kansiota ei ole: %s"
-
-#: ../camel/camel-imapx-store.c:1420
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imap/camel-imap-store.c:2524
+#: ../camel/camel-imapx-store.c:1595
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%c\""
 
-#: ../camel/camel-imapx-store.c:1431
-#: ../camel/providers/imap/camel-imap-store.c:2537
+#: ../camel/camel-imapx-store.c:1606
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ylempi kansio on tuntematon: %s"
 
-#: ../camel/camel-imapx-store.c:1441
-#: ../camel/providers/imap/camel-imap-store.c:2140
-#: ../camel/providers/imap/camel-imap-store.c:2589
+#: ../camel/camel-imapx-store.c:1616
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ylempi kansio ei voi sisältää alikansioita"
 
-#: ../camel/camel-imapx-stream.c:97
+#: ../camel/camel-imapx-stream.c:98
 #, c-format
 msgid "Source stream returned no data"
 msgstr ""
 
-#: ../camel/camel-imapx-stream.c:106
+#: ../camel/camel-imapx-stream.c:107
 #, fuzzy, c-format
 msgid "Source stream unavailable"
 msgstr "Palvelu ei ole saatavilla"
@@ -2628,28 +2684,38 @@ msgstr "Palvelimen osoitteen haku epäonnistui"
 
 #: ../camel/camel-net-utils.c:732
 #, c-format
-msgid "Host lookup failed: %s: %s"
+msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgstr ""
+
+#: ../camel/camel-net-utils.c:736
+#, fuzzy, c-format
+#| msgid "Host lookup failed: %s: %s"
+msgid "Host lookup '%s' failed: %s"
 msgstr "Palvelimen %s osoitteen haku epäonnistui: %s"
 
-#: ../camel/camel-net-utils.c:853
+#: ../camel/camel-net-utils.c:857
 msgid "Resolving address"
 msgstr "Etsitään osoitetta"
 
-#: ../camel/camel-net-utils.c:874
+#: ../camel/camel-net-utils.c:878
 msgid "Name lookup failed"
 msgstr "Nimikysely epäonnistui"
 
-#: ../camel/camel-net-utils.c:880
+#: ../camel/camel-net-utils.c:885
+msgid "Name lookup failed. Check your host name for spelling errors."
+msgstr ""
+
+#: ../camel/camel-net-utils.c:889
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Nimen haku epäonnistui: %s"
 
-#: ../camel/camel-network-service.c:114
+#: ../camel/camel-network-service.c:350
 #, fuzzy, c-format
-msgid "Could not connect to %s: "
+msgid "Could not connect to '%s:%s': "
 msgstr "Yhteyttä %s:ään ei voitu luoda: %s"
 
-#: ../camel/camel-offline-folder.c:210
+#: ../camel/camel-offline-folder.c:212
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkronoidaan viestejä kansiossa %s levylle"
@@ -2667,29 +2733,30 @@ msgstr "Virtuaalikansion sähköpostitarjoaja"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Sähköpostien lukuun hakuna joukosta muita kansioita"
 
-#: ../camel/camel-provider.c:195
+#: ../camel/camel-provider.c:263
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Moduulin %s lataaminen epäonnistui: Järjestelmäsi ei tue moduulien "
 "lataamista."
 
-#: ../camel/camel-provider.c:204
+#: ../camel/camel-provider.c:272
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ei voitu ladata: %s"
 
-#: ../camel/camel-provider.c:213
+#: ../camel/camel-provider.c:281
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ei voitu ladata: moduulissa ei ole alustuskoodia"
 
-#: ../camel/camel-provider.c:412 ../camel/camel-session.c:406
+#: ../camel/camel-provider.c:429 ../camel/camel-session.c:407
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
 #: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "Anonyymi"
 
@@ -2855,7 +2922,7 @@ msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 
 #: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
 #: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
-#: ../camel/providers/smtp/camel-smtp-transport.c:575
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
@@ -2909,42 +2976,45 @@ msgstr ""
 msgid "POP Source UID"
 msgstr "POP:in lähde-URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:96
+#: ../camel/camel-sasl-popb4smtp.c:98
 #, fuzzy, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr ""
 "POP ennen SMTP:tä tunnistautuminen käyttäen tuntematonta siirtomenetelmää"
 
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
+#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119
 #, fuzzy, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP ennen SMTP:tä käyttäen lähdettä, joka ei ole POP"
 
-#: ../camel/camel-search-private.c:112
+#: ../camel/camel-search-private.c:116
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Säännöllisen lausekkeen käännös epäonnistui: %s: %s"
 
-#: ../camel/camel-session.c:415
+#: ../camel/camel-session.c:416
 #, fuzzy, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/camel-session.c:509
+#: ../camel/camel-session.c:510
 #, fuzzy, c-format
 msgid "%s authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../camel/camel-session.c:645
+#: ../camel/camel-session.c:646
 msgid "Forwarding messages is not supported"
-msgstr ""
+msgstr "Viestien edelleenlähetystä ei tueta"
 
-#: ../camel/camel-session.c:1362
+#. Translators: The first argument is the account type
+#. * (e.g. "IMAP"), the second is the user name, and the
+#. * third is the host name.
+#: ../camel/camel-session.c:1423
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
 
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Varmennetta \"%s\":lle ei löydy"
@@ -3078,107 +3148,105 @@ msgstr "Allekirjoitustiivisteitä ei löydy"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allekirjoittaja: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
+#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148
 msgid "Cannot create encoder context"
 msgstr "Kooderin kontekstia ei voi luoda"
 
-#: ../camel/camel-smime-context.c:850
+#: ../camel/camel-smime-context.c:864
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS-kooderiin ei voitu lisätä tietoa"
 
-#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
+#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165
 msgid "Failed to encode data"
 msgstr "Tiedon koodaus epäonnistui"
 
-#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
+#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262
 msgid "Decoder failed"
 msgstr "Purkaja epäonnistui"
 
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1082
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Yhteistä massasalausalgoritmia ei löydy"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Lokeroa massasalausavaimelle ei voi varata"
 
-#: ../camel/camel-smime-context.c:1087
+#: ../camel/camel-smime-context.c:1101
 msgid "Cannot create CMS Message"
 msgstr "CMS-viestiä ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS-käärittyä tietoa ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1099
+#: ../camel/camel-smime-context.c:1113
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS-käärittyä tietoa ei voi liittää"
 
-#: ../camel/camel-smime-context.c:1105
+#: ../camel/camel-smime-context.c:1119
 msgid "Cannot attach CMS data object"
 msgstr "CMS tieto-oliota ei voi liittää"
 
-#: ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:1128
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1119
+#: ../camel/camel-smime-context.c:1133
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:1145
+#: ../camel/camel-smime-context.c:1159
 msgid "Failed to add data to encoder"
 msgstr "Tiedon lisäys koodaajaan epäonnistui"
 
-#: ../camel/camel-smime-context.c:1255
+#: ../camel/camel-smime-context.c:1269
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME purku: salauskontekstia ei löytynyt"
 
-#: ../camel/camel-store.c:1838
+#: ../camel/camel-store.c:1871
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Kansiota \"%s\" ei voi luoda: kansio on jo olemassa"
 
-#: ../camel/camel-store.c:1881
+#: ../camel/camel-store.c:1914
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Avataan kansiota ”%s”"
 
-#: ../camel/camel-store.c:2066
+#: ../camel/camel-store.c:2099
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Tutkitaan kansion ”%s” alikansioita"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
+#: ../camel/camel-store.c:2115 ../camel/camel-store.c:2146
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Roskakori"
 
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
+#: ../camel/camel-store.c:2127 ../camel/camel-store.c:2162
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../camel/camel-store.c:2540
+#: ../camel/camel-store.c:2615
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
 
-#: ../camel/camel-store.c:2554
+#: ../camel/camel-store.c:2629
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Luodaan kansiota '%s'"
 
-#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
-#: ../camel/providers/local/camel-maildir-store.c:306
+#: ../camel/camel-store.c:2747 ../camel/camel-vee-store.c:416
+#: ../camel/providers/local/camel-maildir-store.c:315
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
-#: ../camel/providers/local/camel-maildir-store.c:788
+#: ../camel/camel-store.c:2890 ../camel/camel-vee-store.c:466
+#: ../camel/providers/local/camel-maildir-store.c:839
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
@@ -3201,12 +3269,12 @@ msgstr "Yhteys peruutettu"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Komentoon \"%s\" liittyminen epäonnistui: %s"
 
-#: ../camel/camel-subscribable.c:386
+#: ../camel/camel-subscribable.c:397
 #, fuzzy, c-format
 msgid "Subscribing to folder '%s'"
 msgstr "_Näytä ainoastaan tilatut kansiot"
 
-#: ../camel/camel-subscribable.c:518
+#: ../camel/camel-subscribable.c:529
 #, fuzzy, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "_Näytä ainoastaan tilatut kansiot"
@@ -3214,7 +3282,7 @@ msgstr "_Näytä ainoastaan tilatut kansiot"
 #: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
-msgstr ""
+msgstr "NSPR-virhekoodi %d"
 
 #: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
 #, c-format
@@ -3238,7 +3306,7 @@ msgstr "Varmennusmenetelmä %s ei ole tuettu"
 
 #: ../camel/camel-tcp-stream-raw.c:801
 msgid "General SOCKS server failure"
-msgstr ""
+msgstr "Yleinen SOCKS-palvelimen virhe"
 
 #: ../camel/camel-tcp-stream-raw.c:802
 msgid "SOCKS server's rules do not allow connection"
@@ -3261,14 +3329,12 @@ msgid "Time-to-live expired"
 msgstr ""
 
 #: ../camel/camel-tcp-stream-raw.c:807
-#, fuzzy
 msgid "Command not supported by SOCKS server"
-msgstr "Palvelin ei tue STLS-laajennosta"
+msgstr "Komento ei ole SOCKS-palvelimen tukema"
 
 #: ../camel/camel-tcp-stream-raw.c:808
-#, fuzzy
 msgid "Address type not supported by SOCKS server"
-msgstr "Palvelin ei tue STLS-laajennosta"
+msgstr "Osoitetyyppi ei ole SOCKS-palvelimen tukema"
 
 #: ../camel/camel-tcp-stream-raw.c:809
 msgid "Unknown error from SOCKS server"
@@ -3280,9 +3346,9 @@ msgid "Got unknown address type from SOCKS server"
 msgstr ""
 
 #: ../camel/camel-tcp-stream-raw.c:860
-#, fuzzy, c-format
+#, c-format
 msgid "Incomplete reply from SOCKS server"
-msgstr "Virheellinen vastaus palvelimelta"
+msgstr "Puutteellinen vastaus SOCKS-palvelimelta"
 
 #: ../camel/camel-tcp-stream-raw.c:880
 #, c-format
@@ -3296,93 +3362,15 @@ msgstr ""
 msgid "Invalid reply from proxy server"
 msgstr "Virheellinen vastaus välityspalvelimelta"
 
-#: ../camel/camel-tcp-stream-ssl.c:505
-#, fuzzy, c-format
-msgid ""
-"   Issuer:       %s\n"
-"   Subject:      %s\n"
-"   Fingerprint:  %s\n"
-"   Signature:    %s"
-msgstr ""
-"Myöntäjä:          %s\n"
-"Aihe:              %s\n"
-"Sormenjälki:       %s\n"
-"Allekirjoitus:     %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:512
-msgid "GOOD"
-msgstr "HYVÄKSYTTY"
-
-#: ../camel/camel-tcp-stream-ssl.c:512
-msgid "BAD"
-msgstr "VIRHEELLINEN"
-
-#: ../camel/camel-tcp-stream-ssl.c:517
-#, c-format
-msgid ""
-"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-"\n"
-"Detailed information about the certificate:\n"
-"%s"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-ssl.c:523
-msgid "_Reject"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-ssl.c:524
-msgid "Accept _Temporarily"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-ssl.c:525
-msgid "_Accept Permanently"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-ssl.c:586
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"Ongelma varmenteessa: %s\n"
-"Myöntäjä: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:638
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"Virheellinen varmenteen alue: %s\n"
-"Myöntäjä %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:656
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Varmenne vanhentunut: %s\n"
-"Myöntäjä: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:673
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Varmenteiden hylkäyslista vanhentunut: %s\n"
-"Myöntäjä: %s"
-
 #: ../camel/camel-url.c:331
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URLia \"%s\" ei voi tulkita"
 
 #: ../camel/camel-vee-folder.c:494
-#, fuzzy, c-format
+#, c-format
 msgid "Updating folder '%s'"
-msgstr "Kansiota \"%s\" ei voi hakea: %s"
+msgstr "Päivitetään kansiota '%s'"
 
 #: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
 #, c-format
@@ -3400,27 +3388,27 @@ msgstr "Viestiä %s ei voitu löytää %s:stä"
 msgid "Error storing '%s': "
 msgstr "Virhe tallennettaessa \"%s\": %s"
 
-#: ../camel/camel-vee-folder.c:1169
+#: ../camel/camel-vee-folder.c:1171
 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
-#: ../camel/camel-vee-store.c:38
+#: ../camel/camel-vee-store.c:42
 msgid "Unmatched"
 msgstr "Ei vastaavaa"
 
-#: ../camel/camel-vee-store.c:436
+#: ../camel/camel-vee-store.c:442
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: ../camel/camel-vee-store.c:470
+#: ../camel/camel-vee-store.c:476
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
 
-#: ../camel/camel-vee-store.c:532
+#: ../camel/camel-vee-store.c:538
 msgid "Enable _Unmatched folder"
 msgstr ""
 
@@ -3432,275 +3420,89 @@ msgstr "Viestejä ei voi kopioida roskakoriin"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Viestejä ei voi kopioida roskapostikansioon"
 
-#: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:299
-#, c-format
-msgid "No output stream"
-msgstr "Ei tulosvirtaa"
-
-#: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:307
-#, c-format
-msgid "No input stream"
-msgstr "Ei syötevirtaa"
-
-#: ../camel/providers/imap/camel-imap-command.c:392
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:425
-#, fuzzy, c-format
-msgid ""
-"Alert from IMAP server %s %s in folder %s:\n"
-"%s"
-msgstr ""
-"Hälytys IMAP-palvelimelta %s %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:429
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-"Hälytys IMAP-palvelimelta %s %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:512
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:524
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP-komento epäonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:607
-#, c-format
-msgid "Server response ended too soon."
-msgstr "Palvelimen vastaus päättyi liian äkkiä."
-
-#: ../camel/providers/imap/camel-imap-command.c:822
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP-palvelimen vaste ei sisältänyt tietoja %s:stä"
-
-#: ../camel/providers/imap/camel-imap-command.c:860
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:356
-#, fuzzy
-msgid "Always check for _new mail in this folder"
-msgstr "Etsi aina uusia viestejä tästä kansiosta"
-
-#: ../camel/providers/imap/camel-imap-folder.c:447
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Hakemistoa %s ei voitu luoda: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:468
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Yhteenvetoa %s:lle ei voitu ladata"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1137
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "Etsitään muuttuneita viestejä kansiosta %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3494
-#, fuzzy
-msgid "Unable to retrieve message: "
-msgstr "Viestin haku epäonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3620
-#: ../camel/providers/imap/camel-imap-folder.c:4512
-#: ../camel/providers/nntp/camel-nntp-folder.c:493
-#, c-format
-msgid "This message is not currently available"
-msgstr "Tämä viesti ei ole juuri nyt saatavilla"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4085
-#: ../camel/providers/imap/camel-imap-folder.c:4167
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4299
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr ""
-"Epätäydellinen vastaus palvelimelta: viestille %d ei löytynyt mitään tietoja"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4309
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Epätäydellinen vastaus palvelimelta: Viestille %d ei löytynyt UID:ia"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4549
-#, c-format
-msgid "Could not find message body in FETCH response."
-msgstr "Viestin runkoa ei löytynyt FETCH-vastauksesta"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:196
-#: ../camel/providers/imap/camel-imap-message-cache.c:253
-#, fuzzy
-msgid "Could not open cache directory: "
-msgstr "Välimuistihakemistoa ei voitu avata: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:331
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "Viestin %s tallennus välimuistiin epäonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:397
-#, fuzzy, c-format
-msgid "Failed to cache message %s: "
-msgstr "Viestin %s tallennus välimuistiin epäonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:539
-#, fuzzy, c-format
-msgid "Failed to cache %s: "
-msgstr "Välimuistiin tallennus epäonnistui %s: %s"
-
-#: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "Haetaan uusia viestejä"
 
-#: ../camel/providers/imap/camel-imap-provider.c:42
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "Etsi uusia viestejä kaikista kansioista"
 
-#: ../camel/providers/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "_Etsi uusia viestejä tilatuista kansioista"
 
-#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr ""
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "Kansiot"
 
-#: ../camel/providers/imap/camel-imap-provider.c:49
 #: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "_Näytä ainoastaan tilatut kansiot"
 
-#: ../camel/providers/imap/camel-imap-provider.c:51
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "Ohita pal_velimen tarjoama kansioiden nimiavaruus"
 
-#: ../camel/providers/imap/camel-imap-provider.c:53
-#, fuzzy
-msgid "Names_pace:"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
 msgstr "Nimiavaruus:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:55
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
 #: ../camel/providers/local/camel-local-provider.c:41
-#: ../camel/providers/local/camel-local-provider.c:77
-#: ../camel/providers/local/camel-local-provider.c:97
+#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:101
 #: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "Asetukset"
 
-#: ../camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
-#, fuzzy
 msgid "Apply _filters to new messages in all folders"
-msgstr "_Käytä suodattimia uusille viesteille saapuvien kansiossa"
+msgstr "_Käytä suodattimia uusille viesteille kaikissa kansioissa"
 
-#: ../camel/providers/imap/camel-imap-provider.c:59
 #: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "Käytä suodattimia uusille viesteille saapuvien kansiossa tällä palvelimella"
 
-#: ../camel/providers/imap/camel-imap-provider.c:61
 #: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "_Etsi roskapostia uusista viesteistä"
 
-#: ../camel/providers/imap/camel-imap-provider.c:63
 #: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Etsi roskapostia vain saapuvien kansiosta"
 
-#: ../camel/providers/imap/camel-imap-provider.c:65
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "_Synkronoi sähköposti etäpalvelimelta automaattisesti"
 
-#: ../camel/providers/imap/camel-imap-provider.c:71
-msgid "IMAP default port"
-msgstr "IMAPin oletusportti"
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
+msgstr "IMAP:in oletusportti"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "IMAP SSL:llä"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
-msgid "IMAP"
-msgstr "IMAP"
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
 #: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Sähköpostien luku ja tallennus IMAP-palvelimilta."
 
-#: ../camel/providers/imap/camel-imap-store.c:2191
-#: ../camel/providers/local/camel-maildir-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:564
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Kansiota \"%s\" ei voi luoda: kansio on jo olemassa."
-
-#: ../camel/providers/imap/camel-imap-store.c:2984
-#, fuzzy, c-format
-msgid "Retrieving list of folders at '%s'"
-msgstr "Valmistellaan kansiota \"%s\" yhteydettömään tilaan"
-
-#: ../camel/providers/imap/camel-imap-store.c:3334
-#, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "Palvelin katkaisi yhteyden odottamatta"
-
-#: ../camel/providers/imap/camel-imap-store.c:3338
-#, fuzzy
-msgid "Server unexpectedly disconnected: "
-msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use _Quick Resync if the server supports it"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "_Listen for server change notifications"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Namespace:"
-msgstr "Nimiavaruus:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
-msgid "Default IMAP port"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:83
-msgid "IMAP+"
-msgstr "IMAP+"
-
 #: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
@@ -3743,11 +3545,11 @@ msgstr "MH-muotoisia sähköpostihakemistoja"
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Sähköpostin tallennus MH-muotoisiin hakemistoihin paikallisesti."
 
-#: ../camel/providers/local/camel-local-provider.c:64
+#: ../camel/providers/local/camel-local-provider.c:68
 msgid "Local delivery"
 msgstr "Paikallinen toimitus"
 
-#: ../camel/providers/local/camel-local-provider.c:65
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3755,30 +3557,29 @@ msgstr ""
 "Sähköpostin siirto paikallisista mbox-muotoisista saapuvien kansioista "
 "Evolutionin hallinnoimiin kansioihin."
 
-#: ../camel/providers/local/camel-local-provider.c:79
-#: ../camel/providers/local/camel-local-provider.c:99
-#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:83
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Käytä suodattimia uusille viesteille saapuvien kansiossa"
 
-#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:90
 msgid "Maildir-format mail directories"
 msgstr "Maildir-muotoisia sähköpostikansioita"
 
-#: ../camel/providers/local/camel-local-provider.c:87
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "For storing local mail in maildir directories."
 msgstr "Sähköpostin tallennus maildir-muotoisiin hakemistoihin paikallisesti."
 
-#: ../camel/providers/local/camel-local-provider.c:100
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Tallenna tila-otsakkeet Elm/Pine/Mutt-muodossa"
 
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "Tavallinen Unixin mbox-kansio"
 
-#: ../camel/providers/local/camel-local-provider.c:108
-#: ../camel/providers/local/camel-local-provider.c:120
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:126
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3787,7 +3588,7 @@ msgstr ""
 "sähköpostitiedostoihin.\n"
 "Tällä voidaan myös lukea hakemisto Elm, Pine tai Mutt-tyylisiä kansioita."
 
-#: ../camel/providers/local/camel-local-provider.c:119
+#: ../camel/providers/local/camel-local-provider.c:125
 msgid "Standard Unix mbox spool directory"
 msgstr "Tavallinen Unixin mbox-muotoinen saapuvien hakemisto"
 
@@ -3803,7 +3604,7 @@ msgstr "Paikallinen viestitiedosto %s"
 
 #: ../camel/providers/local/camel-local-store.c:223
 #: ../camel/providers/local/camel-local-store.c:383
-#: ../camel/providers/local/camel-maildir-store.c:104
+#: ../camel/providers/local/camel-maildir-store.c:117
 #: ../camel/providers/local/camel-mbox-store.c:581
 #: ../camel/providers/local/camel-spool-store.c:89
 #, c-format
@@ -3818,7 +3619,7 @@ msgstr "Säilön juuri %s ei ole tavallinen hakemisto"
 #: ../camel/providers/local/camel-local-store.c:244
 #: ../camel/providers/local/camel-local-store.c:254
 #: ../camel/providers/local/camel-local-store.c:396
-#: ../camel/providers/local/camel-maildir-store.c:137
+#: ../camel/providers/local/camel-maildir-store.c:145
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
@@ -3845,7 +3646,7 @@ msgstr "Kansion metadatatiedostoa \"%s\" ei voitu poistaa: %s"
 msgid "Could not rename '%s': %s"
 msgstr "Uudelleennimeäminen epäonnistui \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-summary.c:543
+#: ../camel/providers/local/camel-local-summary.c:567
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Viestin lisäys yhteenvetoon epäonnistui: tuntematon syy"
@@ -3879,87 +3680,84 @@ msgstr ""
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Viestiä ei voi lisätä maildir-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:112
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: Folder name cannot contain a dot"
-msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
-
-#: ../camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-maildir-store.c:806
+#: ../camel/providers/local/camel-maildir-store.c:125
+#: ../camel/providers/local/camel-maildir-store.c:848
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Kansio %s on jo olemassa"
 
-#: ../camel/providers/local/camel-maildir-store.c:221
-#: ../camel/providers/local/camel-maildir-store.c:252
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-maildir-store.c:261
 #: ../camel/providers/local/camel-mbox-store.c:403
 #: ../camel/providers/local/camel-mbox-store.c:424
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:245
 #: ../camel/providers/local/camel-mbox-store.c:369
 #: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi hakea: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:251
 #: ../camel/providers/local/camel-mbox-store.c:379
 #: ../camel/providers/local/camel-mh-store.c:531
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Kansiota \"%s\" ei voi hakea: kansiota ei ole olemassa."
 
-#: ../camel/providers/local/camel-maildir-store.c:269
+#: ../camel/providers/local/camel-maildir-store.c:278
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "'Kansiota \"%s\" ei voi avata: ei maildir-muotoinen hakemisto."
 
-#: ../camel/providers/local/camel-maildir-store.c:338
-#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../camel/providers/local/camel-maildir-store.c:283
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:564
+#, c-format
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Kansiota \"%s\" ei voi luoda: kansio on jo olemassa."
+
+#: ../camel/providers/local/camel-maildir-store.c:347
+#: ../camel/providers/local/camel-maildir-store.c:387
 #: ../camel/providers/local/camel-mh-store.c:682
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:340
+#: ../camel/providers/local/camel-maildir-store.c:349
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: ../camel/providers/local/camel-maildir-store.c:589
-#: ../camel/providers/local/camel-maildir-store.c:1003
+#: ../camel/providers/local/camel-maildir-store.c:628
+#: ../camel/providers/local/camel-maildir-store.c:1063
 #: ../camel/providers/local/camel-spool-store.c:212
 #: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voitu käydä läpi: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:797
-#, fuzzy, c-format
-msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
-
-#: ../camel/providers/local/camel-maildir-summary.c:434
-#: ../camel/providers/local/camel-maildir-summary.c:567
+#: ../camel/providers/local/camel-maildir-summary.c:458
+#: ../camel/providers/local/camel-maildir-summary.c:591
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-kansiota ei voi avata: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:582
 msgid "Checking folder consistency"
 msgstr "Tarkastetaan kansion yhdenmukaisuutta"
 
-#: ../camel/providers/local/camel-maildir-summary.c:651
+#: ../camel/providers/local/camel-maildir-summary.c:675
 msgid "Checking for new messages"
 msgstr "Etsitään uusia viestejä"
 
-#: ../camel/providers/local/camel-maildir-summary.c:746
-#: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:650
-#: ../camel/providers/local/camel-mbox-summary.c:794
-#: ../camel/providers/local/camel-spool-summary.c:132
+#: ../camel/providers/local/camel-maildir-summary.c:770
+#: ../camel/providers/local/camel-mbox-summary.c:450
+#: ../camel/providers/local/camel-mbox-summary.c:682
+#: ../camel/providers/local/camel-mbox-summary.c:830
+#: ../camel/providers/local/camel-spool-summary.c:141
 msgid "Storing folder"
 msgstr "Tallennetaan kansiota"
 
@@ -4050,83 +3848,83 @@ msgstr "Kohdetta \"%s\" ei voitu nimetä uudestaan: \"%s\": %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Uudelleennimeäminen %s:stä %s:ksi epäonnistui: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:428
+#: ../camel/providers/local/camel-mbox-summary.c:460
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kansiota ei voitu avata: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:490
+#: ../camel/providers/local/camel-mbox-summary.c:522
 #, fuzzy, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "Vakava sähköpostin käsittelyvirhe kohdassa %ld kansiossa %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:575
+#: ../camel/providers/local/camel-mbox-summary.c:607
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion tarkistus ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:663
-#: ../camel/providers/local/camel-mbox-summary.c:803
-#: ../camel/providers/local/camel-spool-summary.c:139
+#: ../camel/providers/local/camel-mbox-summary.c:695
+#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-spool-summary.c:148
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Tiedostoa ei voitu avata: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:677
-#: ../camel/providers/local/camel-spool-summary.c:154
+#: ../camel/providers/local/camel-mbox-summary.c:709
+#: ../camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Väliaikaista sähköpostilaatikkoa ei voi avata: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:694
-#: ../camel/providers/local/camel-mbox-summary.c:920
+#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:956
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Lähdekansiota %s ei voitu sulkea: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Väliaikaiskansiota ei voitu sulkea: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:758
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:817
-#: ../camel/providers/local/camel-mbox-summary.c:1086
+#: ../camel/providers/local/camel-mbox-summary.c:853
+#: ../camel/providers/local/camel-mbox-summary.c:1122
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kansiota ei voitu tallentaa: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:856
-#: ../camel/providers/local/camel-mbox-summary.c:1123
+#: ../camel/providers/local/camel-mbox-summary.c:892
+#: ../camel/providers/local/camel-mbox-summary.c:1162
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:866
-#: ../camel/providers/local/camel-mbox-summary.c:1136
+#: ../camel/providers/local/camel-mbox-summary.c:902
+#: ../camel/providers/local/camel-mbox-summary.c:1174
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Yhteenveto ja kansio ovat ristiriidassa synkronoinnin jälkeenkin"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1031
-#: ../camel/providers/local/camel-spool-summary.c:347
+#: ../camel/providers/local/camel-mbox-summary.c:1067
+#: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1194
-#: ../camel/providers/local/camel-mbox-summary.c:1224
+#: ../camel/providers/local/camel-mbox-summary.c:1232
+#: ../camel/providers/local/camel-mbox-summary.c:1262
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Väliaikaiseen postikansioon kirjoitus epäonnistui: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1213
+#: ../camel/providers/local/camel-mbox-summary.c:1251
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Väliaikaiseen postikansioon kirjoitus epäonnistui: %s: %s"
@@ -4224,21 +4022,21 @@ msgstr "Saapuvan sähköpostin kansioita ei voi poistaa"
 msgid "Spool folders cannot be renamed"
 msgstr "Saapuvan sähköpostin kansioita ei voi uudelleennimetä"
 
-#: ../camel/providers/local/camel-spool-summary.c:170
-#: ../camel/providers/local/camel-spool-summary.c:182
-#: ../camel/providers/local/camel-spool-summary.c:194
+#: ../camel/providers/local/camel-spool-summary.c:179
+#: ../camel/providers/local/camel-spool-summary.c:191
+#: ../camel/providers/local/camel-spool-summary.c:203
 #, fuzzy, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Väliaikaishakemistoa %s ei voitu synkronoida: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:212
+#: ../camel/providers/local/camel-spool-summary.c:221
 #, fuzzy, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Saapuvan sähköpostin kansion virkistys epäonnistui %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:244
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:253
+#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:285
 #, fuzzy, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -4256,21 +4054,26 @@ msgstr "Sisäinen virhe: UID on virheellisessä muodossa: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:328
 #: ../camel/providers/nntp/camel-nntp-folder.c:332
-#: ../camel/providers/pop3/camel-pop3-folder.c:630
-#: ../camel/providers/pop3/camel-pop3-folder.c:1033
+#: ../camel/providers/pop3/camel-pop3-folder.c:633
+#: ../camel/providers/pop3/camel-pop3-folder.c:1065
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:339
 #: ../camel/providers/nntp/camel-nntp-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
-#: ../camel/providers/pop3/camel-pop3-folder.c:620
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
+#: ../camel/providers/pop3/camel-pop3-folder.c:558
+#: ../camel/providers/pop3/camel-pop3-folder.c:623
+#: ../camel/providers/pop3/camel-pop3-folder.c:642
 #, fuzzy, c-format
 msgid "Cannot get message %s: "
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
+#, c-format
+msgid "This message is not currently available"
+msgstr "Tämä viesti ei ole juuri nyt saatavilla"
+
 #: ../camel/providers/nntp/camel-nntp-folder.c:559
 #: ../camel/providers/nntp/camel-nntp-folder.c:565
 #: ../camel/providers/nntp/camel-nntp-folder.c:611
@@ -4279,9 +4082,8 @@ msgid "Posting failed: %s"
 msgstr "Postitus epäonnistui: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:606
-#, fuzzy
 msgid "Posting failed: "
-msgstr "Postitus epäonnistui: %s"
+msgstr "Postitus epäonnistui: "
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, c-format
@@ -4304,7 +4106,7 @@ msgstr "Näytä _tilauslomakkeessa suhteelliset kansionimet"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
-msgstr ""
+msgstr "NNTP:n oletusportti"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over SSL"
@@ -4319,6 +4121,16 @@ msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "Tämän tarjoajan avulla voit lukea ja postittaa USENET-uutisryhmiin."
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:87
+#, fuzzy
+#| msgid ""
+#| "This option will connect to the server using Kerberos 5 authentication."
+msgid ""
+"This option will connect to the NNTP server anonymously, without "
+"authentication."
+msgstr ""
+"Tämä vaihtoehto yhdistää palvelimeen käyttäen Kerberos 5 - tunnistautumista."
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:97
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4326,22 +4138,22 @@ msgstr ""
 "Tämä vaihtoehto tunnistautuu NNTP-palvelimelle käyttäen selväkielistä "
 "salasanaa."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:286
+#: ../camel/providers/nntp/camel-nntp-store.c:333
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Tervehdystä %s:stä ei voitu lukea: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:298
+#: ../camel/providers/nntp/camel-nntp-store.c:345
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-palvelin %s palautti virhekoodin %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:463
+#: ../camel/providers/nntp/camel-nntp-store.c:522
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET uutisryhmät palvelimelta %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1058
+#: ../camel/providers/nntp/camel-nntp-store.c:1123
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4352,23 +4164,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1152
+#: ../camel/providers/nntp/camel-nntp-store.c:1217
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Et voi luoda kansioita uutisryhmien alle: tilaa sen sijaan ryhmiä."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1168
+#: ../camel/providers/nntp/camel-nntp-store.c:1233
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Et voi nimetä kansiota Uutisryhmissä."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1191
+#: ../camel/providers/nntp/camel-nntp-store.c:1256
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Et voi poistaa kansiota uutisryhmistä: lopeta sen sijaan ryhmän tilaaminen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:1455
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4379,7 +4191,7 @@ msgstr ""
 "\n"
 "Uutisryhmää ei ole olemassa. Valittu kohta on luultavasti ylempi kansio."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1438
+#: ../camel/providers/nntp/camel-nntp-store.c:1503
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4390,18 +4202,22 @@ msgstr ""
 "\n"
 "Uutisryhmää ei ole olemassa!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1628
-#, fuzzy
+#: ../camel/providers/nntp/camel-nntp-store.c:1707
 msgid "NNTP Command failed: "
-msgstr "NNTP-komento epäonnistui: %s"
+msgstr "NNTP-komento epäonnistui: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1713
+#: ../camel/providers/nntp/camel-nntp-store.c:1794
 #, c-format
 msgid "Not connected."
 msgstr "Ei yhteyttä."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:198
-#: ../camel/providers/nntp/camel-nntp-summary.c:328
+#: ../camel/providers/nntp/camel-nntp-store.c:1856
+#, c-format
+msgid "No such folder: %s"
+msgstr "Kansiota ei ole: %s"
+
+#: ../camel/providers/nntp/camel-nntp-summary.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Etsii uusia viestejä"
@@ -4421,35 +4237,39 @@ msgstr "Odottamaton palvelimen vastaus head:ilta: %s"
 msgid "Operation failed: %s"
 msgstr "Toiminto epäonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:450
-#: ../camel/providers/pop3/camel-pop3-folder.c:523
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:526
 #, c-format
 msgid "No message with UID %s"
 msgstr "Ei viestejä tunnisteella %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:539
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestiä %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:634
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:679
+#: ../camel/providers/pop3/camel-pop3-folder.c:682
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:740
+#: ../camel/providers/pop3/camel-pop3-folder.c:741
+#: ../camel/providers/pop3/camel-pop3-folder.c:744
+#: ../camel/providers/pop3/camel-pop3-folder.c:757
+#: ../camel/providers/pop3/camel-pop3-folder.c:770
+#: ../camel/providers/pop3/camel-pop3-folder.c:784
 #, fuzzy
 msgid "Cannot get POP summary: "
 msgstr "POP-yhteenvedon hakeminen ei onnistu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:859
+#: ../camel/providers/pop3/camel-pop3-folder.c:891
 msgid "Expunging old messages"
 msgstr "Poistetaan vanhoja viestejä pysyvästi"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:879
+#: ../camel/providers/pop3/camel-pop3-folder.c:911
 msgid "Expunging deleted messages"
 msgstr "Poistetaan poistetut viestit pysyvästi"
 
@@ -4479,7 +4299,7 @@ msgstr "Poista _käytöstä tuki POP3-laajennoksille"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "Default POP3 port"
-msgstr ""
+msgstr "POP3:n oletusportti"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP3 over SSL"
@@ -4512,57 +4332,57 @@ msgstr ""
 "palvelimilla, jotka väittävät sitä tukevansa."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:83
+#: ../camel/providers/pop3/camel-pop3-store.c:89
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:139
+#: ../camel/providers/pop3/camel-pop3-store.c:150
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP-palvelimelta %s ei saatu luettua kelvollista tervehdystä"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:154
+#: ../camel/providers/pop3/camel-pop3-store.c:165
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Yhdistäminen POP-palvelimeen %s turvallisessa tilassa epäonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:155
+#: ../camel/providers/pop3/camel-pop3-store.c:166
 msgid "STLS not supported by server"
 msgstr "Palvelin ei tue STLS-laajennosta"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:176
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Yhdistäminen POP-palvelimeen %s turvallisessa tilassa epäonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:298
+#: ../camel/providers/pop3/camel-pop3-store.c:311
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP-palvelimeen %s kirjautuminen epäonnistui: SASL protokollavirhe"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:320
+#: ../camel/providers/pop3/camel-pop3-store.c:333
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Tunnistautuminen POP-palvelimelle %s epäonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:371
+#: ../camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3-palvelin %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
+#: ../camel/providers/pop3/camel-pop3-store.c:438
 #, fuzzy, c-format
 msgid "POP3 server for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/providers/pop3/camel-pop3-store.c:613
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4571,7 +4391,7 @@ msgstr ""
 "POP-palvelimeen %s ei saatu yhteyttä:\tVastaanotettiin virheellinen APOP-"
 "tunniste. Voidaan epäillä yhteyden kaappaamista, ota yhteyttä ylläpitäjääsi."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:598
+#: ../camel/providers/pop3/camel-pop3-store.c:665
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4582,29 +4402,25 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:613
+#: ../camel/providers/pop3/camel-pop3-store.c:680
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:673
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:701
+#: ../camel/providers/pop3/camel-pop3-store.c:751
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Kansiota \"%s\" ei ole olemassa."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:718
+#: ../camel/providers/pop3/camel-pop3-store.c:768
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr ""
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4624,44 +4440,50 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sähköpostin lähetys ohjelman sendmail avulla"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:107
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Vastaanottajalistan tulkitseminen epäonnistui"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:140
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#, fuzzy, c-format
+#| msgid "Could not parse recipient list"
+msgid "Could not parse arguments"
+msgstr "Vastaanottajalistan tulkitseminen epäonnistui"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:213
 #, fuzzy, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "Putkea sendmailille ei voitu luoda: %s: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:163
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:238
 #, fuzzy, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "Sendmailia ei voi käynnistää: %s: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:287
 #, fuzzy
 msgid "Could not send message: "
 msgstr "Viestin lähettäminen epäonnistui: %s"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:239
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:317
 #, fuzzy, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "Sendmail keskeytettiin signaaliin %s: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:327
 #, fuzzy, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "Komentoa %s ei voitu suorittaa: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:252
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:332
 #, fuzzy, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "Sendmail palautti arvon %d: sähköpostia ei lähetetty"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Default SMTP port"
-msgstr ""
+msgstr "SMTP:n oletusportti"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP over SSL"
@@ -4681,224 +4503,222 @@ msgstr ""
 "Sähköpostin lähetys ottamalla yhteyttä sähköpostipalvelimeen SMTP-"
 "protokollalla."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:168
 #, fuzzy
 msgid "Welcome response error: "
 msgstr "virhe tervetuloviestissä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:207
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Yhdistäminen SMTP-palvelimeen %s turvallisessa tilassa epäonnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:223
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:229
+#: ../camel/providers/smtp/camel-smtp-transport.c:236
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:241
+#: ../camel/providers/smtp/camel-smtp-transport.c:247
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Yhdistäminen SMTP-palvelimeen %s turvallisessa tilassa epäonnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:301
+#: ../camel/providers/smtp/camel-smtp-transport.c:349
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:304
+#: ../camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP postinvälitys %s:n kautta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:378
+#: ../camel/providers/smtp/camel-smtp-transport.c:426
 #, fuzzy, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP-palvelin %s ei tue pyydettyä tunnistautumismenetelmää %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:458
+#: ../camel/providers/smtp/camel-smtp-transport.c:508
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:488
-#: ../camel/providers/smtp/camel-smtp-transport.c:499
-#: ../camel/providers/smtp/camel-smtp-transport.c:512
+#: ../camel/providers/smtp/camel-smtp-transport.c:538
+#: ../camel/providers/smtp/camel-smtp-transport.c:549
+#: ../camel/providers/smtp/camel-smtp-transport.c:562
 msgid "AUTH command failed: "
 msgstr "AUTH-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Viestiä ei voi lähettää: palveluun ei ole yhteyttä."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:661
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voi lähettää: lähettäjän osoite on epäkelpo."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:665
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:690
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Viestiä ei voi lähettää: vastaanottajia ei ole määritelty."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Viestiä ei voi lähettää: yksi tai useampi viallinen vastaanottaja"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:807
+#: ../camel/providers/smtp/camel-smtp-transport.c:873
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksivirhe, tuntematon komento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:809
+#: ../camel/providers/smtp/camel-smtp-transport.c:875
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksivirhe parametreissa tai argumenteissa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:811
+#: ../camel/providers/smtp/camel-smtp-transport.c:877
 msgid "Command not implemented"
 msgstr "Komentoa ei ole toteutettu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:813
+#: ../camel/providers/smtp/camel-smtp-transport.c:879
 msgid "Command parameter not implemented"
 msgstr "Komennon parametria ei ole toteutettu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:815
+#: ../camel/providers/smtp/camel-smtp-transport.c:881
 msgid "System status, or system help reply"
 msgstr "Järjestelmän tila tai järjestelmän ohjevastaus"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:817
+#: ../camel/providers/smtp/camel-smtp-transport.c:883
 msgid "Help message"
 msgstr "Ohjeviesti"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:819
+#: ../camel/providers/smtp/camel-smtp-transport.c:885
 msgid "Service ready"
 msgstr "Palvelu valmis"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:821
+#: ../camel/providers/smtp/camel-smtp-transport.c:887
 msgid "Service closing transmission channel"
 msgstr "Palvelu sulkee siirtokanavaa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:823
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 msgid "Service not available, closing transmission channel"
 msgstr "Palvelu ei ole käytettävissä, suljetaan siirtokanava"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:825
+#: ../camel/providers/smtp/camel-smtp-transport.c:891
 msgid "Requested mail action okay, completed"
 msgstr "Pyydetty sähköpostikäsky ok, valmis"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:827
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 "Käyttäjä ei ole paikallinen, uudelleenohjaus osoitteeseen <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:829
+#: ../camel/providers/smtp/camel-smtp-transport.c:895
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Pyydettyä sähköpostikäskyä ei suoritettu: postilaatikko ei käytettävissä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:831
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Pyydettyä toimenpidettä ei suoritettu: postilaatikko ei käytettävissä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:833
+#: ../camel/providers/smtp/camel-smtp-transport.c:899
 msgid "Requested action aborted: error in processing"
 msgstr "Pyydetty toimenpide keskeytetty: virhe käsittelyssä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:835
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "User not local; please try <forward-path>"
 msgstr "Käyttäjä ei ole paikallinen: kokeile <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:837
+#: ../camel/providers/smtp/camel-smtp-transport.c:903
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Pyydettyä toimenpidettä ei suoritettu: järjestelmän levytila ei riitä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:839
+#: ../camel/providers/smtp/camel-smtp-transport.c:905
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Pyydettyä toimenpidettä ei suoritettu: varattu levytila ylitetty"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:841
+#: ../camel/providers/smtp/camel-smtp-transport.c:907
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "Pyydettyä toimenpidettä ei suoritettu: postilaatikon nimi ei ole sallittu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:843
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Aloita sähköpostin kirjoittaminen: lopeta <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../camel/providers/smtp/camel-smtp-transport.c:911
 msgid "Transaction failed"
 msgstr "Tapahtuma epäonnistui"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
 msgid "A password transition is needed"
 msgstr "Vaaditaan salasanatransaktio"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:851
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
 msgid "Authentication mechanism is too weak"
 msgstr "Todennusmenetelmä on liian heikko"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:853
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pyydetty todennusmenetelmä vaatii salausta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:855
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
 msgid "Temporary authentication failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../camel/providers/smtp/camel-smtp-transport.c:1178
 msgid "SMTP Greeting"
 msgstr "SMTP tervehdys"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#: ../camel/providers/smtp/camel-smtp-transport.c:1165
+#: ../camel/providers/smtp/camel-smtp-transport.c:1205
+#: ../camel/providers/smtp/camel-smtp-transport.c:1223
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
 msgid "HELO command failed: "
 msgstr "HELO-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1255
-#: ../camel/providers/smtp/camel-smtp-transport.c:1265
-#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:1306
+#: ../camel/providers/smtp/camel-smtp-transport.c:1321
+#: ../camel/providers/smtp/camel-smtp-transport.c:1331
 msgid "MAIL FROM command failed: "
-msgstr "Komento MAIL FROM epäonnistui"
+msgstr "MAIL FROM -komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1292
-#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:1358
 msgid "RCPT TO command failed: "
-msgstr "Komento RSET epäonnistui: %s"
+msgstr "RCPT TO -komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1309
-#: ../camel/providers/smtp/camel-smtp-transport.c:1319
-#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:1375
+#: ../camel/providers/smtp/camel-smtp-transport.c:1385
+#, c-format
 msgid "RCPT TO <%s> failed: "
-msgstr "RCPT TO <%s> epäonnistui"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1362
-#: ../camel/providers/smtp/camel-smtp-transport.c:1373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1384
-#: ../camel/providers/smtp/camel-smtp-transport.c:1443
-#: ../camel/providers/smtp/camel-smtp-transport.c:1463
-#: ../camel/providers/smtp/camel-smtp-transport.c:1477
-#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+msgstr "RCPT TO <%s> epäonnistui: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1428
+#: ../camel/providers/smtp/camel-smtp-transport.c:1439
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1509
+#: ../camel/providers/smtp/camel-smtp-transport.c:1529
+#: ../camel/providers/smtp/camel-smtp-transport.c:1543
+#: ../camel/providers/smtp/camel-smtp-transport.c:1552
 msgid "DATA command failed: "
 msgstr "DATA-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-#: ../camel/providers/smtp/camel-smtp-transport.c:1526
-#: ../camel/providers/smtp/camel-smtp-transport.c:1535
+#: ../camel/providers/smtp/camel-smtp-transport.c:1577
+#: ../camel/providers/smtp/camel-smtp-transport.c:1592
+#: ../camel/providers/smtp/camel-smtp-transport.c:1601
 msgid "RSET command failed: "
 msgstr "RSET-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1560
-#: ../camel/providers/smtp/camel-smtp-transport.c:1574
-#: ../camel/providers/smtp/camel-smtp-transport.c:1581
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1640
+#: ../camel/providers/smtp/camel-smtp-transport.c:1647
 msgid "QUIT command failed: "
 msgstr "QUIT-komento epäonnistui: "
 
@@ -4909,7 +4729,7 @@ msgstr "OID on jo olemassa"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
 msgid "Birthday and anniversary reminder"
-msgstr ""
+msgstr "Syntymä- ja juhlapäivien muistutin"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
 msgid "Whether to set a reminder for birthdays and anniversaries"
@@ -4935,8 +4755,8 @@ msgstr ""
 
 #: ../libebackend/e-authentication-mediator.c:205
 #: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:849
-#: ../libebackend/e-authentication-mediator.c:1179
+#: ../libebackend/e-authentication-mediator.c:852
+#: ../libebackend/e-authentication-mediator.c:1185
 msgid "Bus name vanished (client terminated?)"
 msgstr ""
 
@@ -4946,8 +4766,8 @@ msgstr ""
 
 #: ../libebackend/e-authentication-mediator.c:334
 #: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:843
-#: ../libebackend/e-authentication-mediator.c:1173
+#: ../libebackend/e-authentication-mediator.c:846
+#: ../libebackend/e-authentication-mediator.c:1179
 #, fuzzy
 msgid "Client cancelled the operation"
 msgstr "Toimenpidettä ei voitu perua"
@@ -4960,75 +4780,89 @@ msgstr ""
 msgid "Add this password to your keyring"
 msgstr ""
 
-#: ../libebackend/e-authentication-session.c:595
+#: ../libebackend/e-authentication-session.c:622
 msgid "Password was incorrect"
-msgstr ""
-
-#: ../libebackend/e-authentication-session.c:1331
-#: ../libebackend/e-authentication-session.c:1507
-#: ../libebackend/e-authentication-session.c:1690
-#, fuzzy
-msgid "Keyring operation was cancelled"
-msgstr "Toimenpide on peruttu"
+msgstr "Salasana oli väärin"
 
-#: ../libebackend/e-backend.c:190
+#: ../libebackend/e-backend.c:428
 #, fuzzy, c-format
 msgid "%s does not support authentication"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: ../libebackend/e-collection-backend.c:734
+#: ../libebackend/e-collection-backend.c:800
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr ""
 
-#: ../libebackend/e-collection-backend.c:793
+#: ../libebackend/e-collection-backend.c:859
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:126
+#: ../libebackend/e-data-factory.c:320
+#, fuzzy, c-format
+#| msgid "No backend name in source '%s'"
+msgid "No backend factory for hash key '%s'"
+msgstr "Taustapalvelun nimeä ei löydy lähteestä \"%s\""
+
+#: ../libebackend/e-server-side-source.c:134
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1111
+#: ../libebackend/e-server-side-source.c:1008
+#: ../libedataserver/e-source.c:1120
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:930
+#: ../libebackend/e-server-side-source.c:1022
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:958 ../libedataserver/e-source.c:1220
+#: ../libebackend/e-server-side-source.c:1050
+#: ../libedataserver/e-source.c:1227
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:972
+#: ../libebackend/e-server-side-source.c:1064
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:1285
+#: ../libebackend/e-server-side-source.c:1095
+#: ../libedataserver/e-source.c:1317
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990
+#, fuzzy, c-format
+msgid "Data source '%s' does not support OAuth 2.0 authentication"
+msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
+
+#: ../libebackend/e-server-side-source.c:1438
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr ""
 
-#: ../libebackend/e-source-registry-server.c:522
-#: ../libedataserver/e-source-registry.c:1523
+#: ../libebackend/e-source-registry-server.c:523
+#: ../libedataserver/e-source-registry.c:1625
 #, fuzzy
 msgid "The user declined to authenticate"
 msgstr "Tunnistautuminen epäonnistui.\n"
 
-#: ../libebackend/e-source-registry-server.c:770
+#: ../libebackend/e-source-registry-server.c:792
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr ""
 
+#: ../libebackend/e-user-prompter-server.c:303
+#, fuzzy, c-format
+#| msgid "Contact '%s' not found"
+msgid "Extension dialog '%s' not found."
+msgstr "Yhteystietoa \"%s\" ei löydy"
+
 #: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
@@ -5141,23 +4975,22 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: ../libedataserver/e-client.c:124
-#, fuzzy
+#: ../libedataserver/e-client.c:135
 msgid "Source not loaded"
-msgstr "URIa ei ole ladattu"
+msgstr "Lähdettä ei ole ladattu"
 
-#: ../libedataserver/e-client.c:126
-#, fuzzy
+#: ../libedataserver/e-client.c:137
 msgid "Source already loaded"
-msgstr "URI on jo ladattu"
+msgstr "Lähde on jo ladattu"
 
-#. Translators: This means that the EClient does not support offline mode, or
-#. * it's not set to by a user, thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:136
+#. Translators: This means that the EClient does not
+#. * support offline mode, or it's not set to by a user,
+#. * thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:148
 msgid "Offline unavailable"
 msgstr "Yhteydetön tila ei ole käytettävissä"
 
-#: ../libedataserver/e-client.c:158
+#: ../libedataserver/e-client.c:170
 msgid "D-Bus error"
 msgstr "D-Bus-virhe"
 
@@ -5182,19 +5015,19 @@ msgid "Authentication request"
 msgstr "Todennuspyyntö"
 
 #: ../libedataserver/e-source-authenticator.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the password for address book \"%s\"."
-msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
+msgstr "Anna osoitekirjan \"%s\" salasana."
 
 #: ../libedataserver/e-source-authenticator.c:194
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the password for calendar \"%s\"."
-msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
+msgstr "Anna kalenterin \"%s\" salasana."
 
 #: ../libedataserver/e-source-authenticator.c:200
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the password for mail account \"%s\"."
-msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
+msgstr "Anna sähköpostitilin \"%s\" salasana."
 
 #: ../libedataserver/e-source-authenticator.c:206
 #, fuzzy, c-format
@@ -5212,39 +5045,67 @@ msgid "Please enter the password for task list \"%s\"."
 msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
 
 #: ../libedataserver/e-source-authenticator.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the password for account \"%s\"."
-msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
+msgstr "Anna tilin \"%s\" salasana."
 
-#: ../libedataserver/e-source.c:621
+#: ../libedataserver/e-source.c:622
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr ""
 
-#: ../libedataserver/e-source.c:938
+#: ../libedataserver/e-source.c:943
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr ""
 
-#: ../libedataserver/e-source.c:1020
+#: ../libedataserver/e-source.c:1029
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr ""
 
-#: ../libedataserver/e-source.c:1408
+#: ../libedataserver/e-source.c:1523
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: ../libedataserver/e-source-mail-signature.c:485
+#: ../libedataserver/e-source-mail-signature.c:487
 #, c-format
 msgid "Signature script must be a local file"
 msgstr ""
 
+#: ../libedataserver/e-source-webdav.c:1529
+#, c-format
+msgid ""
+"SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+
+#: ../libedataserver/e-source-webdav.c:1538
+#, c-format
+msgid ""
+"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
+"wish to accept it?"
+msgstr ""
+
+#: ../libedataserver/e-source-webdav.c:1547
+#, c-format
+msgid ""
+"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+
+#: ../libedataserver/e-source-webdav.c:1556
+#, c-format
+msgid ""
+"SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1949
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %I.%M.%S %p"
 
@@ -5252,7 +5113,7 @@ msgstr "%a %d.%m.%Y %I.%M.%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1655 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
@@ -5260,7 +5121,7 @@ msgstr "%a %d.%m.%Y %H.%M.%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1660 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %I.%M %p"
 
@@ -5268,78 +5129,78 @@ msgstr "%a %d.%m.%Y %I.%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1665 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1683
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1675
+#: ../libedataserver/e-time-utils.c:1688
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1798
-#: ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811
+#: ../libedataserver/e-time-utils.c:1944
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1685
+#: ../libedataserver/e-time-utils.c:1698
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I.%M.%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1702
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H.%M.%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1707
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %I.%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1712
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1717
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1709
+#: ../libedataserver/e-time-utils.c:1722
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1712 ../libedataserver/e-time-utils.c:1801
+#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1993
+#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006
 msgid "%I:%M:%S %p"
 msgstr "%I.%M.%S %P"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1876 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
@@ -5347,25 +5208,25 @@ msgstr "%H.%M.%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1990
+#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003
 msgid "%I:%M %p"
 msgstr "%I.%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:1982
+#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1902
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1906
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5406,11 +5267,11 @@ msgstr ""
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
 msgid "Port number for HTTP requests"
-msgstr ""
+msgstr "Porttinumero HTTP-pyynnöille"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
 msgid "Port number to use for HTTP requests."
-msgstr ""
+msgstr "Porttinumero HTTP-pyynnöille."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
 #, fuzzy
@@ -5469,7 +5330,7 @@ msgstr ""
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
 msgid "Port number for SOCKS requests"
-msgstr ""
+msgstr "Porttinumero SOCKS-pyynnöille"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
 msgid "Port number to use for SOCKS requests."
@@ -5483,225 +5344,557 @@ msgstr "Automaattisen välipalvelinmäärittelyn URL"
 msgid "Where to read automatic proxy configuration from."
 msgstr ""
 
-#: ../libedataserverui/e-categories-editor.c:230
-msgid "Currently _used categories:"
-msgstr ""
-
-#: ../libedataserverui/e-categories-editor.c:239
-msgid "_Available Categories:"
-msgstr "_Saatavilla olevat luokat:"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:132
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365
+#, fuzzy, c-format
+#| msgid "No such source for UID '%s'"
+msgid "No such data source for UID '%s'"
+msgstr "Lähdettä, jonka UID on \"%s\", ei löydy"
 
-#: ../libedataserverui/e-categories-selector.c:325
-msgid "Icon"
-msgstr "Kuvake"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:144
+#, c-format
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain a password for '%s'"
+msgstr ""
 
-#: ../libedataserverui/e-categories-selector.c:330
-msgid "Category"
-msgstr "Luokka"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:216
+#, fuzzy, c-format
+msgid "Invalid password for '%s'"
+msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../libedataserverui/e-category-completion.c:300
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:223
 #, c-format
-msgid "Create category \"%s\""
-msgstr "Luo luokka \"%s\""
+msgid "Code: %u - Unexpected response from server"
+msgstr "Koodi: %u - Odottamaton vastaus palvelimelta"
 
-#: ../libedataserverui/e-category-editor.c:137
-msgid "Category Icon"
-msgstr "Luokan kuvake"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:244
+#, fuzzy, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "Viestiä ei voitu hakea."
 
-#: ../libedataserverui/e-category-editor.c:141
-msgid "_No Image"
-msgstr "_Ei kuvaa"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:253
+#, fuzzy, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "Tiedon koodaus epäonnistui"
 
-#: ../libedataserverui/e-category-editor.c:178
-msgid "Category _Name"
-msgstr "Luokan _nimi"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:265
+#, fuzzy, c-format
+msgid "Failed to find Response element"
+msgstr "Tiedon koodaus epäonnistui"
 
-#: ../libedataserverui/e-category-editor.c:186
-msgid "Category _Icon"
-msgstr "Luokan _kuvake"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:277
+#, fuzzy, c-format
+msgid "Failed to find Account element"
+msgstr "Tiedon koodaus epäonnistui"
 
-#: ../libedataserverui/e-category-editor.c:226
-msgid "Category Properties"
-msgstr "Luokan ominaisuudet"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:291
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr ""
 
-#: ../libedataserverui/e-category-editor.c:287
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1237
 #, c-format
 msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "Luokka \"%s\" on jo määritelty konfiguraatiossa. Käytä toista nimeä"
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an access token for '%s'"
+msgstr ""
+
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1264
+#, fuzzy, c-format
+#| msgid "Failed to open addressbook at '%s': %s"
+msgid "Failed to obtain an access token for '%s': "
+msgstr "Osoitekirjan avaaminen kohteessa \"%s\" epäonnistui: %s"
+
+#: ../modules/google-backend/module-google-backend.c:140
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: ../modules/google-backend/module-google-backend.c:217
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+msgid "Contacts"
+msgstr "Yhteystiedot"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Show Contacts"
-msgstr "Näytä yhteystiedot"
+#: ../modules/trust-prompt/certificate-viewer.c:292
+#| msgid "Cannot add encryption certificate"
+msgid "Not part of certificate"
+msgstr "Ei osa varmennetta"
 
-#: ../libedataserverui/e-name-selector-dialog.c:300
-msgid "Address B_ook:"
-msgstr "_Osoitekirja:"
+#: ../modules/trust-prompt/certificate-viewer.c:600
+msgid "This certificate has been verified for the following uses:"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../modules/trust-prompt/certificate-viewer.c:604
+#: ../modules/trust-prompt/e-asn1-object.c:387
 #, fuzzy
-msgid "Cat_egory:"
-msgstr "L_uokka:"
+#| msgid "X.509 Certificate"
+msgid "SSL Client Certificate"
+msgstr "X.509-varmenne"
 
-#: ../libedataserverui/e-name-selector-dialog.c:332
-msgid "_Search:"
-msgstr "_Etsi:"
+#: ../modules/trust-prompt/certificate-viewer.c:609
+#: ../modules/trust-prompt/e-asn1-object.c:391
+#, fuzzy
+#| msgid "X.509 Certificate"
+msgid "SSL Server Certificate"
+msgstr "X.509-varmenne"
 
-#: ../libedataserverui/e-name-selector-dialog.c:357
-#: ../libedataserverui/e-name-selector-dialog.c:1182
-msgid "Any Category"
-msgstr "Mikä tahansa luokka"
+#: ../modules/trust-prompt/certificate-viewer.c:614
+msgid "Email Signer Certificate"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:359
-msgid "Co_ntacts"
-msgstr "Y_hteystiedot"
+#: ../modules/trust-prompt/certificate-viewer.c:619
+#, fuzzy
+#| msgid "Cannot add encryption certificate"
+msgid "Email Recipient Certificate"
+msgstr "Salausvarmennetta ei voi lisätä"
 
-#: ../libedataserverui/e-name-selector-dialog.c:421
-msgid "Search"
-msgstr "Etsi"
+#: ../modules/trust-prompt/certificate-viewer.c:634
+msgid "Issued To"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:424
-msgid "Address Book"
-msgstr "Osoitekirja"
+#: ../modules/trust-prompt/certificate-viewer.c:635
+#: ../modules/trust-prompt/certificate-viewer.c:641
+msgid "Common Name (CN)"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:427
-#: ../modules/google-backend/module-google-backend.c:183
-msgid "Contacts"
-msgstr "Yhteystiedot"
+#: ../modules/trust-prompt/certificate-viewer.c:636
+#: ../modules/trust-prompt/certificate-viewer.c:642
+#, fuzzy
+#| msgid "Organization"
+msgid "Organization (O)"
+msgstr "Organisaatio"
 
-#: ../libedataserverui/e-name-selector-dialog.c:545
-msgid "Select Contacts from Address Book"
-msgstr "Valitse yhteystiedot osoitekirjasta"
+#: ../modules/trust-prompt/certificate-viewer.c:637
+#: ../modules/trust-prompt/certificate-viewer.c:643
+#, fuzzy
+#| msgid "Organizational Unit"
+msgid "Organizational Unit (OU)"
+msgstr "Organisaatioyksikkö"
 
-#: ../libedataserverui/e-name-selector-dialog.c:917
-msgid "_Add"
-msgstr "_Lisää"
+#: ../modules/trust-prompt/certificate-viewer.c:638
+#: ../modules/trust-prompt/e-asn1-object.c:134
+msgid "Serial Number"
+msgstr "Sarjanumero"
 
-#: ../libedataserverui/e-name-selector-dialog.c:921
-msgid "_Remove"
-msgstr "_Poista"
+#: ../modules/trust-prompt/certificate-viewer.c:640
+msgid "Issued By"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:1097
-#, c-format
-msgid "Error loading address book: %s"
-msgstr "Virhe osoitekirjaa ladattaessa: %s"
+#: ../modules/trust-prompt/certificate-viewer.c:645
+msgid "Validity"
+msgstr ""
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:3043
-#, c-format
-msgid "E_xpand %s Inline"
-msgstr "L_aajenna %s sisäkkäisesti"
+#: ../modules/trust-prompt/certificate-viewer.c:646
+msgid "Issued On"
+msgstr "Myönnetty"
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3059
-#, c-format
-msgid "Cop_y %s"
-msgstr "_Kopioi %s"
+#: ../modules/trust-prompt/certificate-viewer.c:647
+msgid "Expires On"
+msgstr "Vanhenee"
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3070
-#, c-format
-msgid "C_ut %s"
-msgstr "_Leikkaa %s"
+#: ../modules/trust-prompt/certificate-viewer.c:649
+msgid "Fingerprints"
+msgstr "Sormenjäljet"
+
+#: ../modules/trust-prompt/certificate-viewer.c:650
+msgid "SHA1 Fingerprint"
+msgstr "SHA1-sormenjälki"
+
+#: ../modules/trust-prompt/certificate-viewer.c:651
+msgid "MD5 Fingerprint"
+msgstr "MD5-sormenjälki"
+
+#: ../modules/trust-prompt/certificate-viewer.c:653
+msgid "General"
+msgstr "Yleiset"
+
+#: ../modules/trust-prompt/certificate-viewer.c:672
+#| msgid "Certificate import failed"
+msgid "Certificate Hierarchy"
+msgstr "Varmenteen hierarkia"
+
+#: ../modules/trust-prompt/certificate-viewer.c:676
+#| msgid "Certificate import failed"
+msgid "Certificate Fields"
+msgstr "Varmenteen kentät"
+
+#: ../modules/trust-prompt/certificate-viewer.c:680
+msgid "Field Value"
+msgstr "Kentän arvo"
+
+#: ../modules/trust-prompt/certificate-viewer.c:682
+msgid "Details"
+msgstr "Tiedot"
+
+#: ../modules/trust-prompt/e-asn1-object.c:95
+msgid "Version"
+msgstr "Versio"
+
+#: ../modules/trust-prompt/e-asn1-object.c:110
+msgid "Version 1"
+msgstr "Versio 1"
+
+#: ../modules/trust-prompt/e-asn1-object.c:113
+msgid "Version 2"
+msgstr "Versio 2"
+
+#: ../modules/trust-prompt/e-asn1-object.c:116
+msgid "Version 3"
+msgstr "Versio 3"
+
+#: ../modules/trust-prompt/e-asn1-object.c:192
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:3088
+#: ../modules/trust-prompt/e-asn1-object.c:195
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:198
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:201
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:204
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:207
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:234
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:237
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Key Usage"
+msgstr "Varmenteen tuonti epäonnistui"
+
+#: ../modules/trust-prompt/e-asn1-object.c:240
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:243
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Authority Key Identifier"
+msgstr "Varmenteen tuonti epäonnistui"
+
+#: ../modules/trust-prompt/e-asn1-object.c:255
 #, c-format
-msgid "_Edit %s"
-msgstr "_Muokkaa %s"
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:306
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:314
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:336
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:341
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:356
+msgid "Subject's Public Key"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:378
+#: ../modules/trust-prompt/e-asn1-object.c:428
+#, fuzzy
+#| msgid "Unable to process spool folder"
+msgid "Error: Unable to process extension"
+msgstr "Saapuvien viestien kansiota ei voitu käsitellä"
+
+#: ../modules/trust-prompt/e-asn1-object.c:395
+#| msgid "Email 1"
+msgid "Email"
+msgstr "Sähköposti"
+
+#: ../modules/trust-prompt/e-asn1-object.c:399
+#: ../modules/trust-prompt/e-asn1-object.c:411
+msgid "Object Signer"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:403
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "SSL Certificate Authority"
+msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../libedataserverui/e-name-selector-list.c:532
+#: ../modules/trust-prompt/e-asn1-object.c:407
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:436
+#, fuzzy
+#| msgid "Signing message"
+msgid "Signing"
+msgstr "Allekirjoitetaan viestiä"
+
+#: ../modules/trust-prompt/e-asn1-object.c:440
+msgid "Non-repudiation"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:444
+msgid "Key Encipherment"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:448
+msgid "Data Encipherment"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:452
+msgid "Key Agreement"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:456
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Signer"
+msgstr "Varmenteen tuonti epäonnistui"
+
+#: ../modules/trust-prompt/e-asn1-object.c:460
+msgid "CRL Signer"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:509
+msgid "Critical"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:511
+#: ../modules/trust-prompt/e-asn1-object.c:514
+msgid "Not Critical"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:535
+msgid "Extensions"
+msgstr ""
+
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../modules/trust-prompt/e-asn1-object.c:615
 #, c-format
-msgid "_Delete %s"
-msgstr "_Poista %s"
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../modules/trust-prompt/e-asn1-object.c:658
+#| msgid "X.509 Certificate"
+msgid "Certificate"
+msgstr "Varmenne"
 
-#: ../libedataserverui/e-passwords.c:126
-msgid "Keyring key is unusable: no user or host name"
+#: ../modules/trust-prompt/e-asn1-object.c:674
+#: ../modules/trust-prompt/e-asn1-object.c:812
+#, fuzzy
+#| msgid "Signature algorithm unknown"
+msgid "Certificate Signature Algorithm"
+msgstr "Allekirjoituksen algoritmi on tuntematon"
+
+#: ../modules/trust-prompt/e-asn1-object.c:683
+msgid "Issuer"
+msgstr "Myöntäjä"
+
+#: ../modules/trust-prompt/e-asn1-object.c:714
+msgid "Subject"
 msgstr ""
-"Avainrenkaan avain ei ole käyttökelpoinen: ei ole käyttäjä tai verkkonimi"
 
-#: ../libedataserverui/e-passwords.c:701
-#: ../libedataserverui/e-passwords-win32.c:614
-msgid "You have the Caps Lock key on."
-msgstr "CapsLock-näppäin on päällä."
+#: ../modules/trust-prompt/e-asn1-object.c:738
+#, fuzzy
+#| msgid "Unique ID"
+msgid "Issuer Unique ID"
+msgstr "Yksilöllinen tunniste"
 
-#: ../libedataserverui/e-passwords.c:821
-#: ../libedataserverui/e-passwords-win32.c:737
-msgid "_Remember this passphrase"
-msgstr "_Muista tämä salasana"
+#: ../modules/trust-prompt/e-asn1-object.c:757
+#, fuzzy
+#| msgid "Unique ID"
+msgid "Subject Unique ID"
+msgstr "Yksilöllinen tunniste"
 
-#: ../libedataserverui/e-passwords.c:822
-#: ../libedataserverui/e-passwords-win32.c:738
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "_Muista salasana tämän istunnon loppuun asti"
+#: ../modules/trust-prompt/e-asn1-object.c:818
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Signature Value"
+msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../libedataserverui/e-passwords.c:827
-#: ../libedataserverui/e-passwords-win32.c:743
-msgid "_Remember this password"
-msgstr "_Muista tämä salasana"
+#: ../modules/trust-prompt/module-trust-prompt.c:201
+#, fuzzy
+#| msgid "Signing certificate not found"
+msgid "The signing certificate authority is not known."
+msgstr "Allekirjoitusvarmennetta ei löytynyt"
 
-#: ../libedataserverui/e-passwords.c:828
-#: ../libedataserverui/e-passwords-win32.c:744
-msgid "_Remember this password for the remainder of this session"
-msgstr "Muista salasana tämän istunnon loppuun asti"
+#: ../modules/trust-prompt/module-trust-prompt.c:203
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
 
-#: ../libedataserverui/e-source-selector-dialog.c:224
-msgid "_Destination"
-msgstr "_Kohde"
+#: ../modules/trust-prompt/module-trust-prompt.c:205
+msgid "The certificate's activation time is still in the future."
+msgstr "Varmenteen aktivointiaika on tulevaisuudessa."
 
-#: ../libedataserverui/e-source-selector-dialog.c:326
-msgid "Select destination"
-msgstr "Valitse kohde"
+#: ../modules/trust-prompt/module-trust-prompt.c:207
+#| msgid "The referenced credentials have expired."
+msgid "The certificate has expired."
+msgstr "Varmenne on vanhentunut."
 
-#: ../modules/google-backend/module-google-backend.c:118
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+#: ../modules/trust-prompt/module-trust-prompt.c:209
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
+msgstr ""
+
+#: ../modules/trust-prompt/module-trust-prompt.c:211
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:162
 #, fuzzy
-msgid "Calendar"
-msgstr "Kalenterin URL"
+#| msgid "Signing certificate not trusted"
+msgid "Certificate trust..."
+msgstr "Allekirjoitusvarmenteeseen ei luoteta"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:184
+#: ../modules/trust-prompt/trust-prompt-gtk.c:163
+#| msgid "X.509 Certificate"
+msgid "_View Certificate"
+msgstr "_Näytä varmenne"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+msgid "_Reject"
+msgstr "_Hylkää"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+msgid "Accept _Temporarily"
+msgstr "Hyväksy _väliaikaisesti"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+msgid "_Accept Permanently"
+msgstr "_Hyväksy pysyvästi"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:203
 #, c-format
-msgid "Code: %u - Unexpected response from server"
-msgstr "Koodi: %u - Odottamaton vastaus palvelimelta"
+msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr "SSL-varmenne '%s' ei ole luotettu. Haluatko hyväksyä sen?"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:205
-#, fuzzy, c-format
-msgid "Failed to parse autodiscover response XML"
-msgstr "Viestiä ei voitu hakea."
+#: ../modules/trust-prompt/trust-prompt-gtk.c:209
+msgid "Detailed information about the certificate:"
+msgstr "Varmenteen yksityiskohtaiset tiedot:"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:214
-#, fuzzy, c-format
-msgid "Failed to find Autodiscover element"
-msgstr "Tiedon koodaus epäonnistui"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:223
+msgid "Issuer:"
+msgstr "Myöntäjä:"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:226
-#, fuzzy, c-format
-msgid "Failed to find Response element"
-msgstr "Tiedon koodaus epäonnistui"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:224
+msgid "Subject:"
+msgstr ""
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:238
-#, fuzzy, c-format
-msgid "Failed to find Account element"
-msgstr "Tiedon koodaus epäonnistui"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:225
+msgid "Fingerprint:"
+msgstr "Sormenjälki:"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:252
+#: ../modules/trust-prompt/trust-prompt-gtk.c:226
+msgid "Reason:"
+msgstr "Syy:"
+
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
+msgid "Integrate your calendars"
+msgstr "Integroi kalenterisi"
+
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
+msgid "Integrate your contacts"
+msgstr "Integroi yhteystietosi"
+
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257
+msgid "Signon service did not return a secret"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
+msgid "Google Calendar"
+msgstr "Google-kalenteri"
+
+#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
+#| msgctxt "CategoryName"
+#| msgid "Hot Contacts"
+msgid "Google Contacts"
+msgstr "Google-yhteystiedot"
+
+#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
+#| msgid "Mailer"
+msgid "GMail"
+msgstr "GMail"
+
+#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
+#| msgid "Mailer"
+msgid "Mail"
+msgstr "Sähköposti"
+
+#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
+msgid "Integrate your mailboxes"
+msgstr "Integroi postilaatikkosi"
+
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971
 #, c-format
-msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgid ""
+"Cannot find a corresponding account service in the accounts database from "
+"which to obtain an access token for '%s'"
 msgstr ""
 
-#: ../modules/yahoo-backend/module-yahoo-backend.c:215
-msgid "Tasks"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:79
+#, c-format
+msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
 msgstr ""
 
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:96
+#, fuzzy
+#| msgid "Error parsing filter: %s: %s"
+msgid "Error parsing response as JSON: "
+msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:112
+msgid "Didn't find email member in JSON data"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
+msgid "Yahoo! Calendar"
+msgstr "Yahoo!-kalenteri"
+
+#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
+msgid "Yahoo! Mail"
+msgstr "Yahoo!-sähköposti"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:227
+msgid "Tasks"
+msgstr "Tehtävät"
+
 #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
 #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:31
 msgid "Keep running after the last client is closed"
 msgstr ""
 
@@ -5710,22 +5903,385 @@ msgstr ""
 msgid "Wait running until at least one client is connected"
 msgstr ""
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:620
-msgid "Evolution Source Viewer"
+#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1
+msgid "Birthdays & Anniversaries"
+msgstr "Syntymä- ja juhlapäivät"
+
+#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1
+msgid "Google"
+msgstr "Google"
+
+#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
+#| msgid "IMAP server %s"
+msgid "On LDAP Servers"
+msgstr "LDAP-palvelimilla"
+
+#: ../services/evolution-source-registry/builtin/local.source.in.h:1
+#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1
+msgid "On This Computer"
+msgstr "Tällä tietokoneella"
+
+#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1
+#, fuzzy
+#| msgid "Folders"
+msgid "Search Folders"
+msgstr "Kansiot"
+
+#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1
+#| msgid "Weather: Fog"
+msgid "Weather"
+msgstr "Sää"
+
+#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
+msgid "On The Web"
+msgstr "Verkossa"
+
+#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+msgid "_Dismiss"
 msgstr ""
 
-#. Translators: The name that is displayed in the user interface
-#: ../tests/libedataserverui/evolution-source-viewer.c:650
-msgid "Display Name"
-msgstr "Näkyvä nimi"
+#~ msgid "Failed to build summary for an address book %s"
+#~ msgstr "Yhteenvedon luominen osoitekirjalle %s epäonnistui."
+
+#~ msgid "Using Distinguished Name (DN)"
+#~ msgstr "Käytetään yksilöllöistä nimeä (DN)"
+
+#~ msgid "Using Email Address"
+#~ msgstr "Käytetään sähköpostiosoitetta"
+
+#, fuzzy
+#~ msgid "Failed to run book factory"
+#~ msgstr "Tiedon koodaus epäonnistui"
+
+#, fuzzy
+#~ msgid "Cannot get connection to view"
+#~ msgstr "Kansion %s säiliötä ei voitu hakea"
+
+#, fuzzy
+#~ msgid "Empty query: "
+#~ msgstr "Tyhjä kysely"
+
+#~ msgid "Cannot remove book: "
+#~ msgstr "Kirjan poistaminen epäonnistui: "
+
+#, fuzzy
+#~ msgid "Cannot get backend property: "
+#~ msgstr "Viestiä ei voi luoda: %s"
+
+#~ msgid "Invalid backend name '%s' in source '%s'"
+#~ msgstr "Virheellinen taustapalvelun nimi \"%s\" lähteessä \"%s\""
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:659
-msgid "Flags"
-msgstr "Tunnisteet"
+#~ msgid "Cannot create local store"
+#~ msgstr "Paikallisen tallennustilan luominen epäonnistui"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:711
-msgid "Identity"
-msgstr "Henkilöllisyys"
+#, fuzzy
+#~ msgid "Could not create synch slave thread"
+#~ msgstr "Välimuistitiedostoa ei voitu luoda"
+
+#, fuzzy
+#~ msgid "Failed to run calendar factory"
+#~ msgstr "Tiedon koodaus epäonnistui"
+
+#, fuzzy
+#~ msgid "Cannot process, calendar backend is opening"
+#~ msgstr "Kalenteria ei voi päivittää"
+
+#~ msgid "Cannot remove calendar: "
+#~ msgstr "Kalenterin poisto epäonnistui: "
+
+#, fuzzy
+#~ msgid "Invalid call"
+#~ msgstr "Virheellinen alue"
+
+#, fuzzy
+#~ msgid ""
+#~ "   Issuer:       %s\n"
+#~ "   Subject:      %s\n"
+#~ "   Fingerprint:  %s\n"
+#~ "   Signature:    %s"
+#~ msgstr ""
+#~ "Myöntäjä:          %s\n"
+#~ "Aihe:              %s\n"
+#~ "Sormenjälki:       %s\n"
+#~ "Allekirjoitus:     %s"
+
+#~ msgid "GOOD"
+#~ msgstr "HYVÄKSYTTY"
+
+#~ msgid "BAD"
+#~ msgstr "VIRHEELLINEN"
+
+#~ msgid ""
+#~ "Certificate problem: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Ongelma varmenteessa: %s\n"
+#~ "Myöntäjä: %s"
+
+#~ msgid ""
+#~ "Bad certificate domain: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Virheellinen varmenteen alue: %s\n"
+#~ "Myöntäjä %s"
+
+#~ msgid ""
+#~ "Certificate expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Varmenne vanhentunut: %s\n"
+#~ "Myöntäjä: %s"
+
+#~ msgid ""
+#~ "Certificate revocation list expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Varmenteiden hylkäyslista vanhentunut: %s\n"
+#~ "Myöntäjä: %s"
+
+#~ msgid "No output stream"
+#~ msgstr "Ei tulosvirtaa"
+
+#~ msgid "No input stream"
+#~ msgstr "Ei syötevirtaa"
+
+#~ msgid "Server unexpectedly disconnected: %s"
+#~ msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Alert from IMAP server %s %s in folder %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hälytys IMAP-palvelimelta %s %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hälytys IMAP-palvelimelta %s %s:\n"
+#~ "%s"
+
+#~ msgid "Unexpected response from IMAP server: %s"
+#~ msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
+
+#~ msgid "IMAP command failed: %s"
+#~ msgstr "IMAP-komento epäonnistui: %s"
+
+#~ msgid "Server response ended too soon."
+#~ msgstr "Palvelimen vastaus päättyi liian äkkiä."
+
+#~ msgid "IMAP server response did not contain %s information"
+#~ msgstr "IMAP-palvelimen vaste ei sisältänyt tietoja %s:stä"
+
+#~ msgid "Unexpected OK response from IMAP server: %s"
+#~ msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
+
+#, fuzzy
+#~ msgid "Always check for _new mail in this folder"
+#~ msgstr "Etsi aina uusia viestejä tästä kansiosta"
+
+#~ msgid "Could not create directory %s: %s"
+#~ msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#~ msgid "Could not load summary for %s"
+#~ msgstr "Yhteenvetoa %s:lle ei voitu ladata"
+
+#~ msgid "Scanning for changed messages in %s"
+#~ msgstr "Etsitään muuttuneita viestejä kansiosta %s"
+
+#~ msgid "Fetching summary information for new messages in %s"
+#~ msgstr "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
+
+#~ msgid "Incomplete server response: no information provided for message %d"
+#~ msgstr ""
+#~ "Epätäydellinen vastaus palvelimelta: viestille %d ei löytynyt mitään "
+#~ "tietoja"
+
+#~ msgid "Incomplete server response: no UID provided for message %d"
+#~ msgstr ""
+#~ "Epätäydellinen vastaus palvelimelta: Viestille %d ei löytynyt UID:ia"
+
+#~ msgid "Could not find message body in FETCH response."
+#~ msgstr "Viestin runkoa ei löytynyt FETCH-vastauksesta"
+
+#, fuzzy
+#~ msgid "Could not open cache directory: "
+#~ msgstr "Välimuistihakemistoa ei voitu avata: %s"
+
+#~ msgid "Failed to cache message %s: %s"
+#~ msgstr "Viestin %s tallennus välimuistiin epäonnistui: %s"
+
+#, fuzzy
+#~ msgid "Failed to cache message %s: "
+#~ msgstr "Viestin %s tallennus välimuistiin epäonnistui: %s"
+
+#, fuzzy
+#~ msgid "Failed to cache %s: "
+#~ msgstr "Välimuistiin tallennus epäonnistui %s: %s"
+
+#, fuzzy
+#~ msgid "Names_pace:"
+#~ msgstr "Nimiavaruus:"
+
+#~ msgid "IMAP default port"
+#~ msgstr "IMAPin oletusportti"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#, fuzzy
+#~ msgid "Retrieving list of folders at '%s'"
+#~ msgstr "Valmistellaan kansiota \"%s\" yhteydettömään tilaan"
+
+#~ msgid "Server unexpectedly disconnected"
+#~ msgstr "Palvelin katkaisi yhteyden odottamatta"
+
+#, fuzzy
+#~ msgid "Server unexpectedly disconnected: "
+#~ msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
+
+#, fuzzy
+#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot"
+#~ msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
+
+#, fuzzy
+#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+#~ msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
+
+#~ msgid "Could not connect to POP server %s"
+#~ msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+
+#, fuzzy
+#~ msgid "Keyring operation was cancelled"
+#~ msgstr "Toimenpide on peruttu"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "_Saatavilla olevat luokat:"
+
+#~ msgid "Icon"
+#~ msgstr "Kuvake"
+
+#~ msgid "Category"
+#~ msgstr "Luokka"
+
+#~ msgid "Create category \"%s\""
+#~ msgstr "Luo luokka \"%s\""
+
+#~ msgid "Category Icon"
+#~ msgstr "Luokan kuvake"
+
+#~ msgid "_No Image"
+#~ msgstr "_Ei kuvaa"
+
+#~ msgid "Category _Name"
+#~ msgstr "Luokan _nimi"
+
+#~ msgid "Category _Icon"
+#~ msgstr "Luokan _kuvake"
+
+#~ msgid "Category Properties"
+#~ msgstr "Luokan ominaisuudet"
+
+#~ msgid ""
+#~ "There is already a category '%s' in the configuration. Please use another "
+#~ "name"
+#~ msgstr "Luokka \"%s\" on jo määritelty konfiguraatiossa. Käytä toista nimeä"
+
+#~ msgid "Show Contacts"
+#~ msgstr "Näytä yhteystiedot"
+
+#~ msgid "Address B_ook:"
+#~ msgstr "_Osoitekirja:"
+
+#, fuzzy
+#~ msgid "Cat_egory:"
+#~ msgstr "L_uokka:"
+
+#~ msgid "_Search:"
+#~ msgstr "_Etsi:"
+
+#~ msgid "Any Category"
+#~ msgstr "Mikä tahansa luokka"
+
+#~ msgid "Co_ntacts"
+#~ msgstr "Y_hteystiedot"
+
+#~ msgid "Search"
+#~ msgstr "Etsi"
+
+#~ msgid "Address Book"
+#~ msgstr "Osoitekirja"
+
+#~ msgid "Select Contacts from Address Book"
+#~ msgstr "Valitse yhteystiedot osoitekirjasta"
+
+#~ msgid "_Add"
+#~ msgstr "_Lisää"
+
+#~ msgid "_Remove"
+#~ msgstr "_Poista"
+
+#~ msgid "Error loading address book: %s"
+#~ msgstr "Virhe osoitekirjaa ladattaessa: %s"
+
+#~ msgid "E_xpand %s Inline"
+#~ msgstr "L_aajenna %s sisäkkäisesti"
+
+#~ msgid "Cop_y %s"
+#~ msgstr "_Kopioi %s"
+
+#~ msgid "C_ut %s"
+#~ msgstr "_Leikkaa %s"
+
+#~ msgid "_Edit %s"
+#~ msgstr "_Muokkaa %s"
+
+#~ msgid "_Delete %s"
+#~ msgstr "_Poista %s"
+
+#~ msgid "Keyring key is unusable: no user or host name"
+#~ msgstr ""
+#~ "Avainrenkaan avain ei ole käyttökelpoinen: ei ole käyttäjä tai verkkonimi"
+
+#~ msgid "You have the Caps Lock key on."
+#~ msgstr "CapsLock-näppäin on päällä."
+
+#~ msgid "_Remember this passphrase"
+#~ msgstr "_Muista tämä salasana"
+
+#~ msgid "_Remember this passphrase for the remainder of this session"
+#~ msgstr "_Muista salasana tämän istunnon loppuun asti"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Muista tämä salasana"
+
+#~ msgid "_Remember this password for the remainder of this session"
+#~ msgstr "Muista salasana tämän istunnon loppuun asti"
+
+#~ msgid "_Destination"
+#~ msgstr "_Kohde"
+
+#~ msgid "Select destination"
+#~ msgstr "Valitse kohde"
+
+#~ msgid "Display Name"
+#~ msgstr "Näkyvä nimi"
+
+#~ msgid "Flags"
+#~ msgstr "Tunnisteet"
+
+#~ msgid "Identity"
+#~ msgstr "Henkilöllisyys"
 
 #, fuzzy
 #~ msgid "Authenticating with the server…"
@@ -5735,9 +6291,6 @@ msgstr "Henkilöllisyys"
 #~ msgid "%s: there was no source for UID '%s' stored in GConf."
 #~ msgstr "%s: gconf ei sisältänyt lähdettä uid:ille \"%s\""
 
-#~ msgid "On This Computer"
-#~ msgstr "Tällä tietokoneella"
-
 #~ msgid "Invalid source"
 #~ msgstr "Virheellinen lähde"
 


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