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

From: Timo Jyrinki <tjyrinki src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Finnish translation by Jiri Grönroos.
Date: Fri, 17 Sep 2010 15:33:15 +0000 (UTC)
commit 82554e3da48fd4f5c90e88177a3d05253893086c
Author: Timo Jyrinki <timo jyrinki iki fi>
Date:   Fri Sep 17 18:32:26 2010 +0300

    Updated Finnish translation by Jiri GrÃ¶nroos.

 po/fi.po | 4960 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2607 insertions(+), 2353 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index a987456..5269ddf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,185 +3,112 @@
 # Jarkko Ranta <jjranta cc joensuu fi> 2000-2001,
 # Sami Pesonen <sampeson iki fi> 2001-2003.
 # Ilkka Tuohela <hile iki fi> 2003-2008.
+# Jiri GrÃ¶nroos, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 10:58+0300\n"
-"PO-Revision-Date: 2009-07-19 11:05+0300\n"
-"Last-Translator: Ilkka Tuohela <hile iki fi>\n"
+"POT-Creation-Date: 2010-09-17 18:31+0300\n"
+"PO-Revision-Date: 2010-09-17 18:31+0300\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"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../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
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../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
 msgid "Searching..."
 msgstr "EtsitÃ¤Ã¤n..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "Haetaan yhteystietoja (%d)..."
+msgstr "Haetaan yhteystietoja (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
+#: ../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)..."
+msgstr "PÃ¤ivitetÃ¤Ã¤n yhteystietojen vÃ¤limuistia (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#, fuzzy
+msgid "Not connected"
+msgstr "Ei yhteyttÃ¤."
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
 msgid "Using Distinguished Name (DN)"
 msgstr "KÃ¤ytetÃ¤Ã¤n yksilÃ¶llÃ¶istÃ¤ nimeÃ¤ (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
 msgid "Using Email Address"
 msgstr "KÃ¤ytetÃ¤Ã¤n sÃ¤hkÃ¶postiosoitetta"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
 msgid "Reconnecting to LDAP server..."
 msgstr "Odotetaan uudelleen yhteyttÃ¤ LDAP-palvelimeen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#, fuzzy
+msgid "Invalid DN syntax"
+msgstr "Virheellinen argumentti"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
 msgid "Adding contact to LDAP server..."
 msgstr "LisÃ¤tÃ¤Ã¤n yhteystieto LDAP-palvelimelle..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
 msgid "Removing contact from LDAP server..."
 msgstr "Poistetaan yhteystieto LDAP-palvelimelta..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
 msgid "Modifying contact from LDAP server..."
 msgstr "Muokataan yhteystietoa LDAP-palvelimella..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
 msgid "Receiving LDAP search results..."
 msgstr "Vastaanotetaan LDAP-haun tuloksia..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
 msgid "Error performing search"
 msgstr "Virhe suoritettaessa hakua"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:287 ../addressbook/libebook/e-book.c:291
-#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
-#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
-#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
-#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
-#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
-#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
-#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
-#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
-#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
-#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
-#: ../addressbook/libebook/e-book.c:3445
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" on kirjassa ennen kuin \"%s\""
-
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
-#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
-#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
-#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
-#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
-#: ../addressbook/libebook/e-book.c:2877
-#, c-format
-msgid "book busy"
-msgstr "kirja kÃ¤ytÃ¶ssÃ¤"
-
-#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
-#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
-#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
-#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
-#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
-#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
-#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
-#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
-#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
-#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
-#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
-#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA-poikkeus kutsun \"%s\" aikana"
-
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: suoritettavaa toimintoa ei ole"
-
-#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
-#: ../addressbook/libebook/e-book.c:2633
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: ei voi perua"
-
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" on kirjassa \"%s\" jÃ¤lkeen"
-
-#: ../addressbook/libebook/e-book.c:2733
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: peruttu"
-
-#: ../addressbook/libebook/e-book.c:3310
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
 #, c-format
-msgid "%s: Invalid source."
-msgstr "%s: virheellinen lÃ¤hde."
-
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: URIlle \"%s\" ei lÃ¶ydy tehdasta"
-
-#: ../addressbook/libebook/e-book.c:3329
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: EBookListeneriÃ¤ ei voitu luoda"
-
-#: ../addressbook/libebook/e-book.c:3595
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: gconf ei sisÃ¤ltÃ¤nyt oman kontaktin uidia"
+msgid "Create resource '%s' failed with HTTP status: %d"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3727
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+#: ../addressbook/libebook/e-book.c:2995
+#, fuzzy, c-format
+msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: gconf ei sisÃ¤ltÃ¤nyt lÃ¤hdettÃ¤ uid:ille \"%s\""
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "YksilÃ¶llinen tunniste"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "Tallenna kohtaan"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "Kirjan URI"
 
@@ -189,806 +116,1048 @@ msgstr "Kirjan URI"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Lempinimi"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "1. sÃ¤hkÃ¶posti"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "2. sÃ¤hkÃ¶posti"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "3. sÃ¤hkÃ¶posti"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "4. sÃ¤hkÃ¶posti"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
-msgstr "Kotiosoite "
+msgstr "Kotiosoite"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "TyÃ¶osoite"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "Muu osoite"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "Apulaisen puhelin"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "TyÃ¶puhelin"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "TyÃ¶puhelin 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "TyÃ¶/faksi"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "Takaisinsoitto"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "Pager"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "OrganisaatioyksikkÃ¶"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Asema"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "Titteli"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "Rooli"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "Apulainen"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "Kotisivun URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "Weblogin URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:609
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:667
 msgid "Categories"
 msgstr "RyhmÃ¤t"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "Kalenterin URL"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "Vapaa/varattu URL"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS-kalenteri"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "Videoneuvottelun URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Puolison nimi"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "Huomio"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "AIM-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "AIM-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "AIM-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "AIM-tyÃ¶nimi 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "AIM-tyÃ¶nimi 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "AIM-tyÃ¶nimi 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise-tyÃ¶nimi 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise-tyÃ¶nimi 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-tyÃ¶nimi 3"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:203
+#, fuzzy
+msgid "Jabber Home ID 1"
 msgstr "Jabber kotitunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:204
+#, fuzzy
+msgid "Jabber Home ID 2"
 msgstr "Jabber kotitunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:205
+#, fuzzy
+msgid "Jabber Home ID 3"
 msgstr "Jabber kotitunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:206
+#, fuzzy
+msgid "Jabber Work ID 1"
 msgstr "Jabber tyÃ¶tunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:207
+#, fuzzy
+msgid "Jabber Work ID 2"
 msgstr "Jabber tyÃ¶tunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:208
+#, fuzzy
+msgid "Jabber Work ID 3"
 msgstr "Jabber tyÃ¶tunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!-tyÃ¶nimi 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!-tyÃ¶nimi 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!-tyÃ¶nimi 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "MSN-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "MSN-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "MSN-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "MSN-tyÃ¶nimi 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "MSN-tyÃ¶nimi 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:221
+#, fuzzy
+msgid "ICQ Home ID 1"
 msgstr "ICQ kotitunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:222
+#, fuzzy
+msgid "ICQ Home ID 2"
 msgstr "ICQ tyÃ¶tunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:223
+#, fuzzy
+msgid "ICQ Home ID 3"
 msgstr "ICQ kotitunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:224
+#, fuzzy
+msgid "ICQ Work ID 1"
 msgstr "ICQ tyÃ¶tunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:225
+#, fuzzy
+msgid "ICQ Work ID 2"
 msgstr "ICQ tyÃ¶tunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:226
+#, fuzzy
+msgid "ICQ Work ID 3"
 msgstr "ICQ tyÃ¶tunniste 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "Viimeisin tarkistettu versio"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "Nimi tai Org"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "Osoitelista"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "TyÃ¶osoite"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Muu osoite"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "RyhmÃ¤luettelo"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "Logo"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "SÃ¤hkÃ¶postilista"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "AIM nÃ¤yttÃ¶nimien lista"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:250
+#, fuzzy
+msgid "GroupWise ID List"
 msgstr "Groupwisen Id-lista"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:251
+#, fuzzy
+msgid "Jabber ID List"
 msgstr "Jabber-tunnisteiden lista"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! nÃ¤yttÃ¶nimien lista"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "MSN nÃ¤yttÃ¶nimien lista"
 
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:254
+#, fuzzy
+msgid "ICQ ID List"
 msgstr "ICQ-tunnisteiden lista"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "Tahtoo HTML-postia"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "Lista"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "Lista nÃ¤ytettÃ¤vistÃ¤ osoitteista"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "SyntymÃ¤pÃ¤ivÃ¤"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:45
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:44
 msgid "Anniversary"
 msgstr "VuosipÃ¤ivÃ¤"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509-varmenne"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:267
+#, fuzzy
+msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu kotitunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:268
+#, fuzzy
+msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu kotitunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:269
+#, fuzzy
+msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu kotitunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:270
+#, fuzzy
+msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu tyÃ¶tunniste 1"
 
-#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:271
+#, fuzzy
+msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu tyÃ¶tunniste 2"
 
-#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:272
+#, fuzzy
+msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu tyÃ¶tunniste 3"
 
-#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:273
+#, fuzzy
+msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadun tunnistelista"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "Maantieteelliset tiedot"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "Skype-kotinimi 1"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "Skype-kotinimi 2"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "Skype-kotinimi 3"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "Skype-tyÃ¶nimi 1"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "Skype-tyÃ¶nimi 2"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "Skype-tyÃ¶nimi 3"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Skypenimien luettelo"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "SIP-osoite"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1517
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "NimeÃ¤mÃ¤tÃ¶n lista"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:46
+#: ../addressbook/libedata-book/e-data-book-factory.c:298
+#, c-format
+msgid "Empty URI"
+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
+#, c-format
+msgid "Invalid source"
+msgstr "Virheellinen lÃ¤hde"
+
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Success"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:110
+#, 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
+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
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Todennus epÃ¤onnistui"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+#: ../calendar/libedata-cal/e-data-cal.c:117
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Todennus vaaditaan"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:118
+msgid "Unsupported field"
+msgstr "KenttÃ¤ ei ole tuettu"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
+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
+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
+msgid "Book removed"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
+#, 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
+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
+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
+msgid "Invalid query"
+msgstr "Virheellinen kysely"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Query refused"
+msgstr "KyselyÃ¤ ei hyvÃ¤ksytty"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:129
+#, 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
+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
+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
+#, 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
+#, 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"
+
+#. 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"
+
+#. 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"
+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"
+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"
+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"
+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: 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: 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"
+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: 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: 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: 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: 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: 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"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#, fuzzy, c-format
+msgid "Unexpected HTTP status code %d returned"
+msgstr ""
+"Odottamaton GnuPG tilaviesti havaittu:\n"
+"\n"
+"%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
+msgid "Calendar doesn't support Free/Busy"
+msgstr ""
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:45
 msgid "Birthday"
 msgstr "SyntymÃ¤pÃ¤ivÃ¤"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
 #, c-format
 msgid "Birthday: %s"
 msgstr "SyntymÃ¤pÃ¤ivÃ¤: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
 #, c-format
 msgid "Anniversary: %s"
 msgstr "VuosipÃ¤ivÃ¤: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Kalenteritietoja ei voi tallentaa: virheellinen URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 msgid "Cannot save calendar data"
 msgstr "Kalenteritietoja ei voi tallentaa"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
-msgid "Could not create thread for getting deltas"
-msgstr "Deltojen hakuun ei voitu luoda sÃ¤iettÃ¤"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
-#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1066
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1362
-#: ../calendar/backends/http/e-cal-backend-http.c:621
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
-msgid "Could not create cache file"
-msgstr "VÃ¤limuistitiedostoa ei voitu luoda"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1078
-msgid "Could not create thread for populating cache"
-msgstr "VÃ¤limuistitiedoston luontia varten ei voitu luoda sÃ¤iettÃ¤"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
+#: ../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:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
+#: ../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:277
+#: ../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:907
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:965
+#: ../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:984
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:993
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1083
-#: ../calendar/libecal/e-cal.c:5117
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "Todennus epÃ¤onnistui"
+#: ../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:282
+#: ../calendar/backends/http/e-cal-backend-http.c:359
 msgid "Redirected to Invalid URI"
 msgstr "Uudelleenohjaus virheelliseen URI:in"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:305
+#: ../calendar/backends/http/e-cal-backend-http.c:382
 msgid "Bad file format."
 msgstr "Virheellinen tiedostomuoto."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:312
+#: ../calendar/backends/http/e-cal-backend-http.c:389
 msgid "Not a calendar."
 msgstr "Ei kalenteri."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "SÃ¤Ã¤tietoja ei voitu hakea"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "SÃ¤Ã¤: sumuista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "SÃ¤Ã¤: pilvistÃ¤"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "SÃ¤Ã¤: pilvinen yÃ¶"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+msgid "Weather: Cloudy"
+msgstr "SÃ¤Ã¤: pilvistÃ¤"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Overcast"
 msgstr "SÃ¤Ã¤: poutaista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "SÃ¤Ã¤: sadekuuroja"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "SÃ¤Ã¤: sadetta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "SÃ¤Ã¤: Aurinkoista"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "SÃ¤Ã¤: kirkas yÃ¶"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+msgid "Weather: Sunny"
+msgstr "SÃ¤Ã¤: Aurinkoista"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Thunderstorms"
 msgstr "SÃ¤Ã¤: ukkosta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "SÃ¤Ã¤ennuste"
 
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "NimeÃ¤mÃ¤tÃ¶n tapaaminen"
 
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "Korkea"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
 
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../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)"
@@ -997,188 +1166,168 @@ 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:1707
+#: ../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:5089
-msgid "Invalid argument"
-msgstr "Virheellinen argumentti"
-
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:4051
 msgid "Backend is busy"
 msgstr "TaustajÃ¤rjestelmÃ¤ on kÃ¤ytÃ¶ssÃ¤"
 
-#: ../calendar/libecal/e-cal.c:5093
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4053
 msgid "Repository is offline"
 msgstr "Varasto on yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#: ../calendar/libecal/e-cal.c:5095
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4055
 msgid "No such calendar"
 msgstr "Kalenteria ei ole olemassa"
 
-#: ../calendar/libecal/e-cal.c:5097
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../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:5099
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../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:5101
+#: ../calendar/libecal/e-cal.c:4061
 msgid "URI not loaded"
 msgstr "URIa ei ole ladattu"
 
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:4063
 msgid "URI already loaded"
 msgstr "URI on jo ladattu"
 
-#: ../calendar/libecal/e-cal.c:5105
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Permission denied"
-msgstr "Lupa evÃ¤tty"
-
-#: ../calendar/libecal/e-cal.c:5107
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../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:5109
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../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:5111
+#: ../calendar/libecal/e-cal.c:4071
 msgid "Protocol not supported"
 msgstr "Protokolla ei ole tuettu"
 
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:4073
 msgid "Operation has been canceled"
 msgstr "Toimenpide on peruttu"
 
-#: ../calendar/libecal/e-cal.c:5115
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4075
 msgid "Could not cancel operation"
 msgstr "ToimenpidettÃ¤ ei voitu perua"
 
-#: ../calendar/libecal/e-cal.c:5119
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../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:5121
-msgid "A CORBA exception has occurred"
+#: ../calendar/libecal/e-cal.c:4081
+#, fuzzy
+msgid "A D-Bus exception has occurred"
 msgstr "Tapahtui CORBA-poikkeus"
 
-#: ../calendar/libecal/e-cal.c:5123
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:219
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../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/libecal/e-cal.c:5125
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../calendar/libecal/e-cal.c:4085
 msgid "No error"
 msgstr "Ei virhettÃ¤"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../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
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" ei ota argumentteja"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../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
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ottaa yhden argumentin"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../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
 #, 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:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "\"%s\" olettaa ensimmÃ¤isen argumentin olevan ISO-8601 muotoinen pÃ¤ivÃ¤ys"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../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
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../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
 #, 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:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, 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:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../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
 #, 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:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, 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:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1189,12 +1338,12 @@ msgstr ""
 "\"description\", \"sijainti\", \"attendee\", \"organizer\" tai "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, 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:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1203,104 +1352,244 @@ msgstr ""
 "\"%s\" olettaa kaikkien argumenttien olevan merkkijonoja, tai yhden ja "
 "ainoastaan yhden olevan totuusarvoisen epÃ¤toden (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:112
 msgid "Invalid range"
 msgstr "Virheellinen alue"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "KenttÃ¤ ei ole tuettu"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Unsupported method"
 msgstr "MenetelmÃ¤ ei ole tuettu."
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "TunnistautumismenetelmÃ¤ ei ole tuettu"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+#, fuzzy
+msgid "Calendar does not exist"
+msgstr "Kansiota \"%s\" ei ole olemassa."
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS ei kÃ¤ytettÃ¤vissÃ¤"
+#: ../calendar/libedata-cal/e-data-cal.c:123
+#, fuzzy
+msgid "Unknown user"
+msgstr "Tuntematon kÃ¤yttÃ¤jÃ¤"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "YhteydetÃ¶n tila ei saatavilla"
+#. 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"
+msgstr "Kalenteria ei voi pÃ¤ivittÃ¤Ã¤"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "Haun kokorajoitus ylitettiin"
+#. 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."
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Haun aikaraja ylitettiin"
+#. 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"
+msgstr "Kalenteritietoja ei voi tallentaa"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Virheellinen kysely"
+#. 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"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "KyselyÃ¤ ei hyvÃ¤ksytty"
+#. 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"
+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"
+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"
+msgstr "ViestiÃ¤ ei voi luoda: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Virheellinen palvelimen versio"
+#. 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"
+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"
+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"
+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"
 
-#: ../camel/camel-cipher-context.c:102
+#. 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"
+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"
+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: 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"
+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"
+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 ""
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:432
+#, c-format
+msgid "Could not instantiate backend"
+msgstr ""
+
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "TÃ¤mÃ¤ salakirjoitusmenetelmÃ¤ ei tue allekirjoitusta"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "Allekirjoitetaan viestiÃ¤"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "TÃ¤mÃ¤ salakirjoitusmenetelmÃ¤ ei tue varmennusta"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "Varmistetaan viestiÃ¤"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "TÃ¤mÃ¤ salakirjoitusmenetelmÃ¤ ei tue tiedon salausta"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "Salataan viestiÃ¤"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "TÃ¤mÃ¤ salakirjoitusmenetelmÃ¤ ei tue salauksen purkua"
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "Puretaan viestin salausta"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:297
+#, 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:301
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Et voi viedÃ¤ avaimia tÃ¤llÃ¤ salakirjoitusmenetelmÃ¤llÃ¤"
 
-#: ../camel/camel-data-cache.c:136
+#: ../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:402
+#: ../camel/camel-data-cache.c:494
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Tietoa ei voitu avata vÃ¤limuistista: %s: %s"
 
-#: ../camel/camel-db.c:412
+#: ../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:197
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1311,8 +1600,8 @@ msgstr ""
 "MyÃ¶hempiÃ¤ toimenpiteitÃ¤ tÃ¤llÃ¤ palvelimella ei toisteta, kun otat\n"
 "uudelleen yhteyttÃ¤Ã¤ verkkoon."
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1323,122 +1612,151 @@ msgstr ""
 "%s\n"
 "TÃ¤hÃ¤n kansioon tehtyjÃ¤ muutoksia ei tahdisteta uudestaan."
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
 msgstr "Uudelleentahdistetaan palvelimen kanssa"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "Kopioi kansion sisÃ¤ltÃ¶ paikallisesti yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "Haetaan uusia viestejÃ¤ yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:379
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Valmistellaan kansiota \"%s\" yhteydettÃ¶mÃ¤Ã¤n tilaan"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+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
+#, 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-exception.c:260
-msgid "No description available"
-msgstr "Ei kuvausta saatavilla"
+#: ../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"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "Peruttu"
+
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Lapsiprosessin \"%s\" luominen epÃ¤onnistui: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Virheellinen viestivirta lÃ¤hteestÃ¤ %s: %s"
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jÃ¤sennettÃ¤essÃ¤ suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu avata"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu kÃ¤sitellÃ¤"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiÃ¤ %d (%d %%)"
 
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "ViestiÃ¤ ei voi avata"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "Valmis"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestiÃ¤ %d / %d"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "ViestiÃ¤ ei voitu hakea."
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "VirheellisiÃ¤ argumentteja (system-flag)"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "VirheellisiÃ¤ argumentteja (user-tag)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1447,8 +1765,8 @@ msgstr ""
 "Hakulauseketta ei voi tulkita: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1457,72 +1775,74 @@ msgstr ""
 "Virhe suoritettaessa hakulauseketta: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) vaatii yhden totuusarvoisen tuloksen"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ei ole sallittu kohdan %s sisÃ¤llÃ¤"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) vaatii vertaustyypin merkkijonon"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) olettaa tuloksena olevan taulukon"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) vaatii kansion asettamisen"
 
-#: ../camel/camel-folder.c:683
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Toiminto ei ole tuettu: lisÃ¤Ã¤ viesti: %s:lle"
-
-#: ../camel/camel-folder.c:1388
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Toiminto ei ole tuettu: hae lausekkeella: %s"
-
-#: ../camel/camel-folder.c:1429
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Toiminto ei ole tuettu: lukumÃ¤Ã¤rÃ¤ lausekkeella: %s"
-
-#: ../camel/camel-folder.c:1468
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Toiminto ei ole tuettu: haku UID:n perusteella: %s"
-
-#: ../camel/camel-folder.c:1581
+#: ../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:1581
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
 msgstr "Kopioidaan viestejÃ¤"
 
-#: ../camel/camel-folder.c:1922
-msgid "Learning junk"
-msgstr "Opitaan roskapostia"
-
-#: ../camel/camel-folder.c:1939
-msgid "Learning non-junk"
-msgstr "Opitaan ei-roskapostia"
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "gpg:n suoritus epÃ¤onnistui: %s"
 
-#: ../camel/camel-folder.c:1958
-msgid "Filtering new message(s)"
-msgstr "Suodatetaan uusia viestejÃ¤"
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "Tuntematon"
 
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1533,22 +1853,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg kÃ¤yttÃ¤jÃ¤tunnisteen vihjeen tulkitseminen epÃ¤onnistui."
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg salalausepyynnÃ¶n tulkinta epÃ¤onnistui."
 
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr "Tarvitset PIN-koodin avataksesi Ã¤lykorttisi: \"%s\""
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1557,145 +1879,118 @@ msgstr ""
 "Tarvitse salalauseen avataksesi avaimen\n"
 "kÃ¤yttÃ¤jÃ¤lle: \"%s\""
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Odottamaton pyyntÃ¶ GnuPG:ltÃ¤ kohteelle \"%s\""
 
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "Peruttu."
-
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Salaisen avaimen avaus epÃ¤onnistui: 3 virheellistÃ¤ salalausetta syÃ¶tetty."
 
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus GnuPG:ltÃ¤: %s"
 
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Salaus epÃ¤onnistui: kelvollisia vastaanottajia ei ole mÃ¤Ã¤ritelty"
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1205 ../camel/camel-gpg-context.c:1330
-#: ../camel/camel-gpg-context.c:1852 ../camel/camel-gpg-context.c:1897
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "gpg:n suoritus epÃ¤onnistui: %s"
-
-#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#, fuzzy
+msgid "Could not generate signing data: "
 msgstr "Allekirjoitustietoa ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1546
-#: ../camel/camel-gpg-context.c:1562 ../camel/camel-gpg-context.c:1642
-#: ../camel/camel-gpg-context.c:1657 ../camel/camel-gpg-context.c:1773
-#: ../camel/camel-gpg-context.c:1788 ../camel/camel-gpg-context.c:1868
-#: ../camel/camel-gpg-context.c:1913
+#: ../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
 msgid "Failed to execute gpg."
 msgstr "gpg:n suoritus epÃ¤onnistui."
 
-#: ../camel/camel-gpg-context.c:1364
-msgid "This is a digitally signed message part"
-msgstr "Digitaalisesti allekirjoitettu viestin osa"
-
-#: ../camel/camel-gpg-context.c:1450 ../camel/camel-gpg-context.c:1456
-#: ../camel/camel-gpg-context.c:1462 ../camel/camel-gpg-context.c:1477
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../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
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1516
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"Viestin allekirjoitusta ei voi varmentaa: vÃ¤liaikaistiedostoa ei voitu "
-"luoda: %s"
+#: ../camel/camel-gpg-context.c:1695
+#, fuzzy
+msgid "Cannot verify message signature: "
+msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1625
-#, c-format
-msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1814
+#, fuzzy
+msgid "Could not generate encrypting data: "
 msgstr "Salaustieto ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:1675
+#: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
 msgstr "Digitaalisesti salattu viestin osa"
 
-#: ../camel/camel-gpg-context.c:1728 ../camel/camel-gpg-context.c:1736
-#: ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Viestin salausta ei voi purkaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:1745
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-osan salauksen purku epÃ¤onnistui: protokollavirhe"
 
-#: ../camel/camel-gpg-context.c:1810 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "Salattu sisÃ¤ltÃ¶"
 
-#: ../camel/camel-gpg-context.c:1829
-msgid "Unable to parse message content"
-msgstr "Viestin sisÃ¤ltÃ¶Ã¤ ei voitu tulkita"
-
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
-#: ../camel/camel-tcp-stream-openssl.c:627
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Lukitsevan apulaisen putkea ei voi luoda: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Lukitsevaa apulaista ei voi kÃ¤ynnistÃ¤Ã¤: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "\"%s\" ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Lukitus epÃ¤onnistui: %s"
 
-#: ../camel/camel-lock.c:103
+#: ../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:144
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+#: ../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:199
+#: ../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:262
+#: ../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:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "SÃ¤hkÃ¶postitiedostoa %s ei voitu tarkistaa: %s"
@@ -1705,145 +2000,146 @@ msgstr "SÃ¤hkÃ¶postitiedostoa %s ei voitu tarkistaa: %s"
 msgid "Could not open mail file %s: %s"
 msgstr "SÃ¤hkÃ¶postitiedostoa %s ei voitu avata: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "TilapÃ¤istÃ¤ sÃ¤hkÃ¶postitiedostoa %s ei voitu avata: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Viestin tallentaminen vÃ¤liaikaistiedostoon %s epÃ¤onnistui: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Putken luonti epÃ¤onnistui: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Haaroitus epÃ¤onnistui: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Ohjelma movemail epÃ¤onnistui: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Virhe luettaessa viestitiedostoa: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Virhe kirjoitettaessa vÃ¤liaikaista viestitiedostoa: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin vÃ¤liaikaistiedostoa: %s"
 
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "Virhe tulkittaessa"
+#: ../camel/camel-multipart-signed.c:285
+#, fuzzy, c-format
+msgid "No content available"
+msgstr "Ei kuvausta saatavilla"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
-msgid "Canceled"
-msgstr "Peruttu"
+#: ../camel/camel-multipart-signed.c:293
+#, fuzzy, c-format
+msgid "No signature available"
+msgstr "Ei kuvausta saatavilla"
 
-#: ../camel/camel-net-utils.c:522
-msgid "cannot create thread"
-msgstr "sÃ¤iettÃ¤ ei voi luoda"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "Virhe tulkittaessa"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ratkaistaan: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:717
 msgid "Host lookup failed"
 msgstr "Palvelimen osoitteen haku epÃ¤onnistui"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:721
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Palvelimen %s osoitteen haku epÃ¤onnistui: %s"
 
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:844
 msgid "Resolving address"
 msgstr "EtsitÃ¤Ã¤n osoitetta"
 
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:864
 msgid "Name lookup failed"
 msgstr "Nimikysely epÃ¤onnistui"
 
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:869
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Nimen haku epÃ¤onnistui: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkronoidaan viestejÃ¤ kansiossa %s levylle"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Kansion \"%s\" yhteydettÃ¶mÃ¤n tilan muutoslokia ei voi luoda: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "Virtuaalikansion sÃ¤hkÃ¶postitarjoaja"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 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:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Moduulin %s lataaminen epÃ¤onnistui: JÃ¤rjestelmÃ¤si ei tue moduulien "
 "lataamista."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ei voitu ladata: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, 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:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonyymi"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "TÃ¤mÃ¤ valitsin kirjautuu palvelimelle anonyymisti."
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
 msgstr "Todennus epÃ¤onnistui."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1852,7 +2148,7 @@ msgstr ""
 "Virheellinen sÃ¤hkÃ¶postiosoitteen seurantatieto:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1861,7 +2157,7 @@ msgstr ""
 "Virheellinen lÃ¤pinÃ¤kyvÃ¤n seurannan tieto:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1870,11 +2166,11 @@ msgstr ""
 "Virheellinen seurannan tieto:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../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."
@@ -1882,11 +2178,11 @@ msgstr ""
 "TÃ¤mÃ¤ vaihtoehto yhdistÃ¤Ã¤ palvelimeen kÃ¤yttÃ¤en turvallista CRAM-MD5 "
 "salasanaa, jos palvelin tukee tÃ¤tÃ¤."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../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."
@@ -1894,41 +2190,47 @@ 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:844
+#: ../camel/camel-sasl-digest-md5.c:820
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Palvelimen haaste liian pitkÃ¤ (>2048 tavua)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:831
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "Palvelimen haaste on virheellinen\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:839
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "Palvelimen haaste sisÃ¤lsi virheellisen \"Quality of Protection\" kentÃ¤n"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Palvelimen vaste ei sisÃ¤ltÃ¤nyt todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Palvelimen vaste sisÃ¤lsi vajaata todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "Palvelimen vaste ei vastaa haluttua"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:80
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:82
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "TÃ¤mÃ¤ vaihtoehto yhdistÃ¤Ã¤ palvelimeen kÃ¤yttÃ¤en Kerberos 5 - tunnistautumista."
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:119
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1936,11 +2238,11 @@ msgstr ""
 "Annettu valtuustieto ei tue mÃ¤Ã¤riteltyÃ¤ mekanismia, tai se on toteutukselle "
 "tuntematon."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:124
 msgid "The provided target_name parameter was ill-formed."
 msgstr "MÃ¤Ã¤ritelty target_name parametri oli vÃ¤Ã¤rin muotoiltu."
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:127
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -1948,7 +2250,7 @@ msgstr ""
 "MÃ¤Ã¤ritelty target_name parametri sisÃ¤lsi virheellisen tai tukemattoman "
 "tyyppisen nimen."
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:131
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1956,7 +2258,7 @@ msgstr ""
 "input_token sisÃ¤ltÃ¤Ã¤ eri kanavasidontoja kun mitÃ¤ on mÃ¤Ã¤ritelty "
 "input_chan_bindings parametrissa."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:136
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -1964,7 +2266,7 @@ msgstr ""
 "input_token sisÃ¤ltÃ¤Ã¤ virheellisen allekirjoituksen tai allekirjoituksen, "
 "jota ei voi varmentaa."
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../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."
@@ -1972,68 +2274,52 @@ 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:185
+#: ../camel/camel-sasl-gssapi.c:145
 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:188
+#: ../camel/camel-sasl-gssapi.c:148
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_check:ille tehdyt eheystarkistukset epÃ¤onnistuivat."
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:151
 msgid "The consistency checks performed on the credential failed."
 msgstr "Valtuustiedoille tehdyt eheystarkistukset epÃ¤onnistuivat."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:154
 msgid "The referenced credentials have expired."
 msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../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
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:369
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Turvakerros ei ole tuettu."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-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."
-
-#: ../camel/camel-sasl-kerberos4.c:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos-lippua ei saatu:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "Kirjautuminen"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 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:134
+#: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
 msgstr "Tuntematon todennustila."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2041,54 +2327,56 @@ msgstr ""
 "TÃ¤mÃ¤ vaihtoehto yhdistÃ¤Ã¤ Windows-palvelimeen kÃ¤yttÃ¤en NTLM/Secure Password "
 "tunnistautumista."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "SELVÃ?KIELINEN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP ennen SMTP:tÃ¤"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../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Ã¶Ã¤."
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "POP:in lÃ¤hde-URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, fuzzy, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
 msgstr ""
 "POP ennen SMTP:tÃ¤ tunnistautuminen kÃ¤yttÃ¤en tuntematonta siirtomenetelmÃ¤Ã¤"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, fuzzy, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
 msgstr "POP ennen SMTP:tÃ¤ kÃ¤yttÃ¤en lÃ¤hdettÃ¤, joka ei ole POP"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "SÃ¤Ã¤nnÃ¶llisen lausekkeen kÃ¤Ã¤nnÃ¶s epÃ¤onnistui: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../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:269
+#: ../camel/camel-service.c:92
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL \"%s\" vaatii palvelinosan"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:96
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL \"%s\" vaatii polkuosan"
 
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:261
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2097,371 +2385,305 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:758
 #, 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-session.c:817
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel-istunto ei tue viestin edelleenlÃ¤hetystÃ¤."
-
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Varmennetta \"%s\":lle ei lÃ¶ydy"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "CMS-viestiÃ¤ ei voi luoda"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voitu luoda"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voi liittÃ¤Ã¤"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "CMS-tietoa ei voi liittÃ¤Ã¤"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "CMS-allekirjoitustietoa ei voitu luoda"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "Varmenneketjua ei lÃ¶ydy"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "CMS allekirjoitusaikaa ei voi lisÃ¤tÃ¤"
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Salausvarmennetta kohteelle \"%s\" ei ole olemassa."
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs-attribuuttia ei voi lisÃ¤tÃ¤"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs-attribuuttia ei voi lisÃ¤tÃ¤"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "Salausvarmennetta ei voi lisÃ¤tÃ¤"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "CMS allekirjoittajatietoa ei voi lisÃ¤tÃ¤"
 
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "Kooderin kontekstia ei voi luoda"
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS-kooderiin ei voitu lisÃ¤tÃ¤ tietoa"
-
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "Tiedon koodaus epÃ¤onnistui"
-
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "Varmistamaton"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "HyvÃ¤ksytty allekirjoitus"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "HylÃ¤tty allekirjoitus"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "SisÃ¤ltÃ¶Ã¤ muutettu siirrettÃ¤essÃ¤"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "Allekirjoitusvarmennetta ei lÃ¶ytynyt"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "Allekirjoitusvarmenteeseen ei luoteta"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "Allekirjoituksen algoritmi on tuntematon"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "Allekirjoituksen algoritmi ei ole tuettu"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "Virhe allekirjoituksen muodossa"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "Virhe kÃ¤sittelyssÃ¤"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "Allekirjoituksessa ei ole allekirjoitettua tietoa"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Viestin kuoresta ei ole tiivisteitÃ¤."
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "TiivisteitÃ¤ ei voi laskea"
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "Viestin tiivisteitÃ¤ ei voi asettaa"
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "Varmenteen tuonti epÃ¤onnistui"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, 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:820
+#: ../camel/camel-smime-context.c:634
 #, 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:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "AllekirjoitustiivisteitÃ¤ ei lÃ¶ydy"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allekirjoittaja: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+msgid "Cannot create encoder context"
+msgstr "Kooderin kontekstia ei voi luoda"
+
+#: ../camel/camel-smime-context.c:838
+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
+msgid "Failed to encode data"
+msgstr "Tiedon koodaus epÃ¤onnistui"
+
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "Purkaja epÃ¤onnistui"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "YhteistÃ¤ massasalausalgoritmia ei lÃ¶ydy"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Lokeroa massasalausavaimelle ei voi varata"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
 msgstr "CMS-viestiÃ¤ ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS-kÃ¤Ã¤rittyÃ¤ tietoa ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS-kÃ¤Ã¤rittyÃ¤ tietoa ei voi liittÃ¤Ã¤"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
 msgstr "CMS tieto-oliota ei voi liittÃ¤Ã¤"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi lisÃ¤tÃ¤"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
 msgstr "Tiedon lisÃ¤ys koodaajaan epÃ¤onnistui"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME purku: salauskontekstia ei lÃ¶ytynyt"
 
-#: ../camel/camel-smime-context.c:1200
-msgid "import keys: unimplemented"
-msgstr "tuo avaimia; ei toteutettu"
-
-#: ../camel/camel-smime-context.c:1208
-msgid "export keys: unimplemented"
-msgstr "vie avaimet ei ole toteutettu"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr ""
-"Kansion hakeminen ei onnistu: virheellinen toiminto tÃ¤ssÃ¤ tallennuspaikassa"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Kansiota \"%s\" ei voi luoda: kansio on jo olemassa"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
-
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, 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:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Roskakori"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "MyÃ¶ntÃ¤jÃ¤n varmennetta ei voitu noutaa"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "Varmenteiden hylkÃ¤yslistaa ei voitu noutaa"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "Varmenteen allekirjoituksen avaus ei onnistunut"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Varmenteiden hylkÃ¤yslistaan allekirjoituksen avaus ei onnistunut"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "MyÃ¶ntÃ¤jÃ¤n julkisen avaimen purku epÃ¤onnistui"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "Virhe varmenteen allekirjoituksessa"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "Varmenteiden hylkÃ¤yslistan allekirjoituksessa virhe"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "Varmenne ei ole vielÃ¤ voimassa"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "Varmenne on vanhentunut"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "Varmenteiden hylkÃ¤yslista (CRL) ei ole vielÃ¤ kelvollinen"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "Varmenteiden hylkÃ¤yslista (CRL) on vanhentunut"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "Virhe Varmenteiden hylkÃ¤yslistassa (CRL)"
-
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "Muisti loppui"
-
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "Nollansyvyinen itseallekirjoitettu varmenne"
-
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "Ketjussa on itseallekirjoitettu varmenne"
+#: ../camel/camel-tcp-stream-raw.c:814
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "MyÃ¶ntÃ¤jÃ¤n varmennetta ei voi lÃ¶ydy paikallisesti"
+#: ../camel/camel-tcp-stream-raw.c:820
+#, fuzzy, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "VarmennusmenetelmÃ¤ %s ei ole tuettu"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "Lehtiallekirjoitusta ei voi varmentaa"
+#: ../camel/camel-tcp-stream-raw.c:832
+msgid "General SOCKS server failure"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "Varmenneketju on liian pitkÃ¤"
+#: ../camel/camel-tcp-stream-raw.c:833
+msgid "SOCKS server's rules do not allow connection"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "Varmenne on hylÃ¤tty"
+#: ../camel/camel-tcp-stream-raw.c:834
+msgid "Network is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Virheellinen varmenneviranomainen (CA)"
+#: ../camel/camel-tcp-stream-raw.c:835
+msgid "Host is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "Polun pituus ylitti maksimiarvonsa"
+#: ../camel/camel-tcp-stream-raw.c:836
+#, fuzzy
+msgid "Connection refused"
+msgstr "Yhteys peruutettu"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "VÃ¤Ã¤rÃ¤ kÃ¤yttÃ¶tarkoitus"
+#: ../camel/camel-tcp-stream-raw.c:837
+msgid "Time-to-live expired"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "Varmenteeseen ei luoteta"
+#: ../camel/camel-tcp-stream-raw.c:838
+#, fuzzy
+msgid "Command not supported by SOCKS server"
+msgstr "Palvelin ei tue STLS-laajennosta"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "Varmennetta kieltÃ¤ydyttiin kÃ¤yttÃ¤mÃ¤stÃ¤"
+#: ../camel/camel-tcp-stream-raw.c:839
+#, fuzzy
+msgid "Address type not supported by SOCKS server"
+msgstr "Palvelin ei tue STLS-laajennosta"
 
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "Aihe/MyÃ¶ntÃ¤jÃ¤ eivÃ¤t tÃ¤smÃ¤Ã¤"
+#: ../camel/camel-tcp-stream-raw.c:840
+#, fuzzy
+msgid "Unknown error from SOCKS server"
+msgstr "Tuntematon virhe: %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID eivÃ¤t tÃ¤smÃ¤Ã¤"
+#: ../camel/camel-tcp-stream-raw.c:870
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/MyÃ¶ntÃ¤jÃ¤n sarjannumero eivÃ¤t tÃ¤smÃ¤Ã¤"
+#: ../camel/camel-tcp-stream-raw.c:887
+#, fuzzy, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "Virheellinen vastaus palvelimelta"
 
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "Avaimen kÃ¤yttÃ¶tarkoitus ei salli varmenteiden allekirjoitusta"
+#: ../camel/camel-tcp-stream-raw.c:902
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "Virhe kÃ¤yttÃ¶tarkoituksen varmentamisessa"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:934 ../camel/camel-tcp-stream-raw.c:944
+#, fuzzy, c-format
+msgid "Invalid reply from proxy server"
+msgstr "Virheellinen vastaus palvelimelta"
 
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:457
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2472,37 +2694,18 @@ msgstr ""
 "MyÃ¶ntÃ¤jÃ¤:          %s\n"
 "Aihe:              %s\n"
 "SormenjÃ¤lki:       %s\n"
-"Allekirjoitus:     %s "
+"Allekirjoitus:     %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "GOOD"
 msgstr "HYVÃ?KSYTTY"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "BAD"
 msgstr "VIRHEELLINEN"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-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?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:467
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2517,7 +2720,7 @@ msgstr ""
 "\n"
 "Haluatko hyvÃ¤ksyÃ¤?"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:511
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2526,7 +2729,7 @@ msgstr ""
 "Ongelma varmenteessa: %s\n"
 "MyÃ¶ntÃ¤jÃ¤: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:563
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2535,7 +2738,7 @@ msgstr ""
 "Virheellinen varmenteen alue: %s\n"
 "MyÃ¶ntÃ¤jÃ¤ %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:581
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2544,7 +2747,7 @@ msgstr ""
 "Varmenne vanhentunut: %s\n"
 "MyÃ¶ntÃ¤jÃ¤: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:598
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2553,50 +2756,51 @@ msgstr ""
 "Varmenteiden hylkÃ¤yslista vanhentunut: %s\n"
 "MyÃ¶ntÃ¤jÃ¤: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URLia \"%s\" ei voi tulkita"
 
-#: ../camel/camel-vee-folder.c:580
-#, c-format
-msgid "Error storing '%s': %s"
+#: ../camel/camel-vee-folder.c:1045
+#, fuzzy, c-format
+msgid "Error storing '%s': "
 msgstr "Virhe tallennettaessa \"%s\": %s"
 
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:1118
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ViestiÃ¤ %s ei voitu lÃ¶ytÃ¤Ã¤ %s:stÃ¤"
 
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
+#: ../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-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "Ei vastaavaa"
 
-#: ../camel/camel-vee-store.c:400
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
-
-#: ../camel/camel-vee-store.c:422
+#: ../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-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:289
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
+
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ViestejÃ¤ ei voi kopioida roskakoriin"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ViestejÃ¤ ei voi kopioida roskapostikansioon"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2605,236 +2809,232 @@ msgstr ""
 "ViestiÃ¤ ei voi hakea: %s\n"
 " %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:255
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:216
+#: ../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:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "KÃ¤yttÃ¤jÃ¤ perui"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
-#, c-format
-msgid "Cannot get message %s: %s"
+#: ../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"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2672
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "TÃ¤mÃ¤ viesti ei ole saatavilla yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
+#: ../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
+#, c-format
 msgid "Could not get message"
 msgstr "ViestiÃ¤ ei voitu hakea"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../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/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1144
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "EtsitÃ¤Ã¤n poistettuja viestejÃ¤ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
-msgid "Trash Folder Full. Please Empty."
-msgstr "Roskakori on tÃ¤ynnÃ¤, poista sieltÃ¤ viestejÃ¤."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../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
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Haetaan yhteenvetoa uusista viesteistÃ¤ kansiossa %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2502
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2552
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ViestiÃ¤ ei voi lisÃ¤tÃ¤ kansioon  \"%s\": %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ViestiÃ¤ ei voi luoda: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Kansion %s sÃ¤iliÃ¶tÃ¤ ei voitu hakea"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, 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"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+#, 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:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../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:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../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:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../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:61
+#: ../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:63
+#: ../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:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../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:67
+#: ../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:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP-asetukset"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../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:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "Novell Groupwise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../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:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../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"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../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/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr "Verkkonimi tai kÃ¤yttÃ¤jÃ¤ ei ole mÃ¤Ã¤ritelty URLissa"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:2992
+#, c-format
 msgid "You did not enter a password."
 msgstr "Et antanut salasanaa."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../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"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../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
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Groupwise-kansioita ei voi luoda yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../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/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
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ylempi kansio ei voi sisÃ¤ltÃ¤Ã¤ alikansioita"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Groupwise-kansiota \"%s\" ei voi nimetÃ¤ uudelleen nimelle \"%s\""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "Groupwise-palvelin %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "Groupwise-palvelu kÃ¤yttÃ¤jÃ¤lle %s palvelimella %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "GroupWise-postinvÃ¤litys %s:n kautta"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
 msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:217
+#: ../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 "
@@ -2844,93 +3044,36 @@ msgstr ""
 "viestien kansioon. YritÃ¤ lÃ¤hettÃ¤Ã¤ niitÃ¤ uudestaan, kun olet ensin poistanut "
 "joitakin sÃ¤hkÃ¶postiviestejÃ¤.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:219
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../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/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Haetaan uusia viestejÃ¤"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "Yhteys palvelimeen"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "KÃ¤ytÃ¤ _omaa komentoa palvelimeen yhdistÃ¤miseen"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "Komento:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Kansiot"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-msgid "_Show only subscribed folders"
-msgstr "_NÃ¤ytÃ¤ ainoastaan tilatut kansiot"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-msgid "O_verride server-supplied folder namespace"
-msgstr "Ohita pal_velimen tarjoama kansioiden nimiavaruus"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "Nimiavaruus"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "Hula-palvelinten kÃ¤yttÃ¶Ã¤ varten"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "Ota yhteys Hula-palvelimeen selvÃ¤kielistÃ¤ salasanaa kÃ¤yttÃ¤en."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../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:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../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:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
 msgstr "Toiminto keskeytetty"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../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:352
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2939,246 +3082,282 @@ msgstr ""
 "HÃ¤lytys IMAP-palvelimelta %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../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:431
+#: ../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:506
+#: ../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:712
+#: ../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:748
+#: ../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:91
+#: ../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:277
+#: ../camel/providers/imap/camel-imap-folder.c:353
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
+#: ../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:1987
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Odottamaton vastauskoodin tila \"%s\" APPEND-komennon jÃ¤lkeen"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2002
-msgid "No response on continuation after APPEND command"
-msgstr "Ei vastausta jatkolle APPEND-komennon jÃ¤lkeen"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2047
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Tapahtui tuntematon virhe APPEND-komennon aikana!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2878
-#, c-format
-msgid "Unable to retrieve message: %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:2913
+#: ../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:2914
+#: ../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:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../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:3624
+#: ../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:3632
+#: ../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:3846
+#: ../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:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
+#: ../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:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, 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:530
-#, c-format
-msgid "Failed to cache %s: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#, fuzzy, c-format
+msgid "Failed to cache message %s: "
+msgstr "Viestin %s tallennus vÃ¤limuistiin epÃ¤onnistui: %s"
+
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#, fuzzy, c-format
+msgid "Failed to cache %s: "
 msgstr "VÃ¤limuistiin tallennus epÃ¤onnistui %s: %s"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "Haetaan uusia viestejÃ¤"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "_Etsi uusia viestejÃ¤ tilatuista kansioista"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-msgid "Namespace:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Yhteys palvelimeen"
+
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "KÃ¤ytÃ¤ _omaa komentoa palvelimeen yhdistÃ¤miseen"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#, fuzzy
+msgid "Co_mmand:"
+msgstr "Komento:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Kansiot"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "_NÃ¤ytÃ¤ ainoastaan tilatut kansiot"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "Ohita pal_velimen tarjoama kansioiden nimiavaruus"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#, fuzzy
+msgid "Names_pace:"
 msgstr "Nimiavaruus:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../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/imap/camel-imap-provider.c:72
+#: ../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Ã¤"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "_Synkronoi sÃ¤hkÃ¶posti etÃ¤palvelimelta automaattisesti"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 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:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 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:437
-#: ../camel/providers/imap4/camel-imap4-store.c:210
+#: ../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:439
-#: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../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:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../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:569
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../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:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "Yhteys peruutettu"
+#: ../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"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../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
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "IMAP-palvelimeen %s yhdistÃ¤minen turvallisessa muodossa epÃ¤onnistui: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2846
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "STARTTLS laajennos ei ole kÃ¤ytettÃ¤vissÃ¤"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../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:717
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../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:865
+#: ../camel/providers/imap/camel-imap-store.c:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2682
+#, c-format
+msgid "Connection cancelled"
+msgstr "Yhteys peruutettu"
+
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2687
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Komentoon \"%s\" liittyminen epÃ¤onnistui: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../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:1305
+#: ../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:1315
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:2960
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "VarmennusmenetelmÃ¤ %s ei ole tuettu"
 
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:3030
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3189,423 +3368,164 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
+#: ../camel/providers/imapx/camel-imapx-store.c:858
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisÃ¤ltÃ¤Ã¤ merkin \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../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
 #, 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:2253
+#: ../camel/providers/imap/camel-imap-store.c:2206
+#: ../camel/providers/imapx/camel-imapx-store.c:869
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ylempi kansio on tuntematon: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3053
+#: ../camel/providers/imap/camel-imap-store.c:3062
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Palvelin katkaisi yhteyden odottamatta"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Komennon lÃ¤hetys IMAP-palvelimelle %s epÃ¤onnistui: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Odottamaton vastaus IMAP-palvelimelta %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Odottamaton tervehdys IMAP-palvelimelta %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Kansiota \"%s\" ei voi valita: virheellinen kansion nimi"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Kansiota \"%s\" ei voi valita: virheellinen komento"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Komentoa ei voitu lÃ¤hettÃ¤Ã¤ IMAP-palvelimelle %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "Palvelu ei ole saatavilla"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Palvelin %s katkaisi yhteyden odottamatta: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-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"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Vanhenna vÃ¤limuistin viestit, joita ei ole luettu X sekuntiin"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "Vanhenna vÃ¤limuistin viestit, jotka ovat vanhempia kuin X sekuntia"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Kansiota \"%s\" ei voi avata: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Kansion \"%s\" lipukkeita ei voi synkronisoida: tuntematon virhe"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Kansion \"%s\" lipukkeita ei voi synkronisoida: virheellinen komento"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Kansion \"%s\" poistettuja viestejÃ¤ ei voi siivota: tuntematon virhe"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Kansion \"%s\" poistettuja viestejÃ¤ ei siivota: virheellinen komento"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "ViestiÃ¤ %s kansiosta \"%s\" ei voi hakea: viestiÃ¤ ei ole olemassa"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "ViestiÃ¤ %s kansiosta \"%s\" ei voi hakea: virheellinen komento"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "kansioon \"%s\" ei voi lisÃ¤tÃ¤ viestiÃ¤: kansio on kirjoitussuojattu"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "ViestiÃ¤ ei voi lisÃ¤tÃ¤ kansioon \"%s\": tuntematon virhe"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "ViestiÃ¤ ei voi lisÃ¤tÃ¤ kansioon \"%s\": virheellinen kÃ¤sky"
+#: ../camel/providers/imap/camel-imap-store.c:3065
+#, fuzzy
+msgid "Server unexpectedly disconnected: "
+msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+msgid "Could not create folder summary for %s"
 msgstr ""
-"ViestejÃ¤ ei voi siirtÃ¤Ã¤ kansiosta \"%s\" kansioon \"%s\": Tuntematon virhe"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr ""
-"ViestejÃ¤ ei voi kopioida kansiosta \"%s\" kansioon \"%s\": Tuntematon virhe"
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#, fuzzy, c-format
+msgid "Could not create cache for %s: "
+msgstr "VÃ¤limuistitiedostoa ei voitu luoda"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
 msgstr ""
-"ViestejÃ¤ ei voi siirtÃ¤Ã¤ kansiosta \"%s\" kansioon \"%s\": Virheellinen "
-"komento"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
 msgstr ""
-"ViestejÃ¤ ei voi kopioida kansiosta \"%s\" kansioon \"%s\": Virheellinen "
-"komento"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "_Etsi roskapostia uusista viesteistÃ¤"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Etsi roskapostia vain Saapuvan postin kansiosta"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "SÃ¤hkÃ¶postien luku ja tallennus IMAPv4rev1-palvelimilta."
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Ota yhteys IMAPv4rev1-palvelimeen selvÃ¤kielistÃ¤ salasanaa kÃ¤yttÃ¤en."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "Yhteys peruutettu"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-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Ã¤"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-msgid "TLS negotiations failed"
-msgstr "TLS-kÃ¤ttely epÃ¤onnistui"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "YhdistÃ¤minen POP-palvelimeen %s menetelmÃ¤llÃ¤ %s epÃ¤onnistui"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Tunnistautuminen IMAP-palvelimelle %s epÃ¤onnistui menetelmÃ¤llÃ¤ %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "IMAP-kansioita ei voi luoda yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Kansiota \"%s\" IMAP-palvelimelta %s ei voi hakea: tuntematon virhe"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "LIST-tulosta kansiolle \"%s\" IMAP-palvelimella %s ei saatu: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "Virheellinen komento"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Kansiota \"%s\" ei voi luoda: virheellinen kansion nimi"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Kansiota \"%s\" ei voi luoda: Virheellinen komento"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Kansiota \"%s\" ei voi poistaa: erikoiskansio"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "IMAP-kansioita ei voi poistaa yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Kansiota \"%s\" ei voi poistaa: virheellinen kansion nimi"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Kansiota \"%s\" ei voi poistaa: virheellinen komento"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Kansiota \"%s\" ei voi nimetÃ¤ uudestaan nimelle \"%s\": erikoiskansio"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "IMAP-kansioita ei voi uudelleennimetÃ¤ yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Komento:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
 msgstr ""
-"Kansiota \"%s\" ei voi nimetÃ¤ nimelle \"%s\": virheellinen kansion nimi"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Kansiota \"%s\" ei voi nimelle \"%s\": virheellinen komento"
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-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"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "IMAP-kansioita ei voi tilata yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Kansiota \"%s\" ei voi tilata: virheellinen kansion nimi"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Nimiavaruus:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Kansiota \"%s\" ei voi tilata: virheellinen komento"
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "IMAP-kansion tilausta ei voi perua yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
+#: ../camel/providers/imapx/camel-imapx-server.c:1384
+#, fuzzy
+msgid "Error writing to cache stream: "
+msgstr "Virhe kirjoitettaessa vÃ¤liaikaista viestitiedostoa: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Kansion \"%s\" tilausta ei voi perua: virheellinen kansion nimi"
+#: ../camel/providers/imapx/camel-imapx-server.c:2039
+#, fuzzy, c-format
+msgid "Not authenticated"
+msgstr "Tunnistautuminen epÃ¤onnistui.\n"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Kansion \"%s\" tilausta ei voi perua: virheellinen komento"
+#: ../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/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "EtsitÃ¤Ã¤n muuttuneita viestejÃ¤"
+#: ../camel/providers/imapx/camel-imapx-server.c:3202
+#, fuzzy
+msgid "Closing tmp stream failed: "
+msgstr "Postitus epÃ¤onnistui: %s"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP-palvelin %s on epÃ¤yhtenÃ¤isessÃ¤ tilassa."
+#: ../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/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "Noudetaan uusien viestien kuoria"
+#: ../camel/providers/imapx/camel-imapx-server.c:5099
+#, fuzzy
+msgid "Cannot create spool file: "
+msgstr "ViestiÃ¤ ei voi luoda: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-store.c:432
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Odottamaton merkki IMAP-palvelimen %s vastauksessa:"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "Ei tietoja"
+msgid "No such folder: %s"
+msgstr "Kansiota ei ole: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+#: ../camel/providers/imapx/camel-imapx-stream.c:68
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP-palvelin %s katkaisi yhteyden odottamatta: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "ViestisÃ¤ilÃ¶"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-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"
+msgid "Source stream returned no data"
 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"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
-#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "YhteyttÃ¤ %s porttiin %s ei voitu luoda: %s"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:348
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "YhdistÃ¤minen POP-palvelimeen %s epÃ¤onnistui"
 
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "Indeksoi viestin rungon tiedot"
+#: ../camel/providers/imapx/camel-imapx-stream.c:77
+#, fuzzy, c-format
+msgid "Source stream unavailable"
+msgstr "Palvelu ei ole saatavilla"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "postilaatikko: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:272
+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-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_KÃ¤ytÃ¤ kansioissa '.folders'-yhteenvetotiedostoja (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-muotoisia sÃ¤hkÃ¶postihakemistoja"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 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:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "Paikallinen toimitus"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3613,29 +3533,29 @@ msgstr ""
 "SÃ¤hkÃ¶postin siirto paikallisista mbox-muotoisista saapuvien kansioista "
 "Evolutionin hallinnoimiin kansioihin."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_KÃ¤ytÃ¤ suodattimia uusille viesteille saapuvien kansiossa"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "Maildir-muotoisia sÃ¤hkÃ¶postikansioita"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr "SÃ¤hkÃ¶postin tallennus maildir-muotoisiin hakemistoihin paikallisesti."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Tallenna tila-otsakkeet Elm/Pine/Mutt-muodossa"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "Tavallinen Unixin mbox-kansio"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../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."
@@ -3644,145 +3564,135 @@ msgstr ""
 "sÃ¤hkÃ¶postitiedostoihin.\n"
 "TÃ¤llÃ¤ voidaan myÃ¶s lukea hakemisto Elm, Pine tai Mutt-tyylisiÃ¤ kansioita."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "Tavallinen Unixin mbox-muotoinen saapuvien hakemisto"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:128
+#: ../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
 #, 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:172
+#: ../camel/providers/local/camel-local-store.c:158
 #, 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:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:169
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:193
+#, 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:247
+#: ../camel/providers/local/camel-local-store.c:250
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:358
 #, 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:410
+#: ../camel/providers/local/camel-local-store.c:431
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "UudelleennimeÃ¤minen epÃ¤onnistui \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../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:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../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:515
+#: ../camel/providers/local/camel-local-summary.c:537
+#, 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:229
-msgid "Maildir append message canceled"
-msgstr "Maildir-kansioon lisÃ¤ys keskeytettiin"
-
-#: ../camel/providers/local/camel-maildir-folder.c:232
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
+#: ../camel/providers/local/camel-maildir-folder.c:195
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %s: "
 msgstr "ViestiÃ¤ ei voi lisÃ¤tÃ¤ maildir-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:254
-#: ../camel/providers/local/camel-maildir-folder.c:280
-#: ../camel/providers/local/camel-maildir-folder.c:294
-#: ../camel/providers/local/camel-maildir-folder.c:303
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:215
-#: ../camel/providers/local/camel-mh-folder.c:226
+#: ../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
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder %s: "
 msgstr ""
 "Viestin %s hakeminen kansiosta %s epÃ¤onnistui\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:304
-msgid "Invalid message contents"
-msgstr "Virheellinen viestin sisÃ¤ltÃ¶"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, fuzzy, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "ViestiÃ¤ ei voi lisÃ¤tÃ¤ maildir-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../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
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi hakea: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
 #: ../camel/providers/local/camel-mh-store.c:224
 #, 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:189
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, 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:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, 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:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-kansiota ei voi avata: %s: %s"
@@ -3791,60 +3701,52 @@ msgstr "Maildir-kansiota ei voi avata: %s: %s"
 msgid "Checking folder consistency"
 msgstr "Tarkastetaan kansion yhdenmukaisuutta"
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
 msgstr "EtsitÃ¤Ã¤n uusia viestejÃ¤"
 
-#: ../camel/providers/local/camel-maildir-summary.c:744
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:708
-#: ../camel/providers/local/camel-mbox-summary.c:828
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../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-spool-summary.c:130
 msgid "Storing folder"
 msgstr "Tallennetaan kansiota"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../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:231
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
+#: ../camel/providers/local/camel-mbox-folder.c:194
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: "
 msgstr "SÃ¤hkÃ¶postilaatikkoa ei voi avata: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "SÃ¤hkÃ¶postin lisÃ¤ys keskeytetty"
-
-#: ../camel/providers/local/camel-mbox-folder.c:300
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
+#: ../camel/providers/local/camel-mbox-folder.c:260
+#, fuzzy, c-format
+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:466
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Kansio nÃ¤yttÃ¤isi olevan peruuttamattomasti vaurioitunut."
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:236
-msgid "Message construction failed."
-msgstr "Viestin luominen epÃ¤onnistui."
-
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, 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:198
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, 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:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:218
+#: ../camel/providers/local/camel-mbox-store.c:231
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3853,164 +3755,168 @@ msgstr ""
 "Kansiota \"%s\" ei voitu poistaa:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "\"%s\" ei ole tavallinen tiedosto."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:250
 #, 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:288
+#: ../camel/providers/local/camel-mbox-store.c:290
 #, 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:378
+#: ../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:392
+#: ../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:394
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "Kansio on jo olemassa"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
 msgstr "Kansion nimi ei ole sallittu."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, 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:579
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, 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:532
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kansiota ei voitu avata: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:533
+#, fuzzy, c-format
+msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "Vakava sÃ¤hkÃ¶postin kÃ¤sittelyvirhe kohdassa %ld kansiossa %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:645
+#: ../camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion tarkistus ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:713
-#: ../camel/providers/local/camel-mbox-summary.c:833
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../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:725
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../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:738
-#: ../camel/providers/local/camel-mbox-summary.c:942
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:932
 #, 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:747
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "VÃ¤liaikaiskansiota ei voitu sulkea: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:762
+#: ../camel/providers/local/camel-mbox-summary.c:743
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kansiota ei voitu uudelleen nimetÃ¤: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:844
-#: ../camel/providers/local/camel-mbox-summary.c:1069
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1070
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kansiota ei voitu tallentaa: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:883
-#: ../camel/providers/local/camel-mbox-summary.c:891
-#: ../camel/providers/local/camel-mbox-summary.c:1099
-#: ../camel/providers/local/camel-mbox-summary.c:1107
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1102
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+
+#: ../camel/providers/local/camel-mbox-summary.c:878
+#: ../camel/providers/local/camel-mbox-summary.c:1111
+#, 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:1032
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1175
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../camel/providers/local/camel-mbox-summary.c:1181
+#: ../camel/providers/local/camel-mbox-summary.c:1211
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "VÃ¤liaikaiseen postikansioon kirjoitus epÃ¤onnistui: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1192
+#: ../camel/providers/local/camel-mbox-summary.c:1200
 #, 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:181
-msgid "MH append message canceled"
-msgstr "Viestin lisÃ¤ys MH-kansioon peruttiin"
-
-#: ../camel/providers/local/camel-mh-folder.c:184
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
+#: ../camel/providers/local/camel-mh-folder.c:165
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: "
 msgstr "ViestiÃ¤ ei voi liittÃ¤Ã¤ MH-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:248
 #, 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:240
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, 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:134
+#: ../camel/providers/local/camel-spool-store.c:118
 #, 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:146
+#: ../camel/providers/local/camel-spool-store.c:132
 #, 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:165
+#: ../camel/providers/local/camel-spool-store.c:158
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Kansiota \"%s/%s\" ei ole olemassa."
 
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4019,12 +3925,12 @@ msgstr ""
 "Kansiota \"%s\" ei voi avata:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Kansiota \"%s\" ei ole olemassa."
 
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4033,97 +3939,116 @@ msgstr ""
 "Kansiota \"%s\" ei voi luoda:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "\"%s\" ei ole mailbox-muotoinen tiedosto."
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Kansio ei tue INBOXia"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../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:221
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "SÃ¤hkÃ¶postilÃ¤hde %s"
 
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Saapuvan sÃ¤hkÃ¶postin kansioita ei voi uudelleennimetÃ¤"
 
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../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:180
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
 #: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
-#, c-format
-msgid "Could not sync temporary folder %s: %s"
+#, fuzzy, c-format
+msgid "Could not synchronize temporary folder %s: %s"
 msgstr "VÃ¤liaikaishakemistoa %s ei voitu synkronoida: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
-#, c-format
-msgid "Could not sync spool folder %s: %s"
+#: ../camel/providers/local/camel-spool-summary.c:208
+#, fuzzy, c-format
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "Saapuvan sÃ¤hkÃ¶postin kansion virkistys epÃ¤onnistui %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
-#, c-format
+#: ../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 sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "SÃ¤hkÃ¶postiviestien kansiota %s ei voi synkronoida: %s\n"
 "Kansio saattaa olla vaurioitunut, kopio tallennettu tiedostoon \"%s\""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, 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:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../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
+#, 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
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Postitus epÃ¤onnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#, fuzzy
+msgid "Posting failed: "
+msgstr "Postitus epÃ¤onnistui: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, 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:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, 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:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 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:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "NÃ¤ytÃ¤ _tilauslomakkeessa suhteelliset kansionimet"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "KeskusteluryhmÃ¤t"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 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:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4131,22 +4056,22 @@ msgstr ""
 "TÃ¤mÃ¤ vaihtoehto tunnistautuu NNTP-palvelimelle kÃ¤yttÃ¤en selvÃ¤kielistÃ¤ "
 "salasanaa."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
-#, c-format
-msgid "Could not read greeting from %s: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:265
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: "
 msgstr "TervehdystÃ¤ %s:stÃ¤ ei voitu lukea: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP-paveline %s palautti virhekoodin %d: %s"
+msgstr "NNTP-palvelin %s palautti virhekoodin %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:434
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET uutisryhmÃ¤t palvelimelta %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:927
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4157,7 +4082,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4167,7 +4093,8 @@ msgstr ""
 "\n"
 "UutisryhmÃ¤Ã¤ ei ole olemassa. Valittu kohta on luultavasti ylempi kansio."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4177,123 +4104,123 @@ msgstr ""
 "\n"
 "UutisryhmÃ¤Ã¤ ei ole olemassa!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#, 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:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#, 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:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Et voi poistaa kansiota uutisryhmistÃ¤: lopeta sen sijaan ryhmÃ¤n tilaaminen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid "Authentication requested but no username provided"
 msgstr "Todennus vaaditaan, mutta kÃ¤yttÃ¤jÃ¤tunnusta ei annettu"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Tunnistautuminen palvelimelle epÃ¤onnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
+#, fuzzy
+msgid "NNTP Command failed: "
 msgstr "NNTP-komento epÃ¤onnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#, c-format
 msgid "Not connected."
 msgstr "Ei yhteyttÃ¤."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "Kansiota ei ole: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Etsii uusia viestejÃ¤"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Odottamaton palvelimen vastaus xover:ilta: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Odottamaton palvelimen vastaus head:ilta: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "KÃ¤ytÃ¤ perumista"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Toiminto epÃ¤onnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../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:314
+#: ../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:322
+#: ../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:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, 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:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestiÃ¤ %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+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:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "Poista %s pÃ¤ivÃ¤n kuluttua"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "Poista _kÃ¤ytÃ¶stÃ¤ tuki POP3-laajennoksille"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 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:76
+#: ../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."
@@ -4301,7 +4228,7 @@ msgstr ""
 "tÃ¤mÃ¤ vaihtoehto yhdistÃ¤Ã¤ POP-palvelimeen selvÃ¤kielisellÃ¤ salasanalla. TÃ¤mÃ¤ "
 "on ainoa tapa, jota monet POP-palvelimet tukevat."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../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 "
@@ -4311,34 +4238,43 @@ msgstr ""
 "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-store.c:207
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-store.c:168
 #, 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:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
 #, 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:225
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 msgid "STLS not supported by server"
 msgstr "Palvelin ei tue STLS-laajennosta"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:205
+#, 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:361
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui: %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../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 "
@@ -4347,22 +4283,23 @@ msgstr ""
 "YhdistÃ¤minen POP-palvelimeen %s  epÃ¤onnistui: pyydettyÃ¤ "
 "tunnistautumismenetelmÃ¤Ã¤ ei tueta."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#. 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 "SASL \"%s\"-kirjautuminen POP-palvelimelle %s epÃ¤onnistui: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, 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:449
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:357
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: "
 msgstr "Tunnistautuminen POP-palvelimelle %s epÃ¤onnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:421
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4371,8 +4308,7 @@ msgstr ""
 "POP-palvelimeen %s ei saatu yhteyttÃ¤:\tVastaanotettiin virheellinen APOP-"
 "tunniste. Voidaan epÃ¤illÃ¤ yhteyden kaappaamista, ota yhteyttÃ¤ yllÃ¤pitÃ¤jÃ¤Ã¤si."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4381,25 +4317,52 @@ msgstr ""
 "YhdistÃ¤minen POP-palvelimeen epÃ¤onnistui: %s\n"
 "Virhe lÃ¤hetettÃ¤essÃ¤ salasanaa: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
-"YhdistÃ¤minen POP-palvelimeen %s epÃ¤onnistui.\n"
-"Virhe lÃ¤hetettÃ¤essÃ¤ salasanaa: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:497
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-store.c:653
+#, 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
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Kansiota \"%s\" ei ole olemassa."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:709
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4407,178 +4370,184 @@ msgstr ""
 "Postin lÃ¤hettÃ¤minen siirtÃ¤mÃ¤llÃ¤ se \"sendmail\"-ohjelmalle paikallisessa "
 "jÃ¤rjestelmÃ¤ssÃ¤."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "Vastaanottajalistan tulkitseminen epÃ¤onnistui"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, 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:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, 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:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#, fuzzy
+msgid "Could not send message: "
+msgstr "Viestin lÃ¤hettÃ¤minen epÃ¤onnistui: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, 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:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, 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:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, 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:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../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:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 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:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksivirhe, tuntematon komento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../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-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
 msgstr "Komentoa ei ole toteutettu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../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:175
+#: ../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:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "Ohjeviesti"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
 msgstr "Palvelu valmis"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr "Palvelu sulkee siirtokanavaa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../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:185
+#: ../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:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 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:189
+#: ../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:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "PyydettyÃ¤ toimenpidettÃ¤ ei suoritettu: postilaatikko ei kÃ¤ytettÃ¤vissÃ¤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "Pyydetty toimenpide keskeytetty: virhe kÃ¤sittelyssÃ¤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 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:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 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:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "PyydettyÃ¤ toimenpidettÃ¤ ei suoritettu: varattu levytila ylitetty"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "PyydettyÃ¤ toimenpidettÃ¤ ei suoritettu: postilaatikon nimi ei ole sallittu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Aloita sÃ¤hkÃ¶postin kirjoittaminen: lopeta <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Transaction failed"
 msgstr "Tapahtuma epÃ¤onnistui"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "Vaaditaan salasanatransaktio"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
 msgstr "TodennusmenetelmÃ¤ on liian heikko"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pyydetty todennusmenetelmÃ¤ vaatii salausta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
 msgstr "VÃ¤liaikainen todennusvirhe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
+#: ../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:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../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:340
-#, c-format
-msgid "STARTTLS command failed: %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:355
-msgid "STARTTLS command failed"
-msgstr "Komento STARTTLS epÃ¤onnistui"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../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:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4589,202 +4558,189 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../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:702
+#: ../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:720
+#: ../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:726
+#: ../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:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Sending message"
 msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../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:756
+#: ../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:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:966
 msgid "SMTP Greeting"
 msgstr "SMTP tervehdys"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:990
+#: ../camel/providers/smtp/camel-smtp-transport.c:1005
+#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+#, fuzzy
+msgid "HELO command failed: "
 msgstr "Komento HELO epÃ¤onnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "Komento HELO epÃ¤onnistui"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1079
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../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:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
+#: ../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:1133
-msgid "AUTH command failed"
-msgstr "Komento AUTH epÃ¤onnistui"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "Virheellinen todennusvastaus palvelimelta.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Komento MAIL FROM epÃ¤onnistui: : %s: sÃ¤hkÃ¶postia ei lÃ¤hetetty"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1219
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+#, fuzzy
+msgid "MAIL FROM command failed: "
 msgstr "Komento MAIL FROM epÃ¤onnistui"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Komento RCPT TO epÃ¤onnistui: %s: sÃ¤hkÃ¶postia ei lÃ¤hetetty"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1261
+#, fuzzy
+msgid "RCPT TO command failed: "
+msgstr "Komento RSET epÃ¤onnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+#: ../camel/providers/smtp/camel-smtp-transport.c:1283
+#, fuzzy, c-format
+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:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Komento DATA epÃ¤onnistui: %s: sÃ¤hkÃ¶postia ei lÃ¤hetetty"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
+#: ../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
+#, fuzzy
+msgid "DATA command failed: "
 msgstr "Komento DATA epÃ¤onnistui"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1453
+#: ../camel/providers/smtp/camel-smtp-transport.c:1465
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#, fuzzy
+msgid "RSET command failed: "
 msgstr "Komento RSET epÃ¤onnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "Komento RSET epÃ¤onnistui"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %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
+#, fuzzy
+msgid "QUIT command failed: "
 msgstr "Komento QUIT epÃ¤onnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "Komento QUIT epÃ¤onnistui"
-
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:46
 msgid "Business"
 msgstr "TyÃ¶"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgid "Competition"
 msgstr "Kilpailu"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgid "Favorites"
 msgstr "Suosikit"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgid "Gifts"
 msgstr "Lahjat"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgid "Goals/Objectives"
 msgstr "Tavoitteet/Kohteet"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday"
 msgstr "Loma"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday Cards"
 msgstr "Lomakortit"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgid "Hot Contacts"
 msgstr "Kuumat yhteystiedot"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:55
 msgid "Ideas"
 msgstr "Ideat"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgid "International"
 msgstr "KansainvÃ¤linen"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgid "Key Customer"
 msgstr "Avainasiakas"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgid "Personal"
 msgstr "HenkilÃ¶kohtainen"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgid "Phone Calls"
 msgstr "Puhelut"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgid "Status"
 msgstr "Tila"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:63
 msgid "Strategies"
 msgstr "Strategiat"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgid "Suppliers"
 msgstr "Hankkijat"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgid "Time & Expenses"
 msgstr "Aika ja kulut"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgid "Waiting"
 msgstr "Odotetaan"
 
@@ -4792,7 +4748,7 @@ msgstr "Odotetaan"
 #. 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:1900
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %I.%M.%S %p"
 
@@ -4800,7 +4756,7 @@ msgstr "%a %d.%m.%Y %I.%M.%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
@@ -4808,7 +4764,7 @@ msgstr "%a %d.%m.%Y %H.%M.%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %I.%M %p"
 
@@ -4816,7 +4772,7 @@ msgstr "%a %d.%m.%Y %I.%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
 
@@ -4834,8 +4790,8 @@ 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:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -4875,19 +4831,19 @@ 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:1766
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 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:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 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:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
@@ -4895,201 +4851,198 @@ msgstr "%H.%M.%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 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:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 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:1840
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../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:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:430
 msgid "Failed to authenticate.\n"
 msgstr "Tunnistautuminen epÃ¤onnistui.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:327
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "Luokan kuvake"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+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Ã¤"
 
-#: ../libedataserverui/e-categories-dialog.c:618
+#: ../libedataserverui/e-categories-dialog.c:676
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../libedataserverui/e-categories-dialog.c:623
+#: ../libedataserverui/e-categories-dialog.c:681
 msgid "Category"
 msgstr "Luokka"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "Luokan kuvake"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "Luokan ominaisuudet"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "Luokan _kuvake"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "Luokan _nimi"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Kuuluu nÃ¤ihin _luokkiin:"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Currently _used categories:"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "_Saatavilla olevat luokat:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "luokat"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Luo luokka \"%s\""
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "VÃ¤ritietot"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "EsitettÃ¤vÃ¤ vÃ¤ri"
-
-#: ../libedataserverui/e-name-selector-dialog.c:276
+#: ../libedataserverui/e-name-selector-dialog.c:321
 msgid "Select Contacts from Address Book"
 msgstr "Valitse yhteystiedot osoitekirjasta"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
+#: ../libedataserverui/e-name-selector-dialog.c:660
 msgid "_Add"
 msgstr "_LisÃ¤Ã¤"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
+#: ../libedataserverui/e-name-selector-dialog.c:664
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:892
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "MikÃ¤ tahansa luokka"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
 msgid "*"
 msgstr "*"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
 msgid "<b>Co_ntacts</b>"
 msgstr "<b>_Yhteystiedot</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>NÃ¤ytÃ¤ yhteystiedot</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
 msgid "Address B_ook:"
 msgstr "_Osoitekirja:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "L_uokka:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
 msgid "_Search:"
 msgstr "_Etsi:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2455
+#: ../libedataserverui/e-name-selector-entry.c:2639
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "L_aajenna %s sisÃ¤kkÃ¤isesti"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
+#: ../libedataserverui/e-name-selector-entry.c:2654
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopioi %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
+#: ../libedataserverui/e-name-selector-entry.c:2664
 #, c-format
 msgid "C_ut %s"
 msgstr "_Leikkaa %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
+#: ../libedataserverui/e-name-selector-entry.c:2681
 #, c-format
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:516
 #, c-format
 msgid "_Delete %s"
 msgstr "_Poista %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 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"
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1120
 msgid "You have the Caps Lock key on."
 msgstr "CapsLock-nÃ¤ppÃ¤in on pÃ¤Ã¤llÃ¤."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1243
 msgid "_Remember this passphrase"
 msgstr "_Muista tÃ¤mÃ¤ salasana"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Muista salasana tÃ¤mÃ¤n istunnon loppuun asti"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1249
 msgid "_Remember this password"
 msgstr "_Muista tÃ¤mÃ¤ salasana"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1250
 msgid "_Remember this password for the remainder of this session"
 msgstr "Muista salasana tÃ¤mÃ¤n istunnon loppuun asti"
 
@@ -5098,353 +5051,654 @@ msgstr "Muista salasana tÃ¤mÃ¤n istunnon loppuun asti"
 msgid "Select destination"
 msgstr "Valitse kohde"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:174
 msgid "_Destination"
 msgstr "_Kohde"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "SyÃ¶tÃ¤ salasana tilille %s"
+#: ../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/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-msgid "Enter password"
-msgstr "SyÃ¶tÃ¤ salasana"
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "Ei vastausta palvelimelta"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "Omistaja"
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "Virheellinen parametri"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "Julkaisun toimittaja"
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "Deltojen hakuun ei voitu luoda sÃ¤iettÃ¤"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "Toimittaja"
+#~ msgid "Offline mode unavailable"
+#~ msgstr "YhteydetÃ¶n tila ei saatavilla"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "Julkaisun tekijÃ¤"
+#~ msgid "Cannot open message"
+#~ msgstr "ViestiÃ¤ ei voi avata"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "TekijÃ¤"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Toiminto ei ole tuettu: lisÃ¤Ã¤ viesti: %s:lle"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "Ei-muokkaava tekijÃ¤"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Toiminto ei ole tuettu: hae lausekkeella: %s"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "Tarkastaja"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Toiminto ei ole tuettu: lukumÃ¤Ã¤rÃ¤ lausekkeella: %s"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "Avustaja"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "Toiminto ei ole tuettu: haku UID:n perusteella: %s"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "Ei mitÃ¤Ã¤n"
+#~ msgid "Learning junk"
+#~ msgstr "Opitaan roskapostia"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "Itse mÃ¤Ã¤ritelty"
+#~ msgid "Learning non-junk"
+#~ msgstr "Opitaan ei-roskapostia"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "Yleinen virhe"
+#~ msgid "Canceled."
+#~ msgstr "Peruttu."
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "Samanniminen kansio on jo olemassa"
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "Viestin allekirjoitusta ei voi varmentaa: vÃ¤liaikaistiedostoa ei voitu "
+#~ "luoda: %s"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "Annettu kansiotyyppi ei ole kelvollinen"
+#~ msgid "Unable to parse message content"
+#~ msgstr "Viestin sisÃ¤ltÃ¶Ã¤ ei voitu tulkita"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O-virhe"
+#~ msgid "cannot create thread"
+#~ msgstr "sÃ¤iettÃ¤ ei voi luoda"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "Kansion luontiin ei ole riittÃ¤vÃ¤sti tilaa"
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel-istunto ei tue viestin edelleenlÃ¤hetystÃ¤."
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "Kansio ei ole tyhjÃ¤"
+#~ msgid "import keys: unimplemented"
+#~ msgstr "tuo avaimia; ei toteutettu"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "KysyttyÃ¤ kansiota ei lÃ¶ydy"
+#~ msgid "export keys: unimplemented"
+#~ msgstr "vie avaimet ei ole toteutettu"
 
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "TÃ¤mÃ¤ sÃ¤ilÃ¶ ei toteuta tÃ¤tÃ¤ funktiota"
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr ""
+#~ "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "Toiminto ei ole tuettu"
+#~ msgid "User canceled"
+#~ msgstr "KÃ¤yttÃ¤jÃ¤ perui"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "TÃ¤mÃ¤ sÃ¤ilÃ¶ ei tue annettua tyyppiÃ¤"
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "Roskakori on tÃ¤ynnÃ¤, poista sieltÃ¤ viestejÃ¤."
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "PyydettyÃ¤ kansiota ei voi muokata tai poistaa"
+#~ msgid "Hula"
+#~ msgstr "Hula"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Kansiota ei voi siirtÃ¤Ã¤ omaan alikansioonsa"
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Hula-palvelinten kÃ¤yttÃ¶Ã¤ varten"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "TÃ¤mÃ¤nnimistÃ¤ kansiota ei voi luoda"
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr "Ota yhteys Hula-palvelimeen selvÃ¤kielistÃ¤ salasanaa kÃ¤yttÃ¤en."
 
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "TÃ¤tÃ¤ toimintoa ei voi tehdÃ¤ yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "Odottamaton vastauskoodin tila \"%s\" APPEND-komennon jÃ¤lkeen"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:640
-#, c-format
-msgid "%s's Folders"
-msgstr "%s:n kansiot"
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "Ei vastausta jatkolle APPEND-komennon jÃ¤lkeen"
 
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "Omat kansiot"
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "Tapahtui tuntematon virhe APPEND-komennon aikana!"
 
-#: ../servers/exchange/storage/exchange-account.c:1275
-msgid "Favorite Public Folders"
-msgstr "Julkisten kansioiden suosikit"
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Komennon lÃ¤hetys IMAP-palvelimelle %s epÃ¤onnistui: %s"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
-msgid "All Public Folders"
-msgstr "Kaikki julkiset kansiot"
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "Odottamaton vastaus IMAP-palvelimelta %s: %s"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
-msgid "Global Address List"
-msgstr "Osoitelista"
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Odottamaton tervehdys IMAP-palvelimelta %s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Poistetut"
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "Kansiota \"%s\" ei voi valita: virheellinen kansion nimi"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Luonnokset"
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "Kansiota \"%s\" ei voi valita: virheellinen komento"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "PÃ¤ivÃ¤kirja"
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Komentoa ei voitu lÃ¤hettÃ¤Ã¤ IMAP-palvelimelle %s: %s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Huomioita"
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "Palvelin %s katkaisi yhteyden odottamatta: %s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "LÃ¤htevÃ¤t"
+#~ 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"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "LÃ¤hetetyt"
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "Vanhenna vÃ¤limuistin viestit, joita ei ole luettu X sekuntiin"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "TehtÃ¤vÃ¤t"
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "Vanhenna vÃ¤limuistin viestit, jotka ovat vanhempia kuin X sekuntia"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Virheellinen yhteys"
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "Kansiota \"%s\" ei voi avata: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "Virheellinen vastaus palvelimelta"
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "Kansion \"%s\" lipukkeita ei voi synkronisoida: tuntematon virhe"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "Ei vastausta palvelimelta"
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Kansion \"%s\" lipukkeita ei voi synkronisoida: virheellinen komento"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "Virheellinen parametri"
+#~ 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"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Evolution osoitekirjan tiedostotaustajÃ¤rjestelmÃ¤"
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "Kansiota \"%s\" ei voi tilata: virheellinen komento"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolutionin kalenterin tiedosto- ja webcal-taustajÃ¤rjestelmÃ¤"
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "IMAP-kansion tilausta ei voi perua yhteydettÃ¶mÃ¤ssÃ¤ tilassa."
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Evolution Data Serverin liittymÃ¤n tarkistuspalvelu"
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "Kansion \"%s\" tilausta ei voi perua: virheellinen kansion nimi"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Evolution Data Serverin lokituspalvelu"
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "Kansion \"%s\" tilausta ei voi perua: virheellinen komento"
 
-#~ msgid "CRL not yet valid"
-#~ msgstr "Varmenteiden hylkÃ¤yslista ei ole vielÃ¤ voimassa"
+#~ msgid "Scanning for changed messages"
+#~ msgstr "EtsitÃ¤Ã¤n muuttuneita viestejÃ¤"
 
-#~ msgid "CRL has expired"
-#~ msgstr "Varmenteiden hylkÃ¤yslista on vanhentunut"
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP-palvelin %s on epÃ¤yhtenÃ¤isessÃ¤ tilassa."
 
-#~ msgid "Error in CRL"
-#~ msgstr "Virhe CRL:ssÃ¤"
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "Noudetaan uusien viestien kuoria"
 
-#~ msgid "Sent"
+#~ 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 "Templates"
-#~ msgstr "Viestipohjat"
+#~ msgid "Outbox"
+#~ msgstr "LÃ¤htevÃ¤t"
+
+#~ msgid "Notes"
+#~ msgstr "Huomioita"
+
+#~ msgid "Journal"
+#~ msgstr "PÃ¤ivÃ¤kirja"
+
+#~ msgid "Deleted Items"
+#~ msgstr "Poistetut"
 
-#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-#~ msgstr "Tapahtui useita ohjelman kaatumisia; virheikkunaa ei voi nÃ¤yttÃ¤Ã¤\n"
+#~ msgid "Global Address List"
+#~ msgstr "Osoitelista"
 
-#~ msgid "Decoder failed, error %d"
-#~ msgstr "Purkaja epÃ¤onnistui: virhe %d"
+#~ msgid "All Public Folders"
+#~ msgstr "Kaikki julkiset kansiot"
 
-#~ msgid "Fair"
-#~ msgstr "Kohtuullista"
+#~ msgid "Favorite Public Folders"
+#~ msgstr "Julkisten kansioiden suosikit"
 
-#~ msgid "Snow showers"
-#~ msgstr "Lumituiskuja"
+#~ msgid "%s's Folders"
+#~ msgstr "%s:n kansiot"
 
-#~ msgid "Snow"
-#~ msgstr "Lunta"
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "TÃ¤tÃ¤ toimintoa ei voi tehdÃ¤ yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#~ msgid "Partly cloudy"
-#~ msgstr "PuolipilvistÃ¤"
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "TÃ¤mÃ¤nnimistÃ¤ kansiota ei voi luoda"
 
-#~ msgid "Smoke"
-#~ msgstr "Savua"
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Kansiota ei voi siirtÃ¤Ã¤ omaan alikansioonsa"
 
-#~ msgid "Thunderstorms"
-#~ msgstr "UkkosmyrskyjÃ¤"
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "TÃ¤mÃ¤ sÃ¤ilÃ¶ ei tue annettua tyyppiÃ¤"
 
-#~ msgid "Cloudy"
-#~ msgstr "PilvistÃ¤"
+#~ msgid "Operation not supported"
+#~ msgstr "Toiminto ei ole tuettu"
 
-#~ msgid "Drizzle"
-#~ msgstr "Tihkusadetta"
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "TÃ¤mÃ¤ sÃ¤ilÃ¶ ei toteuta tÃ¤tÃ¤ funktiota"
 
-#~ msgid "Sunny"
-#~ msgstr "Aurinkoista"
+#~ msgid "The specified folder was not found"
+#~ msgstr "KysyttyÃ¤ kansiota ei lÃ¶ydy"
 
-#~ msgid "Dust"
-#~ msgstr "PÃ¶lyÃ¤"
+#~ msgid "The folder is not empty"
+#~ msgstr "Kansio ei ole tyhjÃ¤"
 
-#~ msgid "Clear"
-#~ msgstr "Kirkasta"
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Kansion luontiin ei ole riittÃ¤vÃ¤sti tilaa"
 
-#~ msgid "Mostly cloudy"
-#~ msgstr "Melko pilvistÃ¤"
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Annettu kansiotyyppi ei ole kelvollinen"
 
-#~ msgid "Windy"
-#~ msgstr "Tuulista"
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Samanniminen kansio on jo olemassa"
 
-#~ msgid "Rain showers"
-#~ msgstr "Sadekuuroja"
+#~ msgid "Generic error"
+#~ msgstr "Yleinen virhe"
 
-#~ msgid "Foggy"
-#~ msgstr "Sumuista"
+#~ msgid "Custom"
+#~ msgstr "Itse mÃ¤Ã¤ritelty"
 
-#~ msgid "Rain/snow mixed"
-#~ msgstr "Loskakeli"
+#~ msgid "None"
+#~ msgstr "Ei mitÃ¤Ã¤n"
 
-#~ msgid "Sleet"
-#~ msgstr "RÃ¤ntÃ¤Ã¤"
+#~ msgid "Contributor"
+#~ msgstr "Avustaja"
 
-#~ msgid "Very hot/humid"
-#~ msgstr "Hyvin kuumaa ja kosteaa"
+#~ msgid "Reviewer"
+#~ msgstr "Tarkastaja"
 
-#~ msgid "Blizzard"
-#~ msgstr "Salamointia"
+#~ msgid "Non-editing Author"
+#~ msgstr "Ei-muokkaava tekijÃ¤"
 
-#~ msgid "Freezing rain"
-#~ msgstr "JÃ¤Ã¤tÃ¤vÃ¤Ã¤ sadetta"
+#~ msgid "Author"
+#~ msgstr "TekijÃ¤"
 
-#~ msgid "Haze"
-#~ msgstr "Usvaa"
+#~ msgid "Publishing Author"
+#~ msgstr "Julkaisun tekijÃ¤"
 
-#~ msgid "Blowing snow"
-#~ msgstr "LumipyryÃ¤"
+#~ msgid "Editor"
+#~ msgstr "Toimittaja"
 
-#~ msgid "Freezing drizzle"
-#~ msgstr "JÃ¤Ã¤tÃ¤vÃ¤Ã¤ tihkusadetta"
+#~ msgid "Publishing Editor"
+#~ msgstr "Julkaisun toimittaja"
 
-#~ msgid "Very cold/wind chill"
-#~ msgstr "Hyvin kylmÃ¤Ã¤ tai kylmÃ¤Ã¤ tuulista"
+#~ msgid "Owner"
+#~ msgstr "Omistaja"
 
-#~ msgid "Rain"
-#~ msgstr "Sadetta"
+#~ msgid "Enter password"
+#~ msgstr "SyÃ¶tÃ¤ salasana"
 
-#~ msgid "Weather: Partly Cloudy"
-#~ msgstr "SÃ¤Ã¤: puolipilvistÃ¤"
+#~ msgid "Enter password for %s"
+#~ msgstr "SyÃ¶tÃ¤ salasana tilille %s"
 
-#~ msgid "%.1fÂ°C - %s"
-#~ msgstr "%.1fÂ°C - %s"
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Kuuluu nÃ¤ihin _luokkiin:"
 
-#~ msgid "%.1fÂ°F - %s"
-#~ msgstr "%.1fÂ°F - %s"
+#~ 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 "%.1f/%.1fÂ°C - %s"
-#~ msgstr "%.1f/%.1fÂ°C - %s"
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "YhdistÃ¤minen POP-palvelimeen %s epÃ¤onnistui"
 
-#~ msgid "%.1f/%.1fÂ°F - %s"
-#~ msgstr "%.1f/%.1fÂ°F - %s"
+#~ 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 "%d%% chance of precipitation\n"
-#~ msgstr "%d %% todennÃ¤kÃ¶isyys sateelle\n"
+#~ msgid "Drafts"
+#~ msgstr "Luonnokset"
 
-#~ msgid "%.1fcm snow\n"
-#~ msgstr "%.1fcm lunta\n"
+#~ 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 "%.1fin snow\n"
-#~ msgstr "%.1ftuumaa lunta\n"
+#~ msgid "Error in application verification"
+#~ msgstr "Virhe kÃ¤yttÃ¶tarkoituksen varmentamisessa"
 
-#~ msgid "%.1f-%.1fcm snow\n"
-#~ msgstr "%.1f-%.1fcm lunta\n"
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "Avaimen kÃ¤yttÃ¶tarkoitus ei salli varmenteiden allekirjoitusta"
 
-#~ msgid "%.1f-%.1fin snow\n"
-#~ msgstr "%.1f-%.1ftuumaa lunta\n"
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/MyÃ¶ntÃ¤jÃ¤n sarjannumero eivÃ¤t tÃ¤smÃ¤Ã¤"
 
-#~ msgid "Failed to create create child process '%s': %s"
-#~ msgstr "Lapsiprosessin \"%s\" luominen epÃ¤onnistui: %s"
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID eivÃ¤t tÃ¤smÃ¤Ã¤"
 
-#~ msgid "Performing query on unknown header: %s"
-#~ msgstr "Kysely tuntemattomaan otsakkeeseen: %s"
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Aihe/MyÃ¶ntÃ¤jÃ¤ eivÃ¤t tÃ¤smÃ¤Ã¤"
 
-#~ msgid "Detected a corrupt mbox file or an invalid 'From' header"
-#~ msgstr "Havaittiin viallinen mbox-tiedosto tai virheellinen From-otsake"
+#~ msgid "Certificate rejected"
+#~ msgstr "Varmennetta kieltÃ¤ydyttiin kÃ¤yttÃ¤mÃ¤stÃ¤"
 
-#~ msgid "Folder %s cannot be opened: %s"
-#~ msgstr "Kansiota \"%s\" ei voi avata: %s"
+#~ 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 "Cannot find certificate for `%s'"
-#~ msgstr "Varmennetta `%s':lle ei lÃ¶ydy"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "Varmenne ei ole vielÃ¤ voimassa"
 
-#~ msgid "Folder was destroyed and recreated on server."
-#~ msgstr "Kansio oli tuhottu ja uudelleenluotu palvelimella"
+#~ 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 ""
-#~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
+#~ "This option will connect to the server using Kerberos 4 authentication."
 #~ msgstr ""
-#~ "Odottamaton vastaus palvelimelta: Viesteille %d ja %d annettiin "
-#~ "tÃ¤smÃ¤lleen samat UID:it"
+#~ "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"
 
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "Yhteenvedon tallennus epÃ¤onnistui %s: %s"
+#~ msgid "Error in Certificate Revocation List (CRL)"
+#~ msgstr "Virhe Varmenteiden hylkÃ¤yslistassa (CRL)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]