[evolution-data-server] Finnish translation update from http://l10n.laxstrom.name/wiki/Gnome_3.4 translation sprint



commit 0192681ac6258df1489d41e208502a2acce68d20
Author: Timo Jyrinki <timo debian org>
Date:   Mon Mar 12 11:00:35 2012 +0200

    Finnish translation update from http://l10n.laxstrom.name/wiki/Gnome_3.4 translation sprint

 po/fi.po | 5846 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 2707 insertions(+), 3139 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 8d93247..f851690 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,909 +5,1180 @@
 # Ilkka Tuohela <hile iki fi> 2003-2008.
 # Jiri GrÃnroos, 2010.
 #
+# 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: \n"
-"POT-Creation-Date: 2010-09-17 18:31+0300\n"
-"PO-Revision-Date: 2010-09-17 18:31+0300\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"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-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/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
+#: ../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
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:154
+#, c-format, fuzzy
+msgid "Failed to remove file '%s': %s"
+msgstr "Lapsiprosessin \"%s\" luominen epÃonnistui: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:177
+#, c-format, fuzzy
+msgid "Failed to make directory %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:472
+#, c-format, fuzzy
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr "Lapsiprosessin \"%s\" luominen epÃonnistui: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/file/e-book-backend-file.c:1129
+msgid "No UID in the contact"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1563
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:573
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../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
 msgid "Searching..."
 msgstr "EtsitÃÃn..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
+#: ../addressbook/backends/file/e-book-backend-file.c:2108
 #, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "Haetaan yhteystietoja (%d)... "
+msgid "Failed to build summary for an address book %s"
+msgstr ""
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "PÃivitetÃÃn yhteystietojen vÃlimuistia (%d)... "
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:874
+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 ""
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1019
+msgid "Querying for updated groupsâ"
+msgstr ""
+
+#: ../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/webdav/e-book-backend-webdav.c:326
+msgid "The backend does not support bulk additions"
+msgstr ""
+
+#. Insert the entry on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1451
+msgid "Creating new contactâ"
+msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#: ../addressbook/backends/google/e-book-backend-google.c:1540
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+msgid "The backend does not support bulk removals"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1568
+msgid "Deleting contactâ"
+msgstr ""
+
+#: ../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/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"
+
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1851
+msgid "Modifying contactâ"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2058
+#, fuzzy
+msgid "Loadingâ"
+msgstr "Ladataan..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2187
+#, fuzzy
+msgid "Authenticating with the serverâ"
+msgstr "Todennus vaaditaan"
+
+#. 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
 msgid "Not connected"
 msgstr "Ei yhteyttÃ."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
 msgid "Using Distinguished Name (DN)"
 msgstr "KÃytetÃÃn yksilÃllÃistà nimeà (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
 msgid "Using Email Address"
 msgstr "KÃytetÃÃn sÃhkÃpostiosoitetta"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
 msgid "Reconnecting to LDAP server..."
 msgstr "Odotetaan uudelleen yhteyttà LDAP-palvelimeen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
 #, fuzzy
 msgid "Invalid DN syntax"
 msgstr "Virheellinen argumentti"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
 msgid "Adding contact to LDAP server..."
 msgstr "LisÃtÃÃn yhteystieto LDAP-palvelimelle..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1869
 msgid "Removing contact from LDAP server..."
 msgstr "Poistetaan yhteystieto LDAP-palvelimelta..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2318
 msgid "Modifying contact from LDAP server..."
 msgstr "Muokataan yhteystietoa LDAP-palvelimella..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4720
 msgid "Receiving LDAP search results..."
 msgstr "Vastaanotetaan LDAP-haun tuloksia..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
 msgid "Error performing search"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr "Haetaan yhteystietoja (%d)... "
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
-msgid "Create resource '%s' failed with HTTP status: %d"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr ""
 
-#: ../addressbook/libebook/e-book.c:2995
-#, fuzzy, c-format
+#: ../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/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/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/libebook/e-book-client.c:95
+#, fuzzy
+msgid "No such book"
+msgstr "Kansioita %s ei ole olemassa"
+
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:315
+#, fuzzy
+msgid "Contact not found"
+msgstr "Kohdetta ei lÃydy"
+
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:316
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "OID on jo olemassa"
+
+#: ../addressbook/libebook/e-book-client.c:101
+#, fuzzy
+msgid "No such source"
+msgstr "Ei tÃllaista viestiÃ"
+
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:332
+#, fuzzy
+msgid "No space"
+msgstr "Nimiavaruus"
+
+#: ../addressbook/libebook/e-book-client.c:515
+#, 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
+#, fuzzy
+msgid "Cannot get connection to view"
+msgstr "Kansion %s sÃiliÃtà ei voitu hakea"
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Unique ID"
 msgstr "YksilÃllinen tunniste"
 
-#: ../addressbook/libebook/e-contact.c:116
+#. 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.
+#: ../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:118
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Book URI"
 msgstr "Kirjan URI"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
-#. so we can set the N property (since evo 1.4 works fine with
-#. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:124
+#. * so we can set the N property (since evo 1.4 works fine with
+#. * vcards that don't even have a N attribute.  *sigh*)
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "Lempinimi"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "1. sÃhkÃposti"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
 msgstr "2. sÃhkÃposti"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
 msgstr "3. sÃhkÃposti"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "4. sÃhkÃposti"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "Kotiosoite"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "TyÃosoite"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "Muu osoite"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "Apulaisen puhelin"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "TyÃpuhelin"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
 msgstr "TyÃpuhelin 2"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
 msgstr "TyÃ/faksi"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "Takaisinsoitto"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "Pager"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "OrganisaatioyksikkÃ"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "Asema"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "Titteli"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "Rooli"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "Apulainen"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "Kotisivun URL"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "Weblogin URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:667
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:88
 msgid "Categories"
 msgstr "RyhmÃt"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "Kalenterin URL"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "Vapaa/varattu URL"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ICS-kalenteri"
 
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "Videoneuvottelun URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "Puolison nimi"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "Huomio"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "AIM-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "AIM-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "AIM-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "AIM-tyÃnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "AIM-tyÃnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "AIM-tyÃnimi 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise-tyÃnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise-tyÃnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-tyÃnimi 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:213
 #, fuzzy
 msgid "Jabber Home ID 1"
 msgstr "Jabber kotitunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:214
 #, fuzzy
 msgid "Jabber Home ID 2"
 msgstr "Jabber kotitunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:215
 #, fuzzy
 msgid "Jabber Home ID 3"
 msgstr "Jabber kotitunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:216
 #, fuzzy
 msgid "Jabber Work ID 1"
 msgstr "Jabber tyÃtunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:217
 #, fuzzy
 msgid "Jabber Work ID 2"
 msgstr "Jabber tyÃtunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:218
 #, fuzzy
 msgid "Jabber Work ID 3"
 msgstr "Jabber tyÃtunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!-tyÃnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!-tyÃnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!-tyÃnimi 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "MSN-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "MSN-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "MSN-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "MSN-tyÃnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "MSN-tyÃnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:231
 #, fuzzy
 msgid "ICQ Home ID 1"
 msgstr "ICQ kotitunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:232
 #, fuzzy
 msgid "ICQ Home ID 2"
 msgstr "ICQ tyÃtunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:233
 #, fuzzy
 msgid "ICQ Home ID 3"
 msgstr "ICQ kotitunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:234
 #, fuzzy
 msgid "ICQ Work ID 1"
 msgstr "ICQ tyÃtunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:235
 #, fuzzy
 msgid "ICQ Work ID 2"
 msgstr "ICQ tyÃtunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:236
 #, fuzzy
 msgid "ICQ Work ID 3"
 msgstr "ICQ tyÃtunniste 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "Viimeisin tarkistettu versio"
 
-#: ../addressbook/libebook/e-contact.c:230
+#. Translators: This is an EContact field description, in this case it's a
+#. virtual field, which returns either name of the contact or the organization
+#. name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "Nimi tai Org"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "Osoitelista"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "TyÃosoite"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "Muu osoite"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "RyhmÃluettelo"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "Logo"
 
-#: ../addressbook/libebook/e-contact.c:245
+#. Translators: This is an EContact field description, in this case it's a name
+#. of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "SÃhkÃpostilista"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "AIM nÃyttÃnimien lista"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:265
 #, fuzzy
 msgid "GroupWise ID List"
 msgstr "Groupwisen Id-lista"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:266
 #, fuzzy
 msgid "Jabber ID List"
 msgstr "Jabber-tunnisteiden lista"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! nÃyttÃnimien lista"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "MSN nÃyttÃnimien lista"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:269
 #, fuzzy
 msgid "ICQ ID List"
 msgstr "ICQ-tunnisteiden lista"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "Tahtoo HTML-postia"
 
-#: ../addressbook/libebook/e-contact.c:258
+#. Translators: This is an EContact field description, in this case it's a
+#. field describing whether it's a Contact list (list of email addresses) or a
+#. regular contact for one person/organization/...
+#: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "Lista"
 
-#: ../addressbook/libebook/e-contact.c:259
+#. 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.
+#: ../addressbook/libebook/e-contact.c:281
 msgid "List Show Addresses"
 msgstr "Lista nÃytettÃvistà osoitteista"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "SyntymÃpÃivÃ"
 
-#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:44
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
 msgid "Anniversary"
 msgstr "VuosipÃivÃ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "X.509-varmenne"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:289
 #, fuzzy
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu kotitunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:290
 #, fuzzy
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu kotitunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:291
 #, fuzzy
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu kotitunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:292
 #, fuzzy
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu tyÃtunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:293
 #, fuzzy
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu tyÃtunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:294
 #, fuzzy
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu tyÃtunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:295
 #, fuzzy
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadun tunnistelista"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "Maantieteelliset tiedot"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "Skype-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "Skype-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "Skype-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "Skype-tyÃnimi 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "Skype-tyÃnimi 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "Skype-tyÃnimi 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 msgstr "Skypenimien luettelo"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:310
 msgid "SIP address"
 msgstr "SIP-osoite"
 
-#: ../addressbook/libebook/e-contact.c:1517
-#: ../addressbook/libebook/e-destination.c:739
+#: ../addressbook/libebook/e-contact.c:312
+#, fuzzy
+msgid "Google Talk Home Name 1"
+msgstr "Skype-kotinimi 1"
+
+#: ../addressbook/libebook/e-contact.c:313
+#, fuzzy
+msgid "Google Talk Home Name 2"
+msgstr "Skype-kotinimi 2"
+
+#: ../addressbook/libebook/e-contact.c:314
+#, fuzzy
+msgid "Google Talk Home Name 3"
+msgstr "Skype-kotinimi 3"
+
+#: ../addressbook/libebook/e-contact.c:315
+#, fuzzy
+msgid "Google Talk Work Name 1"
+msgstr "Skype-tyÃnimi 1"
+
+#: ../addressbook/libebook/e-contact.c:316
+#, fuzzy
+msgid "Google Talk Work Name 2"
+msgstr "Skype-tyÃnimi 2"
+
+#: ../addressbook/libebook/e-contact.c:317
+#, fuzzy
+msgid "Google Talk Work Name 3"
+msgstr "Skype-tyÃnimi 3"
+
+#: ../addressbook/libebook/e-contact.c:318
+#, fuzzy
+msgid "Google Talk Name List"
+msgstr "Skypenimien luettelo"
+
+#: ../addressbook/libebook/e-contact.c:1611
+#: ../addressbook/libebook/e-destination.c:878
 msgid "Unnamed List"
 msgstr "NimeÃmÃtÃn lista"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:298
-#, c-format
-msgid "Empty URI"
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:317
-#: ../addressbook/libedata-book/e-data-book-factory.c:355
-#: ../calendar/libedata-cal/e-data-cal-factory.c:342
-#: ../calendar/libedata-cal/e-data-cal-factory.c:354
+#: ../addressbook/libedata-book/e-book-backend.c:91
+#, c-format, fuzzy
+msgid "Unknown book property '%s'"
+msgstr "Tuntematon virhe: %s"
+
+#: ../addressbook/libedata-book/e-book-backend.c:108
+#, c-format, fuzzy
+msgid "Cannot change value of book property '%s'"
+msgstr "Kansiota \"%s\" ei voi luoda: %s"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
+#: ../camel/camel-db.c:503
 #, c-format
-msgid "Invalid source"
-msgstr "Virheellinen lÃhde"
+msgid "Insufficient memory"
+msgstr "Muisti ei riitÃ"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#, c-format, fuzzy
+msgid "Contact '%s' not found"
+msgstr "Kohdetta 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
+msgid "Invalid query: "
+msgstr "Virheellinen kysely"
 
-#: ../addressbook/libedata-book/e-data-book.c:171
-#: ../calendar/libedata-cal/e-data-cal.c:109
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Success"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book.c:172
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../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
+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
 msgid "Repository offline"
 msgstr "Varasto on yhteydettÃmÃssà tilassa"
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libecal/e-cal.c:4065 ../calendar/libedata-cal/e-data-cal.c:111
+#: ../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
 msgid "Permission denied"
 msgstr "Lupa evÃtty"
 
-#: ../addressbook/libedata-book/e-data-book.c:174
-#, fuzzy
-msgid "Contact not found"
-msgstr "Kohdetta ei lÃydy"
-
-#: ../addressbook/libedata-book/e-data-book.c:175
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "OID on jo olemassa"
-
-#: ../addressbook/libedata-book/e-data-book.c:176
-#: ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Todennus epÃonnistui"
 
-#: ../addressbook/libedata-book/e-data-book.c:177
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Unsupported field"
 msgstr "Kenttà ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:147
 msgid "Unsupported authentication method"
 msgstr "Tunnistautumismenetelmà ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:149
 msgid "TLS not available"
 msgstr "TLS ei kÃytettÃvissÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:181
-#, fuzzy
-msgid "Address book does not exist"
-msgstr "Kansiota \"%s/%s\" ei ole olemassa."
-
-#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "Book removed"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book.c:183
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:443
 #, fuzzy
 msgid "Not available in offline mode"
 msgstr "TÃmà viesti ei ole saatavilla yhteydettÃmÃssà tilassa."
 
-#: ../addressbook/libedata-book/e-data-book.c:184
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:151
 msgid "Search size limit exceeded"
 msgstr "Haun kokorajoitus ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:153
 msgid "Search time limit exceeded"
 msgstr "Haun aikaraja ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:155
 msgid "Invalid query"
 msgstr "Virheellinen kysely"
 
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:157
 msgid "Query refused"
 msgstr "Kyselyà ei hyvÃksytty"
 
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:143
 #, fuzzy
 msgid "Could not cancel"
 msgstr "%s: ei voi perua"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libedata-cal/e-data-cal.c:450
 msgid "Invalid server version"
 msgstr "Virheellinen palvelimen versio"
 
-#: ../addressbook/libedata-book/e-data-book.c:191
-#, fuzzy
-msgid "No space"
-msgstr "Nimiavaruus"
-
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:132
+#: ../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
 msgid "Invalid argument"
 msgstr "Virheellinen argumentti"
 
-#: ../addressbook/libedata-book/e-data-book.c:193
-#: ../calendar/libecal/e-cal.c:4087 ../calendar/libedata-cal/e-data-cal.c:133
+#. 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
 msgid "Not supported"
 msgstr "Protokolla ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../calendar/libedata-cal/e-data-cal.c:141
+#: ../addressbook/libedata-book/e-data-book.c:336
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:163
 #, fuzzy
-msgid "Other error"
-msgstr "I/O-virhe"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:322
-#, fuzzy, c-format
-msgid "Cannot open book: %s"
-msgstr "SÃhkÃpostilaatikkoa ei voi avata: %s: %s\n"
+msgid "Backend is not opened yet"
+msgstr "TaustajÃrjestelmà on kÃytÃssÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:344
-#, fuzzy, c-format
-msgid "Cannot remove book: %s"
-msgstr "SÃhkÃpostilaatikkoa ei voi avata: %s: %s\n"
+#: ../calendar/libecal/e-cal-client.c:621
+#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:161
+#, fuzzy
+msgid "Other error"
+msgstr "I/O-virhe"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:361
-#: ../addressbook/libedata-book/e-data-book.c:380
-#, fuzzy, c-format
-msgid "Cannot get contact: %s"
+#. 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
+msgid "Cannot get contact: "
 msgstr "Kansion %s sÃiliÃtà ei voitu hakea"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:395
-#, fuzzy, c-format
-msgid "Empty query: %s"
+#. 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
+#, fuzzy
+msgid "Empty query: "
 msgstr "Tyhjà kysely"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:411
-#, fuzzy, c-format
-msgid "Cannot get contact list: %s"
+#. 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
+msgid "Cannot add contact: "
+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:651
+#: ../addressbook/libedata-book/e-data-book.c:1075
+#, fuzzy
+msgid "Cannot modify contacts: "
 msgstr "Kansion %s sÃiliÃtà ei voitu hakea"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:448
-#, fuzzy, c-format
-msgid "Cannot authenticate user: %s"
+#. 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"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:463
-#: ../addressbook/libedata-book/e-data-book.c:482
-#, fuzzy, c-format
-msgid "Cannot add contact: %s"
-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:830
+#, fuzzy
+msgid "Cannot open book: "
+msgstr "SÃhkÃpostilaatikkoa ei voi avata: %s: %s\n"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:500
-#: ../addressbook/libedata-book/e-data-book.c:519
-#, fuzzy, c-format
-msgid "Cannot modify contact: %s"
-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:846
+#, fuzzy
+msgid "Cannot remove book: "
+msgstr "SÃhkÃpostilaatikkoa ei voi avata: %s: %s\n"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:558
-#, fuzzy, c-format
-msgid "Cannot remove contacts: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:873
+#, fuzzy
+msgid "Cannot refresh address book: "
 msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:595
-#, fuzzy, c-format
-msgid "Cannot get supported fields: %s"
-msgstr "Viestin %s hakeminen ei onnistu: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:899
+#, fuzzy
+msgid "Cannot get backend property: "
+msgstr "Viestià ei voi luoda: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
-#, fuzzy, c-format
-msgid "Cannot get required fields: %s"
-msgstr "Viestin %s hakeminen ei onnistu: %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
+#, fuzzy
+msgid "Cannot set backend property: "
+msgstr "Kalenteritietoja ei voi tallentaa"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, fuzzy, c-format
-msgid "Cannot get supported authentication methods: %s"
-msgstr "Tunnistautumismenetelmà ei ole tuettu"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:961
+#, fuzzy
+msgid "Cannot get contact list: "
+msgstr "Kansion %s sÃiliÃtà ei voitu hakea"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:662
-#, fuzzy, c-format
-msgid "Invalid query: %s"
-msgstr "Virheellinen kysely"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:995
+#, fuzzy
+msgid "Cannot get contact list uids: "
+msgstr "Kansion %s sÃiliÃtà ei voitu hakea"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:698
-#, fuzzy, c-format
-msgid "Cannot get changes: %s"
-msgstr "Viestin %s hakeminen ei onnistu: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1100
+#, fuzzy
+msgid "Cannot remove contacts: "
+msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:738
-#, fuzzy, c-format
-msgid "Cancel operation failed: %s"
-msgstr "Toiminto epÃonnistui: %s"
+#: ../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
+#, c-format
+msgid "Empty URI"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#, c-format, fuzzy
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "Odottamaton GnuPG tilaviesti havaittu:\n\n%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
-#, fuzzy, c-format
-msgid "Unexpected HTTP status code %d returned"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
+#, c-format
+msgid "Server is unreachable, calendar is opened in read-only mode.\nError message: %s"
 msgstr ""
-"Odottamaton GnuPG tilaviesti havaittu:\n"
-"\n"
-"%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
 msgid "Calendar doesn't support Free/Busy"
 msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:45
+#: ../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/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/contacts/e-cal-backend-contacts.c:1065
 msgid "Birthday"
 msgstr "SyntymÃpÃivÃ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
 #, c-format
 msgid "Birthday: %s"
 msgstr "SyntymÃpÃivÃ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
 #, c-format
 msgid "Anniversary: %s"
 msgstr "VuosipÃivÃ: %s"
@@ -921,1033 +1192,977 @@ msgstr "Kalenteritietoja ei voi tallentaa: virheellinen URI."
 msgid "Cannot save calendar data"
 msgstr "Kalenteritietoja ei voi tallentaa"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
-msgid "Reply Requested: by "
-msgstr "Vastausta pyydetÃÃn: mennessà "
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
-msgid "Reply Requested: When convenient"
-msgstr "Vastausta pyydetÃÃn: kun sopii"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
-#, c-format
-msgid "Loading %s items"
-msgstr "Ladataan %s kohdetta"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
-msgid "Calendar"
-msgstr "Kalenteri"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
-msgid "Invalid server URI"
-msgstr "Virheellinen palvelimen URI"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
-#: ../calendar/backends/http/e-cal-backend-http.c:690
-#: ../calendar/backends/weather/e-cal-backend-weather.c:520
-msgid "Could not create cache file"
-msgstr "VÃlimuistitiedostoa ei voitu luoda"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
-msgid "Could not create thread for populating cache"
-msgstr "VÃlimuistitiedoston luontia varten ei voitu luoda sÃiettÃ"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:359
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "Uudelleenohjaus virheelliseen URI:in"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:382
+#: ../calendar/backends/http/e-cal-backend-http.c:446
 msgid "Bad file format."
 msgstr "Virheellinen tiedostomuoto."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:389
+#: ../calendar/backends/http/e-cal-backend-http.c:454
 msgid "Not a calendar."
 msgstr "Ei kalenteri."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../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
+msgid "Could not create cache file"
+msgstr "VÃlimuistitiedostoa ei voitu luoda"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
 msgid "Could not retrieve weather data"
 msgstr "SÃÃtietoja ei voitu hakea"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Fog"
 msgstr "SÃÃ: sumuista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Cloudy Night"
 msgstr "SÃÃ: pilvinen yÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Cloudy"
 msgstr "SÃÃ: pilvistÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Overcast"
 msgstr "SÃÃ: poutaista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Showers"
 msgstr "SÃÃ: sadekuuroja"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Snow"
 msgstr "SÃÃ: sadetta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Clear Night"
 msgstr "SÃÃ: kirkas yÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Sunny"
 msgstr "SÃÃ: Aurinkoista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Thunderstorms"
 msgstr "SÃÃ: ukkosta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+#: ../calendar/backends/weather/e-cal-backend-weather.c:435
 msgid "Forecast"
 msgstr "SÃÃennuste"
 
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../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
+msgid "Repository is offline"
+msgstr "Varasto on yhteydettÃmÃssà tilassa"
+
+#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
+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
+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
+msgid "Invalid object"
+msgstr "Virheellinen kohde"
+
+#: ../calendar/libecal/e-cal.c:4574
+msgid "URI not loaded"
+msgstr "URIa ei ole ladattu"
+
+#: ../calendar/libecal/e-cal.c:4576
+msgid "URI already loaded"
+msgstr "URI on jo ladattu"
+
+#: ../calendar/libecal/e-cal.c:4580
+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
+msgid "Object ID already exists"
+msgstr "OID on jo olemassa"
+
+#: ../calendar/libecal/e-cal.c:4584
+msgid "Protocol not supported"
+msgstr "Protokolla ei ole tuettu"
+
+#: ../calendar/libecal/e-cal.c:4586
+msgid "Operation has been canceled"
+msgstr "Toimenpide on peruttu"
+
+#: ../calendar/libecal/e-cal.c:4588
+msgid "Could not cancel operation"
+msgstr "Toimenpidettà ei voitu perua"
+
+#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
+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
+msgid "Authentication required"
+msgstr "Todennus vaaditaan"
+
+#: ../calendar/libecal/e-cal.c:4594
+#, fuzzy
+msgid "A D-Bus exception has occurred"
+msgstr "Tapahtui CORBA-poikkeus"
+
+#: ../calendar/libecal/e-cal.c:4598
+msgid "No error"
+msgstr "Ei virhettÃ"
+
+#: ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:442
+msgid "Unknown user"
+msgstr "Tuntematon kÃyttÃjÃ"
+
+#: ../calendar/libecal/e-cal-client.c:147
+#: ../calendar/libedata-cal/e-data-cal.c:431
+msgid "Invalid range"
+msgstr "Virheellinen alue"
+
+#: ../calendar/libecal/e-cal-client.c:603
+#, 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
 msgid "Untitled appointment"
 msgstr "NimeÃmÃtÃn tapaaminen"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
+#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#, fuzzy
+msgctxt "Priority"
 msgid "High"
 msgstr "Korkea"
 
-#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#, fuzzy
+msgctxt "Priority"
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
+#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#, fuzzy
+msgctxt "Priority"
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:703
+#: ../calendar/libecal/e-cal-util.c:716
+#, fuzzy
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "MÃÃrittelemÃtÃn"
 
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:435
-#, 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:1241
-#, 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:4051
-msgid "Backend is busy"
-msgstr "TaustajÃrjestelmà on kÃytÃssÃ"
-
-#: ../calendar/libecal/e-cal.c:4053
-msgid "Repository is offline"
-msgstr "Varasto on yhteydettÃmÃssà tilassa"
-
-#: ../calendar/libecal/e-cal.c:4055
-msgid "No such calendar"
-msgstr "Kalenteria ei ole olemassa"
-
-#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "Kohdetta ei lÃydy"
-
-#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "Virheellinen kohde"
-
-#: ../calendar/libecal/e-cal.c:4061
-msgid "URI not loaded"
-msgstr "URIa ei ole ladattu"
-
-#: ../calendar/libecal/e-cal.c:4063
-msgid "URI already loaded"
-msgstr "URI on jo ladattu"
-
-#: ../calendar/libecal/e-cal.c:4067 ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "Tuntematon kÃyttÃjÃ"
-
-#: ../calendar/libecal/e-cal.c:4069 ../calendar/libedata-cal/e-data-cal.c:115
-msgid "Object ID already exists"
-msgstr "OID on jo olemassa"
-
-#: ../calendar/libecal/e-cal.c:4071
-msgid "Protocol not supported"
-msgstr "Protokolla ei ole tuettu"
-
-#: ../calendar/libecal/e-cal.c:4073
-msgid "Operation has been canceled"
-msgstr "Toimenpide on peruttu"
-
-#: ../calendar/libecal/e-cal.c:4075
-msgid "Could not cancel operation"
-msgstr "Toimenpidettà ei voitu perua"
-
-#: ../calendar/libecal/e-cal.c:4077
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1466
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1484
-#: ../camel/providers/groupwise/camel-groupwise-store.c:618
-#: ../camel/providers/groupwise/camel-groupwise-store.c:793
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
-#, c-format
-msgid "Authentication failed"
-msgstr "Todennus epÃonnistui"
-
-#: ../calendar/libecal/e-cal.c:4079
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-msgid "Authentication required"
-msgstr "Todennus vaaditaan"
-
-#: ../calendar/libecal/e-cal.c:4081
+#: ../calendar/libedata-cal/e-cal-backend.c:38
 #, fuzzy
-msgid "A D-Bus exception has occurred"
-msgstr "Tapahtui CORBA-poikkeus"
+msgid "Cannot process, calendar backend is opening"
+msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#: ../calendar/libecal/e-cal.c:4083
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
-#: ../camel/providers/imap/camel-imap-command.c:457
-#: ../camel/providers/imap/camel-imap-store.c:627
-#: ../camel/providers/pop3/camel-pop3-store.c:474
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
+#: ../calendar/libedata-cal/e-cal-backend.c:146
+#, c-format, fuzzy
+msgid "Unknown calendar property '%s'"
+msgstr "Tuntematon virhe: %s"
 
-#: ../calendar/libecal/e-cal.c:4085
-msgid "No error"
-msgstr "Ei virhettÃ"
+#: ../calendar/libedata-cal/e-cal-backend.c:163
+#, c-format, fuzzy
+msgid "Cannot change value of calendar property '%s'"
+msgstr "Viestià ei voi luoda: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
+#: ../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
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" ei ota argumentteja"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
+#: ../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
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ottaa yhden argumentin"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
+#: ../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
 #, 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:123
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:136
 #, 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:162
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
+#: ../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
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
+#: ../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
 #, 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:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
 #, 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:377
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397
+#, c-format, fuzzy
+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
 #, 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:745
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:420
+#, c-format, fuzzy
+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
+msgid "\"%s\" expects none or two arguments"
+msgstr "\"%s\" olettaa kahta argumenttia"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894
 #, 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:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:924
 #, 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:927
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, 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:941
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1100
 #, 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)"
-
-#: ../calendar/libedata-cal/e-data-cal.c:112
-msgid "Invalid range"
-msgstr "Virheellinen alue"
+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:119
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Unsupported method"
 msgstr "Menetelmà ei ole tuettu."
 
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:962
 #, fuzzy
-msgid "Calendar does not exist"
-msgstr "Kansiota \"%s\" ei ole olemassa."
+msgid "Cannot open calendar: "
+msgstr "Kalenteria ei voi avata"
 
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:987
 #, fuzzy
-msgid "Unknown user"
-msgstr "Tuntematon kÃyttÃjÃ"
+msgid "Cannot remove calendar: "
+msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:608
-#, fuzzy, c-format
-msgid "Cannot retrieve calendar address: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#, fuzzy
+msgid "Cannot refresh calendar: "
 msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:628
-#, fuzzy, c-format
-msgid "Cannot retrieve calendar alarm e-mail address: %s"
-msgstr "Kalenteritietoja ei voi tallentaa: virheellinen URI."
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1043
+#, fuzzy
+msgid "Cannot retrieve backend property: "
+msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:648
-#, fuzzy, c-format
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1098
+#, fuzzy
+msgid "Cannot retrieve calendar object path: "
 msgstr "Kalenteritietoja ei voi tallentaa"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:668
-#, fuzzy, c-format
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr "CMS-vastaanottajatietoja ei voi luoda"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:687
-#, fuzzy, c-format
-msgid "Cannot open calendar: %s"
-msgstr "Kalenteria ei voi avata"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:708
-#, fuzzy, c-format
-msgid "Cannot refresh calendar: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1128
+#, fuzzy
+msgid "Cannot retrieve calendar object list: "
 msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:727
-#, fuzzy, c-format
-msgid "Cannot remove calendar: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1157
+#, fuzzy
+msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:748
-#, fuzzy, c-format
-msgid "Cannot create calendar object: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1188
+#, fuzzy
+msgid "Cannot create calendar object: "
 msgstr "Viestià ei voi luoda: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:772
-#, fuzzy, c-format
-msgid "Cannot modify calendar object: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1220
+#, fuzzy
+msgid "Cannot modify calendar object: "
 msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
-#, fuzzy, c-format
-msgid "Cannot remove calendar object: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1254
+#, fuzzy
+msgid "Cannot remove calendar object: "
 msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:819
-#, fuzzy, c-format
-msgid "Cannot receive calendar objects: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1281
+#, fuzzy
+msgid "Cannot receive calendar objects: "
 msgstr "Kalenteria ei voi pÃivittÃÃ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:838
-#, fuzzy, c-format
-msgid "Cannot discard calendar alarm: %s"
-msgstr "Kalenteritietoja ei voi tallentaa"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:859
-#, fuzzy, c-format
-msgid "Cannot send calendar objects: %s"
-msgstr "Kalenteritietoja ei voi tallentaa"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:884
-#, c-format
-msgid "Cannot retrieve default calendar object path: %s"
-msgstr ""
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:904
-#, fuzzy, c-format
-msgid "Cannot retrieve calendar object path: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1312
+#, fuzzy
+msgid "Cannot send calendar objects: "
 msgstr "Kalenteritietoja ei voi tallentaa"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:924
-#, fuzzy, c-format
-msgid "Cannot retrieve calendar object list: %s"
-msgstr "Kalenteria ei voi pÃivittÃÃ"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:952
-#, fuzzy, c-format
-msgid "Could not retrieve attachment list: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1344
+#, fuzzy
+msgid "Could not retrieve attachment uris: "
 msgstr "Tietoa ei voitu avata vÃlimuistista: %s: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:978
-#, fuzzy, c-format
-msgid "Could not complete calendar query: %s"
-msgstr "VÃlimuistihakemistoa ei voitu avata: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1372
+#, fuzzy
+msgid "Could not discard reminder: "
+msgstr "Kansiota ei voitu tallentaa: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:998
-#, fuzzy, c-format
-msgid "Could not retrieve calendar time zone: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1401
+#, fuzzy
+msgid "Could not get calendar view path: "
 msgstr "Kansiota ei voitu uudelleen nimetÃ: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1018
-#, fuzzy, c-format
-msgid "Could not add calendar time zone: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1431
+#, fuzzy
+msgid "Could not retrieve calendar time zone: "
 msgstr "Kansiota ei voitu uudelleen nimetÃ: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1037
-#, fuzzy, c-format
-msgid "Could not set default calendar time zone: %s"
-msgstr "Viestin lÃhettÃminen epÃonnistui: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1060
-#, fuzzy, c-format
-msgid "Cannot retrieve calendar changes: %s"
-msgstr "Kalenteria ei voi pÃivittÃÃ"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1091
-#, fuzzy, c-format
-msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "Kalenteria ei voi pÃivittÃÃ"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:364
-#, c-format
-msgid "Invalid URI"
-msgstr ""
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:382
-#, c-format
-msgid "No backend factory for '%s' of '%s'"
-msgstr ""
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1457
+#, fuzzy
+msgid "Could not add calendar time zone: "
+msgstr "Kansiota ei voitu uudelleen nimetÃ: %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:432
-#, c-format
-msgid "Could not instantiate backend"
-msgstr ""
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
+#, c-format, fuzzy
+msgid "Invalid call"
+msgstr "Virheellinen alue"
 
-#: ../camel/camel-cipher-context.c:75
+#: ../camel/camel-cipher-context.c:206
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "TÃmà salakirjoitusmenetelmà ei tue allekirjoitusta"
 
-#: ../camel/camel-cipher-context.c:110
-msgid "Signing message"
-msgstr "Allekirjoitetaan viestiÃ"
-
-#: ../camel/camel-cipher-context.c:131
+#: ../camel/camel-cipher-context.c:219
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "TÃmà salakirjoitusmenetelmà ei tue varmennusta"
 
-#: ../camel/camel-cipher-context.c:164
-msgid "Verifying message"
-msgstr "Varmistetaan viestiÃ"
-
-#: ../camel/camel-cipher-context.c:188
+#: ../camel/camel-cipher-context.c:235
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "TÃmà salakirjoitusmenetelmà ei tue tiedon salausta"
 
-#: ../camel/camel-cipher-context.c:223
-msgid "Encrypting message"
-msgstr "Salataan viestiÃ"
-
-#: ../camel/camel-cipher-context.c:246
+#: ../camel/camel-cipher-context.c:249
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "TÃmà salakirjoitusmenetelmà ei tue salauksen purkua"
 
-#: ../camel/camel-cipher-context.c:276
-msgid "Decrypting message"
-msgstr "Puretaan viestin salausta"
-
-#: ../camel/camel-cipher-context.c:297
+#: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Et voi tuoda avaimia tÃllà salakirjoitusmenetelmÃllÃ"
 
-#: ../camel/camel-cipher-context.c:341
+#: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Et voi viedà avaimia tÃllà salakirjoitusmenetelmÃllÃ"
 
+#: ../camel/camel-cipher-context.c:805
+msgid "Signing message"
+msgstr "Allekirjoitetaan viestiÃ"
+
+#: ../camel/camel-cipher-context.c:1046
+msgid "Encrypting message"
+msgstr "Salataan viestiÃ"
+
+#: ../camel/camel-cipher-context.c:1173
+msgid "Decrypting message"
+msgstr "Puretaan viestin salausta"
+
 #: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
 msgstr "VÃlimuistipolun luonti epÃonnistui"
 
-#: ../camel/camel-data-cache.c:494
+#: ../camel/camel-data-cache.c:507
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Tietoa ei voitu avata vÃlimuistista: %s: %s"
 
-#: ../camel/camel-data-wrapper.c:89
-#, fuzzy, c-format
-msgid "No stream available"
-msgstr "TÃmà viesti ei ole saatavilla."
-
-#: ../camel/camel-db.c:464
-#, c-format
-msgid "Insufficient memory"
-msgstr "Muisti ei riitÃ"
-
-#: ../camel/camel-disco-diary.c:195
+#: ../camel/camel-disco-diary.c:201
 #, c-format
-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."
+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."
 
-#: ../camel/camel-disco-diary.c:258
-#: ../camel/providers/imap/camel-imap-journal.c:298
+#: ../camel/camel-disco-diary.c:266
+#: ../camel/providers/imap/camel-imap-journal.c:309
 #, c-format
-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."
+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."
 
-#: ../camel/camel-disco-diary.c:299
+#: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
 msgstr "Uudelleentahdistetaan palvelimen kanssa"
 
-#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "Haetaan uusia viestejà yhteydettÃmÃÃn kÃyttÃÃn"
 
-#: ../camel/camel-disco-folder.c:379
+#: ../camel/camel-disco-folder.c:416
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Valmistellaan kansiota \"%s\" yhteydettÃmÃÃn tilaan"
 
-#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
-msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+#, 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:398
-#: ../camel/providers/groupwise/camel-groupwise-store.c:230
-#: ../camel/providers/imap/camel-imap-store.c:876
-#: ../camel/providers/imap/camel-imap-store.c:1720
-#: ../camel/providers/imap/camel-imap-store.c:2178
-#: ../camel/providers/imap/camel-imap-store.c:3022
-#: ../camel/providers/imapx/camel-imapx-folder.c:164
-#: ../camel/providers/imapx/camel-imapx-folder.c:195
-#: ../camel/providers/imapx/camel-imapx-folder.c:224
-#: ../camel/providers/imapx/camel-imapx-folder.c:281
-#: ../camel/providers/imapx/camel-imapx-folder.c:324
-#: ../camel/providers/imapx/camel-imapx-folder.c:356
-#: ../camel/providers/imapx/camel-imapx-folder.c:387
-#: ../camel/providers/imapx/camel-imapx-store.c:193
-#: ../camel/providers/imapx/camel-imapx-store.c:715
-#: ../camel/providers/imapx/camel-imapx-store.c:778
-#: ../camel/providers/imapx/camel-imapx-store.c:837
+#: ../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
 #, c-format
 msgid "You must be working online to complete this operation"
-msgstr ""
-"Sinun tÃytyy olla yhteydellisessà tilassa suorittaaksesi tÃmÃn toiminnon "
-"loppuun"
-
-#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
-#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
-#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
-#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:514
-#: ../camel/camel-net-utils.c:691 ../camel/camel-net-utils.c:840
-#: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4675
-#: ../camel/providers/imapx/camel-imapx-server.c:4692
-#: ../camel/providers/nntp/camel-nntp-summary.c:396
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
-#: ../camel/providers/pop3/camel-pop3-folder.c:625
-#: ../camel/providers/pop3/camel-pop3-folder.c:690
-#: ../camel/providers/pop3/camel-pop3-store.c:466
-#: ../libedataserverui/e-book-auth-util.c:229
-#, fuzzy, c-format
-msgid "Cancelled"
-msgstr "Peruttu"
+msgstr "Sinun tÃytyy olla yhteydellisessà tilassa suorittaaksesi tÃmÃn toiminnon loppuun"
 
-#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
-#: ../camel/camel-file-utils.c:791
+#: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "Peruttu"
 
-#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Lapsiprosessin \"%s\" luominen epÃonnistui: %s"
 
-#: ../camel/camel-filter-driver.c:853
+#: ../camel/camel-filter-driver.c:943
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Virheellinen viestivirta lÃhteestà %s: %s"
 
-#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
+#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jÃsennettÃessà suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1240
+#: ../camel/camel-filter-driver.c:1347
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu avata"
 
-#: ../camel/camel-filter-driver.c:1251
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu kÃsitellÃ"
 
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestià %d (%d %%)"
 
-#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
 msgid "Complete"
 msgstr "Valmis"
 
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1485
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestià %d / %d"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1503
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: ../camel/camel-filter-search.c:135
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "Viestià ei voitu hakea."
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
 msgstr "Virheellisià argumentteja (system-flag)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
 msgstr "Virheellisià argumentteja (user-tag)"
 
-#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../camel/camel-folder.c:262
+#, c-format, fuzzy
+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
+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
+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
+msgid "Moving messages"
+msgstr "SiirretÃÃn viestejÃ"
+
+#: ../camel/camel-folder.c:921
+msgid "Copying messages"
+msgstr "Kopioidaan viestejÃ"
+
+#: ../camel/camel-folder.c:1233
 #, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
+msgid "Quota information not supported for folder '%s'"
 msgstr ""
-"Hakulauseketta ei voi tulkita: %s:\n"
-"%s"
 
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder.c:3549
+#, c-format, fuzzy
+msgid "Retrieving message '%s' in %s"
+msgstr "Haetaan POP-viestià %d"
+
+#: ../camel/camel-folder.c:3698
+#, c-format, fuzzy
+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
 #, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Virhe suoritettaessa hakulauseketta: %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
+#, c-format
+msgid "Error executing search expression: %s:\n%s"
+msgstr "Virhe suoritettaessa hakulauseketta: %s:\n%s"
 
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#. 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
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) vaatii yhden totuusarvoisen tuloksen"
 
-#: ../camel/camel-folder-search.c:938
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ei ole sallittu kohdan %s sisÃllÃ"
 
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#. 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
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) vaatii vertaustyypin merkkijonon"
 
-#: ../camel/camel-folder-search.c:978
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1037
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) olettaa tuloksena olevan taulukon"
 
-#: ../camel/camel-folder-search.c:987
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1047
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) vaatii kansion asettamisen"
 
-#: ../camel/camel-folder.c:125
-#, 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:147
-#, 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:171
-#, 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:688
-#: ../camel/providers/local/camel-maildir-folder.c:366
-msgid "Moving messages"
-msgstr "SiirretÃÃn viestejÃ"
-
-#: ../camel/camel-folder.c:690
-msgid "Copying messages"
-msgstr "Kopioidaan viestejÃ"
-
-#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
-#: ../camel/camel-gpg-context.c:1330
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg:n suoritus epÃonnistui: %s"
 
-#: ../camel/camel-gpg-context.c:706
-#: ../camel/providers/smtp/camel-smtp-transport.c:114
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../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:787
+#: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg kÃyttÃjÃtunnisteen vihjeen tulkitseminen epÃonnistui."
 
-#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg salalausepyynnÃn tulkinta epÃonnistui."
 
-#: ../camel/camel-gpg-context.c:848
+#: ../camel/camel-gpg-context.c:830
 #, c-format
-msgid ""
-"You need a PIN to unlock the key for your\n"
-"SmartCard: \"%s\""
+msgid "You need a PIN to unlock the key for your\nSmartCard: \"%s\""
 msgstr "Tarvitset PIN-koodin avataksesi Ãlykorttisi: \"%s\""
 
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:834
 #, c-format
-msgid ""
-"You need a passphrase to unlock the key for\n"
-"user: \"%s\""
-msgstr ""
-"Tarvitse salalauseen avataksesi avaimen\n"
-"kÃyttÃjÃlle: \"%s\""
+msgid "You need a passphrase to unlock the key for\nuser: \"%s\""
+msgstr "Tarvitse salalauseen avataksesi avaimen\nkÃyttÃjÃlle: \"%s\""
 
-#: ../camel/camel-gpg-context.c:858
+#: ../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:905
+#: ../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."
+msgstr ""
+
+#: ../camel/camel-gpg-context.c:879 ../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
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#: ../camel/camel-gpg-context.c:900
 #, 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:917
+#: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus GnuPG:ltÃ: %s"
 
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:1044
 #, 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:1434 ../camel/camel-smime-context.c:821
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Could not generate signing data: "
 msgstr "Allekirjoitustietoa ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
-#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
+#: ../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
 msgid "Failed to execute gpg."
 msgstr "gpg:n suoritus epÃonnistui."
 
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
-#: ../camel/camel-smime-context.c:966
+#: ../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
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1695
+#: ../camel/camel-gpg-context.c:1797
 #, fuzzy
 msgid "Cannot verify message signature: "
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1814
+#: ../camel/camel-gpg-context.c:1920
 #, fuzzy
 msgid "Could not generate encrypting data: "
 msgstr "Salaustieto ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:1866
+#: ../camel/camel-gpg-context.c:1973
 msgid "This is a digitally encrypted message part"
 msgstr "Digitaalisesti salattu viestin osa"
 
-#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
-#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Viestin salausta ei voi purkaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1942
+#: ../camel/camel-gpg-context.c:2051
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-osan salauksen purku epÃonnistui: protokollavirhe"
 
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
 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"
+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-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-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"
@@ -1968,29 +2183,7 @@ msgstr "\"%s\" ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
 msgid "Could not lock '%s'"
 msgstr "Lukitus epÃonnistui: %s"
 
-#: ../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-movemail.c:105
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "SÃhkÃpostitiedostoa %s ei voitu tarkistaa: %s"
@@ -2039,59 +2232,64 @@ msgstr "Virhe luettaessa viestitiedostoa: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "Virhe kirjoitettaessa vÃliaikaista viestitiedostoa: %s"
 
-#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
+#: ../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-multipart-signed.c:285
-#, fuzzy, c-format
+#: ../camel/camel-multipart-signed.c:297
+#, c-format, fuzzy
 msgid "No content available"
 msgstr "Ei kuvausta saatavilla"
 
-#: ../camel/camel-multipart-signed.c:293
-#, fuzzy, c-format
+#: ../camel/camel-multipart-signed.c:305
+#, c-format, fuzzy
 msgid "No signature available"
 msgstr "Ei kuvausta saatavilla"
 
-#: ../camel/camel-multipart-signed.c:612
+#: ../camel/camel-multipart-signed.c:689
 #, c-format
 msgid "parse error"
 msgstr "Virhe tulkittaessa"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ratkaistaan: %s"
 
-#: ../camel/camel-net-utils.c:717
+#: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
 msgstr "Palvelimen osoitteen haku epÃonnistui"
 
-#: ../camel/camel-net-utils.c:721
+#: ../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:844
+#: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
 msgstr "EtsitÃÃn osoitetta"
 
-#: ../camel/camel-net-utils.c:864
+#: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
 msgstr "Nimikysely epÃonnistui"
 
-#: ../camel/camel-net-utils.c:869
+#: ../camel/camel-net-utils.c:880
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Nimen haku epÃonnistui: %s"
 
-#: ../camel/camel-offline-folder.c:169
+#: ../camel/camel-network-service.c:112
+#, c-format, fuzzy
+msgid "Could not connect to %s: "
+msgstr "Yhteyttà %s:ÃÃn ei voitu luoda: %s"
+
+#: ../camel/camel-offline-folder.c:206
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkronoidaan viestejà kansiossa %s levylle"
 
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Kansion \"%s\" yhteydettÃmÃn tilan muutoslokia ei voi luoda: %s"
@@ -2104,24 +2302,22 @@ 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:188
+#: ../camel/camel-provider.c:193
 #, 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:197
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ei voitu ladata: %s"
 
-#: ../camel/camel-provider.c:206
+#: ../camel/camel-provider.c:211
 #, 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:388 ../camel/camel-session.c:207
+#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
@@ -2134,200 +2330,154 @@ msgstr "Anonyymi"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "TÃmà valitsin kirjautuu palvelimelle anonyymisti."
 
-#: ../camel/camel-sasl-anonymous.c:69
+#: ../camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
 msgstr "Todennus epÃonnistui."
 
-#: ../camel/camel-sasl-anonymous.c:80
+#: ../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:94
+#: ../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:108
+#: ../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:45
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:47
-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-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Ã."
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:60
-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: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Ã."
 
-#: ../camel/camel-sasl-digest-md5.c:820
+#: ../camel/camel-sasl-digest-md5.c:850
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Palvelimen haaste liian pitkà (>2048 tavua)"
 
-#: ../camel/camel-sasl-digest-md5.c:831
+#: ../camel/camel-sasl-digest-md5.c:861
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Palvelimen haaste on virheellinen\n"
 
-#: ../camel/camel-sasl-digest-md5.c:839
+#: ../camel/camel-sasl-digest-md5.c:869
 #, 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:871
+#: ../camel/camel-sasl-digest-md5.c:902
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Palvelimen vaste ei sisÃltÃnyt todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:892
+#: ../camel/camel-sasl-digest-md5.c:923
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Palvelimen vaste sisÃlsi vajaata todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:905
+#: ../camel/camel-sasl-digest-md5.c:936
 #, c-format
 msgid "Server response does not match"
 msgstr "Palvelimen vaste ei vastaa haluttua"
 
-#: ../camel/camel-sasl-gssapi.c:80
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../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:119
-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: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."
 
-#: ../camel/camel-sasl-gssapi.c:124
+#: ../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:127
-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: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."
 
-#: ../camel/camel-sasl-gssapi.c:131
-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: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."
 
-#: ../camel/camel-sasl-gssapi.c:136
-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: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."
 
-#: ../camel/camel-sasl-gssapi.c:140
-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: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."
 
-#: ../camel/camel-sasl-gssapi.c:145
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "MÃÃritelty tilakahva ei viittaa kelvolliseen tilaan."
 
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_check:ille tehdyt eheystarkistukset epÃonnistuivat."
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "Valtuustiedoille tehdyt eheystarkistukset epÃonnistuivat."
 
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 
-#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
-#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../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
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
-#: ../camel/camel-sasl-gssapi.c:369
+#: ../camel/camel-sasl-gssapi.c:410
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Turvakerros ei ole tuettu."
 
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "Kirjautuminen"
 
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 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:94
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Tuntematon todennustila."
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:43
-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-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."
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "SELVÃKIELINEN"
 
@@ -2337,23 +2487,21 @@ 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:82
-msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:84
+#, fuzzy
+msgid "POP Source UID"
 msgstr "POP:in lÃhde-URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:89
-#, fuzzy, c-format
+#: ../camel/camel-sasl-popb4smtp.c:96
+#, c-format, fuzzy
 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:97
-#, fuzzy, c-format
-msgid "POP Before SMTP authentication using a non-POP source"
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
+#, c-format, fuzzy
+msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP ennen SMTP:tà kÃyttÃen lÃhdettÃ, joka ei ole POP"
 
 #: ../camel/camel-search-private.c:112
@@ -2361,437 +2509,463 @@ 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-service.c:88
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL \"%s\" vaatii kÃyttÃjÃtunnusosan"
-
-#: ../camel/camel-service.c:92
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL \"%s\" vaatii palvelinosan"
+#: ../camel/camel-session.c:393
+#, c-format, fuzzy
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/camel-service.c:96
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL \"%s\" vaatii polkuosan"
+#: ../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:261
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Hakemistoa %s ei voitu luoda:\n"
-"%s"
+#: ../camel/camel-session.c:487
+#, c-format, fuzzy
+msgid "%s authentication failed"
+msgstr "Todennus epÃonnistui"
 
-#: ../camel/camel-session.c:758
+#: ../camel/camel-session.c:1194
 #, 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:348 ../camel/camel-smime-context.c:1041
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Varmennetta \"%s\":lle ei lÃydy"
 
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "CMS-viestià ei voi luoda"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voitu luoda"
 
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voi liittÃÃ"
 
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "CMS-tietoa ei voi liittÃÃ"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "CMS-allekirjoitustietoa ei voitu luoda"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "Varmenneketjua ei lÃydy"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "CMS allekirjoitusaikaa ei voi lisÃtÃ"
 
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Salausvarmennetta kohteelle \"%s\" ei ole olemassa."
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs-attribuuttia ei voi lisÃtÃ"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs-attribuuttia ei voi lisÃtÃ"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "Salausvarmennetta ei voi lisÃtÃ"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "CMS allekirjoittajatietoa ei voi lisÃtÃ"
 
-#: ../camel/camel-smime-context.c:506
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "Varmistamaton"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "HyvÃksytty allekirjoitus"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "HylÃtty allekirjoitus"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr "SisÃltÃÃ muutettu siirrettÃessÃ"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "Allekirjoitusvarmennetta ei lÃytynyt"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "Allekirjoitusvarmenteeseen ei luoteta"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "Allekirjoituksen algoritmi on tuntematon"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "Allekirjoituksen algoritmi ei ole tuettu"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "Virhe allekirjoituksen muodossa"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "Virhe kÃsittelyssÃ"
 
-#: ../camel/camel-smime-context.c:566
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "Allekirjoituksessa ei ole allekirjoitettua tietoa"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "Viestin kuoresta ei ole tiivisteitÃ."
 
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "Tiivisteità ei voi laskea"
 
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "Viestin tiivisteità ei voi asettaa"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "Varmenteen tuonti epÃonnistui"
 
-#: ../camel/camel-smime-context.c:631
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Viesti on itsessÃÃn varmenne, varmenteita ei voi tarkistaa"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Viesti on itsessÃÃn varmenne, varmenteet tuotu ja tarkistettu"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "Allekirjoitustiivisteità ei lÃydy"
 
-#: ../camel/camel-smime-context.c:654
+#: ../camel/camel-smime-context.c:661
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allekirjoittaja: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
 msgstr "Kooderin kontekstia ei voi luoda"
 
-#: ../camel/camel-smime-context.c:838
+#: ../camel/camel-smime-context.c:848
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS-kooderiin ei voitu lisÃtà tietoa"
 
-#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
 msgstr "Tiedon koodaus epÃonnistui"
 
-#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
 msgstr "Purkaja epÃonnistui"
 
-#: ../camel/camel-smime-context.c:1049
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Yhteistà massasalausalgoritmia ei lÃydy"
 
-#: ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Lokeroa massasalausavaimelle ei voi varata"
 
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
 msgstr "CMS-viestià ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS-kÃÃrittyà tietoa ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS-kÃÃrittyà tietoa ei voi liittÃÃ"
 
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
 msgstr "CMS tieto-oliota ei voi liittÃÃ"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1100
+#: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi lisÃtÃ"
 
-#: ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
 msgstr "Tiedon lisÃys koodaajaan epÃonnistui"
 
-#: ../camel/camel-smime-context.c:1227
+#: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME purku: salauskontekstia ei lÃytynyt"
 
-#: ../camel/camel-store.c:444
+#: ../camel/camel-store.c:1799
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Kansiota \"%s\" ei voi luoda: kansio on jo olemassa"
 
-#: ../camel/camel-store.c:543
+#: ../camel/camel-store.c:1842
+#, c-format, fuzzy
+msgid "Opening folder '%s'"
+msgstr "Synkronoidaan kansiota"
+
+#: ../camel/camel-store.c:2027
+#, c-format, fuzzy
+msgid "Scanning folders in '%s'"
+msgstr "EtsitÃÃn muuttuneita viestejà kansiosta %s"
+
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../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-vtrash-folder.c:50
+msgid "Junk"
+msgstr "Roskaposti"
+
+#: ../camel/camel-store.c:2501
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
 
-#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
-#: ../camel/providers/local/camel-maildir-store.c:224
+#: ../camel/camel-store.c:2515
+#, c-format, fuzzy
+msgid "Creating folder '%s'"
+msgstr "Kansiota \"%s\" ei voi hakea: %s"
+
+#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
-#: ../camel/providers/local/camel-maildir-store.c:314
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:764
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeÃminen ei onnistu: %s: virheellinen toiminto"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
-msgid "Trash"
-msgstr "Roskakori"
+#: ../camel/camel-stream-filter.c:334
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr ""
 
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
-msgid "Junk"
-msgstr "Roskaposti"
+#: ../camel/camel-stream-process.c:267
+#, c-format
+msgid "Connection cancelled"
+msgstr "Yhteys peruutettu"
+
+#: ../camel/camel-stream-process.c:272
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Komentoon \"%s\" liittyminen epÃonnistui: %s"
+
+#: ../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
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-raw.c:669
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:814
+#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:820
-#, fuzzy, c-format
+#: ../camel/camel-tcp-stream-raw.c:777
+#, c-format, fuzzy
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "Varmennusmenetelmà %s ei ole tuettu"
 
-#: ../camel/camel-tcp-stream-raw.c:832
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "General SOCKS server failure"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:833
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "SOCKS server's rules do not allow connection"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:834
+#: ../camel/camel-tcp-stream-raw.c:791
 msgid "Network is unreachable from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:835
+#: ../camel/camel-tcp-stream-raw.c:792
 msgid "Host is unreachable from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:836
+#: ../camel/camel-tcp-stream-raw.c:793
 #, fuzzy
 msgid "Connection refused"
 msgstr "Yhteys peruutettu"
 
-#: ../camel/camel-tcp-stream-raw.c:837
+#: ../camel/camel-tcp-stream-raw.c:794
 msgid "Time-to-live expired"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:838
+#: ../camel/camel-tcp-stream-raw.c:795
 #, fuzzy
 msgid "Command not supported by SOCKS server"
 msgstr "Palvelin ei tue STLS-laajennosta"
 
-#: ../camel/camel-tcp-stream-raw.c:839
+#: ../camel/camel-tcp-stream-raw.c:796
 #, fuzzy
 msgid "Address type not supported by SOCKS server"
 msgstr "Palvelin ei tue STLS-laajennosta"
 
-#: ../camel/camel-tcp-stream-raw.c:840
+#: ../camel/camel-tcp-stream-raw.c:797
 #, fuzzy
 msgid "Unknown error from SOCKS server"
 msgstr "Tuntematon virhe: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:870
+#: ../camel/camel-tcp-stream-raw.c:830
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-raw.c:887
-#, fuzzy, c-format
+#: ../camel/camel-tcp-stream-raw.c:848
+#, c-format, fuzzy
 msgid "Incomplete reply from SOCKS server"
 msgstr "Virheellinen vastaus palvelimelta"
 
-#: ../camel/camel-tcp-stream-raw.c:902
+#: ../camel/camel-tcp-stream-raw.c:868
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr ""
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:934 ../camel/camel-tcp-stream-raw.c:944
-#, fuzzy, c-format
+#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
+#, c-format, fuzzy
 msgid "Invalid reply from proxy server"
 msgstr "Virheellinen vastaus palvelimelta"
 
-#: ../camel/camel-tcp-stream-ssl.c:457
-#, 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: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:463
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "GOOD"
 msgstr "HYVÃKSYTTY"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "BAD"
 msgstr "VIRHEELLINEN"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
+#: ../camel/camel-tcp-stream-ssl.c:484
 #, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
+msgid "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n\nDetailed information about the certificate:\n%s"
 msgstr ""
-"SSL-varmenteen tarkistus %s:lle:\n"
-"\n"
-"%s\n"
-"\n"
-"Haluatko hyvÃksyÃ?"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
+#: ../camel/camel-tcp-stream-ssl.c:488
+msgid "_Reject"
 msgstr ""
-"Ongelma varmenteessa: %s\n"
-"MyÃntÃjÃ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:563
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
+#: ../camel/camel-tcp-stream-ssl.c:489
+msgid "Accept _Temporarily"
 msgstr ""
-"Virheellinen varmenteen alue: %s\n"
-"MyÃntÃjà %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:581
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
+#: ../camel/camel-tcp-stream-ssl.c:490
+msgid "_Accept Permanently"
 msgstr ""
-"Varmenne vanhentunut: %s\n"
-"MyÃntÃjÃ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:548
 #, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Varmenteiden hylkÃyslista vanhentunut: %s\n"
-"MyÃntÃjÃ: %s"
+msgid "Certificate problem: %s\nIssuer: %s"
+msgstr "Ongelma varmenteessa: %s\nMyÃntÃjÃ: %s"
 
-#: ../camel/camel-url.c:314
+#: ../camel/camel-tcp-stream-ssl.c:600
+#, c-format
+msgid "Bad certificate domain: %s\nIssuer: %s"
+msgstr "Virheellinen varmenteen alue: %s\nMyÃntÃjà %s"
+
+#: ../camel/camel-tcp-stream-ssl.c:618
+#, c-format
+msgid "Certificate expired: %s\nIssuer: %s"
+msgstr "Varmenne vanhentunut: %s\nMyÃntÃjÃ: %s"
+
+#: ../camel/camel-tcp-stream-ssl.c:635
+#, c-format
+msgid "Certificate revocation list expired: %s\nIssuer: %s"
+msgstr "Varmenteiden hylkÃyslista vanhentunut: %s\nMyÃntÃjÃ: %s"
+
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URLia \"%s\" ei voi tulkita"
 
-#: ../camel/camel-vee-folder.c:1045
-#, fuzzy, c-format
-msgid "Error storing '%s': "
-msgstr "Virhe tallennettaessa \"%s\": %s"
+#: ../camel/camel-vee-folder.c:652
+#, c-format, fuzzy
+msgid "Updating %s folder"
+msgstr "Tallennetaan kansiota"
+
+#: ../camel/camel-vee-folder.c:1326 ../camel/camel-vee-folder.c:1483
+#, c-format
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Viestien kopioiminen tai siirtÃminen ei onnistu virtuaalisiin kansioihin"
 
-#: ../camel/camel-vee-folder.c:1118
+#: ../camel/camel-vee-folder.c:1359
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Viestià %s ei voitu lÃytÃà %s:stÃ"
 
-#: ../camel/camel-vee-folder.c:1134 ../camel/camel-vee-folder.c:1149
-#, c-format
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr ""
-"Viestien kopioiminen tai siirtÃminen ei onnistu virtuaalisiin kansioihin"
+#: ../camel/camel-vee-folder.c:1427
+#, c-format, fuzzy
+msgid "Error storing '%s': "
+msgstr "Virhe tallennettaessa \"%s\": %s"
 
-#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:417
+#. 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
 msgid "Unmatched"
 msgstr "Ei vastaavaa"
 
-#: ../camel/camel-vee-store.c:223
-#, 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:289
+#: ../camel/camel-vee-store.c:378
 #, 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
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Kansion nimeÃminen ei onnistu: %s: kansiota ei lÃydy"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Viestejà ei voi kopioida roskakoriin"
@@ -2800,385 +2974,150 @@ msgstr "Viestejà ei voi kopioida roskakoriin"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Viestejà ei voi kopioida roskapostikansioon"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Viestià ei voi hakea: %s\n"
-" %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#: ../camel/providers/local/camel-maildir-folder.c:268
-#: ../camel/providers/local/camel-maildir-folder.c:380
-#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-mh-folder.c:215
-msgid "No such message"
-msgstr "Ei tÃllaista viestiÃ"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:244
-#: ../camel/providers/nntp/camel-nntp-folder.c:337
-#: ../camel/providers/pop3/camel-pop3-folder.c:714
-#, fuzzy, c-format
-msgid "Cannot get message %s: "
-msgstr "Viestin %s hakeminen ei onnistu: %s"
+msgid "No output stream"
+msgstr "Ei tulosvirtaa"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2672
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, c-format
-msgid "This message is not available in offline mode."
-msgstr "TÃmà viesti ei ole saatavilla yhteydettÃmÃssà tilassa."
+msgid "No input stream"
+msgstr "Ei syÃtevirtaa"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2190
+#: ../camel/providers/imap/camel-imap-command.c:383
 #, c-format
-msgid "Could not get message"
-msgstr "Viestià ei voitu hakea"
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1070
-#: ../camel/providers/imap/camel-imap-folder.c:376
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Yhteenvetoa %s:lle ei voitu ladata"
+#: ../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/groupwise/camel-groupwise-folder.c:1144
+#: ../camel/providers/imap/camel-imap-command.c:420
 #, c-format
-msgid "Checking for deleted messages %s"
-msgstr "EtsitÃÃn poistettuja viestejà %s"
+msgid "Alert from IMAP server %s %s:\n%s"
+msgstr "HÃlytys IMAP-palvelimelta %s %s:\n%s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1670
-#: ../camel/providers/groupwise/camel-groupwise-store.c:654
-#: ../camel/providers/groupwise/camel-groupwise-store.c:779
-#: ../camel/providers/imap/camel-imap-folder.c:3814
-#: ../camel/providers/imap/camel-imap-folder.c:3892
-#: ../camel/providers/imapx/camel-imapx-server.c:3741
-#: ../camel/providers/imapx/camel-imapx-server.c:3865
+#: ../camel/providers/imap/camel-imap-command.c:502
 #, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "Haetaan yhteenvetoa uusista viesteistà kansiossa %s"
+msgid "Unexpected response from IMAP server: %s"
+msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2502
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2552
+#: ../camel/providers/imap/camel-imap-command.c:514
 #, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "Viestià ei voi lisÃtà kansioon  \"%s\": %s"
+msgid "IMAP command failed: %s"
+msgstr "IMAP-komento epÃonnistui: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
+#: ../camel/providers/imap/camel-imap-command.c:594
 #, c-format
-msgid "Cannot create message: %s"
-msgstr "Viestià ei voi luoda: %s"
+msgid "Server response ended too soon."
+msgstr "Palvelimen vastaus pÃÃttyi liian ÃkkiÃ."
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
+#: ../camel/providers/imap/camel-imap-command.c:806
 #, c-format
-msgid "Cannot get folder container %s"
-msgstr "Kansion %s sÃiliÃtà ei voitu hakea"
+msgid "IMAP server response did not contain %s information"
+msgstr "IMAP-palvelimen vaste ei sisÃltÃnyt tietoja %s:stÃ"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#: ../camel/providers/imap/camel-imap-command.c:844
 #, c-format
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr ""
-"Viestejà ei voi lisÃtà yhteydettÃmÃssà tilassa: vÃlimuisti ei ole saatavilla"
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+#: ../camel/providers/imap/camel-imap-folder.c:348
 #, fuzzy
-msgid "Cannot append message in offline mode: "
-msgstr "Viestià ei voi lisÃtà yhteydettÃmÃssà tilassa: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
-msgid "Checking for new mail"
-msgstr "Tarkastetaan onko uutta sÃhkÃpostia"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "C_heck for new messages in all folders"
-msgstr "Etsi uusia viestejà kaikista kansioista"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-#: ../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:82
-#: ../camel/providers/local/camel-local-provider.c:102
-msgid "Options"
-msgstr "Asetukset"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr ""
-"KÃytà suodattimia uusille viesteille saapuvien kansiossa tÃllà palvelimella"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-msgid "Check new messages for J_unk contents"
-msgstr "Etsi roskapostia _uusista viesteistÃ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Etsi roskapostia vain saapuvien kansiosta"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "Automatically synchroni_ze account locally"
-msgstr "Synk_ronoi tili paikallisesti automaattisesti"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "SOAP Settings"
-msgstr "SOAP-asetukset"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP _Port:"
-msgstr "Postitoimiston agentin SOAP-_portti:"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "Novell Groupwise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell GroupWise-palvelinten kÃyttÃÃ varten"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
-#: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:70
-msgid "Password"
-msgstr "Salasana"
+msgid "Always check for _new mail in this folder"
+msgstr "Etsi aina uusia viestejà tÃstà kansiosta"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
-msgstr "Ota yhteys Groupwise-palvelimeen selvÃkielistà salasanaa kÃyttÃen."
+#: ../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/groupwise/camel-groupwise-store.c:107
+#: ../camel/providers/imap/camel-imap-folder.c:440
 #, c-format
-msgid "Host or user not available in url"
-msgstr "Verkkonimi tai kÃyttÃjà ei ole mÃÃritelty URLissa"
+msgid "Could not create directory %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1188
-#: ../camel/providers/imapx/camel-imapx-server.c:2992
+#: ../camel/providers/imap/camel-imap-folder.c:461
 #, c-format
-msgid "You did not enter a password."
-msgstr "Et antanut salasanaa."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:328
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
-"Jotkut ominaisuudet eivÃt toimi oikein nykyisellà palvelimesi versiolla"
+msgid "Could not load summary for %s"
+msgstr "Yhteenvetoa %s:lle ei voitu ladata"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:550
-#: ../camel/providers/imap/camel-imap-store.c:1757
-#: ../camel/providers/imap/camel-imap-store.c:1952
-#: ../camel/providers/imapx/camel-imapx-store.c:416
+#: ../camel/providers/imap/camel-imap-folder.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:3938
 #, c-format
-msgid "No such folder %s"
-msgstr "Kansioita %s ei ole olemassa"
+msgid "Scanning for changed messages in %s"
+msgstr "EtsitÃÃn muuttuneita viestejà kansiosta %s"
+
+#: ../camel/providers/imap/camel-imap-folder.c:3478
+#, fuzzy
+msgid "Unable to retrieve message: "
+msgstr "Viestin haku epÃonnistui: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#: ../camel/providers/imap/camel-imap-folder.c:3515
+#: ../camel/providers/imapx/camel-imapx-server.c:5497
 #, c-format
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Groupwise-kansioita ei voi luoda yhteydettÃmÃssà tilassa."
+msgid "Cannot get message with message ID %s: %s"
+msgstr "Viestià tunnisteella %s ei voi noutaa: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
-#, fuzzy, c-format
-msgid "Cannot create a special system folder"
-msgstr "Kansiota \"%s\" ei voi poistaa: erikoiskansio"
+#: ../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/groupwise/camel-groupwise-store.c:1206
-#: ../camel/providers/imap/camel-imap-store.c:1835
-#: ../camel/providers/imap/camel-imap-store.c:2257
-#: ../camel/providers/imapx/camel-imapx-store.c:879
+#: ../camel/providers/imap/camel-imap-folder.c:3591
+#: ../camel/providers/imap/camel-imap-folder.c:4469
+#: ../camel/providers/nntp/camel-nntp-folder.c:515
 #, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Ylempi kansio ei voi sisÃltÃÃ alikansioita"
+msgid "This message is not currently available"
+msgstr "TÃmà viesti ei ole juuri nyt saatavilla"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
+#: ../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
 #, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Groupwise-kansiota \"%s\" ei voi nimetà uudelleen nimelle \"%s\""
+msgid "Fetching summary information for new messages in %s"
+msgstr "Haetaan yhteenvetoa uusista viesteistà kansiossa %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
+#: ../camel/providers/imap/camel-imap-folder.c:4267
 #, c-format
-msgid "GroupWise server %s"
-msgstr "Groupwise-palvelin %s"
+msgid "Incomplete server response: no information provided for message %d"
+msgstr "EpÃtÃydellinen vastaus palvelimelta: viestille %d ei lÃytynyt mitÃÃn tietoja"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
+#: ../camel/providers/imap/camel-imap-folder.c:4277
 #, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "Groupwise-palvelu kÃyttÃjÃlle %s palvelimella %s"
+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/groupwise/camel-groupwise-transport.c:58
+#: ../camel/providers/imap/camel-imap-folder.c:4509
 #, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "GroupWise-postinvÃlitys %s:n kautta"
+msgid "Could not find message body in FETCH response."
+msgstr "Viestin runkoa ei lÃytynyt FETCH-vastauksesta"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
-msgid "Sending Message"
-msgstr "LÃhetetÃÃn viestiÃ"
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#, fuzzy
+msgid "Could not open cache directory: "
+msgstr "VÃlimuistihakemistoa ei voitu avata: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
-#, c-format
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr ""
-"Kansion hakeminen ei onnistu: virheellinen toiminto tÃssà tallennuspaikassa"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
-#, c-format
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-"Olet ylittÃnyt tÃmÃn tilin tallennustilan rajat. Viestisi jÃivÃt lÃhtevien "
-"viestien kansioon. Yrità lÃhettÃà niità uudestaan, kun olet ensin poistanut "
-"joitakin sÃhkÃpostiviestejÃ.\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Viestin lÃhettÃminen epÃonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:190
-#: ../camel/providers/imap/camel-imap-command.c:288
-#, c-format
-msgid "No output stream"
-msgstr "Ei tulosvirtaa"
-
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:296
-#, c-format
-msgid "No input stream"
-msgstr "Ei syÃtevirtaa"
-
-#: ../camel/providers/imap/camel-imap-command.c:245
-#, c-format
-msgid "Operation cancelled"
-msgstr "Toiminto keskeytetty"
-
-#: ../camel/providers/imap/camel-imap-command.c:353
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
-
-#. for imap ALERT codes, account user host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:373
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-"HÃlytys IMAP-palvelimelta %s %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:444
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:456
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP-komento epÃonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:532
-#, c-format
-msgid "Server response ended too soon."
-msgstr "Palvelimen vastaus pÃÃttyi liian ÃkkiÃ."
-
-#: ../camel/providers/imap/camel-imap-command.c:740
-#, 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:778
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:281
-msgid "Always check for new mail in this folder"
-msgstr "Etsi aina uusia viestejà tÃstà kansiosta"
-
-#: ../camel/providers/imap/camel-imap-folder.c:353
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Hakemistoa %s ei voitu luoda: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3781
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "EtsitÃÃn muuttuneita viestejà kansiosta %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3231
-#, fuzzy
-msgid "Unable to retrieve message: "
-msgstr "Viestin haku epÃonnistui: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4958
-#, 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:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4959
-msgid "No such message available."
-msgstr "TÃmà viesti ei ole saatavilla."
-
-#: ../camel/providers/imap/camel-imap-folder.c:3341
-#: ../camel/providers/imap/camel-imap-folder.c:4211
-#: ../camel/providers/nntp/camel-nntp-folder.c:326
-#, 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:4021
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr ""
-"EpÃtÃydellinen vastaus palvelimelta: viestille %d ei lÃytynyt mitÃÃn tietoja"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4031
-#, 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:4251
-#, c-format
-msgid "Could not find message body in FETCH response."
-msgstr "Viestin runkoa ei lÃytynyt FETCH-vastauksesta"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:193
-#: ../camel/providers/imap/camel-imap-message-cache.c:253
-#, fuzzy
-msgid "Could not open cache directory: "
-msgstr "VÃlimuistihakemistoa ei voitu avata: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:326
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Viestin %s tallennus vÃlimuistiin epÃonnistui: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:388
-#, fuzzy, c-format
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
+#, c-format, fuzzy
 msgid "Failed to cache message %s: "
 msgstr "Viestin %s tallennus vÃlimuistiin epÃonnistui: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:525
-#, fuzzy, c-format
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
+#, c-format, fuzzy
 msgid "Failed to cache %s: "
 msgstr "VÃlimuistiin tallennus epÃonnistui %s: %s"
 
@@ -3187,8 +3126,13 @@ msgstr "VÃlimuistiin tallennus epÃonnistui %s: %s"
 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
+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:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "_Etsi uusia viestejà tilatuista kansioista"
 
@@ -3203,13 +3147,12 @@ msgid "_Use custom command to connect to server"
 msgstr "KÃytà _omaa komentoa palvelimeen yhdistÃmiseen"
 
 #: ../camel/providers/imap/camel-imap-provider.c:52
-#, fuzzy
 msgid "Co_mmand:"
-msgstr "Komento:"
+msgstr "Ko_mento:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
 #: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -3228,194 +3171,201 @@ msgstr "Ohita pal_velimen tarjoama kansioiden nimiavaruus"
 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
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "KÃytà suodattimia uusille viesteille Saapuvissa tÃllà palvelimella"
+#: ../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 "Check new messages for Jun_k contents"
-msgstr "Etsi roskapostia _uusista viesteistÃ"
+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:79
+#: ../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:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../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:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../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."
 
-#: ../camel/providers/imap/camel-imap-store.c:310
-#: ../camel/providers/imapx/camel-imapx-store.c:228
-#, c-format
-msgid "IMAP server %s"
-msgstr "Imap-palvelin %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:312
-#: ../camel/providers/imapx/camel-imapx-store.c:230
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-palvelin %s:lle palvelimella %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:447
-#: ../camel/providers/nntp/camel-nntp-store.c:234
-#: ../camel/providers/pop3/camel-pop3-store.c:132
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "Yhteyttà %s:ÃÃn ei voitu luoda: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:448
-#: ../camel/providers/nntp/camel-nntp-store.c:235
-#: ../camel/providers/pop3/camel-pop3-store.c:133
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
-msgid "SSL unavailable"
-msgstr "SSL ei kÃytettÃvissÃ"
-
-#: ../camel/providers/imap/camel-imap-store.c:466
-#: ../camel/providers/nntp/camel-nntp-store.c:252
-#, fuzzy, c-format
-msgid "Could not connect to %s: "
-msgstr "Yhteyttà %s:ÃÃn ei voitu luoda: %s"
+#. 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:572
-#: ../camel/providers/imap/camel-imap-store.c:592
-#: ../camel/providers/imap/camel-imap-store.c:599
-#: ../camel/providers/imap/camel-imap-store.c:626
-#: ../camel/providers/imapx/camel-imapx-server.c:2845
-#: ../camel/providers/imapx/camel-imapx-server.c:2881
+#: ../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"
+msgstr "IMAP-palvelimeen %s yhdistÃminen turvallisessa muodossa epÃonnistui: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2846
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../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:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2882
-msgid "SSL negotiations failed"
-msgstr "SSL-kÃttely epÃonnistui."
+#: ../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:600
-#: ../camel/providers/smtp/camel-smtp-transport.c:339
-msgid "SSL is not available in this build"
-msgstr "SSL ei ole kÃytettÃvissà tÃssà kÃÃnnÃksessÃ"
+#: ../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:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2682
+#: ../camel/providers/imap/camel-imap-store.c:809
+#: ../camel/providers/imapx/camel-imapx-store.c:155
 #, c-format
-msgid "Connection cancelled"
-msgstr "Yhteys peruutettu"
+msgid "IMAP server %s"
+msgstr "Imap-palvelin %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2687
+#: ../camel/providers/imap/camel-imap-store.c:812
+#: ../camel/providers/imapx/camel-imapx-store.c:158
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Komentoon \"%s\" liittyminen epÃonnistui: %s"
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:926
-#: ../camel/providers/imap/camel-imap-store.c:2350
-#: ../camel/providers/imapx/camel-imapx-store.c:463
-#: ../camel/providers/imapx/camel-imapx-store.c:1060
-#: ../camel/providers/local/camel-maildir-folder.c:90
-#: ../camel/providers/local/camel-maildir-store.c:225
-#: ../camel/providers/local/camel-maildir-store.c:315
-#: ../camel/providers/local/camel-maildir-store.c:562
-#: ../camel/providers/local/camel-maildir-store.c:575
-#: ../camel/providers/local/camel-spool-store.c:508
-msgid "Inbox"
-msgstr "Saapuneet"
+#: ../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:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2948
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmÃÃ %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:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2960
-#: ../camel/providers/smtp/camel-smtp-transport.c:462
+#: ../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 support for authentication type %s"
-msgstr "Varmennusmenetelmà %s ei ole tuettu"
+msgid "No such folder %s"
+msgstr "Kansioita %s ei ole olemassa"
 
-#: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3030
+#: ../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 ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"IMAP-palvelimelle tunnistautuminen epÃonnistui.\n"
-"%s\n"
-"\n"
+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:1771
-#: ../camel/providers/imap/camel-imap-store.c:2193
-#: ../camel/providers/imapx/camel-imapx-store.c:858
+#: ../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 folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisÃltÃÃ merkin \"%c\""
+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:1887
-#: ../camel/providers/local/camel-maildir-store.c:189
-#: ../camel/providers/local/camel-mbox-store.c:193
-#: ../camel/providers/local/camel-mh-store.c:255
+#: ../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:2206
-#: ../camel/providers/imapx/camel-imapx-store.c:869
+#: ../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:3062
+#: ../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:3065
+#: ../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:74
+#: ../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:82
-#, fuzzy, c-format
+#: ../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:42
+#: ../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:44
-msgid "Use I_dle if the server supports it"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
 msgstr ""
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
@@ -3431,83 +3381,177 @@ 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:1384
+#: ../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:2039
-#, fuzzy, c-format
+#: ../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:2773
-#, fuzzy, c-format
-msgid "Could not connect to %s (port %s): "
-msgstr "Yhteyttà %s porttiin %s ei voitu luoda: %s"
+#: ../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/imapx/camel-imapx-server.c:3202
+#: ../camel/providers/imapx/camel-imapx-server.c:3218
 #, fuzzy
 msgid "Closing tmp stream failed: "
 msgstr "Postitus epÃonnistui: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5083
-#, fuzzy, c-format
-msgid "Cannot create spool file: %s"
-msgstr "Viestià ei voi luoda: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3317
+#, fuzzy
+msgid "Error copying messages"
+msgstr "Kopioidaan viestejÃ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3447
+#, fuzzy
+msgid "Error appending message"
+msgstr "LÃhetetÃÃn viestiÃ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3627
+msgid "Error fetching message headers"
+msgstr ""
+
+#: ../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/imapx/camel-imapx-server.c:4161
+#, fuzzy
+msgid "Error while fetching messages"
+msgstr "Varmistetaan viestiÃ"
+
+#: ../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/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/imapx/camel-imapx-server.c:4444
+#, fuzzy
+msgid "Error expunging message"
+msgstr "Poistetaan vanhoja viestejà pysyvÃsti"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4528
+#, fuzzy
+msgid "Error fetching folders"
+msgstr "Tallennetaan kansiota"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4602
+#, fuzzy
+msgid "Error subscribing to folder"
+msgstr "_NÃytà ainoastaan tilatut kansiot"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4655
+#, fuzzy
+msgid "Error creating folder"
+msgstr "Tallennetaan kansiota"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4700
+#, fuzzy
+msgid "Error deleting folder"
+msgstr "Tallennetaan kansiota"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4750
+#, fuzzy
+msgid "Error renaming folder"
+msgstr "Tallennetaan kansiota"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4801
+#, fuzzy
+msgid "Error performing NOOP"
+msgstr "Virhe suoritettaessa hakua"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4896
+msgid "Error syncing changes"
+msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5099
+#: ../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:432
-#: ../camel/providers/nntp/camel-nntp-store.c:1510
+#: ../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-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-stream.c:68
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
 msgid "Source stream returned no data"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:77
-#, fuzzy, c-format
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
+#, c-format, fuzzy
 msgid "Source stream unavailable"
 msgstr "Palvelu ei ole saatavilla"
 
-#: ../camel/providers/local/camel-local-folder.c:199
+#: ../camel/providers/local/camel-local-folder.c:191
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:209
-#: ../camel/providers/local/camel-local-folder.c:218
+#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "postilaatikko: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:227
+#: ../camel/providers/local/camel-local-folder.c:219
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:272
-msgid "Index message body data"
+#: ../camel/providers/local/camel-local-folder.c:483
+#, fuzzy
+msgid "_Index message body data"
 msgstr "Indeksoi viestin rungon tiedot"
 
-#: ../camel/providers/local/camel-local-folder.c:686
-#, 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-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-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
@@ -3521,839 +3565,789 @@ msgstr "MH-muotoisia sÃhkÃpostihakemistoja"
 msgid "For storing local mail in MH-like mail directories."
 msgstr "SÃhkÃpostin tallennus MH-muotoisiin hakemistoihin paikallisesti."
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "Paikallinen toimitus"
 
-#: ../camel/providers/local/camel-local-provider.c:70
-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: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:84
-#: ../camel/providers/local/camel-local-provider.c:103
-msgid "_Apply filters to new messages in INBOX"
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:107
+#, fuzzy
+msgid "_Apply filters to new messages in Inbox"
 msgstr "_KÃytà suodattimia uusille viesteille saapuvien kansiossa"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Maildir-muotoisia sÃhkÃpostikansioita"
 
-#: ../camel/providers/local/camel-local-provider.c:92
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "SÃhkÃpostin tallennus maildir-muotoisiin hakemistoihin paikallisesti."
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Tallenna tila-otsakkeet Elm/Pine/Mutt-muodossa"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:115
 msgid "Standard Unix mbox spool file"
 msgstr "Tavallinen Unixin mbox-kansio"
 
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:123
-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: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:122
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "Tavallinen Unixin mbox-muotoinen saapuvien hakemisto"
 
-#: ../camel/providers/local/camel-local-store.c:149
-#: ../camel/providers/local/camel-local-store.c:284
-#: ../camel/providers/local/camel-mbox-store.c:371
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../camel/providers/local/camel-local-store.c:98
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Hakemistoa %s ei voitu uudelleennimetà seuraavaksi: %s: %s"
+
+#: ../camel/providers/local/camel-local-store.c:178
+#, 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
 #, 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:158
+#: ../camel/providers/local/camel-local-store.c:227
 #, 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:169
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../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
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:193
+#: ../camel/providers/local/camel-local-store.c:286
 #, 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:250
+#: ../camel/providers/local/camel-local-store.c:445
+#: ../camel/providers/local/camel-mbox-store.c:722
 #, c-format
-msgid "Local mail file %s"
-msgstr "Paikallinen viestitiedosto %s"
+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:358
+#: ../camel/providers/local/camel-local-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:752
 #, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Hakemistoa %s ei voitu uudelleennimetà seuraavaksi: %s: %s"
-
-#: ../camel/providers/local/camel-local-store.c:431
+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
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "UudelleennimeÃminen epÃonnistui \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-store.c:461
-#: ../camel/providers/local/camel-mbox-store.c:304
-#, 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:489
-#: ../camel/providers/local/camel-mbox-store.c:333
-#, c-format
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "Kansion metadatatiedostoa \"%s\" ei voitu poistaa: %s"
-
-#: ../camel/providers/local/camel-local-summary.c:537
+#: ../camel/providers/local/camel-local-summary.c:527
 #, 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:195
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:336
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
+msgid "No such message"
+msgstr "Ei tÃllaista viestiÃ"
+
+#: ../camel/providers/local/camel-maildir-folder.c:226
+#, c-format, fuzzy
 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:283
-#: ../camel/providers/local/camel-maildir-folder.c:291
-#: ../camel/providers/local/camel-mbox-folder.c:440
-#: ../camel/providers/local/camel-mh-folder.c:227
-#: ../camel/providers/local/camel-mh-folder.c:235
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../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
 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:399
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-folder.c:354
+#, c-format, fuzzy
 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:136
-#: ../camel/providers/local/camel-maildir-store.c:167
-#: ../camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:175
+#: ../camel/providers/local/camel-maildir-store.c:109
+#, c-format, fuzzy
+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
+msgid "Folder %s already exists"
+msgstr "Kansio 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-mbox-store.c:403
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:151
-#: ../camel/providers/local/camel-mbox-store.c:127
-#: ../camel/providers/local/camel-mh-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:516
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi hakea: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:157
-#: ../camel/providers/local/camel-mbox-store.c:137
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:525
 #, 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:184
+#: ../camel/providers/local/camel-maildir-store.c:263
 #, 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:242
-#: ../camel/providers/local/camel-maildir-store.c:282
-#: ../camel/providers/local/camel-mh-store.c:287
+#: ../camel/providers/local/camel-maildir-store.c:329
+#: ../camel/providers/local/camel-maildir-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:670
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-maildir-store.c:331
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: ../camel/providers/local/camel-maildir-store.c:482
-#: ../camel/providers/local/camel-spool-store.c:364
-#: ../camel/providers/local/camel-spool-store.c:380
+#: ../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
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voitu kÃydà lÃpi: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-store.c:773
+#, c-format, fuzzy
+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
 #, 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:549
+#: ../camel/providers/local/camel-maildir-summary.c:540
 msgid "Checking folder consistency"
 msgstr "Tarkastetaan kansion yhdenmukaisuutta"
 
-#: ../camel/providers/local/camel-maildir-summary.c:641
+#: ../camel/providers/local/camel-maildir-summary.c:633
 msgid "Checking for new messages"
 msgstr "EtsitÃÃn uusia viestejÃ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:732
-#: ../camel/providers/local/camel-mbox-summary.c:465
-#: ../camel/providers/local/camel-mbox-summary.c:679
-#: ../camel/providers/local/camel-mbox-summary.c:809
+#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../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
 msgid "Storing folder"
 msgstr "Tallennetaan kansiota"
 
-#: ../camel/providers/local/camel-mbox-folder.c:124
-#: ../camel/providers/local/camel-spool-folder.c:125
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "Kansion \"%s\" lukkoa ei voi varata: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:194
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-folder.c:187
+#, c-format, fuzzy
 msgid "Cannot open mailbox: %s: "
 msgstr "SÃhkÃpostilaatikkoa ei voi avata: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:260
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-folder.c:253
+#, c-format, fuzzy
 msgid "Cannot append message to mbox file: %s: "
 msgstr "Viestià ei voi lisÃtà mbox-tiedostoon: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:433
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Kansio nÃyttÃisi olevan peruuttamattomasti vaurioitunut."
 
-#: ../camel/providers/local/camel-mbox-store.c:149
-#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, 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
 #, 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:186
+#: ../camel/providers/local/camel-mbox-store.c:414
 #, 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:218
-#: ../camel/providers/local/camel-mbox-store.c:231
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
-msgid ""
-"Could not delete folder '%s':\n"
-"%s"
-msgstr ""
-"Kansiota \"%s\" ei voitu poistaa:\n"
-"%s"
+msgid "Cannot create directory '%s': %s."
+msgstr "Kansiota \"%s\" ei voi luoda: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:591
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Kansiota ei voi luoda: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:241
+#: ../camel/providers/local/camel-mbox-store.c:593
+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
+#, c-format
+msgid "Could not delete folder '%s':\n%s"
+msgstr "Kansiota \"%s\" ei voitu poistaa:\n%s"
+
+#: ../camel/providers/local/camel-mbox-store.c:656
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "\"%s\" ei ole tavallinen tiedosto."
 
-#: ../camel/providers/local/camel-mbox-store.c:250
+#: ../camel/providers/local/camel-mbox-store.c:665
 #, 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:276
-#: ../camel/providers/local/camel-mbox-store.c:290
+#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../camel/providers/local/camel-mbox-store.c:707
 #, 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:395
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Kansiota \"%s\" ei voi luoda: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:411
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Kansiota ei voi luoda: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:413
-msgid "Folder already exists"
-msgstr "Kansio on jo olemassa"
-
-#: ../camel/providers/local/camel-mbox-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:789
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Kansion nimi ei ole sallittu."
 
-#: ../camel/providers/local/camel-mbox-store.c:522
+#: ../camel/providers/local/camel-mbox-store.c:805
 #, 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:605
+#: ../camel/providers/local/camel-mbox-store.c:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "UudelleennimeÃminen %s:stà %s:ksi epÃonnistui: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:473
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kansiota ei voitu avata: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:533
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:490
+#, c-format, fuzzy
 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:615
+#: ../camel/providers/local/camel-mbox-summary.c:574
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion tarkistus ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:686
-#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:802
 #: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Tiedostoa ei voitu avata: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-mbox-summary.c:676
 #: ../camel/providers/local/camel-spool-summary.c:152
 #, 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:715
-#: ../camel/providers/local/camel-mbox-summary.c:932
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:918
 #, 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:726
+#: ../camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "VÃliaikaiskansiota ei voitu sulkea: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kansiota ei voitu uudelleen nimetÃ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:829
-#: ../camel/providers/local/camel-mbox-summary.c:1070
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kansiota ei voitu tallentaa: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1102
+#: ../camel/providers/local/camel-mbox-summary.c:855
+#: ../camel/providers/local/camel-mbox-summary.c:1115
 #, 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:878
-#: ../camel/providers/local/camel-mbox-summary.c:1111
+#: ../camel/providers/local/camel-mbox-summary.c:864
+#: ../camel/providers/local/camel-mbox-summary.c:1124
 #, 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:337
+#: ../camel/providers/local/camel-spool-summary.c:345
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1211
+#: ../camel/providers/local/camel-mbox-summary.c:1182
+#: ../camel/providers/local/camel-mbox-summary.c:1212
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "VÃliaikaiseen postikansioon kirjoitus epÃonnistui: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1200
+#: ../camel/providers/local/camel-mbox-summary.c:1201
 #, 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:165
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mh-folder.c:119
+#, c-format, fuzzy
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Viestià ei voi liittÃà MH-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:234
+#: ../camel/providers/local/camel-mh-store.c:535
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:248
+#: ../camel/providers/local/camel-mh-store.c:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Kansiota \"%s\" ei voi avata: se ei ole hakemisto."
 
-#: ../camel/providers/local/camel-mh-summary.c:228
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-kansion polku ei voi avata: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:118
+#: ../camel/providers/local/camel-spool-store.c:94
 #, 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:132
+#: ../camel/providers/local/camel-spool-store.c:108
 #, 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:158
+#: ../camel/providers/local/camel-spool-store.c:416
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Saapuvan sÃhkÃpostin tiedosto %s"
+
+#: ../camel/providers/local/camel-spool-store.c:420
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "SÃhkÃpostilÃhde %s"
+
+#: ../camel/providers/local/camel-spool-store.c:423
+#, fuzzy
+msgid "Invalid spool"
+msgstr "Virheellinen lÃhde"
+
+#: ../camel/providers/local/camel-spool-store.c:480
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Kansiota \"%s/%s\" ei ole olemassa."
 
-#: ../camel/providers/local/camel-spool-store.c:170
+#: ../camel/providers/local/camel-spool-store.c:493
 #, 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:176
+#: ../camel/providers/local/camel-spool-store.c:499
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Kansiota \"%s\" ei ole olemassa."
 
-#: ../camel/providers/local/camel-spool-store.c:183
+#: ../camel/providers/local/camel-spool-store.c:507
 #, 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:193
+#: ../camel/providers/local/camel-spool-store.c:520
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "\"%s\" ei ole mailbox-muotoinen tiedosto."
 
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:584
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Kansio ei tue INBOXia"
 
-#: ../camel/providers/local/camel-spool-store.c:226
-#, c-format
-msgid "Spool mail file %s"
-msgstr "Saapuvan sÃhkÃpostin tiedosto %s"
-
-#: ../camel/providers/local/camel-spool-store.c:226
+#: ../camel/providers/local/camel-spool-store.c:603
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "SÃhkÃpostilÃhde %s"
+msgid "Spool folders cannot be deleted"
+msgstr "Saapuvan sÃhkÃpostin kansioita ei voi poistaa"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:618
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Saapuvan sÃhkÃpostin kansioita ei voi uudelleennimetÃ"
 
-#: ../camel/providers/local/camel-spool-store.c:251
-#, c-format
-msgid "Spool folders cannot be deleted"
-msgstr "Saapuvan sÃhkÃpostin kansioita ei voi poistaa"
-
-#: ../camel/providers/local/camel-spool-summary.c:166
-#: ../camel/providers/local/camel-spool-summary.c:178
-#: ../camel/providers/local/camel-spool-summary.c:190
-#, fuzzy, c-format
+#: ../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
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "VÃliaikaishakemistoa %s ei voitu synkronoida: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:208
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-summary.c:210
+#, c-format, fuzzy
 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:240
-#: ../camel/providers/local/camel-spool-summary.c:259
-#: ../camel/providers/local/camel-spool-summary.c:272
-#, 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/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/nntp/camel-nntp-folder.c:197
-#: ../camel/providers/nntp/camel-nntp-folder.c:271
-#: ../camel/providers/nntp/camel-nntp-folder.c:312
+#: ../camel/providers/nntp/camel-nntp-folder.c:290
+#: ../camel/providers/nntp/camel-nntp-folder.c:379
+#: ../camel/providers/nntp/camel-nntp-folder.c:501
 #, 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:234
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
-#: ../camel/providers/pop3/camel-pop3-folder.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:630
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
-#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#: ../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
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:465
-#: ../camel/providers/nntp/camel-nntp-folder.c:471
-#: ../camel/providers/nntp/camel-nntp-folder.c:518
+#: ../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/pop3/camel-pop3-folder.c:620
+#, c-format, fuzzy
+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
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Postitus epÃonnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, fuzzy
 msgid "Posting failed: "
 msgstr "Postitus epÃonnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#: ../camel/providers/nntp/camel-nntp-folder.c:662
 #, 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:560
+#: ../camel/providers/nntp/camel-nntp-folder.c:682
 #, 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:44
-msgid ""
-"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
+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:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "NÃytà _tilauslomakkeessa suhteelliset kansionimet"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
+msgid "Default NNTP port"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
+msgid "NNTP over SSL"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
 msgstr "KeskusteluryhmÃt"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
 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:74
-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: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-store.c:265
-#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:285
+#, c-format, fuzzy
 msgid "Could not read greeting from %s: "
 msgstr "Tervehdystà %s:stà ei voitu lukea: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:278
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, 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:434
+#: ../camel/providers/nntp/camel-nntp-store.c:469
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET uutisryhmÃt palvelimelta %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:927
-#, c-format
-msgid ""
-"Error retrieving newsgroups:\n"
-"\n"
-"%s"
-msgstr ""
-"Uutisryhmien haku epÃonnistui:\n"
-"\n"
-"%s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1024
-#, c-format
-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:1064
+#: ../camel/providers/nntp/camel-nntp-store.c:1072
 #, c-format
-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!"
+msgid "Error retrieving newsgroups:\n\n%s"
+msgstr "Uutisryhmien haku epÃonnistui:\n\n%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#: ../camel/providers/nntp/camel-nntp-store.c:1165
 #, 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:1106
+#: ../camel/providers/nntp/camel-nntp-store.c:1181
 #, 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:1119
+#: ../camel/providers/nntp/camel-nntp-store.c:1204
 #, 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:1257
+#: ../camel/providers/nntp/camel-nntp-store.c:1402
 #, c-format
-msgid "Authentication requested but no username provided"
-msgstr "Todennus vaaditaan, mutta kÃyttÃjÃtunnusta ei annettu"
+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."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1269
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
 #, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Tunnistautuminen palvelimelle epÃonnistui: %s"
+msgid "You cannot unsubscribe to this newsgroup:\n\nnewsgroup does not exist!"
+msgstr "Et voi lopettaa uutisryhmÃn tilausta:\n\nUutisryhmÃÃ ei ole olemassa!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1395
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 #, fuzzy
 msgid "NNTP Command failed: "
 msgstr "NNTP-komento epÃonnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1732
 #, c-format
 msgid "Not connected."
 msgstr "Ei yhteyttÃ."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:238
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:195
+#: ../camel/providers/nntp/camel-nntp-summary.c:322
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Etsii uusia viestejÃ"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:249
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Odottamaton palvelimen vastaus xover:ilta: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:356
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Odottamaton palvelimen vastaus head:ilta: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Toiminto epÃonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
-msgid "Retrieving POP summary"
-msgstr "Haetaan POP-yhteenvetoa"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "POP-yhteenvedon hakeminen ei onnistu: %s"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:324
-msgid "Expunging old messages"
-msgstr "Poistetaan vanhoja viestejà pysyvÃsti"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:332
-msgid "Expunging deleted messages"
-msgstr "Poistetaan poistetut viestit pysyvÃsti"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:566
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:517
 #, c-format
 msgid "No message with UID %s"
 msgstr "Ei viestejà tunnisteella %s"
 
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:603
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestià %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
+#: ../camel/providers/pop3/camel-pop3-folder.c:612
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
+msgid "Retrieving POP summary"
+msgstr "Haetaan POP-yhteenvetoa"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:711
+#, fuzzy
+msgid "Cannot get POP summary: "
+msgstr "POP-yhteenvedon hakeminen ei onnistu: %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:823
+msgid "Expunging old messages"
+msgstr "Poistetaan vanhoja viestejà pysyvÃsti"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:843
+msgid "Expunging deleted messages"
+msgstr "Poistetaan poistetut viestit pysyvÃsti"
+
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
+#, fuzzy
+msgid "Message Storage"
 msgstr "ViestisÃilÃ"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_JÃtà viestit palvelimelle"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#. 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
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "Poista %s pÃivÃn kuluttua"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "Poista _kÃytÃstà tuki POP3-laajennoksille"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#, fuzzy
+msgid "POP3 over SSL"
+msgstr "Imap-palvelin %s"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Yhteyksien ottoon ja postien hakuun POP-palvelimilta."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
-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: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:82
-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: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."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:98
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:168
+#: ../camel/providers/pop3/camel-pop3-store.c:136
 #, 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:186
-#: ../camel/providers/pop3/camel-pop3-store.c:217
-#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:153
 #, 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:187
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 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:205
+#: ../camel/providers/pop3/camel-pop3-store.c:172
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:218
-msgid "TLS negotiations failed"
-msgstr "TLS-kÃttely epÃonnistui"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:225
-msgid "TLS is not available in this build"
-msgstr "TLS ei ole kÃytettÃvissà tÃssà kÃÃnnÃksessÃ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:300
-#: ../camel/providers/pop3/camel-pop3-store.c:452
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"YhdistÃminen POP-palvelimeen %s  epÃonnistui: pyydettyà "
-"tunnistautumismenetelmÃÃ ei tueta."
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:323
-#, c-format
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr ""
+#: ../camel/providers/pop3/camel-pop3-store.c:185
+#, c-format, fuzzy
+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:340
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, 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:357
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:310
+#, c-format, fuzzy
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Tunnistautuminen POP-palvelimelle %s epÃonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:421
-#, c-format
-msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
-msgstr ""
-"POP-palvelimeen %s ei saatu yhteyttÃ:\tVastaanotettiin virheellinen APOP-"
-"tunniste. Voidaan epÃillà yhteyden kaappaamista, ota yhteyttà yllÃpitÃjÃÃsi."
+#: ../camel/providers/pop3/camel-pop3-store.c:359
+#, c-format, fuzzy
+msgid "POP3 server %s"
+msgstr "Imap-palvelin %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:471
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password: %s"
-msgstr ""
-"YhdistÃminen POP-palvelimeen epÃonnistui: %s\n"
-"Virhe lÃhetettÃessà salasanaa: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:362
+#, c-format, fuzzy
+msgid "POP3 server for %s on %s"
+msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:525
 #, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending username%s"
-msgstr ""
+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."
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:497
+#: ../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"
+
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:592
 #, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password%s"
+msgid "Unable to connect to POP server %s.\nError sending username%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:653
+#: ../camel/providers/pop3/camel-pop3-store.c:650
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "YhdistÃminen palvelimeen epÃonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:666
-#, fuzzy, c-format
-msgid "POP3 server %s"
-msgstr "Imap-palvelin %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:670
-#, fuzzy, c-format
-msgid "POP3 server for %s on %s"
-msgstr "IMAP-palvelin %s:lle palvelimella %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:685
+#: ../camel/providers/pop3/camel-pop3-store.c:678
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Kansiota \"%s\" ei ole olemassa."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:709
+#: ../camel/providers/pop3/camel-pop3-store.c:695
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr ""
@@ -4363,1346 +4357,920 @@ 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
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "SÃhkÃpostin lÃhetys ohjelman sendmail avulla"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Vastaanottajalistan tulkitseminen epÃonnistui"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Putkea sendmailille ei voitu luoda: %s: sÃhkÃpostia ei lÃhetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Sendmailia ei voi kÃynnistÃÃ: %s: sÃhkÃpostia ei lÃhetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
 #, fuzzy
 msgid "Could not send message: "
 msgstr "Viestin lÃhettÃminen epÃonnistui: %s"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
 msgid "sendmail 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:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
 #, 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:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail palautti arvon %d: sÃhkÃpostia ei lÃhetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
-msgid "Mail delivery via the sendmail program"
-msgstr "SÃhkÃpostin lÃhetys ohjelman sendmail avulla"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr ""
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
-msgid "SMTP"
-msgstr "SMTP"
+#, fuzzy
+msgid "SMTP over SSL"
+msgstr "SMTP-palvelin %s"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:45
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
 msgstr ""
-"SÃhkÃpostin lÃhetys ottamalla yhteyttà sÃhkÃpostipalvelimeen SMTP-"
-"protokollalla."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:116
-msgid "Syntax error, command unrecognized"
-msgstr "Syntaksivirhe, tuntematon komento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:118
-msgid "Syntax error in parameters or arguments"
-msgstr "Syntaksivirhe parametreissa tai argumenteissa"
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:120
-msgid "Command not implemented"
-msgstr "Komentoa ei ole toteutettu"
+#: ../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."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:122
-msgid "Command parameter not implemented"
-msgstr "Komennon parametria ei ole toteutettu"
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#, fuzzy
+msgid "Welcome response error: "
+msgstr "virhe tervetuloviestissÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:124
-msgid "System status, or system help reply"
-msgstr "JÃrjestelmÃn tila tai jÃrjestelmÃn ohjevastaus"
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#, 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:126
-msgid "Help message"
-msgstr "Ohjeviesti"
+#: ../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
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS-komento epÃonnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:128
-msgid "Service ready"
-msgstr "Palvelu valmis"
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#, c-format, fuzzy
+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:130
-msgid "Service closing transmission channel"
-msgstr "Palvelu sulkee siirtokanavaa"
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP-palvelin %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:132
-msgid "Service not available, closing transmission channel"
-msgstr "Palvelu ei ole kÃytettÃvissÃ, suljetaan siirtokanava"
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP postinvÃlitys %s:n kautta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:134
-msgid "Requested mail action okay, completed"
-msgstr "Pyydetty sÃhkÃpostikÃsky ok, valmis"
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#, c-format, fuzzy
+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:136
-msgid "User not local; will forward to <forward-path>"
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
+#, c-format
+msgid "No SASL mechanism was specified"
 msgstr ""
-"KÃyttÃjà ei ole paikallinen, uudelleenohjaus osoitteeseen <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:138
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"Pyydettyà sÃhkÃpostikÃskyà ei suoritettu: postilaatikko ei kÃytettÃvissÃ"
+#: ../camel/providers/smtp/camel-smtp-transport.c:459
+msgid "SMTP Authentication"
+msgstr "SMTP-todennus"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:140
-msgid "Requested action not taken: mailbox unavailable"
+#: ../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
+msgid "AUTH command failed: "
+msgstr "Komento AUTH epÃonnistui: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#, 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
+#, 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
+msgid "Sending message"
+msgstr "LÃhetetÃÃn viestiÃ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#, 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
+#, 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
+msgid "Syntax error, command unrecognized"
+msgstr "Syntaksivirhe, tuntematon komento"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
+msgid "Syntax error in parameters or arguments"
+msgstr "Syntaksivirhe parametreissa tai argumenteissa"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
+msgid "Command not implemented"
+msgstr "Komentoa ei ole toteutettu"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
+msgid "Command parameter not implemented"
+msgstr "Komennon parametria ei ole toteutettu"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
+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
+msgid "Help message"
+msgstr "Ohjeviesti"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
+msgid "Service ready"
+msgstr "Palvelu valmis"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
+msgid "Service closing transmission channel"
+msgstr "Palvelu sulkee siirtokanavaa"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
+msgid "Service not available, closing transmission channel"
+msgstr "Palvelu ei ole kÃytettÃvissÃ, suljetaan siirtokanava"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
+msgid "Requested mail action okay, completed"
+msgstr "Pyydetty sÃhkÃpostikÃsky ok, valmis"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
+msgid "User not local; will forward to <forward-path>"
+msgstr "KÃyttÃjà ei ole paikallinen, uudelleenohjaus osoitteeseen <forward-path>"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr "Pyydettyà sÃhkÃpostikÃskyà ei suoritettu: postilaatikko ei kÃytettÃvissÃ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
+msgid "Requested action not taken: mailbox unavailable"
 msgstr "Pyydettyà toimenpidettà ei suoritettu: postilaatikko ei kÃytettÃvissÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:142
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Requested action aborted: error in processing"
 msgstr "Pyydetty toimenpide keskeytetty: virhe kÃsittelyssÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:144
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 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:146
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 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:148
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Pyydettyà toimenpidettà ei suoritettu: varattu levytila ylitetty"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../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"
+msgstr "Pyydettyà toimenpidettà ei suoritettu: postilaatikon nimi ei ole sallittu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
+#: ../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>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "Transaction failed"
 msgstr "Tapahtuma epÃonnistui"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "A password transition is needed"
 msgstr "Vaaditaan salasanatransaktio"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Authentication mechanism is too weak"
 msgstr "Todennusmenetelmà on liian heikko"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pyydetty todennusmenetelmà vaatii salausta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Temporary authentication failure"
 msgstr "VÃliaikainen todennusvirhe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:252
-#: ../camel/providers/smtp/camel-smtp-transport.c:258
-#, fuzzy
-msgid "Welcome response error: "
-msgstr "virhe tervetuloviestissÃ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:294
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
-#, 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:302
-#: ../camel/providers/smtp/camel-smtp-transport.c:314
-#: ../camel/providers/smtp/camel-smtp-transport.c:320
-#, fuzzy
-msgid "STARTTLS command failed: "
-msgstr "STARTTLS-komento epÃonnistui: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:450
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP-palvelin %s ei tue pyydettyà tunnistautumismenetelmÃà %s."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP-palvelimelle kirjautuminen epÃonnistui.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP-palvelin %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:671
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP postinvÃlitys %s:n kautta"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:691
-#, 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:698
-#, 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:702
-msgid "Sending message"
-msgstr "LÃhetetÃÃn viestiÃ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
-#, 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:730
-#, 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:966
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Greeting"
 msgstr "SMTP tervehdys"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:990
-#: ../camel/providers/smtp/camel-smtp-transport.c:1005
-#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+#: ../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"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
-msgid "SMTP Authentication"
-msgstr "SMTP-todennus"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "Virhe luotaessa SASL todennusobjektia"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
-#, fuzzy
-msgid "AUTH command failed: "
-msgstr "Komento AUTH epÃonnistui: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1219
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+#: ../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"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1261
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 #, fuzzy
 msgid "RCPT TO command failed: "
 msgstr "Komento RSET epÃonnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1275
-#: ../camel/providers/smtp/camel-smtp-transport.c:1283
-#, fuzzy, c-format
+#: ../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"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1321
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1340
-#: ../camel/providers/smtp/camel-smtp-transport.c:1397
-#: ../camel/providers/smtp/camel-smtp-transport.c:1413
-#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../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"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1453
-#: ../camel/providers/smtp/camel-smtp-transport.c:1465
-#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1505
 #, fuzzy
 msgid "RSET command failed: "
 msgstr "Komento RSET epÃonnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1494
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
-#: ../camel/providers/smtp/camel-smtp-transport.c:1513
+#: ../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"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:47
+#, fuzzy
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "VuosipÃivÃ"
+
+#: ../libedataserver/e-categories.c:48
+#, fuzzy
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "SyntymÃpÃivÃ"
+
+#: ../libedataserver/e-categories.c:49
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "TyÃ"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Kilpailu"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Suosikit"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Lahjat"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Tavoitteet/Kohteet"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Loma"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:55
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Lomakortit"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Kuumat yhteystiedot"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:58
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideat"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
+#, fuzzy
+msgctxt "CategoryName"
 msgid "International"
 msgstr "KansainvÃlinen"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Avainasiakas"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "HenkilÃkohtainen"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:63
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Puhelut"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "Tila"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:66
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategiat"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Hankkijat"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Aika ja kulut"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
+#, fuzzy
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:70
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Odotetaan"
 
+#: ../libedataserver/e-client.c:125
+#, fuzzy
+msgid "Source not loaded"
+msgstr "URIa ei ole ladattu"
+
+#: ../libedataserver/e-client.c:127
+#, 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
+msgid "Offline unavailable"
+msgstr "YhteydetÃn tila ei saatavilla"
+
+#: ../libedataserver/e-client.c:159
+#, fuzzy
+msgid "D-Bus error"
+msgstr "Virhe tulkittaessa"
+
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %I.%M.%S %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
+#. * 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:1645 ../libedataserver/e-time-utils.c:1898
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %I.%M %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
+#. * 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:1650 ../libedataserver/e-time-utils.c:1889
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
 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:1655
+#. * in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1666
 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:1660
+#. * in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1671
 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:1663 ../libedataserver/e-time-utils.c:1765
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
+#: ../libedataserver/e-time-utils.c:1926
 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:1670
+#: ../libedataserver/e-time-utils.c:1681
 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:1674
+#: ../libedataserver/e-time-utils.c:1685
 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:1679
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1690
 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:1684
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1695
 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:1689
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1700
 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:1694
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1705
 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:1697 ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
 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:1826 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
 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:1830 ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
 #. strptime format for time of day, without seconds,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
 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:1839 ../libedataserver/e-time-utils.c:1935
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
 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:1842
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1846
+#: ../libedataserver/e-time-utils.c:1888
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:668
-msgid "Accessing LDAP Server anonymously"
-msgstr "Otetaan yhteyttà LDAP-palvelimeen anonyymisti"
-
-#: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:430
-msgid "Failed to authenticate.\n"
-msgstr "Tunnistautuminen epÃonnistui.\n"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "Proxy type to use"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.c:145
-msgid "Category Icon"
-msgstr "Luokan kuvake"
+#: ../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."
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.c:151
-msgid "_No Image"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "Whether to use http-proxy"
 msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.c:368
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "Luokka \"%s\" on jo mÃÃritelty konfiguraatiossa. KÃytà toista nimeÃ"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Whether to use proxy for HTTP requests."
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.c:676
-msgid "Icon"
-msgstr "Kuvake"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "Whether proxy server requires authentication"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.c:681
-msgid "Category"
-msgstr "Luokka"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+#, fuzzy
+msgid "Whether authentication is required to access proxy server."
+msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "Luokan ominaisuudet"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "Host name for HTTP requests"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "Luokan _kuvake"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "Host name to use for HTTP requests."
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "Luokan _nimi"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "Port number for HTTP requests"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Currently _used categories:"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Port number to use for HTTP requests."
 msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.ui.h:5
-msgid "_Available Categories:"
-msgstr "_Saatavilla olevat luokat:"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+#, fuzzy
+msgid "Proxy authentication user name"
+msgstr "Tuntematon todennustila."
 
-#: ../libedataserverui/e-categories-dialog.ui.h:6
-msgid "_Edit"
-msgstr "_Muokkaa"
+#: ../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"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
-msgstr "luokat"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+#, fuzzy
+msgid "Proxy authentication password"
+msgstr "VÃliaikainen todennusvirhe"
 
-#: ../libedataserverui/e-category-completion.c:292
-#, c-format
-msgid "Create category \"%s\""
-msgstr "Luo luokka \"%s\""
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+#, fuzzy
+msgid "Password to use to authenticate against proxy server."
+msgstr "Tunnistautuminen palvelimelle epÃonnistui: %s"
 
-#: ../libedataserverui/e-name-selector-dialog.c:321
-msgid "Select Contacts from Address Book"
-msgstr "Valitse yhteystiedot osoitekirjasta"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
+msgid "List of hosts to connect to without proxy"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:660
-msgid "_Add"
-msgstr "_LisÃÃ"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
+msgid "List of hosts for which do not use proxy."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:664
-msgid "_Remove"
-msgstr "_Poista"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
+msgid "Host name for HTTPS requests"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:892
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
-msgid "Any Category"
-msgstr "Mikà tahansa luokka"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
+msgid "Host name to use for HTTPS requests."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
+msgid "Port number for HTTPS requests"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>_Yhteystiedot</b>"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
+msgid "Port number to use for HTTPS requests."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>NÃytà yhteystiedot</b>"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
+msgid "Host name for SOCKS requests"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "_Osoitekirja:"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
+msgid "Host name to use for SOCKS requests."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
-msgid "Address Book"
-msgstr "Osoitekirja"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
+msgid "Port number for SOCKS requests"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
+msgid "Port number to use for SOCKS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
+msgid "Automatic proxy configuration URL"
+msgstr ""
+
+#: ../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
+msgid "Currently _used categories:"
+msgstr ""
+
+#: ../libedataserverui/e-categories-editor.c:237
+msgid "_Available Categories:"
+msgstr "_Saatavilla olevat luokat:"
+
+#: ../libedataserverui/e-categories-selector.c:322
+msgid "Icon"
+msgstr "Kuvake"
+
+#: ../libedataserverui/e-categories-selector.c:327
+msgid "Category"
+msgstr "Luokka"
+
+#: ../libedataserverui/e-category-completion.c:299
+#, c-format
+msgid "Create category \"%s\""
+msgstr "Luo luokka \"%s\""
+
+#: ../libedataserverui/e-category-editor.c:135
+msgid "Category Icon"
+msgstr "Luokan kuvake"
+
+#: ../libedataserverui/e-category-editor.c:139
+msgid "_No Image"
+msgstr ""
+
+#: ../libedataserverui/e-category-editor.c:176
+msgid "Category _Name"
+msgstr "Luokan _nimi"
+
+#: ../libedataserverui/e-category-editor.c:184
+msgid "Category _Icon"
+msgstr "Luokan _kuvake"
+
+#: ../libedataserverui/e-category-editor.c:224
+msgid "Category Properties"
+msgstr "Luokan ominaisuudet"
+
+#: ../libedataserverui/e-category-editor.c:285
+#, c-format
+msgid "There is already a category '%s' in the configuration. Please use another name"
+msgstr "Luokka \"%s\" on jo mÃÃritelty konfiguraatiossa. KÃytà toista nimeÃ"
+
+#: ../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
+msgid "Show Contacts"
+msgstr "Kuumat yhteystiedot"
+
+#: ../libedataserverui/e-name-selector-dialog.c:209
+msgid "Address B_ook:"
+msgstr "_Osoitekirja:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:217
+msgid "Cate_gory:"
 msgstr "L_uokka:"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
-msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:235
+msgid "_Search:"
+msgstr "_Etsi:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:253
+#: ../libedataserverui/e-name-selector-dialog.c:1038
+msgid "Any Category"
+msgstr "Mikà tahansa luokka"
+
+#: ../libedataserverui/e-name-selector-dialog.c:255
+#, fuzzy
+msgid "Co_ntacts"
 msgstr "Yhteystiedot"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "_Etsi:"
+#: ../libedataserverui/e-name-selector-dialog.c:313
+msgid "Address Book"
+msgstr "Osoitekirja"
+
+#: ../libedataserverui/e-name-selector-dialog.c:316
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../libedataserverui/e-name-selector-dialog.c:433
+msgid "Select Contacts from Address Book"
+msgstr "Valitse yhteystiedot osoitekirjasta"
+
+#: ../libedataserverui/e-name-selector-dialog.c:781
+msgid "_Add"
+msgstr "_LisÃÃ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:785
+msgid "_Remove"
+msgstr "_Poista"
+
+#: ../libedataserverui/e-name-selector-dialog.c:957
+#, c-format, fuzzy
+msgid "Error loading address book: %s"
+msgstr "Virhe luettaessa viestitiedostoa: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2639
+#: ../libedataserverui/e-name-selector-entry.c:2823
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "L_aajenna %s sisÃkkÃisesti"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2654
+#: ../libedataserverui/e-name-selector-entry.c:2838
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopioi %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2664
+#: ../libedataserverui/e-name-selector-entry.c:2848
 #, c-format
 msgid "C_ut %s"
 msgstr "_Leikkaa %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2681
+#: ../libedataserverui/e-name-selector-entry.c:2865
 #, c-format
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
 
-#: ../libedataserverui/e-name-selector-list.c:516
+#: ../libedataserverui/e-name-selector-list.c:524
 #, c-format
 msgid "_Delete %s"
 msgstr "_Poista %s"
 
-#: ../libedataserverui/e-passwords.c:257
-#, c-format
+#: ../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:1120
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:614
 msgid "You have the Caps Lock key on."
 msgstr "CapsLock-nÃppÃin on pÃÃllÃ."
 
-#: ../libedataserverui/e-passwords.c:1243
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:737
 msgid "_Remember this passphrase"
 msgstr "_Muista tÃmà salasana"
 
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:738
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Muista salasana tÃmÃn istunnon loppuun asti"
 
-#: ../libedataserverui/e-passwords.c:1249
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:743
 msgid "_Remember this password"
 msgstr "_Muista tÃmà salasana"
 
-#: ../libedataserverui/e-passwords.c:1250
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:744
 msgid "_Remember this password for the remainder of this session"
 msgstr "Muista salasana tÃmÃn istunnon loppuun asti"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
+#: ../libedataserverui/e-source-selector-dialog.c:91
 msgid "Select destination"
 msgstr "Valitse kohde"
 
-#: ../libedataserverui/e-source-selector-dialog.c:174
+#: ../libedataserverui/e-source-selector-dialog.c:166
 msgid "_Destination"
 msgstr "_Kohde"
 
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "Virheellinen yhteys"
-
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "Virheellinen vastaus palvelimelta"
-
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "Ei vastausta palvelimelta"
-
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "Virheellinen parametri"
-
-#~ msgid "Could not create thread for getting deltas"
-#~ msgstr "Deltojen hakuun ei voitu luoda sÃiettÃ"
-
-#~ msgid "Offline mode unavailable"
-#~ msgstr "YhteydetÃn tila ei saatavilla"
-
-#~ msgid "Cannot open message"
-#~ msgstr "Viestià ei voi avata"
-
-#~ msgid "Unsupported operation: append message: for %s"
-#~ msgstr "Toiminto ei ole tuettu: lisÃÃ viesti: %s:lle"
-
-#~ msgid "Unsupported operation: search by expression: for %s"
-#~ msgstr "Toiminto ei ole tuettu: hae lausekkeella: %s"
-
-#~ msgid "Unsupported operation: count by expression: for %s"
-#~ msgstr "Toiminto ei ole tuettu: lukumÃÃrà lausekkeella: %s"
-
-#~ msgid "Unsupported operation: search by UIDs: for %s"
-#~ msgstr "Toiminto ei ole tuettu: haku UID:n perusteella: %s"
-
-#~ msgid "Learning junk"
-#~ msgstr "Opitaan roskapostia"
-
-#~ msgid "Learning non-junk"
-#~ msgstr "Opitaan ei-roskapostia"
-
-#~ msgid "Canceled."
-#~ msgstr "Peruttu."
-
-#~ msgid "Cannot verify message signature: could not create temp file: %s"
-#~ msgstr ""
-#~ "Viestin allekirjoitusta ei voi varmentaa: vÃliaikaistiedostoa ei voitu "
-#~ "luoda: %s"
-
-#~ msgid "Unable to parse message content"
-#~ msgstr "Viestin sisÃltÃÃ ei voitu tulkita"
-
-#~ msgid "cannot create thread"
-#~ msgstr "sÃiettà ei voi luoda"
-
-#~ msgid "Camel session doesn't support forwarding of a message."
-#~ msgstr "Camel-istunto ei tue viestin edelleenlÃhetystÃ."
-
-#~ msgid "import keys: unimplemented"
-#~ msgstr "tuo avaimia; ei toteutettu"
-
-#~ msgid "export keys: unimplemented"
-#~ msgstr "vie avaimet ei ole toteutettu"
-
-#~ msgid "Cannot create folder: Invalid operation on this store"
-#~ msgstr ""
-#~ "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
-
-#~ msgid "User canceled"
-#~ msgstr "KÃyttÃjà perui"
-
-#~ msgid "Trash Folder Full. Please Empty."
-#~ msgstr "Roskakori on tÃynnÃ, poista sieltà viestejÃ."
-
-#~ msgid "Hula"
-#~ msgstr "Hula"
-
-#~ msgid "For accessing Hula servers"
-#~ msgstr "Hula-palvelinten kÃyttÃÃ varten"
-
-#~ msgid ""
-#~ "This option will connect to the Hula server using a plaintext password."
-#~ msgstr "Ota yhteys Hula-palvelimeen selvÃkielistà salasanaa kÃyttÃen."
-
-#~ msgid "Unexpected response status '%s' after APPEND command"
-#~ msgstr "Odottamaton vastauskoodin tila \"%s\" APPEND-komennon jÃlkeen"
-
-#~ msgid "No response on continuation after APPEND command"
-#~ msgstr "Ei vastausta jatkolle APPEND-komennon jÃlkeen"
-
-#~ msgid "Unknown error occurred during APPEND command!"
-#~ msgstr "Tapahtui tuntematon virhe APPEND-komennon aikana!"
-
-#~ msgid "Failed sending command to IMAP server %s: %s"
-#~ msgstr "Komennon lÃhetys IMAP-palvelimelle %s epÃonnistui: %s"
-
-#~ msgid "Unexpected response from IMAP4 server %s: %s"
-#~ msgstr "Odottamaton vastaus IMAP-palvelimelta %s: %s"
-
-#~ msgid "Unexpected greeting from IMAP server %s."
-#~ msgstr "Odottamaton tervehdys IMAP-palvelimelta %s"
-
-#~ msgid "Cannot select folder '%s': Invalid mailbox name"
-#~ msgstr "Kansiota \"%s\" ei voi valita: virheellinen kansion nimi"
-
-#~ msgid "Cannot select folder '%s': Bad command"
-#~ msgstr "Kansiota \"%s\" ei voi valita: virheellinen komento"
-
-#~ msgid "Failed to send command to IMAP server %s: %s"
-#~ msgstr "Komentoa ei voitu lÃhettÃÃ IMAP-palvelimelle %s: %s"
-
-#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
-#~ msgstr "Palvelin %s katkaisi yhteyden odottamatta: %s"
-
-#~ msgid ""
-#~ "Enable extended Mailing-List detection required for some filter and "
-#~ "vFolder rules"
-#~ msgstr ""
-#~ "Ota kÃyttÃÃn postilistojen laajennettu tunnistus, jota tarvitaan "
-#~ "joihinkin suotimiin ja virtuaalikansiosÃÃntÃihin"
-
-#~ msgid "Expire cached messages that haven't been read in X seconds"
-#~ msgstr "Vanhenna vÃlimuistin viestit, joita ei ole luettu X sekuntiin"
-
-#~ msgid "Expire cached messages older than X seconds"
-#~ msgstr "Vanhenna vÃlimuistin viestit, jotka ovat vanhempia kuin X sekuntia"
-
-#~ msgid "Cannot access folder '%s': %s"
-#~ msgstr "Kansiota \"%s\" ei voi avata: %s"
-
-#~ msgid "Cannot sync flags to folder '%s': Unknown error"
-#~ msgstr "Kansion \"%s\" lipukkeita ei voi synkronisoida: tuntematon virhe"
-
-#~ msgid "Cannot sync flags to folder '%s': Bad command"
-#~ msgstr ""
-#~ "Kansion \"%s\" lipukkeita ei voi synkronisoida: virheellinen komento"
-
-#~ msgid "Cannot expunge folder '%s': Unknown error"
-#~ msgstr ""
-#~ "Kansion \"%s\" poistettuja viestejà ei voi siivota: tuntematon virhe"
-
-#~ msgid "Cannot expunge folder '%s': Bad command"
-#~ msgstr ""
-#~ "Kansion \"%s\" poistettuja viestejà ei siivota: virheellinen komento"
-
-#~ msgid "Cannot get message %s from folder '%s': No such message"
-#~ msgstr "Viestià %s kansiosta \"%s\" ei voi hakea: viestià ei ole olemassa"
-
-#~ msgid "Cannot get message %s from folder '%s': Bad command"
-#~ msgstr "Viestià %s kansiosta \"%s\" ei voi hakea: virheellinen komento"
-
-#~ msgid "Cannot append message to folder '%s': Folder is read-only"
-#~ msgstr "kansioon \"%s\" ei voi lisÃtà viestiÃ: kansio on kirjoitussuojattu"
-
-#~ msgid "Cannot append message to folder '%s': Unknown error"
-#~ msgstr "Viestià ei voi lisÃtà kansioon \"%s\": tuntematon virhe"
-
-#~ msgid "Cannot append message to folder '%s': Bad command"
-#~ msgstr "Viestià ei voi lisÃtà kansioon \"%s\": virheellinen kÃsky"
-
-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr ""
-#~ "Viestejà ei voi siirtÃà kansiosta \"%s\" kansioon \"%s\": Tuntematon virhe"
-
-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr ""
-#~ "Viestejà ei voi kopioida kansiosta \"%s\" kansioon \"%s\": Tuntematon "
-#~ "virhe"
-
-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr ""
-#~ "Viestejà ei voi siirtÃà kansiosta \"%s\" kansioon \"%s\": Virheellinen "
-#~ "komento"
-
-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr ""
-#~ "Viestejà ei voi kopioida kansiosta \"%s\" kansioon \"%s\": Virheellinen "
-#~ "komento"
-
-#~ msgid "Check new messages for _Junk contents"
-#~ msgstr "_Etsi roskapostia uusista viesteistÃ"
-
-#~ msgid "Only check for Junk messa_ges in the INBOX folder"
-#~ msgstr "Etsi roskapostia vain Saapuvan postin kansiosta"
-
-#~ msgid "IMAP4rev1"
-#~ msgstr "IMAP4rev1"
-
-#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
-#~ msgstr "SÃhkÃpostien luku ja tallennus IMAPv4rev1-palvelimilta."
-
-#~ msgid ""
-#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
-#~ "password."
-#~ msgstr "Ota yhteys IMAPv4rev1-palvelimeen selvÃkielistà salasanaa kÃyttÃen."
-
-#~ msgid ""
-#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
-#~ "support STARTTLS"
-#~ msgstr ""
-#~ "IMAP-palvelimeen %s ei saatu muodostettua turvallista yhteyttÃ: palvelin "
-#~ "ei tue STARTTLS-menettelyÃ"
-
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr "YhdistÃminen POP-palvelimeen %s menetelmÃllà %s epÃonnistui"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "Tunnistautuminen IMAP-palvelimelle %s epÃonnistui menetelmÃllà %s"
-
-#~ msgid "Cannot create IMAP folders in offline mode."
-#~ msgstr "IMAP-kansioita ei voi luoda yhteydettÃmÃssà tilassa."
-
-#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-#~ msgstr "Kansiota \"%s\" IMAP-palvelimelta %s ei voi hakea: tuntematon virhe"
-
-#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-#~ msgstr "LIST-tulosta kansiolle \"%s\" IMAP-palvelimella %s ei saatu: %s"
-
-#~ msgid "Bad command"
-#~ msgstr "Virheellinen komento"
-
-#~ msgid "Cannot create folder '%s': Invalid mailbox name"
-#~ msgstr "Kansiota \"%s\" ei voi luoda: virheellinen kansion nimi"
-
-#~ msgid "Cannot create folder '%s': Bad command"
-#~ msgstr "Kansiota \"%s\" ei voi luoda: Virheellinen komento"
-
-#~ msgid "Cannot delete IMAP folders in offline mode."
-#~ msgstr "IMAP-kansioita ei voi poistaa yhteydettÃmÃssà tilassa."
-
-#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
-#~ msgstr "Kansiota \"%s\" ei voi poistaa: virheellinen kansion nimi"
-
-#~ msgid "Cannot delete folder '%s': Bad command"
-#~ msgstr "Kansiota \"%s\" ei voi poistaa: virheellinen komento"
-
-#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
-#~ msgstr ""
-#~ "Kansiota \"%s\" ei voi nimetà uudestaan nimelle \"%s\": erikoiskansio"
-
-#~ msgid "Cannot rename IMAP folders in offline mode."
-#~ msgstr "IMAP-kansioita ei voi uudelleennimetà yhteydettÃmÃssà tilassa."
-
-#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Kansiota \"%s\" ei voi nimetà nimelle \"%s\": virheellinen kansion nimi"
-
-#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
-#~ msgstr "Kansiota \"%s\" ei voi nimelle \"%s\": virheellinen komento"
-
-#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-#~ msgstr "%s-tietoja mallille \"%s\" ei voi hakea IMAP-palvelimelta %s: %s"
-
-#~ msgid "Cannot subscribe to IMAP folders in offline mode."
-#~ msgstr "IMAP-kansioita ei voi tilata yhteydettÃmÃssà tilassa."
-
-#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-#~ msgstr "Kansiota \"%s\" ei voi tilata: virheellinen kansion nimi"
-
-#~ msgid "Cannot subscribe to folder '%s': Bad command"
-#~ msgstr "Kansiota \"%s\" ei voi tilata: virheellinen komento"
-
-#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
-#~ msgstr "IMAP-kansion tilausta ei voi perua yhteydettÃmÃssà tilassa."
-
-#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-#~ msgstr "Kansion \"%s\" tilausta ei voi perua: virheellinen kansion nimi"
-
-#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
-#~ msgstr "Kansion \"%s\" tilausta ei voi perua: virheellinen komento"
-
-#~ msgid "Scanning for changed messages"
-#~ msgstr "EtsitÃÃn muuttuneita viestejÃ"
-
-#~ msgid "IMAP server %s is in an inconsistent state."
-#~ msgstr "IMAP-palvelin %s on epÃyhtenÃisessà tilassa."
-
-#~ msgid "Fetching envelopes of new messages"
-#~ msgstr "Noudetaan uusien viestien kuoria"
-
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "Odottamaton merkki IMAP-palvelimen %s vastauksessa: "
-
-#~ msgid "No data"
-#~ msgstr "Ei tietoja"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "IMAP-palvelin %s katkaisi yhteyden odottamatta: %s"
-
-#~ msgid "Maildir append message canceled"
-#~ msgstr "Maildir-kansioon lisÃys keskeytettiin"
-
-#~ msgid "Invalid message contents"
-#~ msgstr "Virheellinen viestin sisÃltÃ"
-
-#~ msgid "Mail append canceled"
-#~ msgstr "SÃhkÃpostin lisÃys keskeytetty"
-
-#~ msgid "Message construction failed."
-#~ msgstr "Viestin luominen epÃonnistui."
-
-#~ msgid "MH append message canceled"
-#~ msgstr "Viestin lisÃys MH-kansioon peruttiin"
-
-#~ msgid "Use cancel"
-#~ msgstr "KÃytà perumista"
-
-#~ msgid "STARTTLS command failed"
-#~ msgstr "Komento STARTTLS epÃonnistui"
-
-#~ msgid "HELO command failed"
-#~ msgstr "Komento HELO epÃonnistui"
-
-#~ msgid "AUTH command failed"
-#~ msgstr "Komento AUTH epÃonnistui"
-
-#~ msgid "Bad authentication response from server.\n"
-#~ msgstr "Virheellinen todennusvastaus palvelimelta.\n"
-
-#~ msgid "MAIL FROM command failed: %s: mail not sent"
-#~ msgstr "Komento MAIL FROM epÃonnistui: : %s: sÃhkÃpostia ei lÃhetetty"
-
-#~ msgid "RCPT TO command failed: %s: mail not sent"
-#~ msgstr "Komento RCPT TO epÃonnistui: %s: sÃhkÃpostia ei lÃhetetty"
-
-#~ msgid "DATA command failed: %s: mail not sent"
-#~ msgstr "Komento DATA epÃonnistui: %s: sÃhkÃpostia ei lÃhetetty"
-
-#~ msgid "RSET command failed"
-#~ msgstr "Komento RSET epÃonnistui"
-
-#~ msgid "QUIT command failed"
-#~ msgstr "Komento QUIT epÃonnistui"
-
-#~ msgid "Color Info"
-#~ msgstr "VÃritiedot"
-
-#~ msgid "The color to render"
-#~ msgstr "EsitettÃvà vÃri"
-
-#~ msgid "SASL '%s' Login failed for POP server %s: %s"
-#~ msgstr "SASL \"%s\"-kirjautuminen POP-palvelimelle %s epÃonnistui: %s"
-
-#~ msgid "%s: Could not create EBookListener"
-#~ msgstr "%s: EBookListenerià ei voitu luoda"
-
-#~ msgid "%s: no factories available for URI `%s'"
-#~ msgstr "%s: URIlle \"%s\" ei lÃydy tehdasta"
-
-#~ msgid "%s: Invalid source."
-#~ msgstr "%s: virheellinen lÃhde."
-
-#~ msgid "%s: canceled"
-#~ msgstr "%s: peruttu"
-
-#~ msgid "\"%s\" on book after \"%s\""
-#~ msgstr "\"%s\" on kirjassa \"%s\" jÃlkeen"
-
-#~ msgid "%s: there is no current operation"
-#~ msgstr "%s: suoritettavaa toimintoa ei ole"
-
-#~ msgid "book busy"
-#~ msgstr "kirja kÃytÃssÃ"
-
-#~ msgid "Evolution Data Server logging service"
-#~ msgstr "Evolution Data Serverin lokituspalvelu"
-
-#~ msgid "Evolution Data Server interface check service"
-#~ msgstr "Evolution Data Serverin liittymÃn tarkistuspalvelu"
-
-#~ msgid "Evolution Calendar file and webcal backend"
-#~ msgstr "Evolutionin kalenterin tiedosto- ja webcal-taustajÃrjestelmÃ"
-
-#~ msgid "Evolution Addressbook file backend"
-#~ msgstr "Evolution osoitekirjan tiedostotaustajÃrjestelmÃ"
-
-#~ msgid "Tasks"
-#~ msgstr "TehtÃvÃt"
-
-#~ msgid "Sent Items"
-#~ msgstr "LÃhetetyt"
-
-#~ msgid "Outbox"
-#~ msgstr "LÃhtevÃt"
-
-#~ msgid "Notes"
-#~ msgstr "Huomioita"
-
-#~ msgid "Journal"
-#~ msgstr "PÃivÃkirja"
-
-#~ msgid "Deleted Items"
-#~ msgstr "Poistetut"
-
-#~ msgid "Global Address List"
-#~ msgstr "Osoitelista"
-
-#~ msgid "All Public Folders"
-#~ msgstr "Kaikki julkiset kansiot"
-
-#~ msgid "Favorite Public Folders"
-#~ msgstr "Julkisten kansioiden suosikit"
-
-#~ msgid "%s's Folders"
-#~ msgstr "%s:n kansiot"
-
-#~ msgid "This operation cannot be performed in off-line mode"
-#~ msgstr "TÃtà toimintoa ei voi tehdà yhteydettÃmÃssà tilassa"
-
-#~ msgid "Cannot create a folder with that name"
-#~ msgstr "TÃmÃnnimistà kansiota ei voi luoda"
-
-#~ msgid "Cannot make a folder a child of one of its descendants"
-#~ msgstr "Kansiota ei voi siirtÃÃ omaan alikansioonsa"
-
-#~ msgid "The specified type is not supported in this storage"
-#~ msgstr "TÃmà sÃilà ei tue annettua tyyppiÃ"
-
-#~ msgid "Operation not supported"
-#~ msgstr "Toiminto ei ole tuettu"
-
-#~ msgid "Function not implemented in this storage"
-#~ msgstr "TÃmà sÃilà ei toteuta tÃtà funktiota"
-
-#~ msgid "The specified folder was not found"
-#~ msgstr "Kysyttyà kansiota ei lÃydy"
-
-#~ msgid "The folder is not empty"
-#~ msgstr "Kansio ei ole tyhjÃ"
-
-#~ msgid "Not enough space to create the folder"
-#~ msgstr "Kansion luontiin ei ole riittÃvÃsti tilaa"
-
-#~ msgid "The specified folder type is not valid"
-#~ msgstr "Annettu kansiotyyppi ei ole kelvollinen"
-
-#~ msgid "A folder with the same name already exists"
-#~ msgstr "Samanniminen kansio on jo olemassa"
-
-#~ msgid "Generic error"
-#~ msgstr "Yleinen virhe"
-
-#~ msgid "Custom"
-#~ msgstr "Itse mÃÃritelty"
-
-#~ msgid "None"
-#~ msgstr "Ei mitÃÃn"
-
-#~ msgid "Contributor"
-#~ msgstr "Avustaja"
-
-#~ msgid "Reviewer"
-#~ msgstr "Tarkastaja"
-
-#~ msgid "Non-editing Author"
-#~ msgstr "Ei-muokkaava tekijÃ"
-
-#~ msgid "Author"
-#~ msgstr "TekijÃ"
-
-#~ msgid "Publishing Author"
-#~ msgstr "Julkaisun tekijÃ"
-
-#~ msgid "Editor"
-#~ msgstr "Toimittaja"
-
-#~ msgid "Publishing Editor"
-#~ msgstr "Julkaisun toimittaja"
-
-#~ msgid "Owner"
-#~ msgstr "Omistaja"
-
-#~ msgid "Enter password"
-#~ msgstr "SyÃtà salasana"
-
-#~ msgid "Enter password for %s"
-#~ msgstr "SyÃtà salasana tilille %s"
-
-#~ msgid "Item(s) belong to these _categories:"
-#~ msgstr "Kuuluu nÃihin _luokkiin:"
-
-#~ msgid ""
-#~ "Unable to connect to POP server %s.\n"
-#~ "Error sending username: %s"
-#~ msgstr ""
-#~ "YhdistÃminen POP-palvelimeen %s epÃonnistui.\n"
-#~ "Virhe lÃhetettÃessà salasanaa: %s"
-
-#~ msgid "Could not connect to POP server on %s"
-#~ msgstr "YhdistÃminen POP-palvelimeen %s epÃonnistui"
-
-#~ msgid ""
-#~ "Experimental IMAP 4(.1) client\n"
-#~ "This is untested and unsupported code, you want to use plain imap "
-#~ "instead.\n"
-#~ "\n"
-#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-#~ msgstr ""
-#~ "Kokeellinen IMAP 4(.1)-asiakas\n"
-#~ "TÃmà on testaamatonta ja ei-tuettua koodia, haluat oikeasti kÃyttÃà "
-#~ "pelkkÃÃ IMAP-yhteyttÃ.\n"
-#~ " !!! ÃLÃ KÃYTÃ TÃTÃ TÃRKEÃN SÃHKÃPOSTIN KÃSITTELYYN !!!\n"
-
-#~ msgid "Drafts"
-#~ msgstr "Luonnokset"
-
-#~ msgid ""
-#~ "Bad certificate from %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept anyway?"
-#~ msgstr ""
-#~ "HylÃtty varmenne %s:lta\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Haluatko hyvÃksyà kaikesta huolimatta?"
-
-#~ msgid "Error in application verification"
-#~ msgstr "Virhe kÃyttÃtarkoituksen varmentamisessa"
-
-#~ msgid "Key usage does not support certificate signing"
-#~ msgstr "Avaimen kÃyttÃtarkoitus ei salli varmenteiden allekirjoitusta"
-
-#~ msgid "AKID/Issuer serial mismatch"
-#~ msgstr "AKID/MyÃntÃjÃn sarjannumero eivÃt tÃsmÃÃ"
-
-#~ msgid "AKID/SKID mismatch"
-#~ msgstr "AKID/SKID eivÃt tÃsmÃÃ"
-
-#~ msgid "Subject/Issuer mismatch"
-#~ msgstr "Aihe/MyÃntÃjà eivÃt tÃsmÃÃ"
-
-#~ msgid "Certificate rejected"
-#~ msgstr "Varmennetta kieltÃydyttiin kÃyttÃmÃstÃ"
-
-#~ msgid "Certificate untrusted"
-#~ msgstr "Varmenteeseen ei luoteta"
-
-#~ msgid "Invalid purpose"
-#~ msgstr "VÃÃrà kÃyttÃtarkoitus"
-
-#~ msgid "Path length exceeded"
-#~ msgstr "Polun pituus ylitti maksimiarvonsa"
-
-#~ msgid "Invalid Certificate Authority (CA)"
-#~ msgstr "Virheellinen varmenneviranomainen (CA)"
-
-#~ msgid "Certificate Revoked"
-#~ msgstr "Varmenne on hylÃtty"
-
-#~ msgid "Certificate chain too long"
-#~ msgstr "Varmenneketju on liian pitkÃ"
-
-#~ msgid "Unable to verify leaf signature"
-#~ msgstr "Lehtiallekirjoitusta ei voi varmentaa"
-
-#~ msgid "Unable to get issuer's certificate locally"
-#~ msgstr "MyÃntÃjÃn varmennetta ei voi lÃydy paikallisesti"
-
-#~ msgid "Self-signed certificate in chain"
-#~ msgstr "Ketjussa on itseallekirjoitettu varmenne"
-
-#~ msgid "Zero-depth self-signed certificate"
-#~ msgstr "Nollansyvyinen itseallekirjoitettu varmenne"
-
-#~ msgid "Out of memory"
-#~ msgstr "Muisti loppui"
-
-#~ msgid "Certificate has expired"
-#~ msgstr "Varmenne on vanhentunut"
-
-#~ msgid "Certificate not yet valid"
-#~ msgstr "Varmenne ei ole vielà voimassa"
-
-#~ msgid "Certificate Revocation List signature failure"
-#~ msgstr "Varmenteiden hylkÃyslistan allekirjoituksessa virhe"
-
-#~ msgid "Certificate signature failure"
-#~ msgstr "Virhe varmenteen allekirjoituksessa"
-
-#~ msgid "Unable to decode issuer's public key"
-#~ msgstr "MyÃntÃjÃn julkisen avaimen purku epÃonnistui"
-
-#~ msgid "Unable to decrypt Certificate Revocation List signature"
-#~ msgstr "Varmenteiden hylkÃyslistaan allekirjoituksen avaus ei onnistunut"
-
-#~ msgid "Unable to decrypt certificate signature"
-#~ msgstr "Varmenteen allekirjoituksen avaus ei onnistunut"
-
-#~ msgid "Unable to get Certificate Revocation List"
-#~ msgstr "Varmenteiden hylkÃyslistaa ei voitu noutaa"
-
-#~ msgid "Unable to get issuer's certificate"
-#~ msgstr "MyÃntÃjÃn varmennetta ei voitu noutaa"
-
-#~ msgid ""
-#~ "Could not get Kerberos ticket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kerberos-lippua ei saatu:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "This option will connect to the server using Kerberos 4 authentication."
-#~ msgstr ""
-#~ "TÃmà vaihtoehto ottaa yhteyttà palvelimeen kÃyttÃen Kerberos 4 "
-#~ "varmennusta."
-
-#~ msgid "Kerberos 4"
-#~ msgstr "Kerberos 4"
-
-#~ msgid "This is a digitally signed message part"
-#~ msgstr "Digitaalisesti allekirjoitettu viestin osa"
-
-#~ msgid "%s: there was no self contact UID stored in gconf"
-#~ msgstr "%s: gconf ei sisÃltÃnyt oman kontaktin uidia"
-
-#~ msgid "CORBA exception making \"%s\" call"
-#~ msgstr "CORBA-poikkeus kutsun \"%s\" aikana"
-
-#~ msgid "\"%s\" on book before \"%s\""
-#~ msgstr "\"%s\" on kirjassa ennen kuin \"%s\""
-
-#~ msgid "Personal Folders"
-#~ msgstr "Omat kansiot"
-
-#~ msgid "The specified folder cannot be modified or removed"
-#~ msgstr "Pyydettyà kansiota ei voi muokata tai poistaa"
-
-#~ msgid "Certificate Revocation List (CRL) not yet valid"
-#~ msgstr "Varmenteiden hylkÃyslista (CRL) ei ole vielà kelvollinen"
-
-#~ msgid "Certificate Revocation List (CRL) has expired"
-#~ msgstr "Varmenteiden hylkÃyslista (CRL) on vanhentunut"
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+msgid "Keep running after the last client is closed"
+msgstr ""
 
-#~ msgid "Error in Certificate Revocation List (CRL)"
-#~ msgstr "Virhe Varmenteiden hylkÃyslistassa (CRL)"
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+msgid "Wait running until at least one client is connected"
+msgstr ""
 
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "TÃllà tietokoneella"



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