[evolution-data-server] Updated Finnish translation



commit 0e8309e249a2a146ee75663cfe48fe47acd94db9
Author: Timo Jyrinki <timo jyrinki iki fi>
Date:   Wed Sep 26 11:37:13 2012 +0300

    Updated Finnish translation

 po/fi.po | 4451 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 2507 insertions(+), 1944 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index f851690..cb69d4b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,19 +4,20 @@
 # 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
 msgid ""
 msgstr ""
-""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n";
-"POT-Creation-Date: 2012-02-23 12:45+0000\n"
-"PO-Revision-Date: 2012-03-12 08:36:52+0000\n"
-"Last-Translator: Jiri GrÃnroos <Unknown>\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"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,201 +25,253 @@ msgstr ""
 "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:129
+#: ../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:939
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:931
 #: ../addressbook/libebook/e-book-client.c:106
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:577
-#: ../calendar/backends/http/e-cal-backend-http.c:424
-#: ../calendar/libecal/e-cal.c:4596 ../calendar/libecal/e-cal-client.c:150
-#: ../camel/providers/imap/camel-imap-command.c:515
-#: ../camel/providers/imap/camel-imap-store.c:464
-#: ../camel/providers/imapx/camel-imapx-command.c:538
-#: ../libedataserver/e-client.c:166
+#: ../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"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:154
-#, c-format, fuzzy
+#: ../addressbook/backends/file/e-book-backend-file.c:141
+#, c-format
 msgid "Failed to remove file '%s': %s"
-msgstr "Lapsiprosessin \"%s\" luominen epÃonnistui: %s"
+msgstr "Tiedoston \"%s\" poistaminen epÃonnistui: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:177
-#, c-format, fuzzy
+#: ../addressbook/backends/file/e-book-backend-file.c:164
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:616
+#, c-format
 msgid "Failed to make directory %s: %s"
-msgstr "Hakemistoa %s ei voitu luoda: %s"
+msgstr "Kansion \"%s\" luominen epÃonnistui: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:472
-#, c-format, fuzzy
+#: ../addressbook/backends/file/e-book-backend-file.c:459
+#, 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:574
-#: ../addressbook/backends/file/e-book-backend-file.c:1129
+#: ../addressbook/backends/file/e-book-backend-file.c:561
+#: ../addressbook/backends/file/e-book-backend-file.c:1127
 msgid "No UID in the contact"
-msgstr ""
+msgstr "UID puuttuu yhteystiedosta"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1563
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516
+#: ../addressbook/backends/file/e-book-backend-file.c:1569
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1566
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518
+#: ../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
 msgid "Searching..."
 msgstr "EtsitÃÃn..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2108
+#: ../addressbook/backends/file/e-book-backend-file.c:2115
 #, c-format
 msgid "Failed to build summary for an address book %s"
-msgstr ""
+msgstr "Yhteenvedon luominen osoitekirjalle %s epÃonnistui."
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:874
+#: ../addressbook/backends/google/e-book-backend-google.c:645
 msgid "Querying for updated contactsâ"
-msgstr ""
-
-#: ../addressbook/backends/google/e-book-backend-google.c:923
-#: ../addressbook/libebook/e-book.c:3531 ../calendar/libecal/e-cal.c:1380
-#: ../libedataserver/e-client.c:1920
-msgid "Personal"
-msgstr "HenkilÃkohtainen"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:925
-#, fuzzy
-msgid "Friends"
-msgstr "Suosikit"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:927
-#, fuzzy
-msgid "Family"
-msgstr "Sukunimi"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:929
-msgid "Coworkers"
-msgstr ""
+msgstr "Haetaan pÃivittyneità yhteystietoja..."
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1019
+#: ../addressbook/backends/google/e-book-backend-google.c:782
 msgid "Querying for updated groupsâ"
-msgstr ""
+msgstr "Haetaan pÃivittyneità ryhmiÃ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1424
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1639
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:295
+#: ../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
 msgid "The backend does not support bulk additions"
-msgstr ""
+msgstr "Taustapalvelu ei tue massalisÃyksiÃ"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1451
+#: ../addressbook/backends/google/e-book-backend-google.c:1234
 msgid "Creating new contactâ"
-msgstr ""
+msgstr "Luodaan uutta yhteystietoa..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1540
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
+#: ../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
 msgid "The backend does not support bulk removals"
-msgstr ""
+msgstr "Taustapalvelu ei tue massapoistoja"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1568
+#: ../addressbook/backends/google/e-book-backend-google.c:1351
 msgid "Deleting contactâ"
-msgstr ""
+msgstr "Poistetaan yhteystietoa..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1818
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2296
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:375
+#: ../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
-#, fuzzy
 msgid "The backend does not support bulk modifications"
-msgstr "Avaimen kÃyttÃtarkoitus ei salli varmenteiden allekirjoitusta"
+msgstr "Taustapalvelu ei tue massamuokkauksia"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1851
+#: ../addressbook/backends/google/e-book-backend-google.c:1639
 msgid "Modifying contactâ"
-msgstr ""
+msgstr "Muokataan yhteystietoa..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2058
-#, fuzzy
+#: ../addressbook/backends/google/e-book-backend-google.c:1809
 msgid "Loadingâ"
-msgstr "Ladataan..."
+msgstr "Ladataanâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2187
-#, fuzzy
-msgid "Authenticating with the serverâ"
-msgstr "Todennus vaaditaan"
+#: ../addressbook/backends/google/e-book-google-utils.c:1562
+msgid "Personal"
+msgstr "HenkilÃkohtainen"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1563
+msgid "Friends"
+msgstr "YstÃvÃt"
+
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1564
+msgid "Family"
+msgstr "Perhe"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1565
+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:177
-#, fuzzy
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
 msgid "Not connected"
-msgstr "Ei yhteyttÃ."
+msgstr "Ei yhteyttÃ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
+#: ../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:800
+#: ../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:1071
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
+msgid "Failed to bind using either v3 or v2 binds"
+msgstr ""
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
 msgid "Reconnecting to LDAP server..."
 msgstr "Odotetaan uudelleen yhteyttà LDAP-palvelimeen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
-#, fuzzy
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
 msgid "Invalid DN syntax"
-msgstr "Virheellinen argumentti"
+msgstr "Virheellinen DN-syntaksi"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1231
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4784
+#, c-format
+msgid "LDAP error 0x%x (%s)"
+msgstr "LDAP-virhe 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
 msgid "Adding contact to LDAP server..."
 msgstr "LisÃtÃÃn yhteystieto LDAP-palvelimelle..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1869
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885
 msgid "Removing contact from LDAP server..."
 msgstr "Poistetaan yhteystieto LDAP-palvelimelta..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2318
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2405
+#, 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
+#, c-format
+msgid "%s: Unhandled result type %d returned"
+msgstr ""
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
 msgid "Modifying contact from LDAP server..."
 msgstr "Muokataan yhteystietoa LDAP-palvelimella..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4720
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2673
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2886
+#, c-format
+msgid "%s: Unhandled search result type %d returned"
+msgstr ""
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
 msgid "Receiving LDAP search results..."
 msgstr "Vastaanotetaan LDAP-haun tuloksia..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Haetaan yhteystietoja (%d)... "
 
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552
+#, 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)"
+msgstr "Resurssin \"%s\" luominen epÃonnistui HTTP-statuskoodilla %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447
+#, 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
+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)"
+msgstr "Yhteystiedon muokkaaminen epÃonnistui HTTP-tilakoodilla %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912
+msgid "Loading Addressbook summary..."
+msgstr "Ladataan osoitekirjan yhteenvetoa..."
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928
+#, c-format
+msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr ""
+"PROPFIND-toiminto webdav-palvelimella epÃonnistui HTTP-tilakoodilla %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3198
-#, c-format, fuzzy
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: gconf ei sisÃltÃnyt lÃhdettà uid:ille \"%s\""
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949
+msgid "No response body in webdav PROPFIND result"
+msgstr "Vastausrunko puuttuu webdav-palvelimen vastauksesta PROPFIND-pyyntÃÃn"
 
-#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
-#: ../libedataserver/e-client.c:1915
-msgid "On This Computer"
-msgstr "TÃllà tietokoneella"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980
+#, c-format
+msgid "Loading Contacts (%d%%)"
+msgstr "Ladataan yhteystietoja (%d%%)"
 
-#: ../addressbook/libebook/e-book.c:3640
-#: ../addressbook/libebook/e-book-client.c:702
-#: ../addressbook/libedata-book/e-data-book.c:322
-msgid "Address book does not exist"
-msgstr "Osoitekirjaa ei ole olemassa"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287
+msgid "Cannot transform SoupURI to string"
+msgstr ""
 
 #: ../addressbook/libebook/e-book-client.c:95
 #, fuzzy
@@ -226,62 +279,31 @@ msgid "No such book"
 msgstr "Kansioita %s ei ole olemassa"
 
 #: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:315
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:306
 msgid "Contact not found"
-msgstr "Kohdetta ei lÃydy"
+msgstr "Yhteystietoa ei lÃytynyt"
 
 #: ../addressbook/libebook/e-book-client.c:99
-#: ../addressbook/libedata-book/e-data-book.c:316
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:307
 msgid "Contact ID already exists"
-msgstr "OID on jo olemassa"
+msgstr "Yhteystiedon tunniste on jo olemassa"
 
 #: ../addressbook/libebook/e-book-client.c:101
-#, fuzzy
 msgid "No such source"
-msgstr "Ei tÃllaista viestiÃ"
+msgstr "LÃhdettà ei ole olemassa"
 
 #: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:332
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "No space"
-msgstr "Nimiavaruus"
+msgstr "Ei tilaa"
 
-#: ../addressbook/libebook/e-book-client.c:515
+#: ../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:525
-#: ../addressbook/libedata-book/e-data-book-factory.c:196
-#: ../addressbook/libedata-book/e-data-book-factory.c:228
-#: ../calendar/libecal/e-cal-client.c:613
-#: ../calendar/libedata-cal/e-data-cal-factory.c:213
-#: ../calendar/libedata-cal/e-data-cal-factory.c:242
-#, c-format
-msgid "Invalid source"
-msgstr "Virheellinen lÃhde"
-
-#: ../addressbook/libebook/e-book-client.c:627
-#: ../calendar/libecal/e-cal-client.c:728
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr ""
-
-#: ../addressbook/libebook/e-book-client.c:665
-#, fuzzy
-msgid "Failed to find system book"
-msgstr "Virhe viestin %d kohdalla"
-
-#: ../addressbook/libebook/e-book-client.c:774
-#: ../calendar/libecal/e-cal-client.c:881
-#, c-format, fuzzy
-msgid "There was no source for UID '%s' stored in a source list."
-msgstr "%s: gconf ei sisÃltÃnyt lÃhdettà uid:ille \"%s\""
-
-#: ../addressbook/libebook/e-book-client.c:2566
-#: ../calendar/libecal/e-cal-client.c:4536
+#: ../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"
@@ -294,14 +316,15 @@ msgstr "YksilÃllinen tunniste"
 #. FILE_AS is not really a structured field - we use a getter/setter
 #. * 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.
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
 #: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "Tallenna kohtaan"
 
 #. URI of the book to which the contact belongs to
 #: ../addressbook/libebook/e-contact.c:128
-msgid "Book URI"
+#, fuzzy
+msgid "Book UID"
 msgstr "Kirjan URI"
 
 #. Name fields
@@ -476,7 +499,7 @@ msgstr "Weblogin URL"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:188
-#: ../libedataserverui/e-categories-dialog.c:88
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "RyhmÃt"
 
@@ -556,34 +579,28 @@ msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-tyÃnimi 3"
 
 #: ../addressbook/libebook/e-contact.c:213
-#, fuzzy
 msgid "Jabber Home ID 1"
-msgstr "Jabber kotitunniste 1"
+msgstr "Jabber koti ID 1"
 
 #: ../addressbook/libebook/e-contact.c:214
-#, fuzzy
 msgid "Jabber Home ID 2"
-msgstr "Jabber kotitunniste 2"
+msgstr "Jabber koti ID 2"
 
 #: ../addressbook/libebook/e-contact.c:215
-#, fuzzy
 msgid "Jabber Home ID 3"
-msgstr "Jabber kotitunniste 3"
+msgstr "Jabber koti ID 3"
 
 #: ../addressbook/libebook/e-contact.c:216
-#, fuzzy
 msgid "Jabber Work ID 1"
-msgstr "Jabber tyÃtunniste 1"
+msgstr "Jabber tyà ID 1"
 
 #: ../addressbook/libebook/e-contact.c:217
-#, fuzzy
 msgid "Jabber Work ID 2"
-msgstr "Jabber tyÃtunniste 2"
+msgstr "Jabber tyà ID 2"
 
 #: ../addressbook/libebook/e-contact.c:218
-#, fuzzy
 msgid "Jabber Work ID 3"
-msgstr "Jabber tyÃtunniste 3"
+msgstr "Jabber tyà ID 3"
 
 #: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
@@ -634,34 +651,28 @@ msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
 #: ../addressbook/libebook/e-contact.c:231
-#, fuzzy
 msgid "ICQ Home ID 1"
-msgstr "ICQ kotitunniste 1"
+msgstr "ICQ koti ID 1"
 
 #: ../addressbook/libebook/e-contact.c:232
-#, fuzzy
 msgid "ICQ Home ID 2"
-msgstr "ICQ tyÃtunniste 2"
+msgstr "ICQ koti ID 2"
 
 #: ../addressbook/libebook/e-contact.c:233
-#, fuzzy
 msgid "ICQ Home ID 3"
-msgstr "ICQ kotitunniste 3"
+msgstr "ICQ koti ID 3"
 
 #: ../addressbook/libebook/e-contact.c:234
-#, fuzzy
 msgid "ICQ Work ID 1"
-msgstr "ICQ tyÃtunniste 1"
+msgstr "ICQ tyà ID 1"
 
 #: ../addressbook/libebook/e-contact.c:235
-#, fuzzy
 msgid "ICQ Work ID 2"
-msgstr "ICQ tyÃtunniste 2"
+msgstr "ICQ tyà ID 2"
 
 #: ../addressbook/libebook/e-contact.c:236
-#, fuzzy
 msgid "ICQ Work ID 3"
-msgstr "ICQ tyÃtunniste 3"
+msgstr "ICQ tyà ID 3"
 
 #. Last modified time
 #: ../addressbook/libebook/e-contact.c:239
@@ -669,8 +680,8 @@ 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.
+#. * 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
 msgid "Name or Org"
 msgstr "Nimi tai Org"
@@ -707,7 +718,7 @@ 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
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
 #: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "Nimi"
@@ -722,14 +733,12 @@ msgid "AIM Screen Name List"
 msgstr "AIM nÃyttÃnimien lista"
 
 #: ../addressbook/libebook/e-contact.c:265
-#, fuzzy
 msgid "GroupWise ID List"
-msgstr "Groupwisen Id-lista"
+msgstr "GroupWise ID lista"
 
 #: ../addressbook/libebook/e-contact.c:266
-#, fuzzy
 msgid "Jabber ID List"
-msgstr "Jabber-tunnisteiden lista"
+msgstr "Jabber ID lista"
 
 #: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
@@ -740,27 +749,27 @@ msgid "MSN Screen Name List"
 msgstr "MSN nÃyttÃnimien lista"
 
 #: ../addressbook/libebook/e-contact.c:269
-#, fuzzy
 msgid "ICQ ID List"
-msgstr "ICQ-tunnisteiden lista"
+msgstr "ICQ ID lista"
 
 #: ../addressbook/libebook/e-contact.c:271
 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/...
+#. * 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
 msgid "List"
 msgstr "Lista"
 
 #. Translators: This is an EContact field description, in this case it's a flag
-#. 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.
+#. * 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
-msgid "List Show Addresses"
+#, fuzzy
+msgid "List Shows Addresses"
 msgstr "Lista nÃytettÃvistà osoitteista"
 
 #: ../addressbook/libebook/e-contact.c:283
@@ -768,7 +777,7 @@ msgid "Birth Date"
 msgstr "SyntymÃpÃivÃ"
 
 #: ../addressbook/libebook/e-contact.c:284
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
 msgid "Anniversary"
 msgstr "VuosipÃivÃ"
 
@@ -778,39 +787,32 @@ msgid "X.509 Certificate"
 msgstr "X.509-varmenne"
 
 #: ../addressbook/libebook/e-contact.c:289
-#, fuzzy
 msgid "Gadu-Gadu Home ID 1"
-msgstr "Gadu-Gadu kotitunniste 1"
+msgstr "Gadu-Gadu koti ID 1"
 
 #: ../addressbook/libebook/e-contact.c:290
-#, fuzzy
 msgid "Gadu-Gadu Home ID 2"
-msgstr "Gadu-Gadu kotitunniste 2"
+msgstr "Gadu-Gadu koti ID 2"
 
 #: ../addressbook/libebook/e-contact.c:291
-#, fuzzy
 msgid "Gadu-Gadu Home ID 3"
-msgstr "Gadu-Gadu kotitunniste 3"
+msgstr "Gadu-Gadu koti ID 3"
 
 #: ../addressbook/libebook/e-contact.c:292
-#, fuzzy
 msgid "Gadu-Gadu Work ID 1"
-msgstr "Gadu-Gadu tyÃtunniste 1"
+msgstr "Gadu-Gadu tyà ID 1"
 
 #: ../addressbook/libebook/e-contact.c:293
-#, fuzzy
 msgid "Gadu-Gadu Work ID 2"
-msgstr "Gadu-Gadu tyÃtunniste 2"
+msgstr "Gadu-Gadu tyà ID 2"
 
 #: ../addressbook/libebook/e-contact.c:294
-#, fuzzy
 msgid "Gadu-Gadu Work ID 3"
-msgstr "Gadu-Gadu tyÃtunniste 3"
+msgstr "Gadu-Gadu tyà ID 3"
 
 #: ../addressbook/libebook/e-contact.c:295
-#, fuzzy
 msgid "Gadu-Gadu ID List"
-msgstr "Gadu-Gadun tunnistelista"
+msgstr "Gadu-Gadu ID lista"
 
 #. Geo information
 #: ../addressbook/libebook/e-contact.c:298
@@ -854,893 +856,921 @@ msgid "SIP address"
 msgstr "SIP-osoite"
 
 #: ../addressbook/libebook/e-contact.c:312
-#, fuzzy
 msgid "Google Talk Home Name 1"
-msgstr "Skype-kotinimi 1"
+msgstr "Google Talk koti nimi 1"
 
 #: ../addressbook/libebook/e-contact.c:313
-#, fuzzy
 msgid "Google Talk Home Name 2"
-msgstr "Skype-kotinimi 2"
+msgstr "Google Talk koti nimi 2"
 
 #: ../addressbook/libebook/e-contact.c:314
-#, fuzzy
 msgid "Google Talk Home Name 3"
-msgstr "Skype-kotinimi 3"
+msgstr "Google Talk koti nimi 3"
 
 #: ../addressbook/libebook/e-contact.c:315
-#, fuzzy
 msgid "Google Talk Work Name 1"
-msgstr "Skype-tyÃnimi 1"
+msgstr "Google Talk tyà nimi 1"
 
 #: ../addressbook/libebook/e-contact.c:316
-#, fuzzy
 msgid "Google Talk Work Name 2"
-msgstr "Skype-tyÃnimi 2"
+msgstr "Google Talk tyà nimi 2"
 
 #: ../addressbook/libebook/e-contact.c:317
-#, fuzzy
 msgid "Google Talk Work Name 3"
-msgstr "Skype-tyÃnimi 3"
+msgstr "Google Talk tyà nimi 3"
 
 #: ../addressbook/libebook/e-contact.c:318
-#, fuzzy
 msgid "Google Talk Name List"
+msgstr "Google Talk nimilista"
+
+#: ../addressbook/libebook/e-contact.c:320
+#, fuzzy
+msgid "Twitter Name List"
 msgstr "Skypenimien luettelo"
 
-#: ../addressbook/libebook/e-contact.c:1611
-#: ../addressbook/libebook/e-destination.c:878
+#: ../addressbook/libebook/e-contact.c:1623
+#: ../addressbook/libebook/e-destination.c:879
 msgid "Unnamed List"
 msgstr "NimeÃmÃtÃn lista"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
 msgid "Cannot process, book backend is opening"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend.c:91
-#, c-format, fuzzy
+#: ../addressbook/libedata-book/e-book-backend.c:90
+#, fuzzy, c-format
 msgid "Unknown book property '%s'"
 msgstr "Tuntematon virhe: %s"
 
-#: ../addressbook/libedata-book/e-book-backend.c:108
-#, c-format, fuzzy
+#: ../addressbook/libedata-book/e-book-backend.c:107
+#, 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:501
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
 #: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "Muisti ei riitÃ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
-#, c-format, fuzzy
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
+#, c-format
 msgid "Contact '%s' not found"
-msgstr "Kohdetta ei lÃydy"
+msgstr "Yhteystietoa \"%s\" ei lÃydy"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:206
-#: ../addressbook/libedata-book/e-data-book.c:219
-#: ../addressbook/libedata-book/e-data-book.c:733
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:214
+#: ../addressbook/libedata-book/e-data-book.c:724
 msgid "Invalid query: "
-msgstr "Virheellinen kysely"
+msgstr "Virheellinen haku: "
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Success"
-msgstr ""
+msgstr "Valmis"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libecal/e-cal.c:4564 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:123
+#: ../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
 msgid "Backend is busy"
 msgstr "TaustajÃrjestelmà on kÃytÃssÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:133
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
 msgid "Repository offline"
-msgstr "Varasto on yhteydettÃmÃssà tilassa"
+msgstr "LÃhde poissa kÃytÃstÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libecal/e-cal.c:4578 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:139
+#: ../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
 msgid "Permission denied"
 msgstr "Lupa evÃtty"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Failed"
-msgstr "Todennus epÃonnistui"
+msgstr "Tunnistus epÃonnistui"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Authentication Required"
-msgstr "Todennus vaaditaan"
+msgstr "Tunnistautuminen vaaditaan"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported field"
 msgstr "Kenttà ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:147
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
 msgid "Unsupported authentication method"
 msgstr "Tunnistautumismenetelmà ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:149
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
 msgid "TLS not available"
 msgstr "TLS ei kÃytettÃvissÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "Osoitekirjaa ei ole olemassa"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
 msgid "Book removed"
-msgstr ""
+msgstr "Kirja poistettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:443
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Not available in offline mode"
-msgstr "TÃmà viesti ei ole saatavilla yhteydettÃmÃssà tilassa."
+msgstr "Ei kÃytettÃvissà yhteydettÃmÃssà tilassa"
 
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:151
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
 msgid "Search size limit exceeded"
 msgstr "Haun kokorajoitus ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:153
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
 msgid "Search time limit exceeded"
 msgstr "Haun aikaraja ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:155
+#: ../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:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:157
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
 msgid "Query refused"
 msgstr "Kyselyà ei hyvÃksytty"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:143
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
 msgid "Could not cancel"
-msgstr "%s: ei voi perua"
+msgstr "Ei voi perua"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid server version"
 msgstr "Virheellinen palvelimen versio"
 
-#: ../addressbook/libedata-book/e-data-book.c:333
-#: ../calendar/libecal/e-cal.c:4562 ../calendar/libedata-cal/e-data-cal.c:451
-#: ../libedataserver/e-client.c:121
+#: ../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
 msgid "Invalid argument"
 msgstr "Virheellinen argumentti"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal.c:4601 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:145
-#, fuzzy
+#: ../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
 msgid "Not supported"
-msgstr "Protokolla ei ole tuettu"
+msgstr "Ei tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:163
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
 msgid "Backend is not opened yet"
-msgstr "TaustajÃrjestelmà on kÃytÃssÃ"
+msgstr "Taustapalvelu ei vielà kÃynnissÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libecal/e-cal-client.c:621
-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:161
-#, fuzzy
+#: ../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 "I/O-virhe"
+msgstr "Muu virhe"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:551
-#: ../addressbook/libedata-book/e-data-book.c:943
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:909
 msgid "Cannot get contact: "
-msgstr "Kansion %s sÃiliÃtà ei voitu hakea"
+msgstr "Yhteystiedon hakeminen epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:576
-#: ../addressbook/libedata-book/e-data-book.c:601
+#: ../addressbook/libedata-book/e-data-book.c:567
+#: ../addressbook/libedata-book/e-data-book.c:592
 #, fuzzy
 msgid "Empty query: "
 msgstr "Tyhjà kysely"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:626
-#: ../addressbook/libedata-book/e-data-book.c:1041
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:617
+#: ../addressbook/libedata-book/e-data-book.c:1007
 msgid "Cannot add contact: "
-msgstr "Kansion %s sÃiliÃtà ei voitu hakea"
+msgstr "Yhteystiedon lisÃys epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:1075
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:642
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot modify contacts: "
-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:759
-#: ../calendar/libedata-cal/e-data-cal.c:866
-#, fuzzy
-msgid "Cannot authenticate user: "
-msgstr "Tunnistautuminen palvelimelle epÃonnistui: %s"
+msgstr "Yhteystietojen muokkaaminen epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:830
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:796
 msgid "Cannot open book: "
-msgstr "SÃhkÃpostilaatikkoa ei voi avata: %s: %s\n"
+msgstr "Kirjan avaaminen epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:846
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:812
 msgid "Cannot remove book: "
-msgstr "SÃhkÃpostilaatikkoa ei voi avata: %s: %s\n"
+msgstr "Kirjan poistaminen epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:873
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:839
 msgid "Cannot refresh address book: "
-msgstr "Kalenteria ei voi pÃivittÃÃ"
+msgstr "Osoitekirjan pÃivitys epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:899
+#: ../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:924
-#: ../calendar/libedata-cal/e-data-cal.c:1069
+#: ../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"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:927
 msgid "Cannot get contact list: "
-msgstr "Kansion %s sÃiliÃtà ei voitu hakea"
+msgstr "Yhteystietoluettelon haku epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:995
+#: ../addressbook/libedata-book/e-data-book.c:961
 #, 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:1100
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:1066
 msgid "Cannot remove contacts: "
-msgstr "Kalenteria ei voi pÃivittÃÃ"
+msgstr "Yhteystietojen poisto epÃonnistui: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:184
-#: ../addressbook/libedata-book/e-data-book-factory.c:212
-#: ../calendar/libedata-cal/e-data-cal-factory.c:229
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
 #, c-format
-msgid "Empty URI"
-msgstr ""
+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
+#, c-format
+msgid "Invalid backend name '%s' in source '%s'"
+msgstr "Virheellinen taustapalvelun nimi \"%s\" lÃhteessà \"%s\""
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#: ../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
+#, 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
 #, c-format
 msgid "Server is unreachable (%s)"
+msgstr "Palvelin ei ole tavoitettavissa (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:598
+#, 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:574
-#, c-format, fuzzy
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
+#, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
-msgstr "Odottamaton GnuPG tilaviesti havaittu:\n\n%s"
+msgstr "Odottamaton HTTP-tilakoodi %d palautettiin (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
+msgid "CalDAV backend is not loaded yet"
+msgstr "CalDAV-taustapalvelua ei ole vielà ladattu"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017
+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
 #, c-format
-msgid "Server is unreachable, calendar is opened in read-only mode.\nError message: %s"
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
 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:4482
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672
+#, 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
+msgid "CalDAV does not support bulk additions"
+msgstr "CalDAV ei tue massalisÃyksiÃ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3779
+msgid "CalDAV does not support bulk modifications"
+msgstr "CalDAV ei tue massamuokkauksia"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3947
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV ei tue massapoistoja"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4606
 msgid "Calendar doesn't support Free/Busy"
-msgstr ""
+msgstr "Kalenteri ei tue Vapaa/Varattu -tiloja"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:219
-#: ../libedataserverui/e-client-utils.c:875
-#, c-format, fuzzy
-msgid "Enter password for address book %s (user %s)\nReason: %s"
-msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4614
+msgid "Schedule outbox url not found"
+msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:221
-#: ../libedataserverui/e-client-utils.c:877
-#, c-format, fuzzy
-msgid "Enter password for address book %s (user %s)"
-msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4713
+msgid "Unexpected result in schedule-response"
+msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
 msgid "Birthday"
 msgstr "SyntymÃpÃivÃ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
 #, c-format
 msgid "Birthday: %s"
 msgstr "SyntymÃpÃivÃ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
 #, c-format
 msgid "Anniversary: %s"
 msgstr "VuosipÃivÃ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:235
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Kalenteritietoja ei voi tallentaa: virheellinen URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../calendar/backends/file/e-cal-backend-file.c:242
+#: ../calendar/backends/file/e-cal-backend-file.c:248
 msgid "Cannot save calendar data"
 msgstr "Kalenteritietoja ei voi tallentaa"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:405
+#: ../calendar/backends/http/e-cal-backend-http.c:482
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "Virheellinen URI: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:543
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Uudelleenohjaus virheelliseen URI:in"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:446
+#: ../calendar/backends/http/e-cal-backend-http.c:580
+#, c-format
 msgid "Bad file format."
 msgstr "Virheellinen tiedostomuoto."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:590
+#, c-format
 msgid "Not a calendar."
 msgstr "Ei kalenteri."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:780
-#: ../calendar/backends/http/e-cal-backend-http.c:781
-#: ../calendar/backends/weather/e-cal-backend-weather.c:524
+#: ../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
 msgid "Could not create cache file"
 msgstr "VÃlimuistitiedostoa ei voitu luoda"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+#: ../calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "SÃÃtietoja ei voitu hakea"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "SÃÃ: sumuista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "SÃÃ: pilvinen yÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy"
 msgstr "SÃÃ: pilvistÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "SÃÃ: poutaista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "SÃÃ: sadekuuroja"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "SÃÃ: sadetta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "SÃÃ: kirkas yÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Sunny"
 msgstr "SÃÃ: Aurinkoista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "SÃÃ: ukkosta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:435
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "SÃÃennuste"
 
-#: ../calendar/libecal/e-cal.c:891 ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:428
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
-
-#. * This password prompt will be prompted rarely. Since the key that is passed to
-#. * the auth_func corresponds to the parent user.
-#: ../calendar/libecal/e-cal.c:905
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "SyÃtà salasana kohteelle %s ottaaksesi kÃyttÃÃn vÃlimuisti  kÃyttÃjÃlle %s"
-
-#: ../calendar/libecal/e-cal.c:4566
+#: ../calendar/libecal/e-cal.c:4003
 msgid "Repository is offline"
 msgstr "Varasto on yhteydettÃmÃssà tilassa"
 
-#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "Kalenteria ei ole olemassa"
 
-#: ../calendar/libecal/e-cal.c:4570 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:4007 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Object not found"
 msgstr "Kohdetta ei lÃydy"
 
-#: ../calendar/libecal/e-cal.c:4572 ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:4009 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "Virheellinen kohde"
 
-#: ../calendar/libecal/e-cal.c:4574
+#: ../calendar/libecal/e-cal.c:4011
 msgid "URI not loaded"
 msgstr "URIa ei ole ladattu"
 
-#: ../calendar/libecal/e-cal.c:4576
+#: ../calendar/libecal/e-cal.c:4013
 msgid "URI already loaded"
 msgstr "URI on jo ladattu"
 
-#: ../calendar/libecal/e-cal.c:4580
+#: ../calendar/libecal/e-cal.c:4017
 msgid "Unknown User"
 msgstr "Tuntematon kÃyttÃjÃ"
 
-#: ../calendar/libecal/e-cal.c:4582 ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:4019 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Object ID already exists"
 msgstr "OID on jo olemassa"
 
-#: ../calendar/libecal/e-cal.c:4584
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Protocol not supported"
 msgstr "Protokolla ei ole tuettu"
 
-#: ../calendar/libecal/e-cal.c:4586
+#: ../calendar/libecal/e-cal.c:4023
 msgid "Operation has been canceled"
 msgstr "Toimenpide on peruttu"
 
-#: ../calendar/libecal/e-cal.c:4588
+#: ../calendar/libecal/e-cal.c:4025
 msgid "Could not cancel operation"
 msgstr "Toimenpidettà ei voitu perua"
 
-#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
+#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "Todennus epÃonnistui"
 
-#: ../calendar/libecal/e-cal.c:4592
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
-#: ../libedataserver/e-client.c:131
+#: ../calendar/libecal/e-cal.c:4029
+#: ../camel/providers/smtp/camel-smtp-transport.c:857
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: ../calendar/libecal/e-cal.c:4594
+#: ../calendar/libecal/e-cal.c:4031
 #, fuzzy
 msgid "A D-Bus exception has occurred"
 msgstr "Tapahtui CORBA-poikkeus"
 
-#: ../calendar/libecal/e-cal.c:4598
+#: ../calendar/libecal/e-cal.c:4035
 msgid "No error"
 msgstr "Ei virhettÃ"
 
-#: ../calendar/libecal/e-cal-client.c:143
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Unknown user"
 msgstr "Tuntematon kÃyttÃjÃ"
 
-#: ../calendar/libecal/e-cal-client.c:147
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Invalid range"
 msgstr "Virheellinen alue"
 
-#: ../calendar/libecal/e-cal-client.c:603
+#: ../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:768
-#, fuzzy
-msgid "Failed to find system calendar"
-msgstr "Tiedon koodaus epÃonnistui"
-
-#: ../calendar/libecal/e-cal-client.c:807
-#: ../calendar/libedata-cal/e-data-cal.c:441
-#, fuzzy
-msgid "Calendar does not exist"
-msgstr "Kansiota \"%s\" ei ole olemassa."
-
-#: ../calendar/libecal/e-cal-client.c:922
-#, fuzzy
-msgid "Invalid source type"
-msgstr "Virheellinen lÃhde"
-
-#: ../calendar/libecal/e-cal-component.c:1337
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "NimeÃmÃtÃn tapaaminen"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
-#, fuzzy
+#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
 msgctxt "Priority"
 msgid "High"
 msgstr "Korkea"
 
-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
-#, fuzzy
+#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
-#, fuzzy
+#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
 msgctxt "Priority"
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:716
-#, fuzzy
+#: ../calendar/libecal/e-cal-util.c:721
 msgctxt "Priority"
 msgid "Undefined"
-msgstr "MÃÃrittelemÃtÃn"
+msgstr "MÃÃrittÃmÃtÃn"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:38
+#: ../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:146
-#, c-format, fuzzy
+#: ../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:163
-#, c-format, fuzzy
+#: ../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:79
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:841
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:956
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1187
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1217
+#: ../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:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:231
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:276
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:315
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1258
+#: ../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
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ottaa yhden argumentin"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:128
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:321
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:886
+#: ../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
 #, 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:136
+#: ../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"
+msgstr ""
+"\"%s\" olettaa ensimmÃisen argumentin olevan ISO-8601 muotoinen pÃivÃys"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:178
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:537
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:880
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
+#: ../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"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:184
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:237
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:282
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:403
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:486
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:543
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1028
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1264
+#: ../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
 #, 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:192
+#: ../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:397
-#, c-format, fuzzy
+#: ../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:411
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:492
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:552
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1036
+#: ../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
 #, 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:420
-#, c-format, fuzzy
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#, 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:480
-#, c-format, fuzzy
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#, fuzzy, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
 #, 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:924
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "\"%s\" olettaa ensimmÃisen argumentin olevan joko \"any\", \"summary\", \"description\", \"sijainti\", \"attendee\", \"organizer\" tai \"classification\""
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"\"%s\" olettaa ensimmÃisen argumentin olevan joko \"any\", \"summary\", "
+"\"description\", \"sijainti\", \"attendee\", \"organizer\" tai "
+"\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
 #, 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:1100
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "\"%s\" olettaa kaikkien argumenttien olevan merkkijonoja, tai yhden ja ainoastaan yhden olevan totuusarvoisen epÃtoden (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"\"%s\" olettaa kaikkien argumenttien olevan merkkijonoja, tai yhden ja "
+"ainoastaan yhden olevan totuusarvoisen epÃtoden (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
 msgstr "Menetelmà ei ole tuettu."
 
+#: ../calendar/libedata-cal/e-data-cal.c:429
+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:962
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:909
 msgid "Cannot open calendar: "
-msgstr "Kalenteria ei voi avata"
+msgstr "Kalenterin avaus epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:987
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:934
 msgid "Cannot remove calendar: "
-msgstr "Kalenteria ei voi pÃivittÃÃ"
+msgstr "Kalenterin poisto epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:961
 msgid "Cannot refresh calendar: "
-msgstr "Kalenteria ei voi pÃivittÃÃ"
+msgstr "Kalenterin pÃivitys epÃonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1043
+#: ../calendar/libedata-cal/e-data-cal.c:990
 #, 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:1098
+#: ../calendar/libedata-cal/e-data-cal.c:1045
 #, 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:1128
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 #, 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:1157
+#: ../calendar/libedata-cal/e-data-cal.c:1104
 #, 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:1188
+#: ../calendar/libedata-cal/e-data-cal.c:1142
 #, 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:1220
+#: ../calendar/libedata-cal/e-data-cal.c:1177
 #, 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:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1217
 #, 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:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 #, 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:1312
+#: ../calendar/libedata-cal/e-data-cal.c:1285
 #, 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:1344
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 #, 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:1372
+#: ../calendar/libedata-cal/e-data-cal.c:1345
 #, 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:1401
+#: ../calendar/libedata-cal/e-data-cal.c:1374
 #, 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:1431
+#: ../calendar/libedata-cal/e-data-cal.c:1404
 #, 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:1457
+#: ../calendar/libedata-cal/e-data-cal.c:1430
 #, fuzzy
 msgid "Could not add calendar time zone: "
 msgstr "Kansiota ei voitu uudelleen nimetÃ: %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:199
-#, c-format, fuzzy
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
+#, fuzzy, c-format
 msgid "Invalid call"
 msgstr "Virheellinen alue"
 
@@ -1774,15 +1804,15 @@ msgstr "Et voi tuoda avaimia tÃllà salakirjoitusmenetelmÃllÃ"
 msgid "You may not export keys with this cipher"
 msgstr "Et voi viedà avaimia tÃllà salakirjoitusmenetelmÃllÃ"
 
-#: ../camel/camel-cipher-context.c:805
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "Allekirjoitetaan viestiÃ"
 
-#: ../camel/camel-cipher-context.c:1046
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "Salataan viestiÃ"
 
-#: ../camel/camel-cipher-context.c:1173
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "Puretaan viestin salausta"
 
@@ -1791,23 +1821,39 @@ msgstr "Puretaan viestin salausta"
 msgid "Unable to create cache path"
 msgstr "VÃlimuistipolun luonti epÃonnistui"
 
-#: ../camel/camel-data-cache.c:507
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr ""
+
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Tietoa ei voitu avata vÃlimuistista: %s: %s"
 
-#: ../camel/camel-disco-diary.c:201
+#: ../camel/camel-disco-diary.c:207
 #, c-format
-msgid "Could not write log entry: %s\nFurther operations on this server will not be replayed when you\nreconnect to the network."
-msgstr "LokimerkintÃà ei voitu kirjoittaa: %s\nMyÃhempià toimenpiteità tÃllà palvelimella ei toisteta, kun otat\nuudelleen yhteyttÃà verkkoon."
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+"LokimerkintÃÃ ei voitu kirjoittaa: %s\n"
+"MyÃhempià toimenpiteità tÃllà palvelimella ei toisteta, kun otat\n"
+"uudelleen yhteyttÃÃ verkkoon."
 
-#: ../camel/camel-disco-diary.c:266
-#: ../camel/providers/imap/camel-imap-journal.c:309
+#: ../camel/camel-disco-diary.c:271
+#: ../camel/providers/imap/camel-imap-journal.c:312
 #, c-format
-msgid "Could not open '%s':\n%s\nChanges made to this folder will not be resynchronized."
-msgstr "\"%s\" ei voitu avata:\n%s\nTÃhÃn kansioon tehtyjà muutoksia ei tahdisteta uudestaan."
+msgid ""
+"Could not open '%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+"\"%s\" ei voitu avata:\n"
+"%s\n"
+"TÃhÃn kansioon tehtyjà muutoksia ei tahdisteta uudestaan."
 
-#: ../camel/camel-disco-diary.c:310
+#: ../camel/camel-disco-diary.c:315
 msgid "Resynchronizing with server"
 msgstr "Uudelleentahdistetaan palvelimen kanssa"
 
@@ -1815,106 +1861,102 @@ 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:416
+#: ../camel/camel-disco-folder.c:420
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Valmistellaan kansiota \"%s\" yhteydettÃmÃÃn tilaan"
 
-#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334
 #, 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:456
-#: ../camel/providers/imap/camel-imap-store.c:1239
-#: ../camel/providers/imap/camel-imap-store.c:2028
-#: ../camel/providers/imap/camel-imap-store.c:2523
-#: ../camel/providers/imap/camel-imap-store.c:3282
-#: ../camel/providers/imapx/camel-imapx-folder.c:407
-#: ../camel/providers/imapx/camel-imapx-folder.c:440
-#: ../camel/providers/imapx/camel-imapx-folder.c:474
-#: ../camel/providers/imapx/camel-imapx-folder.c:530
-#: ../camel/providers/imapx/camel-imapx-folder.c:587
-#: ../camel/providers/imapx/camel-imapx-folder.c:621
-#: ../camel/providers/imapx/camel-imapx-folder.c:661
-#: ../camel/providers/imapx/camel-imapx-folder.c:697
-#: ../camel/providers/imapx/camel-imapx-store.c:276
-#: ../camel/providers/imapx/camel-imapx-store.c:1367
-#: ../camel/providers/imapx/camel-imapx-store.c:1455
-#: ../camel/providers/imapx/camel-imapx-store.c:1501
-#: ../camel/providers/pop3/camel-pop3-folder.c:525
-#: ../camel/providers/pop3/camel-pop3-folder.c:655
-#: ../camel/providers/pop3/camel-pop3-folder.c:838
-#: ../camel/providers/pop3/camel-pop3-folder.c:1036
-#: ../camel/providers/pop3/camel-pop3-store.c:393
-#: ../camel/providers/pop3/camel-pop3-store.c:805
+#: ../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
 #, c-format
 msgid "You must be working online to complete this operation"
-msgstr "Sinun tÃytyy olla yhteydellisessà tilassa suorittaaksesi tÃmÃn toiminnon loppuun"
+msgstr ""
+"Sinun tÃytyy olla yhteydellisessà tilassa suorittaaksesi tÃmÃn toiminnon "
+"loppuun"
 
 #: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "Peruttu"
 
-#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Lapsiprosessin \"%s\" luominen epÃonnistui: %s"
 
-#: ../camel/camel-filter-driver.c:943
+#: ../camel/camel-filter-driver.c:964
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Virheellinen viestivirta lÃhteestà %s: %s"
 
-#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
+#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jÃsennettÃessà suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
+#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1347
+#: ../camel/camel-filter-driver.c:1383
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu avata"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu kÃsitellÃ"
 
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestià %d (%d %%)"
 
-#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
+#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
+#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
 msgid "Complete"
 msgstr "Valmis"
 
-#: ../camel/camel-filter-driver.c:1485
+#: ../camel/camel-filter-driver.c:1529
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestià %d / %d"
 
-#: ../camel/camel-filter-driver.c:1503
+#: ../camel/camel-filter-driver.c:1547
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
@@ -1931,113 +1973,135 @@ msgstr "Virheellisià argumentteja (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Virheellisià argumentteja (user-tag)"
 
-#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
+#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 
-#: ../camel/camel-folder.c:262
-#, c-format, fuzzy
+#: ../camel/camel-folder.c:270
+#, 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:302
-#, c-format, fuzzy
+#: ../camel/camel-folder.c:310
+#, 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:350
-#, c-format, fuzzy
+#: ../camel/camel-folder.c:358
+#, 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:918
-#: ../camel/providers/local/camel-maildir-folder.c:322
+#: ../camel/camel-folder.c:930
+#: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "SiirretÃÃn viestejÃ"
 
-#: ../camel/camel-folder.c:921
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "Kopioidaan viestejÃ"
 
-#: ../camel/camel-folder.c:1233
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr ""
 
-#: ../camel/camel-folder.c:3549
-#, c-format, fuzzy
+#: ../camel/camel-folder.c:3372
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "Siivotaan poistettuja kansiosta â%sâ"
+
+#: ../camel/camel-folder.c:3604
+#, fuzzy, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Haetaan POP-viestià %d"
 
-#: ../camel/camel-folder.c:3698
-#, c-format, fuzzy
+#: ../camel/camel-folder.c:3755
+#, fuzzy, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Haetaan yhteenvetoa uusista viesteistà kansiossa %s"
 
-#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
-#: ../camel/camel-folder-search.c:664
+#: ../camel/camel-folder.c:3987
+#, 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"
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Hakulauseketta ei voi tulkita: %s:\n"
+"%s"
 
-#: ../camel/camel-folder-search.c:377 ../camel/camel-folder-search.c:491
-#: ../camel/camel-folder-search.c:676
+#: ../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"
+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:890 ../camel/camel-folder-search.c:933
+#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
 #, 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:994
+#: ../camel/camel-folder-search.c:932
 #, 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:1001 ../camel/camel-folder-search.c:1009
+#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
 #, 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:1037
+#: ../camel/camel-folder-search.c:975
 #, 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:1047
+#: ../camel/camel-folder-search.c:985
 #, 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:1327
+#: ../camel/camel-gpg-context.c:1331
 #, 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:849
+#: ../camel/providers/smtp/camel-smtp-transport.c:860
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #: ../camel/camel-gpg-context.c:733
 #, c-format
-msgid "Unexpected GnuPG status message encountered:\n\n%s"
-msgstr "Odottamaton GnuPG tilaviesti havaittu:\n\n%s"
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+"Odottamaton GnuPG tilaviesti havaittu:\n"
+"\n"
+"%s"
 
 #: ../camel/camel-gpg-context.c:769
 #, c-format
@@ -2051,223 +2115,524 @@ msgstr "gpg salalausepyynnÃn tulkinta epÃonnistui."
 
 #: ../camel/camel-gpg-context.c:830
 #, c-format
-msgid "You need a PIN to unlock the key for your\nSmartCard: \"%s\""
+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
 #, c-format
-msgid "You need a passphrase to unlock the key for\nuser: \"%s\""
-msgstr "Tarvitse salalauseen avataksesi avaimen\nkÃyttÃjÃlle: \"%s\""
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+"Tarvitse salalauseen avataksesi avaimen\n"
+"kÃyttÃjÃlle: \"%s\""
 
 #: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Odottamaton pyyntà GnuPG:ltà kohteelle \"%s\""
 
-#: ../camel/camel-gpg-context.c:850
-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."
+#: ../camel/camel-gpg-context.c:852
+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:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:883 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:382
-#: ../libedataserver/e-client.c:141 ../libedataserverui/e-book-auth-util.c:227
-#, c-format, fuzzy
+#: ../camel/providers/nntp/camel-nntp-summary.c:388
+#: ../libedataserver/e-client.c:140
+#, c-format
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../camel/camel-gpg-context.c:900
+#: ../camel/camel-gpg-context.c:904
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Salaisen avaimen avaus epÃonnistui: 3 virheellistà salalausetta syÃtetty."
+msgstr ""
+"Salaisen avaimen avaus epÃonnistui: 3 virheellistà salalausetta syÃtetty."
 
-#: ../camel/camel-gpg-context.c:913
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus GnuPG:ltÃ: %s"
 
-#: ../camel/camel-gpg-context.c:1044
+#: ../camel/camel-gpg-context.c:1048
 #, 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:1591 ../camel/camel-smime-context.c:831
+#: ../camel/camel-gpg-context.c:1595 ../camel/camel-smime-context.c:832
 #, fuzzy
 msgid "Could not generate signing data: "
 msgstr "Allekirjoitustietoa ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
-#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
+#: ../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
 msgid "Failed to execute gpg."
 msgstr "gpg:n suoritus epÃonnistui."
 
-#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
-#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
-#: ../camel/camel-smime-context.c:980
+#: ../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
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1797
+#: ../camel/camel-gpg-context.c:1801
 #, fuzzy
 msgid "Cannot verify message signature: "
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1924
 #, fuzzy
 msgid "Could not generate encrypting data: "
 msgstr "Salaustieto ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:1973
+#: ../camel/camel-gpg-context.c:1977
 msgid "This is a digitally encrypted message part"
 msgstr "Digitaalisesti salattu viestin osa"
 
-#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
-#: ../camel/camel-gpg-context.c:2063
+#: ../camel/camel-gpg-context.c:2035 ../camel/camel-gpg-context.c:2044
+#: ../camel/camel-gpg-context.c:2067
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Viestin salausta ei voi purkaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:2051
+#: ../camel/camel-gpg-context.c:2055
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-osan salauksen purku epÃonnistui: protokollavirhe"
 
-#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
+#: ../camel/camel-gpg-context.c:2146 ../camel/camel-smime-context.c:1273
 msgid "Encrypted content"
 msgstr "Salattu sisÃltÃ"
 
-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
+#: ../camel/camel-imapx-folder.c:104
+#, c-format
+msgid "Could not create folder summary for %s"
 msgstr ""
 
-#: ../camel/camel-lock.c:102
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Lukkotiedostoa %s:lle ei voitu luoda: %s"
+#: ../camel/camel-imapx-folder.c:112
+#, fuzzy, c-format
+msgid "Could not create cache for %s: "
+msgstr "VÃlimuistitiedostoa ei voitu luoda"
 
-#: ../camel/camel-lock.c:145
-#, c-format, fuzzy
-msgid "Timed out trying to get lock file on %s.  Try again later."
-msgstr "Aikaviivekatkaisu yritettÃessà hankkia lukkotiedostoa %s:lle. Yrità myÃhemmin uudestaan."
+#: ../camel/camel-imapx-folder.c:794
+#: ../camel/providers/imap/camel-imap-folder.c:367
+#: ../camel/providers/nntp/camel-nntp-folder.c:738
+#, fuzzy
+msgid "Apply message _filters to this folder"
+msgstr "Viestejà ei voi kopioida roskakoriin"
 
-#: ../camel/camel-lock.c:205
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Lukitseminen kÃyttÃen fcntl(2) kutsua epÃonnistui: %s"
+#: ../camel/camel-imapx-server.c:1094
+#, fuzzy
+msgid "Server disconnected"
+msgstr "Palvelin katkaisi yhteyden odottamatta"
 
-#: ../camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Lukitseminen kÃyttÃen flock(2) kutsua epÃonnistui: %s"
+#: ../camel/camel-imapx-server.c:1549
+#, fuzzy
+msgid "Error writing to cache stream: "
+msgstr "Virhe kirjoitettaessa vÃliaikaista viestitiedostoa: %s"
 
-#: ../camel/camel-lock-client.c:106
+#: ../camel/camel-imapx-server.c:2500
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Lukitsevan apulaisen putkea ei voi luoda: %s"
+msgid "Not authenticated"
+msgstr "Ei tunnistettu."
 
-#: ../camel/camel-lock-client.c:130
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Lukitsevaa apulaista ei voi kÃynnistÃÃ: %s"
+#: ../camel/camel-imapx-server.c:2580
+#, fuzzy
+msgid "Error performing IDLE"
+msgstr "Virhe suoritettaessa hakua"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-imapx-server.c:3462
+#: ../camel/providers/imap/camel-imap-store.c:414
+#: ../camel/providers/imap/camel-imap-store.c:468
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "\"%s\" ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
+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-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Lukitus 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
+msgid "STARTTLS not supported"
+msgstr "STARTTLS laajennos ei ole kÃytettÃvissÃ"
 
-#: ../camel/camel-movemail.c:105
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "SÃhkÃpostitiedostoa %s ei voitu tarkistaa: %s"
+#: ../camel/camel-imapx-server.c:3502
+#: ../camel/providers/imap/camel-imap-store.c:440
+#, 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-movemail.c:119
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "SÃhkÃpostitiedostoa %s ei voitu avata: %s"
+#: ../camel/camel-imapx-server.c:3580
+#: ../camel/providers/imap/camel-imap-store.c:749
+#, fuzzy, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmÃÃ %s"
 
-#: ../camel/camel-movemail.c:129
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "TilapÃistà sÃhkÃpostitiedostoa %s ei voitu avata: %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
+#, fuzzy, c-format
+msgid "No support for %s authentication"
+msgstr "Varmennusmenetelmà %s ei ole tuettu"
 
-#: ../camel/camel-movemail.c:159
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Viestin tallentaminen vÃliaikaistiedostoon %s epÃonnistui: %s"
+#: ../camel/camel-imapx-server.c:3610
+#: ../camel/providers/imap/camel-imap-store.c:1142
+#: ../camel/providers/nntp/camel-nntp-store.c:502
+#, fuzzy
+msgid "Cannot authenticate without a username"
+msgstr "Tunnistautuminen palvelimelle epÃonnistui: %s"
 
-#: ../camel/camel-movemail.c:193
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Putken luonti 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
+#, fuzzy
+msgid "Authentication password not available"
+msgstr "Todennus epÃonnistui"
 
-#: ../camel/camel-movemail.c:207
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Haaroitus epÃonnistui: %s"
+#: ../camel/camel-imapx-server.c:3821
+#, fuzzy
+msgid "Error fetching message"
+msgstr "Salataan viestiÃ"
 
-#: ../camel/camel-movemail.c:245
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Ohjelma movemail epÃonnistui: %s"
+#: ../camel/camel-imapx-server.c:3903
+#, fuzzy
+msgid "Failed to copy the tmp file"
+msgstr "VÃlimuistiin tallennus epÃonnistui %s: %s"
 
-#: ../camel/camel-movemail.c:246
-msgid "(Unknown error)"
-msgstr "(tuntematon virhe)"
+#: ../camel/camel-imapx-server.c:3917
+#, fuzzy
+msgid "Failed to close the tmp stream"
+msgstr "Tiedon koodaus epÃonnistui"
 
-#: ../camel/camel-movemail.c:273
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Virhe luettaessa viestitiedostoa: %s"
+#: ../camel/camel-imapx-server.c:4015
+#, fuzzy
+msgid "Error copying messages"
+msgstr "Kopioidaan viestejÃ"
 
-#: ../camel/camel-movemail.c:286
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Virhe kirjoitettaessa vÃliaikaista viestitiedostoa: %s"
+#: ../camel/camel-imapx-server.c:4150
+#, fuzzy
+msgid "Error appending message"
+msgstr "LÃhetetÃÃn viestiÃ"
 
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
-#, c-format
-msgid "Error copying mail temp file: %s"
-msgstr "Virhe kopioitaessa viestin vÃliaikaistiedostoa: %s"
+#: ../camel/camel-imapx-server.c:4333
+msgid "Error fetching message headers"
+msgstr ""
 
-#: ../camel/camel-multipart-signed.c:297
-#, c-format, fuzzy
-msgid "No content available"
-msgstr "Ei kuvausta saatavilla"
+#: ../camel/camel-imapx-server.c:4468
+msgid "Error retrieving message"
+msgstr "Virhe haettaessa viestiÃ"
 
-#: ../camel/camel-multipart-signed.c:305
-#, c-format, fuzzy
-msgid "No signature available"
-msgstr "Ei kuvausta saatavilla"
+#: ../camel/camel-imapx-server.c:4590 ../camel/camel-imapx-server.c:4783
+#, fuzzy, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "Haetaan yhteenvetoa uusista viesteistà kansiossa %s"
 
-#: ../camel/camel-multipart-signed.c:689
-#, c-format
-msgid "parse error"
-msgstr "Virhe tulkittaessa"
+#: ../camel/camel-imapx-server.c:4641
+#, fuzzy, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "EtsitÃÃn muuttuneita viestejà kansiosta %s"
 
-#: ../camel/camel-net-utils.c:703
-#, c-format
-msgid "Resolving: %s"
-msgstr "Ratkaistaan: %s"
+#: ../camel/camel-imapx-server.c:4684
+#, fuzzy
+msgid "Error fetching new messages"
+msgstr "EtsitÃÃn uusia viestejÃ"
 
-#: ../camel/camel-net-utils.c:726
-msgid "Host lookup failed"
-msgstr "Palvelimen osoitteen haku epÃonnistui"
+#: ../camel/camel-imapx-server.c:4874
+#, fuzzy
+msgid "Error while fetching messages"
+msgstr "Varmistetaan viestiÃ"
 
-#: ../camel/camel-net-utils.c:732
-#, c-format
-msgid "Host lookup failed: %s: %s"
-msgstr "Palvelimen %s osoitteen haku epÃonnistui: %s"
+#: ../camel/camel-imapx-server.c:4882 ../camel/camel-imapx-server.c:4918
+#, 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-net-utils.c:853
-msgid "Resolving address"
+#: ../camel/camel-imapx-server.c:5043 ../camel/camel-imapx-server.c:5079
+#, fuzzy
+msgid "Error refreshing folder"
+msgstr "Virhe suoritettaessa hakua"
+
+#: ../camel/camel-imapx-server.c:5172
+#, fuzzy
+msgid "Error expunging message"
+msgstr "Poistetaan vanhoja viestejà pysyvÃsti"
+
+#: ../camel/camel-imapx-server.c:5269
+#, fuzzy
+msgid "Error fetching folders"
+msgstr "Tallennetaan kansiota"
+
+#: ../camel/camel-imapx-server.c:5348
+#, fuzzy
+msgid "Error subscribing to folder"
+msgstr "_NÃytà ainoastaan tilatut kansiot"
+
+#: ../camel/camel-imapx-server.c:5409
+msgid "Error creating folder"
+msgstr "Virhe luotaessa kansiota"
+
+#: ../camel/camel-imapx-server.c:5458
+#, fuzzy
+msgid "Error deleting folder"
+msgstr "Tallennetaan kansiota"
+
+#: ../camel/camel-imapx-server.c:5519
+#, fuzzy
+msgid "Error renaming folder"
+msgstr "Tallennetaan kansiota"
+
+#: ../camel/camel-imapx-server.c:5580
+#, fuzzy
+msgid "Error performing NOOP"
+msgstr "Virhe suoritettaessa hakua"
+
+#: ../camel/camel-imapx-server.c:5676
+msgid "Error syncing changes"
+msgstr ""
+
+#: ../camel/camel-imapx-server.c:6447
+#: ../camel/providers/imap/camel-imap-folder.c:3531
+#, 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
+msgid "No such message available."
+msgstr "TÃmà viesti ei ole saatavilla."
+
+#: ../camel/camel-imapx-server.c:6603 ../camel/camel-imapx-server.c:6618
+#, 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
+#, c-format
+msgid "IMAP server %s"
+msgstr "Imap-palvelin %s"
+
+#: ../camel/camel-imapx-store.c:160
+#: ../camel/providers/imap/camel-imap-store.c:830
+#, 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/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
+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
+#, 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/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-spool-store.c:393
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: ../camel/camel-imapx-store.c:1099
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "Source stream returned no data"
+msgstr ""
+
+#: ../camel/camel-imapx-stream.c:106
+#, fuzzy, c-format
+msgid "Source stream unavailable"
+msgstr "Palvelu ei ole saatavilla"
+
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Lukkotiedostoa %s:lle ei voitu luoda: %s"
+
+#: ../camel/camel-lock.c:145
+#, fuzzy, c-format
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"Aikaviivekatkaisu yritettÃessà hankkia lukkotiedostoa %s:lle. Yrità "
+"myÃhemmin uudestaan."
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Lukitseminen kÃyttÃen fcntl(2) kutsua epÃonnistui: %s"
+
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Lukitseminen kÃyttÃen flock(2) kutsua epÃonnistui: %s"
+
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Lukitsevan apulaisen putkea ei voi luoda: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Lukitsevaa apulaista ei voi kÃynnistÃÃ: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "\"%s\" ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Lukitus epÃonnistui: %s"
+
+#: ../camel/camel-movemail.c:105
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "SÃhkÃpostitiedostoa %s ei voitu tarkistaa: %s"
+
+#: ../camel/camel-movemail.c:119
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "SÃhkÃpostitiedostoa %s ei voitu avata: %s"
+
+#: ../camel/camel-movemail.c:129
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr "TilapÃistà sÃhkÃpostitiedostoa %s ei voitu avata: %s"
+
+#: ../camel/camel-movemail.c:159
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "Viestin tallentaminen vÃliaikaistiedostoon %s epÃonnistui: %s"
+
+#: ../camel/camel-movemail.c:193
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr "Putken luonti epÃonnistui: %s"
+
+#: ../camel/camel-movemail.c:207
+#, c-format
+msgid "Could not fork: %s"
+msgstr "Haaroitus epÃonnistui: %s"
+
+#: ../camel/camel-movemail.c:245
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr "Ohjelma movemail epÃonnistui: %s"
+
+#: ../camel/camel-movemail.c:246
+msgid "(Unknown error)"
+msgstr "(tuntematon virhe)"
+
+#: ../camel/camel-movemail.c:273
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Virhe luettaessa viestitiedostoa: %s"
+
+#: ../camel/camel-movemail.c:286
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Virhe kirjoitettaessa vÃliaikaista viestitiedostoa: %s"
+
+#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Virhe kopioitaessa viestin vÃliaikaistiedostoa: %s"
+
+#: ../camel/camel-multipart-signed.c:297
+#, c-format
+msgid "No content available"
+msgstr "Ei sisÃltÃÃ saatavilla"
+
+#: ../camel/camel-multipart-signed.c:305
+#, c-format
+msgid "No signature available"
+msgstr "Ei allekirjoitusta saatavilla"
+
+#: ../camel/camel-multipart-signed.c:689
+#, c-format
+msgid "parse error"
+msgstr "Virhe tulkittaessa"
+
+#: ../camel/camel-net-utils.c:703
+#, c-format
+msgid "Resolving: %s"
+msgstr "Ratkaistaan: %s"
+
+#: ../camel/camel-net-utils.c:726
+msgid "Host lookup failed"
+msgstr "Palvelimen osoitteen haku epÃonnistui"
+
+#: ../camel/camel-net-utils.c:732
+#, c-format
+msgid "Host lookup failed: %s: %s"
+msgstr "Palvelimen %s osoitteen haku epÃonnistui: %s"
+
+#: ../camel/camel-net-utils.c:853
+msgid "Resolving address"
 msgstr "EtsitÃÃn osoitetta"
 
 #: ../camel/camel-net-utils.c:874
@@ -2279,12 +2644,12 @@ msgstr "Nimikysely epÃonnistui"
 msgid "Name lookup failed: %s"
 msgstr "Nimen haku epÃonnistui: %s"
 
-#: ../camel/camel-network-service.c:112
-#, c-format, fuzzy
+#: ../camel/camel-network-service.c:114
+#, fuzzy, c-format
 msgid "Could not connect to %s: "
 msgstr "Yhteyttà %s:ÃÃn ei voitu luoda: %s"
 
-#: ../camel/camel-offline-folder.c:206
+#: ../camel/camel-offline-folder.c:210
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkronoidaan viestejà kansiossa %s levylle"
@@ -2302,22 +2667,24 @@ 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:193
+#: ../camel/camel-provider.c:195
 #, 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."
+msgstr ""
+"Moduulin %s lataaminen epÃonnistui: JÃrjestelmÃsi ei tue moduulien "
+"lataamista."
 
-#: ../camel/camel-provider.c:202
+#: ../camel/camel-provider.c:204
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ei voitu ladata: %s"
 
-#: ../camel/camel-provider.c:211
+#: ../camel/camel-provider.c:213
 #, 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:402 ../camel/camel-session.c:384
+#: ../camel/camel-provider.c:412 ../camel/camel-session.c:406
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
@@ -2337,61 +2704,82 @@ msgstr "Todennus epÃonnistui."
 
 #: ../camel/camel-sasl-anonymous.c:81
 #, c-format
-msgid "Invalid email address trace information:\n%s"
-msgstr "Virheellinen sÃhkÃpostiosoitteen seurantatieto:\n%s"
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+"Virheellinen sÃhkÃpostiosoitteen seurantatieto:\n"
+"%s"
 
 #: ../camel/camel-sasl-anonymous.c:95
 #, c-format
-msgid "Invalid opaque trace information:\n%s"
-msgstr "Virheellinen lÃpinÃkyvÃn seurannan tieto:\n%s"
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Virheellinen lÃpinÃkyvÃn seurannan tieto:\n"
+"%s"
 
 #: ../camel/camel-sasl-anonymous.c:109
 #, c-format
-msgid "Invalid trace information:\n%s"
-msgstr "Virheellinen seurannan tieto:\n%s"
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Virheellinen seurannan tieto:\n"
+"%s"
 
 #: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: ../camel/camel-sasl-cram-md5.c:48
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "TÃmà vaihtoehto yhdistÃà palvelimeen kÃyttÃen turvallista CRAM-MD5 salasanaa, jos palvelin tukee tÃtÃ."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"TÃmà vaihtoehto yhdistÃà palvelimeen kÃyttÃen turvallista CRAM-MD5 "
+"salasanaa, jos palvelin tukee tÃtÃ."
 
 #: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: ../camel/camel-sasl-digest-md5.c:61
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "TÃmà vaihtoehto ottaa yhteyttà palvelimeen kÃyttÃen turvallista DIGEST-MD5 salasanaa, jos palvelin tukee tÃtÃ."
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"TÃmà vaihtoehto ottaa yhteyttà palvelimeen kÃyttÃen turvallista DIGEST-MD5 "
+"salasanaa, jos palvelin tukee tÃtÃ."
 
-#: ../camel/camel-sasl-digest-md5.c:850
+#: ../camel/camel-sasl-digest-md5.c:855
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Palvelimen haaste liian pitkà (>2048 tavua)"
 
-#: ../camel/camel-sasl-digest-md5.c:861
+#: ../camel/camel-sasl-digest-md5.c:866
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Palvelimen haaste on virheellinen\n"
 
-#: ../camel/camel-sasl-digest-md5.c:869
+#: ../camel/camel-sasl-digest-md5.c:874
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Palvelimen haaste sisÃlsi virheellisen \"Quality of Protection\" kentÃn"
+msgstr ""
+"Palvelimen haaste sisÃlsi virheellisen \"Quality of Protection\" kentÃn"
 
-#: ../camel/camel-sasl-digest-md5.c:902
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Palvelimen vaste ei sisÃltÃnyt todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:923
+#: ../camel/camel-sasl-digest-md5.c:928
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Palvelimen vaste sisÃlsi vajaata todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:936
+#: ../camel/camel-sasl-digest-md5.c:941
 #, c-format
 msgid "Server response does not match"
 msgstr "Palvelimen vaste ei vastaa haluttua"
@@ -2402,31 +2790,52 @@ msgstr "GSSAPI"
 
 #: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "TÃmà vaihtoehto yhdistÃà palvelimeen kÃyttÃen Kerberos 5 - tunnistautumista."
+msgstr ""
+"TÃmà vaihtoehto yhdistÃà palvelimeen kÃyttÃen Kerberos 5 - tunnistautumista."
 
 #: ../camel/camel-sasl-gssapi.c:134
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "Annettu valtuustieto ei tue mÃÃriteltyà mekanismia, tai se on toteutukselle tuntematon."
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"Annettu valtuustieto ei tue mÃÃriteltyà mekanismia, tai se on toteutukselle "
+"tuntematon."
 
 #: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "MÃÃritelty target_name parametri oli vÃÃrin muotoiltu."
 
 #: ../camel/camel-sasl-gssapi.c:142
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "MÃÃritelty target_name parametri sisÃlsi virheellisen tai tukemattoman tyyppisen nimen."
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"MÃÃritelty target_name parametri sisÃlsi virheellisen tai tukemattoman "
+"tyyppisen nimen."
 
 #: ../camel/camel-sasl-gssapi.c:146
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "input_token sisÃltÃà eri kanavasidontoja kun mità on mÃÃritelty input_chan_bindings parametrissa."
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"input_token sisÃltÃà eri kanavasidontoja kun mità on mÃÃritelty "
+"input_chan_bindings parametrissa."
 
 #: ../camel/camel-sasl-gssapi.c:151
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token sisÃltÃÃ virheellisen allekirjoituksen tai allekirjoituksen, jota ei voi varmentaa."
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"input_token sisÃltÃÃ virheellisen allekirjoituksen tai allekirjoituksen, "
+"jota ei voi varmentaa."
 
 #: ../camel/camel-sasl-gssapi.c:155
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "Annetut valtuustiedot eivÃt ole kelvollisia tÃmÃn tilan alustamisessa tai valtuustiedon kahva ei viitannut mihinkÃÃn valtuustietoihin."
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"Annetut valtuustiedot eivÃt ole kelvollisia tÃmÃn tilan alustamisessa tai "
+"valtuustiedon kahva ei viitannut mihinkÃÃn valtuustietoihin."
 
 #: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
@@ -2444,14 +2853,14 @@ msgstr "Valtuustiedoille tehdyt eheystarkistukset epÃonnistuivat."
 msgid "The referenced credentials have expired."
 msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
-#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:562
+#: ../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
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
-#: ../camel/camel-sasl-gssapi.c:410
+#: ../camel/camel-sasl-gssapi.c:417
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Turvakerros ei ole tuettu."
@@ -2464,7 +2873,7 @@ msgstr "Kirjautuminen"
 msgid "This option will connect to the server using a simple password."
 msgstr "TÃmà valitsin yhdistÃà palvelimeen yksinkertaista salasanaa kÃyttÃen."
 
-#: ../camel/camel-sasl-login.c:107
+#: ../camel/camel-sasl-login.c:110
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Tuntematon todennustila."
@@ -2474,8 +2883,12 @@ msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 #: ../camel/camel-sasl-ntlm.c:49
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "TÃmà vaihtoehto yhdistÃà Windows-palvelimeen kÃyttÃen NTLM/Secure Password tunnistautumista."
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"TÃmà vaihtoehto yhdistÃà Windows-palvelimeen kÃyttÃen NTLM/Secure Password "
+"tunnistautumista."
 
 #: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
@@ -2487,7 +2900,9 @@ msgstr "POP ennen SMTP:tÃ"
 
 #: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "TÃmà vaihtoehto tunnistautuu POP-yhteyteen, ennen kuin yrittÃà SMTP:n kÃyttÃÃ."
+msgstr ""
+"TÃmà vaihtoehto tunnistautuu POP-yhteyteen, ennen kuin yrittÃà SMTP:n "
+"kÃyttÃÃ."
 
 #: ../camel/camel-sasl-popb4smtp.c:84
 #, fuzzy
@@ -2495,12 +2910,13 @@ msgid "POP Source UID"
 msgstr "POP:in lÃhde-URI"
 
 #: ../camel/camel-sasl-popb4smtp.c:96
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
-msgstr "POP ennen SMTP:tà tunnistautuminen kÃyttÃen tuntematonta siirtomenetelmÃÃ"
+msgstr ""
+"POP ennen SMTP:tà tunnistautuminen kÃyttÃen tuntematonta siirtomenetelmÃÃ"
 
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
-#, c-format, fuzzy
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
+#, 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"
 
@@ -2509,32 +2925,26 @@ msgstr "POP ennen SMTP:tà kÃyttÃen lÃhdettÃ, joka ei ole POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "SÃÃnnÃllisen lausekkeen kÃÃnnÃs epÃonnistui: %s: %s"
 
-#: ../camel/camel-session.c:393
-#, c-format, fuzzy
+#: ../camel/camel-session.c:415
+#, fuzzy, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/camel-session.c:472
-#: ../camel/providers/imap/camel-imap-store.c:1143
-#: ../camel/providers/imapx/camel-imapx-server.c:2936
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../camel/providers/smtp/camel-smtp-transport.c:455
-#, c-format, fuzzy
-msgid "No support for %s authentication"
-msgstr "Varmennusmenetelmà %s ei ole tuettu"
-
-#: ../camel/camel-session.c:487
-#, c-format, fuzzy
+#: ../camel/camel-session.c:509
+#, fuzzy, c-format
 msgid "%s authentication failed"
 msgstr "Todennus epÃonnistui"
 
-#: ../camel/camel-session.c:1194
+#: ../camel/camel-session.c:645
+msgid "Forwarding messages is not supported"
+msgstr ""
+
+#: ../camel/camel-session.c:1362
 #, 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:1057
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Varmennetta \"%s\":lle ei lÃydy"
@@ -2663,112 +3073,112 @@ msgstr "Viesti on itsessÃÃn varmenne, varmenteet tuotu ja tarkistettu"
 msgid "Cannot find signature digests"
 msgstr "Allekirjoitustiivisteità ei lÃydy"
 
-#: ../camel/camel-smime-context.c:661
+#: ../camel/camel-smime-context.c:662
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allekirjoittaja: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
 msgid "Cannot create encoder context"
 msgstr "Kooderin kontekstia ei voi luoda"
 
-#: ../camel/camel-smime-context.c:848
+#: ../camel/camel-smime-context.c:850
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS-kooderiin ei voitu lisÃtà tietoa"
 
-#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
 msgid "Failed to encode data"
 msgstr "Tiedon koodaus epÃonnistui"
 
-#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
+#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
 msgid "Decoder failed"
 msgstr "Purkaja epÃonnistui"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Yhteistà massasalausalgoritmia ei lÃydy"
 
-#: ../camel/camel-smime-context.c:1073
+#: ../camel/camel-smime-context.c:1076
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Lokeroa massasalausavaimelle ei voi varata"
 
-#: ../camel/camel-smime-context.c:1084
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot create CMS Message"
 msgstr "CMS-viestià ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS-kÃÃrittyà tietoa ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1096
+#: ../camel/camel-smime-context.c:1099
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS-kÃÃrittyà tietoa ei voi liittÃÃ"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1105
 msgid "Cannot attach CMS data object"
 msgstr "CMS tieto-oliota ei voi liittÃÃ"
 
-#: ../camel/camel-smime-context.c:1111
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1116
+#: ../camel/camel-smime-context.c:1119
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi lisÃtÃ"
 
-#: ../camel/camel-smime-context.c:1141
+#: ../camel/camel-smime-context.c:1145
 msgid "Failed to add data to encoder"
 msgstr "Tiedon lisÃys koodaajaan epÃonnistui"
 
-#: ../camel/camel-smime-context.c:1250
+#: ../camel/camel-smime-context.c:1255
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME purku: salauskontekstia ei lÃytynyt"
 
-#: ../camel/camel-store.c:1799
+#: ../camel/camel-store.c:1838
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Kansiota \"%s\" ei voi luoda: kansio on jo olemassa"
 
-#: ../camel/camel-store.c:1842
-#, c-format, fuzzy
+#: ../camel/camel-store.c:1881
+#, c-format
 msgid "Opening folder '%s'"
-msgstr "Synkronoidaan kansiota"
+msgstr "Avataan kansiota â%sâ"
 
-#: ../camel/camel-store.c:2027
-#, c-format, fuzzy
+#: ../camel/camel-store.c:2066
+#, c-format
 msgid "Scanning folders in '%s'"
-msgstr "EtsitÃÃn muuttuneita viestejà kansiosta %s"
+msgstr "Tutkitaan kansion â%sâ alikansioita"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Roskakori"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
+#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../camel/camel-store.c:2501
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
 
-#: ../camel/camel-store.c:2515
-#, c-format, fuzzy
+#: ../camel/camel-store.c:2554
+#, c-format
 msgid "Creating folder '%s'"
-msgstr "Kansiota \"%s\" ei voi hakea: %s"
+msgstr "Luodaan kansiota '%s'"
 
-#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:300
+#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:306
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:764
+#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/providers/local/camel-maildir-store.c:788
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeÃminen ei onnistu: %s: virheellinen toiminto"
@@ -2777,195 +3187,243 @@ msgstr "Kansion nimeÃminen ei onnistu: %s: virheellinen toiminto"
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr ""
 
-#: ../camel/camel-stream-process.c:267
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr ""
+
+#: ../camel/camel-stream-process.c:275
 #, c-format
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: ../camel/camel-stream-process.c:272
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Komentoon \"%s\" liittyminen epÃonnistui: %s"
 
+#: ../camel/camel-subscribable.c:386
+#, fuzzy, c-format
+msgid "Subscribing to folder '%s'"
+msgstr "_NÃytà ainoastaan tilatut kansiot"
+
+#: ../camel/camel-subscribable.c:518
+#, fuzzy, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "_NÃytà ainoastaan tilatut kansiot"
+
 #: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658
+#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:669
+#: ../camel/camel-tcp-stream-raw.c:675
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
+#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:777
-#, c-format, fuzzy
+#: ../camel/camel-tcp-stream-raw.c:789
+#, fuzzy, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "Varmennusmenetelmà %s ei ole tuettu"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:801
 msgid "General SOCKS server failure"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:802
 msgid "SOCKS server's rules do not allow connection"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:791
+#: ../camel/camel-tcp-stream-raw.c:803
 msgid "Network is unreachable from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:792
+#: ../camel/camel-tcp-stream-raw.c:804
 msgid "Host is unreachable from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:793
-#, fuzzy
+#: ../camel/camel-tcp-stream-raw.c:805
 msgid "Connection refused"
-msgstr "Yhteys peruutettu"
+msgstr "Yhteys torjuttu"
 
-#: ../camel/camel-tcp-stream-raw.c:794
+#: ../camel/camel-tcp-stream-raw.c:806
 msgid "Time-to-live expired"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:795
+#: ../camel/camel-tcp-stream-raw.c:807
 #, fuzzy
 msgid "Command not supported by SOCKS server"
 msgstr "Palvelin ei tue STLS-laajennosta"
 
-#: ../camel/camel-tcp-stream-raw.c:796
+#: ../camel/camel-tcp-stream-raw.c:808
 #, fuzzy
 msgid "Address type not supported by SOCKS server"
 msgstr "Palvelin ei tue STLS-laajennosta"
 
-#: ../camel/camel-tcp-stream-raw.c:797
-#, fuzzy
+#: ../camel/camel-tcp-stream-raw.c:809
 msgid "Unknown error from SOCKS server"
-msgstr "Tuntematon virhe: %s"
+msgstr "Tuntematon virhe SOCKS-palvelimelta."
 
-#: ../camel/camel-tcp-stream-raw.c:830
+#: ../camel/camel-tcp-stream-raw.c:842
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:848
-#, c-format, fuzzy
+#: ../camel/camel-tcp-stream-raw.c:860
+#, fuzzy, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "Virheellinen vastaus palvelimelta"
 
-#: ../camel/camel-tcp-stream-raw.c:868
+#: ../camel/camel-tcp-stream-raw.c:880
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr ""
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
-#, c-format, fuzzy
+#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
+#, c-format
 msgid "Invalid reply from proxy server"
-msgstr "Virheellinen vastaus palvelimelta"
+msgstr "Virheellinen vastaus vÃlityspalvelimelta"
 
-#: ../camel/camel-tcp-stream-ssl.c:474
-#, c-format, fuzzy
-msgid "   Issuer:       %s\n   Subject:      %s\n   Fingerprint:  %s\n   Signature:    %s"
-msgstr "MyÃntÃjÃ:          %s\nAihe:              %s\nSormenjÃlki:       %s\nAllekirjoitus:     %s"
+#: ../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:480
+#: ../camel/camel-tcp-stream-ssl.c:512
 msgid "GOOD"
 msgstr "HYVÃKSYTTY"
 
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:512
 msgid "BAD"
 msgstr "VIRHEELLINEN"
 
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:517
 #, c-format
-msgid "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n\nDetailed information about the certificate:\n%s"
+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:488
+#: ../camel/camel-tcp-stream-ssl.c:523
 msgid "_Reject"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-ssl.c:489
+#: ../camel/camel-tcp-stream-ssl.c:524
 msgid "Accept _Temporarily"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-ssl.c:490
+#: ../camel/camel-tcp-stream-ssl.c:525
 msgid "_Accept Permanently"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-ssl.c:548
+#: ../camel/camel-tcp-stream-ssl.c:586
 #, c-format
-msgid "Certificate problem: %s\nIssuer: %s"
-msgstr "Ongelma varmenteessa: %s\nMyÃntÃjÃ: %s"
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+"Ongelma varmenteessa: %s\n"
+"MyÃntÃjÃ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:600
+#: ../camel/camel-tcp-stream-ssl.c:638
 #, c-format
-msgid "Bad certificate domain: %s\nIssuer: %s"
-msgstr "Virheellinen varmenteen alue: %s\nMyÃntÃjà %s"
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+"Virheellinen varmenteen alue: %s\n"
+"MyÃntÃjà %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:618
+#: ../camel/camel-tcp-stream-ssl.c:656
 #, c-format
-msgid "Certificate expired: %s\nIssuer: %s"
-msgstr "Varmenne vanhentunut: %s\nMyÃntÃjÃ: %s"
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+"Varmenne vanhentunut: %s\n"
+"MyÃntÃjÃ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:635
+#: ../camel/camel-tcp-stream-ssl.c:673
 #, c-format
-msgid "Certificate revocation list expired: %s\nIssuer: %s"
-msgstr "Varmenteiden hylkÃyslista vanhentunut: %s\nMyÃntÃjÃ: %s"
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+"Varmenteiden hylkÃyslista vanhentunut: %s\n"
+"MyÃntÃjÃ: %s"
 
-#: ../camel/camel-url.c:330
+#: ../camel/camel-url.c:331
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URLia \"%s\" ei voi tulkita"
 
-#: ../camel/camel-vee-folder.c:652
-#, c-format, fuzzy
-msgid "Updating %s folder"
-msgstr "Tallennetaan kansiota"
+#: ../camel/camel-vee-folder.c:494
+#, fuzzy, c-format
+msgid "Updating folder '%s'"
+msgstr "Kansiota \"%s\" ei voi hakea: %s"
 
-#: ../camel/camel-vee-folder.c:1326 ../camel/camel-vee-folder.c:1483
+#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Viestien kopioiminen tai siirtÃminen ei onnistu virtuaalisiin kansioihin"
+msgstr ""
+"Viestien kopioiminen tai siirtÃminen ei onnistu virtuaalisiin kansioihin"
 
-#: ../camel/camel-vee-folder.c:1359
+#: ../camel/camel-vee-folder.c:888
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Viestià %s ei voitu lÃytÃà %s:stÃ"
 
-#: ../camel/camel-vee-folder.c:1427
-#, c-format, fuzzy
+#: ../camel/camel-vee-folder.c:941
+#, fuzzy, c-format
 msgid "Error storing '%s': "
 msgstr "Virhe tallennettaessa \"%s\": %s"
 
+#: ../camel/camel-vee-folder.c:1169
+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:37
+#: ../camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "Ei vastaavaa"
 
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:470
 #, 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
+msgid "Enable _Unmatched folder"
+msgstr ""
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Viestejà ei voi kopioida roskakoriin"
@@ -2975,127 +3433,115 @@ 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:297
+#: ../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:305
+#: ../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:383
+#: ../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:416
-#, c-format, fuzzy
-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: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:420
+#: ../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"
+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:502
+#: ../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:514
+#: ../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:594
+#: ../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:806
+#: ../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:844
+#: ../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:348
+#: ../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:359
-#: ../camel/providers/imapx/camel-imapx-folder.c:747
-#: ../camel/providers/nntp/camel-nntp-folder.c:760
-#, fuzzy
-msgid "Apply message _filters to this folder"
-msgstr "Viestejà ei voi kopioida roskakoriin"
-
-#: ../camel/providers/imap/camel-imap-folder.c:440
+#: ../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:461
+#: ../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:1119
-#: ../camel/providers/imapx/camel-imapx-server.c:3938
+#: ../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:3478
+#: ../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:3515
-#: ../camel/providers/imapx/camel-imapx-server.c:5497
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "Viestià tunnisteella %s ei voi noutaa: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3516
-#: ../camel/providers/imapx/camel-imapx-server.c:5498
-msgid "No such message available."
-msgstr "TÃmà viesti ei ole saatavilla."
-
-#: ../camel/providers/imap/camel-imap-folder.c:3591
-#: ../camel/providers/imap/camel-imap-folder.c:4469
-#: ../camel/providers/nntp/camel-nntp-folder.c:515
+#: ../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:4050
-#: ../camel/providers/imap/camel-imap-folder.c:4133
-#: ../camel/providers/imapx/camel-imapx-server.c:3890
-#: ../camel/providers/imapx/camel-imapx-server.c:4070
+#: ../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:4267
+#: ../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"
+msgstr ""
+"EpÃtÃydellinen vastaus palvelimelta: viestille %d ei lÃytynyt mitÃÃn tietoja"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4277
+#: ../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:4509
+#: ../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"
@@ -3112,495 +3558,236 @@ 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
-#, c-format, fuzzy
+#, 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
-#, c-format, fuzzy
+#, 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: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: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: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:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "Yhteys palvelimeen"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "KÃytà _omaa komentoa palvelimeen yhdistÃmiseen"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "Ko_mento:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../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:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-msgid "_Show only subscribed folders"
-msgstr "_NÃytà ainoastaan tilatut kansiot"
-
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
-msgid "O_verride server-supplied folder namespace"
-msgstr "Ohita pal_velimen tarjoama kansioiden nimiavaruus"
-
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#, fuzzy
-msgid "Names_pace:"
-msgstr "Nimiavaruus:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
-#: ../camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Options"
-msgstr "Asetukset"
-
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-#: ../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"
-
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
-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:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Check new messages for _Junk contents"
-msgstr "_Etsi roskapostia uusista viesteistÃ"
-
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Etsi roskapostia vain saapuvien kansiosta"
-
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
-msgid "Automatically synchroni_ze remote mail locally"
-msgstr "_Synkronoi sÃhkÃposti etÃpalvelimelta automaattisesti"
-
-#: ../camel/providers/imap/camel-imap-provider.c:80
-msgid "IMAP default port"
-msgstr "IMAPin oletusportti"
-
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
-#, fuzzy
-msgid "IMAP over SSL"
-msgstr "Imap-palvelin %s"
-
-#: ../camel/providers/imap/camel-imap-provider.c:87
-msgid "IMAP"
-msgstr "IMAP"
-
-#: ../camel/providers/imap/camel-imap-provider.c:89
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
-msgid "For reading and storing mail on IMAP servers."
-msgstr "SÃhkÃpostien luku ja tallennus IMAP-palvelimilta."
-
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:118
-#: ../camel/providers/nntp/camel-nntp-provider.c:84
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
-msgid "Password"
-msgstr "Salasana"
-
-#: ../camel/providers/imap/camel-imap-provider.c:109
-#: ../camel/providers/imapx/camel-imapx-provider.c:120
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ota yhteys IMAP-palvelimeen selvÃkielistà salasanaa kÃyttÃen."
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:272
-#: ../camel/providers/imap/camel-imap-store.c:2694
-#: ../camel/providers/imapx/camel-imapx-store.c:373
-#: ../camel/providers/imapx/camel-imapx-store.c:844
-#: ../camel/providers/local/camel-maildir-folder.c:471
-#: ../camel/providers/local/camel-maildir-store.c:301
-#: ../camel/providers/local/camel-maildir-store.c:675
-#: ../camel/providers/local/camel-maildir-store.c:681
-#: ../camel/providers/local/camel-maildir-store.c:765
-#: ../camel/providers/local/camel-spool-store.c:387
-msgid "Inbox"
-msgstr "Saapuneet"
-
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/imap/camel-imap-store.c:463
-#: ../camel/providers/imapx/camel-imapx-server.c:2818
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "IMAP-palvelimeen %s yhdistÃminen turvallisessa muodossa epÃonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:2819
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
-msgid "STARTTLS not supported"
-msgstr "STARTTLS laajennos ei ole kÃytettÃvissÃ"
-
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imapx/camel-imapx-server.c:2858
-#, c-format, fuzzy
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "IMAP-palvelimeen %s yhdistÃminen turvallisessa muodossa epÃonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:734
-#: ../camel/providers/imapx/camel-imapx-server.c:2925
-#, c-format, fuzzy
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmÃÃ %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:809
-#: ../camel/providers/imapx/camel-imapx-store.c:155
-#, c-format
-msgid "IMAP server %s"
-msgstr "Imap-palvelin %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:812
-#: ../camel/providers/imapx/camel-imapx-store.c:158
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-palvelin %s:lle palvelimella %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:1111
-#: ../camel/providers/imapx/camel-imapx-server.c:2955
-#: ../camel/providers/nntp/camel-nntp-store.c:505
-#, fuzzy
-msgid "Cannot authenticate without a username"
-msgstr "Tunnistautuminen palvelimelle epÃonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:1119
-#: ../camel/providers/imapx/camel-imapx-server.c:2964
-#: ../camel/providers/nntp/camel-nntp-store.c:514
-#: ../camel/providers/pop3/camel-pop3-store.c:491
-#: ../camel/providers/pop3/camel-pop3-store.c:511
-#, fuzzy
-msgid "Authentication password not available"
-msgstr "Todennus epÃonnistui"
-
-#: ../camel/providers/imap/camel-imap-store.c:2065
-#: ../camel/providers/imap/camel-imap-store.c:2269
-#: ../camel/providers/imapx/camel-imapx-store.c:348
-#, c-format
-msgid "No such folder %s"
-msgstr "Kansioita %s ei ole olemassa"
-
-#: ../camel/providers/imap/camel-imap-store.c:2079
-#: ../camel/providers/imap/camel-imap-store.c:2538
-#: ../camel/providers/imapx/camel-imapx-store.c:1388
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisÃltÃÃ merkin \"%c\""
-
-#: ../camel/providers/imap/camel-imap-store.c:2143
-#: ../camel/providers/imap/camel-imap-store.c:2602
-#: ../camel/providers/imapx/camel-imapx-store.c:1409
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Ylempi kansio ei voi sisÃltÃÃ alikansioita"
-
-#: ../camel/providers/imap/camel-imap-store.c:2196
-#: ../camel/providers/local/camel-maildir-store.c:268
-#: ../camel/providers/local/camel-mbox-store.c:421
-#: ../camel/providers/local/camel-mh-store.c:558
-#, 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:2551
-#: ../camel/providers/imapx/camel-imapx-store.c:1399
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Ylempi kansio on tuntematon: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:3326
-#, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "Palvelin katkaisi yhteyden odottamatta"
-
-#: ../camel/providers/imap/camel-imap-store.c:3329
-#, fuzzy
-msgid "Server unexpectedly disconnected: "
-msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:101
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:109
-#, c-format, fuzzy
-msgid "Could not create cache for %s: "
-msgstr "VÃlimuistitiedostoa ei voitu luoda"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use _Quick Resync if the server supports it"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
-msgid "_Listen for server change notifications"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "Komento:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
-msgid "Namespace:"
-msgstr "Nimiavaruus:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "Default IMAP port"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:817
-#, fuzzy
-msgid "Server disconnected"
-msgstr "Palvelin katkaisi yhteyden odottamatta"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1203
-#, fuzzy
-msgid "Error writing to cache stream: "
-msgstr "Virhe kirjoitettaessa vÃliaikaista viestitiedostoa: %s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1930
-#, c-format, fuzzy
-msgid "Not authenticated"
-msgstr "Tunnistautuminen epÃonnistui.\n"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1995
-#, fuzzy
-msgid "Error performing IDLE"
-msgstr "Virhe suoritettaessa hakua"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3150
-#, fuzzy
-msgid "Error fetching message"
-msgstr "Salataan viestiÃ"
+#: ../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/imapx/camel-imapx-server.c:3218
-#, fuzzy
-msgid "Closing tmp stream failed: "
-msgstr "Postitus epÃonnistui: %s"
+#: ../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/imapx/camel-imapx-server.c:3317
+#: ../camel/providers/imap/camel-imap-provider.c:53
 #, fuzzy
-msgid "Error copying messages"
-msgstr "Kopioidaan viestejÃ"
+msgid "Names_pace:"
+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/nntp/camel-nntp-provider.c:41
+msgid "Options"
+msgstr "Asetukset"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3447
+#: ../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 "Error appending message"
-msgstr "LÃhetetÃÃn viestiÃ"
+msgid "Apply _filters to new messages in all folders"
+msgstr "_KÃytà suodattimia uusille viesteille saapuvien kansiossa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3627
-msgid "Error fetching message headers"
+#: ../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/imapx/camel-imapx-server.c:3768
-#, fuzzy
-msgid "Error retrieving message"
-msgstr "Uutisryhmien haku epÃonnistui:\n\n%s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3971
-#, fuzzy
-msgid "Error fetching new messages"
-msgstr "EtsitÃÃn uusia viestejÃ"
+#: ../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/imapx/camel-imapx-server.c:4161
-#, fuzzy
-msgid "Error while fetching messages"
-msgstr "Varmistetaan viestiÃ"
+#: ../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/imapx/camel-imapx-server.c:4169
-#: ../camel/providers/imapx/camel-imapx-server.c:4199
-#, c-format, fuzzy
-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/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/imapx/camel-imapx-server.c:4321
-#: ../camel/providers/imapx/camel-imapx-server.c:4355
-#, fuzzy
-msgid "Error refreshing folder"
-msgstr "Virhe suoritettaessa hakua"
+#: ../camel/providers/imap/camel-imap-provider.c:71
+msgid "IMAP default port"
+msgstr "IMAPin oletusportti"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4444
-#, fuzzy
-msgid "Error expunging message"
-msgstr "Poistetaan vanhoja viestejà pysyvÃsti"
+#: ../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/imapx/camel-imapx-server.c:4528
-#, fuzzy
-msgid "Error fetching folders"
-msgstr "Tallennetaan kansiota"
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4602
-#, fuzzy
-msgid "Error subscribing to folder"
-msgstr "_NÃytà ainoastaan tilatut kansiot"
+#: ../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/imapx/camel-imapx-server.c:4655
-#, fuzzy
-msgid "Error creating folder"
-msgstr "Tallennetaan kansiota"
+#: ../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/imapx/camel-imapx-server.c:4700
-#, fuzzy
-msgid "Error deleting folder"
-msgstr "Tallennetaan kansiota"
+#: ../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/imapx/camel-imapx-server.c:4750
-#, fuzzy
-msgid "Error renaming folder"
-msgstr "Tallennetaan kansiota"
+#: ../camel/providers/imap/camel-imap-store.c:3334
+#, c-format
+msgid "Server unexpectedly disconnected"
+msgstr "Palvelin katkaisi yhteyden odottamatta"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4801
+#: ../camel/providers/imap/camel-imap-store.c:3338
 #, fuzzy
-msgid "Error performing NOOP"
-msgstr "Virhe suoritettaessa hakua"
+msgid "Server unexpectedly disconnected: "
+msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4896
-msgid "Error syncing changes"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5652
-#: ../camel/providers/imapx/camel-imapx-server.c:5667
-#, fuzzy
-msgid "Cannot create spool file: "
-msgstr "Viestià ei voi luoda: %s"
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1076
-#, c-format, fuzzy
-msgid "Retrieving folder list for %s"
-msgstr "Valmistellaan kansiota \"%s\" yhteydettÃmÃÃn tilaan"
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1176
-#: ../camel/providers/nntp/camel-nntp-store.c:1790
-#, c-format
-msgid "No such folder: %s"
-msgstr "Kansiota ei ole: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "Nimiavaruus:"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
-#, c-format
-msgid "Source stream returned no data"
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format, fuzzy
-msgid "Source stream unavailable"
-msgstr "Palvelu ei ole saatavilla"
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/local/camel-local-folder.c:191
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:201
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "postilaatikko: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:219
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:483
+#: ../camel/providers/local/camel-local-folder.c:499
 #, fuzzy
 msgid "_Index message body data"
 msgstr "Indeksoi viestin rungon tiedot"
 
-#: ../camel/providers/local/camel-local-folder.c:712
-#, c-format, fuzzy
-msgid "Cannot get message %s from folder %s\n%s"
-msgstr "Viestin %s hakeminen kansiosta %s epÃonnistui\n  %s"
+#: ../camel/providers/local/camel-local-folder.c:727
+#, fuzzy, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Viestin %s hakeminen kansiosta %s epÃonnistui\n"
+"  %s"
 
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_KÃytà kansioissa '.folders'-yhteenvetotiedostoja (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-muotoisia sÃhkÃpostihakemistoja"
 
-#: ../camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:51
 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:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Paikallinen toimitus"
 
-#: ../camel/providers/local/camel-local-provider.c:71
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "SÃhkÃpostin siirto paikallisista mbox-muotoisista saapuvien kansioista Evolutionin hallinnoimiin kansioihin."
+#: ../camel/providers/local/camel-local-provider.c:65
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"SÃhkÃpostin siirto paikallisista mbox-muotoisista saapuvien kansioista "
+"Evolutionin hallinnoimiin kansioihin."
 
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
 #, fuzzy
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_KÃytà suodattimia uusille viesteille saapuvien kansiossa"
 
-#: ../camel/providers/local/camel-local-provider.c:93
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Maildir-muotoisia sÃhkÃpostikansioita"
 
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "SÃhkÃpostin tallennus maildir-muotoisiin hakemistoihin paikallisesti."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Tallenna tila-otsakkeet Elm/Pine/Mutt-muodossa"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "Standard Unix mbox spool file"
 msgstr "Tavallinen Unixin mbox-kansio"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
-msgid "For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr "SÃhkÃpostin tallennus ulkoisiin tavallisiin mbox-muotoisiin sÃhkÃpostitiedostoihin.\nTÃllà voidaan myÃs lukea hakemisto Elm, Pine tai Mutt-tyylisià kansioita."
+#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:120
+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."
+msgstr ""
+"SÃhkÃpostin tallennus ulkoisiin tavallisiin mbox-muotoisiin "
+"sÃhkÃpostitiedostoihin.\n"
+"TÃllà voidaan myÃs lukea hakemisto Elm, Pine tai Mutt-tyylisià kansioita."
 
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:119
 msgid "Standard Unix mbox spool directory"
 msgstr "Tavallinen Unixin mbox-muotoinen saapuvien hakemisto"
 
@@ -3609,178 +3796,180 @@ msgstr "Tavallinen Unixin mbox-muotoinen saapuvien hakemisto"
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetà seuraavaksi: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:180
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: ../camel/providers/local/camel-local-store.c:218
-#: ../camel/providers/local/camel-local-store.c:375
-#: ../camel/providers/local/camel-maildir-store.c:101
-#: ../camel/providers/local/camel-mbox-store.c:555
-#: ../camel/providers/local/camel-spool-store.c:86
+#: ../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-mbox-store.c:581
+#: ../camel/providers/local/camel-spool-store.c:89
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "SÃilÃn juuri %s ei ole absoluuttinen polku"
 
-#: ../camel/providers/local/camel-local-store.c:227
+#: ../camel/providers/local/camel-local-store.c:232
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "SÃilÃn juuri %s ei ole tavallinen hakemisto"
 
-#: ../camel/providers/local/camel-local-store.c:239
-#: ../camel/providers/local/camel-local-store.c:249
-#: ../camel/providers/local/camel-local-store.c:388
-#: ../camel/providers/local/camel-maildir-store.c:134
+#: ../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
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:286
+#: ../camel/providers/local/camel-local-store.c:291
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Paikallisissa sÃilÃissà ei ole saapuvien viestien kansiota"
 
-#: ../camel/providers/local/camel-local-store.c:445
-#: ../camel/providers/local/camel-mbox-store.c:722
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:748
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Kansion sisÃllysluetteloa \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-local-store.c:473
-#: ../camel/providers/local/camel-mbox-store.c:752
+#: ../camel/providers/local/camel-local-store.c:484
+#: ../camel/providers/local/camel-mbox-store.c:778
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Kansion metadatatiedostoa \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-local-store.c:581
+#: ../camel/providers/local/camel-local-store.c:596
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "UudelleennimeÃminen epÃonnistui \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-summary.c:527
+#: ../camel/providers/local/camel-local-summary.c:543
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Viestin lisÃys yhteenvetoon epÃonnistui: tuntematon syy"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:336
+#: ../camel/providers/local/camel-maildir-folder.c:335
 #: ../camel/providers/local/camel-mbox-folder.c:117
 #: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:160
+#: ../camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "Ei tÃllaista viestiÃ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:226
-#, c-format, fuzzy
+#: ../camel/providers/local/camel-maildir-folder.c:225
+#, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Viestià ei voi lisÃtà maildir-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-maildir-folder.c:273
+#: ../camel/providers/local/camel-maildir-folder.c:283
 #: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:172
-#: ../camel/providers/local/camel-mh-folder.c:182
-#, c-format, fuzzy
+#: ../camel/providers/local/camel-mh-folder.c:171
+#: ../camel/providers/local/camel-mh-folder.c:181
+#, fuzzy, c-format
 msgid "Cannot get message %s from folder %s: "
-msgstr "Viestin %s hakeminen kansiosta %s epÃonnistui\n  %s"
+msgstr ""
+"Viestin %s hakeminen kansiosta %s epÃonnistui\n"
+"  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:354
-#, c-format, fuzzy
+#: ../camel/providers/local/camel-maildir-folder.c:353
+#, fuzzy, c-format
 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:109
-#, c-format, fuzzy
+#: ../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:119
-#: ../camel/providers/local/camel-maildir-store.c:782
-#, c-format, fuzzy
+#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-maildir-store.c:806
+#, c-format
 msgid "Folder %s already exists"
-msgstr "Kansio on jo olemassa"
+msgstr "Kansio %s on jo olemassa"
 
-#: ../camel/providers/local/camel-maildir-store.c:215
-#: ../camel/providers/local/camel-maildir-store.c:246
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-maildir-store.c:221
+#: ../camel/providers/local/camel-maildir-store.c:252
 #: ../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:230
-#: ../camel/providers/local/camel-mbox-store.c:355
-#: ../camel/providers/local/camel-mh-store.c:516
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../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:236
-#: ../camel/providers/local/camel-mbox-store.c:365
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../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:263
+#: ../camel/providers/local/camel-maildir-store.c:269
 #, 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:329
-#: ../camel/providers/local/camel-maildir-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:670
+#: ../camel/providers/local/camel-maildir-store.c:338
+#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../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:331
+#: ../camel/providers/local/camel-maildir-store.c:340
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: ../camel/providers/local/camel-maildir-store.c:569
-#: ../camel/providers/local/camel-maildir-store.c:970
-#: ../camel/providers/local/camel-spool-store.c:209
-#: ../camel/providers/local/camel-spool-store.c:228
+#: ../camel/providers/local/camel-maildir-store.c:589
+#: ../camel/providers/local/camel-maildir-store.c:1003
+#: ../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:773
-#, c-format, fuzzy
+#: ../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:416
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:434
+#: ../camel/providers/local/camel-maildir-summary.c:567
 #, 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:540
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "Tarkastetaan kansion yhdenmukaisuutta"
 
-#: ../camel/providers/local/camel-maildir-summary.c:633
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "EtsitÃÃn uusia viestejÃ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:649
-#: ../camel/providers/local/camel-mbox-summary.c:793
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-mbox-summary.c:650
+#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-spool-summary.c:132
 msgid "Storing folder"
 msgstr "Tallennetaan kansiota"
 
 #: ../camel/providers/local/camel-mbox-folder.c:187
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "SÃhkÃpostilaatikkoa ei voi avata: %s: %s\n"
 
 #: ../camel/providers/local/camel-mbox-folder.c:253
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "Viestià ei voi lisÃtà mbox-tiedostoon: %s: %s"
 
@@ -3789,70 +3978,74 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Kansio nÃyttÃisi olevan peruuttamattomasti vaurioitunut."
 
 #: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:69
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kansion \"%s\" lukkoa ei voi varata: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mbox-store.c:563
+#: ../camel/providers/local/camel-mbox-store.c:391
+#: ../camel/providers/local/camel-mbox-store.c:589
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "TÃmÃnnimistà kansiota ei voi luoda."
 
-#: ../camel/providers/local/camel-mbox-store.c:414
+#: ../camel/providers/local/camel-mbox-store.c:435
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Kansiota \"%s\" ei voitu avata: ei ole tavallinen tiedosto"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Kansiota \"%s\" ei voi luoda: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:591
+#: ../camel/providers/local/camel-mbox-store.c:617
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kansiota ei voi luoda: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:593
+#: ../camel/providers/local/camel-mbox-store.c:619
 msgid "Folder already exists"
 msgstr "Kansio on jo olemassa"
 
-#: ../camel/providers/local/camel-mbox-store.c:633
-#: ../camel/providers/local/camel-mbox-store.c:646
-#: ../camel/providers/local/camel-mbox-store.c:675
+#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:672
+#: ../camel/providers/local/camel-mbox-store.c:701
 #, c-format
-msgid "Could not delete folder '%s':\n%s"
-msgstr "Kansiota \"%s\" ei voitu poistaa:\n%s"
+msgid ""
+"Could not delete folder '%s':\n"
+"%s"
+msgstr ""
+"Kansiota \"%s\" ei voitu poistaa:\n"
+"%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:656
+#: ../camel/providers/local/camel-mbox-store.c:682
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "\"%s\" ei ole tavallinen tiedosto."
 
-#: ../camel/providers/local/camel-mbox-store.c:665
+#: ../camel/providers/local/camel-mbox-store.c:691
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Kansio \"%s\" ei ole tyhjÃ, sità ei poistettu."
 
-#: ../camel/providers/local/camel-mbox-store.c:692
-#: ../camel/providers/local/camel-mbox-store.c:707
+#: ../camel/providers/local/camel-mbox-store.c:718
+#: ../camel/providers/local/camel-mbox-store.c:733
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Kansion yhteenvetotiedostoa \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:789
+#: ../camel/providers/local/camel-mbox-store.c:815
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Kansion nimi ei ole sallittu."
 
-#: ../camel/providers/local/camel-mbox-store.c:805
+#: ../camel/providers/local/camel-mbox-store.c:831
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Kohdetta \"%s\" ei voitu nimetà uudestaan: \"%s\": %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:888
+#: ../camel/providers/local/camel-mbox-store.c:915
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "UudelleennimeÃminen %s:stà %s:ksi epÃonnistui: %s"
@@ -3863,90 +4056,92 @@ msgid "Could not open folder: %s: %s"
 msgstr "Kansiota ei voitu avata: %s: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:490
-#, c-format, fuzzy
+#, 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:574
+#: ../camel/providers/local/camel-mbox-summary.c:575
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion tarkistus ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:662
-#: ../camel/providers/local/camel-mbox-summary.c:802
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:663
+#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-spool-summary.c:139
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Tiedostoa ei voitu avata: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:676
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:677
+#: ../camel/providers/local/camel-spool-summary.c:154
 #, 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:693
-#: ../camel/providers/local/camel-mbox-summary.c:918
+#: ../camel/providers/local/camel-mbox-summary.c:694
+#: ../camel/providers/local/camel-mbox-summary.c:920
 #, 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:704
+#: ../camel/providers/local/camel-mbox-summary.c:705
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "VÃliaikaiskansiota ei voitu sulkea: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:721
+#: ../camel/providers/local/camel-mbox-summary.c:722
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kansiota ei voitu uudelleen nimetÃ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:817
+#: ../camel/providers/local/camel-mbox-summary.c:1086
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kansiota ei voitu tallentaa: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:855
-#: ../camel/providers/local/camel-mbox-summary.c:1115
+#: ../camel/providers/local/camel-mbox-summary.c:856
+#: ../camel/providers/local/camel-mbox-summary.c:1123
 #, c-format
-msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
+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:864
-#: ../camel/providers/local/camel-mbox-summary.c:1124
+#: ../camel/providers/local/camel-mbox-summary.c:866
+#: ../camel/providers/local/camel-mbox-summary.c:1136
 #, 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:1029
-#: ../camel/providers/local/camel-spool-summary.c:345
+#: ../camel/providers/local/camel-mbox-summary.c:1031
+#: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1182
-#: ../camel/providers/local/camel-mbox-summary.c:1212
+#: ../camel/providers/local/camel-mbox-summary.c:1194
+#: ../camel/providers/local/camel-mbox-summary.c:1224
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "VÃliaikaiseen postikansioon kirjoitus epÃonnistui: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "VÃliaikaiseen postikansioon kirjoitus epÃonnistui: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:119
-#, c-format, fuzzy
+#: ../camel/providers/local/camel-mh-folder.c:118
+#, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Viestià ei voi liittÃà MH-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:535
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:551
+#: ../camel/providers/local/camel-mh-store.c:557
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Kansiota \"%s\" ei voi avata: se ei ole hakemisto."
@@ -3956,269 +4151,305 @@ msgstr "Kansiota \"%s\" ei voi avata: se ei ole hakemisto."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-kansion polku ei voi avata: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:94
+#: ../camel/providers/local/camel-spool-store.c:97
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "SÃhkÃpostilÃhdettà \"%s\" ei voi avata: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:108
+#: ../camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "LÃhde \"%s\" ei ole tavallinen tiedosto tai hakemisto"
 
-#: ../camel/providers/local/camel-spool-store.c:416
+#: ../camel/providers/local/camel-spool-store.c:425
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Saapuvan sÃhkÃpostin tiedosto %s"
 
-#: ../camel/providers/local/camel-spool-store.c:420
+#: ../camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "SÃhkÃpostilÃhde %s"
 
-#: ../camel/providers/local/camel-spool-store.c:423
+#: ../camel/providers/local/camel-spool-store.c:432
 #, fuzzy
 msgid "Invalid spool"
 msgstr "Virheellinen lÃhde"
 
-#: ../camel/providers/local/camel-spool-store.c:480
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Kansiota \"%s/%s\" ei ole olemassa."
 
-#: ../camel/providers/local/camel-spool-store.c:493
+#: ../camel/providers/local/camel-spool-store.c:505
 #, c-format
-msgid "Could not open folder '%s':\n%s"
-msgstr "Kansiota \"%s\" ei voi avata:\n%s"
+msgid ""
+"Could not open folder '%s':\n"
+"%s"
+msgstr ""
+"Kansiota \"%s\" ei voi avata:\n"
+"%s"
 
-#: ../camel/providers/local/camel-spool-store.c:499
+#: ../camel/providers/local/camel-spool-store.c:511
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Kansiota \"%s\" ei ole olemassa."
 
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-spool-store.c:519
 #, c-format
-msgid "Could not create folder '%s':\n%s"
-msgstr "Kansiota \"%s\" ei voi luoda:\n%s"
+msgid ""
+"Could not create folder '%s':\n"
+"%s"
+msgstr ""
+"Kansiota \"%s\" ei voi luoda:\n"
+"%s"
 
-#: ../camel/providers/local/camel-spool-store.c:520
+#: ../camel/providers/local/camel-spool-store.c:532
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "\"%s\" ei ole mailbox-muotoinen tiedosto."
 
-#: ../camel/providers/local/camel-spool-store.c:584
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Kansio ei tue INBOXia"
 
-#: ../camel/providers/local/camel-spool-store.c:603
+#: ../camel/providers/local/camel-spool-store.c:615
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Saapuvan sÃhkÃpostin kansioita ei voi poistaa"
 
-#: ../camel/providers/local/camel-spool-store.c:618
+#: ../camel/providers/local/camel-spool-store.c:630
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Saapuvan sÃhkÃpostin kansioita ei voi uudelleennimetÃ"
 
-#: ../camel/providers/local/camel-spool-summary.c:168
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:192
-#, c-format, fuzzy
+#: ../camel/providers/local/camel-spool-summary.c:170
+#: ../camel/providers/local/camel-spool-summary.c:182
+#: ../camel/providers/local/camel-spool-summary.c:194
+#, 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:210
-#, c-format, fuzzy
+#: ../camel/providers/local/camel-spool-summary.c:212
+#, 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:242
-#: ../camel/providers/local/camel-spool-summary.c:261
-#: ../camel/providers/local/camel-spool-summary.c:274
-#, c-format, fuzzy
-msgid "Could not synchronize spool folder %s: %s\nFolder may be corrupt, copy saved in '%s'"
-msgstr "SÃhkÃpostiviestien kansiota %s ei voi synkronoida: %s\nKansio saattaa olla vaurioitunut, kopio tallennettu tiedostoon \"%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
+#, fuzzy, c-format
+msgid ""
+"Could not synchronize spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in '%s'"
+msgstr ""
+"SÃhkÃpostiviestien kansiota %s ei voi synkronoida: %s\n"
+"Kansio saattaa olla vaurioitunut, kopio tallennettu tiedostoon \"%s\""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:290
-#: ../camel/providers/nntp/camel-nntp-folder.c:379
-#: ../camel/providers/nntp/camel-nntp-folder.c:501
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "SisÃinen virhe: UID on virheellisessà muodossa: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:340
-#: ../camel/providers/nntp/camel-nntp-folder.c:344
-#: ../camel/providers/pop3/camel-pop3-folder.c:611
-#: ../camel/providers/pop3/camel-pop3-folder.c:995
+#: ../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
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:351
-#: ../camel/providers/nntp/camel-nntp-folder.c:526
-#: ../camel/providers/pop3/camel-pop3-folder.c:549
-#: ../camel/providers/pop3/camel-pop3-folder.c:601
+#: ../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
-#, c-format, fuzzy
+#: ../camel/providers/pop3/camel-pop3-folder.c:639
+#, fuzzy, c-format
 msgid "Cannot get message %s: "
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:585
-#: ../camel/providers/nntp/camel-nntp-folder.c:591
-#: ../camel/providers/nntp/camel-nntp-folder.c:638
+#: ../camel/providers/nntp/camel-nntp-folder.c:559
+#: ../camel/providers/nntp/camel-nntp-folder.c:565
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Postitus epÃonnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:633
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 #, fuzzy
 msgid "Posting failed: "
 msgstr "Postitus epÃonnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:662
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Et voi lÃhettÃà NNTP-viestejà ollessasi yhteydettÃmÃssà tilassa!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:682
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Et voi kopioida viestejà NNTP-kansiosta"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:48
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "NÃytà kansiot lyhyessà muodossa (esim. c.o.linux eikà comp.os.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:50
+#: ../camel/providers/nntp/camel-nntp-provider.c:51
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "NÃytà _tilauslomakkeessa suhteelliset kansionimet"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:56
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over SSL"
-msgstr ""
+msgstr "NNTP SSL:llÃ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "KeskusteluryhmÃt"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:65
+#: ../camel/providers/nntp/camel-nntp-provider.c:66
 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:86
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "TÃmà vaihtoehto tunnistautuu NNTP-palvelimelle kÃyttÃen selvÃkielistà salasanaa."
+#: ../camel/providers/nntp/camel-nntp-provider.c:87
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"TÃmà vaihtoehto tunnistautuu NNTP-palvelimelle kÃyttÃen selvÃkielistà "
+"salasanaa."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:285
-#, c-format, fuzzy
+#: ../camel/providers/nntp/camel-nntp-store.c:286
+#, 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:297
+#: ../camel/providers/nntp/camel-nntp-store.c:298
 #, 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:469
+#: ../camel/providers/nntp/camel-nntp-store.c:463
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET uutisryhmÃt palvelimelta %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1058
 #, c-format
-msgid "Error retrieving newsgroups:\n\n%s"
-msgstr "Uutisryhmien haku epÃonnistui:\n\n%s"
+msgid ""
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
+msgstr ""
+"Uutisryhmien haku epÃonnistui:\n"
+"\n"
+"%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
 #, 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:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1168
 #, 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:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1191
 #, 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."
+msgstr ""
+"Et voi poistaa kansiota uutisryhmistÃ: lopeta sen sijaan ryhmÃn tilaaminen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#: ../camel/providers/nntp/camel-nntp-store.c:1390
 #, c-format
-msgid "You cannot subscribe to this newsgroup:\n\nNo such newsgroup. The selected item is a probably a parent folder."
-msgstr "Et voi tilata tÃtà uutisryhmÃÃ:\n\nUutisryhmÃà ei ole olemassa. Valittu kohta on luultavasti ylempi kansio."
+msgid ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
+msgstr ""
+"Et voi tilata tÃtà uutisryhmÃÃ:\n"
+"\n"
+"UutisryhmÃÃ ei ole olemassa. Valittu kohta on luultavasti ylempi kansio."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1438
 #, c-format
-msgid "You cannot unsubscribe to this newsgroup:\n\nnewsgroup does not exist!"
-msgstr "Et voi lopettaa uutisryhmÃn tilausta:\n\nUutisryhmÃÃ ei ole olemassa!"
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
+msgstr ""
+"Et voi lopettaa uutisryhmÃn tilausta:\n"
+"\n"
+"UutisryhmÃÃ ei ole olemassa!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1628
 #, fuzzy
 msgid "NNTP Command failed: "
 msgstr "NNTP-komento epÃonnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1713
 #, c-format
 msgid "Not connected."
 msgstr "Ei yhteyttÃ."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:195
-#: ../camel/providers/nntp/camel-nntp-summary.c:322
+#: ../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Ã"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:213
+#: ../camel/providers/nntp/camel-nntp-summary.c:216
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Odottamaton palvelimen vastaus xover:ilta: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:346
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Odottamaton palvelimen vastaus head:ilta: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:387
+#: ../camel/providers/nntp/camel-nntp-summary.c:393
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Toiminto epÃonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
-#: ../camel/providers/pop3/camel-pop3-folder.c:517
+#: ../camel/providers/pop3/camel-pop3-folder.c:450
+#: ../camel/providers/pop3/camel-pop3-folder.c:523
 #, c-format
 msgid "No message with UID %s"
 msgstr "Ei viestejà tunnisteella %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:533
+#: ../camel/providers/pop3/camel-pop3-folder.c:539
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestià %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:612
+#: ../camel/providers/pop3/camel-pop3-folder.c:631
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/pop3/camel-pop3-folder.c:679
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:711
+#: ../camel/providers/pop3/camel-pop3-folder.c:740
 #, fuzzy
 msgid "Cannot get POP summary: "
 msgstr "POP-yhteenvedon hakeminen ei onnistu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:823
+#: ../camel/providers/pop3/camel-pop3-folder.c:859
 msgid "Expunging old messages"
 msgstr "Poistetaan vanhoja viestejà pysyvÃsti"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:843
+#: ../camel/providers/pop3/camel-pop3-folder.c:879
 msgid "Expunging deleted messages"
 msgstr "Poistetaan poistetut viestit pysyvÃsti"
 
@@ -4231,123 +4462,144 @@ msgstr "ViestisÃilÃ"
 msgid "_Leave messages on server"
 msgstr "_JÃtà viestit palvelimelle"
 
-#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#. Translators: '%s' is replaced with a widget, where user can
+#. * select how many days can be message left on the server.
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "Poista %s pÃivÃn kuluttua"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Delete _expunged from local Inbox"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:48
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "Poista _kÃytÃstà tuki POP3-laajennoksille"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "Default POP3 port"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
-#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP3 over SSL"
-msgstr "Imap-palvelin %s"
+msgstr "POP3 SSL:llÃ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:64
+#: ../camel/providers/pop3/camel-pop3-provider.c:65
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Yhteyksien ottoon ja postien hakuun POP-palvelimilta."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "tÃmà vaihtoehto yhdistÃà POP-palvelimeen selvÃkielisellà salasanalla. TÃmà on ainoa tapa, jota monet POP-palvelimet tukevat."
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"tÃmà vaihtoehto yhdistÃà POP-palvelimeen selvÃkielisellà salasanalla. TÃmà "
+"on ainoa tapa, jota monet POP-palvelimet tukevat."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:94
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "TÃmà vaihtoehto yhdistÃà POP-palvelimeen kÃyttÃen salattua salasanaa APOP-protokollan avulla. TÃmà ei vÃlttÃmÃttà toimi kaikille kÃyttÃjille edes palvelimilla, jotka vÃittÃvÃt sità tukevansa."
+#: ../camel/providers/pop3/camel-pop3-provider.c:95
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"TÃmà vaihtoehto yhdistÃà POP-palvelimeen kÃyttÃen salattua salasanaa APOP-"
+"protokollan avulla. TÃmà ei vÃlttÃmÃttà toimi kaikille kÃyttÃjille edes "
+"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
 msgid ": "
-msgstr ""
+msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/pop3/camel-pop3-store.c:139
 #, 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:153
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 #, 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:154
+#: ../camel/providers/pop3/camel-pop3-store.c:155
 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:172
+#. Translators: Last %s is an optional
+#. * explanation beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:176
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:185
-#, c-format, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:189
+#, 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:288
+#: ../camel/providers/pop3/camel-pop3-store.c:298
 #, 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:310
-#, c-format, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:320
+#, 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:359
-#, c-format, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:371
+#, c-format
 msgid "POP3 server %s"
-msgstr "Imap-palvelin %s"
+msgstr "POP3-palvelin %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:362
-#, c-format, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:374
+#, fuzzy, c-format
 msgid "POP3 server for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:525
+#: ../camel/providers/pop3/camel-pop3-store.c:546
 #, c-format
-msgid "Unable to connect to POP server %s:	Invalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "POP-palvelimeen %s ei saatu yhteyttÃ:	Vastaanotettiin virheellinen APOP-tunniste. Voidaan epÃillà yhteyden kaappaamista, ota yhteyttà yllÃpitÃjÃÃsi."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"POP-palvelimeen %s ei saatu yhteyttÃ:\tVastaanotettiin virheellinen APOP-"
+"tunniste. Voidaan epÃillà yhteyden kaappaamista, ota yhteyttà yllÃpitÃjÃÃsi."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:577
-#, c-format, fuzzy
-msgid "Unable to connect to POP server %s.\nError sending password: "
-msgstr "YhdistÃminen POP-palvelimeen epÃonnistui: %s\nVirhe lÃhetettÃessà salasanaa: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:598
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: "
+msgstr ""
+"YhdistÃminen POP-palvelimeen epÃonnistui: %s\n"
+"Virhe lÃhetettÃessà salasanaa: %s"
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:592
+#: ../camel/providers/pop3/camel-pop3-store.c:613
 #, c-format
-msgid "Unable to connect to POP server %s.\nError sending username%s"
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:650
+#: ../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:678
+#: ../camel/providers/pop3/camel-pop3-store.c:701
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Kansiota \"%s\" ei ole olemassa."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:695
+#: ../camel/providers/pop3/camel-pop3-store.c:718
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr ""
@@ -4357,50 +4609,54 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "Postin lÃhettÃminen siirtÃmÃllà se \"sendmail\"-ohjelmalle paikallisessa jÃrjestelmÃssÃ."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Postin lÃhettÃminen siirtÃmÃllà se \"sendmail\"-ohjelmalle paikallisessa "
+"jÃrjestelmÃssÃ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
 msgid "Mail delivery via the sendmail program"
 msgstr "SÃhkÃpostin lÃhetys ohjelman sendmail avulla"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Vastaanottajalistan tulkitseminen epÃonnistui"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:140
+#, 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:141
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:163
+#, 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:184
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, fuzzy
 msgid "Could not send message: "
 msgstr "Viestin lÃhettÃminen epÃonnistui: %s"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:239
+#, 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:219
-#, c-format
-msgid "Could not execute %s: mail not sent."
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#, 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:224
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:252
+#, 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
@@ -4408,9 +4664,8 @@ msgid "Default SMTP port"
 msgstr ""
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
-#, fuzzy
 msgid "SMTP over SSL"
-msgstr "SMTP-palvelin %s"
+msgstr "SMTP SSL:llÃ"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:44
 msgid "Message submission port"
@@ -4422,397 +4677,574 @@ msgstr "SMTP"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "SÃhkÃpostin lÃhetys ottamalla yhteyttà sÃhkÃpostipalvelimeen SMTP-protokollalla."
+msgstr ""
+"SÃhkÃpostin lÃhetys ottamalla yhteyttà sÃhkÃpostipalvelimeen SMTP-"
+"protokollalla."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 #, fuzzy
 msgid "Welcome response error: "
 msgstr "virhe tervetuloviestissÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 #, 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:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
-#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:223
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
 msgid "STARTTLS command failed: "
-msgstr "STARTTLS-komento epÃonnistui: %s"
+msgstr "STARTTLS-komento epÃonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:235
-#, c-format, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:241
+#, 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:292
+#: ../camel/providers/smtp/camel-smtp-transport.c:301
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/smtp/camel-smtp-transport.c:304
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP postinvÃlitys %s:n kautta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
-#, c-format, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:378
+#, 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:446
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:459
-msgid "SMTP Authentication"
-msgstr "SMTP-todennus"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:478
-#: ../camel/providers/smtp/camel-smtp-transport.c:489
-#: ../camel/providers/smtp/camel-smtp-transport.c:502
-#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#: ../camel/providers/smtp/camel-smtp-transport.c:499
+#: ../camel/providers/smtp/camel-smtp-transport.c:512
 msgid "AUTH command failed: "
-msgstr "Komento AUTH epÃonnistui: %s"
+msgstr "AUTH-komento epÃonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 #, 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:650
+#: ../camel/providers/smtp/camel-smtp-transport.c:661
 #, 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:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Sending message"
 msgstr "LÃhetetÃÃn viestiÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#: ../camel/providers/smtp/camel-smtp-transport.c:690
 #, 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:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, 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:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksivirhe, tuntematon komento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksivirhe parametreissa tai argumenteissa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Command not implemented"
 msgstr "Komentoa ei ole toteutettu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Command parameter not implemented"
 msgstr "Komennon parametria ei ole toteutettu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "System status, or system help reply"
 msgstr "JÃrjestelmÃn tila tai jÃrjestelmÃn ohjevastaus"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Help message"
 msgstr "Ohjeviesti"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Service ready"
 msgstr "Palvelu valmis"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Service closing transmission channel"
 msgstr "Palvelu sulkee siirtokanavaa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "Service not available, closing transmission channel"
 msgstr "Palvelu ei ole kÃytettÃvissÃ, suljetaan siirtokanava"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested mail action okay, completed"
 msgstr "Pyydetty sÃhkÃpostikÃsky ok, valmis"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:827
 msgid "User not local; will forward to <forward-path>"
-msgstr "KÃyttÃjà ei ole paikallinen, uudelleenohjaus osoitteeseen <forward-path>"
+msgstr ""
+"KÃyttÃjà ei ole paikallinen, uudelleenohjaus osoitteeseen <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Pyydettyà sÃhkÃpostikÃskyà ei suoritettu: postilaatikko ei kÃytettÃvissÃ"
+msgstr ""
+"Pyydettyà sÃhkÃpostikÃskyà ei suoritettu: postilaatikko ei kÃytettÃvissÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Pyydettyà toimenpidettà ei suoritettu: postilaatikko ei kÃytettÃvissÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Requested action aborted: error in processing"
 msgstr "Pyydetty toimenpide keskeytetty: virhe kÃsittelyssÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:835
 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:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:837
 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:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:839
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Pyydettyà toimenpidettà ei suoritettu: varattu levytila ylitetty"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
-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:841
+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
+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
+msgid "Transaction failed"
+msgstr "Tapahtuma epÃonnistui"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
+msgid "A password transition is needed"
+msgstr "Vaaditaan salasanatransaktio"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:851
+msgid "Authentication mechanism is too weak"
+msgstr "Todennusmenetelmà on liian heikko"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:853
+msgid "Encryption required for requested authentication mechanism"
+msgstr "Pyydetty todennusmenetelmà vaatii salausta"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:855
+msgid "Temporary authentication failure"
+msgstr "VÃliaikainen todennusvirhe"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+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
+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
+msgid "MAIL FROM command failed: "
+msgstr "Komento MAIL FROM epÃonnistui"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1292
+#, fuzzy
+msgid "RCPT TO command failed: "
+msgstr "Komento RSET epÃonnistui: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1309
+#: ../camel/providers/smtp/camel-smtp-transport.c:1319
+#, fuzzy, 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
+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
+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
+msgid "QUIT command failed: "
+msgstr "QUIT-komento epÃonnistui: "
+
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+#, fuzzy
+msgid "Contact UID of a user"
+msgstr "OID on jo olemassa"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+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
+msgid "Bus name vanished (client terminated?)"
+msgstr ""
+
+#: ../libebackend/e-authentication-mediator.c:264
+msgid "No response from client"
+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
+#, fuzzy
+msgid "Client cancelled the operation"
+msgstr "Toimenpidettà ei voitu perua"
+
+#: ../libebackend/e-authentication-mediator.c:416
+msgid "Client reports password was rejected"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Aloita sÃhkÃpostin kirjoittaminen: lopeta <CRLF>.<CRLF>"
+#: ../libebackend/e-authentication-session.c:532
+msgid "Add this password to your keyring"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
-msgid "Transaction failed"
-msgstr "Tapahtuma epÃonnistui"
+#: ../libebackend/e-authentication-session.c:595
+msgid "Password was incorrect"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
-msgid "A password transition is needed"
-msgstr "Vaaditaan salasanatransaktio"
+#: ../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"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
-msgid "Authentication mechanism is too weak"
-msgstr "Todennusmenetelmà on liian heikko"
+#: ../libebackend/e-backend.c:190
+#, fuzzy, c-format
+msgid "%s does not support authentication"
+msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmÃÃ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
-msgid "Encryption required for requested authentication mechanism"
-msgstr "Pyydetty todennusmenetelmà vaatii salausta"
+#: ../libebackend/e-collection-backend.c:734
+#, c-format
+msgid "%s does not support creating remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
-msgid "Temporary authentication failure"
-msgstr "VÃliaikainen todennusvirhe"
+#: ../libebackend/e-collection-backend.c:793
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
-msgid "SMTP Greeting"
-msgstr "SMTP tervehdys"
+#: ../libebackend/e-server-side-source.c:126
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
-#: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1147
-#, fuzzy
-msgid "HELO command failed: "
-msgstr "Komento HELO epÃonnistui: %s"
+#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1111
+#, c-format
+msgid "Data source '%s' does not support creating remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1222
-#: ../camel/providers/smtp/camel-smtp-transport.c:1236
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
-#, fuzzy
-msgid "MAIL FROM command failed: "
-msgstr "Komento MAIL FROM epÃonnistui"
+#: ../libebackend/e-server-side-source.c:930
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to create the remote resource"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, fuzzy
-msgid "RCPT TO command failed: "
-msgstr "Komento RSET epÃonnistui: %s"
+#: ../libebackend/e-server-side-source.c:958 ../libedataserver/e-source.c:1220
+#, c-format
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1288
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
-#, c-format, fuzzy
-msgid "RCPT TO <%s> failed: "
-msgstr "RCPT TO <%s> epÃonnistui"
+#: ../libebackend/e-server-side-source.c:972
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to delete the remote resource"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
-#: ../camel/providers/smtp/camel-smtp-transport.c:1349
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#: ../camel/providers/smtp/camel-smtp-transport.c:1437
-#: ../camel/providers/smtp/camel-smtp-transport.c:1450
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#, fuzzy
-msgid "DATA command failed: "
-msgstr "Komento DATA epÃonnistui"
+#: ../libebackend/e-server-side-source.c:1285
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1483
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#: ../camel/providers/smtp/camel-smtp-transport.c:1505
+#: ../libebackend/e-source-registry-server.c:522
+#: ../libedataserver/e-source-registry.c:1523
 #, fuzzy
-msgid "RSET command failed: "
-msgstr "Komento RSET epÃonnistui: %s"
+msgid "The user declined to authenticate"
+msgstr "Tunnistautuminen epÃonnistui.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1530
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
-#, fuzzy
-msgid "QUIT command failed: "
-msgstr "Komento QUIT epÃonnistui: %s"
+#: ../libebackend/e-source-registry-server.c:770
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr ""
 
-#: ../libedataserver/e-categories.c:47
-#, fuzzy
+#: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "VuosipÃivÃ"
 
-#: ../libedataserver/e-categories.c:48
-#, fuzzy
+#: ../libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "SyntymÃpÃivÃ"
 
-#: ../libedataserver/e-categories.c:49
-#, fuzzy
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "TyÃ"
 
-#: ../libedataserver/e-categories.c:50
-#, fuzzy
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Kilpailu"
 
-#: ../libedataserver/e-categories.c:51
-#, fuzzy
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Suosikit"
 
-#: ../libedataserver/e-categories.c:52
-#, fuzzy
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Lahjat"
 
-#: ../libedataserver/e-categories.c:53
-#, fuzzy
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
-msgstr "Tavoitteet/Kohteet"
+msgstr "Tavoitteet"
 
-#: ../libedataserver/e-categories.c:54
-#, fuzzy
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Holiday"
-msgstr "Loma"
+msgstr "LomapÃivÃ"
 
-#: ../libedataserver/e-categories.c:55
-#, fuzzy
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Lomakortit"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
-#, fuzzy
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Hot Contacts"
-msgstr "Kuumat yhteystiedot"
+msgstr "TÃrkeÃt yhteystiedot"
 
-#: ../libedataserver/e-categories.c:58
-#, fuzzy
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideat"
 
-#: ../libedataserver/e-categories.c:59
-#, fuzzy
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "International"
-msgstr "KansainvÃlinen"
+msgstr "KansainvÃliset"
 
-#: ../libedataserver/e-categories.c:60
-#, fuzzy
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Avainasiakas"
 
-#: ../libedataserver/e-categories.c:61
-#, fuzzy
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: ../libedataserver/e-categories.c:62
-#, fuzzy
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Personal"
-msgstr "HenkilÃkohtainen"
+msgstr "HenkilÃkohtaiset"
 
-#: ../libedataserver/e-categories.c:63
-#, fuzzy
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Puhelut"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:65
-#, fuzzy
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Tila"
 
-#: ../libedataserver/e-categories.c:66
-#, fuzzy
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategiat"
 
-#: ../libedataserver/e-categories.c:67
-#, fuzzy
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Suppliers"
-msgstr "Hankkijat"
+msgstr "Toimittajat"
 
-#: ../libedataserver/e-categories.c:68
-#, fuzzy
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Aika ja kulut"
 
-#: ../libedataserver/e-categories.c:69
-#, fuzzy
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:70
-#, fuzzy
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Waiting"
-msgstr "Odotetaan"
+msgstr "Odottaa"
 
-#: ../libedataserver/e-client.c:125
+#: ../libedataserver/e-client.c:124
 #, fuzzy
 msgid "Source not loaded"
 msgstr "URIa ei ole ladattu"
 
-#: ../libedataserver/e-client.c:127
+#: ../libedataserver/e-client.c:126
 #, fuzzy
 msgid "Source already loaded"
 msgstr "URI 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:137
-#, fuzzy
+#. * it's not set to by a user, thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:136
 msgid "Offline unavailable"
-msgstr "YhteydetÃn tila ei saatavilla"
+msgstr "YhteydetÃn tila ei ole kÃytettÃvissÃ"
 
-#: ../libedataserver/e-client.c:159
-#, fuzzy
+#: ../libedataserver/e-client.c:158
 msgid "D-Bus error"
-msgstr "Virhe tulkittaessa"
+msgstr "D-Bus-virhe"
+
+#: ../libedataserver/e-source-authenticator.c:166
+#, fuzzy
+msgid "Address book authentication request"
+msgstr "Todennus vaaditaan"
+
+#: ../libedataserver/e-source-authenticator.c:171
+#, fuzzy
+msgid "Calendar authentication request"
+msgstr "Todennus vaaditaan"
+
+#: ../libedataserver/e-source-authenticator.c:175
+#, fuzzy
+msgid "Mail authentication request"
+msgstr "Todennus vaaditaan"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+msgid "Authentication request"
+msgstr "TodennuspyyntÃ"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, fuzzy, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "SyÃtà %s-salasana kÃyttÃjÃlle %s palvelimella %s."
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, fuzzy, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "SyÃtà %s-salasana kÃyttÃjÃlle %s palvelimella %s."
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, fuzzy, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "SyÃtà %s-salasana kÃyttÃjÃlle %s palvelimella %s."
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, fuzzy, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "SyÃtà %s-salasana kÃyttÃjÃlle %s palvelimella %s."
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, fuzzy, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "SyÃtà %s-salasana kÃyttÃjÃlle %s palvelimella %s."
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, fuzzy, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "SyÃtà %s-salasana kÃyttÃjÃlle %s palvelimella %s."
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, fuzzy, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "SyÃtà %s-salasana kÃyttÃjÃlle %s palvelimella %s."
+
+#: ../libedataserver/e-source.c:621
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr ""
+
+#: ../libedataserver/e-source.c:938
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr ""
+
+#: ../libedataserver/e-source.c:1020
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr ""
+
+#: ../libedataserver/e-source.c:1408
+msgid "Unnamed"
+msgstr "NimeÃmÃtÃn"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr ""
 
 #. 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:1646 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1949
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %I.%M.%S %p"
 
@@ -4820,7 +5252,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:1651 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1655 ../libedataserver/e-time-utils.c:1940
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
@@ -4828,7 +5260,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:1656 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1660 ../libedataserver/e-time-utils.c:1945
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %I.%M %p"
 
@@ -4836,78 +5268,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:1661 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1665 ../libedataserver/e-time-utils.c:1936
 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:1666
+#: ../libedataserver/e-time-utils.c:1670
 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:1671
+#: ../libedataserver/e-time-utils.c:1675
 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:1674 ../libedataserver/e-time-utils.c:1794
-#: ../libedataserver/e-time-utils.c:1926
+#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1798
+#: ../libedataserver/e-time-utils.c:1931
 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:1681
+#: ../libedataserver/e-time-utils.c:1685
 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:1685
+#: ../libedataserver/e-time-utils.c:1689
 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:1690
+#: ../libedataserver/e-time-utils.c:1694
 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:1695
+#: ../libedataserver/e-time-utils.c:1699
 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:1700
+#: ../libedataserver/e-time-utils.c:1704
 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:1705
+#: ../libedataserver/e-time-utils.c:1709
 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:1708 ../libedataserver/e-time-utils.c:1797
+#: ../libedataserver/e-time-utils.c:1712 ../libedataserver/e-time-utils.c:1801
 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:1868 ../libedataserver/e-time-utils.c:1988
+#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1993
 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:1872 ../libedataserver/e-time-utils.c:1980
+#: ../libedataserver/e-time-utils.c:1876 ../libedataserver/e-time-utils.c:1985
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
@@ -4915,24 +5347,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:1877 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1990
 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:1881 ../libedataserver/e-time-utils.c:1977
+#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:1982
 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:1884
+#. strptime format for time of day, without seconds 24-hour format,
+#. * and no colon.
+#: ../libedataserver/e-time-utils.c:1889
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1888
+#: ../libedataserver/e-time-utils.c:1893
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4941,7 +5374,9 @@ msgid "Proxy type to use"
 msgstr ""
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-msgid "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" means manual proxy."
+msgid ""
+"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+"means manual proxy."
 msgstr ""
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
@@ -4985,7 +5420,10 @@ msgstr "Tuntematon todennustila."
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
 #, fuzzy
 msgid "User name to use to authenticate against proxy server."
-msgstr "IMAP-palvelimelle tunnistautuminen epÃonnistui.\n%s\n\n"
+msgstr ""
+"IMAP-palvelimelle tunnistautuminen epÃonnistui.\n"
+"%s\n"
+"\n"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
 #, fuzzy
@@ -5039,196 +5477,149 @@ msgstr ""
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
 msgid "Automatic proxy configuration URL"
-msgstr ""
+msgstr "Automaattisen vÃlipalvelinmÃÃrittelyn URL"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
 msgid "Where to read automatic proxy configuration from."
 msgstr ""
 
-#: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:656
-msgid "Accessing LDAP Server anonymously"
-msgstr "Otetaan yhteyttà LDAP-palvelimeen anonyymisti"
-
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "Tunnistautuminen epÃonnistui.\n"
-
-#: ../libedataserverui/e-categories-editor.c:228
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr ""
 
-#: ../libedataserverui/e-categories-editor.c:237
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "_Saatavilla olevat luokat:"
 
-#: ../libedataserverui/e-categories-selector.c:322
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../libedataserverui/e-categories-selector.c:327
+#: ../libedataserverui/e-categories-selector.c:330
 msgid "Category"
 msgstr "Luokka"
 
-#: ../libedataserverui/e-category-completion.c:299
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Luo luokka \"%s\""
 
-#: ../libedataserverui/e-category-editor.c:135
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "Luokan kuvake"
 
-#: ../libedataserverui/e-category-editor.c:139
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
-msgstr ""
+msgstr "_Ei kuvaa"
 
-#: ../libedataserverui/e-category-editor.c:176
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
 msgstr "Luokan _nimi"
 
-#: ../libedataserverui/e-category-editor.c:184
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "Luokan _kuvake"
 
-#: ../libedataserverui/e-category-editor.c:224
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "Luokan ominaisuudet"
 
-#: ../libedataserverui/e-category-editor.c:285
+#: ../libedataserverui/e-category-editor.c:287
 #, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
 msgstr "Luokka \"%s\" on jo mÃÃritelty konfiguraatiossa. KÃytà toista nimeÃ"
 
-#: ../libedataserverui/e-client-utils.c:856
-#, c-format, fuzzy
-msgid "Enter password for calendar %s (user %s)\nReason: %s"
-msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
-
-#: ../libedataserverui/e-client-utils.c:858
-#, c-format, fuzzy
-msgid "Enter password for calendar %s (user %s)"
-msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
-
-#: ../libedataserverui/e-client-utils.c:862
-#, c-format, fuzzy
-msgid "Enter password for task list %s (user %s)\nReason: %s"
-msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
-
-#: ../libedataserverui/e-client-utils.c:864
-#, c-format, fuzzy
-msgid "Enter password for task list %s (user %s)"
-msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
-
-#: ../libedataserverui/e-client-utils.c:868
-#, c-format, fuzzy
-msgid "Enter password for memo list %s (user %s)\nReason: %s"
-msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
-
-#: ../libedataserverui/e-client-utils.c:870
-#, c-format, fuzzy
-msgid "Enter password for memo list %s (user %s)"
-msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
-
-#: ../libedataserverui/e-client-utils.c:981
-#, fuzzy
-msgid "Enter Passphrase"
-msgstr "SyÃtà salasana"
-
-#: ../libedataserverui/e-client-utils.c:983
-#, fuzzy
-msgid "Enter Password"
-msgstr "SyÃtà salasana"
-
-#: ../libedataserverui/e-name-selector-dialog.c:187
-#, fuzzy
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
-msgstr "Kuumat yhteystiedot"
+msgstr "NÃytà yhteystiedot"
 
-#: ../libedataserverui/e-name-selector-dialog.c:209
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "_Osoitekirja:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
-msgid "Cate_gory:"
+#: ../libedataserverui/e-name-selector-dialog.c:310
+#, fuzzy
+msgid "Cat_egory:"
 msgstr "L_uokka:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:332
 msgid "_Search:"
 msgstr "_Etsi:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:253
-#: ../libedataserverui/e-name-selector-dialog.c:1038
+#: ../libedataserverui/e-name-selector-dialog.c:357
+#: ../libedataserverui/e-name-selector-dialog.c:1182
 msgid "Any Category"
 msgstr "Mikà tahansa luokka"
 
-#: ../libedataserverui/e-name-selector-dialog.c:255
-#, fuzzy
+#: ../libedataserverui/e-name-selector-dialog.c:359
 msgid "Co_ntacts"
-msgstr "Yhteystiedot"
+msgstr "Y_hteystiedot"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:421
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:424
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../libedataserverui/e-name-selector-dialog.c:316
+#: ../libedataserverui/e-name-selector-dialog.c:427
+#: ../modules/google-backend/module-google-backend.c:183
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../libedataserverui/e-name-selector-dialog.c:433
+#: ../libedataserverui/e-name-selector-dialog.c:545
 msgid "Select Contacts from Address Book"
 msgstr "Valitse yhteystiedot osoitekirjasta"
 
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:917
 msgid "_Add"
 msgstr "_LisÃÃ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:785
+#: ../libedataserverui/e-name-selector-dialog.c:921
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../libedataserverui/e-name-selector-dialog.c:957
-#, c-format, fuzzy
+#: ../libedataserverui/e-name-selector-dialog.c:1097
+#, c-format
 msgid "Error loading address book: %s"
-msgstr "Virhe luettaessa viestitiedostoa: %s"
+msgstr "Virhe osoitekirjaa ladattaessa: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2823
+#: ../libedataserverui/e-name-selector-entry.c:3043
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "L_aajenna %s sisÃkkÃisesti"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2838
+#: ../libedataserverui/e-name-selector-entry.c:3059
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopioi %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2848
+#: ../libedataserverui/e-name-selector-entry.c:3070
 #, c-format
 msgid "C_ut %s"
 msgstr "_Leikkaa %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2865
+#: ../libedataserverui/e-name-selector-entry.c:3088
 #, c-format
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
 
-#: ../libedataserverui/e-name-selector-list.c:524
+#: ../libedataserverui/e-name-selector-list.c:532
 #, c-format
 msgid "_Delete %s"
 msgstr "_Poista %s"
 
 #: ../libedataserverui/e-passwords.c:126
 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"
+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
@@ -5255,22 +5646,194 @@ msgstr "_Muista tÃmà salasana"
 msgid "_Remember this password for the remainder of this session"
 msgstr "Muista salasana tÃmÃn istunnon loppuun asti"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:91
+#: ../libedataserverui/e-source-selector-dialog.c:224
+msgid "_Destination"
+msgstr "_Kohde"
+
+#: ../libedataserverui/e-source-selector-dialog.c:326
 msgid "Select destination"
 msgstr "Valitse kohde"
 
-#: ../libedataserverui/e-source-selector-dialog.c:166
-msgid "_Destination"
-msgstr "_Kohde"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+#, fuzzy
+msgid "Calendar"
+msgstr "Kalenterin URL"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:184
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "Koodi: %u - Odottamaton vastaus palvelimelta"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, fuzzy, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "Viestià ei voitu hakea."
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:214
+#, fuzzy, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "Tiedon koodaus epÃonnistui"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, fuzzy, c-format
+msgid "Failed to find Response element"
+msgstr "Tiedon koodaus epÃonnistui"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, fuzzy, c-format
+msgid "Failed to find Account element"
+msgstr "Tiedon koodaus epÃonnistui"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr ""
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr ""
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
 msgid "Keep running after the last client is closed"
 msgstr ""
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
 msgid "Wait running until at least one client is connected"
 msgstr ""
 
+#: ../tests/libedataserverui/evolution-source-viewer.c:620
+msgid "Evolution Source Viewer"
+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"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:659
+msgid "Flags"
+msgstr "Tunnisteet"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:711
+msgid "Identity"
+msgstr "HenkilÃllisyys"
+
+#, fuzzy
+#~ msgid "Authenticating with the serverâ"
+#~ msgstr "Todennus vaaditaan"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Failed to find system book"
+#~ msgstr "Virhe viestin %d kohdalla"
+
+#, fuzzy
+#~ msgid "There was no source for UID '%s' stored in a source list."
+#~ msgstr "%s: gconf ei sisÃltÃnyt lÃhdettà uid:ille \"%s\""
+
+#, fuzzy
+#~ msgid "Cannot authenticate user: "
+#~ msgstr "Tunnistautuminen palvelimelle epÃonnistui: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+
+#, fuzzy
+#~ msgid "Enter password for address book %s (user %s)"
+#~ msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+
+#~ msgid "Enter password for %s to enable proxy for user %s"
+#~ msgstr ""
+#~ "SyÃtà salasana kohteelle %s ottaaksesi kÃyttÃÃn vÃlimuisti  kÃyttÃjÃlle %s"
+
+#, fuzzy
+#~ msgid "Invalid source type"
+#~ msgstr "Virheellinen lÃhde"
+
+#, fuzzy
+#~ msgid "Updating %s folder"
+#~ msgstr "Tallennetaan kansiota"
+
+#~ msgid "Connection to Server"
+#~ msgstr "Yhteys palvelimeen"
+
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "KÃytà _omaa komentoa palvelimeen yhdistÃmiseen"
+
+#~ msgid "Co_mmand:"
+#~ msgstr "Ko_mento:"
+
+#~ msgid "Command:"
+#~ msgstr "Komento:"
+
+#, fuzzy
+#~ msgid "Closing tmp stream failed: "
+#~ msgstr "Postitus epÃonnistui: %s"
+
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP-todennus"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "Otetaan yhteyttà LDAP-palvelimeen anonyymisti"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+
+#, fuzzy
+#~ msgid "Enter password for calendar %s (user %s)"
+#~ msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+
+#, fuzzy
+#~ msgid "Enter password for task list %s (user %s)"
+#~ msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+
+#, fuzzy
+#~ msgid "Enter password for memo list %s (user %s)"
+#~ msgstr "SyÃtà salasana tilille %s (kÃyttÃjà %s)"
+
+#, fuzzy
+#~ msgid "Enter Passphrase"
+#~ msgstr "SyÃtà salasana"
+
+#, fuzzy
+#~ msgid "Enter Password"
+#~ msgstr "SyÃtà salasana"



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