[balsa] Finnish translation update



commit 88df135647935f9ce57008b0284cd7f14073097a
Author: Lasse Liehu <lasse liehu gmail com>
Date:   Fri May 30 14:52:43 2014 +0300

    Finnish translation update

 po/fi.po | 6114 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 3475 insertions(+), 2639 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 6c18cb8..62b898b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,150 +1,183 @@
 # Finnish messages for Balsa
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Tero Pulkkinen <?>, ?
-# Antti Ahvensalmi <aahven mbnet fi>, 2001. 
-# Ilkka Tuohela <hile iki fi>, 2005-2006.
 #
 # Suomennos: http://gnome.fi/
 #
+# Antti Ahvensalmi <aahven mbnet fi>, 2001.
+# Ilkka Tuohela <hile iki fi>, 2005-2006.
+# Lasse Liehu <lasse liehu gmail com>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-15 18:03+0300\n"
-"PO-Revision-Date: 2006-12-29 11:10+0200\n"
-"Last-Translator: Ilkka Tuohela <hile iki fi>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
+"cgi?product=balsa&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-12-18 14:17+0000\n"
+"PO-Revision-Date: 2014-05-04 02:57+0300\n"
+"Last-Translator: Lasse Liehu <lasse liehu gmail com>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: ../balsa.desktop.in.h:1
+#: ../balsa.desktop.in.in.h:1 ../balsa-mailto-handler.desktop.in.in.h:1
 msgid "Balsa"
 msgstr "Balsa"
 
-#: ../balsa.desktop.in.h:2
+#: ../balsa.desktop.in.in.h:2 ../balsa-mailto-handler.desktop.in.in.h:2
 msgid "E-Mail utility"
 msgstr "Sähköpostiohjelma"
 
-#. The externq database doesn't support Id's, sorry!
-#: ../libbalsa/address-book-extern.c:210 ../libbalsa/address-book-ldap.c:494
-#: ../libbalsa/address-book-ldif.c:329
-msgid "No-Id"
-msgstr "Ei tunnusta"
-
-#: ../libbalsa/address-book-extern.c:215 ../libbalsa/address-book-extern.c:370
-#: ../libbalsa/address-book-ldap.c:500 ../libbalsa/address-book-ldif.c:309
-#: ../libbalsa/address-book-ldif.c:332 ../libbalsa/address-book-ldif.c:351
-#: ../libbalsa/address-book-ldif.c:355 ../libbalsa/address-book-vcard.c:158
-#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:393
-msgid "No-Name"
-msgstr "Nimetön"
-
-#: ../libbalsa/address-book-ldap.c:282
-msgid "SASL Interaction\n"
-msgstr "SASL-kättely\n"
+#: ../balsa.desktop.in.in.h:3 ../balsa-mailto-handler.desktop.in.in.h:3
+#, fuzzy
+#| msgid "Default Client"
+msgid "Mail Client"
+msgstr "Oletusasiakas"
 
-#: ../libbalsa/address-book-ldap.c:329
-msgid "TLS requested but not compiled in"
-msgstr "TLS-yhteyttä vaaditiin, mutta tukea ei ole käännetty mukaan"
+#: ../balsa.desktop.in.in.h:4 ../balsa-mailto-handler.desktop.in.in.h:4
+#, fuzzy
+#| msgid "The Balsa E-Mail Client"
+msgid "Balsa Mail Client"
+msgstr "Balsa-sähköpostiohjelma"
 
-#: ../libbalsa/address-book.c:315 ../libbalsa/filter-error.c:45
+#: ../libbalsa/address-book.c:314 ../libbalsa/filter-error.c:47
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: ../libbalsa/address-book.c:316
+#: ../libbalsa/address-book.c:315
 msgid "Cannot read from address book"
 msgstr "Osoitekirjasta ei voi lukea"
 
-#: ../libbalsa/address-book.c:317
+#: ../libbalsa/address-book.c:316
 msgid "Cannot write to address book"
 msgstr "Osoitekirjaan ei voi kirjoittaa"
 
-#: ../libbalsa/address-book.c:318 ../libbalsa/imap-server.c:538
-#, c-format
+#: ../libbalsa/address-book.c:317
 msgid "Cannot connect to the server"
 msgstr "Palvelimeen ei saatu yhteyttä"
 
-#: ../libbalsa/address-book.c:319
+#: ../libbalsa/address-book.c:318
 msgid "Cannot search in the address book"
 msgstr "Osoitekirjasta ei voida hakea"
 
-#: ../libbalsa/address-book.c:321
+#: ../libbalsa/address-book.c:320
 msgid "Cannot add duplicate entry"
 msgstr "Kaksoiskappaletta ei voida lisätä"
 
-#: ../libbalsa/address-book.c:323
+#: ../libbalsa/address-book.c:322
 msgid "Cannot find address in address book"
 msgstr "Osoitetta ei löydy osoitekirjasta"
 
-#: ../libbalsa/address-book.c:324 ../src/main-window.c:2150
-#: ../src/main-window.c:4295 ../src/sendmsg-window.c:4040
+#: ../libbalsa/address-book.c:323 ../src/main-window.c:2389
+#: ../src/main-window.c:4839 ../src/sendmsg-window.c:4192
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../libbalsa/address.c:920
+#. The externq database doesn't support Id's, sorry!
+#: ../libbalsa/address-book-extern.c:210 ../libbalsa/address-book-ldap.c:495
+#: ../libbalsa/address-book-ldif.c:332
+msgid "No-Id"
+msgstr "Ei tunnusta"
+
+#: ../libbalsa/address-book-extern.c:215 ../libbalsa/address-book-extern.c:370
+#: ../libbalsa/address-book-ldap.c:501 ../libbalsa/address-book-ldif.c:311
+#: ../libbalsa/address-book-ldif.c:335 ../libbalsa/address-book-ldif.c:354
+#: ../libbalsa/address-book-ldif.c:358 ../libbalsa/address-book-vcard.c:160
+#: ../libbalsa/address-book-vcard.c:258 ../libbalsa/address.c:403
+msgid "No-Name"
+msgstr "Nimetön"
+
+#: ../libbalsa/address-book-ldap.c:283
+msgid "SASL Interaction\n"
+msgstr "SASL-kättely\n"
+
+#: ../libbalsa/address-book-ldap.c:330
+msgid "TLS requested but not compiled in"
+msgstr "TLS-yhteyttä vaaditiin, mutta tukea ei ole käännetty mukaan"
+
+#: ../libbalsa/address-book-ldap.c:610
+#, fuzzy
+#| msgid "Select load program for address book"
+msgid "Undefined location of user address book"
+msgstr "Valitse ohjelma, jolla osoitekirja avataan"
+
+#: ../libbalsa/address.c:955
 msgid "D_isplayed Name:"
 msgstr "_Näytettävä nimi:"
 
-#: ../libbalsa/address.c:921
+#: ../libbalsa/address.c:956
 msgid "_First Name:"
 msgstr "_Etunimi:"
 
-#: ../libbalsa/address.c:922
+#: ../libbalsa/address.c:957
 msgid "_Last Name:"
 msgstr "_Sukunimi:"
 
-#: ../libbalsa/address.c:923
+#: ../libbalsa/address.c:958
 msgid "_Nickname:"
 msgstr "_Lempinimi:"
 
-#: ../libbalsa/address.c:924
+#: ../libbalsa/address.c:959
 msgid "O_rganization:"
 msgstr "O_rganisaatio:"
 
-#: ../libbalsa/address.c:925
+#: ../libbalsa/address.c:960
 msgid "_Email Address:"
 msgstr "_Sähköpostiosoite:"
 
 #. Right/Add button
-#: ../libbalsa/address.c:944 ../src/filter-edit-callbacks.c:1022
-#: ../src/filter-run-dialog.c:327
+#: ../libbalsa/address.c:979 ../src/filter-edit-callbacks.c:1088
+#: ../src/filter-run-dialog.c:329
 msgid "A_dd"
 msgstr "_Lisää"
 
-#: ../libbalsa/body.c:119 ../libbalsa/mailbox_local.c:1777
-#: ../libbalsa/message.c:825
-msgid "(No subject)"
-msgstr "(Ei aihetta)"
+# src/balsa-message.c#
+# 651 src/filter-edit-dialog.c:325
+#: ../libbalsa/address-view.c:129 ../src/balsa-mime-widget-message.c:738
+#: ../src/balsa-print-object-header.c:170 ../src/sendmsg-window.c:1113
+#: ../src/sendmsg-window.c:3855 ../src/store-address.c:341
+msgid "To:"
+msgstr "Vastaanottaja:"
 
-#: ../libbalsa/files.c:231
-#, c-format
-msgid "Open with %s"
-msgstr "Avaa ohjelmalla %s"
+#: ../libbalsa/address-view.c:130 ../src/balsa-mime-widget-message.c:739
+#: ../src/balsa-print-object-header.c:172 ../src/sendmsg-window.c:1113
+#: ../src/sendmsg-window.c:3863 ../src/store-address.c:342
+msgid "Cc:"
+msgstr "Kopio:"
 
-#: ../libbalsa/filter-error.c:46
-msgid "Syntax error in the filter configuration file"
-msgstr "Syntaksivirhe suodattimen asetustiedostossa"
+#: ../libbalsa/address-view.c:131 ../src/balsa-mime-widget-message.c:740
+#: ../src/balsa-print-object-header.c:174 ../src/sendmsg-window.c:1113
+#: ../src/store-address.c:343
+msgid "Bcc:"
+msgstr "Toinen kopio:"
 
-#: ../libbalsa/filter-error.c:47
-msgid "Unable to allocate memory"
-msgstr "Muistia ei voida varata"
+#: ../libbalsa/address-view.c:133
+#, fuzzy
+#| msgid "_Reply To:"
+msgid "Reply To:"
+msgstr "_Vastausosoite:"
 
-#: ../libbalsa/filter-error.c:48
-msgid "Error in regular expression syntax"
-msgstr "Virhe säännöllisessä lausekkeessa"
+#: ../libbalsa/body.c:123 ../libbalsa/mailbox_local.c:1762
+#: ../libbalsa/message.c:845
+msgid "(No subject)"
+msgstr "(Ei aihetta)"
 
-#: ../libbalsa/filter-error.c:49
-msgid "Attempt to apply an invalid filter"
-msgstr "Yritettiin käyttää virheellistä suodatinta"
+#: ../libbalsa/body.c:352 ../libbalsa/body.c:399
+#, fuzzy, c-format
+#| msgid "Failed to create temporary file \"%s\": %s"
+msgid "Failed to create output stream"
+msgstr "Väliaikaistiedostoa \"%s\" ei voi luoda: %s"
 
-#: ../libbalsa/filter-file.c:141
-#, c-format
-msgid "Invalid filters %s for mailbox %s"
-msgstr "Virheellisiä suodattimia %s kansiolle %s"
+#: ../libbalsa/body.c:543
+#, fuzzy, c-format
+#| msgid "Could not save message."
+msgid "Could not read embedded message"
+msgstr "Viestin tallennus epäonnistui."
 
-#: ../libbalsa/filter.c:130 ../libbalsa/mailbox_local.c:877
+#: ../libbalsa/filter.c:129 ../libbalsa/mailbox_local.c:842
 msgid "Unable to load message body to match filter"
 msgstr "Viestin runkoa ei voida hakea suodatettavaksi"
 
@@ -153,357 +186,459 @@ msgstr "Viestin runkoa ei voida hakea suodatettavaksi"
 msgid "Invalid filter: %s"
 msgstr "Virheellinen suodatin: %s"
 
-#: ../libbalsa/filter.c:275 ../libbalsa/filter.c:298
+#: ../libbalsa/filter.c:284 ../libbalsa/filter.c:307
 #, c-format
 msgid "Bad mailbox name for filter: %s"
 msgstr "Virheellinen postikansion nimi suodattimelle: %s"
 
-#: ../libbalsa/filter.c:279
+#: ../libbalsa/filter.c:288
 #, c-format
 msgid "Error when copying messages: %s"
 msgstr "Virhe kopioitaessa viestejä: %s"
 
-#: ../libbalsa/filter.c:289
+#: ../libbalsa/filter.c:298
 #, c-format
 msgid "Error when trashing messages: %s"
 msgstr "Virhe siirrettäessä viestejä roskapostiin: %s"
 
-#: ../libbalsa/filter.c:302
+#: ../libbalsa/filter.c:311
 #, c-format
 msgid "Error when moving messages: %s"
 msgstr "Vihr sirrettäessä viestejä: %s"
 
-#: ../libbalsa/gmime-application-pkcs7.c:237
-#: ../libbalsa/gmime-application-pkcs7.c:380
-#, c-format
-msgid "Failed to decrypt MIME part: parse error"
-msgstr "MIME-osan salauksen purku epäonnistui: tulkintavirhe"
+#: ../libbalsa/filter-error.c:48
+msgid "Syntax error in the filter configuration file"
+msgstr "Syntaksivirhe suodattimen asetustiedostossa"
+
+#: ../libbalsa/filter-error.c:49
+msgid "Unable to allocate memory"
+msgstr "Muistia ei voida varata"
+
+#: ../libbalsa/filter-error.c:50
+msgid "Error in regular expression syntax"
+msgstr "Virhe säännöllisessä lausekkeessa"
+
+#: ../libbalsa/filter-error.c:51
+msgid "Attempt to apply an invalid filter"
+msgstr "Yritettiin käyttää virheellistä suodatinta"
 
-#: ../libbalsa/gmime-gpgme-context.c:282 ../libbalsa/rfc3156.c:1527
+#: ../libbalsa/filter-file.c:139
 #, c-format
-msgid ""
-"The passphrase for this key was bad, please try again!\n"
-"\n"
-"Key: %s"
-msgstr ""
-"Tämän avaimen salalause oli virheellinen, yritä uudestaan:\n"
-"\n"
-"Avain: %s"
+msgid "Invalid filters %s for mailbox %s"
+msgstr "Virheellisiä suodattimia %s kansiolle %s"
 
-#: ../libbalsa/gmime-gpgme-context.c:287 ../libbalsa/rfc3156.c:1532
+# src/balsa-message.c#
+# 651 src/filter-edit-dialog.c:325
+#. FIXME: this is hack!
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:1055
+msgid "To"
+msgstr "Vastaanottaja"
+
+#: ../libbalsa/filter-funcs.c:384 ../src/balsa-index.c:359
+msgid "From"
+msgstr "Lähettäjä"
+
+#: ../libbalsa/filter-funcs.c:385 ../src/balsa-index.c:375
+#: ../src/pref-manager.c:418
+msgid "Subject"
+msgstr "Aihe"
+
+#: ../libbalsa/filter-funcs.c:386
+#, fuzzy
+#| msgid "Cc:"
+msgid "Cc"
+msgstr "Kopio:"
+
+#: ../libbalsa/filter-funcs.c:387
+#, fuzzy
+#| msgid "_Body"
+msgid "Body"
+msgstr "Viestin _sisältö"
+
+#: ../libbalsa/filter-funcs.c:392
+#, fuzzy, c-format
+#| msgid "_Headers"
+msgid "Header:%s"
+msgstr "_Otsikot"
+
+#: ../libbalsa/filter-funcs.c:398 ../libbalsa/filter-funcs.c:426
 #, c-format
-msgid ""
-"Please enter the passphrase for the secret key!\n"
-"\n"
-"Key: %s"
+msgid ",%s"
 msgstr ""
-"Syötä salaisen avaimen salalause!\n"
-"\n"
-"Avain: %s"
 
-#: ../libbalsa/gmime-gpgme-context.c:405 ../libbalsa/gmime-gpgme-context.c:478
-#: ../libbalsa/gmime-gpgme-context.c:486 ../libbalsa/gmime-gpgme-context.c:595
-#: ../libbalsa/gmime-gpgme-context.c:674
-msgid "could not get data from stream"
-msgstr "virrasta ei voitu lukea tietoja"
+#: ../libbalsa/filter-funcs.c:414
+#, fuzzy
+#| msgid "_New"
+msgid "New"
+msgstr "Uu_si"
 
-#: ../libbalsa/gmime-gpgme-context.c:410 ../libbalsa/gmime-gpgme-context.c:601
-#: ../libbalsa/gmime-gpgme-context.c:679
-msgid "could not create new data object"
-msgstr "uutta tieto-oliota ei voitu luoda"
+#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:1011
+msgid "Deleted"
+msgstr "Poistettu"
 
-#: ../libbalsa/gmime-gpgme-context.c:417
-msgid "signing failed"
-msgstr "allekirjoitus epäonnistui"
+#: ../libbalsa/filter-funcs.c:416 ../src/filter-edit-callbacks.c:1011
+msgid "Replied"
+msgstr "Vastattu"
 
-#: ../libbalsa/gmime-gpgme-context.c:497 ../libbalsa/rfc3156.c:515
-#: ../libbalsa/rfc3156.c:520 ../libbalsa/rfc3156.c:797
-#: ../libbalsa/rfc3156.c:803
-msgid "signature verification failed"
-msgstr "allekirjoituksen varmennus epäonnistui"
+#: ../libbalsa/filter-funcs.c:417 ../src/filter-edit-callbacks.c:1011
+msgid "Flagged"
+msgstr "Lipulla"
 
-#: ../libbalsa/gmime-gpgme-context.c:561
-#, c-format
-msgid "combined signing and encryption is only defined for RFC 2440"
+#: ../libbalsa/filter-funcs.c:441
+msgid "Not "
 msgstr ""
-"Yhdistetty allekirjoitus ja salaus on määritelty vain RFC 2440-viestelle"
 
-#: ../libbalsa/gmime-gpgme-context.c:624
-msgid "signing and encryption failed"
-msgstr "allekirjoitus ja salaus epäonnistui"
+#: ../libbalsa/filter-funcs.c:457
+msgid "From %Y-%m-%d"
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:626
-msgid "encryption failed"
-msgstr "salaus epäonnistui"
+#: ../libbalsa/filter-funcs.c:463
+msgid "To %Y-%m-%d"
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:688 ../libbalsa/rfc3156.c:642
-#: ../libbalsa/rfc3156.c:647
-msgid "decryption failed"
-msgstr "salauksen purku epäonnistui"
+#: ../libbalsa/filter-funcs.c:471
+msgid "And"
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:720
-msgid "could not create context"
-msgstr "kontekstia ei voitu luoda"
+#: ../libbalsa/filter-funcs.c:474
+msgid "Or"
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:775
+#: ../libbalsa/gmime-application-pkcs7.c:125
 #, c-format
-msgid "the crypto engine for protocol OpenPGP is not available"
-msgstr "OpenPGP-salausjärjestelmä ei ole käytettävissä"
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "MIME-osan salauksen purku epäonnistui: tulkintavirhe"
 
-#: ../libbalsa/gmime-gpgme-context.c:785
-#, c-format
-msgid "the crypto engine for protocol CMS is not available"
-msgstr "salausmoottoria protokollalle CMS ei ole käytettävissä"
+#: ../libbalsa/gmime-multipart-crypt.c:225
+msgid "Cannot verify multipart/signed part due to missing subparts."
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:792
-#, c-format
-msgid "invalid crypto engine %d"
-msgstr "virheellinen salausmoottori %d"
+#: ../libbalsa/gmime-multipart-crypt.c:251
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Disable support for protocol %s."
+msgid "unsupported protocol '%s'"
+msgstr ""
+"\n"
+"Otetaan protokollan %s tuki pois käytöstä."
 
-#: ../libbalsa/gmime-gpgme-context.c:823 ../libbalsa/gmime-gpgme-context.c:850
-#, c-format
-msgid "could not list keys for \"%s\""
-msgstr "käyttäjän \"%s\" avaimia ei voi listata"
+#: ../libbalsa/gmime-multipart-crypt.c:264
+msgid ""
+"Cannot verify multipart/signed part: signature content-type does not match "
+"protocol."
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:865
+#: ../libbalsa/gmime-multipart-crypt.c:487
 #, c-format
 msgid ""
-"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
+"Cannot decrypt multipart/encrypted part: unsupported encryption protocol '"
+"%s'."
 msgstr ""
-"%s: avain %s on olemassa, mutta se on joko vanhentunut, mitätöity, pois "
-"käytöstä tai virheellinen"
 
-#: ../libbalsa/gmime-gpgme-context.c:869
-#, c-format
-msgid "%s: could not find a key for %s"
-msgstr "%s: avainta käyttäjälle %s ei löytynyt"
+#: ../libbalsa/gmime-multipart-crypt.c:488
+msgid "(none)"
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:882
-#, c-format
-msgid "%s: multiple keys for %s"
-msgstr "%s: useita avaimia käyttäjälle %s"
+#: ../libbalsa/gmime-multipart-crypt.c:501
+msgid ""
+"Cannot decrypt multipart/encrypted part: content-type does not match "
+"protocol."
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:927
-#, c-format
-msgid "%s: insufficient validity for uid %s"
-msgstr "%s: UID %s ei ole tarpeeksi kelvollinen"
+#: ../libbalsa/gmime-multipart-crypt.c:516
+msgid "Cannot decrypt multipart/encrypted part: unexpected content type"
+msgstr ""
+
+#: ../libbalsa/gmime-multipart-crypt.c:558
+msgid ""
+"Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
+msgstr ""
+
+#: ../libbalsa/html.c:68
+#, fuzzy, c-format
+#| msgid "Could not get a part: %s"
+msgid "Could not get an HTML part: %s"
+msgstr "Osaa ei voi hakea: %s"
+
+#: ../libbalsa/html.c:340
+msgid ""
+"This message part contains images from a remote server. To protect your "
+"privacy, Balsa has not downloaded them. You may choose to download them if "
+"you trust the server."
+msgstr ""
+
+#: ../libbalsa/html.c:348
+#, fuzzy
+#| msgid "Downloading %u kB"
+msgid "_Download images"
+msgstr "Noudetaan %u kt"
 
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:102 ../libbalsa/mailbox_local.c:1896
-#: ../libbalsa/mailbox_local.c:1898 ../src/sendmsg-window.c:3938
-#: ../src/sendmsg-window.c:3939
+#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1881
+#: ../libbalsa/mailbox_local.c:1883 ../src/sendmsg-window.c:4089
+#: ../src/sendmsg-window.c:4091
 msgid "Re:"
 msgstr "Re:"
 
-#: ../libbalsa/identity.c:103 ../src/sendmsg-window.c:3883
-#: ../src/sendmsg-window.c:3884 ../src/sendmsg-window.c:3885
+#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:4029
+#: ../src/sendmsg-window.c:4030 ../src/sendmsg-window.c:4031
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: ../libbalsa/identity.c:161
+#: ../libbalsa/identity.c:165
 msgid "New Identity"
 msgstr "Uusi henkilöllisyys"
 
-#: ../libbalsa/identity.c:332
+#: ../libbalsa/identity.c:344
 #, c-format
 msgid "Error executing signature generator %s"
 msgstr "Virhe suoritettaessa allekirjoituksen luojaa %s"
 
-#: ../libbalsa/identity.c:342
+#: ../libbalsa/identity.c:354
 #, c-format
 msgid "Cannot open signature file '%s' for reading"
 msgstr "Allekirjoitustiedostoa \"%s\" ei voida avata luettavaksi"
 
-#: ../libbalsa/identity.c:348
+#: ../libbalsa/identity.c:360
 #, c-format
 msgid "Error reading signature from %s"
 msgstr "Virhe luoettaessa allekirjoitusta tiedostosta %s"
 
-#: ../libbalsa/identity.c:353
+#: ../libbalsa/identity.c:365
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "Allekirjoitus viestissä %s ei ole UTF-8 koodattua tekstiä."
 
-#: ../libbalsa/identity.c:480
+#: ../libbalsa/identity.c:496
 msgid "Current"
 msgstr "Nykyinen"
 
-#: ../libbalsa/identity.c:736 ../libbalsa/smtp-server.c:259
+#: ../libbalsa/identity.c:750 ../libbalsa/smtp-server.c:266
 msgid "Default"
 msgstr "Oletus"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:931
+#: ../libbalsa/identity.c:949
 msgid "_Face Path"
 msgstr "_Kasvotiedoston polku"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:937
+#: ../libbalsa/identity.c:955
 msgid "_X-Face Path"
 msgstr "_X-Face-tiedoston polku"
 
 #. create the "General" tab
-#: ../libbalsa/identity.c:963
+#: ../libbalsa/identity.c:983
 msgid "General"
 msgstr "Yleistä"
 
-#: ../libbalsa/identity.c:965
-msgid "_Identity Name:"
+#: ../libbalsa/identity.c:985
+#, fuzzy
+#| msgid "_Identity Name:"
+msgid "_Identity name:"
 msgstr "Henkilöllisyyden nimi:"
 
-#: ../libbalsa/identity.c:967
-msgid "_Full Name:"
+#: ../libbalsa/identity.c:987
+#, fuzzy
+#| msgid "_Full Name:"
+msgid "_Full name:"
 msgstr "_Koko nimi:"
 
-#: ../libbalsa/identity.c:969
-msgid "_Mailing Address:"
+#: ../libbalsa/identity.c:989
+#, fuzzy
+#| msgid "_Mailing Address:"
+msgid "_Mailing address:"
 msgstr "_Sähköpostiosoite:"
 
-#: ../libbalsa/identity.c:971
-msgid "Reply _To:"
+#: ../libbalsa/identity.c:991
+#, fuzzy
+#| msgid "Reply _To:"
+msgid "Reply _to:"
 msgstr "_Vastausosoite:"
 
-#: ../libbalsa/identity.c:973
+#: ../libbalsa/identity.c:993
 msgid "_Domain:"
 msgstr "_Aluenimi:"
 
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:977
+#: ../libbalsa/identity.c:997
 msgid "Messages"
 msgstr "Viestit"
 
-#: ../libbalsa/identity.c:979
+#: ../libbalsa/identity.c:999
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../libbalsa/identity.c:981
-msgid "Reply _String:"
+#: ../libbalsa/identity.c:1001
+#, fuzzy
+#| msgid "Reply _String:"
+msgid "Reply _string:"
 msgstr "Vastaus_merkkijono:"
 
-#: ../libbalsa/identity.c:983
-msgid "F_orward String:"
+#: ../libbalsa/identity.c:1003
+#, fuzzy
+#| msgid "F_orward String:"
+msgid "F_orward string:"
 msgstr "Välitys_merkkijono:"
 
-#: ../libbalsa/identity.c:986
+#: ../libbalsa/identity.c:1006
+msgid "send messages in both plain text and _HTML format"
+msgstr ""
+
+#: ../libbalsa/identity.c:1009
 msgid "request _Message Disposition Notification by default"
 msgstr "pyydä _Message Disposition Notification -viestit oletuksena"
 
-#: ../libbalsa/identity.c:996
-msgid "SMT_P Server:"
+#: ../libbalsa/identity.c:1019
+#, fuzzy
+#| msgid "SMT_P Server:"
+msgid "SMT_P server:"
 msgstr "SMT_P-palvelin:"
 
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:1001
+#: ../libbalsa/identity.c:1024
 msgid "Signature"
 msgstr "Allekirjoitus"
 
-#: ../libbalsa/identity.c:1004
-msgid "Signature _Path"
+#: ../libbalsa/identity.c:1027
+#, fuzzy
+#| msgid "Signature _Path"
+msgid "Signature _path"
 msgstr "Allekirjoituksen _polku"
 
-#: ../libbalsa/identity.c:1007
-msgid "_Execute Signature"
+#: ../libbalsa/identity.c:1030
+#, fuzzy
+#| msgid "_Execute Signature"
+msgid "_Execute signature"
 msgstr "_Suoritettava allekirjoitus"
 
-#: ../libbalsa/identity.c:1010
-msgid "Incl_ude Signature"
+#: ../libbalsa/identity.c:1033
+#, fuzzy
+#| msgid "Incl_ude Signature"
+msgid "Incl_ude signature"
 msgstr "Lisää _allekirjoitus"
 
-#: ../libbalsa/identity.c:1013
-msgid "Include Signature When For_warding"
+#: ../libbalsa/identity.c:1036
+#, fuzzy
+#| msgid "Include Signature When For_warding"
+msgid "Include signature when for_warding"
 msgstr "Liitä allekirjoitus _välitettäessä"
 
-#: ../libbalsa/identity.c:1016
-msgid "Include Signature When Rep_lying"
+#: ../libbalsa/identity.c:1039
+#, fuzzy
+#| msgid "Include Signature When Rep_lying"
+msgid "Include signature when rep_lying"
 msgstr "Lisää allekirjoitus vastattaessa"
 
-#: ../libbalsa/identity.c:1019
-msgid "_Add Signature Separator"
+#: ../libbalsa/identity.c:1042
+#, fuzzy
+#| msgid "_Add Signature Separator"
+msgid "_Add signature separator"
 msgstr "_Lisää allekirjoituksen erotin"
 
-#: ../libbalsa/identity.c:1022
-msgid "Prepend Si_gnature"
+#: ../libbalsa/identity.c:1045
+#, fuzzy
+#| msgid "Prepend Si_gnature"
+msgid "Prepend si_gnature"
 msgstr "Lisää allekirjoitus _alkuun"
 
-#. create the "Security" tab
-#: ../libbalsa/identity.c:1027
+#: ../libbalsa/identity.c:1051
+msgid ""
+"Signing and encrypting messages are possible\n"
+"only if Balsa is built with cryptographic support."
+msgstr ""
+
+#: ../libbalsa/identity.c:1056
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: ../libbalsa/identity.c:1030
+#: ../libbalsa/identity.c:1059
 msgid "sign messages by default"
 msgstr "allekirjoita viestit oletuksena"
 
-#: ../libbalsa/identity.c:1033
+#: ../libbalsa/identity.c:1062
 msgid "encrypt messages by default"
 msgstr "salaa viestit oletuksena"
 
-#: ../libbalsa/identity.c:1036
+#: ../libbalsa/identity.c:1065
 msgid "default protocol"
 msgstr "oletusprotokolla"
 
-#: ../libbalsa/identity.c:1039
+#: ../libbalsa/identity.c:1068
 msgid "always trust GnuPG keys when encrypting"
 msgstr "Luota aina GnuPG-avaimiin salattaessa"
 
-#: ../libbalsa/identity.c:1176
+#: ../libbalsa/identity.c:1071
+#, fuzzy
+#| msgid "Message could not be encrypted"
+msgid "remind me if messages can be encrypted"
+msgstr "Viestiä ei voitu salata"
+
+#: ../libbalsa/identity.c:1074
+msgid ""
+"use secret key with this id for signing\n"
+"(leave empty for automatic selection)"
+msgstr ""
+
+#: ../libbalsa/identity.c:1208
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Virhe luettaessa tiedostoa %s: %s"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1187
+#: ../libbalsa/identity.c:1218
 #, c-format
 msgid "Face header file %s is too long (%lu bytes)."
 msgstr "Kasvokuvan otsikkotiedosto %s on liian pitkä (%lu tavua)."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1197
+#: ../libbalsa/identity.c:1228
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "Kasvokuvan otsikkotiedost %s sisältää binääritietoa."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1217 ../src/balsa-message.c:1224
+#: ../libbalsa/identity.c:1248 ../src/balsa-message.c:1573
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Virhe ladattaessa kasvokuvaa: %s"
 
-#: ../libbalsa/identity.c:1413
+#: ../libbalsa/identity.c:1427
 msgid "Error: The identity does not have a name"
 msgstr "Virhe: Henkilöllisyydellä ei ole nimeä"
 
-#: ../libbalsa/identity.c:1423
+#: ../libbalsa/identity.c:1437
 msgid "Error: An identity with that name already exists"
 msgstr "Virhe: Henkilöllisyyden nimi on jo varattu"
 
-#: ../libbalsa/identity.c:1620
+#: ../libbalsa/identity.c:1636
 msgid "Do you really want to delete the selected identity?"
 msgstr "Haluatko varmasti poistaa valitun henkilöllisyyden?"
 
-#: ../libbalsa/identity.c:1655
+#: ../libbalsa/identity.c:1673
 #, c-format
 msgid "Error displaying help for identities: %s\n"
 msgstr "Virhe näytettäessä ohjetta henkilöllisyyksille: %s\n"
 
-#: ../libbalsa/identity.c:1701
+#: ../libbalsa/identity.c:1719
 msgid "Manage Identities"
 msgstr "Henkilöllisyyksien hallinta"
 
-#: ../libbalsa/identity.c:2063
+#: ../libbalsa/identity.c:2116
 msgid "GnuPG MIME mode"
 msgstr "GnuPG:n MIME-tila"
 
-#: ../libbalsa/identity.c:2065
+#: ../libbalsa/identity.c:2118
 msgid "GnuPG OpenPGP mode"
 msgstr "GnpPG:n OpenPGP-tila"
 
-#: ../libbalsa/identity.c:2068
+#: ../libbalsa/identity.c:2121
 msgid "GpgSM S/MIME mode"
 msgstr "GpgSM:n S/MIME-tila"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:273
+#: ../libbalsa/imap-server.c:319
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -513,41 +648,50 @@ msgstr ""
 "%s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:277
+#: ../libbalsa/imap-server.c:323
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "IMAP-palvelimen %s virhe: %s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:283
+#: ../libbalsa/imap-server.c:329
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../libbalsa/imap-server.c:543 ../libbalsa/imap-server.c:548
+#: ../libbalsa/imap-server.c:575 ../libbalsa/server.c:348
+#: ../libbalsa/server.c:392
+#, fuzzy
+#| msgid "Your _password:"
+msgid "Balsa passwords"
+msgstr "_Salasana:"
+
+#: ../libbalsa/imap-server.c:626
+#, fuzzy, c-format
+#| msgid "Cannot connect to server"
+msgid "Cannot connect to %s"
+msgstr "Palvelimeen ei voida ottaa yhteyttä"
+
+#: ../libbalsa/imap-server.c:631 ../libbalsa/imap-server.c:636
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "Palvelimeen ei saatu yhteyttä: %s"
 
-#: ../libbalsa/imap-server.c:696
+#: ../libbalsa/imap-server.c:784
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Liikaa samanaikaisia yhteyksiä palvelimelle %s"
 
-#: ../libbalsa/libbalsa-conf.c:203
-msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
-msgstr "Balsan asetukset on nyt tallennettu tiedostoon \"~/.balsa/config\"."
-
-#: ../libbalsa/libbalsa.c:354
+#: ../libbalsa/libbalsa.c:385
 msgid "Invalid date"
 msgstr "Virheellinen päivämäärä"
 
-#: ../libbalsa/libbalsa.c:370 ../src/pref-manager.c:1321
-#: ../src/pref-manager.c:1417
+#: ../libbalsa/libbalsa.c:401 ../src/pref-manager.c:1408
+#: ../src/pref-manager.c:1504
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libbalsa/libbalsa.c:516
+#: ../libbalsa/libbalsa.c:547
 #, c-format
 msgid ""
 "Authenticity of this certificate could not be verified.\n"
@@ -558,7 +702,7 @@ msgstr ""
 "<b>Syy:</b> %s\n"
 "<b>Tämän varmenteen omistaa:</b>\n"
 
-#: ../libbalsa/libbalsa.c:528
+#: ../libbalsa/libbalsa.c:559
 msgid ""
 "\n"
 "<b>This certificate was issued by:</b>\n"
@@ -566,7 +710,7 @@ msgstr ""
 "\n"
 "<b>Tämän varmenteen myönsi:</b>\n"
 
-#: ../libbalsa/libbalsa.c:539
+#: ../libbalsa/libbalsa.c:570
 #, c-format
 msgid ""
 "<b>This certificate is valid</b>\n"
@@ -579,106 +723,312 @@ msgstr ""
 "saakka: %s\n"
 "<b>Sormenjälki:</b> %s"
 
-#: ../libbalsa/libbalsa.c:548
+#: ../libbalsa/libbalsa.c:579
 msgid "SSL/TLS certificate"
 msgstr "SSL/TLS-varmenne"
 
-#: ../libbalsa/libbalsa.c:550
+#: ../libbalsa/libbalsa.c:581
 msgid "_Accept Once"
 msgstr "Hyväksy _kerran"
 
-#: ../libbalsa/libbalsa.c:551
+#: ../libbalsa/libbalsa.c:582
 msgid "Accept&_Save"
 msgstr "Hyväksy ja _tallenna"
 
-#: ../libbalsa/libbalsa.c:552
+#: ../libbalsa/libbalsa.c:583
 msgid "_Reject"
 msgstr "_Hylkää"
 
-#: ../libbalsa/libbalsa.c:597
+#: ../libbalsa/libbalsa.c:629
 #, c-format
 msgid "Connection to %s timed out. Abort?"
 msgstr "Yhteys %s aikakatkaistiin. Keskeytetäänkö?"
 
-#: ../libbalsa/libbalsa.c:837
+#: ../libbalsa/libbalsa.c:875
 #, c-format
 msgid "No image data"
 msgstr "Ei kuvatietoa"
 
-#: ../libbalsa/libbalsa.c:881
+#: ../libbalsa/libbalsa.c:919
 #, c-format
 msgid "Invalid input format"
 msgstr "Virheellinen syötteen muoto"
 
-#: ../libbalsa/libbalsa.c:885
+#: ../libbalsa/libbalsa.c:923
 #, c-format
 msgid "Internal buffer overrun"
 msgstr "Sisäisen puskurin ylivuoto"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:902
+#: ../libbalsa/libbalsa.c:940
 #, c-format
 msgid "Bad X-Face data"
 msgstr "Virheellistä X-Face-tietoa"
 
-#: ../libbalsa/mailbox.c:452
+#: ../libbalsa/libbalsa-conf.c:143
+msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
+msgstr "Balsan asetukset on nyt tallennettu tiedostoon \"~/.balsa/config\"."
+
+#: ../libbalsa/libbalsa-gpgme.c:245 ../libbalsa/libbalsa-gpgme.c:256
+#: ../libbalsa/libbalsa-gpgme.c:358 ../libbalsa/libbalsa-gpgme.c:481
+#: ../libbalsa/libbalsa-gpgme.c:574
+msgid "could not get data from stream"
+msgstr "virrasta ei voitu lukea tietoja"
+
+#: ../libbalsa/libbalsa-gpgme.c:269 ../libbalsa/rfc3156.c:394
+#: ../libbalsa/rfc3156.c:399 ../libbalsa/rfc3156.c:571
+#: ../libbalsa/rfc3156.c:577
+msgid "signature verification failed"
+msgstr "allekirjoituksen varmennus epäonnistui"
+
+#: ../libbalsa/libbalsa-gpgme.c:366 ../libbalsa/libbalsa-gpgme.c:490
+#: ../libbalsa/libbalsa-gpgme.c:582
+msgid "could not create new data object"
+msgstr "uutta tieto-oliota ei voitu luoda"
+
+#: ../libbalsa/libbalsa-gpgme.c:375
+msgid "signing failed"
+msgstr "allekirjoitus epäonnistui"
+
+#: ../libbalsa/libbalsa-gpgme.c:449
+#, fuzzy, c-format
+#| msgid "combined signing and encryption is only defined for RFC 2440"
+msgid "combined signing and encryption is defined only for RFC 2440"
+msgstr ""
+"Yhdistetty allekirjoitus ja salaus on määritelty vain RFC 2440-viestelle"
+
+#: ../libbalsa/libbalsa-gpgme.c:517
+msgid "signing and encryption failed"
+msgstr "allekirjoitus ja salaus epäonnistui"
+
+#: ../libbalsa/libbalsa-gpgme.c:519
+msgid "encryption failed"
+msgstr "salaus epäonnistui"
+
+#: ../libbalsa/libbalsa-gpgme.c:592 ../libbalsa/rfc3156.c:472
+#: ../libbalsa/rfc3156.c:477
+msgid "decryption failed"
+msgstr "salauksen purku epäonnistui"
+
+#: ../libbalsa/libbalsa-gpgme.c:693
+msgid "could not create context"
+msgstr "kontekstia ei voitu luoda"
+
+#: ../libbalsa/libbalsa-gpgme.c:697
+#, fuzzy, c-format
+#| msgid "Could not get part: %s"
+msgid "could not set protocol '%s'"
+msgstr "Osaa ei voi hakea: %s"
+
+#: ../libbalsa/libbalsa-gpgme.c:736 ../libbalsa/libbalsa-gpgme.c:764
+#, c-format
+msgid "could not list keys for \"%s\""
+msgstr "käyttäjän \"%s\" avaimia ei voi listata"
+
+#: ../libbalsa/libbalsa-gpgme.c:782
+#, c-format
+msgid ""
+"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
+msgstr ""
+"%s: avain %s on olemassa, mutta se on joko vanhentunut, mitätöity, pois "
+"käytöstä tai virheellinen"
+
+#: ../libbalsa/libbalsa-gpgme.c:787
+#, c-format
+msgid "%s: could not find a key for %s"
+msgstr "%s: avainta käyttäjälle %s ei löytynyt"
+
+#: ../libbalsa/libbalsa-gpgme.c:794
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: a key for %s is present, but it is expired, disabled, revoked or "
+#| "invalid"
+msgid ""
+"%s: a key with id %s is present, but it is expired, disabled, revoked or "
+"invalid"
+msgstr ""
+"%s: avain %s on olemassa, mutta se on joko vanhentunut, mitätöity, pois "
+"käytöstä tai virheellinen"
+
+#: ../libbalsa/libbalsa-gpgme.c:799
+#, fuzzy, c-format
+#| msgid "%s: could not find a key for %s"
+msgid "%s: could not find a key with id %s"
+msgstr "%s: avainta käyttäjälle %s ei löytynyt"
+
+#: ../libbalsa/libbalsa-gpgme.c:816
+#, c-format
+msgid "%s: multiple keys for %s"
+msgstr "%s: useita avaimia käyttäjälle %s"
+
+#: ../libbalsa/libbalsa-gpgme.c:862
+#, c-format
+msgid "%s: insufficient validity for uid %s"
+msgstr "%s: UID %s ei ole tarpeeksi kelvollinen"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:145
+msgid "User ID"
+msgstr "Käyttäjätunniste"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:145
+msgid "Key ID"
+msgstr "Avaimen tunniste"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:145
+msgid "Length"
+msgstr "Pituus"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:145
+msgid "Validity"
+msgstr "Voimassaolo"
+
+#. FIXME: create dialog according to the Gnome HIG
+#: ../libbalsa/libbalsa-gpgme-cb.c:160
+msgid "Select key"
+msgstr "Valitse avain"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:176
+#, c-format
+msgid "Select the private key for the signer %s"
+msgstr "Valitse allekirjoittajan %s salainen avain"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:180
+#, c-format
+msgid "Select the public key for the recipient %s"
+msgstr "Valitse julkinen avain vastaanottajalle %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:303
+#, c-format
+msgid "Insufficient trust for recipient %s"
+msgstr "Vastaanottajaan %s ei luoteta tarpeeksi"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:307
+#, c-format
+msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+msgstr "Avaimen tunnisteella \"%s\" kelpoisuus on \"%s\""
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:318
+msgid "Use this key anyway?"
+msgstr "Käytetäänkö avainta joka tapauksessa?"
+
+#. FIXME: create dialog according to the Gnome HIG
+#: ../libbalsa/libbalsa-gpgme-cb.c:344
+#, fuzzy
+#| msgid "_Pass Phrase:"
+msgid "Enter Passphrase"
+msgstr "_Salalause:"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:371
+#, fuzzy, c-format
+#| msgid ""
+#| "The passphrase for this key was bad, please try again!\n"
+#| "\n"
+#| "Key: %s"
+msgid ""
+"%s\n"
+"The passphrase for this key was bad, please try again!\n"
+"\n"
+"Key: %s"
+msgstr ""
+"Tämän avaimen salalause oli virheellinen, yritä uudestaan:\n"
+"\n"
+"Avain: %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:376
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase for the secret key!\n"
+#| "\n"
+#| "Key: %s"
+msgid ""
+"%s\n"
+"Please enter the passphrase for the secret key!\n"
+"\n"
+"Key: %s"
+msgstr ""
+"Syötä salaisen avaimen salalause!\n"
+"\n"
+"Avain: %s"
+
+#: ../libbalsa/libbalsa-vfs.c:558 ../src/sendmsg-window.c:5226
+#, c-format
+msgid "not a regular file"
+msgstr "ei ole tavallinen tiedosto"
+
+#: ../libbalsa/libbalsa-vfs.c:610
+#, c-format
+msgid "Cannot launch, missing application"
+msgstr ""
+
+#: ../libbalsa/libbalsa-vfs.c:676
+#, c-format
+msgid "Open with %s"
+msgstr "Avaa ohjelmalla %s"
+
+#: ../libbalsa/libbalsa-vfs.c:729
+#, fuzzy, c-format
+#| msgid "View _part with %s"
+msgid "Open _part with %s"
+msgstr "Näytä _osa ohjelmalla %s"
+
+#: ../libbalsa/mailbox.c:522
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Ei voida ladata kansiota %s"
 
-#: ../libbalsa/mailbox.c:459
+#: ../libbalsa/mailbox.c:529
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Viallinen kansiotyyppi: %s"
 
-#: ../libbalsa/mailbox.c:476
+#: ../libbalsa/mailbox.c:546
 #, c-format
 msgid "Bad local mailbox path \"%s\""
 msgstr "Virheellinen paikallisen kansion polku \"%s\""
 
-#: ../libbalsa/mailbox.c:481
+#: ../libbalsa/mailbox.c:551
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Ei voida luoda %s -tyyppistä kansiota"
 
-#: ../libbalsa/mailbox.c:789
+#: ../libbalsa/mailbox.c:874
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Toteutetaan suodatinsäännöt kansiolle %s"
 
-#: ../libbalsa/mailbox.c:892
+#: ../libbalsa/mailbox.c:1029
 #, c-format
 msgid "Copying from %s to %s"
 msgstr "Kopioidaan kansiosta %s kansioon %s"
 
-#: ../libbalsa/mailbox.c:1702
+#: ../libbalsa/mailbox.c:1936
 #, c-format
 msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
 msgstr "libbalsa_mailbox_get_message: postikansio %s on suljettu"
 
-#: ../libbalsa/mailbox.c:1904
+#: ../libbalsa/mailbox.c:2146
 #, c-format
 msgid "Removing messages from source mailbox failed"
 msgstr "Viestien poisto lähdekansiosta epäonnistui"
 
-#: ../libbalsa/mailbox.c:2844
+#: ../libbalsa/mailbox.c:3019
 msgid "from unknown"
 msgstr "tuntemattomalta lähettäjältä"
 
-#: ../libbalsa/mailbox.c:2846
+#: ../libbalsa/mailbox.c:3021
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../libbalsa/mailbox.c:3774
+#: ../libbalsa/mailbox.c:3991
 #, c-format
 msgid "Searching %s for partial messages"
 msgstr "Etsitään osittaisia viestejä kansiosta %s"
 
-#: ../libbalsa/mailbox.c:3865
+#: ../libbalsa/mailbox.c:4081
 msgid "Reconstructing message"
 msgstr "Kootaan viestiä uudestaan"
 
-#: ../libbalsa/mailbox.c:4150
+#: ../libbalsa/mailbox.c:4350
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Kahdennettujen viestien haku lähdekansiosta epäonnistui"
@@ -686,33 +1036,37 @@ msgstr "Kahdennettujen viestien haku lähdekansiosta epäonnistui"
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:550
+#: ../libbalsa/mailbox_imap.c:619
 msgid "IMAP connection has been severed. Reconnecting..."
 msgstr "IMAP-yhteys on mennyt sekaisin. Otetaan uusi yhteys..."
 
-#: ../libbalsa/mailbox_imap.c:553
+#: ../libbalsa/mailbox_imap.c:622
+msgid "IMAP protocol error. Try enabling bug workarounds."
+msgstr ""
+
+#: ../libbalsa/mailbox_imap.c:625
 #, c-format
 msgid "IMAP server has shut the connection: %s Reconnecting..."
 msgstr "IMAP-palvelin katkaisi yhteyden: %s otetaan uusi yhteys..."
 
-#: ../libbalsa/mailbox_imap.c:565
+#: ../libbalsa/mailbox_imap.c:637
 #, c-format
 msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
 msgstr ""
 "Asynkronista IMAP-komentoa %s ei voitu suorittaa. Yhdistetään uudestaan..."
 
-#: ../libbalsa/mailbox_imap.c:1040 ../libbalsa/mailbox_maildir.c:505
-#: ../libbalsa/mailbox_mbox.c:719 ../libbalsa/mailbox_mh.c:546
+#: ../libbalsa/mailbox_imap.c:1128 ../libbalsa/mailbox_maildir.c:511
+#: ../libbalsa/mailbox_mbox.c:750 ../libbalsa/mailbox_mh.c:547
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Avataan %s viitemär: %d\n"
 
-#: ../libbalsa/mailbox_imap.c:1123
+#: ../libbalsa/mailbox_imap.c:1215
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Haetaan %ld kt"
 
-#: ../libbalsa/mailbox_imap.c:1505
+#: ../libbalsa/mailbox_imap.c:1614
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -721,115 +1075,103 @@ msgstr ""
 "IMAPin komento SEARCH epäonnistui kansiolle %s\n"
 "palataan tavalliseen hakumenetelmään"
 
-#: ../libbalsa/mailbox_imap.c:1565
+#: ../libbalsa/mailbox_imap.c:1674
 #, c-format
 msgid "No path found for mailbox \"%s\", using \"%s\""
 msgstr "Polkua kansiolle \"%s\" ei löydy, käytetään \"%s\""
 
-#: ../libbalsa/mailbox_imap.c:1654 ../libbalsa/mailbox_imap.c:1695
+#: ../libbalsa/mailbox_imap.c:1802 ../libbalsa/mailbox_imap.c:1843
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "IMAP-kahvaa ei voida avata"
 
-#: ../libbalsa/mailbox_imap.c:2304
-#, c-format
-msgid "Downloading %u kB"
-msgstr "Noudetaan %u kt"
-
-#: ../libbalsa/mailbox_imap.c:2336
+#: ../libbalsa/mailbox_imap.c:2447 ../libbalsa/mailbox_imap.c:2513
 #, c-format
 msgid "Error fetching message from IMAP server: %s"
 msgstr "Virhe noudettaessa viestiä IMAP-palvelimelta: %s"
 
-#: ../libbalsa/mailbox_imap.c:2348
+#: ../libbalsa/mailbox_imap.c:2481
+#, c-format
+msgid "Downloading %u kB"
+msgstr "Noudetaan %u kt"
+
+#: ../libbalsa/mailbox_imap.c:2525
 #, c-format
 msgid "Cannot create temporary file"
 msgstr "Väliaikaistiedostoa ei voida luoda"
 
-#: ../libbalsa/mailbox_imap.c:2368
+#: ../libbalsa/mailbox_imap.c:2545
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "Väliaikaistiedostoon %s ei voida kirjoittaa"
 
-#: ../libbalsa/mailbox_imap.c:2587
+#: ../libbalsa/mailbox_imap.c:2774 ../libbalsa/mailbox_imap.c:2893
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "Viedään %ld kt"
 
-#: ../libbalsa/mailbox_imap.c:2778
+#: ../libbalsa/mailbox_imap.c:3196
 msgid "Server-side threading not supported."
 msgstr "Palvelimella tapahtuva säikeistys ei ole tuettu"
 
-#: ../libbalsa/mailbox_local.c:551 ../libbalsa/mailbox_mbox.c:416
-#, c-format
-msgid "Failed to create temporary file \"%s\": %s"
-msgstr "Väliaikaistiedostoa \"%s\" ei voi luoda: %s"
-
-#: ../libbalsa/mailbox_local.c:570
+#: ../libbalsa/mailbox_local.c:540
 #, c-format
 msgid "Failed to save cache file \"%s\": %s."
 msgstr "Välimuistitiedostoa \"%s\" ei voi tallentaa: %s."
 
-#: ../libbalsa/mailbox_local.c:580 ../libbalsa/mailbox_mbox.c:428
-#, c-format
-msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
-msgstr ""
-"Välimuistitiedoston \"%s\" tallennus ei onnistunut: %s. Uusi versio "
-"tallennettu nimellä \"%s\""
-
-#: ../libbalsa/mailbox_local.c:611
+#: ../libbalsa/mailbox_local.c:572
 #, c-format
 msgid "Cache file for mailbox %s will be created"
 msgstr "Luodaan välimuistitiedosto kansiolle %s"
 
-#: ../libbalsa/mailbox_local.c:620
+#: ../libbalsa/mailbox_local.c:581
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Välimuistitiedostoa %s ei voi lukea: %s"
 
-#: ../libbalsa/mailbox_local.c:638 ../libbalsa/mailbox_local.c:655
-#: ../libbalsa/mailbox_local.c:679
+#: ../libbalsa/mailbox_local.c:599 ../libbalsa/mailbox_local.c:616
+#: ../libbalsa/mailbox_local.c:640
 #, c-format
 msgid "Cache file for mailbox %s will be repaired"
 msgstr "Korjataan kansion %s välimuistitiedosto"
 
-#: ../libbalsa/mailbox_local.c:1188
+#: ../libbalsa/mailbox_local.c:1166
 #, c-format
 msgid "Filtering %s"
 msgstr "Suodatetaan %s"
 
-#: ../libbalsa/mailbox_local.c:1272
+#: ../libbalsa/mailbox_local.c:1254
 #, c-format
 msgid "Preparing %s"
 msgstr "Valmistellaan %s"
 
-#: ../libbalsa/mailbox_local.c:2057
+#: ../libbalsa/mailbox_local.c:2050
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "%s:n avaaminen epäonnistui. Errno = %d, "
 
-#: ../libbalsa/mailbox_local.c:2079
+#: ../libbalsa/mailbox_local.c:2072
 #, c-format
 msgid "Failed to sync mailbox \"%s\""
 msgstr "Kansion \"%s\" synkronointi epäonnistui"
 
-#: ../libbalsa/mailbox_maildir.c:196
+#: ../libbalsa/mailbox_maildir.c:197
 #, c-format
 msgid "Mailbox %s does not appear to be a Maildir mailbox."
 msgstr "Kansio %s ei näytä olevan Maildir-muotoinen postikansio."
 
-#: ../libbalsa/mailbox_maildir.c:205
+#: ../libbalsa/mailbox_maildir.c:206
 #, c-format
 msgid "Could not create a MailDir directory at %s (%s)"
 msgstr "Ei voida luoda MailDir-hakemistoa kohteeseen %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:213 ../libbalsa/mailbox_maildir.c:222
-#: ../libbalsa/mailbox_maildir.c:233
+#: ../libbalsa/mailbox_maildir.c:214 ../libbalsa/mailbox_maildir.c:223
+#: ../libbalsa/mailbox_maildir.c:234
 #, c-format
 msgid "Could not create a MailDir at %s (%s)"
 msgstr "Ei voida luoda MailDiriä kohteeseen %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:340 ../libbalsa/mailbox_mh.c:293
+#: ../libbalsa/mailbox_maildir.c:341 ../libbalsa/mailbox_mh.c:294
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -838,8 +1180,8 @@ msgstr ""
 "Kansion %s sisältöä ei voi poistaa:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:346 ../libbalsa/mailbox_mbox.c:301
-#: ../libbalsa/mailbox_mh.c:299
+#: ../libbalsa/mailbox_maildir.c:347 ../libbalsa/mailbox_mbox.c:326
+#: ../libbalsa/mailbox_mh.c:300
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -848,119 +1190,131 @@ msgstr ""
 "Ei voida poistaa: %s\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:484 ../libbalsa/mailbox_mbox.c:667
-#: ../libbalsa/mailbox_mh.c:527
+#: ../libbalsa/mailbox_maildir.c:490 ../libbalsa/mailbox_mbox.c:694
+#: ../libbalsa/mailbox_mh.c:528
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "Kansiota ei ole olemassa."
 
-#: ../libbalsa/mailbox_maildir.c:925 ../libbalsa/mailbox_mbox.c:1944
-#: ../libbalsa/mailbox_mh.c:1109
+#: ../libbalsa/mailbox_maildir.c:931 ../libbalsa/mailbox_mbox.c:2031
+#: ../libbalsa/mailbox_mh.c:1110
 #, c-format
 msgid "Data copy error"
 msgstr "Virhe kopioitaessa tietoja"
 
-#: ../libbalsa/mailbox_mbox.c:197
+#: ../libbalsa/mailbox_mbox.c:211
 #, c-format
 msgid "Mailbox %s does not appear to be an Mbox mailbox."
 msgstr "Kansio %s ei näytä olevan Mbox-muotoinen postikansio."
 
-#: ../libbalsa/mailbox_mbox.c:404
+#: ../libbalsa/mailbox_mbox.c:429
 #, c-format
 msgid "Could not write file %s: %s"
 msgstr "Tiedostoa \"%s\" ei voi kirjoittaa: %s"
 
-#: ../libbalsa/mailbox_mbox.c:436
+#: ../libbalsa/mailbox_mbox.c:441
+#, c-format
+msgid "Failed to create temporary file \"%s\": %s"
+msgstr "Väliaikaistiedostoa \"%s\" ei voi luoda: %s"
+
+#: ../libbalsa/mailbox_mbox.c:453
+#, c-format
+msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
+msgstr ""
+"Välimuistitiedoston \"%s\" tallennus ei onnistunut: %s. Uusi versio "
+"tallennettu nimellä \"%s\""
+
+#: ../libbalsa/mailbox_mbox.c:461
 #, c-format
 msgid "Could not unlink file %s: %s"
 msgstr "Tiedostoa \"%s\" ei voi poistaa: %s"
 
-#: ../libbalsa/mailbox_mbox.c:675
+#: ../libbalsa/mailbox_mbox.c:702
 #, c-format
 msgid "Cannot open mailbox."
 msgstr "Kansiota ei voida avata."
 
-#: ../libbalsa/mailbox_mbox.c:687
+#: ../libbalsa/mailbox_mbox.c:714
 #, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "Kansio ei ole mbox-muodossa."
 
-#: ../libbalsa/mailbox_mbox.c:695
+#: ../libbalsa/mailbox_mbox.c:722
 #, c-format
 msgid "Cannot lock mailbox."
 msgstr "Kansiota ei voida lukita."
 
-#: ../libbalsa/mailbox_mbox.c:1901
+#: ../libbalsa/mailbox_mbox.c:1988
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: %s avaaminen ei onnistu."
 
-#: ../libbalsa/mailbox_mbox.c:1912
+#: ../libbalsa/mailbox_mbox.c:1999
 #, c-format
 msgid "%s: could not get new mime stream."
 msgstr "%s: ei voi avata uutta MIME-virtaa."
 
-#: ../libbalsa/mailbox_mbox.c:1920
+#: ../libbalsa/mailbox_mbox.c:2007
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: %s ei ole mbox-muotoinen postikansio."
 
-#: ../libbalsa/mailbox_mh.c:174
+#: ../libbalsa/mailbox_mh.c:175
 #, c-format
 msgid "Mailbox %s does not appear to be a Mh mailbox."
 msgstr "Kansio %s ei näytä olevan Mh-muotoinen postikansio."
 
-#: ../libbalsa/mailbox_mh.c:184
+#: ../libbalsa/mailbox_mh.c:185
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "Ei voida luoda MH-hakemistoa kohteeseen %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:196
+#: ../libbalsa/mailbox_mh.c:197
 #, c-format
 msgid "Could not create MH structure at %s (%s)"
 msgstr "Ei voida luoda MH-rakennetta kohteeseen %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:1090
+#: ../libbalsa/mailbox_mh.c:1091
 #, c-format
 msgid "Cannot create message"
 msgstr "Viestiä ei voi luoda"
 
-#: ../libbalsa/mailbox_mh.c:1134
+#: ../libbalsa/mailbox_mh.c:1135
 #, c-format
 msgid "Message rename error"
 msgstr "Virhe uudelleennimettäessä viestä"
 
-#: ../libbalsa/mailbox_pop3.c:191
+#: ../libbalsa/mailbox_pop3.c:192
 #, c-format
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Virhe lisättäessä viestiä %d lähteestä %s kohteeseen %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:340
+#: ../libbalsa/mailbox_pop3.c:341
 #, c-format
 msgid "Saving POP message to %s failed"
 msgstr "POP-viestin tallennus kohteeseen %s epäonnistui"
 
-#: ../libbalsa/mailbox_pop3.c:347
+#: ../libbalsa/mailbox_pop3.c:348
 #, c-format
 msgid "Retrieving Message %d of %d"
 msgstr "Ladataan viestiä %d / %d"
 
-#: ../libbalsa/mailbox_pop3.c:370
+#: ../libbalsa/mailbox_pop3.c:371
 #, c-format
 msgid "Received %ld kB of %ld"
 msgstr "Ladattu %ld/%ld kt"
 
-#: ../libbalsa/mailbox_pop3.c:384
+#: ../libbalsa/mailbox_pop3.c:385
 #, c-format
 msgid "Saving POP message to %s failed."
 msgstr "POP-viestin tallennus kohteeseen %s epäonnistui."
 
-#: ../libbalsa/mailbox_pop3.c:394
+#: ../libbalsa/mailbox_pop3.c:395
 #, c-format
 msgid "Transferring POP message to %s failed."
 msgstr "POP-viestin siirto kohteeseen %s epäonnistui."
 
-#: ../libbalsa/mailbox_pop3.c:470
+#: ../libbalsa/mailbox_pop3.c:477
 #, c-format
 msgid ""
 "POP3 mailbox %s temp file error:\n"
@@ -969,204 +1323,241 @@ msgstr ""
 "POP3-kansion %s väliaikaistiedoston virhe:\n"
 "%s"
 
-#: ../libbalsa/mailbox_pop3.c:495
+#: ../libbalsa/mailbox_pop3.c:502
 #, c-format
 msgid "POP3 mailbox %s error: %s\n"
 msgstr "POP3-kansion %s virhe: %s\n"
 
-#: ../libbalsa/mailbox_pop3.c:532
+#: ../libbalsa/mailbox_pop3.c:540
 #, c-format
 msgid "POP3 message %d oversized: %d kB - skipped."
 msgstr "POP3-viesti %d on liian suuri: %d kt - ohitetaan."
 
-#: ../libbalsa/mailbox_pop3.c:544
+#: ../libbalsa/mailbox_pop3.c:552
 #, c-format
 msgid "POP3 error: cannot open %s for writing."
 msgstr "POP3-virhe: %s ei voida avata kirjoitettavaksi."
 
-#: ../libbalsa/mailbox_pop3.c:552
+#: ../libbalsa/mailbox_pop3.c:560
 #, c-format
 msgid "POP3 error: cannot close %s."
 msgstr "POP3-virhe: %s ei voida sulkea."
 
-#: ../libbalsa/mailbox_pop3.c:585
+#: ../libbalsa/mailbox_pop3.c:595
 #, c-format
 msgid "POP3 error: %s."
 msgstr "POP3-virhe: %s."
 
-#: ../libbalsa/message.c:601
+#: ../libbalsa/message.c:617
 #, c-format
 msgid "Mailbox (%s) is readonly: cannot change flags."
 msgstr "Kansio (%s) on vain luettavissa. Viestin lippuja ei voida muuttaa."
 
-#: ../libbalsa/misc.c:634
+#: ../libbalsa/misc.c:596
 msgid "west european"
 msgstr "länsieurooppalainen"
 
-#: ../libbalsa/misc.c:636 ../libbalsa/misc.c:670
+#: ../libbalsa/misc.c:598 ../libbalsa/misc.c:632
 msgid "east european"
 msgstr "itäeurooppalainen"
 
-#: ../libbalsa/misc.c:638
+#: ../libbalsa/misc.c:600
 msgid "south european"
 msgstr "eteläeurooppalainen"
 
-#: ../libbalsa/misc.c:640
+#: ../libbalsa/misc.c:602
 msgid "north european"
 msgstr "pohoiseurooppalainen"
 
-#: ../libbalsa/misc.c:642 ../libbalsa/misc.c:672
+#: ../libbalsa/misc.c:604 ../libbalsa/misc.c:634
 msgid "cyrillic"
 msgstr "kyrillinen"
 
-#: ../libbalsa/misc.c:644 ../libbalsa/misc.c:678
+#: ../libbalsa/misc.c:606 ../libbalsa/misc.c:640
 msgid "arabic"
 msgstr "arabialainen"
 
-#: ../libbalsa/misc.c:646 ../libbalsa/misc.c:674
+#: ../libbalsa/misc.c:608 ../libbalsa/misc.c:636
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: ../libbalsa/misc.c:648 ../libbalsa/misc.c:676
+#: ../libbalsa/misc.c:610 ../libbalsa/misc.c:638
 msgid "hebrew"
 msgstr "heprealainen"
 
-#: ../libbalsa/misc.c:650
+#: ../libbalsa/misc.c:612
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: ../libbalsa/misc.c:652
+#: ../libbalsa/misc.c:614
 msgid "nordic"
 msgstr "pohjoismaalainen"
 
-#: ../libbalsa/misc.c:654
+#: ../libbalsa/misc.c:616
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: ../libbalsa/misc.c:656 ../libbalsa/misc.c:680
+#: ../libbalsa/misc.c:618 ../libbalsa/misc.c:642
 msgid "baltic"
 msgstr "itämerellinen"
 
-#: ../libbalsa/misc.c:658
+#: ../libbalsa/misc.c:620
 msgid "celtic"
 msgstr "kelttiläinen"
 
-#: ../libbalsa/misc.c:660
+#: ../libbalsa/misc.c:622
 msgid "west europe (euro)"
 msgstr "länsi-eurooppa (euro)"
 
-#: ../libbalsa/misc.c:662
+#: ../libbalsa/misc.c:624
 msgid "russian"
 msgstr "venäläinen"
 
-#: ../libbalsa/misc.c:664
+#: ../libbalsa/misc.c:626
 msgid "ukrainian"
 msgstr "ukrainalainen"
 
-#: ../libbalsa/misc.c:666
+#: ../libbalsa/misc.c:628
 msgid "japanese"
 msgstr "japanilainen"
 
-#: ../libbalsa/misc.c:668
+#: ../libbalsa/misc.c:630
 msgid "korean"
 msgstr "korealainen"
 
-#: ../libbalsa/misc.c:993
+#: ../libbalsa/misc.c:831
+#, fuzzy, c-format
+#| msgid "Could not open trash: %s"
+msgid "Cannot open %s: %s"
+msgstr "Roskakoria ei voi avata: %s"
+
+#: ../libbalsa/misc.c:840
+#, c-format
+msgid "Cannot open %s: is a symbolic link"
+msgstr ""
+
+#: ../libbalsa/misc.c:967
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "Aikaraja ylitetty yrittäessä fcntl-lukkoa!"
 
-#: ../libbalsa/misc.c:1000
+#: ../libbalsa/misc.c:974
 #, c-format
 msgid "Waiting for fcntl lock... %d"
 msgstr "Odotetaan fcntl-lukkoa... %d"
 
-#: ../libbalsa/misc.c:1028
+#: ../libbalsa/misc.c:1002
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "Aikaraja yritetty ylittäessä flock-lukkoa!"
 
-#: ../libbalsa/misc.c:1035
+#: ../libbalsa/misc.c:1009
 #, c-format
 msgid "Waiting for flock attempt... %d"
 msgstr "Odotetaan flock-yritystä... %d"
 
-#: ../libbalsa/misc.c:1333
+#: ../libbalsa/misc.c:1290
 #, c-format
 msgid "LDAP Directory for %s"
 msgstr "LDAP-hakemisto käyttäjälle %s"
 
-#: ../libbalsa/rfc3156.c:87
-#, c-format
-msgid "Gpgme has been compiled without support for protocol %s."
-msgstr "Gpgme on käännetty ilman tukea protokollalle %s."
+#: ../libbalsa/rfc2445.c:90 ../libbalsa/rfc2445.c:683
+#: ../libbalsa/rfc2445.c:702 ../libbalsa/rfc3156.c:716
+msgid "unknown"
+msgstr "tuntematon"
 
-#: ../libbalsa/rfc3156.c:92
-#, c-format
-msgid "Crypto engine %s is not installed properly."
-msgstr "Salausmoottori %s ei ole asennettu kunnolla."
+#: ../libbalsa/rfc2445.c:91
+#, fuzzy
+#| msgid "Description"
+msgid "needs action"
+msgstr "Kuvaus"
 
-#: ../libbalsa/rfc3156.c:97
-#, c-format
-msgid ""
-"Crypto engine %s version %s is installed, but at least version %s is "
-"required."
+#: ../libbalsa/rfc2445.c:92
+#, fuzzy
+#| msgid "_Accept Once"
+msgid "accepted"
+msgstr "Hyväksy _kerran"
+
+#: ../libbalsa/rfc2445.c:93
+#, fuzzy
+#| msgid "undefined"
+msgid "declined"
+msgstr "määrittelemätön"
+
+#: ../libbalsa/rfc2445.c:94
+msgid "tentatively accepted"
 msgstr ""
-"Salausmoottorin %s versio %s on asennettu, mutta vaaditaan vähintään versio %"
-"s."
 
-#: ../libbalsa/rfc3156.c:104
-#, c-format
-msgid "Unknown problem with engine for protocol %s."
-msgstr "Tuntematon salausmoottorin virhe protokollalle %s."
+#: ../libbalsa/rfc2445.c:95
+#, fuzzy
+#| msgid "_Undelete"
+msgid "delegated"
+msgstr "P_alauta viesti"
 
-#: ../libbalsa/rfc3156.c:109
-#, c-format
-msgid "%s: could not retrieve crypto engine information: %s."
-msgstr "%s: ei voi hakea salausmoottorin tietoja: %s."
+#: ../libbalsa/rfc2445.c:96
+#, fuzzy
+#| msgid "Auto-complete"
+msgid "completed"
+msgstr "Automaattinen täydennys"
 
-#: ../libbalsa/rfc3156.c:113
-#, c-format
-msgid ""
-"\n"
-"Disable support for protocol %s."
+#: ../libbalsa/rfc2445.c:97
+msgid "in process"
 msgstr ""
-"\n"
-"Otetaan protokollan %s tuki pois käytöstä."
 
-#: ../libbalsa/rfc3156.c:264 ../libbalsa/rfc3156.c:715
-msgid "Enter passphrase to unlock the secret key for signing"
-msgstr "Syötä tunnuslause salaiselle avaimelle allekirjoitusta varten"
+#: ../libbalsa/rfc2445.c:684
+#, fuzzy
+#| msgid "Notification:"
+msgid "Event Notification"
+msgstr "Ilmoitus:"
+
+#: ../libbalsa/rfc2445.c:685
+msgid "Event Request"
+msgstr ""
+
+#: ../libbalsa/rfc2445.c:686
+#, fuzzy
+#| msgid "Reply to mailing list"
+msgid "Reply to Event Request"
+msgstr "Vastaa listalle"
+
+#: ../libbalsa/rfc2445.c:687
+msgid "Event Cancellation"
+msgstr ""
+
+#: ../libbalsa/rfc2445.c:703
+msgid "chair"
+msgstr ""
+
+#: ../libbalsa/rfc2445.c:704
+msgid "required participant"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:482 ../libbalsa/rfc3156.c:487
-#: ../libbalsa/rfc3156.c:592 ../libbalsa/rfc3156.c:597
-#: ../libbalsa/rfc3156.c:781 ../libbalsa/rfc3156.c:786
-#: ../libbalsa/rfc3156.c:861 ../libbalsa/rfc3156.c:866
-msgid "creating a gpgme context failed"
-msgstr "gpgme-kontekstin luonti epäonnistui"
+#: ../libbalsa/rfc2445.c:705
+msgid "optional participant"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:609 ../libbalsa/rfc3156.c:877
-msgid "Enter passphrase to decrypt message"
-msgstr "Syötä tunnuslause salauksen avaamista varten"
+#: ../libbalsa/rfc2445.c:706
+msgid "non-participant, information only"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:886 ../libbalsa/rfc3156.c:893
+#: ../libbalsa/rfc3156.c:626 ../libbalsa/rfc3156.c:633
 msgid "decryption and signature verification failed"
 msgstr "salauksen purku ja allekirjoituksen varmistaminen epäonnistuivat"
 
-#: ../libbalsa/rfc3156.c:924
+#: ../libbalsa/rfc3156.c:659
 msgid "The signature is valid."
 msgstr "Allekirjoitus on kelvollinen."
 
-#: ../libbalsa/rfc3156.c:926
+#: ../libbalsa/rfc3156.c:661
 msgid "The signature is valid but expired."
 msgstr "Allekirjoitus on kelvollinen, mutta vanhentunut."
 
-#: ../libbalsa/rfc3156.c:929
+#: ../libbalsa/rfc3156.c:664
 msgid ""
 "The signature is valid but the key used to verify the signature has expired."
 msgstr ""
 "Allekirjoitus on kelvollinen, mutta sen varmistamiseen käytettävä avain on "
 "vanhentunut."
 
-#: ../libbalsa/rfc3156.c:932
+#: ../libbalsa/rfc3156.c:667
 msgid ""
 "The signature is valid but the key used to verify the signature has been "
 "revoked."
@@ -1174,134 +1565,163 @@ msgstr ""
 "Allekirjoitus on kelvollinen, mutta sen varmistamiseen käytettävä avain on "
 "peruttu."
 
-#: ../libbalsa/rfc3156.c:935
+#: ../libbalsa/rfc3156.c:670
 msgid "The signature is invalid."
 msgstr "Allekirjoitus on virheellinen."
 
-#: ../libbalsa/rfc3156.c:938
+#: ../libbalsa/rfc3156.c:673
 msgid "The signature could not be verified due to a missing key."
 msgstr "Allekirjoitusta ei voi varmistaa, koska avain puuttuu."
 
-#: ../libbalsa/rfc3156.c:940
+#: ../libbalsa/rfc3156.c:675
 msgid "This part is not a real PGP signature."
 msgstr "Tämä osa ei ole oikea PGP-allekirjoitus"
 
-#: ../libbalsa/rfc3156.c:943
+#: ../libbalsa/rfc3156.c:678
 msgid "The signature could not be verified due to an invalid crypto engine."
 msgstr "Allekirjoitusta ei voi varmistaa virheellisen salausmoottorin takia."
 
-#: ../libbalsa/rfc3156.c:946 ../libbalsa/rfc3156.c:1688
+#: ../libbalsa/rfc3156.c:681 ../libbalsa/rfc3156.c:1044
 msgid "GnuPG is rebuilding the trust database and is currently unavailable."
 msgstr "GnuPG on päivittämässä luottamustietokantaa eikä ole käytettävissä."
 
-#: ../libbalsa/rfc3156.c:949
+#: ../libbalsa/rfc3156.c:684
 msgid "An error prevented the signature verification."
 msgstr "Virhe esti allekirjoituksen varmistamisen."
 
-#: ../libbalsa/rfc3156.c:957
+#: ../libbalsa/rfc3156.c:694
 msgid "The user ID is of unknown validity."
 msgstr "Käyttäjätunnisteen luotettavuutta ei tunneta."
 
-#: ../libbalsa/rfc3156.c:959
+#: ../libbalsa/rfc3156.c:696
 msgid "The validity of the user ID is undefined."
 msgstr "Käyttäjätunnisteen luotettavuutta ei ole määritelty."
 
-#: ../libbalsa/rfc3156.c:961
+#: ../libbalsa/rfc3156.c:698
 msgid "The user ID is never valid."
 msgstr "Käyttäjätunniste ei ole koskaan luotettava."
 
-#: ../libbalsa/rfc3156.c:963
+#: ../libbalsa/rfc3156.c:700
 msgid "The user ID is marginally valid."
 msgstr "Käyttäjätunniste on rajatusti luotettava."
 
-#: ../libbalsa/rfc3156.c:965
+#: ../libbalsa/rfc3156.c:702
 msgid "The user ID is fully valid."
 msgstr "Käyttäjätunniste on täysin luotettava."
 
-#: ../libbalsa/rfc3156.c:967
+#: ../libbalsa/rfc3156.c:704
 msgid "The user ID is ultimately valid."
 msgstr "Käyttäjätunniste on ehdottoman luotettava."
 
-#: ../libbalsa/rfc3156.c:969 ../libbalsa/rfc3156.c:1216
+#: ../libbalsa/rfc3156.c:706 ../libbalsa/rfc3156.c:728
 msgid "bad validity"
 msgstr "epäkelpo"
 
-#: ../libbalsa/rfc3156.c:977
+#: ../libbalsa/rfc3156.c:718
+msgid "undefined"
+msgstr "määrittelemätön"
+
+#: ../libbalsa/rfc3156.c:720 ../libbalsa/rfc3156.c:755
+#: ../src/address-book-config.c:200
+msgid "never"
+msgstr "ei koskaan"
+
+#: ../libbalsa/rfc3156.c:722
+msgid "marginal"
+msgstr "jonkin verran"
+
+#: ../libbalsa/rfc3156.c:724
+msgid "full"
+msgstr "kokonaan"
+
+#: ../libbalsa/rfc3156.c:726
+msgid "ultimate"
+msgstr "ehdottomasti"
+
+#: ../libbalsa/rfc3156.c:738
 msgid "PGP signature: "
 msgstr "PGP-allekirjoitus:"
 
-#: ../libbalsa/rfc3156.c:979
+#: ../libbalsa/rfc3156.c:740
 msgid "S/MIME signature: "
 msgstr "S/MIME-allekirjoitus:"
 
-#: ../libbalsa/rfc3156.c:981
+#: ../libbalsa/rfc3156.c:742
 msgid "(unknown protocol) "
 msgstr "(tuntematon protokolla)"
 
-#: ../libbalsa/rfc3156.c:1000
-#, c-format
+#: ../libbalsa/rfc3156.c:772
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "User ID validity: %s"
 msgid ""
 "\n"
-"User ID: %s"
+"Signature validity: %s"
 msgstr ""
 "\n"
-"Käyttäjätunniste: %s"
+"Käyttäjätunnisteen kelvollisuus: %s"
 
-#: ../libbalsa/rfc3156.c:1003
+#: ../libbalsa/rfc3156.c:775
 #, c-format
 msgid ""
 "\n"
-"Signed by: %s"
+"Signed on: %s"
 msgstr ""
 "\n"
-"Allekirjoittanut: %s"
+"Allekirjoitettu: %s"
 
-#: ../libbalsa/rfc3156.c:1007
+#: ../libbalsa/rfc3156.c:777
 #, c-format
 msgid ""
 "\n"
-"Mail address: %s"
+"Key owner trust: %s"
 msgstr ""
 "\n"
-"Postitusosoite: %s"
+"Avaimen omistajan luotettavuus: %s"
 
-#: ../libbalsa/rfc3156.c:1012
+#: ../libbalsa/rfc3156.c:781
 #, c-format
 msgid ""
 "\n"
-"Signed on: %s"
+"Key fingerprint: %s"
 msgstr ""
 "\n"
-"Allekirjoitettu: %s"
+"Avaimen sormenjälki: %s"
 
-#: ../libbalsa/rfc3156.c:1014
-#, c-format
+#: ../libbalsa/rfc3156.c:795
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "User ID: %s"
 msgid ""
 "\n"
-"User ID validity: %s"
+"User ID's:"
 msgstr ""
 "\n"
-"Käyttäjätunnisteen kelvollisuus: %s"
+"Käyttäjätunniste: %s"
 
-#: ../libbalsa/rfc3156.c:1018
-#, c-format
+#: ../libbalsa/rfc3156.c:798
+#, fuzzy
+#| msgid "User ID"
 msgid ""
 "\n"
-"Key owner trust: %s"
-msgstr ""
-"\n"
-"Avaimen omistajan luotettavuus: %s"
+"User ID:"
+msgstr "Käyttäjätunniste"
 
-#: ../libbalsa/rfc3156.c:1022
-#, c-format
-msgid ""
-"\n"
-"Key fingerprint: %s"
-msgstr ""
-"\n"
-"Avaimen sormenjälki: %s"
+#: ../libbalsa/rfc3156.c:809
+#, fuzzy
+#| msgid " revoked"
+msgid " [Revoked]"
+msgstr " peruttu"
+
+#: ../libbalsa/rfc3156.c:811
+#, fuzzy
+#| msgid " invalid"
+msgid " [Invalid]"
+msgstr "virheellinen"
 
-#: ../libbalsa/rfc3156.c:1027
+#: ../libbalsa/rfc3156.c:838
 #, c-format
 msgid ""
 "\n"
@@ -1310,7 +1730,7 @@ msgstr ""
 "\n"
 "Aliavain luotu: %s"
 
-#: ../libbalsa/rfc3156.c:1032
+#: ../libbalsa/rfc3156.c:840
 #, c-format
 msgid ""
 "\n"
@@ -1319,25 +1739,25 @@ msgstr ""
 "\n"
 "Aliavain vanhenee: %s"
 
-#: ../libbalsa/rfc3156.c:1041
+#: ../libbalsa/rfc3156.c:849
 msgid " revoked"
 msgstr " peruttu"
 
-#: ../libbalsa/rfc3156.c:1046
+#: ../libbalsa/rfc3156.c:854
 msgid " expired"
 msgstr "vanhentunut"
 
-#: ../libbalsa/rfc3156.c:1051
+#: ../libbalsa/rfc3156.c:859
 msgid " disabled"
 msgstr "poissa käytöstä"
 
-#: ../libbalsa/rfc3156.c:1056
+#: ../libbalsa/rfc3156.c:864
 msgid " invalid"
 msgstr "virheellinen"
 
-#. ngettext: string begins with a single space, so no space after
-#. * the colon is correct punctuation (in English).
-#: ../libbalsa/rfc3156.c:1060
+#. ngettext: string begins with a single space, so no space
+#. * after the colon is correct punctuation (in English).
+#: ../libbalsa/rfc3156.c:868
 #, c-format
 msgid ""
 "\n"
@@ -1352,7 +1772,7 @@ msgstr[1] ""
 "\n"
 "Aliavaimen ominaisuudet:%s"
 
-#: ../libbalsa/rfc3156.c:1069
+#: ../libbalsa/rfc3156.c:880
 #, c-format
 msgid ""
 "\n"
@@ -1361,7 +1781,7 @@ msgstr ""
 "\n"
 "Myöntäjän nimi: %s"
 
-#: ../libbalsa/rfc3156.c:1073
+#: ../libbalsa/rfc3156.c:884
 #, c-format
 msgid ""
 "\n"
@@ -1370,7 +1790,7 @@ msgstr ""
 "\n"
 "Myöntäjän sarjanumero: %s"
 
-#: ../libbalsa/rfc3156.c:1076
+#: ../libbalsa/rfc3156.c:887
 #, c-format
 msgid ""
 "\n"
@@ -1379,116 +1799,49 @@ msgstr ""
 "\n"
 "Ketjun tunniste: %s"
 
-#: ../libbalsa/rfc3156.c:1123
-#, c-format
-msgid "Could not launch %s to get the public key %s."
+#: ../libbalsa/rfc3156.c:946
+#, fuzzy, c-format
+#| msgid "Could not launch %s to get the public key %s."
+msgid "Could not launch %s to query the public key %s."
 msgstr "Komentoa %s ei voi käynnistää julkisen avaimen %s hakuun."
 
-#: ../libbalsa/rfc3156.c:1173
-#, c-format
+#: ../libbalsa/rfc3156.c:996
+#, fuzzy, c-format
+#| msgid ""
+#| "Running gpg failed with return value %d:\n"
+#| "%s"
 msgid ""
-"Running gpg failed with return value %d:\n"
+"Running %s failed with return value %d:\n"
 "%s"
 msgstr ""
 "Komennon gpg suoritus epäonnistui paluuarvolla %d:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1180
-#, c-format
+#: ../libbalsa/rfc3156.c:1003
+#, fuzzy, c-format
+#| msgid ""
+#| "Running gpg successful:\n"
+#| "%s"
 msgid ""
-"Running gpg successful:\n"
+"Running %s successful:\n"
 "%s"
 msgstr ""
 "Komento pgp suoritettu onnistuneesti:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1204
-msgid "unknown"
-msgstr "tuntematon"
-
-#: ../libbalsa/rfc3156.c:1206
-msgid "undefined"
-msgstr "määrittelemätön"
-
-#: ../libbalsa/rfc3156.c:1208 ../src/address-book-config.c:193
-msgid "never"
-msgstr "ei koskaan"
-
-#: ../libbalsa/rfc3156.c:1210
-msgid "marginal"
-msgstr "jonkin verran"
-
-#: ../libbalsa/rfc3156.c:1212
-msgid "full"
-msgstr "kokonaan"
-
-#: ../libbalsa/rfc3156.c:1214
-msgid "ultimate"
-msgstr "ehdottomasti"
-
-#: ../libbalsa/rfc3156.c:1277
-msgid "User ID"
-msgstr "Käyttäjätunniste"
-
-#: ../libbalsa/rfc3156.c:1277
-msgid "Key ID"
-msgstr "Avaimen tunniste"
-
-#: ../libbalsa/rfc3156.c:1277
-msgid "Length"
-msgstr "Pituus"
-
-#: ../libbalsa/rfc3156.c:1277
-msgid "Validity"
-msgstr "Voimassaolo"
-
-#. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/rfc3156.c:1321
-msgid "Select key"
-msgstr "Valitse avain"
-
-#: ../libbalsa/rfc3156.c:1332
-#, c-format
-msgid "Select the private key for the signer %s"
-msgstr "Valitse allekirjoittajan %s salainen avain"
-
-#: ../libbalsa/rfc3156.c:1336
-#, c-format
-msgid "Select the public key for the recipient %s"
-msgstr "Valitse julkinen avain vastaanottajalle %s"
-
-#: ../libbalsa/rfc3156.c:1467
-#, c-format
-msgid "Insufficient trust for recipient %s"
-msgstr "Vastaanottajaan %s ei luoteta tarpeeksi"
-
-#: ../libbalsa/rfc3156.c:1469
-#, c-format
-msgid "The validity of the key with user ID \"%s\" is \"%s\"."
-msgstr "Avaimen tunnisteella \"%s\" kelpoisuus on \"%s\""
-
-#: ../libbalsa/rfc3156.c:1480
-msgid "Use this key anyway?"
-msgstr "Käytetäänkö avainta joka tapauksessa?"
-
-#: ../libbalsa/rfc3156.c:1689
+#: ../libbalsa/rfc3156.c:1045
 msgid "Try again later."
 msgstr "Yritä myöhemmin uudestaan."
 
-#: ../libbalsa/send.c:245 ../libbalsa/send.c:252
+#: ../libbalsa/send.c:253 ../libbalsa/send.c:260
 msgid "Sending Mail..."
 msgstr "Lähetetään postia..."
 
-#: ../libbalsa/send.c:248 ../src/main-window.c:2611
+#: ../libbalsa/send.c:256 ../src/main-window.c:2876
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../libbalsa/send.c:455
-#, c-format
-msgid "Copying message to outbox failed: %s"
-msgstr "Viestin kopiointi lähtevien kansioon epäonnistui: %s"
-
-#: ../libbalsa/send.c:875
+#: ../libbalsa/send.c:951
 #, c-format
 msgid ""
 "Could not send the message to %s:\n"
@@ -1499,12 +1852,12 @@ msgstr ""
 "%d: %s\n"
 "Viesti jätettiin lähtevien kansioosi.\n"
 
-#: ../libbalsa/send.c:921
+#: ../libbalsa/send.c:997
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Lähetetyt viestin tallennus kansioon %s epäonnistui: %s"
 
-#: ../libbalsa/send.c:940 ../libbalsa/send.c:952
+#: ../libbalsa/send.c:1027 ../libbalsa/send.c:1039
 #, c-format
 msgid ""
 "Relaying refused:\n"
@@ -1515,7 +1868,7 @@ msgstr ""
 "%d: %s\n"
 "Viesti jätetty lähtevien kansioon.\n"
 
-#: ../libbalsa/send.c:959
+#: ../libbalsa/send.c:1046
 msgid ""
 "Message submission problem, placing it into your outbox.\n"
 "System will attempt to resubmit the message until you delete it."
@@ -1523,39 +1876,39 @@ msgstr ""
 "Viestinkuljetusongelma, sijoitetaan lähteviin.\n"
 "Järjestelmä yrittää viestin lähettämistä kunnes poistat sen."
 
-#: ../libbalsa/send.c:989
+#: ../libbalsa/send.c:1076
 msgid "Connected to MTA"
 msgstr "Yhdistetty MTA:han"
 
 #. status code, mailbox
-#: ../libbalsa/send.c:998
+#: ../libbalsa/send.c:1085
 #, c-format
 msgid "From: %d <%s>"
 msgstr "Alkaen: %d <%s>"
 
 #. mailbox, status code, status text
-#: ../libbalsa/send.c:1002
+#: ../libbalsa/send.c:1089
 #, c-format
 msgid "From %s: %d %s"
 msgstr "Alkaen %s: %d %s"
 
 #. status code, mailbox
-#: ../libbalsa/send.c:1013
+#: ../libbalsa/send.c:1100
 #, c-format
 msgid "To: %d <%s>"
 msgstr "Saakka: %d <%s>"
 
 #. mailbox, status code, status text
-#: ../libbalsa/send.c:1017
+#: ../libbalsa/send.c:1104
 #, c-format
 msgid "To %s: %d %s"
 msgstr "Alkaen %s: %d %s"
 
-#: ../libbalsa/send.c:1055
+#: ../libbalsa/send.c:1142
 msgid "Disconnected"
 msgstr "Yhteys suljettu"
 
-#: ../libbalsa/send.c:1335
+#: ../libbalsa/send.c:1424
 msgid ""
 "SMTP server refused connection.\n"
 "Check your internet connection."
@@ -1563,7 +1916,7 @@ msgstr ""
 "SMTP-palvelin hylkäsi yhteyden.n\n"
 "Tarkista Internet-yhteytesi tila."
 
-#: ../libbalsa/send.c:1340
+#: ../libbalsa/send.c:1429
 msgid ""
 "SMTP server cannot be reached.\n"
 "Check your internet connection."
@@ -1571,11 +1924,11 @@ msgstr ""
 "SMTP-palvelimeen ei saada yhteyttä.\n"
 "Tarkista Internet-yhteytesi tila."
 
-#: ../libbalsa/send.c:1349
+#: ../libbalsa/send.c:1438
 msgid "Message left in Outbox (try again later)"
 msgstr "Viesti jätetty lähtevien kansioon (yritä myöhemmin uudestaan)"
 
-#: ../libbalsa/send.c:1353
+#: ../libbalsa/send.c:1442
 #, c-format
 msgid ""
 "SMTP server problem (%d): %s\n"
@@ -1584,183 +1937,275 @@ msgstr ""
 "Ongelma SMTP-palvelimella (%d): %s\n"
 "Viesti jätetty lähtevien kansioon."
 
-#: ../libbalsa/send.c:1658
+#: ../libbalsa/send.c:1757 ../libbalsa/send.c:1826
+#, fuzzy, c-format
+#| msgid "Cannot read message"
+msgid "Cannot read %s: %s"
+msgstr "Viestiä ei voi lukea"
+
+#: ../libbalsa/send.c:1760 ../libbalsa/send.c:1829
+#, fuzzy, c-format
+#| msgid "Cannot read message"
+msgid "Cannot read %s"
+msgstr "Viestiä ei voi lukea"
+
+#: ../libbalsa/send.c:1790
 #, c-format
 msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
 msgstr ""
-"Tekstitiedoston \"%s\" merkistöä ei voi päätellä, lähetetään MIME-tyypillä "
-"\"%s\""
-
-#: ../libbalsa/send.c:1864
-#, c-format
-msgid "Postponing message failed: %s"
-msgstr "Viestin lykkääminen epäonnistui: %s"
-
-#: ../libbalsa/send.c:2007 ../libbalsa/send.c:2088
+"Tekstitiedoston \"%s\" merkistöä ei voi päätellä, lähetetään MIME-tyypillä \""
+"%s\""
+
+#: ../libbalsa/send.c:2142
+#, fuzzy
+#| msgid "This message will not be encrypted for the BCC: recipient(s)."
+msgid "This message will not be encrypted for the BCC: recipient."
+msgid_plural "This message will not be encrypted for the BCC: recipients."
+msgstr[0] "Tätä viestiä ei salata BCC:-vastaanottajille"
+msgstr[1] "Tätä viestiä ei salata BCC:-vastaanottajille"
+
+#: ../libbalsa/send.c:2230
 msgid "This message will not be encrypted for the BCC: recipient(s)."
 msgstr "Tätä viestiä ei salata BCC:-vastaanottajille"
 
 #. host, authentication method
-#: ../libbalsa/server.c:367
+#: ../libbalsa/server.c:431
 #, c-format
 msgid "Logging in to %s using %s"
 msgstr "Kirjaudutaan palvelimelle %s käyttäen %s"
 
-#: ../libbalsa/smtp-server.c:377 ../src/mailbox-conf.c:204
-#: ../src/mailbox-conf.c:1393 ../src/pref-manager.c:388
-#: ../src/pref-manager.c:3247
+#: ../libbalsa/smtp-server.c:386 ../libbalsa/smtp-server.c:394
+#: ../src/mailbox-conf.c:210 ../src/mailbox-conf.c:1510
+#: ../src/pref-manager.c:404 ../src/pref-manager.c:3430
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../libbalsa/smtp-server.c:378 ../src/mailbox-conf.c:205
-#: ../src/mailbox-conf.c:1394
+#: ../libbalsa/smtp-server.c:388 ../libbalsa/smtp-server.c:395
+#: ../src/mailbox-conf.c:211 ../src/mailbox-conf.c:1511
 msgid "If Possible"
 msgstr "Jos mahdollista"
 
-#: ../libbalsa/smtp-server.c:379 ../src/mailbox-conf.c:206
+#: ../libbalsa/smtp-server.c:390 ../libbalsa/smtp-server.c:396
+#: ../src/mailbox-conf.c:212
 msgid "Required"
 msgstr "Vaaditaan"
 
-#: ../libbalsa/smtp-server.c:416 ../src/folder-conf.c:105
-#, c-format
-msgid "Error displaying %s: %s\n"
-msgstr "Virhe näytettäessä %s: %s\n"
+#: ../libbalsa/smtp-server.c:430
+#, fuzzy, c-format
+#| msgid "Error displaying help: %s\n"
+msgid "Error displaying server help: %s\n"
+msgstr "Virhe näytettäessä ohjetta: %s\n"
 
-#: ../libbalsa/smtp-server.c:532
+#: ../libbalsa/smtp-server.c:545
 msgid "SMTP Server"
 msgstr "SMTP-palvelin"
 
-#: ../libbalsa/smtp-server.c:554
+#: ../libbalsa/smtp-server.c:572
 msgid "_Descriptive Name:"
 msgstr "_Kuvaava nimi:"
 
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:561 ../src/folder-conf.c:361
-#: ../src/mailbox-conf.c:1145 ../src/mailbox-conf.c:1248
+#: ../libbalsa/smtp-server.c:579 ../src/folder-conf.c:377
+#: ../src/mailbox-conf.c:1234 ../src/mailbox-conf.c:1347
 msgid "_Server:"
 msgstr "P_alvelin:"
 
-#: ../libbalsa/smtp-server.c:568
+#: ../libbalsa/smtp-server.c:586
 msgid "_User Name:"
 msgstr "Käyttäjä_tunnus:"
 
-#: ../libbalsa/smtp-server.c:575
+#: ../libbalsa/smtp-server.c:593
 msgid "_Pass Phrase:"
 msgstr "_Salalause:"
 
-#: ../libbalsa/smtp-server.c:584 ../src/mailbox-conf.c:225
+#: ../libbalsa/smtp-server.c:602 ../src/mailbox-conf.c:242
 msgid "Use _TLS:"
 msgstr "Käytä _TLS:ää:"
 
-#: ../libbalsa/smtp-server.c:589
+#: ../libbalsa/smtp-server.c:607
 msgid "C_ertificate Pass Phrase:"
 msgstr "_Varmenteen salalause:"
 
-#: ../libbalsa/smtp-server.c:601
+#: ../libbalsa/smtp-server.c:619
 msgid "Sp_lit message larger than"
 msgstr "_Jaa viestit joka ovat suurempia kuin"
 
-#: ../libbalsa/smtp-server.c:607 ../src/pref-manager.c:1826
+#: ../libbalsa/smtp-server.c:625 ../src/pref-manager.c:1918
 msgid "MB"
 msgstr "Mt"
 
+#. Top level
+#. Menus
+#: ../libbalsa/source-viewer.c:46 ../src/ab-main.c:553
+#: ../src/main-window.c:346 ../src/message-window.c:239
+#: ../src/sendmsg-window.c:320
+#, fuzzy
+#| msgid "_Filters"
+msgid "_File"
+msgstr "_Suodattimet..."
+
+#: ../libbalsa/source-viewer.c:47 ../src/filter-edit-dialog.c:332
+#: ../src/main-window.c:347 ../src/message-window.c:240
+#: ../src/sendmsg-window.c:321
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ../libbalsa/source-viewer.c:48 ../src/main-window.c:348
+#: ../src/message-window.c:241
+msgid "_View"
+msgstr ""
+
 #. Items
-#: ../libbalsa/source-viewer.c:47 ../src/mailbox-node.c:1070
-#: ../src/main-window.c:470 ../src/message-window.c:230
-#: ../src/sendmsg-window.c:332
+#: ../libbalsa/source-viewer.c:50 ../src/mailbox-node.c:1096
+#: ../src/main-window.c:521 ../src/message-window.c:248
+#: ../src/sendmsg-window.c:350
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../libbalsa/source-viewer.c:48
+#: ../libbalsa/source-viewer.c:51
 msgid "Close the window"
 msgstr "Sulje ikkuna"
 
 #. Edit menu items
-#: ../libbalsa/source-viewer.c:49 ../src/main-window.c:391
-#: ../src/main-window.c:526 ../src/message-window.c:233
-#: ../src/sendmsg-window.c:340
+#: ../libbalsa/source-viewer.c:52 ../src/main-window.c:421
+#: ../src/main-window.c:587 ../src/message-window.c:251
+#: ../src/sendmsg-window.c:358
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../libbalsa/source-viewer.c:50
+#: ../libbalsa/source-viewer.c:53
 msgid "Copy text"
 msgstr "Kopioi teksti"
 
-#: ../libbalsa/source-viewer.c:51 ../src/main-window.c:528
+#: ../libbalsa/source-viewer.c:54 ../src/main-window.c:589
 msgid "_Select Text"
 msgstr "_Valitse teksti"
 
-#: ../libbalsa/source-viewer.c:52 ../src/main-window.c:529
+#: ../libbalsa/source-viewer.c:55 ../src/main-window.c:590
 msgid "Select entire mail"
 msgstr "Valitse koko viesti"
 
-#: ../libbalsa/source-viewer.c:57
+#: ../libbalsa/source-viewer.c:60
 msgid "_Escape Special Characters"
 msgstr "_Käsittele erikoismerkit"
 
-#: ../libbalsa/source-viewer.c:58
+#: ../libbalsa/source-viewer.c:61
 msgid "Escape special and non-ASCII characters"
 msgstr "Käsittele erikseen erikois- ja muut kuin ASCII-merkit"
 
-#: ../libbalsa/source-viewer.c:154
+#: ../libbalsa/source-viewer.c:159
 msgid "Mailbox closed"
 msgstr "Kansio suljettu"
 
-#: ../libbalsa/source-viewer.c:257
+#: ../libbalsa/source-viewer.c:280
 msgid "Message Source"
 msgstr "Viestin lähdekoodi"
 
-#: ../libinit_balsa/balsa-druid-page-defclient.c:58
-msgid "Use balsa as default email client?"
+#: ../libinit_balsa/assistant_helper.c:68
+#, c-format
+msgid "Error loading %s: %s\n"
+msgstr "Virhe ladattaessa %s: %s\n"
+
+#: ../libinit_balsa/assistant_helper.c:216
+#, c-format
+msgid "The path %s must be relative to the filesystem root (start with /)."
+msgstr ""
+"Hakemiston %s täytyy löytyä jostain tiedostojärjestelmän juuren\n"
+"jälkeen (/ eteenpäin)"
+
+#: ../libinit_balsa/assistant_helper.c:228
+#, fuzzy, c-format
+#| msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+msgid ""
+"Couldn't create a directory: mkdir() failed on pathname \"%s\", with error \""
+"%s\"."
+msgstr "Ei voida luoda hakemistoa: \"%s\"."
+
+#: ../libinit_balsa/assistant_helper.c:240
+#: ../libinit_balsa/assistant_helper.c:263
+#, c-format
+msgid "The file with pathname \"%s\" is not a directory."
+msgstr "Tiedosto \"%s\" ei ole hakemisto."
+
+#: ../libinit_balsa/assistant_helper.c:254
+#, c-format
+msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+msgstr "Ei voida luoda hakemistoa: \"%s\"."
+
+#: ../libinit_balsa/assistant_init.c:51
+msgid ""
+"This will exit Balsa.\n"
+"Do you really want to do this?"
+msgstr ""
+"Tämä lopettaa Balsan.\n"
+"Haluatko varmasti lopettaa?"
+
+#: ../libinit_balsa/assistant_init.c:74
+msgid "GnomeCard Address Book"
+msgstr "GNOME-Kortit (GnomeCard)"
+
+#: ../libinit_balsa/assistant_init.c:81 ../libinit_balsa/assistant_init.c:89
+#: ../src/ab-window.c:236
+msgid "Address Book"
+msgstr "Osoitekirja"
+
+#: ../libinit_balsa/assistant_init.c:148
+msgid "Configure Balsa"
+msgstr "Balsan asetukset"
+
+#: ../libinit_balsa/assistant_page_defclient.c:59
+#, fuzzy
+#| msgid "Use balsa as default email client?"
+msgid "Use Balsa as default email client?"
 msgstr "Käytä Balsaa sähköpostin oletusohjelmana?"
 
-#: ../libinit_balsa/balsa-druid-page-defclient.c:62
+#: ../libinit_balsa/assistant_page_defclient.c:63
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: ../libinit_balsa/balsa-druid-page-defclient.c:64
+#: ../libinit_balsa/assistant_page_defclient.c:65
 msgid "_No"
 msgstr "_Ei"
 
-#: ../libinit_balsa/balsa-druid-page-defclient.c:100
+#: ../libinit_balsa/assistant_page_defclient.c:102
 msgid "Default Client"
 msgstr "Oletusasiakas"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:45
+#: ../libinit_balsa/assistant_page_directory.c:60
 msgid "_Inbox:"
 msgstr "_Saapuneet:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:45
+#: ../libinit_balsa/assistant_page_directory.c:60
 msgid "_Outbox:"
 msgstr "Lähtevät:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:45
+#: ../libinit_balsa/assistant_page_directory.c:60
 msgid "_Sentbox:"
 msgstr "Läh_etetyt:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:45
+#: ../libinit_balsa/assistant_page_directory.c:60
 msgid "_Draftbox:"
 msgstr "L_uonnokset:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:46
+#: ../libinit_balsa/assistant_page_directory.c:61
 msgid "_Trash:"
 msgstr "Roskakori:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:73
+#: ../libinit_balsa/assistant_page_directory.c:95
 #, c-format
 msgid ""
-"The pathname \"%s\" must be specified canonically -- it must start with a "
-"'/'."
+"The pathname \"%s\" must be specified canonically -- it must start with a '/"
+"'."
 msgstr ""
 "Polku \"%s\" on määriteltävä kanonisesti -- sen täytyy alkaa '/'-merkillä."
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:137
+#: ../libinit_balsa/assistant_page_directory.c:161
 #, c-format
 msgid "The mailbox \"%s\" does not appear to be valid."
 msgstr "Kansio \"%s\" ei näytä olevan kelvollinen."
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:187
+#: ../libinit_balsa/assistant_page_directory.c:204
 msgid ""
 "Please verify the locations of your default mail files.\n"
 "These will be created if necessary."
@@ -1768,12 +2213,12 @@ msgstr ""
 "Varmista postitiedostojesi sijainnit.\n"
 "Nämä luodaan, jos se on tarpeellista."
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:242
+#: ../libinit_balsa/assistant_page_directory.c:266
 msgid "Mail Files"
 msgstr "Postitiedostot"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:345
-#: ../libinit_balsa/balsa-druid-page-directory.c:379
+#: ../libinit_balsa/assistant_page_directory.c:362
+#: ../libinit_balsa/assistant_page_directory.c:396
 #, c-format
 msgid ""
 "Problem Creating Mailboxes\n"
@@ -1782,7 +2227,7 @@ msgstr ""
 "Ongelmia luodessa postikansioita\n"
 "%s"
 
-#: ../libinit_balsa/balsa-druid-page-finish.c:41
+#: ../libinit_balsa/assistant_page_finish.c:44
 msgid ""
 "You've successfully set up Balsa. Have fun!\n"
 "   -- The Balsa development team"
@@ -1790,20 +2235,11 @@ msgstr ""
 "Balsan asetukset määritetty. Pidä hauskaa!\n"
 "   -- Balsan kehitystiimi"
 
-#: ../libinit_balsa/balsa-druid-page-finish.c:47
+#: ../libinit_balsa/assistant_page_finish.c:49
 msgid "All Done!"
 msgstr "Kaikki tehty!"
 
-#: ../libinit_balsa/balsa-druid-page-finish.c:77
-msgid "GnomeCard Address Book"
-msgstr "GNOME-Kortit (GnomeCard)"
-
-#: ../libinit_balsa/balsa-druid-page-finish.c:84
-#: ../libinit_balsa/balsa-druid-page-finish.c:92 ../src/ab-window.c:229
-msgid "Address Book"
-msgstr "Osoitekirja"
-
-#: ../libinit_balsa/balsa-druid-page-user.c:72
+#: ../libinit_balsa/assistant_page_user.c:57
 msgid ""
 "The following settings are also needed (and you can find them later, if need "
 "be, in the Email application in the 'Preferences' and 'Identities' commands "
@@ -1812,7 +2248,7 @@ msgstr ""
 "Seuraavat asetukset vaaditaan lisäksi. Voit muuttaa niitä myöhemmin valikon "
 "\"Asetukset\" kohdista \"Asetukset\" ja \"Henkilöllisyydet\"."
 
-#: ../libinit_balsa/balsa-druid-page-user.c:77
+#: ../libinit_balsa/assistant_page_user.c:63
 msgid ""
 " Whoever provides your email account should be able to give you the "
 "following information (if you have a Network Administrator, they may already "
@@ -1822,75 +2258,77 @@ msgstr ""
 "tiedot. Jos verkollasi on verkon ylläpitäjä, voi olla että nämä asetukset on "
 "jo tehty puolestasi:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:83
+#: ../libinit_balsa/assistant_page_user.c:70
 msgid "Yes, remember it"
 msgstr "Muista aina"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:83
+#: ../libinit_balsa/assistant_page_user.c:70
 msgid "No, type it in every time"
 msgstr "Ei, syötä joka kerta"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:115
+#: ../libinit_balsa/assistant_page_user.c:103
 msgid "Name of mail server for incoming _mail:"
 msgstr "Saapuvan _sähköpostin postipalvelin:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:120
+#: ../libinit_balsa/assistant_page_user.c:108
 msgid "_Type of mail server:"
 msgstr "Postipalvelimen tyyppi:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:124
+#: ../libinit_balsa/assistant_page_user.c:112
 msgid "Connect using _SSL:"
 msgstr "Käytä SSL-yhteyttä:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:127
+#: ../libinit_balsa/assistant_page_user.c:115
 msgid "Your email _login name:"
 msgstr "Ki_rjautumisnimi:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:130
+#: ../libinit_balsa/assistant_page_user.c:118
 msgid "Your _password:"
 msgstr "_Salasana:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:138
+#: ../libinit_balsa/assistant_page_user.c:126
 msgid "_SMTP Server:"
 msgstr "_SMTP-palvelin:"
 
 #. 2.1
-#: ../libinit_balsa/balsa-druid-page-user.c:143
+#: ../libinit_balsa/assistant_page_user.c:131
 msgid "Your real _name:"
 msgstr "Koko _nimesi:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:149
+#: ../libinit_balsa/assistant_page_user.c:137
 msgid "Your _Email Address, for this email account:"
 msgstr "Sähköpostiosoitteesi tälle tilille:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:154
+#: ../libinit_balsa/assistant_page_user.c:142
 msgid "_Remember your password:"
 msgstr "_Muista salasana:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:157
-msgid "_Refer to this account as:"
-msgstr "Näytä ni_mellä:"
-
-#: ../libinit_balsa/balsa-druid-page-user.c:165
+#: ../libinit_balsa/assistant_page_user.c:148
 msgid "_Local mail directory:"
 msgstr "_Paikallinen postikansio:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:182
+#: ../libinit_balsa/assistant_page_user.c:167
 msgid "User Settings"
 msgstr "Käyttäjän asetukset"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:334
+#: ../libinit_balsa/assistant_page_user.c:289
+#, fuzzy
+#| msgid "Select Identity"
+msgid "Default Identity"
+msgstr "Valitse henkilöllisyys"
+
+#: ../libinit_balsa/assistant_page_user.c:334
 #, c-format
 msgid ""
 "Local Mail Problem\n"
 "%s"
 msgstr "Paikallinen postiongelma%s"
 
-#: ../libinit_balsa/balsa-druid-page-welcome.c:32
+#: ../libinit_balsa/assistant_page_welcome.c:29
 msgid "Welcome to Balsa!"
 msgstr "Tervetuloa Balsaan!"
 
-#: ../libinit_balsa/balsa-druid-page-welcome.c:35
+#: ../libinit_balsa/assistant_page_welcome.c:32
 msgid ""
 "Before you can send or receive email:\n"
 "\n"
@@ -1908,129 +2346,189 @@ msgstr ""
 "- Verkkosi ylläpito, jos sellainen esimerkiksi työ- tai opiskelupaikan "
 "puolesta on olemassa, on tehnyt verkkoasetukset tietokoneelle valmiiksi."
 
-#: ../libinit_balsa/balsa-initdruid.c:81
-msgid ""
-"This will exit Balsa.\n"
-"Do you really want to do this?"
-msgstr ""
-"Tämä lopettaa Balsan.\n"
-"Haluatko varmasti lopettaa?"
-
-#: ../libinit_balsa/helper.c:66
-#, c-format
-msgid "Error loading %s: %s\n"
-msgstr "Virhe ladattaessa %s: %s\n"
-
-#: ../libinit_balsa/helper.c:202
-#, c-format
-msgid "The path %s must be relative to the filesystem root (start with /)."
-msgstr ""
-"Hakemiston %s täytyy löytyä jostain tiedostojärjestelmän juuren\n"
-"jälkeen (/ eteenpäin)"
-
-#: ../libinit_balsa/helper.c:215 ../libinit_balsa/helper.c:239
-#, c-format
-msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
-msgstr "Ei voida luoda hakemistoa: \"%s\"."
-
-#: ../libinit_balsa/helper.c:225 ../libinit_balsa/helper.c:248
-#, c-format
-msgid "The file with pathname \"%s\" is not a directory."
-msgstr "Tiedosto \"%s\" ei ole hakemisto."
-
-#: ../libinit_balsa/init_balsa.c:48
-msgid "Configure Balsa"
-msgstr "Balsan asetukset"
-
 #: ../sounds/balsa.soundlist.in.h:1
 msgid "Balsa E-mail reader"
 msgstr "Balsa s.hk.postiohjelma"
 
 #: ../sounds/balsa.soundlist.in.h:2
-msgid "New mail notification"
-msgstr "Ilmoitus saapuneesta postista"
-
-#: ../sounds/balsa.soundlist.in.h:3
 msgid "Program startup"
 msgstr "Ohjelman k.ynnistys"
 
-#: ../src/ab-main.c:203 ../src/ab-window.c:680
+#: ../sounds/balsa.soundlist.in.h:3
+msgid "New mail notification"
+msgstr "Ilmoitus saapuneesta postista"
+
+#: ../src/ab-main.c:228 ../src/ab-window.c:702
 msgid " address book: "
 msgstr " osoitekirja:"
 
-#: ../src/ab-main.c:474 ../src/address-book-config.c:895
+#: ../src/ab-main.c:554
+msgid "_Entry"
+msgstr ""
+
+#: ../src/ab-main.c:555 ../src/main-window.c:352
+msgid "_Help"
+msgstr ""
+
+#. new button
+#: ../src/ab-main.c:556 ../src/filter-edit-dialog.c:237
+#: ../src/mailbox-node.c:1061 ../src/main-window.c:354
+#: ../src/main-window.c:609 ../src/main-window.c:618
+msgid "_New"
+msgstr "Uu_si"
+
+#: ../src/ab-main.c:557 ../src/address-book-config.c:868
 msgid "VCard Address Book (GnomeCard)"
 msgstr "VCard-osoitekirja (GNOME-Kortit)"
 
-#: ../src/ab-main.c:476 ../src/address-book-config.c:901
+#: ../src/ab-main.c:559 ../src/address-book-config.c:874
 msgid "External query (a program)"
 msgstr "Ulkoinen kysely (sovellus)"
 
-#: ../src/ab-main.c:478 ../src/address-book-config.c:906
+#: ../src/ab-main.c:561 ../src/address-book-config.c:879
 msgid "LDIF Address Book"
 msgstr "LDIF-osoitekirja"
 
-#: ../src/ab-main.c:481 ../src/address-book-config.c:912
+#: ../src/ab-main.c:564 ../src/address-book-config.c:885
 msgid "LDAP Address Book"
 msgstr "LDAP-osoitekirja"
 
-#: ../src/ab-main.c:485 ../src/address-book-config.c:509
-#: ../src/address-book-config.c:919
+#: ../src/ab-main.c:568 ../src/address-book-config.c:507
+#: ../src/address-book-config.c:892
 msgid "GPE Address Book"
 msgstr "GPE-osoitekirja"
 
-#: ../src/ab-main.c:709
+#: ../src/ab-main.c:572
+#, fuzzy
+#| msgid "Address Book"
+msgid "Rubrica Address Book"
+msgstr "Osoitekirja"
+
+#: ../src/ab-main.c:575
+#, fuzzy
+#| msgid "_Properties..."
+msgid "_Properties"
+msgstr "_Ominaisuudet..."
+
+#: ../src/ab-main.c:576
+#, fuzzy
+#| msgid " address book: "
+msgid "Edit address book properties"
+msgstr " osoitekirja:"
+
+#: ../src/ab-main.c:577 ../src/balsa-index.c:1911
+#: ../src/filter-edit-dialog.c:243 ../src/mailbox-node.c:1088
+#: ../src/mailbox-node.c:1104 ../src/pref-manager.c:1716
+#: ../src/pref-manager.c:1791 ../src/pref-manager.c:2968
+msgid "_Delete"
+msgstr "_Poista"
+
+#: ../src/ab-main.c:578
+#, fuzzy
+#| msgid "Open the address book"
+msgid "Delete address book"
+msgstr "Avaa osoitekirja"
+
+#: ../src/ab-main.c:579 ../src/main-window.c:389
+msgid "_Quit"
+msgstr "_Lopeta"
+
+#: ../src/ab-main.c:579
+#, fuzzy
+#| msgid "External query (a program)"
+msgid "Exit the program"
+msgstr "Ulkoinen kysely (sovellus)"
+
+#: ../src/ab-main.c:581
+#, fuzzy
+#| msgid "New Identity"
+msgid "_New Entry"
+msgstr "Uusi henkilöllisyys"
+
+#: ../src/ab-main.c:582
+msgid "Add new entry"
+msgstr ""
+
+#: ../src/ab-main.c:583
+#, fuzzy
+#| msgid "_Delete"
+msgid "_Delete Entry"
+msgstr "_Poista"
+
+#: ../src/ab-main.c:584
+#, fuzzy
+#| msgid "_Delete to Trash"
+msgid "Delete entry"
+msgstr "_Siirrä roskakoriin"
+
+#: ../src/ab-main.c:585 ../src/main-window.c:481
+msgid "_About"
+msgstr "_Tietoja"
+
+#: ../src/ab-main.c:817
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../src/ab-main.c:859
+#: ../src/ab-main.c:833
+#, fuzzy
+#| msgid "Address"
+msgid "_Address"
+msgstr "Osoite"
+
+#: ../src/ab-main.c:959
 msgid "F_ilter:"
 msgstr "Su_odatin:"
 
-#: ../src/ab-window.c:170 ../src/filter-edit-dialog.c:200
-#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:221
-#: ../src/filter-run-dialog.c:295
+#: ../src/ab-window.c:172 ../src/filter-edit-dialog.c:220
+#: ../src/filter-export-dialog.c:92 ../src/filter-run-dialog.c:223
+#: ../src/filter-run-dialog.c:297
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/ab-window.c:178
+#: ../src/ab-window.c:180
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
 #. -- table column 1 --
 #. Entry widget for finding an address
-#: ../src/ab-window.c:279
+#: ../src/ab-window.c:292
 msgid "_Search for Name:"
 msgstr "_Hae nimellä:"
 
-#: ../src/ab-window.c:314
+#: ../src/ab-window.c:327
 msgid "Run Editor"
 msgstr "Suorita muokkain"
 
-#: ../src/ab-window.c:321
+#: ../src/ab-window.c:334
 msgid "_Re-Import"
 msgstr "Tuo _uudestaan"
 
 #. -- table column 3 --
 #. label for selected addresses in compose mode
-#: ../src/ab-window.c:353
+#: ../src/ab-window.c:366
 msgid "Send-To"
 msgstr "Vastaanottaja"
 
 #. mode switching stuff
-#: ../src/ab-window.c:368
+#: ../src/ab-window.c:381
 msgid "Treat multiple addresses as:"
 msgstr "Käsittele saman henkilön kaikki osoitteet:"
 
-#: ../src/ab-window.c:372
+#: ../src/ab-window.c:385
 msgid "alternative addresses for the same person"
 msgstr "Vaihtoehtoisina osoitteina"
 
-#: ../src/ab-window.c:377
+#: ../src/ab-window.c:390
 msgid "a distribution list"
 msgstr "Jakelulistana"
 
-#: ../src/ab-window.c:709
+#: ../src/ab-window.c:433
+#, fuzzy, c-format
+#| msgid "Could not save %s: %s"
+msgid "Could not launch %s: %s"
+msgstr "ei voi tallentaa %s: %s"
+
+#: ../src/ab-window.c:730
 #, c-format
 msgid ""
 "Error opening address book '%s':\n"
@@ -2039,109 +2537,105 @@ msgstr ""
 "Virhe avattaessa osoitekirjaa \"%s\":\n"
 "%s"
 
-#: ../src/address-book-config.c:170
+#: ../src/address-book-config.c:177
 msgid "Suggest complete addresses:"
 msgstr "Ehdota täydennettyä osoitetta:"
 
-#: ../src/address-book-config.c:176
+#: ../src/address-book-config.c:183
 msgid "as I type"
 msgstr "Kirjoitettaessa"
 
-#: ../src/address-book-config.c:185
+#: ../src/address-book-config.c:192
 msgid "when I hit the Escape key"
 msgstr "Painettaessa Esc-näppäintä"
 
-#: ../src/address-book-config.c:222 ../src/address-book-config.c:316
-msgid "Modify Address Book"
+#: ../src/address-book-config.c:229 ../src/address-book-config.c:330
+#, fuzzy, c-format
+#| msgid "Modify Address Book"
+msgid "Modify %s Address Book"
 msgstr "Muokkaa osoitekirjaa"
 
-#: ../src/address-book-config.c:226 ../src/address-book-config.c:320
-msgid "Add Address Book"
+#: ../src/address-book-config.c:233 ../src/address-book-config.c:333
+#, fuzzy, c-format
+#| msgid "Add Address Book"
+msgid "Add %s Address Book"
 msgstr "Lisää osoitekirja"
 
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:242 ../src/address-book-config.c:355
-#: ../src/address-book-config.c:442 ../src/address-book-config.c:507
+#: ../src/address-book-config.c:253 ../src/address-book-config.c:372
+#: ../src/address-book-config.c:438 ../src/address-book-config.c:505
 msgid "A_ddress Book Name:"
 msgstr "_Osoitekirjan nimi:"
 
-#: ../src/address-book-config.c:360
+#: ../src/address-book-config.c:377
 msgid "Load program location:"
 msgstr "Latausohjelman sijainti:"
 
-#: ../src/address-book-config.c:367 ../src/address-book-config.c:372
+#: ../src/address-book-config.c:383
 msgid "Select load program for address book"
 msgstr "Valitse ohjelma, jolla osoitekirja avataan"
 
-#: ../src/address-book-config.c:379
+#: ../src/address-book-config.c:390
 msgid "Save program location:"
 msgstr "Tallennusohjelman sijainti:"
 
-#: ../src/address-book-config.c:386 ../src/address-book-config.c:391
+#: ../src/address-book-config.c:396
 msgid "Select save program for address book"
 msgstr "Valitse ohjelma, jolla osoitekirja tallennetaan"
 
-#: ../src/address-book-config.c:447
+#: ../src/address-book-config.c:443
 msgid "_Host Name"
 msgstr "_Isäntänimi"
 
-#: ../src/address-book-config.c:452
+#: ../src/address-book-config.c:448
 msgid "Base Domain _Name"
 msgstr "Haun juuri_nimi"
 
-#: ../src/address-book-config.c:457
+#: ../src/address-book-config.c:453
 msgid "_User Name (Bind DN)"
 msgstr "_Käyttäjätunnus (sidottava DN)"
 
-#: ../src/address-book-config.c:462
+#: ../src/address-book-config.c:458
 msgid "_Password"
 msgstr "_Salasana"
 
-#: ../src/address-book-config.c:468
+#: ../src/address-book-config.c:464
 msgid "_User Address Book DN"
 msgstr "Osoitekirjan DN"
 
-#: ../src/address-book-config.c:474
+#: ../src/address-book-config.c:470
 msgid "Enable _TLS"
 msgstr "Käytä _TLS-yhteyttä"
 
-#: ../src/address-book-config.c:529 ../src/main-window.c:2439
-#: ../src/main-window.c:3979
+#: ../src/address-book-config.c:538 ../src/main-window.c:2721
+#: ../src/main-window.c:4486
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Virhe näytettäessä ohjetta: %s\n"
 
-#: ../src/address-book-config.c:630
+#: ../src/address-book-config.c:615
 msgid "No path found.  Do you want to give one?"
 msgstr "Polkua ei annettu. Haluatko syöttää polun?"
 
-#: ../src/address-book-config.c:636
-#, c-format
-msgid "The address book file path \"%s\" is not correct. %s"
-msgstr "Osoitekirjatiedoston polku \"%s\" ei ole oikein. %s"
-
-#: ../src/address-book-config.c:639
-#, c-format
-msgid "The load program path \"%s\" is not correct. %s"
-msgstr "Latainohjelman polku \"%s\" ei ole oikein. %s"
-
-#: ../src/address-book-config.c:642
-#, c-format
-msgid "The save program path \"%s\" is not correct. %s"
-msgstr "Tallennusohjelman polku \"%s\" ei ole oikein. %s"
+#: ../src/address-book-config.c:899
+#, fuzzy
+#| msgid "Address Book"
+msgid "Rubrica2 Address Book"
+msgstr "Osoitekirja"
 
-#: ../src/address-book-config.c:645
-#, c-format
-msgid "The path \"%s\" is not correct. %s"
-msgstr "Polku \"%s\" ei ole oikein. %s"
+#: ../src/balsa-app.c:79 ../src/folder-conf.c:276 ../src/mailbox-conf.c:1328
+#, fuzzy
+#| msgid "_Remember password"
+msgid "_Remember password in keyring"
+msgstr "_Muista salasana"
 
-#: ../src/address-book-config.c:648
-msgid "Do you want to correct the path?"
-msgstr "Haluatko korjata annetun polun?"
+#: ../src/balsa-app.c:82 ../src/folder-conf.c:279 ../src/mailbox-conf.c:1331
+msgid "_Remember password"
+msgstr "_Muista salasana"
 
-#: ../src/balsa-app.c:70
+#: ../src/balsa-app.c:88
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -2150,316 +2644,328 @@ msgstr ""
 "Avataan ulkoista kansiota %s.\n"
 "%s %s salasana:"
 
-#: ../src/balsa-app.c:75
-#, c-format
-msgid "Mailbox _password for %s %s:"
+#: ../src/balsa-app.c:93
+#, fuzzy, c-format
+#| msgid "Mailbox _password for %s %s:"
+msgid "_Password for %s %s (%s):"
 msgstr "Kansion %s %s salasana:"
 
-#: ../src/balsa-app.c:78
+#: ../src/balsa-app.c:96
 msgid "Password needed"
 msgstr "Salasana tarvitaan"
 
-#: ../src/balsa-app.c:92 ../src/folder-conf.c:384
-msgid "_Remember password"
-msgstr "_Muista salasana"
-
 #: ../src/balsa-app.c:551
 #, c-format
 msgid "Couldn't open mailbox \"%s\""
 msgstr "Kansion \"%s\" avaaminen ei onnistu"
 
-#: ../src/balsa-index.c:325
-msgid "From"
-msgstr "Lähettäjä"
-
-#: ../src/balsa-index.c:338 ../src/pref-manager.c:402
-msgid "Subject"
-msgstr "Aihe"
-
-#: ../src/balsa-index.c:352 ../src/pref-manager.c:403
+#: ../src/balsa-index.c:392 ../src/pref-manager.c:419
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: ../src/balsa-index.c:364 ../src/pref-manager.c:404
-#: ../src/sendmsg-window.c:2928
+#: ../src/balsa-index.c:407 ../src/pref-manager.c:420
+#: ../src/sendmsg-window.c:3039
 msgid "Size"
 msgstr "Koko"
 
-#: ../src/balsa-index.c:921
-#, c-format
-msgid "Opening mailbox %s. Please wait..."
-msgstr "Avaataan kansiota %s. Odota..."
-
-# src/balsa-message.c#
-# 651 src/filter-edit-dialog.c:325
-#. FIXME: this is hack!
-#: ../src/balsa-index.c:963
-msgid "To"
-msgstr "Vastaanottaja"
-
-#: ../src/balsa-index.c:1616
+#: ../src/balsa-index.c:1726
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Siirto roskakoriin epäonnistui: %s"
 
 #. Message menu items
-#: ../src/balsa-index.c:1780 ../src/main-window.c:488
-#: ../src/message-window.c:247
+#: ../src/balsa-index.c:1884 ../src/main-window.c:537
+#: ../src/message-window.c:268
 msgid "_Reply..."
 msgstr "_Vastaa..."
 
-#: ../src/balsa-index.c:1782
+#: ../src/balsa-index.c:1886
 msgid "Reply To _All..."
 msgstr "Vastaa k_aikille..."
 
-#: ../src/balsa-index.c:1784
+#: ../src/balsa-index.c:1888
 msgid "Reply To _Group..."
 msgstr "Vastaa _ryhmälle..."
 
-#: ../src/balsa-index.c:1786
+#: ../src/balsa-index.c:1890
 msgid "_Forward Attached..."
 msgstr "Välitä _liitteenä..."
 
-#: ../src/balsa-index.c:1788
+#: ../src/balsa-index.c:1892
 msgid "Forward _Inline..."
 msgstr "Välitä _viestissä..."
 
-#: ../src/balsa-index.c:1790 ../src/main-window.c:518
+#: ../src/balsa-index.c:1894 ../src/main-window.c:564
 msgid "_Pipe through..."
 msgstr "_Putkita ohjelmalle..."
 
-#: ../src/balsa-index.c:1792 ../src/main-window.c:495
+#: ../src/balsa-index.c:1896 ../src/main-window.c:544
 msgid "_Store Address..."
 msgstr "_Tallenna osoite"
 
-#: ../src/balsa-index.c:1807 ../src/filter-edit-dialog.c:223
-#: ../src/mailbox-node.c:1062 ../src/mailbox-node.c:1078
-#: ../src/pref-manager.c:1629 ../src/pref-manager.c:1720
-#: ../src/pref-manager.c:2790
-msgid "_Delete"
-msgstr "_Poista"
-
-#: ../src/balsa-index.c:1812
+#: ../src/balsa-index.c:1916
 msgid "_Undelete"
 msgstr "P_alauta viesti"
 
-#: ../src/balsa-index.c:1817
+#: ../src/balsa-index.c:1921
 msgid "Move To _Trash"
 msgstr "Siirrä _roskakoriin"
 
-#: ../src/balsa-index.c:1821
+#: ../src/balsa-index.c:1925
 msgid "T_oggle"
 msgstr "M_erkitse"
 
 #. Message:toggle-flag submenu items
-#: ../src/balsa-index.c:1825 ../src/main-window.c:550 ../src/main-window.c:589
+#: ../src/balsa-index.c:1929 ../src/main-window.c:614 ../src/main-window.c:659
 msgid "_Flagged"
 msgstr "_Lipulla"
 
-#: ../src/balsa-index.c:1828
+#: ../src/balsa-index.c:1932
 msgid "_Unread"
 msgstr "Lukematta"
 
-#: ../src/balsa-index.c:1836
+#: ../src/balsa-index.c:1940
 msgid "_Move to"
 msgstr "_Siirrä"
 
-#: ../src/balsa-index.c:1844
+#: ../src/balsa-index.c:1948
 msgid "_View Source"
 msgstr "Näytä _lähdekoodi"
 
-#: ../src/balsa-index.c:2048
+#: ../src/balsa-index.c:2193
 #, c-format
 msgid "Failed to copy %d message to mailbox \"%s\": %s"
 msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
 msgstr[0] "%d viestiä ei voi kopioida kansioon \"%s\": %s"
 msgstr[1] "%d viestiä ei voi kopioida kansioon \"%s\": %s"
 
-#: ../src/balsa-index.c:2062
+#: ../src/balsa-index.c:2205
 #, c-format
 msgid "Copied to \"%s\"."
 msgstr "Kopioitu kohteeseen \"%s\"."
 
-#: ../src/balsa-index.c:2063
+#: ../src/balsa-index.c:2206
 #, c-format
 msgid "Moved to \"%s\"."
 msgstr "Siirretty kohteeseen \"%s\"."
 
-#: ../src/balsa-index.c:2165
+#: ../src/balsa-index.c:2308
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Postikansion %s muutosten toteuttaminen epäonnistui."
 
-#: ../src/balsa-index.c:2335
+#: ../src/balsa-index.c:2406
+#, fuzzy, c-format
+#| msgid "Cannot create message"
+msgid "Cannot process the message: %s"
+msgstr "Viestiä ei voi luoda"
+
+#: ../src/balsa-index.c:2529
+#, fuzzy, c-format
+#| msgid "Could not access message %ld in mailbox \"%s\"."
+msgid "Cannot access message %u to pass to %s"
+msgstr "Viestiä %ld ei voi avata kansiosta \"%s\"."
+
+#: ../src/balsa-index.c:2556
+#, fuzzy, c-format
+#| msgid "Cannot read message"
+msgid "Cannot read message %u to pass to %s"
+msgstr "Viestiä ei voi lukea"
+
+#: ../src/balsa-index.c:2725
 msgid "Pipe message through a program"
 msgstr "Putkita viesti ohjelman läpi"
 
-#: ../src/balsa-index.c:2338
+#: ../src/balsa-index.c:2728
 msgid "_Run"
 msgstr "Suo_rita"
 
-#: ../src/balsa-index.c:2347
+#: ../src/balsa-index.c:2740
 msgid "Specify the program to run:"
 msgstr "Määrittele suoritettava komento:"
 
-#: ../src/balsa-mblist.c:357
+#: ../src/balsa-mblist.c:364
 msgid "Mailbox"
 msgstr "Kansio"
 
-#: ../src/balsa-mblist.c:1182 ../src/balsa-mblist.c:1218
+#: ../src/balsa-mblist.c:1144 ../src/balsa-mblist.c:1194
 msgid "Failed to find mailbox"
 msgstr "Kansiota ei löytynyt"
 
-#: ../src/balsa-mblist.c:1845
+#: ../src/balsa-mblist.c:1780
 msgid "_Other..."
 msgstr "_Muut..."
 
-#: ../src/balsa-mblist.c:1913
+#: ../src/balsa-mblist.c:1848
 msgid "Choose destination folder"
 msgstr "Valitse kohdekansio"
 
-#: ../src/balsa-mblist.c:2136 ../src/balsa-mblist.c:2139
+#: ../src/balsa-mblist.c:2061
 msgid "Other..."
 msgstr "_Muut..."
 
-#. xgettext: this is the first part of the message
-#. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/balsa-mblist.c:2304
-#, c-format
-msgid "Shown mailbox: %s "
-msgstr "Näytetty kansio: %s"
-
-#: ../src/balsa-mblist.c:2309
-#, c-format
-msgid "with %d message"
-msgid_plural "with %d messages"
-msgstr[0] "sisältää %d viestin"
-msgstr[1] "sisältää %d viestiä"
-
-#: ../src/balsa-mblist.c:2316
-#, c-format
-msgid ", %d new"
-msgid_plural ", %d new"
-msgstr[0] ", %d uusi"
-msgstr[1] ", %d uutta"
-
-#: ../src/balsa-mblist.c:2323
-#, c-format
-msgid ", %d hidden"
-msgid_plural ", %d hidden"
-msgstr[0] ", %d piilotettu"
-msgstr[1] ", %d piilotettua"
-
-#: ../src/balsa-message.c:290 ../src/balsa-message.c:293
+#: ../src/balsa-message.c:303
 msgid "Check cryptographic signature"
 msgstr "Tarkista digitaalinen allekirjoitus"
 
-#: ../src/balsa-message.c:316 ../src/balsa-message.c:319
+#: ../src/balsa-message.c:324
 msgid "Select message part to display"
 msgstr "Valitse näytettävä viestin osa"
 
-#: ../src/balsa-message.c:396
+#: ../src/balsa-message.c:411
+#, fuzzy
+#| msgid "_Wrap"
+msgid "Wrapped"
+msgstr "_Rivitys"
+
+#: ../src/balsa-message.c:415
+#, fuzzy
+#| msgid "No signature found!"
+msgid "Not found"
+msgstr "Allekirjoitusta ei löydy!"
+
+#: ../src/balsa-message.c:604
+#, fuzzy
+#| msgid "_Find"
+msgid "Find:"
+msgstr "_Etsi"
+
+#: ../src/balsa-message.c:617 ../src/toolbar-factory.c:142
+msgid "Previous"
+msgstr "Edellinen"
+
+#: ../src/balsa-message.c:625 ../src/toolbar-factory.c:143
+msgid "Next"
+msgstr "Seuraava"
+
+#: ../src/balsa-message.c:714
 msgid "Content"
 msgstr "Sisältö"
 
-#: ../src/balsa-message.c:474
+#: ../src/balsa-message.c:807
 msgid "Message parts"
 msgstr "Viestin osat"
 
-#: ../src/balsa-message.c:656
+#: ../src/balsa-message.c:983
 msgid "Save selected as..."
 msgstr "Valitse valinta nimellä..."
 
-#: ../src/balsa-message.c:663
+#: ../src/balsa-message.c:990
 msgid "Save selected to folder..."
 msgstr "Valitse valinta kansioon..."
 
-#: ../src/balsa-message.c:754
+#: ../src/balsa-message.c:1083
 msgid "(No sender)"
 msgstr "(ei lähettäjää)"
 
-#: ../src/balsa-message.c:809
-#, c-format
-msgid "Could not access message %ld in mailbox \"%s\"."
+#: ../src/balsa-message.c:1137 ../src/balsa-message.c:1149
+#, fuzzy, c-format
+#| msgid "Could not access message %ld in mailbox \"%s\"."
+msgid "Could not access message %u in mailbox \"%s\"."
 msgstr "Viestiä %ld ei voi avata kansiosta \"%s\"."
 
-#: ../src/balsa-message.c:982
+#: ../src/balsa-message.c:1323
 msgid "mixed parts"
 msgstr "erityyppiset osat"
 
-#: ../src/balsa-message.c:984
+#: ../src/balsa-message.c:1325
 msgid "alternative parts"
 msgstr "vaihtoehtoiset osat"
 
-#: ../src/balsa-message.c:986
+#: ../src/balsa-message.c:1327
 msgid "signed parts"
 msgstr "allekirjoitetut osat"
 
-#: ../src/balsa-message.c:988
+#: ../src/balsa-message.c:1329
 msgid "encrypted parts"
 msgstr "salatut osat"
 
-#: ../src/balsa-message.c:990
+#: ../src/balsa-message.c:1331
 msgid "rfc822 message"
 msgstr "rfc822-viesti"
 
-#: ../src/balsa-message.c:992
+#: ../src/balsa-message.c:1333
 #, c-format
 msgid "\"%s\" parts"
 msgstr "\"%s\" osaa"
 
-#: ../src/balsa-message.c:1040
+#: ../src/balsa-message.c:1381
 msgid "force inline for all parts"
 msgstr "pakota sisäkkäisyys kaikille osille"
 
-#: ../src/balsa-message.c:1076
+#: ../src/balsa-message.c:1424
 #, c-format
 msgid "rfc822 message (from %s, subject \"%s\")"
 msgstr "rfc822-viesto (lähettäjä %s, aihe \"%s\")"
 
-#: ../src/balsa-message.c:1088
+#: ../src/balsa-message.c:1436
 msgid "complete message"
 msgstr "koko viesti"
 
-#: ../src/balsa-message.c:1105
+#: ../src/balsa-message.c:1453
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "osa %s: %s (tiedosto %s)"
 
-#: ../src/balsa-message.c:1116
+#: ../src/balsa-message.c:1464
 #, c-format
 msgid "part %s: %s"
 msgstr "osa %s: %s"
 
-#: ../src/balsa-message.c:1131
+#: ../src/balsa-message.c:1479
 msgid "encrypted: "
 msgstr "salattu:"
 
-#: ../src/balsa-message.c:1285 ../src/balsa-mime-widget-text.c:615
-#: ../src/balsa-mime-widget-text.c:1083
-msgid "Save..."
+#: ../src/balsa-message.c:1616
+#, fuzzy, c-format
+#| msgid "Parsing a message part failed: %s"
+msgid "Reading embedded message failed: %s"
+msgstr "Viestin osan tulkinta epäonnistui: %s"
+
+#: ../src/balsa-message.c:1624
+#, fuzzy, c-format
+#| msgid "Saving sent message to %s failed: %s"
+msgid "Appending message to %s failed: %s"
+msgstr "Lähetetyt viestin tallennus kansioon %s epäonnistui: %s"
+
+#: ../src/balsa-message.c:1653
+#, fuzzy
+#| msgid "Save..."
+msgid "_Save..."
 msgstr "Tallenna..."
 
-#: ../src/balsa-message.c:1362
+#: ../src/balsa-message.c:1662 ../src/balsa-mime-widget-message.c:458
+#, fuzzy
+#| msgid "Copy to folder..."
+msgid "_Copy to folder..."
+msgstr "Kopioi kansioon..."
+
+#: ../src/balsa-message.c:1745
 msgid "Select folder for saving selected parts"
 msgstr "Valitse kansio, johon valitut osat tallennetaan"
 
-#: ../src/balsa-message.c:1400
+#: ../src/balsa-message.c:1769
+#, fuzzy, c-format
+#| msgid "Could not get a part: %s"
+msgid "Could not create URI for %s"
+msgstr "Osaa ei voi hakea: %s"
+
+#: ../src/balsa-message.c:1794
 #, c-format
 msgid "%s message part"
 msgstr "%s viestin osa"
 
-#: ../src/balsa-message.c:1428 ../src/balsa-mime-widget-callbacks.c:209
+#: ../src/balsa-message.c:1827 ../src/balsa-mime-widget-callbacks.c:165
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "ei voi tallentaa %s: %s"
 
-#: ../src/balsa-message.c:2085 ../src/balsa-message.c:2216
+#: ../src/balsa-message.c:2486 ../src/balsa-message.c:2630
 #, c-format
 msgid "Sending the disposition notification failed: %s"
 msgstr "Disposition Notification -viestin lähetys epäonnistui: %s"
 
-#: ../src/balsa-message.c:2179
+#: ../src/balsa-message.c:2583
 #, c-format
 msgid ""
 "The sender of this mail, %s, requested \n"
@@ -2467,15 +2973,15 @@ msgid ""
 "Do you want to send this notification?"
 msgstr ""
 "Tämän viestin lähettäjä, %s, pyytää \n"
-"Message Disposition Notification-kuittauksen (MDN) palauttamista osoitteeseen "
-"\"%s\"\n"
+"Message Disposition Notification-kuittauksen (MDN) palauttamista "
+"osoitteeseen \"%s\"\n"
 "Lähetetäänkö kuittaus?"
 
-#: ../src/balsa-message.c:2186
+#: ../src/balsa-message.c:2593
 msgid "Reply to MDN?"
 msgstr "Vastataanko kuittauspyyntöön (MDN)?"
 
-#: ../src/balsa-message.c:2388
+#: ../src/balsa-message.c:2804
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
@@ -2485,18 +2991,18 @@ msgstr ""
 "useammin kuin kerran.\n"
 "Sulje viestin näyttävät muut ikkunat ja yritä uudestaan."
 
-#: ../src/balsa-message.c:2409 ../src/balsa-message.c:2494
-#: ../src/balsa-message.c:2616
+#: ../src/balsa-message.c:2825 ../src/balsa-message.c:2910
+#: ../src/balsa-message.c:3032
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Viestin osan tulkinta epäonnistui: %s"
 
-#: ../src/balsa-message.c:2410 ../src/balsa-message.c:2495
-#: ../src/balsa-message.c:2617
+#: ../src/balsa-message.c:2826 ../src/balsa-message.c:2911
+#: ../src/balsa-message.c:3033
 msgid "Possible disk space problem."
 msgstr "Levytila saattaa olla vähissä."
 
-#: ../src/balsa-message.c:2424
+#: ../src/balsa-message.c:2840
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains an encrypted part, but "
@@ -2505,7 +3011,7 @@ msgstr ""
 "Lähettäjän %s viesti aiheesta \"%s\" sisältää salatun osan, mutta tämän osan "
 "rakenne on virheellinen."
 
-#: ../src/balsa-message.c:2432
+#: ../src/balsa-message.c:2848
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
@@ -2514,7 +3020,7 @@ msgstr ""
 "Lähettäjän %s viesti aiheesta \"%s\" sisältää PGP-salatun osan, mutta tämä "
 "salausmenetelmä ei ole käytettävissä."
 
-#: ../src/balsa-message.c:2445
+#: ../src/balsa-message.c:2861
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a S/MIME encrypted part, "
@@ -2523,7 +3029,7 @@ msgstr ""
 "Lähettäjän %s viesti aiheesta \"%s\" sisältää S/MIME-salatun osan, mutta "
 "tämä salausmenetelmä ei ole käytettävissä."
 
-#: ../src/balsa-message.c:2512
+#: ../src/balsa-message.c:2928
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a signed part, but its "
@@ -2532,7 +3038,7 @@ msgstr ""
 "Lähettäjän %s viesti aiheesta \"%s\" sisältää allekirjoitetun osan, mutta "
 "allekirjoituksen rakenne on virheellinen. Allekirjoitusta ei voida tarkistaa."
 
-#: ../src/balsa-message.c:2525
+#: ../src/balsa-message.c:2941
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a %s signed part, but "
@@ -2541,30 +3047,30 @@ msgstr ""
 "Lähettäjän %s viesti aiheesta \"%s\" sisältää %s-salatun osan, mutta tämä "
 "salausmenetelmä ei ole käytettävissä."
 
-#: ../src/balsa-message.c:2528
+#: ../src/balsa-message.c:2944
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/balsa-message.c:2528 ../src/balsa-mime-widget-crypto.c:72
-#: ../src/print.c:1302 ../src/print-gtk.c:191
+#: ../src/balsa-message.c:2944 ../src/balsa-mime-widget-crypto.c:78
+#: ../src/print-gtk.c:201
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: ../src/balsa-message.c:2552 ../src/balsa-message.c:2679
+#: ../src/balsa-message.c:2968 ../src/balsa-message.c:3095
 msgid "Detected a good signature"
 msgstr "Havaittiin kelvollinen allekirjoitus"
 
-#: ../src/balsa-message.c:2558
+#: ../src/balsa-message.c:2974
 msgid "Detected a good signature with insufficient validity"
 msgstr "Havaittiin oikea allekirjoitus, jonka kelvollisuus on riittämätön"
 
-#: ../src/balsa-message.c:2563 ../src/balsa-message.c:2683
+#: ../src/balsa-message.c:2979 ../src/balsa-message.c:3099
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr ""
 "Havaittiin oikea allekirjoitus, jonka kelvollisuus tai luottamus ei ole "
 "riittävä"
 
-#: ../src/balsa-message.c:2570 ../src/balsa-message.c:2689
+#: ../src/balsa-message.c:2986 ../src/balsa-message.c:3105
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" "
@@ -2575,7 +3081,7 @@ msgstr ""
 "arvon:\n"
 "%s"
 
-#: ../src/balsa-message.c:2582
+#: ../src/balsa-message.c:2998
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" failed "
@@ -2584,7 +3090,7 @@ msgstr ""
 "Allekirjoituksen tarkistus lähettäjän %s viestistä aiheesta \"%s\" palautti "
 "virheen!"
 
-#: ../src/balsa-message.c:2641
+#: ../src/balsa-message.c:3057
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once."
@@ -2592,7 +3098,7 @@ msgstr ""
 "Salauksen purkua ei voida suorittaa, koska viesti on auki monessa eri "
 "ikkunassa."
 
-#: ../src/balsa-message.c:2643
+#: ../src/balsa-message.c:3059
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
@@ -2600,358 +3106,705 @@ msgstr ""
 "Allekirjoituksen tarkistusta OpenPGP-esityksen poistoa ei voida suorittaa, "
 "koska viesti on auki monessa eri ikkunassa."
 
-#: ../src/balsa-message.c:2646
+#: ../src/balsa-message.c:3062
 msgid "Please close the other instances of this message and try again."
 msgstr "Valitse viestin muut näkymät ja yritä uudestaan."
 
-#: ../src/balsa-print-object-text.c:487 ../src/balsa-mime-widget-text.c:1199
+#: ../src/balsa-mime-widget.c:237 ../src/balsa-mime-widget-message.c:163
+#: ../src/balsa-mime-widget-message.c:209
+#, c-format
+msgid "File name: %s"
+msgstr "Tiedostonimi: %s"
+
+#: ../src/balsa-mime-widget.c:256
+#, c-format
+msgid "Error reading message part: %s"
+msgstr "Virhe luettaessa viestin osaa: %s"
+
+#: ../src/balsa-mime-widget.c:280
+#, c-format
+msgid "Type: %s (%s)"
+msgstr "Tyyppi: %s (%s)"
+
+#: ../src/balsa-mime-widget.c:284
+#, c-format
+msgid "Content Type: %s"
+msgstr "Sisällön tyyppi: %s"
+
+#: ../src/balsa-mime-widget.c:297
+#, fuzzy
+#| msgid "No open or view action defined in GNOME MIME for this content type"
+msgid "No open or view action defined for this content type"
+msgstr "Tälle MIME-tyypille ei ole määritelty avaus- tai katseluohjelmaa."
+
+#: ../src/balsa-mime-widget.c:302
+msgid "S_ave part"
+msgstr "T_allenna osa"
+
+#: ../src/balsa-mime-widget-callbacks.c:54 ../src/sendmsg-window.c:1804
+#, fuzzy, c-format
+#| msgid "Could not get a part: %s"
+msgid "Could not launch application: %s"
+msgstr "Osaa ei voi hakea: %s"
+
+#: ../src/balsa-mime-widget-callbacks.c:81
+#, c-format
+msgid "Save %s MIME Part"
+msgstr "Tallenna %s MIME-osa"
+
+#: ../src/balsa-mime-widget-callbacks.c:123
+#, fuzzy, c-format
+#| msgid "Could not compile %s"
+msgid "Could not construct URI from %s"
+msgstr "%s ei voi kääntää"
+
+#: ../src/balsa-mime-widget-callbacks.c:142
+msgid "File already exists. Overwrite?"
+msgstr "Tiedosto jo olemassa. Korvaa?"
+
+#: ../src/balsa-mime-widget-callbacks.c:152
+#, fuzzy, c-format
+#| msgid "%s: %s"
+msgid "Unlink %s: %s"
+msgstr "%s: %s"
+
+#: ../src/balsa-mime-widget-crypto.c:76
+#, c-format
+msgid ""
+"This is an inline %s signed %s message part:\n"
+"%s"
+msgstr ""
+"Tämä on sisäkkäinen %s-allekirjoitettu %s viestn osa:\n"
+"%s"
+
+#: ../src/balsa-mime-widget-crypto.c:78 ../src/print-gtk.c:201
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
+#: ../src/balsa-mime-widget-crypto.c:96
+#, fuzzy
+#| msgid "_Run gpg to import this key"
+msgid "_Run GnuPG to import this key"
+msgstr "Suo_rita gpg avaimen tuomiseksi"
+
+#: ../src/balsa-mime-widget-crypto.c:100
+msgid "_Run GnuPG to check for an update of this key"
+msgstr ""
+
+#: ../src/balsa-mime-widget-image.c:54 ../src/balsa-mime-widget-image.c:178
+#, c-format
+msgid "Error loading attached image: %s\n"
+msgstr "Virhe ladattaessa liitettyä kuvaa: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:161
+#: ../src/balsa-mime-widget-message.c:173
+#: ../src/balsa-mime-widget-message.c:201
+#: ../src/balsa-mime-widget-message.c:254
+msgid "Content Type: external-body\n"
+msgstr "Sisällön tyyppi: ulkoinen\n"
+
+#: ../src/balsa-mime-widget-message.c:162
+#, c-format
+msgid "Access type: local-file\n"
+msgstr "Hakutavan tyyppi: paikallinen tiedosto\n"
+
+#: ../src/balsa-mime-widget-message.c:174
+#, c-format
+msgid "Access type: URL\n"
+msgstr "Hakutavan tyyppi: URL\n"
+
+#: ../src/balsa-mime-widget-message.c:175
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: ../src/balsa-mime-widget-message.c:202
+#, c-format
+msgid "Access type: %s\n"
+msgstr "Hakutavan tyyppi: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:206
+#, c-format
+msgid "FTP site: %s\n"
+msgstr "FTP-palvelin: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:208
+#, c-format
+msgid "Directory: %s\n"
+msgstr "Hakemisto: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:255
+msgid "Access type: mail-server\n"
+msgstr "Hakutyyppi: postipalvelin\n"
+
+#: ../src/balsa-mime-widget-message.c:256
+#, c-format
+msgid "Mail server: %s\n"
+msgstr "Postipalvelin: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:258
+#, c-format
+msgid "Subject: %s\n"
+msgstr "Aihe: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:275
+msgid "Se_nd message to obtain this part"
+msgstr "Lähetä _viesti saadaksesti tämän osan"
+
+#: ../src/balsa-mime-widget-message.c:296 ../src/balsa-mime-widget-text.c:811
+#: ../src/sendmsg-window.c:1825
+#, c-format
+msgid "Error showing %s: %s\n"
+msgstr "Virhe näytettäessä %s: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:331
+#, c-format
+msgid "Could not get a part: %s"
+msgstr "Osaa ei voi hakea: %s"
+
+#: ../src/balsa-mime-widget-message.c:363
+#, c-format
+msgid "Sending the external body request failed: %s"
+msgstr "Ulkoisen rungon pyynnön lähetys epäonnistui: %s"
+
+#: ../src/balsa-mime-widget-message.c:450
+msgid "Reply..."
+msgstr "Vastaa..."
+
+#: ../src/balsa-mime-widget-message.c:555
+msgid "... [truncated]"
+msgstr ""
+
+#. Gmail sometimes fails to do that.
+#: ../src/balsa-mime-widget-message.c:705
+msgid "Error:"
+msgstr ""
+
+#: ../src/balsa-mime-widget-message.c:706
+msgid "IMAP server did not report message structure"
+msgstr ""
+
+#: ../src/balsa-mime-widget-message.c:718
+#: ../src/balsa-print-object-header.c:155 ../src/sendmsg-window.c:1144
+#: ../src/sendmsg-window.c:1146 ../src/sendmsg-window.c:1236
+#: ../src/sendmsg-window.c:3840 ../src/sendmsg-window.c:5762
+msgid "Subject:"
+msgstr "Aihe:"
+
+#: ../src/balsa-mime-widget-message.c:722
+#: ../src/balsa-print-object-header.c:163 ../src/sendmsg-window.c:3836
+msgid "Date:"
+msgstr "Päivämäärä:"
+
+#. addresses
+#: ../src/balsa-mime-widget-message.c:728
+#: ../src/balsa-print-object-header.c:168 ../src/sendmsg-window.c:3847
+#: ../src/store-address.c:340
+msgid "From:"
+msgstr "Lähettäjä:"
+
+#: ../src/balsa-mime-widget-message.c:735
+msgid "Reply-To:"
+msgstr "_Vastausosoite:"
+
+#: ../src/balsa-mime-widget-message.c:744
+#: ../src/balsa-print-object-header.c:176
+msgid "Fcc:"
+msgstr "Kansio:"
+
+#: ../src/balsa-mime-widget-message.c:751
+#: ../src/balsa-print-object-header.c:179
+msgid "Disposition-Notification-To:"
+msgstr "Disposition-Notification-To:"
+
+#: ../src/balsa-mime-widget-text.c:174
+#, c-format
+msgid "Could not save a text part: %s"
+msgstr "Tekstiosaa ei voi tallentaa: %s"
+
+#: ../src/balsa-mime-widget-text.c:518
+msgid "Copy link"
+msgstr "Kopioi linkki"
+
+#: ../src/balsa-mime-widget-text.c:523
+msgid "Open link"
+msgstr "Avaa linkki"
+
+#: ../src/balsa-mime-widget-text.c:528
+msgid "Send link..."
+msgstr "Lähetä linkki..."
+
+#: ../src/balsa-mime-widget-text.c:561 ../src/balsa-mime-widget-text.c:1053
+msgid "Save..."
+msgstr "Tallenna..."
+
+#: ../src/balsa-mime-widget-text.c:571
+msgid "Highlight structured phrases"
+msgstr "Korosta rakenteelliset lauseet"
+
+#: ../src/balsa-mime-widget-text.c:798
+#, c-format
+msgid "Calling URL %s..."
+msgstr "Kutsutaan URL:a %s..."
+
+#: ../src/balsa-mime-widget-text.c:1167
+msgid "Address"
+msgstr "Osoite"
+
+#: ../src/balsa-mime-widget-text.c:1170
+msgid "S_tore"
+msgstr "_Tallenna"
+
+#: ../src/balsa-mime-widget-text.c:1178 ../src/balsa-print-object-text.c:508
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../src/balsa-print-object-text.c:489 ../src/balsa-mime-widget-text.c:1200
+#: ../src/balsa-mime-widget-text.c:1179 ../src/balsa-print-object-text.c:510
 msgid "Nick Name"
 msgstr "Lempinimi"
 
-#: ../src/balsa-print-object-text.c:491 ../src/balsa-mime-widget-text.c:1201
+#: ../src/balsa-mime-widget-text.c:1180 ../src/balsa-print-object-text.c:512
 msgid "First Name"
 msgstr "Etunimi"
 
-#: ../src/balsa-print-object-text.c:493 ../src/balsa-mime-widget-text.c:1202
+#: ../src/balsa-mime-widget-text.c:1181 ../src/balsa-print-object-text.c:514
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: ../src/balsa-print-object-text.c:495 ../src/balsa-mime-widget-text.c:1203
+#: ../src/balsa-mime-widget-text.c:1182 ../src/balsa-print-object-text.c:516
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../src/balsa-print-object-text.c:498 ../src/balsa-mime-widget-text.c:1205
+#: ../src/balsa-mime-widget-text.c:1184 ../src/balsa-print-object-text.c:519
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: ../src/filter-edit-callbacks.c:311
+#: ../src/balsa-mime-widget-text.c:1213
+#, c-format
+msgid ""
+"The message sent by %s with subject \"%s\" contains 8-bit characters, but no "
+"header describing the used codeset (converted to %s)"
+msgstr ""
+"Viesti lähettäjältä %s aiheesta \"%s\" sisältää 8-bittisiä merkkejä, mutta "
+"ei otsaketta, joka kertoo käytetyn merkistön (muutettu muotoon %s)"
+
+#: ../src/balsa-mime-widget-vcalendar.c:67
+#, fuzzy, c-format
+#| msgid "This is an inline %s signed %s message part:"
+msgid "This is an iTIP calendar \"%s\" message."
+msgstr "Tämä on sisäkkäinen %s-allekirjoitetun %s viestin osa:"
+
+#: ../src/balsa-mime-widget-vcalendar.c:169
+#: ../src/balsa-print-object-text.c:665
+msgid "Summary"
+msgstr ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:170
+#: ../src/balsa-print-object-text.c:667
+#, fuzzy
+#| msgid "Organization"
+msgid "Organizer"
+msgstr "Organisaatio"
+
+#: ../src/balsa-mime-widget-vcalendar.c:171
+#: ../src/balsa-print-object-text.c:669
+#, fuzzy
+#| msgid "Startup"
+msgid "Start"
+msgstr "Käynnistys"
+
+#: ../src/balsa-mime-widget-vcalendar.c:172
+#: ../src/balsa-print-object-text.c:671
+msgid "End"
+msgstr ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:173
+#: ../src/balsa-print-object-text.c:673
+#, fuzzy
+#| msgid "Action"
+msgid "Location"
+msgstr "Toiminto"
+
+#: ../src/balsa-mime-widget-vcalendar.c:205
+#: ../src/balsa-print-object-text.c:682
+msgid "Attendees"
+msgstr ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:205
+#: ../src/balsa-print-object-text.c:682
+msgid "Attendee"
+msgstr ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:208
+#: ../src/balsa-print-object-text.c:696 ../src/sendmsg-window.c:3051
+msgid "Description"
+msgstr "Kuvaus"
+
+#: ../src/balsa-mime-widget-vcalendar.c:229
+msgid "The sender asks you for a reply to this request:"
+msgstr ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:236
+#, fuzzy
+#| msgid "_Accept Once"
+msgid "Accept"
+msgstr "Hyväksy _kerran"
+
+#: ../src/balsa-mime-widget-vcalendar.c:245
+#, fuzzy
+#| msgid "_Accept Once"
+msgid "Accept tentatively"
+msgstr "Hyväksy _kerran"
+
+#: ../src/balsa-mime-widget-vcalendar.c:253
+#, fuzzy
+#| msgid "Inline"
+msgid "Decline"
+msgstr "Sisäkkäisesti"
+
+#: ../src/balsa-mime-widget-vcalendar.c:300
+msgid "iTip Calendar Request"
+msgstr ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:334
+#, fuzzy, c-format
+#| msgid "Sending the external body request failed: %s"
+msgid "Sending the iTip calendar reply failed: %s"
+msgstr "Ulkoisen rungon pyynnön lähetys epäonnistui: %s"
+
+#: ../src/balsa-print-object-default.c:153
+#: ../src/balsa-print-object-default.c:155
+#: ../src/balsa-print-object-default.c:158
+msgid "Type:"
+msgstr "Tyyppi:"
+
+#: ../src/balsa-print-object-default.c:163
+#: ../src/balsa-print-object-default.c:167
+msgid "File name:"
+msgstr "Tiedostonimi:"
+
+#: ../src/filter-edit-callbacks.c:337
 msgid "One of the specified fields contains:"
 msgstr "Yksi annetuista kentistä sisältää:"
 
-#: ../src/filter-edit-callbacks.c:312
+#: ../src/filter-edit-callbacks.c:338
 msgid "None of the specified fields contains:"
 msgstr "Yksikään annetuista viesteisti ei sisällä:"
 
-#: ../src/filter-edit-callbacks.c:314
+#: ../src/filter-edit-callbacks.c:340
 msgid "One of the regular expressions matches"
 msgstr "Yksi säännöllisistä lausekkeista vastaa"
 
-#: ../src/filter-edit-callbacks.c:315
+#: ../src/filter-edit-callbacks.c:341
 msgid "None of the regular expressions matches"
 msgstr "Mikään säännöllisistä lausekkeista ei täsmää"
 
-#: ../src/filter-edit-callbacks.c:317
+#: ../src/filter-edit-callbacks.c:343
 msgid "Match when date is in the interval:"
 msgstr "Osuma, kun päiväys on väliltä:"
 
-#: ../src/filter-edit-callbacks.c:318
+#: ../src/filter-edit-callbacks.c:344
 msgid "Match when date is outside the interval:"
 msgstr "Osuma, kun päiväys ei ole väliltä:"
 
-#: ../src/filter-edit-callbacks.c:320 ../src/filter-edit-callbacks.c:1085
+#: ../src/filter-edit-callbacks.c:346 ../src/filter-edit-callbacks.c:1155
 msgid "Match when one of these flags is set:"
 msgstr "Osuma, kun joku näistä lipuista ei ole asetettu:"
 
-#: ../src/filter-edit-callbacks.c:321
+#: ../src/filter-edit-callbacks.c:347
 msgid "Match when none of these flags is set:"
 msgstr "Osuma, kun mikään näistä lipuista ei ole asetettu:"
 
-#: ../src/filter-edit-callbacks.c:512
+#: ../src/filter-edit-callbacks.c:554
 msgid "You must specify the name of the user header to match on"
 msgstr "Täsmättävän otsakkeen nimi täytyy antaa"
 
-#: ../src/filter-edit-callbacks.c:523
+#: ../src/filter-edit-callbacks.c:565
 msgid "You must specify at least one field for matching"
 msgstr "Ainakin yksi täsmättävä kenttä täytyy antaa"
 
-#: ../src/filter-edit-callbacks.c:533
+#: ../src/filter-edit-callbacks.c:575
 msgid "You must provide a string"
 msgstr "Merkkijono täytyy syöttää"
 
-#: ../src/filter-edit-callbacks.c:540
+#: ../src/filter-edit-callbacks.c:583
 msgid "You must provide at least one regular expression"
 msgstr "Ainakin yksi säännöllinen lauseke täytyy antaa"
 
-#: ../src/filter-edit-callbacks.c:552
+#: ../src/filter-edit-callbacks.c:596
 msgid "Low date is incorrect"
 msgstr "Alempi päiväys on virheellinen"
 
-#: ../src/filter-edit-callbacks.c:563
+#: ../src/filter-edit-callbacks.c:607
 msgid "High date is incorrect"
 msgstr "Ylempi päiväys on virheellinen"
 
-#: ../src/filter-edit-callbacks.c:571
+#: ../src/filter-edit-callbacks.c:615
 msgid "Low date is greater than high date"
 msgstr "Alempi päiväys on suurempi kuin ylempi"
 
-#: ../src/filter-edit-callbacks.c:856
+#: ../src/filter-edit-callbacks.c:910
 #, c-format
 msgid "Error displaying condition help: %s\n"
 msgstr "Virhe näytettäessä ehtojen ohjetta: %s\n"
 
-#: ../src/filter-edit-callbacks.c:897
+#: ../src/filter-edit-callbacks.c:951
 msgid "Match Fields"
 msgstr "Täsmäävät kentät"
 
-#: ../src/filter-edit-callbacks.c:907
+#: ../src/filter-edit-callbacks.c:961
 msgid "_All"
 msgstr "_Kaikki"
 
-#: ../src/filter-edit-callbacks.c:908
+#: ../src/filter-edit-callbacks.c:962
 msgid "C_lear"
 msgstr "_Tyhjennä"
 
-#: ../src/filter-edit-callbacks.c:910 ../src/main-window.c:3858
+#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:4362
 msgid "_Body"
 msgstr "Viestin _sisältö"
 
-#. To:
-#: ../src/filter-edit-callbacks.c:911 ../src/main-window.c:3859
-#: ../src/sendmsg-window.c:2813
+#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:4363
 msgid "_To:"
 msgstr "_Vastaanottaja:"
 
-#: ../src/filter-edit-callbacks.c:912 ../src/main-window.c:3860
+#: ../src/filter-edit-callbacks.c:966 ../src/main-window.c:4364
 msgid "_From:"
 msgstr "_Lähettäjä:"
 
-#: ../src/filter-edit-callbacks.c:913
+#: ../src/filter-edit-callbacks.c:967
 msgid "_Subject"
 msgstr "_Otsikko"
 
-#: ../src/filter-edit-callbacks.c:914 ../src/main-window.c:3862
+#: ../src/filter-edit-callbacks.c:968 ../src/main-window.c:4366
 msgid "_Cc:"
 msgstr "_Kopio:"
 
-#: ../src/filter-edit-callbacks.c:916
+#: ../src/filter-edit-callbacks.c:970
 msgid "_User header:"
 msgstr "_Käyttäjän otsake:"
 
-#: ../src/filter-edit-callbacks.c:946
+#: ../src/filter-edit-callbacks.c:1011
 msgid "Unread"
 msgstr "Ei luettu"
 
-#: ../src/filter-edit-callbacks.c:946
-msgid "Deleted"
-msgstr "Poistettu"
-
-#: ../src/filter-edit-callbacks.c:946
-msgid "Replied"
-msgstr "Vastattu"
-
-#: ../src/filter-edit-callbacks.c:946
-msgid "Flagged"
-msgstr "Lipulla"
-
-#: ../src/filter-edit-callbacks.c:961
+#: ../src/filter-edit-callbacks.c:1026
 msgid "One of the specified f_ields contains"
 msgstr "Yksi annetuista kentistä täsmää"
 
-#: ../src/filter-edit-callbacks.c:976
+#: ../src/filter-edit-callbacks.c:1041
 msgid "Contain/Does _Not Contain"
 msgstr "Sisältää/_Ei sisällä"
 
-#: ../src/filter-edit-callbacks.c:995
+#: ../src/filter-edit-callbacks.c:1061
 msgid "_One of the regular expressions matches"
 msgstr "_Yksi säännöllinen lauseke täsmää"
 
 #. Left/Remove button
-#: ../src/filter-edit-callbacks.c:1026 ../src/filter-edit-dialog.c:321
-#: ../src/filter-run-dialog.c:332
+#: ../src/filter-edit-callbacks.c:1092 ../src/filter-edit-dialog.c:341
+#: ../src/filter-run-dialog.c:334
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../src/filter-edit-callbacks.c:1030
+#: ../src/filter-edit-callbacks.c:1096
 msgid "One _Matches/None Matches"
 msgstr "Yksi _osuma/ei osumia"
 
-#: ../src/filter-edit-callbacks.c:1047
+#: ../src/filter-edit-callbacks.c:1107
+#, fuzzy
+#| msgid "Error in regular expression syntax"
+msgid "Filtering using regular expressions is not yet implemented."
+msgstr "Virhe säännöllisessä lausekkeessa"
+
+#: ../src/filter-edit-callbacks.c:1117
 msgid "Match when message date is in the interval:"
 msgstr "Täsmää, kun viestin päiväys on väliltä:"
 
-#: ../src/filter-edit-callbacks.c:1067
+#: ../src/filter-edit-callbacks.c:1137
 msgid "Inside/outside the date interval"
 msgstr "Päiväysvälin aikana tai ulkopuolella"
 
-#: ../src/filter-edit-callbacks.c:1114
+#: ../src/filter-edit-callbacks.c:1184
 msgid "Match when one flag is set/when no flag is set"
 msgstr "Täsmää, kun yksi lippu on asetettu tai mitään lippua ei ole asetettu"
 
-#: ../src/filter-edit-callbacks.c:1132
+#: ../src/filter-edit-callbacks.c:1203
 msgid "Search T_ype:"
 msgstr "Haun t_yyppi"
 
-#: ../src/filter-edit-callbacks.c:1206
+#: ../src/filter-edit-callbacks.c:1280
 msgid "Edit condition for filter: "
 msgstr "Muokkaa suodattimen ehtoa: "
 
-#: ../src/filter-edit-callbacks.c:1424 ../src/save-restore.c:2018
+#: ../src/filter-edit-callbacks.c:1498 ../src/save-restore.c:1973
 msgid "Filter with no condition was omitted"
 msgstr "Suodatin, jossa ei ollut ehtoja, jätettiin huomioimatta"
 
-#: ../src/filter-edit-callbacks.c:1450
+#: ../src/filter-edit-callbacks.c:1524
 #, c-format
 msgid "Error displaying filter help: %s\n"
 msgstr "Virhe näytettäessä suodattimien ohjetta: %s\n"
 
-#: ../src/filter-edit-callbacks.c:1640
+#: ../src/filter-edit-callbacks.c:1723
 msgid "New filter"
 msgstr "Uusi suodatin"
 
-#: ../src/filter-edit-callbacks.c:1772
+#: ../src/filter-edit-callbacks.c:1852
 msgid "No filter name specified."
 msgstr "Suodattimelle ei annettu nimeä."
 
-#: ../src/filter-edit-callbacks.c:1777
+#: ../src/filter-edit-callbacks.c:1857
 #, c-format
 msgid "Filter \"%s\" already exists."
 msgstr "Suodatin \"%s\" on jo olemassa."
 
-#: ../src/filter-edit-callbacks.c:1787
+#: ../src/filter-edit-callbacks.c:1867
 msgid "Filter must have conditions."
 msgstr "Suodattimessa täytyy olla ehtoja."
 
-#: ../src/filter-edit-callbacks.c:1844
+#: ../src/filter-edit-callbacks.c:1953
 msgid "Filter has matched"
 msgstr "Suodatin täsmäsi"
 
-#: ../src/filter-edit-callbacks.c:1869
+#: ../src/filter-edit-callbacks.c:1973
 msgid "You must provide a sound to play"
 msgstr "Soitettava ääni täytyy antaa"
 
-#: ../src/filter-edit-callbacks.c:2028
+#: ../src/filter-edit-callbacks.c:2155
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Esimerkki: kirjoita Joulukuun 31, 2000 muodoss %s)"
 
-#: ../src/filter-edit-dialog.c:89 ../src/pref-manager.c:410
+#: ../src/filter-edit-dialog.c:97 ../src/pref-manager.c:426
 msgid "Simple"
 msgstr "Yksinkertainen"
 
-#: ../src/filter-edit-dialog.c:90
+#: ../src/filter-edit-dialog.c:98
 msgid "Regular Expression"
 msgstr "Säännöllinen lauseke"
 
-#: ../src/filter-edit-dialog.c:91
+#: ../src/filter-edit-dialog.c:99
 msgid "Date interval"
 msgstr "Päiväyksien väli"
 
-#: ../src/filter-edit-dialog.c:92
+#: ../src/filter-edit-dialog.c:100
 msgid "Flag condition"
 msgstr "Lipun tila"
 
-#: ../src/filter-edit-dialog.c:96
+#: ../src/filter-edit-dialog.c:104
 msgid "Copy to folder:"
 msgstr "Kopioi kansioon:"
 
-#: ../src/filter-edit-dialog.c:97
+#: ../src/filter-edit-dialog.c:105
 msgid "Move to folder:"
 msgstr "Siirrä kansioon:"
 
-#: ../src/filter-edit-dialog.c:98
+#: ../src/filter-edit-dialog.c:106
+#, fuzzy
+#| msgid "Colors"
+msgid "Colorize"
+msgstr "Värit"
+
+#: ../src/filter-edit-dialog.c:107
 msgid "Print on printer:"
 msgstr "Tulosta tulostimella:"
 
-#: ../src/filter-edit-dialog.c:99
+#: ../src/filter-edit-dialog.c:108
 msgid "Run program:"
 msgstr "Suorita ohjelma:"
 
-#: ../src/filter-edit-dialog.c:100
+#: ../src/filter-edit-dialog.c:109
 msgid "Send to Trash"
 msgstr "Lähetä roskakoriin"
 
-#: ../src/filter-edit-dialog.c:104
+#: ../src/filter-edit-dialog.c:113
 msgid "OR"
 msgstr "TAI"
 
-#: ../src/filter-edit-dialog.c:105
+#: ../src/filter-edit-dialog.c:114
 msgid "AND"
 msgstr "JA"
 
-#. new button
-#: ../src/filter-edit-dialog.c:217 ../src/mailbox-node.c:1035
-#: ../src/main-window.c:545 ../src/main-window.c:554
-msgid "_New"
-msgstr "Uu_si"
-
 #. The name entry
-#: ../src/filter-edit-dialog.c:249
+#: ../src/filter-edit-dialog.c:269
 msgid "_Filter name:"
 msgstr "_Suodattimen nimi:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:267
+#: ../src/filter-edit-dialog.c:287
 msgid "Operation between conditions"
 msgstr "Toiminto ehtojen välillä"
 
-#: ../src/filter-edit-dialog.c:312
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../src/filter-edit-dialog.c:317
+#: ../src/filter-edit-dialog.c:337
 msgid "Ne_w"
 msgstr "_Uusi"
 
+#: ../src/filter-edit-dialog.c:365
+msgid "Foreground"
+msgstr ""
+
+#: ../src/filter-edit-dialog.c:376
+msgid "Background"
+msgstr ""
+
 #. The notification area
-#: ../src/filter-edit-dialog.c:350
+#: ../src/filter-edit-dialog.c:401
 msgid "Notification:"
 msgstr "Ilmoitus:"
 
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:360
+#: ../src/filter-edit-dialog.c:411
 msgid "Play sound:"
 msgstr "Soita ääni:"
 
-#: ../src/filter-edit-dialog.c:367 ../src/filter-edit-dialog.c:380
+#: ../src/filter-edit-dialog.c:417
 msgid "Use Sound..."
 msgstr "Käytä ääniä..."
 
-#: ../src/filter-edit-dialog.c:399
+#: ../src/filter-edit-dialog.c:438
 msgid "Popup text:"
 msgstr "Ponnahdusteksti:"
 
 #. The action area
-#: ../src/filter-edit-dialog.c:420
+#: ../src/filter-edit-dialog.c:459
 msgid "Action to perform:"
 msgstr "Toimenpide:"
 
-#: ../src/filter-edit-dialog.c:471
+#: ../src/filter-edit-dialog.c:512
 msgid "Match"
 msgstr "Täsmää"
 
-#: ../src/filter-edit-dialog.c:474
+#: ../src/filter-edit-dialog.c:515
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../src/filter-edit-dialog.c:486
+#: ../src/filter-edit-dialog.c:527
 msgid "Revert"
 msgstr "Peruuta"
 
-#: ../src/filter-edit-dialog.c:537
-msgid "A filter run dialog is open.Close it before you can modify filters."
+#: ../src/filter-edit-dialog.c:578
+#, fuzzy
+#| msgid "A filter run dialog is open.Close it before you can modify filters."
+msgid "A filter run dialog is open. Close it before you can modify filters."
 msgstr ""
 "Suodattimen suoritusikkuna on auki. Se täytyy sulkea ennen kuin voit muokata "
 "suodattimia."
 
-#: ../src/filter-edit-dialog.c:550
+#: ../src/filter-edit-dialog.c:591
 msgid "Balsa Filters"
 msgstr "Balsan suodattimet"
 
-#: ../src/filter-edit-dialog.c:618
+#: ../src/filter-edit-dialog.c:660
 #, c-format
 msgid "Filter \"%s\" has no condition."
 msgstr "Suodattimessa \"%s\" ei ole ehtoa."
 
-#: ../src/filter-export-callbacks.c:57
+#: ../src/filter-export-callbacks.c:59
 #, c-format
 msgid "Unable to export filter %s, an error occurred."
 msgstr "Suodatinta %s ei voi viedä, tapahtui virhe."
 
-#: ../src/filter-export-dialog.c:63
+#: ../src/filter-export-dialog.c:65
 msgid ""
 "There are opened filter run dialogs, close them before you can modify "
 "filters."
@@ -2959,25 +3812,25 @@ msgstr ""
 "Suodattimen suoritusikkunoita on avoinna. Ne täytyy sulkea ennen kuin voit "
 "muokata suodattimia."
 
-#: ../src/filter-export-dialog.c:75
+#: ../src/filter-export-dialog.c:77
 msgid "Balsa Filters Export"
 msgstr "Balsan suodattimien vienti"
 
-#: ../src/filter-run-callbacks.c:182
+#: ../src/filter-run-callbacks.c:184
 #, c-format
 msgid "Error displaying run filters help: %s\n"
 msgstr "Virhe näytettäessä suodattimien ohjetta: %s\n"
 
-#: ../src/filter-run-callbacks.c:230 ../src/filter-run-callbacks.c:252
+#: ../src/filter-run-callbacks.c:234 ../src/filter-run-callbacks.c:256
 msgid "Error when applying filters"
 msgstr "Virhe toteutettaessa suodattimia"
 
-#: ../src/filter-run-callbacks.c:233 ../src/filter-run-callbacks.c:255
+#: ../src/filter-run-callbacks.c:237 ../src/filter-run-callbacks.c:259
 #, c-format
 msgid "Filter applied to \"%s\"."
 msgstr "Kohde \"%s\" suodatettu."
 
-#: ../src/filter-run-callbacks.c:292
+#: ../src/filter-run-callbacks.c:298
 #, c-format
 msgid ""
 "The destination mailbox of the filter \"%s\" is \"%s\".\n"
@@ -2986,7 +3839,7 @@ msgstr ""
 "Suodattimen \"%s\" kohdekansio on \"%s\".\n"
 "Et voi liittää sitä samaan kansioon uudestaan."
 
-#: ../src/filter-run-callbacks.c:300
+#: ../src/filter-run-callbacks.c:306
 #, c-format
 msgid ""
 "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
@@ -2999,37 +3852,37 @@ msgstr ""
 "jolloin tämä tapahtuu hyvin hitaasti. Tällöin tulisi käyttää mieluummin "
 "alimerkkijonon täsmäämistä."
 
-#: ../src/filter-run-dialog.c:189
+#: ../src/filter-run-dialog.c:191
 msgid "Balsa Filters of Mailbox: "
 msgstr "Balsan sähköpostisuodattimet: "
 
-#: ../src/filter-run-dialog.c:230
+#: ../src/filter-run-dialog.c:232
 msgid "On reception"
 msgstr "Vastaanotettaessa"
 
-#: ../src/filter-run-dialog.c:242
+#: ../src/filter-run-dialog.c:244
 msgid "On exit"
 msgstr "Poistuttaessa"
 
-#: ../src/filter-run-dialog.c:316
+#: ../src/filter-run-dialog.c:318
 msgid "Apply Selected"
 msgstr "Toteuta valitut"
 
 #. up button
-#: ../src/filter-run-dialog.c:364
+#: ../src/filter-run-dialog.c:366
 msgid "_Up"
 msgstr "_Ylös"
 
 #. down button
-#: ../src/filter-run-dialog.c:369
+#: ../src/filter-run-dialog.c:371
 msgid "Do_wn"
 msgstr "_Alas"
 
-#: ../src/filter-run-dialog.c:375
+#: ../src/filter-run-dialog.c:377
 msgid "A_pply Now!"
 msgstr "Toteuta heti!"
 
-#: ../src/filter-run-dialog.c:419
+#: ../src/filter-run-dialog.c:421
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
@@ -3037,84 +3890,92 @@ msgstr ""
 "Suodatin-ikkuna on auki. Se täytyy sulkea ennen kuin voit käyttää "
 "suodattimia kansioille"
 
-#: ../src/folder-conf.c:285
+#: ../src/folder-conf.c:110
+#, fuzzy, c-format
+#| msgid "Error displaying condition help: %s\n"
+msgid "Error displaying config help: %s\n"
+msgstr "Virhe näytettäessä ehtojen ohjetta: %s\n"
+
+#: ../src/folder-conf.c:298
 msgid "Remote IMAP folder"
 msgstr "Ulkoinen IMAP-palvelin"
 
 #. must NOT be modal
-#: ../src/folder-conf.c:288 ../src/folder-conf.c:758 ../src/mailbox-conf.c:529
+#: ../src/folder-conf.c:301 ../src/folder-conf.c:789 ../src/mailbox-conf.c:573
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../src/folder-conf.c:288
+#: ../src/folder-conf.c:301
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../src/folder-conf.c:311 ../src/mailbox-conf.c:1137
-#: ../src/mailbox-conf.c:1239
+#: ../src/folder-conf.c:327 ../src/mailbox-conf.c:1226
+#: ../src/mailbox-conf.c:1338
 msgid "_Basic"
 msgstr "_Perusasetukset"
 
-#: ../src/folder-conf.c:316
+#: ../src/folder-conf.c:332
 msgid "_Max number of connections:"
 msgstr "_Yhteyksiä enintään:"
 
-#: ../src/folder-conf.c:323 ../src/mailbox-conf.c:1302
+#: ../src/folder-conf.c:339 ../src/mailbox-conf.c:1401
 msgid "Enable _persistent cache"
 msgstr "Käytä _pysyvää välimuistia"
 
-#: ../src/folder-conf.c:331
+#: ../src/folder-conf.c:347
 msgid "Use IDLE command"
 msgstr "Käytä IDLE-komentoa"
 
-#: ../src/folder-conf.c:338 ../src/mailbox-conf.c:1306
+#: ../src/folder-conf.c:354 ../src/mailbox-conf.c:1405
 msgid "Enable _bug workarounds"
 msgstr "Käytä _korjauksia tunnettuihin palvelinongelmiin"
 
-#: ../src/folder-conf.c:345
+#: ../src/folder-conf.c:361
 msgid "Use STATUS for mailbox checking"
 msgstr "Käytä STATUS-komentoa kansion tilan katsomiseen"
 
-#: ../src/folder-conf.c:351 ../src/mailbox-conf.c:1191
-#: ../src/mailbox-conf.c:1308
+#: ../src/folder-conf.c:367 ../src/mailbox-conf.c:1280
+#: ../src/mailbox-conf.c:1407
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:354
-msgid "Descriptive _Name:"
+#: ../src/folder-conf.c:370
+#, fuzzy
+#| msgid "Descriptive _Name:"
+msgid "Descriptive _name:"
 msgstr "_Kuvaava nimi:"
 
 #. username
-#: ../src/folder-conf.c:369 ../src/mailbox-conf.c:1153
+#: ../src/folder-conf.c:385 ../src/mailbox-conf.c:1242
 msgid "Use_r name:"
 msgstr "_Käyttäjätunnus:"
 
-#: ../src/folder-conf.c:375
+#: ../src/folder-conf.c:391
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/folder-conf.c:380 ../src/mailbox-conf.c:1264
+#: ../src/folder-conf.c:396 ../src/mailbox-conf.c:1363
 msgid "_Anonymous access"
 msgstr "_Anonyymi pääsy"
 
-#: ../src/folder-conf.c:389
+#: ../src/folder-conf.c:405
 msgid "Subscribed _folders only"
 msgstr "_Ainoastaan tilatut kansiot"
 
-#: ../src/folder-conf.c:391
+#: ../src/folder-conf.c:407
 msgid "Always show _INBOX"
 msgstr "_Näytä aina INBOX"
 
-#: ../src/folder-conf.c:394
+#: ../src/folder-conf.c:410
 msgid "Pr_efix:"
 msgstr "_Etuliite:"
 
-#: ../src/folder-conf.c:540
+#: ../src/folder-conf.c:556
 msgid "Select parent folder"
 msgstr "Valitse yläkansio"
 
-#: ../src/folder-conf.c:614
+#: ../src/folder-conf.c:634
 #, c-format
 msgid ""
 "Renaming INBOX is special!\n"
@@ -3129,29 +3990,29 @@ msgstr ""
 "INBOX alikansioineen säilyy. \n"
 "Mitä haluaisit tehdä?"
 
-#: ../src/folder-conf.c:620
+#: ../src/folder-conf.c:640
 msgid "Question"
 msgstr "Kysymys"
 
-#: ../src/folder-conf.c:625
+#: ../src/folder-conf.c:645
 msgid "Rename INBOX"
 msgstr "Uudelleennimeä INBOX"
 
-#: ../src/folder-conf.c:627
+#: ../src/folder-conf.c:647
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../src/folder-conf.c:648
+#: ../src/folder-conf.c:672
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Kansion uudelleennimeäminen epäonnistui, syy: %s"
 
-#: ../src/folder-conf.c:700
+#: ../src/folder-conf.c:724
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Kansion luonti epöonnistui, syy: %s"
 
-#: ../src/folder-conf.c:740
+#: ../src/folder-conf.c:771
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -3159,40 +4020,109 @@ msgstr ""
 "IMAP-kansiolla, joka ei ole sähköpostikansio,\n"
 "ei ole muutettavia ominaisuuksia."
 
-#: ../src/folder-conf.c:755
+#: ../src/folder-conf.c:786
 msgid "Remote IMAP subfolder"
 msgstr "Ulkoinen IMAP-alikansio"
 
-#: ../src/folder-conf.c:758
+#: ../src/folder-conf.c:789
 msgid "_Create"
 msgstr "_Luo"
 
-#: ../src/folder-conf.c:779
-msgid "Rename or move subfolder"
-msgstr "Uudelleennimeä tai siirrä kansio"
-
-#: ../src/folder-conf.c:780
+#: ../src/folder-conf.c:820
 msgid "Create subfolder"
 msgstr "Luo alikansio"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:788
+#: ../src/folder-conf.c:828
 msgid "_Folder name:"
 msgstr "_Kansion nimi:"
 
-#: ../src/folder-conf.c:794
+#: ../src/folder-conf.c:834
 msgid "Host:"
 msgstr "Palvelin:"
 
-#: ../src/folder-conf.c:800
+#: ../src/folder-conf.c:843
+#, fuzzy
+#| msgid "_Subfolder of:"
+msgid "Subfolder of:"
+msgstr "_Yläkansio:"
+
+#: ../src/folder-conf.c:848
 msgid "_Browse..."
 msgstr "_Selaa..."
 
-#: ../src/folder-conf.c:808
-msgid "_Subfolder of:"
-msgstr "_Yläkansio:"
+#: ../src/folder-conf.c:862
+msgid "read-only"
+msgstr ""
+
+#: ../src/folder-conf.c:863
+msgid "read-write"
+msgstr ""
+
+#: ../src/folder-conf.c:864
+msgid "admin"
+msgstr ""
+
+#: ../src/folder-conf.c:865
+msgid "post"
+msgstr ""
+
+#: ../src/folder-conf.c:866
+msgid "append"
+msgstr ""
+
+#: ../src/folder-conf.c:867
+#, fuzzy
+#| msgid "_Undelete"
+msgid "delete"
+msgstr "P_alauta viesti"
+
+#: ../src/folder-conf.c:868
+msgid "special"
+msgstr ""
+
+#: ../src/folder-conf.c:874
+msgid "Permissions:"
+msgstr ""
+
+#: ../src/folder-conf.c:881
+msgid ""
+"\n"
+"detailed permissions are available only for open folders"
+msgstr ""
 
-#: ../src/folder-conf.c:837
+#: ../src/folder-conf.c:888
+msgid ""
+"\n"
+"the server does not support ACL's"
+msgstr ""
+
+#: ../src/folder-conf.c:897
+msgid "mine: "
+msgstr ""
+
+#: ../src/folder-conf.c:936
+msgid "Quota:"
+msgstr ""
+
+#: ../src/folder-conf.c:940
+msgid "quota information available only for open folders"
+msgstr ""
+
+#: ../src/folder-conf.c:945
+msgid "the server does not support quotas"
+msgstr ""
+
+#: ../src/folder-conf.c:947
+msgid "no limits"
+msgstr ""
+
+#: ../src/folder-conf.c:952
+#, c-format
+msgid "%s of %s (%.1f%%) used"
+msgstr ""
+
+#: ../src/folder-conf.c:989
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
 "it from remote server."
@@ -3200,7 +4130,7 @@ msgstr ""
 "Tätä kansiota ei löydy asetuksista. En vielä tiedä, kuinka se poistetaan "
 "etäpalvelimelta."
 
-#: ../src/folder-conf.c:846
+#: ../src/folder-conf.c:998
 #, c-format
 msgid ""
 "This will remove the folder \"%s\" from the list.\n"
@@ -3209,38 +4139,44 @@ msgstr ""
 "Tämä poistaa kansion \"%s\" listalta.\n"
 "Voit käyttää toimintoa \"Lisää IMAP-kansio\" ja lisätä kansion takaisin.\n"
 
-#: ../src/folder-conf.c:851
+#: ../src/folder-conf.c:1006
 msgid "Confirm"
 msgstr "Varmista"
 
-#: ../src/information-dialog.c:225
+#: ../src/information-dialog.c:232
 msgid "Information - Balsa"
 msgstr "Tietoja - Balsa"
 
-#: ../src/information-dialog.c:328
+#: ../src/information-dialog.c:359
 #, c-format
 msgid "WARNING: "
 msgstr "VAROITUS:"
 
-#: ../src/information-dialog.c:331
+#: ../src/information-dialog.c:362
 #, c-format
 msgid "ERROR: "
 msgstr "VIRHE:"
 
-#: ../src/information-dialog.c:334
+#: ../src/information-dialog.c:365
 #, c-format
 msgid "FATAL: "
 msgstr "VAKAVA:"
 
-#: ../src/mailbox-conf.c:221
+#: ../src/mailbox-conf.c:223
+msgid ""
+"Balsa was built without SSL support.\n"
+"Neither SSL nor TLS can be used."
+msgstr ""
+
+#: ../src/mailbox-conf.c:235
 msgid "Use _SSL"
 msgstr "Käytä _SSL-yhteyttä"
 
-#: ../src/mailbox-conf.c:349
+#: ../src/mailbox-conf.c:374
 msgid "No mailbox selected."
 msgstr "Ei valittuja kansioita."
 
-#: ../src/mailbox-conf.c:378
+#: ../src/mailbox-conf.c:404
 #, c-format
 msgid ""
 "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
@@ -3251,7 +4187,7 @@ msgstr ""
 "Jos todella haluat poistaa sen, siirrä siihen liitetyt tehtävät\n"
 "johonkin toiseen kansioon."
 
-#: ../src/mailbox-conf.c:388
+#: ../src/mailbox-conf.c:414
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
@@ -3266,15 +4202,15 @@ msgstr ""
 "\"Lisää kansio\" saman kansion avaamiseksi uudestaan.\n"
 "Mitä haluat tehdä?"
 
-#: ../src/mailbox-conf.c:400
+#: ../src/mailbox-conf.c:426
 msgid "Remove from _list"
 msgstr "Poista _listalta"
 
-#: ../src/mailbox-conf.c:401
+#: ../src/mailbox-conf.c:427
 msgid "Remove from list and _disk"
 msgstr "Poista listalta ja l_evyltä"
 
-#: ../src/mailbox-conf.c:409
+#: ../src/mailbox-conf.c:435
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" and all its messages from your IMAP "
@@ -3289,11 +4225,11 @@ msgstr ""
 "uudestaan.\n"
 "Mitä haluat tehdä?"
 
-#: ../src/mailbox-conf.c:422
+#: ../src/mailbox-conf.c:448
 msgid "_Remove from server"
 msgstr "_Poista palvelimelta"
 
-#: ../src/mailbox-conf.c:429
+#: ../src/mailbox-conf.c:455
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
@@ -3304,26 +4240,26 @@ msgstr ""
 "Voit käyttää komentoa \"Lisää kansio\" lukeaksesi tätä kansiota uudestaan.\n"
 "Mitä haluat tehdä?"
 
-#: ../src/mailbox-conf.c:438
+#: ../src/mailbox-conf.c:464
 msgid "_Remove from list"
 msgstr "Poista _listalta"
 
-#: ../src/mailbox-conf.c:476
+#: ../src/mailbox-conf.c:508
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 msgstr "Kansion poisto epäonnistui, syy: %s"
 
-#: ../src/mailbox-conf.c:533 ../src/pref-manager.c:1625
-#: ../src/pref-manager.c:1713 ../src/pref-manager.c:2784
+#: ../src/mailbox-conf.c:577 ../src/pref-manager.c:1712
+#: ../src/pref-manager.c:1784 ../src/pref-manager.c:2962
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../src/mailbox-conf.c:753
+#: ../src/mailbox-conf.c:800
 #, c-format
 msgid "%s on %s"
 msgstr "%s kohteessa %s"
 
-#: ../src/mailbox-conf.c:895
+#: ../src/mailbox-conf.c:942
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -3332,70 +4268,80 @@ msgstr ""
 "Nimeäminen %s -> %s epäonnistui:\n"
 "%s"
 
-#: ../src/mailbox-conf.c:1074
+#: ../src/mailbox-conf.c:1152
 msgid "_Mailbox Name:"
 msgstr "Kansion _nimi:"
 
-#: ../src/mailbox-conf.c:1085
-msgid "Local Mailbox Configurator"
-msgstr "Paikallisen postikansion asetukset"
+#: ../src/mailbox-conf.c:1161
+#, fuzzy, c-format
+#| msgid ""
+#| "Local Mail Problem\n"
+#| "%s"
+msgid "Local %s Mailbox Properties"
+msgstr "Paikallinen postiongelma%s"
 
-#: ../src/mailbox-conf.c:1118
+#: ../src/mailbox-conf.c:1162
+#, fuzzy, c-format
+#| msgid "Local MH mailbox..."
+msgid "New Local %s Mailbox"
+msgstr "Paikallinen MH-kansio..."
+
+#: ../src/mailbox-conf.c:1204
 msgid "Remote Mailbox Configurator"
 msgstr "Etäkansion asetukset"
 
 #. mailbox name
-#: ../src/mailbox-conf.c:1140 ../src/mailbox-conf.c:1242
-msgid "Mailbox _Name:"
+#: ../src/mailbox-conf.c:1229 ../src/mailbox-conf.c:1341
+#, fuzzy
+#| msgid "Mailbox _Name:"
+msgid "Mailbox _name:"
 msgstr "Kansion _nimi:"
 
 #. password field
-#: ../src/mailbox-conf.c:1159 ../src/mailbox-conf.c:1276
+#: ../src/mailbox-conf.c:1248 ../src/mailbox-conf.c:1375
 msgid "Pass_word:"
 msgstr "_Salasana:"
 
-#: ../src/mailbox-conf.c:1167
+#: ../src/mailbox-conf.c:1256
 msgid "_Delete messages from server after download"
 msgstr "Po_ista viestit lataamisen jälkeen"
 
-#: ../src/mailbox-conf.c:1172
+#: ../src/mailbox-conf.c:1261
 msgid "_Enable check for new mail"
 msgstr "_Tarkista uudet viestit"
 
-#: ../src/mailbox-conf.c:1177
+#: ../src/mailbox-conf.c:1266
 msgid "_Filter messages through procmail"
 msgstr "_Suodata viestit procmailin läpi"
 
-#: ../src/mailbox-conf.c:1181
+#: ../src/mailbox-conf.c:1270
 msgid "Fi_lter Command:"
 msgstr "S_uodatinkomento:"
 
-#: ../src/mailbox-conf.c:1195
+#: ../src/mailbox-conf.c:1284
 msgid "Disable _APOP"
 msgstr "Älä käytä _APOP:ia"
 
 #. username
-#: ../src/mailbox-conf.c:1256
+#: ../src/mailbox-conf.c:1355
 msgid "_Username:"
 msgstr "_Käyttäjätunnus:"
 
-#: ../src/mailbox-conf.c:1270
-msgid "_Remember Password"
-msgstr "_Muista salasana"
-
-#: ../src/mailbox-conf.c:1281
-msgid "F_older Path:"
+#: ../src/mailbox-conf.c:1380
+#, fuzzy
+#| msgid "F_older Path:"
+msgid "F_older path:"
 msgstr "K_ansion polku:"
 
-#: ../src/mailbox-conf.c:1367
+#: ../src/mailbox-conf.c:1470
 msgid "_Identity:"
 msgstr "_Henkilöllisyys:"
 
-#: ../src/mailbox-conf.c:1395 ../src/pref-manager.c:3249
+#: ../src/mailbox-conf.c:1512 ../src/pref-manager.c:3432
 msgid "Always"
 msgstr "Aina"
 
-#: ../src/mailbox-conf.c:1399
+#: ../src/mailbox-conf.c:1516
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -3403,24 +4349,24 @@ msgstr ""
 "_Pura salaus ja tarkista\n"
 "allekirjoitukset automaattisesti:"
 
-#: ../src/mailbox-conf.c:1420
+#: ../src/mailbox-conf.c:1547
 msgid "Show _Recipient column instead of Sender"
 msgstr "Näytä _vastaanottajakenttä lähettäjän sijasta"
 
-#: ../src/mailbox-conf.c:1427
+#: ../src/mailbox-conf.c:1560
 msgid "_Subscribe for new mail check"
 msgstr "_Merkitse uusien viestien tarkkailulistalle"
 
-#: ../src/mailbox-node.c:314
+#: ../src/mailbox-node.c:316
 msgid "The folder edition to be written."
 msgstr "Kansion muokkaus joka tullaan kirjoittamaan."
 
-#: ../src/mailbox-node.c:478
+#: ../src/mailbox-node.c:491
 #, c-format
 msgid "Scanning %s. Please wait..."
 msgstr "Tutkitaan kansiota %s. Odota..."
 
-#: ../src/mailbox-node.c:494
+#: ../src/mailbox-node.c:507
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -3429,478 +4375,605 @@ msgstr ""
 "Kohteen %s tutkiminen epäonnitui: %s\n"
 "Tarkista verkkoyhteys."
 
-#: ../src/mailbox-node.c:496
+#: ../src/mailbox-node.c:509
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Kansion %s tutkiminen epäonnistui: %s"
 
-#: ../src/mailbox-node.c:1020
+#: ../src/mailbox-node.c:1046
 msgid "Local _mbox mailbox..."
 msgstr "Paikallinen _mbox-kansio..."
 
-#: ../src/mailbox-node.c:1022
+#: ../src/mailbox-node.c:1048
 msgid "Local Mail_dir mailbox..."
 msgstr "Paikallinen Mail_dir-kansio..."
 
-#: ../src/mailbox-node.c:1024
+#: ../src/mailbox-node.c:1050
 msgid "Local M_H mailbox..."
 msgstr "Paikallinen M_H-kansio..."
 
-#: ../src/mailbox-node.c:1026
+#: ../src/mailbox-node.c:1052
 msgid "Remote _IMAP mailbox..."
 msgstr "Ulkoinen _IMAP-postilaatikko..."
 
-#: ../src/mailbox-node.c:1029
+#: ../src/mailbox-node.c:1055
 msgid "Remote IMAP _folder..."
 msgstr "Ulkoinen IMAP-_kansio..."
 
-#: ../src/mailbox-node.c:1031
+#: ../src/mailbox-node.c:1057
 msgid "Remote IMAP _subfolder..."
 msgstr "Ulkoinen IMAP-_alikansio..."
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1042 ../src/mailbox-node.c:1058
+#: ../src/mailbox-node.c:1068 ../src/mailbox-node.c:1084
 msgid "_Rescan"
 msgstr "Lue _uudelleen"
 
-#: ../src/mailbox-node.c:1052
+#: ../src/mailbox-node.c:1078 ../src/main-window.c:508
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
-#: ../src/mailbox-node.c:1068
+#: ../src/mailbox-node.c:1094
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../src/mailbox-node.c:1082
+#: ../src/mailbox-node.c:1108
 msgid "_Subscribe"
 msgstr "_Tilaa"
 
-#: ../src/mailbox-node.c:1084
+#: ../src/mailbox-node.c:1110
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../src/mailbox-node.c:1090
+#: ../src/mailbox-node.c:1116
 msgid "Mark as _Inbox"
 msgstr "Merkitse _saapuvien kansioksi"
 
-#: ../src/mailbox-node.c:1092
+#: ../src/mailbox-node.c:1118
 msgid "_Mark as Sentbox"
 msgstr "Merkitse _lähetettyjen kansioksi"
 
-#: ../src/mailbox-node.c:1094
+#: ../src/mailbox-node.c:1120
 msgid "Mark as _Trash"
 msgstr "Merkitse _roskapostien kansioksi"
 
-#: ../src/mailbox-node.c:1096
+#: ../src/mailbox-node.c:1122
 msgid "Mark as D_raftbox"
 msgstr "Merkitse l_uonnosten kansioksi"
 
-#: ../src/mailbox-node.c:1099
+#: ../src/mailbox-node.c:1125
 msgid "_Empty trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../src/mailbox-node.c:1104
+#: ../src/mailbox-node.c:1130
 msgid "_Edit/Apply filters"
 msgstr "_Muokkaa/toteuta suodattimia"
 
-#: ../src/mailbox-node.c:1192
+#: ../src/mailbox-node.c:1218
 #, c-format
 msgid "The path \"%s\" does not lead to a mailbox."
 msgstr "Polku \"%s\" ei viittaa postikansioon."
 
-#: ../src/mailbox-node.c:1205
+#: ../src/mailbox-node.c:1231
 #, c-format
 msgid "Local mailbox %s loaded as: %s\n"
 msgstr "Paikallinen kansio %s ladattu: %s\n"
 
-#: ../src/mailbox-node.c:1234
+#: ../src/mailbox-node.c:1262
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Paikallinen kansio %s\n"
 
-#: ../src/main-window.c:301
+#: ../src/main.c:212
+#, fuzzy, c-format
+#| msgid "Could not write file %s: %s"
+msgid "Could not write to %s: %s"
+msgstr "Tiedostoa \"%s\" ei voi kirjoittaa: %s"
+
+#: ../src/main.c:462 ../src/main.c:511
+msgid "Get new mail on startup"
+msgstr "Tarkista posti käynnistettäessä"
+
+#: ../src/main.c:464 ../src/main.c:513
+msgid "Compose a new email to EMAIL ADDRESS"
+msgstr "Kirjoita uusi viesti osoitteeseen POSTI OSOITE"
+
+#: ../src/main.c:466
+msgid "Attach file at PATH"
+msgstr "Liitä tiedosto POLUSTA"
+
+#: ../src/main.c:468 ../src/main.c:518
+msgid "Opens MAILBOXNAME"
+msgstr "Avaa LAATIKONNIMEn"
+
+#: ../src/main.c:468 ../src/main.c:518
+msgid "MAILBOXNAME"
+msgstr "LAATIKONNIMI"
+
+#: ../src/main.c:471 ../src/main.c:521
+msgid "Opens first unread mailbox"
+msgstr "Avaa ensimmäisen lukemattoman kansion"
+
+#: ../src/main.c:474 ../src/main.c:524
+msgid "Opens default Inbox on startup"
+msgstr "Avaa Saapuvien viestien oletuskansio käynnistettäessä"
+
+#: ../src/main.c:477 ../src/main.c:527
+msgid "Prints number unread and unsent messages"
+msgstr "näytä lukemattomien ja lähettämättömien viestien määrä"
+
+#: ../src/main.c:479 ../src/main.c:529
+msgid "Debug POP3 connection"
+msgstr "Etsi virheitä POP3-yhteydestä"
+
+#: ../src/main.c:481 ../src/main.c:531
+msgid "Debug IMAP connection"
+msgstr "Debuggaa IMAP-yhteyttä"
+
+#: ../src/main.c:503
+msgid "The Balsa E-Mail Client"
+msgstr "Balsa-sähköpostiohjelma"
+
+#: ../src/main.c:515
+#, fuzzy
+#| msgid "Attach file at PATH"
+msgid "Attach file at URI"
+msgstr "Liitä tiedosto POLUSTA"
+
+#: ../src/main.c:556
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+
+#: ../src/main.c:603 ../src/main.c:608 ../src/main.c:614 ../src/main.c:620
+#: ../src/main.c:626
+#, c-format
+msgid "Balsa cannot open your \"%s\" mailbox."
+msgstr "Balsa ei voi avata kansiotasi \"%s\"."
+
+#: ../src/main.c:603
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: ../src/main.c:609
+msgid "Outbox"
+msgstr "Lähtevät"
+
+#: ../src/main.c:615
+msgid "Sentbox"
+msgstr "Lähetetyt"
+
+#: ../src/main.c:621
+msgid "Draftbox"
+msgstr "Luonnokset"
+
+#: ../src/main.c:626
+msgid "Trash"
+msgstr "Roskat"
+
+#: ../src/main.c:845
+msgid "Compressing mail folders..."
+msgstr "Pakataan postikansiota..."
+
+#: ../src/main-window.c:324
 msgid "Balsa closes files and connections. Please wait..."
 msgstr "Balsa sulkee tiedostoja ja yhteyksiä, odota..."
 
-#: ../src/main-window.c:335
+#: ../src/main-window.c:349
+msgid "Mail_box"
+msgstr "_Kansio"
+
+#: ../src/main-window.c:350 ../src/message-window.c:243
+msgid "_Message"
+msgstr "_Viesti"
+
+#: ../src/main-window.c:351
+#, fuzzy
+#| msgid "User Settings"
+msgid "_Settings"
+msgstr "Käyttäjän asetukset"
+
+#: ../src/main-window.c:357
+msgid "Mail_boxes"
+msgstr "_Kansiot"
+
+#. Less frequently used entries of the 'View' menu
+#. Less frequently used entries of the 'Message' menu
+#. Less frequently used entries of the 'File' menu
+#. Less frequently used entries of the 'Edit' menu
+#. Less frequently used entries of the 'Tools' menu
+#: ../src/main-window.c:359 ../src/main-window.c:364
+#: ../src/sendmsg-window.c:328 ../src/sendmsg-window.c:330
+#: ../src/sendmsg-window.c:332
+msgid "_More"
+msgstr "_Lisää"
+
+#: ../src/main-window.c:360
+msgid "_Headers"
+msgstr "_Otsikot"
+
+#: ../src/main-window.c:361
+msgid "_Sort Mailbox"
+msgstr "_Järjestä kansio"
+
+#: ../src/main-window.c:362
+msgid "H_ide messages"
+msgstr "P_iilota viestit"
+
+#: ../src/main-window.c:365 ../src/sendmsg-window.c:326
+msgid "_Tools"
+msgstr "_Työkalurivi"
+
+#: ../src/main-window.c:366
+msgid "_Filters"
+msgstr "_Suodattimet..."
+
+#: ../src/main-window.c:367
 msgid "F_ilters"
 msgstr "Su_odattimet"
 
-#: ../src/main-window.c:336 ../src/main-window.c:394
+#: ../src/main-window.c:368 ../src/main-window.c:424
 msgid "Manage filters"
 msgstr "Suodatinten hallinta"
 
 #. File menu items
 #. Not in the touchpad menu, but still available as a toolbar
 #. * button:
-#: ../src/main-window.c:341
+#: ../src/main-window.c:373
 msgid "_Continue"
 msgstr "_Jatka"
 
-#: ../src/main-window.c:342
+#: ../src/main-window.c:374
 msgid "Continue editing current message"
 msgstr "Jatka tekstin muokkausta."
 
-#: ../src/main-window.c:344
+#: ../src/main-window.c:376
 msgid "_Get New Mail"
 msgstr "_Vastaanota"
 
-#: ../src/main-window.c:345
+#: ../src/main-window.c:377
 msgid "Fetch new incoming mail"
 msgstr "Lataa uudet viestit"
 
-#: ../src/main-window.c:346
+#: ../src/main-window.c:378
 msgid "_Send Queued Mail"
 msgstr "L_ähetä jonottava posti"
 
-#: ../src/main-window.c:347
+#: ../src/main-window.c:379
 msgid "Send messages from the outbox"
 msgstr "Lähetä Lähtevät-kansion viestit"
 
-#: ../src/main-window.c:350
+#: ../src/main-window.c:382
 msgid "Send and _Receive Mail"
 msgstr "L_ähetä ja vastaanota sähköpostia"
 
-#: ../src/main-window.c:351
+#: ../src/main-window.c:383
 msgid "Send and Receive messages"
 msgstr "Lähetä ja vastaanota viestejä"
 
-#: ../src/main-window.c:354 ../src/message-window.c:225
-#: ../src/sendmsg-window.c:326
+#: ../src/main-window.c:385 ../src/message-window.c:244
+#: ../src/sendmsg-window.c:345
 msgid "Page _Setup"
 msgstr "Sivun _asetukset"
 
-#: ../src/main-window.c:355 ../src/message-window.c:226
-#: ../src/sendmsg-window.c:327
+#: ../src/main-window.c:386 ../src/message-window.c:245
+#: ../src/sendmsg-window.c:346
 msgid "Set up page for printing"
 msgstr "Määrittele sivu tulostusta varten"
 
-#: ../src/main-window.c:357
+#: ../src/main-window.c:387
 msgid "_Address Book..."
 msgstr "_Osoitekirja"
 
-#: ../src/main-window.c:358
+#: ../src/main-window.c:388
 msgid "Open the address book"
 msgstr "Avaa osoitekirja"
 
-#: ../src/main-window.c:359
-msgid "_Quit"
-msgstr "_Lopeta"
+#: ../src/main-window.c:389
+#, fuzzy
+#| msgid "About Balsa"
+msgid "Quit Balsa"
+msgstr "Tietoja balsasta"
 
 #. File:New submenu items
-#: ../src/main-window.c:362
+#: ../src/main-window.c:392
 msgid "_Message..."
 msgstr "_Viesti..."
 
-#: ../src/main-window.c:363
+#: ../src/main-window.c:393
 msgid "Compose a new message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../src/main-window.c:365
+#: ../src/main-window.c:395
 msgid "Local mbox mailbox..."
 msgstr "Paikallinen mbox-kansio..."
 
-#: ../src/main-window.c:366 ../src/main-window.c:375
+#: ../src/main-window.c:396 ../src/main-window.c:405
 msgid "Add a new mbox style mailbox"
 msgstr "Lisää mbox-muotoinen kansio"
 
-#: ../src/main-window.c:368
+#: ../src/main-window.c:398
 msgid "Local Maildir mailbox..."
 msgstr "Paikallinen Maildir-kansio..."
 
-#: ../src/main-window.c:369 ../src/main-window.c:378
+#: ../src/main-window.c:399 ../src/main-window.c:408
 msgid "Add a new Maildir style mailbox"
 msgstr "Lisää Maildir-muotoinen kansio"
 
-#: ../src/main-window.c:371
+#: ../src/main-window.c:401
 msgid "Local MH mailbox..."
 msgstr "Paikallinen MH-kansio..."
 
-#: ../src/main-window.c:372 ../src/main-window.c:381
+#: ../src/main-window.c:402 ../src/main-window.c:411
 msgid "Add a new MH style mailbox"
 msgstr "Lisää MH-muotoinen kansio"
 
-#: ../src/main-window.c:374
+#: ../src/main-window.c:404
 msgid "New mailbox..."
 msgstr "Uusi postikansio..."
 
-#: ../src/main-window.c:377
+#: ../src/main-window.c:407
 msgid "New \"Maildir\" mailbox..."
 msgstr "Uusi Maildir-kansio..."
 
-#: ../src/main-window.c:380
+#: ../src/main-window.c:410
 msgid "New \"MH\" mailbox..."
 msgstr "Uusi MH-kansio..."
 
-#: ../src/main-window.c:383 ../src/pref-manager.c:3108
+#: ../src/main-window.c:413 ../src/pref-manager.c:3281
 msgid "Remote IMAP mailbox..."
 msgstr "Ulkoinen IMAP-kansio..."
 
-#: ../src/main-window.c:384
+#: ../src/main-window.c:414
 msgid "Add a new IMAP mailbox"
 msgstr "Lisää uusi IMAP-kansio"
 
-#: ../src/main-window.c:385 ../src/pref-manager.c:3113
+#: ../src/main-window.c:415 ../src/pref-manager.c:3286
 msgid "Remote IMAP folder..."
 msgstr "Ulkoinen IMAP-kansio..."
 
-#: ../src/main-window.c:386
+#: ../src/main-window.c:416
 msgid "Add a new IMAP folder"
 msgstr "Lisää uusi IMAP-kansio"
 
-#: ../src/main-window.c:387
+#: ../src/main-window.c:417
 msgid "Remote IMAP subfolder..."
 msgstr "Ulkoinen IMAP-alikansio..."
 
-#: ../src/main-window.c:388
+#: ../src/main-window.c:418
 msgid "Add a new IMAP subfolder"
 msgstr "Lisää uusi IMAP-alikansio"
 
-#: ../src/main-window.c:393
+#: ../src/main-window.c:423
 msgid "F_ilters..."
 msgstr "_Suodattimet..."
 
-#: ../src/main-window.c:395
-msgid "_Export Filters"
+#. Export selected filters to a text file.
+#: ../src/main-window.c:426
+#, fuzzy
+#| msgid "_Export Filters"
+msgid "_Export Filters..."
 msgstr "_Vie suodattimet..."
 
-#: ../src/main-window.c:396
+#: ../src/main-window.c:427
 msgid "Export filters as Sieve scripts"
 msgstr "Vie suodattimet Sieve-skripteinä"
 
-#: ../src/main-window.c:397
+#: ../src/main-window.c:428
 msgid "Prefere_nces"
 msgstr "_Asetukset"
 
 #. View menu items
-#: ../src/main-window.c:400
+#: ../src/main-window.c:431
 msgid "E_xpand All"
 msgstr "_Laajenna kaikki"
 
-#: ../src/main-window.c:401
+#: ../src/main-window.c:432
 msgid "Expand all threads"
 msgstr "Laajenna kaikki säikeet"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:433
 msgid "_Collapse All"
 msgstr "_Sulje kaikki"
 
-#: ../src/main-window.c:403
+#: ../src/main-window.c:434
 msgid "Collapse all expanded threads"
 msgstr "Sulje kaikki avatut säikeet"
 
-#: ../src/main-window.c:405 ../src/message-window.c:238
+#: ../src/main-window.c:436 ../src/message-window.c:259
 msgid "Zoom _In"
 msgstr "_Lähennä"
 
-#: ../src/main-window.c:406 ../src/message-window.c:239
+#: ../src/main-window.c:437 ../src/message-window.c:260
 msgid "Increase magnification"
 msgstr "Kasvata suurennosta"
 
-#: ../src/main-window.c:407 ../src/message-window.c:240
+#: ../src/main-window.c:438 ../src/message-window.c:261
 msgid "Zoom _Out"
 msgstr "_Loitonna"
 
-#: ../src/main-window.c:408 ../src/message-window.c:241
+#: ../src/main-window.c:439 ../src/message-window.c:262
 msgid "Decrease magnification"
 msgstr "Pienennä suurennosta"
 
 #. To warn msgfmt that the % sign isn't a format specifier:
-#: ../src/main-window.c:411 ../src/message-window.c:244
+#: ../src/main-window.c:442 ../src/message-window.c:265
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Zoomaus _100%"
 
-#: ../src/main-window.c:412 ../src/message-window.c:245
+#: ../src/main-window.c:443 ../src/message-window.c:266
 msgid "No magnification"
 msgstr "Ei suurennosta"
 
 #. Mailbox menu item that does not require a mailbox
-#: ../src/main-window.c:415 ../src/main-window.c:416
-#: ../src/message-window.c:279 ../src/message-window.c:280
+#: ../src/main-window.c:446 ../src/main-window.c:447
+#: ../src/message-window.c:300 ../src/message-window.c:301
 msgid "Next Unread Message"
 msgstr "Seuraava lukematon"
 
-#: ../src/main-window.c:418
+#: ../src/main-window.c:449
 msgid "Empty _Trash"
 msgstr "Tyhjennä _roskat"
 
-#: ../src/main-window.c:419
+#: ../src/main-window.c:450
 msgid "Delete messages from the Trash mailbox"
 msgstr "Poista viestit roskakorista"
 
 #. Settings menu items
-#: ../src/main-window.c:422
+#: ../src/main-window.c:453
 msgid "_Toolbars..."
 msgstr "_Työkalupalkit..."
 
-#: ../src/main-window.c:423
+#: ../src/main-window.c:454
 msgid "Customize toolbars"
 msgstr "Muokkaa työkalupalkkeja"
 
-#: ../src/main-window.c:424
+#: ../src/main-window.c:455
 msgid "_Identities..."
 msgstr "_Henkilöllisyydet..."
 
-#: ../src/main-window.c:425
+#: ../src/main-window.c:456
 msgid "Create and set current identities"
 msgstr "Luo ja aseta nykyiset henkilöllisyydet"
 
 #. Help menu items
-#: ../src/main-window.c:428
+#: ../src/main-window.c:459
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../src/main-window.c:429
+#: ../src/main-window.c:460
 msgid "Table of Contents"
 msgstr "Sisällys"
 
-#: ../src/main-window.c:430
-msgid "_About"
-msgstr "_Tietoja"
-
-#: ../src/main-window.c:430
+#. license ?
+#: ../src/main-window.c:481 ../src/main-window.c:2776
 msgid "About Balsa"
 msgstr "Tietoja balsasta"
 
 #. Edit menu items
-#: ../src/main-window.c:437 ../src/message-window.c:235
-#: ../src/sendmsg-window.c:344
+#: ../src/main-window.c:488 ../src/message-window.c:253
+#: ../src/sendmsg-window.c:362
 msgid "Select _All"
 msgstr "Valitse k_aikki"
 
-#: ../src/main-window.c:439
+#: ../src/main-window.c:490
 msgid "_Find"
 msgstr "_Etsi"
 
-#: ../src/main-window.c:441
+#: ../src/main-window.c:492
 msgid "Find Ne_xt"
 msgstr "Etsi _seuraava"
 
 #. Mailbox menu items
-#: ../src/main-window.c:444 ../src/main-window.c:445
-#: ../src/message-window.c:277 ../src/message-window.c:278
+#: ../src/main-window.c:495 ../src/main-window.c:496
+#: ../src/message-window.c:298 ../src/message-window.c:299
 msgid "Next Message"
 msgstr "Seuraava viesti"
 
-#: ../src/main-window.c:446 ../src/main-window.c:447
-#: ../src/message-window.c:282 ../src/message-window.c:283
+#: ../src/main-window.c:497 ../src/main-window.c:498
+#: ../src/message-window.c:303 ../src/message-window.c:304
 msgid "Previous Message"
 msgstr "Edellinen viesti"
 
-#: ../src/main-window.c:448 ../src/main-window.c:449
-#: ../src/message-window.c:284 ../src/message-window.c:285
+#: ../src/main-window.c:499 ../src/main-window.c:500
+#: ../src/message-window.c:305 ../src/message-window.c:306
 msgid "Next Flagged Message"
 msgstr "Seuraava liputettu viesti"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:502
+#, fuzzy
+#| msgid "_Hide messages"
+msgid "_Hide Messages"
+msgstr "_Piilota viestit"
+
+#: ../src/main-window.c:503
 msgid "_Reset Filter"
 msgstr "Nollaa _suodatin"
 
-#: ../src/main-window.c:453
+#: ../src/main-window.c:504
 msgid "Reset mailbox filter"
 msgstr "Nollaa postilaatikon suodatin"
 
-#: ../src/main-window.c:454
+#: ../src/main-window.c:505
 msgid "_Select All"
 msgstr "Valitse _kaikki"
 
-#: ../src/main-window.c:455
+#: ../src/main-window.c:506
 msgid "Select all messages in current mailbox"
 msgstr "Valitse kaikki valitun kansion viestit"
 
-#: ../src/main-window.c:457
-msgid "_Edit..."
-msgstr "_Muokkaa..."
-
-#: ../src/main-window.c:458
+#: ../src/main-window.c:509
 msgid "Edit the selected mailbox"
 msgstr "Muokkaa valittua kansiota"
 
-#: ../src/main-window.c:459
+#: ../src/main-window.c:510
 msgid "_Delete..."
 msgstr "_Poista..."
 
-#: ../src/main-window.c:460
+#: ../src/main-window.c:511
 msgid "Delete the selected mailbox"
 msgstr "Poista valittu kansio"
 
-#: ../src/main-window.c:463 ../src/main-window.c:466
+#: ../src/main-window.c:514 ../src/main-window.c:517
 msgid "E_xpunge Deleted Messages"
 msgstr "Poista poistetut viestit"
 
-#: ../src/main-window.c:464 ../src/main-window.c:467
+#: ../src/main-window.c:515 ../src/main-window.c:518
 msgid "Expunge messages marked as deleted in the current mailbox"
-msgstr "Poista pysyvästi viestit, jotka on merkitty poistetuiksi nykyisessä "
+msgstr ""
+"Poista pysyvästi viestit, jotka on merkitty poistetuiksi nykyisessä "
 "postikansiossa"
 
-#: ../src/main-window.c:470
+#: ../src/main-window.c:521
 msgid "Close mailbox"
 msgstr "Sulje kansio"
 
-#: ../src/main-window.c:472
+#: ../src/main-window.c:523
 msgid "Select _Filters"
 msgstr "Valitse _suodattimet"
 
-#: ../src/main-window.c:473
+#: ../src/main-window.c:524
 msgid "Select filters to be applied automatically to current mailbox"
 msgstr "Valitse nykyiseen kansioon automaattisesti käytettävät suodattimet"
 
-#: ../src/main-window.c:476
+#: ../src/main-window.c:527
 msgid "_Remove Duplicates"
 msgstr "Poista kaksoiskappaleet"
 
-#: ../src/main-window.c:477
+#: ../src/main-window.c:528
 msgid "Remove duplicated messages from the current mailbox"
 msgstr "Poista kansiosta viestit, jotka ovat kansiossa kahteen kertaan"
 
-#. File menu item
-#: ../src/main-window.c:485 ../src/message-window.c:228
-#: ../src/sendmsg-window.c:330
-msgid "_Print..."
-msgstr "_Tulosta..."
-
-#: ../src/main-window.c:486 ../src/message-window.c:229
-msgid "Print current message"
-msgstr "Tulosta tämä viesti"
-
-#: ../src/main-window.c:489 ../src/message-window.c:248
+#: ../src/main-window.c:538 ../src/message-window.c:269
 msgid "Reply to the current message"
 msgstr "Vastaa tähän viestiin."
 
-#: ../src/main-window.c:490 ../src/message-window.c:249
+#: ../src/main-window.c:539 ../src/message-window.c:270
 msgid "Reply to _All..."
 msgstr "Vastaa _kaikille..."
 
-#: ../src/main-window.c:491 ../src/message-window.c:250
+#: ../src/main-window.c:540 ../src/message-window.c:271
 msgid "Reply to all recipients of the current message"
 msgstr "Vastaa viestin kaikille vastaanottajille."
 
-#: ../src/main-window.c:493 ../src/message-window.c:252
+#: ../src/main-window.c:542 ../src/message-window.c:273
 msgid "Reply to _Group..."
 msgstr "Vastaa _ryhmälle..."
 
-#: ../src/main-window.c:494 ../src/message-window.c:253
+#: ../src/main-window.c:543 ../src/message-window.c:274
 msgid "Reply to mailing list"
 msgstr "Vastaa listalle"
 
-#: ../src/main-window.c:496
+#: ../src/main-window.c:545
 msgid "Store address of sender in addressbook"
 msgstr "Tallenna lähettäjän osoite osoitekirjaan."
 
-#: ../src/main-window.c:498 ../src/message-window.c:254
-msgid "Save Current Part..."
-msgstr "Tallenna nykyinen osa..."
-
-#: ../src/main-window.c:499 ../src/message-window.c:255
-msgid "Save currently displayed part of message"
-msgstr "Tallenna viestistä nyt näytettävä osa"
-
-#: ../src/main-window.c:501 ../src/message-window.c:257
+#: ../src/main-window.c:547 ../src/message-window.c:278
 msgid "_View Source..."
 msgstr "_Näytä lähdekoodi..."
 
-#: ../src/main-window.c:502 ../src/message-window.c:258
+#: ../src/main-window.c:548 ../src/message-window.c:279
 msgid "View source form of the message"
 msgstr "Näytä viesti lähdemuodossa"
 
@@ -3908,154 +4981,218 @@ msgstr "Näytä viesti lähdemuodossa"
 #. * stock_id; the first in this list defines the action tied to the
 #. * toolbar's Forward button, so "ForwardDefault" must come before
 #. * the others.
-#: ../src/main-window.c:508
+#: ../src/main-window.c:554
 msgid "_Forward..."
 msgstr "_Välitä..."
 
-#: ../src/main-window.c:509 ../src/message-window.c:264
+#: ../src/main-window.c:555 ../src/message-window.c:285
 msgid "Forward the current message"
 msgstr "Lähetä tämä viesti eteenpäin."
 
-#: ../src/main-window.c:512 ../src/message-window.c:266
+#: ../src/main-window.c:558 ../src/message-window.c:287
 msgid "_Forward attached..."
 msgstr "Välitä _liitteenä..."
 
-#: ../src/main-window.c:513 ../src/message-window.c:267
+#: ../src/main-window.c:559 ../src/message-window.c:288
 msgid "Forward the current message as attachment"
 msgstr "Välitä tämä viesti liitetiedostona."
 
-#: ../src/main-window.c:515 ../src/message-window.c:269
+#: ../src/main-window.c:561 ../src/message-window.c:290
 msgid "Forward _inline..."
 msgstr "Välitä viestin sisällä..."
 
-#: ../src/main-window.c:516 ../src/message-window.c:270
+#: ../src/main-window.c:562 ../src/message-window.c:291
 msgid "Forward the current message inline"
 msgstr "Välitä tämä viesti viestinä."
 
-#: ../src/main-window.c:519
+#: ../src/main-window.c:565
 msgid "Pipe the message through another program"
 msgstr "Putkita viesti toisen ohjelman läpi"
 
-#: ../src/main-window.c:521 ../src/message-window.c:272
+#: ../src/main-window.c:567
+#, fuzzy
+#| msgid "Selected headers:"
+msgid "Select _Thread"
+msgstr "Valitut otsikot:"
+
+#: ../src/main-window.c:568
+#, fuzzy
+#| msgid "Select all messages in current mailbox"
+msgid "Select all messages in current thread"
+msgstr "Valitse kaikki valitun kansion viestit"
+
+#. File menu item
+#: ../src/main-window.c:576 ../src/message-window.c:246
+#: ../src/sendmsg-window.c:348
+msgid "_Print..."
+msgstr "_Tulosta..."
+
+#: ../src/main-window.c:577 ../src/message-window.c:247
+msgid "Print current message"
+msgstr "Tulosta tämä viesti"
+
+#: ../src/main-window.c:578 ../src/message-window.c:275
+msgid "Save Current Part..."
+msgstr "Tallenna nykyinen osa..."
+
+#: ../src/main-window.c:579 ../src/message-window.c:276
+msgid "Save currently displayed part of message"
+msgstr "Tallenna viestistä nyt näytettävä osa"
+
+#: ../src/main-window.c:582 ../src/message-window.c:293
 msgid "_Next Part"
 msgstr "_Seuraava osa"
 
-#: ../src/main-window.c:522 ../src/message-window.c:273
+#: ../src/main-window.c:583 ../src/message-window.c:294
 msgid "Next part in message"
 msgstr "Viestin seuraava osa"
 
-#: ../src/main-window.c:523 ../src/message-window.c:274
+#: ../src/main-window.c:584 ../src/message-window.c:295
 msgid "_Previous Part"
 msgstr "_Edellinen osa"
 
-#: ../src/main-window.c:524 ../src/message-window.c:275
+#: ../src/main-window.c:585 ../src/message-window.c:296
 msgid "Previous part in message"
 msgstr "Viestin edellinen viesti"
 
-#: ../src/main-window.c:527
+#: ../src/main-window.c:588
 msgid "Copy message"
 msgstr "Kopioi viesti"
 
-#: ../src/main-window.c:538 ../src/message-window.c:287
+#: ../src/main-window.c:591
+#, fuzzy
+#| msgid "_Sign Message"
+msgid "Find in _Message"
+msgstr "_Allekirjoita viesti"
+
+#: ../src/main-window.c:592 ../src/message-window.c:256
+#, fuzzy
+#| msgid "Send this message"
+msgid "Find a string in this message"
+msgstr "Lähetä tämä viesti"
+
+#: ../src/main-window.c:602 ../src/message-window.c:308
 msgid "_Move to Trash"
 msgstr "_Siirrä roskakoriin"
 
-#: ../src/main-window.c:539 ../src/main-window.c:543
+#: ../src/main-window.c:603 ../src/main-window.c:607
 msgid "Move the current message to Trash mailbox"
 msgstr "Siirrä valittu viesti Roskakoriin"
 
-#: ../src/main-window.c:542
+#: ../src/main-window.c:606
 msgid "_Delete to Trash"
 msgstr "_Siirrä roskakoriin"
 
-#: ../src/main-window.c:546 ../src/main-window.c:555
+#: ../src/main-window.c:610 ../src/main-window.c:619
 msgid "Toggle New"
 msgstr "Merkitse viesti"
 
-#: ../src/main-window.c:551
+#: ../src/main-window.c:612
+#, fuzzy
+#| msgid "_Toggle flag"
+msgid "_Toggle Flag"
+msgstr "Vaihtele _lippua"
+
+#: ../src/main-window.c:615
 msgid "Toggle flagged"
 msgstr "Liputa viesti"
 
 #. Hide messages menu items
-#: ../src/main-window.c:552 ../src/main-window.c:581
+#: ../src/main-window.c:616 ../src/main-window.c:651
 msgid "_Deleted"
 msgstr "_Poistettu"
 
-#: ../src/main-window.c:553
+#: ../src/main-window.c:617
 msgid "Toggle deleted flag"
 msgstr "Viesti poistettu"
 
-#: ../src/main-window.c:556 ../src/main-window.c:593
+#: ../src/main-window.c:620 ../src/main-window.c:663
 msgid "_Answered"
 msgstr "_Vastattu"
 
-#: ../src/main-window.c:557
+#: ../src/main-window.c:621
 msgid "Toggle Answered"
 msgstr "Viestiin vastattu"
 
-#: ../src/main-window.c:564
+#: ../src/main-window.c:628
 msgid "_Show Mailbox Tree"
 msgstr "Näytä kansiopuu"
 
-#: ../src/main-window.c:565
+#: ../src/main-window.c:629
 msgid "Toggle display of mailbox and folder tree"
 msgstr "Näytetäänkö postikansioiden ja muiden kansioiden puu"
 
-#: ../src/main-window.c:567
+#: ../src/main-window.c:631
 msgid "Show Mailbox _Tabs"
 msgstr "Näytä kansioiden _välilehdet"
 
-#: ../src/main-window.c:568
+#: ../src/main-window.c:632
 msgid "Toggle display of mailbox notebook tabs"
 msgstr "Näytetäänkö postikansioissa välilehtiä"
 
-#: ../src/main-window.c:571
+#: ../src/main-window.c:634 ../src/message-window.c:315
+msgid "Show Too_lbar"
+msgstr ""
+
+#: ../src/main-window.c:636
+#, fuzzy
+#| msgid "Show in status bar"
+msgid "Show St_atus Bar"
+msgstr "Näytä tilarivillä"
+
+#: ../src/main-window.c:638
+#, fuzzy
+#| msgid "Show in list"
+msgid "Show _Index Filter"
+msgstr "Näytä listalla"
+
+#: ../src/main-window.c:641
 msgid "_Descending"
 msgstr "_Laskeva"
 
-#: ../src/main-window.c:572
+#: ../src/main-window.c:642
 msgid "Sort in a descending order"
 msgstr "Järjestä laskevaan järjestykseen"
 
-#: ../src/main-window.c:574
+#: ../src/main-window.c:644
 msgid "_View filter"
 msgstr "Näytä _suodatin"
 
-#: ../src/main-window.c:575
+#: ../src/main-window.c:645
 msgid "Enable quick message index filter"
 msgstr "Käytä nopeaa viesti-indeksin suodatinta"
 
-#: ../src/main-window.c:578 ../src/message-window.c:294
+#: ../src/main-window.c:648 ../src/message-window.c:317
 msgid "_Wrap"
 msgstr "_Rivitys"
 
-#: ../src/main-window.c:578 ../src/message-window.c:294
-#: ../src/sendmsg-window.c:347
+#: ../src/main-window.c:648 ../src/message-window.c:317
+#: ../src/sendmsg-window.c:365
 msgid "Wrap message lines"
 msgstr "Rivitä viestin rivit"
 
-#: ../src/main-window.c:583
+#: ../src/main-window.c:653
 msgid "Un_Deleted"
 msgstr "Peru _poisto"
 
-#: ../src/main-window.c:585
+#: ../src/main-window.c:655
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../src/main-window.c:587
+#: ../src/main-window.c:657
 msgid "Un_read"
 msgstr "Ei _luettu"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:661
 msgid "Un_flagged"
 msgstr "_Liputon"
 
-#: ../src/main-window.c:595
+#: ../src/main-window.c:665
 msgid "Un_answered"
 msgstr "Ei _vastattu"
 
 #. Toolbar items not on any menu
-#: ../src/main-window.c:598 ../src/toolbar-factory.c:146
+#: ../src/main-window.c:668 ../src/toolbar-factory.c:161
 msgid ""
 "All\n"
 "headers"
@@ -4063,107 +5200,107 @@ msgstr ""
 "Kaikki\n"
 "otsikot"
 
-#: ../src/main-window.c:599 ../src/message-window.c:297
+#: ../src/main-window.c:669 ../src/message-window.c:320
 msgid "Show all headers"
 msgstr "Näytä kaikki otsikot"
 
-#: ../src/main-window.c:601 ../src/toolbar-factory.c:149
+#: ../src/main-window.c:671 ../src/toolbar-factory.c:163
 msgid "Msg Preview"
 msgstr "Viestin esikatselu"
 
-#: ../src/main-window.c:602
+#: ../src/main-window.c:672
 msgid "Show preview pane"
 msgstr "Näytä esikatseluruutu"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:678 ../src/message-window.c:326
 msgid "_No Headers"
 msgstr "_Ei otsikoita"
 
-#: ../src/main-window.c:609 ../src/message-window.c:304
+#: ../src/main-window.c:679 ../src/message-window.c:327
 msgid "Display no headers"
 msgstr "Älä näytä otsikoita"
 
-#: ../src/main-window.c:610
+#: ../src/main-window.c:680
 msgid "S_elected Headers"
 msgstr "Va_litut otsikot"
 
-#: ../src/main-window.c:611 ../src/message-window.c:306
+#: ../src/main-window.c:681 ../src/message-window.c:329
 msgid "Display selected headers"
 msgstr "Näytä valitut otsikot"
 
-#: ../src/main-window.c:612 ../src/message-window.c:307
+#: ../src/main-window.c:682 ../src/message-window.c:330
 msgid "All _Headers"
 msgstr "_Kaikki otsikot"
 
-#: ../src/main-window.c:613 ../src/message-window.c:308
+#: ../src/main-window.c:683 ../src/message-window.c:331
 msgid "Display all headers"
 msgstr "Näytä k_aikki otsikot"
 
-#: ../src/main-window.c:617
+#: ../src/main-window.c:687
 msgid "_Flat index"
 msgstr "_Litteä indeksi"
 
-#: ../src/main-window.c:618
+#: ../src/main-window.c:688
 msgid "No threading at all"
 msgstr "Ei säikeistystä"
 
-#: ../src/main-window.c:619
+#: ../src/main-window.c:689
 msgid "Si_mple threading"
 msgstr "_Yksinkertainen säikeistys"
 
-#: ../src/main-window.c:620
+#: ../src/main-window.c:690
 msgid "Simple threading algorithm"
 msgstr "Yksinkertainen säikeistysalgoritmi"
 
-#: ../src/main-window.c:621
+#: ../src/main-window.c:691
 msgid "_JWZ threading"
 msgstr "_JWZ-säikeistys"
 
-#: ../src/main-window.c:622
+#: ../src/main-window.c:692
 msgid "Elaborate JWZ threading"
 msgstr "Monimutkainen JWZ-säikeistys"
 
-#: ../src/main-window.c:627
+#: ../src/main-window.c:697
 msgid "By _Arrival"
 msgstr "_Saapumisjärjestys"
 
-#: ../src/main-window.c:628
+#: ../src/main-window.c:698
 msgid "Arrival order"
 msgstr "Saapumisjärjestyksen mukaan"
 
-#: ../src/main-window.c:629
+#: ../src/main-window.c:699
 msgid "By _Sender"
 msgstr "_Lähettäjän mukaan"
 
-#: ../src/main-window.c:630
+#: ../src/main-window.c:700
 msgid "Sender order"
 msgstr "Lähettäjän mukaan"
 
-#: ../src/main-window.c:631
+#: ../src/main-window.c:701
 msgid "By S_ubject"
 msgstr "_Aiheen mukaan"
 
-#: ../src/main-window.c:632
+#: ../src/main-window.c:702
 msgid "Subject order"
 msgstr "Aiheen mukaan"
 
-#: ../src/main-window.c:633
+#: ../src/main-window.c:703
 msgid "By Si_ze"
 msgstr "_Koon mukaan"
 
-#: ../src/main-window.c:634
+#: ../src/main-window.c:704
 msgid "By message size"
 msgstr "Viestin koon mukaan"
 
-#: ../src/main-window.c:635
+#: ../src/main-window.c:705
 msgid "_Threaded"
 msgstr "_Säikeistettynä"
 
-#: ../src/main-window.c:636
+#: ../src/main-window.c:706
 msgid "Use message threading"
 msgstr "Säikeistä viestit"
 
-#: ../src/main-window.c:993
+#: ../src/main-window.c:1067
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -4171,27 +5308,39 @@ msgstr ""
 "Balsa lähettää nyt viestejä.\n"
 "Keskeytä lähettäminen?"
 
-#: ../src/main-window.c:1147
+#: ../src/main-window.c:1237
 msgid "Subject or Sender Contains:"
 msgstr "Aihe tai lähettäjä sisältää:"
 
-#: ../src/main-window.c:1148
+#: ../src/main-window.c:1238
 msgid "Subject or Recipient Contains:"
 msgstr "Aihe tai vastaanottaja sisältää:"
 
-#: ../src/main-window.c:1149
+#: ../src/main-window.c:1239
 msgid "Subject Contains:"
 msgstr "Aihe sisältää:"
 
-#: ../src/main-window.c:1150
+#: ../src/main-window.c:1240
 msgid "Body Contains:"
 msgstr "Viesti sisältää:"
 
-#: ../src/main-window.c:1151
+#: ../src/main-window.c:1241
 msgid "Older than (days):"
 msgstr "Vanhempi kuin (päiviä):"
 
-#: ../src/main-window.c:2149
+#: ../src/main-window.c:1242
+#, fuzzy
+#| msgid "Older than (days):"
+msgid "Old at most (days):"
+msgstr "Vanhempi kuin (päiviä):"
+
+#: ../src/main-window.c:2371
+#, fuzzy, c-format
+#| msgid "Open with %s"
+msgid "Opening %s"
+msgstr "Avaa ohjelmalla %s"
+
+#: ../src/main-window.c:2388
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -4200,7 +5349,7 @@ msgstr ""
 "Kansiota ei voi avata!\n"
 "%s."
 
-#: ../src/main-window.c:2464
+#: ../src/main-window.c:2760
 msgid "translator-credits"
 msgstr ""
 "Ilkka Tuohela, 2005\n"
@@ -4209,694 +5358,469 @@ msgstr ""
 "\n"
 "http://gnome.fi/";
 
-#: ../src/main-window.c:2477 ../src/main-window.c:2504
-msgid ""
-"The Balsa email client is part of the GNOME desktop environment.  "
-"Information on Balsa can be found at http://balsa.gnome.org/\n";
-"\n"
-"If you need to report bugs, please do so at: http://bugzilla.gnome.org/";
+#: ../src/main-window.c:2771
+msgid "The Balsa email client is part of the GNOME desktop environment."
 msgstr ""
-"Balsa-Sähköpostiohjelma on osa Gnome-työpöytää.\n"
-"Lisätietoja Balsasta löytyy osoitteesta http://balsa.gnome.org/\n";
-"\n"
-"Vikailmoitukset voit antaa osoitteessa http://bugzilla.gnome.org/\n";
-"Suomennos: http://gnome.fi/";
 
-#: ../src/main-window.c:2608 ../src/main-window.c:2621
+#: ../src/main-window.c:2873 ../src/main-window.c:2891
 msgid "Checking Mail..."
 msgstr "Tarkistetaan postia..."
 
-#: ../src/main-window.c:2814
+#: ../src/main-window.c:3094
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "IMAP-kansio: %s"
 
-#: ../src/main-window.c:2818
+#: ../src/main-window.c:3098
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Paikallinen postikansio: %s"
 
-#: ../src/main-window.c:2956
+#: ../src/main-window.c:3254
 msgid "Finished Checking."
 msgstr "Tarkistus suoritettu"
 
-#: ../src/main-window.c:3018
+#: ../src/main-window.c:3319
 #, c-format
 msgid "Sending error: %s"
 msgstr "Lähetysvirhe: %s"
 
-#: ../src/main-window.c:3082
+#: ../src/main-window.c:3384
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Saapui %d uusi viesti."
 msgstr[1] "Saapui %d uutta viestiä."
 
-#: ../src/main-window.c:3085
+#: ../src/main-window.c:3387
 msgid "You have new mail."
 msgstr "Sinulla on lukemattomia viestejä"
 
-#: ../src/main-window.c:3148
+#: ../src/main-window.c:3428
+#, fuzzy, c-format
+#| msgid "You have received %d new message."
+#| msgid_plural "You have received %d new messages."
+msgid "Balsa: you have received %d new message."
+msgid_plural "Balsa: you have received %d new messages."
+msgstr[0] "Saapui %d uusi viesti."
+msgstr[1] "Saapui %d uutta viestiä."
+
+#: ../src/main-window.c:3432
+#, fuzzy
+#| msgid "You have new mail."
+msgid "Balsa: you have new mail."
+msgstr "Sinulla on lukemattomia viestejä"
+
+#: ../src/main-window.c:3492
 msgid "Balsa: New mail"
 msgstr "Balsa: uutta sähköpostia"
 
-#: ../src/main-window.c:3321
+#: ../src/main-window.c:3781
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "Seuraava lukematon viesti on kansiossa %s"
 
-#: ../src/main-window.c:3325
-#, c-format
-msgid "Do you want to switch to %s?"
+#: ../src/main-window.c:3788
+#, fuzzy, c-format
+#| msgid "Do you want to switch to %s?"
+msgid "Do you want to select %s?"
 msgstr "Haluatko vaihtaa kansioon %s?"
 
-#: ../src/main-window.c:3820
+#: ../src/main-window.c:4321
 msgid "Search mailbox"
 msgstr "Etsi kansiosta"
 
-#: ../src/main-window.c:3837
+#: ../src/main-window.c:4341
 msgid "_Search for:"
 msgstr "_Hae:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3850
+#: ../src/main-window.c:4354
 msgid "In:"
 msgstr "Kentässä:"
 
-#: ../src/main-window.c:3861
+#: ../src/main-window.c:4365
 msgid "S_ubject"
 msgstr "_Aihe"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3866
+#: ../src/main-window.c:4370
 msgid "Show only matching messages"
 msgstr "Lähetä vain vastaavat viestit"
 
 #. Frame with OK button
-#: ../src/main-window.c:3887
+#: ../src/main-window.c:4391
 msgid "Open next matching message"
 msgstr "Avaa seuraava vastaava viesti"
 
-#: ../src/main-window.c:3898
+#: ../src/main-window.c:4402
 msgid "_Reverse search"
 msgstr "_Hae taaksepäin"
 
-#: ../src/main-window.c:3903
+#: ../src/main-window.c:4407
 msgid "_Wrap around"
 msgstr "_Rivitä viesti"
 
-#: ../src/main-window.c:4065
+#: ../src/main-window.c:4582
 msgid "You can apply filters only on mailbox\n"
 msgstr "Voit käyttää suodattimia vain sähköpostikansioille\n"
 
-#: ../src/main-window.c:4080
+#: ../src/main-window.c:4597
 #, c-format
 msgid "Removing duplicates failed: %s"
 msgstr "Kaksoiskappaleiden poist epäonnistui: %s"
 
-#: ../src/main-window.c:4294
+#: ../src/main-window.c:4603
+#, fuzzy, c-format
+#| msgid "_Remove Duplicates"
+msgid "Removed %d duplicate"
+msgid_plural "Removed %d duplicates"
+msgstr[0] "Poista kaksoiskappaleet"
+msgstr[1] "Poista kaksoiskappaleet"
+
+#: ../src/main-window.c:4608
+#, fuzzy
+#| msgid "No signature found!"
+msgid "No duplicates found"
+msgstr "Allekirjoitusta ei löydy!"
+
+#: ../src/main-window.c:4837
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Roskakoria ei voi avata: %s"
 
-#: ../src/main-window.c:4435
+#: ../src/main-window.c:4985
 #, c-format
 msgid "Balsa: %s (readonly)"
 msgstr "Balsa: %s (vain lukuoikeudet)"
 
-#: ../src/main-window.c:4437
+#: ../src/main-window.c:4987
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
 
-#: ../src/main.c:230 ../src/main.c:279
-msgid "Get new mail on startup"
-msgstr "Tarkista posti käynnistettäessä"
-
-#: ../src/main.c:232 ../src/main.c:281
-msgid "Compose a new email to EMAIL ADDRESS"
-msgstr "Kirjoita uusi viesti osoitteeseen POSTI OSOITE"
-
-#: ../src/main.c:234 ../src/main.c:283
-msgid "Attach file at PATH"
-msgstr "Liitä tiedosto POLUSTA"
-
-#: ../src/main.c:236 ../src/main.c:286
-msgid "Opens MAILBOXNAME"
-msgstr "Avaa LAATIKONNIMEn"
-
-#: ../src/main.c:236 ../src/main.c:286
-msgid "MAILBOXNAME"
-msgstr "LAATIKONNIMI"
-
-#: ../src/main.c:239 ../src/main.c:289
-msgid "Opens first unread mailbox"
-msgstr "Avaa ensimmäisen lukemattoman kansion"
-
-#: ../src/main.c:242 ../src/main.c:292
-msgid "Opens default Inbox on startup"
-msgstr "Avaa Saapuvien viestien oletuskansio käynnistettäessä"
-
-#: ../src/main.c:245 ../src/main.c:295
-msgid "Prints number unread and unsent messages"
-msgstr "näytä lukemattomien ja lähettämättömien viestien määrä"
-
-#: ../src/main.c:247 ../src/main.c:297
-msgid "Debug POP3 connection"
-msgstr "Etsi virheitä POP3-yhteydestä"
-
-#: ../src/main.c:249 ../src/main.c:299
-msgid "Debug IMAP connection"
-msgstr "Debuggaa IMAP-yhteyttä"
-
-#: ../src/main.c:271
-msgid "The Balsa E-Mail Client"
-msgstr "Balsa-sähköpostiohjelma"
-
-#: ../src/main.c:353 ../src/main.c:358 ../src/main.c:364 ../src/main.c:370
-#: ../src/main.c:376
+#. xgettext: this is the first part of the message
+#. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
+#: ../src/main-window.c:5568
 #, c-format
-msgid "Balsa cannot open your \"%s\" mailbox."
-msgstr "Balsa ei voi avata kansiotasi \"%s\"."
-
-#: ../src/main.c:353
-msgid "Inbox"
-msgstr "Saapuneet"
-
-#: ../src/main.c:359
-msgid "Outbox"
-msgstr "Lähtevät"
+msgid "Shown mailbox: %s "
+msgstr "Näytetty kansio: %s"
 
-#: ../src/main.c:365
-msgid "Sentbox"
-msgstr "Lähetetyt"
+#: ../src/main-window.c:5573
+#, c-format
+msgid "with %d message"
+msgid_plural "with %d messages"
+msgstr[0] "sisältää %d viestin"
+msgstr[1] "sisältää %d viestiä"
 
-#: ../src/main.c:371
-msgid "Draftbox"
-msgstr "Luonnokset"
+#: ../src/main-window.c:5580
+#, c-format
+msgid ", %d new"
+msgid_plural ", %d new"
+msgstr[0] ", %d uusi"
+msgstr[1] ", %d uutta"
 
-#: ../src/main.c:376
-msgid "Trash"
-msgstr "Roskat"
+#: ../src/main-window.c:5587
+#, c-format
+msgid ", %d hidden"
+msgid_plural ", %d hidden"
+msgstr[0] ", %d piilotettu"
+msgstr[1] ", %d piilotettua"
 
-#: ../src/main.c:591
-msgid "Compressing mail folders..."
-msgstr "Pakataan postikansiota..."
+#: ../src/message-window.c:242
+msgid "M_ove"
+msgstr "_Siirrä"
 
-#: ../src/message-window.c:231
+#: ../src/message-window.c:249
 msgid "Close the message window"
 msgstr "Sulje viesti-ikkuna"
 
-#: ../src/message-window.c:288
+#: ../src/message-window.c:255
+#, fuzzy
+#| msgid "_Hide messages"
+msgid "_Find in message"
+msgstr "_Piilota viestit"
+
+#: ../src/message-window.c:309
 msgid "Move the message to Trash mailbox"
 msgstr "Siirrä viesti roskakoriin"
 
-#: ../src/message-window.c:303
-msgid "N_o Headers"
-msgstr "_Ei otsikoita"
+#: ../src/message-window.c:316
+#, fuzzy
+#| msgid "Customize toolbars"
+msgid "Show toolbar"
+msgstr "Muokkaa työkalupalkkeja"
 
-#: ../src/message-window.c:305
+#: ../src/message-window.c:328
 msgid "_Selected Headers"
 msgstr "Va_litut otsikot"
 
-#: ../src/message-window.c:1001
+#: ../src/message-window.c:1050
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Viesti lähettäjältä %s: %s"
 
-#: ../src/balsa-mime-widget-callbacks.c:50
-#: ../src/balsa-mime-widget-callbacks.c:113
-#, c-format
-msgid "Could not create temporary file %s: %s"
-msgstr "Väliaikaistiedostoa \"%s\" ei voi luoda: %s"
-
-#: ../src/balsa-mime-widget-callbacks.c:146
-#, c-format
-msgid "Save %s MIME Part"
-msgstr "Tallenna %s MIME-osa"
-
-#: ../src/balsa-mime-widget-callbacks.c:194
-msgid "File already exists. Overwrite?"
-msgstr "Tiedosto jo olemassa. Korvaa?"
-
-#: ../src/balsa-mime-widget-crypto.c:70
-#, c-format
-msgid ""
-"This is an inline %s signed %s message part:\n"
-"%s"
-msgstr ""
-"Tämä on sisäkkäinen %s-allekirjoitettu %s viestn osa:\n"
-"%s"
-
-#: ../src/balsa-mime-widget-crypto.c:72 ../src/print.c:1302
-#: ../src/print-gtk.c:191
-msgid "OpenPGP"
-msgstr "OpenPGP"
-
-#: ../src/balsa-mime-widget-crypto.c:89
-msgid "_Run gpg to import this key"
-msgstr "Suo_rita gpg avaimen tuomiseksi"
-
-#: ../src/balsa-mime-widget-image.c:51 ../src/balsa-mime-widget-image.c:159
-#, c-format
-msgid "Error loading attached image: %s\n"
-msgstr "Virhe ladattaessa liitettyä kuvaa: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:162
-#: ../src/balsa-mime-widget-message.c:175
-#: ../src/balsa-mime-widget-message.c:203
-#: ../src/balsa-mime-widget-message.c:256
-msgid "Content Type: external-body\n"
-msgstr "Sisällön tyyppi: ulkoinen\n"
-
-#: ../src/balsa-mime-widget-message.c:163
-#, c-format
-msgid "Access type: local-file\n"
-msgstr "Hakutavan tyyppi: paikallinen tiedosto\n"
-
-#: ../src/balsa-mime-widget-message.c:164
-#: ../src/balsa-mime-widget-message.c:211 ../src/balsa-mime-widget.c:241
-#, c-format
-msgid "File name: %s"
-msgstr "Tiedostonimi: %s"
-
-#: ../src/balsa-mime-widget-message.c:176
-#, c-format
-msgid "Access type: URL\n"
-msgstr "Hakutavan tyyppi: URL\n"
-
-#: ../src/balsa-mime-widget-message.c:177
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: ../src/balsa-mime-widget-message.c:204
-#, c-format
-msgid "Access type: %s\n"
-msgstr "Hakutavan tyyppi: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:208
-#, c-format
-msgid "FTP site: %s\n"
-msgstr "FTP-palvelin: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:210
-#, c-format
-msgid "Directory: %s\n"
-msgstr "Hakemisto: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:257
-msgid "Access type: mail-server\n"
-msgstr "Hakutyyppi: postipalvelin\n"
-
-#: ../src/balsa-mime-widget-message.c:258
-#, c-format
-msgid "Mail server: %s\n"
-msgstr "Postipalvelin: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:260
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Aihe: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:277
-msgid "Se_nd message to obtain this part"
-msgstr "Lähetä _viesti saadaksesti tämän osan"
-
-#: ../src/balsa-mime-widget-message.c:298 ../src/balsa-mime-widget-text.c:852
-#: ../src/balsa-mime-widget-text.c:1131 ../src/sendmsg-window.c:1745
-#, c-format
-msgid "Error showing %s: %s\n"
-msgstr "Virhe näytettäessä %s: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:333 ../src/print.c:675
-#, c-format
-msgid "Could not get a part: %s"
-msgstr "Osaa ei voi hakea: %s"
-
-#: ../src/balsa-mime-widget-message.c:365
-#, c-format
-msgid "Sending the external body request failed: %s"
-msgstr "Ulkoisen rungon pyynnön lähetys epäonnistui: %s"
-
-#: ../src/balsa-mime-widget-message.c:469
-msgid "Reply..."
-msgstr "Vastaa..."
-
-#: ../src/balsa-mime-widget-message.c:475
-msgid "Copy to folder..."
-msgstr "Kopioi kansioon..."
-
-#: ../src/balsa-mime-widget-message.c:667
-#: ../src/balsa-print-object-header.c:152 ../src/print.c:350
-#: ../src/sendmsg-window.c:1059 ../src/sendmsg-window.c:3696
-#: ../src/sendmsg-window.c:5676
-msgid "Subject:"
-msgstr "Aihe:"
-
-#: ../src/balsa-mime-widget-message.c:671
-#: ../src/balsa-print-object-header.c:160 ../src/print.c:356
-#: ../src/sendmsg-window.c:3692
-msgid "Date:"
-msgstr "Päivämäärä:"
-
-#. addresses
-#: ../src/balsa-mime-widget-message.c:677
-#: ../src/balsa-print-object-header.c:165 ../src/print.c:361
-#: ../src/sendmsg-window.c:3703 ../src/store-address.c:325
-msgid "From:"
-msgstr "Lähettäjä:"
-
-#. Cannot edit the new "From:" header.
-#. { N_("From:"),     G_STRUCT_OFFSET(BalsaSendmsg, from[1])},
-#: ../src/balsa-mime-widget-message.c:684 ../src/sendmsg-window.c:1056
-msgid "Reply-To:"
-msgstr "_Vastausosoite:"
-
-# src/balsa-message.c#
-# 651 src/filter-edit-dialog.c:325
-#: ../src/balsa-mime-widget-message.c:687
-#: ../src/balsa-print-object-header.c:167 ../src/print.c:365
-#: ../src/sendmsg-window.c:1053 ../src/sendmsg-window.c:3711
-#: ../src/store-address.c:326
-msgid "To:"
-msgstr "Vastaanottaja:"
-
-#. cc:
-#: ../src/balsa-mime-widget-message.c:688
-#: ../src/balsa-print-object-header.c:169 ../src/print.c:366
-#: ../src/sendmsg-window.c:1058 ../src/sendmsg-window.c:2824
-#: ../src/sendmsg-window.c:3719 ../src/store-address.c:327
-msgid "Cc:"
-msgstr "Kopio:"
-
-#. bcc:
-#: ../src/balsa-mime-widget-message.c:689
-#: ../src/balsa-print-object-header.c:171 ../src/print.c:367
-#: ../src/sendmsg-window.c:1057 ../src/sendmsg-window.c:2829
-#: ../src/store-address.c:328
-msgid "Bcc:"
-msgstr "Toinen kopio:"
-
-#: ../src/balsa-mime-widget-message.c:693
-#: ../src/balsa-print-object-header.c:173 ../src/print.c:368
-msgid "Fcc:"
-msgstr "Kansio:"
-
-#: ../src/balsa-mime-widget-message.c:700
-#: ../src/balsa-print-object-header.c:176 ../src/print.c:374
-msgid "Disposition-Notification-To:"
-msgstr "Disposition-Notification-To:"
-
-#: ../src/balsa-mime-widget-text.c:140
-#, c-format
-msgid "Could not save a text part: %s"
-msgstr "Tekstiosaa ei voi tallentaa: %s"
-
-#: ../src/balsa-mime-widget-text.c:182
-#, c-format
-msgid ""
-"The message sent by %s with subject \"%s\" contains 8-bit characters, but no "
-"header describing the used codeset (converted to %s)"
-msgstr ""
-"Viesti lähettäjältä %s aiheesta \"%s\" sisältää 8-bittisiä merkkejä, mutta "
-"ei otsaketta, joka kertoo käytetyn merkistön (muutettu muotoon %s)"
-
-#: ../src/balsa-mime-widget-text.c:576
-msgid "Copy link"
-msgstr "Kopioi linkki"
-
-#: ../src/balsa-mime-widget-text.c:581
-msgid "Open link"
-msgstr "Avaa linkki"
-
-#: ../src/balsa-mime-widget-text.c:586
-msgid "Send link..."
-msgstr "Lähetä linkki..."
-
-#: ../src/balsa-mime-widget-text.c:625
-msgid "Highlight structured phrases"
-msgstr "Korosta rakenteelliset lauseet"
-
-#: ../src/balsa-mime-widget-text.c:842
-#, c-format
-msgid "Calling URL %s..."
-msgstr "Kutsutaan URL:a %s..."
-
-#: ../src/balsa-mime-widget-text.c:1188
-msgid "Address"
-msgstr "Osoite"
-
-#: ../src/balsa-mime-widget-text.c:1191
-msgid "S_tore"
-msgstr "_Tallenna"
-
-#: ../src/balsa-mime-widget.c:260
-#, c-format
-msgid "Error reading message part: %s"
-msgstr "Virhe luettaessa viestin osaa: %s"
-
-#: ../src/balsa-mime-widget.c:284
-#, c-format
-msgid "Type: %s (%s)"
-msgstr "Tyyppi: %s (%s)"
-
-#: ../src/balsa-mime-widget.c:287
-#, c-format
-msgid "Content Type: %s"
-msgstr "Sisällön tyyppi: %s"
-
-#: ../src/balsa-mime-widget.c:301
-msgid "No open or view action defined in GNOME MIME for this content type"
-msgstr "Tälle MIME-tyypille ei ole määritelty avaus- tai katseluohjelmaa."
-
-#: ../src/balsa-mime-widget.c:307
-msgid "S_ave part"
-msgstr "T_allenna osa"
-
-#: ../src/balsa-mime-widget.c:329 ../src/balsa-mime-widget.c:353
-#, c-format
-msgid "View _part with %s"
-msgstr "Näytä _osa ohjelmalla %s"
-
-#. gather some info about this part
-#. four fields, one terminator
-#: ../src/balsa-print-object-default.c:154
-#: ../src/balsa-print-object-default.c:157
-#: ../src/balsa-print-object-default.c:161 ../src/print.c:981
-msgid "Type:"
-msgstr "Tyyppi:"
-
-#: ../src/balsa-print-object-default.c:165
-#: ../src/balsa-print-object-default.c:169 ../src/print.c:984
-msgid "File name:"
-msgstr "Tiedostonimi:"
-
-#: ../src/pref-manager.c:386
-msgid "While Retrieving Messages"
+#: ../src/pref-manager.c:402
+#, fuzzy
+#| msgid "While Retrieving Messages"
+msgid "While retrieving messages"
 msgstr "Viestejä ladatessa"
 
-#: ../src/pref-manager.c:387
-msgid "Until Closed"
+#: ../src/pref-manager.c:403
+#, fuzzy
+#| msgid "Until Closed"
+msgid "Until closed"
 msgstr "Kunnes suljetaan"
 
-#: ../src/pref-manager.c:393
+#: ../src/pref-manager.c:409
 msgid "Fast"
 msgstr "Nopea"
 
-#: ../src/pref-manager.c:394
+#: ../src/pref-manager.c:410
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/pref-manager.c:395
-msgid "Bad Spellers"
+#: ../src/pref-manager.c:411
+#, fuzzy
+#| msgid "Bad Spellers"
+msgid "Bad spellers"
 msgstr "Huonot kirjoittajat"
 
-#: ../src/pref-manager.c:401
+#: ../src/pref-manager.c:417
 msgid "Message number"
 msgstr "Viestin numero"
 
-#: ../src/pref-manager.c:405
+#: ../src/pref-manager.c:421
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: ../src/pref-manager.c:409
+#: ../src/pref-manager.c:425
 msgid "Flat"
 msgstr "Litteä"
 
-#: ../src/pref-manager.c:411
+#: ../src/pref-manager.c:427
 msgid "JWZ"
 msgstr "JWZ"
 
 #. must NOT be modal
-#: ../src/pref-manager.c:509
+#: ../src/pref-manager.c:523
 msgid "Balsa Preferences"
 msgstr "Balsan asetukset"
 
-#: ../src/pref-manager.c:558
-msgid "Mail Options"
+#: ../src/pref-manager.c:577
+#, fuzzy
+#| msgid "Mail Options"
+msgid "Mail options"
 msgstr "Sähköpostin asetukset"
 
-#: ../src/pref-manager.c:560
-msgid "Display Options"
+#: ../src/pref-manager.c:579
+#, fuzzy
+#| msgid "Display Options"
+msgid "Display options"
 msgstr "Näyttämisen asetukset"
 
-#: ../src/pref-manager.c:562 ../src/pref-manager.c:2731
-msgid "Address Books"
+#: ../src/pref-manager.c:581 ../src/pref-manager.c:2909
+#, fuzzy
+#| msgid "Address Books"
+msgid "Address books"
 msgstr "Osoitekirjat"
 
-#: ../src/pref-manager.c:566 ../src/toolbar-factory.c:142
+#: ../src/pref-manager.c:585 ../src/toolbar-factory.c:157
 msgid "Spelling"
 msgstr "Oikeinkirjoitus"
 
-#: ../src/pref-manager.c:570
+#: ../src/pref-manager.c:589
 msgid "Startup"
 msgstr "Käynnistys"
 
-#: ../src/pref-manager.c:572 ../src/pref-manager.c:2519
+#: ../src/pref-manager.c:591 ../src/pref-manager.c:2697
 msgid "Miscellaneous"
 msgstr "Lisäasetukset"
 
-#: ../src/pref-manager.c:1324
+#: ../src/pref-manager.c:1411
 #, c-format
 msgid "%s (default)"
 msgstr "%s (oletus)"
 
-#: ../src/pref-manager.c:1584
-msgid "Remote Mailbox Servers"
+#: ../src/pref-manager.c:1671
+#, fuzzy
+#| msgid "Remote Mailbox Servers"
+msgid "Remote mailbox servers"
 msgstr "Ulkoiset postipalvelimet"
 
-#: ../src/pref-manager.c:1605 ../src/pref-manager.c:2752
-#: ../src/sendmsg-window.c:2910
+#: ../src/pref-manager.c:1692 ../src/pref-manager.c:2930
+#: ../src/sendmsg-window.c:3021
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../src/pref-manager.c:1613
-msgid "Mailbox Name"
+#: ../src/pref-manager.c:1700
+#, fuzzy
+#| msgid "Mailbox Name"
+msgid "Mailbox name"
 msgstr "Kansion nimi"
 
-#: ../src/pref-manager.c:1627 ../src/pref-manager.c:1716
-#: ../src/pref-manager.c:2787
+#: ../src/pref-manager.c:1714 ../src/pref-manager.c:1787
+#: ../src/pref-manager.c:2965
 msgid "_Modify"
 msgstr "_Muokkaa"
 
-#: ../src/pref-manager.c:1641
-msgid "Local Mail Directory"
-msgstr "Paikallinen postikansio"
+#: ../src/pref-manager.c:1728
+#, fuzzy
+#| msgid "_Local mail directory:"
+msgid "Local mail directory"
+msgstr "_Paikallinen postikansio:"
 
-#: ../src/pref-manager.c:1644 ../src/pref-manager.c:1652
+#: ../src/pref-manager.c:1730
 msgid "Select your local mail directory"
 msgstr "Valitse paikallisen postin hakemisto"
 
-#: ../src/pref-manager.c:1680
-msgid "Outgoing Mail Servers"
+#: ../src/pref-manager.c:1751
+#, fuzzy
+#| msgid "Outgoing Mail Servers"
+msgid "Outgoing mail servers"
 msgstr "Lähtevän postin palvelimet"
 
-#: ../src/pref-manager.c:1702
-msgid "Server Name"
+#: ../src/pref-manager.c:1773
+#, fuzzy
+#| msgid "Server Name"
+msgid "Server name"
 msgstr "Palvelimen nimi"
 
-#: ../src/pref-manager.c:1742
-msgid "Mail Servers"
+#: ../src/pref-manager.c:1813
+#, fuzzy
+#| msgid "Mail Servers"
+msgid "Mail servers"
 msgstr "Postipalvelimet"
 
-#: ../src/pref-manager.c:1744
+#: ../src/pref-manager.c:1815
 msgid "Incoming"
 msgstr "Tuleva"
 
-#: ../src/pref-manager.c:1746
+#: ../src/pref-manager.c:1817
 msgid "Outgoing"
 msgstr "Menevä"
 
-#: ../src/pref-manager.c:1771
+#: ../src/pref-manager.c:1844
 msgid "Checking"
 msgstr "Uudet viestit"
 
-#: ../src/pref-manager.c:1776
+#: ../src/pref-manager.c:1850
 msgid "_Check mail automatically every"
 msgstr "_Tarkista viestit joka:"
 
-#: ../src/pref-manager.c:1787 ../src/pref-manager.c:2542
-#: ../src/pref-manager.c:2602
+#: ../src/pref-manager.c:1861 ../src/pref-manager.c:2720
+#: ../src/pref-manager.c:2780
 msgid "minutes"
 msgstr "minuuttia"
 
-#: ../src/pref-manager.c:1793
+#: ../src/pref-manager.c:1868
 msgid "Check _IMAP mailboxes"
 msgstr "Tarkista _IMAP-kansiot"
 
-#: ../src/pref-manager.c:1799
+#: ../src/pref-manager.c:1874
 msgid "Check INBOX _only"
 msgstr "Tarkista _vain INBOX"
 
-#: ../src/pref-manager.c:1804
-msgid "Display message if new mail has arrived"
-msgstr "Näytä viesti, jos uutta postia on saapunut"
+#: ../src/pref-manager.c:1881
+msgid "When mail arrives:"
+msgstr ""
+
+#: ../src/pref-manager.c:1886
+#, fuzzy
+#| msgid "Copy message"
+msgid "Display message"
+msgstr "Kopioi viesti"
 
-#: ../src/pref-manager.c:1809
-msgid "Play sound if new mail has arrived"
-msgstr "Soita ääni, jos uutta postia on saapunut"
+#: ../src/pref-manager.c:1891
+#, fuzzy
+#| msgid "Play sound:"
+msgid "Play sound"
+msgstr "Soita ääni:"
 
-#: ../src/pref-manager.c:1814
+#: ../src/pref-manager.c:1896
+#, fuzzy
+#| msgid "Show dialog"
+msgid "Show icon"
+msgstr "Näytä ikkuna"
+
+#: ../src/pref-manager.c:1905
 msgid "Do background check quietly (no messages in status bar)"
 msgstr "Tarkista huomaamattomasti taustalla (ei viestejä tilarivillä)"
 
-#: ../src/pref-manager.c:1818
+#: ../src/pref-manager.c:1910
 msgid "_POP message size limit:"
 msgstr "_POP-viestien enimmäiskoko:"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:1845
-msgid "Quoted and Flowed Text"
+#: ../src/pref-manager.c:1938
+#, fuzzy
+#| msgid "Quoted and Flowed Text"
+msgid "Quoted and flowed text"
 msgstr "Lainattu ja rivitetty teksti"
 
-#: ../src/pref-manager.c:1849
+#: ../src/pref-manager.c:1943
+#, fuzzy
+#| msgid "quoted attachment"
+msgid "Mark quoted text"
+msgstr "lainattu liite"
+
+#: ../src/pref-manager.c:1948
+#, fuzzy
+#| msgid ""
+#| "Quoted Text\n"
+#| "Regular Expression:"
 msgid ""
-"Quoted Text\n"
-"Regular Expression:"
+"Quoted text\n"
+"regular expression:"
 msgstr ""
 "Lainatun tekstin\n"
 "säännöllinen lauseke:"
 
-#: ../src/pref-manager.c:1857
-msgid "Wrap Text at"
+#: ../src/pref-manager.c:1957
+#, fuzzy
+#| msgid "Wrap Text at"
+msgid "Wrap text at"
 msgstr "Rivitä teksti kohdasta "
 
-#: ../src/pref-manager.c:1869 ../src/pref-manager.c:2036
+#: ../src/pref-manager.c:1968 ../src/pref-manager.c:2135
 msgid "characters"
 msgstr "merkkiä"
 
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:1884
-msgid "Display of Multipart/Alternative Parts"
+#: ../src/pref-manager.c:1983
+#, fuzzy
+#| msgid "Display of Multipart/Alternative Parts"
+msgid "Display of multipart/alternative parts"
 msgstr "Multipart/Alternative-osien näyttö"
 
-#: ../src/pref-manager.c:1887
+#: ../src/pref-manager.c:1986
 msgid "Prefer text/plain over html"
 msgstr "Suosi text/plain-muotoa HTML:n sijasta"
 
-#: ../src/pref-manager.c:1903
+#: ../src/pref-manager.c:2002
 msgid "National (8-bit) characters in broken messages without codeset header"
 msgstr ""
 "Kansallisia (8-bittiset) merkkejä rikkinäisessä viestissä ilman merkistön "
 "otsaketta"
 
-#: ../src/pref-manager.c:1910
+#: ../src/pref-manager.c:2009
 msgid "display as \"?\""
 msgstr "näytä muodossa \"?\""
 
-#: ../src/pref-manager.c:1919
+#: ../src/pref-manager.c:2018
 msgid "display in codeset"
 msgstr "näytä käyttäen merkistöä"
 
 #. How to handle received MDN requests
-#: ../src/pref-manager.c:1949
-msgid "Message Disposition Notification Requests"
+#: ../src/pref-manager.c:2048
+#, fuzzy
+#| msgid "Message Disposition Notification Requests"
+msgid "Message disposition notification requests"
 msgstr "Message Disposition Notification-pyynnöt"
 
-#: ../src/pref-manager.c:1951
+#: ../src/pref-manager.c:2050
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -4904,7 +5828,7 @@ msgstr ""
 "Kun vastaanotan viestin, jonka lähettäjä vaatii MDN:n palauttamista, lähetä "
 "se seuraavissa tapauksissa:"
 
-#: ../src/pref-manager.c:1963
+#: ../src/pref-manager.c:2062
 msgid ""
 "The message header looks clean\n"
 "(the notify-to address is the return path,\n"
@@ -4914,240 +5838,292 @@ msgstr ""
 "(pyytäjän osoite on sama kuin paluuosoite ja\n"
 "oma osoite on otsakkeessa \"To:\" tai \"Cc:\")."
 
-#: ../src/pref-manager.c:1980
+#: ../src/pref-manager.c:2079
 msgid "The message header looks suspicious."
 msgstr "Viestin otsakkeet näyttävät epäilyttäviltä"
 
-#: ../src/pref-manager.c:2017
-msgid "Word Wrap"
+#: ../src/pref-manager.c:2116
+#, fuzzy
+#| msgid "Word Wrap"
+msgid "Word wrap"
 msgstr "Rivitys"
 
-#: ../src/pref-manager.c:2022
-msgid "Wrap Outgoing Text at"
+#: ../src/pref-manager.c:2121
+#, fuzzy
+#| msgid "Wrap Outgoing Text at"
+msgid "Wrap outgoing text at"
 msgstr "Rivitä lähtevä teksti kohdasta "
 
-#: ../src/pref-manager.c:2050
-msgid "Other Options"
+#: ../src/pref-manager.c:2149
+#, fuzzy
+#| msgid "Other Options"
+msgid "Other options"
 msgstr "Muita asetuksia"
 
-#: ../src/pref-manager.c:2055
-msgid "Reply Prefix:"
+#: ../src/pref-manager.c:2154
+#, fuzzy
+#| msgid "Reply Prefix:"
+msgid "Reply prefix:"
 msgstr "Lainauksen etuliite:"
 
-#: ../src/pref-manager.c:2058
+#: ../src/pref-manager.c:2157
 msgid "Automatically quote original when replying"
 msgstr "Lainaa automaattisesti alkuperäinen vastatessa"
 
-#: ../src/pref-manager.c:2061
+#: ../src/pref-manager.c:2160
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Välitä viesti liitetiedostona sen sijaan, että lainaisit sen"
 
-#: ../src/pref-manager.c:2064
+#: ../src/pref-manager.c:2163
 msgid "Copy outgoing messages to sentbox"
 msgstr "Kopioi lähtevät viestit Lähteneet-kansioon"
 
-#: ../src/pref-manager.c:2066
+#: ../src/pref-manager.c:2165
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "Lähetä-nappi lisää viestit lähtevien jonoon aina."
 
-#: ../src/pref-manager.c:2069
+#: ../src/pref-manager.c:2168
 msgid "Edit headers in external editor"
 msgstr "Muokkaa otsakkeita ulkoisella ohjelmalla"
 
-#: ../src/pref-manager.c:2071
+#: ../src/pref-manager.c:2170
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr "Sisällytä HTML-osat tekstinä vastatessa tai välittäessä"
 
-#: ../src/pref-manager.c:2088
+#: ../src/pref-manager.c:2187
 msgid "Layout"
 msgstr "Asettelu"
 
-#: ../src/pref-manager.c:2090
-msgid "Sort and Thread"
+#: ../src/pref-manager.c:2189
+#, fuzzy
+#| msgid "Sort and Thread"
+msgid "Sort and thread"
 msgstr "Järjestys ja säikeet"
 
-#: ../src/pref-manager.c:2092 ../src/print-gtk.c:483
+#: ../src/pref-manager.c:2191 ../src/print-gtk.c:501
 msgid "Message"
 msgstr "Viesti"
 
-#: ../src/pref-manager.c:2094
+#: ../src/pref-manager.c:2193
 msgid "Colors"
 msgstr "Värit"
 
-#: ../src/pref-manager.c:2096 ../src/pref-manager.c:2184
+#: ../src/pref-manager.c:2195 ../src/pref-manager.c:2286
 msgid "Format"
 msgstr "Muotoilu"
 
-#: ../src/pref-manager.c:2098
-msgid "Status Messages"
+#: ../src/pref-manager.c:2197
+#, fuzzy
+#| msgid "Status Messages"
+msgid "Status messages"
 msgstr "Tilaviestit"
 
-#: ../src/pref-manager.c:2123
-msgid "Main Window"
+#: ../src/pref-manager.c:2222 ../src/toolbar-prefs.c:168
+msgid "Main window"
 msgstr "Pääikkuna"
 
-#: ../src/pref-manager.c:2126
+#: ../src/pref-manager.c:2225
 msgid "Use preview pane"
 msgstr "Käytä esikatseluruutua"
 
-#: ../src/pref-manager.c:2128
+#: ../src/pref-manager.c:2227
 msgid "Show mailbox statistics in left pane"
 msgstr "Näytä tilastot vasemmassa ruudussa"
 
-#: ../src/pref-manager.c:2130
-msgid "Use alternative main window layout"
-msgstr "Käytä vaihtoehtoista asettelua"
-
-#: ../src/pref-manager.c:2132
+#: ../src/pref-manager.c:2231
 msgid "Automatically view message when mailbox opened"
 msgstr "Näytä viesti heti, kun kansio valitaan"
 
-#: ../src/pref-manager.c:2138
+#: ../src/pref-manager.c:2234
+msgid "Ask me before selecting a different mailbox to show an unread message"
+msgstr ""
+
+#: ../src/pref-manager.c:2240
 msgid "PageUp/PageDown keys scroll text by"
 msgstr "PageUp/PageDown näppäimet vierittävät viestiä"
 
-#: ../src/pref-manager.c:2149
+#: ../src/pref-manager.c:2251
 msgid "percent"
 msgstr "prosentilla"
 
-#: ../src/pref-manager.c:2164
-msgid "Display Progress Dialog"
+#: ../src/pref-manager.c:2266
+#, fuzzy
+#| msgid "Display Progress Dialog"
+msgid "Display progress dialog"
 msgstr "Näytä edistymisikkuna"
 
-#: ../src/pref-manager.c:2189
+#: ../src/pref-manager.c:2291
 msgid "Date encoding (for strftime):"
 msgstr "Päivämäärän koodaus (strftime):"
 
-#: ../src/pref-manager.c:2191
+#: ../src/pref-manager.c:2293
 msgid "Selected headers:"
 msgstr "Valitut otsikot:"
 
-#: ../src/pref-manager.c:2213
-msgid "Information Messages"
+#: ../src/pref-manager.c:2315
+#, fuzzy
+#| msgid "Information Messages"
+msgid "Information messages"
 msgstr "Ilmoitukset"
 
-#: ../src/pref-manager.c:2218
-msgid "Information Messages:"
+#: ../src/pref-manager.c:2320
+#, fuzzy
+#| msgid "Information Messages:"
+msgid "Information messages:"
 msgstr "Ilmoitukset:"
 
-#: ../src/pref-manager.c:2222
-msgid "Warning Messages:"
+#: ../src/pref-manager.c:2324
+#, fuzzy
+#| msgid "Warning Messages:"
+msgid "Warning messages:"
 msgstr "Varoitukset:"
 
-#: ../src/pref-manager.c:2226
-msgid "Error Messages:"
+#: ../src/pref-manager.c:2328
+#, fuzzy
+#| msgid "Error Messages:"
+msgid "Error messages:"
 msgstr "Virheilmoitukset:"
 
-#: ../src/pref-manager.c:2230
-msgid "Fatal Error Messages:"
+#: ../src/pref-manager.c:2332
+#, fuzzy
+#| msgid "Fatal Error Messages:"
+msgid "Fatal error messages:"
 msgstr "Vakavat virheilmoitukset:"
 
-#: ../src/pref-manager.c:2234
-msgid "Debug Messages:"
+#: ../src/pref-manager.c:2336
+#, fuzzy
+#| msgid "Debug Messages:"
+msgid "Debug messages:"
 msgstr "Vianmääritysviestit:"
 
-#: ../src/pref-manager.c:2260
-msgid "Message Colors"
+#: ../src/pref-manager.c:2362
+#, fuzzy
+#| msgid "Message Colors"
+msgid "Message colors"
 msgstr "Viestivärit"
 
-#: ../src/pref-manager.c:2265
+#: ../src/pref-manager.c:2367
 #, c-format
 msgid "Quote level %d color"
 msgstr "%d. tason lainauksen väri"
 
-#: ../src/pref-manager.c:2278
-msgid "Link Color"
+#: ../src/pref-manager.c:2380
+#, fuzzy
+#| msgid "Link Color"
+msgid "Link color"
 msgstr "Linkin väri"
 
-#: ../src/pref-manager.c:2280
+#: ../src/pref-manager.c:2382
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../src/pref-manager.c:2291
-msgid "Composition Window"
+#: ../src/pref-manager.c:2393
+#, fuzzy
+#| msgid "Composition Window"
+msgid "Composition window"
 msgstr "Kirjoitusikkuna"
 
-#: ../src/pref-manager.c:2295
+#: ../src/pref-manager.c:2397
 msgid "Invalid or incomplete address label color"
 msgstr "Virheellisen tai keskeneräisen kohdeosoitteen väri"
 
-#: ../src/pref-manager.c:2318 ../src/print-gtk.c:492
+#: ../src/pref-manager.c:2483 ../src/print-gtk.c:510
 msgid "Fonts"
-msgstr "Kirjasimet"
+msgstr "Fontit"
+
+#: ../src/pref-manager.c:2487
+#| msgid "Message Font:"
+msgid "Message font:"
+msgstr "Viestin fontti:"
 
-#: ../src/pref-manager.c:2322
-msgid "Message Font:"
-msgstr "Viestin kirjasin:"
+#: ../src/pref-manager.c:2492
+#| msgid "Subject Font:"
+msgid "Subject font:"
+msgstr "Aiheen fontti:"
 
-#: ../src/pref-manager.c:2330
-msgid "Subject Font:"
-msgstr "Aiheen kirjasin:"
+#: ../src/pref-manager.c:2498
+msgid "Use default font size"
+msgstr ""
 
-#: ../src/pref-manager.c:2368
-msgid "Sorting and Threading"
+#: ../src/pref-manager.c:2546
+#, fuzzy
+#| msgid "Sorting and Threading"
+msgid "Sorting and threading"
 msgstr "Järjestys ja säikeistys"
 
-#: ../src/pref-manager.c:2372
+#: ../src/pref-manager.c:2550
 msgid "Default sort column:"
 msgstr "Järjestyssarakkeen oletus:"
 
-#: ../src/pref-manager.c:2376
+#: ../src/pref-manager.c:2554
 msgid "Default threading style:"
 msgstr "Säikeistystyylin oletus:"
 
-#: ../src/pref-manager.c:2381
+#: ../src/pref-manager.c:2559
 msgid "Expand threads on open"
 msgstr "Laajenna säikeet avattaessa"
 
-#: ../src/pref-manager.c:2456
-msgid "Pspell Settings"
+#: ../src/pref-manager.c:2634
+#, fuzzy
+#| msgid "Pspell Settings"
+msgid "Pspell settings"
 msgstr "Pspell -asetukset"
 
-#: ../src/pref-manager.c:2462
-msgid "Spell Check Module"
+#: ../src/pref-manager.c:2640
+#, fuzzy
+#| msgid "Spell Check Module"
+msgid "Spell check module"
 msgstr "Oikolukumoduuli"
 
-#: ../src/pref-manager.c:2468
-msgid "Suggestion Level"
+#: ../src/pref-manager.c:2646
+#, fuzzy
+#| msgid "Suggestion Level"
+msgid "Suggestion level"
 msgstr "Ehdotustaso"
 
 #. do the ignore length
-#: ../src/pref-manager.c:2473
+#: ../src/pref-manager.c:2651
 msgid "Ignore words shorter than"
 msgstr "Ohita sanat, jotka ovat lyhyempiä kuin"
 
-#: ../src/pref-manager.c:2491
-msgid "Miscellaneous Spelling Settings"
+#: ../src/pref-manager.c:2669
+#, fuzzy
+#| msgid "Miscellaneous Spelling Settings"
+msgid "Miscellaneous spelling settings"
 msgstr "Muut oikolukuasetukset"
 
-#: ../src/pref-manager.c:2493
+#: ../src/pref-manager.c:2671
 msgid "Check signature"
 msgstr "Tarkista allekirjoitus"
 
-#: ../src/pref-manager.c:2494
+#: ../src/pref-manager.c:2672
 msgid "Check quoted"
 msgstr "Tarkista lainaus"
 
-#: ../src/pref-manager.c:2521
+#: ../src/pref-manager.c:2699
 msgid "Debug"
 msgstr "Debug-tila"
 
-#: ../src/pref-manager.c:2522
-msgid "Empty Trash on exit"
+#: ../src/pref-manager.c:2700
+#, fuzzy
+#| msgid "Empty Trash on exit"
+msgid "Empty trash on exit"
 msgstr "Tyhjennä roskakori poistuessa"
 
-#: ../src/pref-manager.c:2528
+#: ../src/pref-manager.c:2707
 msgid "Close mailbox if unused more than"
 msgstr "Sulje kansio, jos se on käyttämättä pidempään kuin"
 
-#: ../src/pref-manager.c:2557
-msgid "Deleting Messages"
+#: ../src/pref-manager.c:2735
+#, fuzzy
+#| msgid "Deleting Messages"
+msgid "Deleting messages"
 msgstr "Poistetaan viestejä"
 
 #. Translators: this used to be "using Mailbox -> Hide messages";
 #. * the UTF-8 string for the right-arrow symbol is broken out to
 #. * avoid msgconv problems.
-#: ../src/pref-manager.c:2562
+#: ../src/pref-manager.c:2740
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -5156,51 +6132,55 @@ msgstr ""
 "Seuraava asetus vaikuttaa kaikkiin kansioihin, mutta voidaan ohittaa "
 "kansiokohtaisesti kohdasta \"Kansio %s Piilota viestit:\""
 
-#: ../src/pref-manager.c:2574
+#: ../src/pref-manager.c:2752
 msgid "Hide messages marked as deleted"
 msgstr "Piilota poistettavaksi merkityt viestit"
 
-#: ../src/pref-manager.c:2576
+#: ../src/pref-manager.c:2754
 msgid "The following settings are global:"
 msgstr "Seuraavat asetukset vaikuttavat kaikkiin kansioihin:"
 
-#: ../src/pref-manager.c:2582
+#: ../src/pref-manager.c:2760
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Siivoa poistetut viestit, kun kansio suljetaan"
 
-#: ../src/pref-manager.c:2589
+#: ../src/pref-manager.c:2767
 msgid "...and if unused more than"
 msgstr "ja jos kansio on käyttämättä pidempään kuin"
 
-#: ../src/pref-manager.c:2614
-msgid "Message Window"
+#: ../src/pref-manager.c:2792 ../src/toolbar-prefs.c:182
+msgid "Message window"
 msgstr "Viesti-ikkuna"
 
-#: ../src/pref-manager.c:2619
+#: ../src/pref-manager.c:2797
 msgid "After moving a message:"
 msgstr "Viestin siirron jälkeen:"
 
-#: ../src/pref-manager.c:2648
-msgid "Startup Options"
+#: ../src/pref-manager.c:2826
+#, fuzzy
+#| msgid "Startup Options"
+msgid "Startup options"
 msgstr "Käynnistysvalinnat"
 
-#: ../src/pref-manager.c:2651
+#: ../src/pref-manager.c:2829
 msgid "Open Inbox upon startup"
 msgstr "Avaa Inbox käynnistettäessä"
 
-#: ../src/pref-manager.c:2653
+#: ../src/pref-manager.c:2831
 msgid "Check mail upon startup"
 msgstr "Tarkista posti käynnistettäessä"
 
-#: ../src/pref-manager.c:2655
+#: ../src/pref-manager.c:2833
 msgid "Remember open mailboxes between sessions"
 msgstr "Muista avoimet kansiot käyttökertojen välillä"
 
-#: ../src/pref-manager.c:2669
-msgid "Folder Scanning"
+#: ../src/pref-manager.c:2847
+#, fuzzy
+#| msgid "Folder Scanning"
+msgid "Folder scanning"
 msgstr "Kansioiden haku"
 
-#: ../src/pref-manager.c:2671
+#: ../src/pref-manager.c:2849
 msgid ""
 "Choose depth 1 for fast startup; this defers scanning some folders.  To see "
 "more of the tree at startup, choose a greater depth."
@@ -5209,166 +6189,120 @@ msgstr ""
 "joidenkin kansioiden latausta. Valitse suurempi syvyys, jos haluat nähdä "
 "syvemmälle puuhun heti käynnistyksessä."
 
-#: ../src/pref-manager.c:2682
+#: ../src/pref-manager.c:2860
 msgid "Scan local folders to depth"
 msgstr "Paikallisten kansioiden hakusyvyys"
 
-#: ../src/pref-manager.c:2695
+#: ../src/pref-manager.c:2873
 msgid "Scan IMAP folders to depth"
 msgstr "Etsi IMAP-kansioita syvyyteen"
 
-#: ../src/pref-manager.c:2760
-msgid "Address Book Name"
+#: ../src/pref-manager.c:2938
+#, fuzzy
+#| msgid "Address Book Name"
+msgid "Address book name"
 msgstr "Osoitekirjan nimi"
 
-#: ../src/pref-manager.c:2768
+#: ../src/pref-manager.c:2946
 msgid "Auto-complete"
 msgstr "Automaattinen täydennys"
 
-#: ../src/pref-manager.c:2793
+#: ../src/pref-manager.c:2971
 msgid "_Set as default"
 msgstr "_Aseta oletukseksi"
 
-#: ../src/pref-manager.c:3103
+#: ../src/pref-manager.c:3276
 msgid "Remote POP3 mailbox..."
 msgstr "Ulkoinen POP3-kansio..."
 
-#: ../src/pref-manager.c:3229
+#: ../src/pref-manager.c:3412
 msgid "Show nothing"
 msgstr "Älä näytä mitään"
 
-#: ../src/pref-manager.c:3231
+#: ../src/pref-manager.c:3414
 msgid "Show dialog"
 msgstr "Näytä ikkuna"
 
-#: ../src/pref-manager.c:3233
+#: ../src/pref-manager.c:3416
 msgid "Show in list"
 msgstr "Näytä listalla"
 
-#: ../src/pref-manager.c:3235
+#: ../src/pref-manager.c:3418
 msgid "Show in status bar"
 msgstr "Näytä tilarivillä"
 
-#: ../src/pref-manager.c:3237
+#: ../src/pref-manager.c:3420
 msgid "Print to console"
 msgstr "Tulosta konsoliin"
 
-#: ../src/pref-manager.c:3248
+#: ../src/pref-manager.c:3431
 msgid "Ask me"
 msgstr "Kysy"
 
-#: ../src/pref-manager.c:3325
+#: ../src/pref-manager.c:3547
+#, fuzzy
+#| msgid "Default Client"
+msgid "Default layout"
+msgstr "Oletusasiakas"
+
+#: ../src/pref-manager.c:3548
+#, fuzzy
+#| msgid "_Hide messages"
+msgid "Wide message layout"
+msgstr "_Piilota viestit"
+
+#: ../src/pref-manager.c:3549
+msgid "Wide screen layout"
+msgstr ""
+
+#: ../src/pref-manager.c:3557
 msgid "Show next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../src/pref-manager.c:3326
+#: ../src/pref-manager.c:3558
 msgid "Show next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../src/pref-manager.c:3327
+#: ../src/pref-manager.c:3559
 msgid "Close message window"
 msgstr "Suljetaan viesti-ikkuna"
 
-#: ../src/pref-manager.c:3365
+#: ../src/pref-manager.c:3600
 #, c-format
 msgid "Error displaying link_id %s: %s\n"
 msgstr "Virhe näytettäessä linkkiä %s: %s\n"
 
-#: ../src/print.c:246 ../src/print.c:727
-#, c-format
-msgid "Page: %i/%i"
-msgstr "Sivu: %i/%i"
-
-#: ../src/print.c:662
-msgid ""
-"Preparing an HTML part, which must start on a new page.\n"
-"Print this part?"
-msgstr ""
-"Valmistellaan HTML-osaa, jonka täytyy alkaa uudelta sivulta.\n"
-"Tulostetaanko tämä osa?"
-
-#: ../src/print.c:1300 ../src/print-gtk.c:189
-#, c-format
-msgid "This is an inline %s signed %s message part:"
-msgstr "Tämä on sisäkkäinen %s-allekirjoitetun %s viestin osa:"
-
-#: ../src/print.c:1547
-msgid "Font available for printing"
-msgstr "Kirjasinta voidaan käyttää tulostukseen"
-
-#: ../src/print.c:1553
-#, c-format
-msgid "Font <b>not</b> available for printing. Closest: %s"
-msgstr "Kirjasinta <b>ei</b> voida käyttää tulostukseen. Lähinnä sitä on %s"
-
-#: ../src/print.c:1566
-msgid "Select Font"
-msgstr "Valitse kirjasin"
-
-#: ../src/print.c:1599
-msgid "Change..."
-msgstr "Muuta..."
-
-#: ../src/print.c:1634
-msgid "Print message"
-msgstr "Tulosta viesti"
-
-#. create a 2nd notebook page for the fonts
-#: ../src/print.c:1645
-msgid "_Fonts"
-msgstr "_Kirjasimet"
-
-#: ../src/print.c:1648
-msgid "Header font"
-msgstr "Otsikon kirjasin"
-
-#: ../src/print.c:1650
-msgid "Body font"
-msgstr "Viestin kirjasin"
-
-#: ../src/print.c:1652
-msgid "Footer font"
-msgstr "Alaviitteen kirjasin"
-
-#. highlight cited stuff
-#: ../src/print.c:1656
-msgid "Highlight cited text"
-msgstr "Korosta lainattu teksti"
-
-#: ../src/print.c:1660
-msgid "_Enable highlighting of cited text"
-msgstr "_Ota käyttöön lainatun tekstin korostus"
-
-#: ../src/print.c:1686
-#, c-format
-msgid ""
-"Balsa could not find font \"%s\".\n"
-"Use the \"Fonts\" page on the \"Print message\" dialog to change it."
-msgstr ""
-"Balsa ei löytänyt kirjasinta \"%s\".\n"
-"Käytä \"Kirjasimet\"-sivua \"Tulosta viesti\"-ikkunasta kirjasimen vaihtoon."
-
-#: ../src/print.c:1787
-msgid "Balsa: message print preview"
-msgstr "Balsa: tulostuksen esikatselu"
-
-#: ../src/print-gtk.c:88 ../src/print-gtk.c:239
+#: ../src/print-gtk.c:91 ../src/print-gtk.c:250
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sivu %d / %d"
 
-#: ../src/print-gtk.c:142 ../src/print-gtk.c:161
+#: ../src/print-gtk.c:145 ../src/print-gtk.c:171
 msgid "Signed and encrypted matter"
 msgstr "Allekirjoitettu ja salauttu osa"
 
-#: ../src/print-gtk.c:146 ../src/print-gtk.c:165
+#: ../src/print-gtk.c:149 ../src/print-gtk.c:175
 msgid "Signed matter"
 msgstr "Allekirjoitettu osa"
 
-#: ../src/print-gtk.c:344
+#: ../src/print-gtk.c:156
+#, fuzzy
+#| msgid "encrypted parts"
+msgid "Encrypted matter"
+msgstr "salatut osat"
+
+#: ../src/print-gtk.c:199
 #, c-format
-msgid "Cannot print page %d because the document has only %d pages."
-msgstr "Sivua %d ei voi tulostaa, koska asiakirjassa on vain %d sivua."
+msgid "This is an inline %s signed %s message part:"
+msgstr "Tämä on sisäkkäinen %s-allekirjoitetun %s viestin osa:"
+
+#: ../src/print-gtk.c:354
+#, fuzzy, c-format
+#| msgid "Cannot print page %d because the document has only %d pages."
+msgid "Cannot print page %d because the document has only %d page."
+msgid_plural "Cannot print page %d because the document has only %d pages."
+msgstr[0] "Sivua %d ei voi tulostaa, koska asiakirjassa on vain %d sivua."
+msgstr[1] "Sivua %d ei voi tulostaa, koska asiakirjassa on vain %d sivua."
 
 #. Translate to the default units to use for presenting
 #. * lengths to the user. Translate to default:inch if you
@@ -5376,72 +6310,72 @@ msgstr "Sivua %d ei voi tulostaa, koska asiakirjassa on vain %d sivua."
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: ../src/print-gtk.c:378
+#: ../src/print-gtk.c:392
 msgid "default:mm"
 msgstr "default:mm"
 
-#: ../src/print-gtk.c:435
+#: ../src/print-gtk.c:449
 msgid "inch"
 msgstr "tuumaa"
 
-#: ../src/print-gtk.c:442
+#: ../src/print-gtk.c:456
 msgid "mm"
 msgstr "mm"
 
-#: ../src/print-gtk.c:513
+#: ../src/print-gtk.c:531
 msgid "_Header Font:"
-msgstr "_Otsakkeen kirjasin:"
+msgstr "_Otsakkeen fontti:"
 
-#: ../src/print-gtk.c:516
+#: ../src/print-gtk.c:534
 msgid "B_ody Font:"
-msgstr "_Viestirungon kirjasin:"
+msgstr "_Viestirungon fontti:"
 
-#: ../src/print-gtk.c:519
+#: ../src/print-gtk.c:537
 msgid "_Footer Font:"
-msgstr "_Alaviitteen kirjasin:"
+msgstr "_Alaviitteen fontti:"
 
-#: ../src/print-gtk.c:526
+#: ../src/print-gtk.c:544
 msgid "Highlighting"
 msgstr "Korostus"
 
-#: ../src/print-gtk.c:541
+#: ../src/print-gtk.c:559
 msgid "Highlight _cited text"
 msgstr "Korosta _lainattu teksti"
 
-#: ../src/print-gtk.c:550
+#: ../src/print-gtk.c:568
 msgid "Highlight _structured phrases"
 msgstr "Korosta _rakenteelliset lauseet"
 
-#: ../src/print-gtk.c:561
+#: ../src/print-gtk.c:579
 msgid "Margins"
 msgstr "Marginaalit"
 
-#: ../src/print-gtk.c:583
+#: ../src/print-gtk.c:601
 msgid "_Top"
 msgstr "_Ylä"
 
-#: ../src/print-gtk.c:589
+#: ../src/print-gtk.c:607
 msgid "_Bottom"
 msgstr "_Ala"
 
-#: ../src/print-gtk.c:601
+#: ../src/print-gtk.c:619
 msgid "_Left"
 msgstr "_Vasen"
 
-#: ../src/print-gtk.c:607
+#: ../src/print-gtk.c:625
 msgid "_Right"
 msgstr "_Oikea"
 
-#: ../src/print-gtk.c:731
+#: ../src/print-gtk.c:751
 #, c-format
 msgid "Error printing message: %s"
 msgstr "Virhe tulostettaessa viestiä: %s"
 
-#: ../src/save-restore.c:684
+#: ../src/save-restore.c:610
 msgid "Error during filters loading: "
 msgstr "Virhe ladattaessa suodattimia:"
 
-#: ../src/save-restore.c:686
+#: ../src/save-restore.c:612
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -5450,12 +6384,12 @@ msgstr ""
 "Virhe ladattaessa suodattimia: %s\n"
 "Suodattimet ovat ehkä virheellisiä."
 
-#: ../src/save-restore.c:801
+#: ../src/save-restore.c:736
 msgid "The option not to recognize \"format=flowed\" text has been removed."
 msgstr ""
 "Asetus \"format=flowed\"-muotoisen tekstin tunnistamiseen on poistettu."
 
-#: ../src/save-restore.c:1084
+#: ../src/save-restore.c:1017
 msgid ""
 "The option not to send \"format=flowed\" text is now on the Options menu of "
 "the compose window."
@@ -5463,14 +6397,14 @@ msgstr ""
 "Asetuksen \"format=flowed\" valinta on nyt viestin kirjoitusikkunan "
 "Asetukset-valikossa."
 
-#: ../src/save-restore.c:1116
+#: ../src/save-restore.c:1049
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "MDN:n palauttamista pyytävä asetus on nyt viestin kirjoitusikkunan Asetukset-"
 "valikossa"
 
-#: ../src/save-restore.c:1196
+#: ../src/save-restore.c:1131
 msgid ""
 "This version of Balsa uses a new user interface; if you have changed Balsa's "
 "keyboard accelerators, you will need to set them again."
@@ -5478,11 +6412,11 @@ msgstr ""
 "Tämä balsan versio käyttää uutta käyttöliittymää. Jos olet muuttanut Balsan "
 "näppäinoikoteitä, sinun täytyy asettaa ne uudestaan."
 
-#: ../src/save-restore.c:2215
+#: ../src/save-restore.c:2170
 msgid "Error opening GConf database\n"
 msgstr "Virhe avattaessa GConf-tietokantaa\n"
 
-#: ../src/save-restore.c:2223 ../src/save-restore.c:2234
+#: ../src/save-restore.c:2178 ../src/save-restore.c:2189
 #, c-format
 msgid "Error setting GConf field: %s\n"
 msgstr "Virhe asetettaessa GConf-kenttää: %s\n"
@@ -5490,377 +6424,438 @@ msgstr "Virhe asetettaessa GConf-kenttää: %s\n"
 #. Translators: please use the initial letter of each language as
 #. * its accelerator; this is a long list, and unique accelerators
 #. * cannot be found.
-#: ../src/sendmsg-window.c:255
+#: ../src/sendmsg-window.c:258
 msgid "_Brazilian Portuguese"
 msgstr "_Brasilian Portugali"
 
-#: ../src/sendmsg-window.c:256
+#: ../src/sendmsg-window.c:259
 msgid "_Catalan"
 msgstr "_Katalonialainen"
 
-#: ../src/sendmsg-window.c:257
+#: ../src/sendmsg-window.c:260
 msgid "_Chinese Simplified"
 msgstr "_Kiina (yksinkertaistettu)"
 
-#: ../src/sendmsg-window.c:258
+#: ../src/sendmsg-window.c:261
 msgid "_Chinese Traditional"
 msgstr "_Kiina (perinteinen)"
 
-#: ../src/sendmsg-window.c:259
+#: ../src/sendmsg-window.c:262
 msgid "_Czech"
 msgstr "_Tsekki"
 
-#: ../src/sendmsg-window.c:260
+#: ../src/sendmsg-window.c:263
 msgid "_Danish"
 msgstr "_Tanska"
 
-#: ../src/sendmsg-window.c:261
+#: ../src/sendmsg-window.c:264
 msgid "_Dutch"
 msgstr "_Hollanti"
 
-#: ../src/sendmsg-window.c:262
+#: ../src/sendmsg-window.c:265
 msgid "_English (American)"
 msgstr "_Englanti (Amerikkalainen)"
 
-#: ../src/sendmsg-window.c:263
+#: ../src/sendmsg-window.c:266
 msgid "_English (British)"
 msgstr "_Englanti (Brittiläinen)"
 
-#: ../src/sendmsg-window.c:264
+#: ../src/sendmsg-window.c:267
 msgid "_Esperanto"
 msgstr "_Esperanto"
 
-#: ../src/sendmsg-window.c:265
+#: ../src/sendmsg-window.c:268
 msgid "_Estonian"
 msgstr "_Eesti"
 
-#: ../src/sendmsg-window.c:266
+#: ../src/sendmsg-window.c:269
 msgid "_Finnish"
 msgstr "_Suomi"
 
-#: ../src/sendmsg-window.c:267
+#: ../src/sendmsg-window.c:270
 msgid "_French"
 msgstr "_Ranska"
 
-#: ../src/sendmsg-window.c:268
+#: ../src/sendmsg-window.c:271
 msgid "_German"
 msgstr "_Saksa"
 
-#: ../src/sendmsg-window.c:269
+#: ../src/sendmsg-window.c:272
 msgid "_German (Austrian)"
 msgstr "_Saksa (Itävaltalainen)"
 
-#: ../src/sendmsg-window.c:270
+#: ../src/sendmsg-window.c:273
 msgid "_German (Swiss)"
 msgstr "_Saksa (Sveitsiläinen)"
 
-#: ../src/sendmsg-window.c:271
+#: ../src/sendmsg-window.c:274
 msgid "_Greek"
 msgstr "_Kreikka"
 
-#: ../src/sendmsg-window.c:272
+#: ../src/sendmsg-window.c:275
 msgid "_Hebrew"
 msgstr "_Heprea"
 
-#: ../src/sendmsg-window.c:273
+#: ../src/sendmsg-window.c:276
 msgid "_Hungarian"
 msgstr "_Unkari"
 
-#: ../src/sendmsg-window.c:274
+#: ../src/sendmsg-window.c:277
 msgid "_Italian"
 msgstr "_Italia"
 
-#: ../src/sendmsg-window.c:275
+#: ../src/sendmsg-window.c:278
 msgid "_Japanese (JIS)"
 msgstr "_Japani (JIS)"
 
-#: ../src/sendmsg-window.c:276
+#: ../src/sendmsg-window.c:279
+msgid "_Kazakh"
+msgstr ""
+
+#: ../src/sendmsg-window.c:280
 msgid "_Korean"
 msgstr "_Korea"
 
-#: ../src/sendmsg-window.c:277
+#: ../src/sendmsg-window.c:281
 msgid "_Latvian"
 msgstr "_Latvia"
 
-#: ../src/sendmsg-window.c:278
+#: ../src/sendmsg-window.c:282
 msgid "_Lithuanian"
 msgstr "_Liettua"
 
-#: ../src/sendmsg-window.c:279
+#: ../src/sendmsg-window.c:283
 msgid "_Norwegian"
 msgstr "_Norja"
 
-#: ../src/sendmsg-window.c:280
+#: ../src/sendmsg-window.c:284
 msgid "_Polish"
 msgstr "_Puola"
 
-#: ../src/sendmsg-window.c:281
+#: ../src/sendmsg-window.c:285
 msgid "_Portugese"
 msgstr "_Portugali"
 
-#: ../src/sendmsg-window.c:282
+#: ../src/sendmsg-window.c:286
 msgid "_Romanian"
 msgstr "_Rooma"
 
-#: ../src/sendmsg-window.c:283
-msgid "_Russian (ISO)"
-msgstr "_Venäjä (ISO)"
-
-#: ../src/sendmsg-window.c:284
-msgid "_Russian (KOI)"
-msgstr "_Venäjä (KOI)"
+#: ../src/sendmsg-window.c:287
+#, fuzzy
+#| msgid "russian"
+msgid "_Russian"
+msgstr "venäläinen"
 
-#: ../src/sendmsg-window.c:285
+#: ../src/sendmsg-window.c:288
 msgid "_Serbian"
 msgstr "_Serbia"
 
-#: ../src/sendmsg-window.c:286
+#: ../src/sendmsg-window.c:289
 msgid "_Serbian (Latin)"
 msgstr "_Serbia (Latinalainen)"
 
-#: ../src/sendmsg-window.c:287
+#: ../src/sendmsg-window.c:290
 msgid "_Slovak"
 msgstr "_Slovakia"
 
-#: ../src/sendmsg-window.c:288
+#: ../src/sendmsg-window.c:291
 msgid "_Spanish"
 msgstr "_Espanja"
 
-#: ../src/sendmsg-window.c:289
+#: ../src/sendmsg-window.c:292
 msgid "_Swedish"
 msgstr "_Ruotsi"
 
-#: ../src/sendmsg-window.c:290
+#: ../src/sendmsg-window.c:293
+msgid "_Tatar"
+msgstr ""
+
+#: ../src/sendmsg-window.c:294
 msgid "_Turkish"
 msgstr "_Turkki"
 
-#: ../src/sendmsg-window.c:291
+#: ../src/sendmsg-window.c:295
 msgid "_Ukrainian"
 msgstr "_Ukraina"
 
-#: ../src/sendmsg-window.c:292
+#: ../src/sendmsg-window.c:296
 msgid "_Generic UTF-8"
 msgstr "_Yleinen UTF-8"
 
-#: ../src/sendmsg-window.c:314
+#: ../src/sendmsg-window.c:322
+msgid "_Show"
+msgstr "_Näytä"
+
+#: ../src/sendmsg-window.c:323
+msgid "_Language"
+msgstr "_Kieli"
+
+#: ../src/sendmsg-window.c:324
+msgid "_Options"
+msgstr "_Asetukset"
+
+#: ../src/sendmsg-window.c:334
 msgid "_Include File..."
 msgstr "_Sisällytä tiedosto..."
 
-#: ../src/sendmsg-window.c:315
+#: ../src/sendmsg-window.c:335
 msgid "Include a file"
 msgstr "Sisällytä tiedosto"
 
-#: ../src/sendmsg-window.c:316
+#: ../src/sendmsg-window.c:336
 msgid "_Attach File..."
 msgstr "Liitä _tiedosto..."
 
-#: ../src/sendmsg-window.c:317
+#: ../src/sendmsg-window.c:337
 msgid "Attach a file"
 msgstr "Liitä tiedosto"
 
-#: ../src/sendmsg-window.c:318
+#: ../src/sendmsg-window.c:338
 msgid "I_nclude Message(s)"
 msgstr "_Sisällytä viesti(t)"
 
-#: ../src/sendmsg-window.c:319
+#: ../src/sendmsg-window.c:339
 msgid "Include selected message(s)"
 msgstr "_Sisällytä valitut viestit"
 
-#: ../src/sendmsg-window.c:320
+#: ../src/sendmsg-window.c:340
 msgid "Attach _Message(s)"
 msgstr "_Liitä viesti(t)"
 
-#: ../src/sendmsg-window.c:321
+#: ../src/sendmsg-window.c:341
 msgid "Attach selected message(s)"
 msgstr "_Liitä valitut viestit"
 
-#: ../src/sendmsg-window.c:322
+#: ../src/sendmsg-window.c:342
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../src/sendmsg-window.c:323
+#: ../src/sendmsg-window.c:343
 msgid "Save this message"
 msgstr "Tallenna tämä viesti"
 
-#: ../src/sendmsg-window.c:331
+#: ../src/sendmsg-window.c:349
 msgid "Print the edited message"
 msgstr "Tulosta muokattu viesti"
 
-#: ../src/sendmsg-window.c:334
+#: ../src/sendmsg-window.c:352
 msgid "_Undo"
 msgstr "_Peru"
 
-#: ../src/sendmsg-window.c:335
+#: ../src/sendmsg-window.c:353
 msgid "Undo most recent change"
 msgstr "Peru viimeisin muutos"
 
-#: ../src/sendmsg-window.c:336
+#: ../src/sendmsg-window.c:354
 msgid "_Redo"
 msgstr "Tee _uudestaan"
 
-#: ../src/sendmsg-window.c:337
+#: ../src/sendmsg-window.c:355
 msgid "Redo most recent change"
 msgstr "Tee viimeisin muutos uudestaan"
 
-#: ../src/sendmsg-window.c:338
+#: ../src/sendmsg-window.c:356
 msgid "Cu_t"
 msgstr "L_eikkaa"
 
-#: ../src/sendmsg-window.c:339
+#: ../src/sendmsg-window.c:357
 msgid "Cut the selected text"
 msgstr "Leikkaa valittu teksti"
 
-#: ../src/sendmsg-window.c:341
+#: ../src/sendmsg-window.c:359
 msgid "Copy to the clipboard"
 msgstr "Kopioi leikepöydälle"
 
-#: ../src/sendmsg-window.c:342
+#: ../src/sendmsg-window.c:360
 msgid "_Paste"
 msgstr "_Liitä"
 
-#: ../src/sendmsg-window.c:343
+#: ../src/sendmsg-window.c:361
 msgid "Paste from the clipboard"
 msgstr "Liitä leikepöydältä"
 
-#: ../src/sendmsg-window.c:346
+#: ../src/sendmsg-window.c:364
 msgid "_Wrap Body"
 msgstr "_Rivitä viesti"
 
-#: ../src/sendmsg-window.c:348
+#: ../src/sendmsg-window.c:366
 msgid "_Reflow Selected Text"
 msgstr "_Rivitä valittu teksti uudestaan"
 
-#: ../src/sendmsg-window.c:350
+#: ../src/sendmsg-window.c:368
 msgid "Insert Si_gnature"
 msgstr "Lisää _allekirjoitus"
 
-#: ../src/sendmsg-window.c:352
+#: ../src/sendmsg-window.c:370
 msgid "_Quote Message(s)"
 msgstr "_Lainaa viestejä"
 
-#: ../src/sendmsg-window.c:355 ../src/sendmsg-window.c:391
+#: ../src/sendmsg-window.c:373 ../src/sendmsg-window.c:415
 msgid "C_heck Spelling"
 msgstr "Tarkista _oikeinkirjoitus"
 
-#: ../src/sendmsg-window.c:356 ../src/sendmsg-window.c:392
+#: ../src/sendmsg-window.c:374 ../src/sendmsg-window.c:416
 msgid "Check the spelling of the message"
 msgstr "Tarkista viestin oikeinkirjoitus"
 
-#: ../src/sendmsg-window.c:359
+#: ../src/sendmsg-window.c:377
 msgid "Select _Identity..."
 msgstr "Valitse _henkilöllisyys..."
 
-#: ../src/sendmsg-window.c:360
+#: ../src/sendmsg-window.c:378
 msgid "Select the Identity to use for the message"
 msgstr "Valitse viestissä käytettävä henkilöllisyys."
 
-#: ../src/sendmsg-window.c:363
+#: ../src/sendmsg-window.c:381
 msgid "_Edit with Gnome-Editor"
 msgstr "_Muokkaa Gnomen editorilla"
 
-#: ../src/sendmsg-window.c:364
+#: ../src/sendmsg-window.c:382
 msgid "Edit the current message with the default Gnome editor"
 msgstr "Muokkaa valittua viestiä Gnomen oletuseditorilla"
 
-#: ../src/sendmsg-window.c:371
+#. All three "Send" and "Queue" actions have the same
+#. * stock_id; the first in this list defines the action tied to the
+#. * toolbar's "Send" button, so "ToolbarSend" must come before
+#. * the others.
+#: ../src/sendmsg-window.c:393 ../src/sendmsg-window.c:395
 msgid "Sen_d"
 msgstr "_Lähetä"
 
-#: ../src/sendmsg-window.c:372
+#: ../src/sendmsg-window.c:394 ../src/sendmsg-window.c:396
 msgid "Send this message"
 msgstr "Lähetä tämä viesti"
 
-#: ../src/sendmsg-window.c:374
+#: ../src/sendmsg-window.c:398
 msgid "_Queue"
 msgstr "_Jono"
 
-#: ../src/sendmsg-window.c:375 ../src/sendmsg-window.c:381
+#: ../src/sendmsg-window.c:399 ../src/sendmsg-window.c:405
 msgid "Queue this message in Outbox for sending"
 msgstr "Listää viesti jonoon"
 
-#: ../src/sendmsg-window.c:377
+#: ../src/sendmsg-window.c:401
 msgid "_Postpone"
 msgstr "_Jatka myöhemmin"
 
-#: ../src/sendmsg-window.c:380
+#: ../src/sendmsg-window.c:402
+#, fuzzy
+#| msgid "Save this message"
+msgid "Save this message and close"
+msgstr "Tallenna tämä viesti"
+
+#: ../src/sendmsg-window.c:404
 msgid "Send _Later"
 msgstr "Lähetä _myöhemmin"
 
-#: ../src/sendmsg-window.c:383
+#: ../src/sendmsg-window.c:407
 msgid "Sa_ve and Close"
 msgstr "Tallenna ja _sulje"
 
-#: ../src/sendmsg-window.c:395
-msgid "Fr_om"
-msgstr "_Lähettäjä"
-
-#: ../src/sendmsg-window.c:397
-msgid "_Cc"
-msgstr "_Kopio"
+#: ../src/sendmsg-window.c:419
+#, fuzzy
+#| msgid "_Toolbars..."
+msgid "Too_lbar"
+msgstr "_Työkalupalkit..."
 
-#: ../src/sendmsg-window.c:399
-msgid "_Bcc"
-msgstr "_Toinen kopio"
+#: ../src/sendmsg-window.c:421
+#, fuzzy
+#| msgid "F_rom:"
+msgid "F_rom"
+msgstr "_Lähettäjä:"
 
-#: ../src/sendmsg-window.c:401
-msgid "_Fcc"
-msgstr "K_ansio"
+#: ../src/sendmsg-window.c:423
+msgid "Rec_ipients"
+msgstr ""
 
-#: ../src/sendmsg-window.c:404
-msgid "_Reply To"
+#: ../src/sendmsg-window.c:426
+#, fuzzy
+#| msgid "_Reply To"
+msgid "R_eply To"
 msgstr "_Vastausosoite"
 
-#: ../src/sendmsg-window.c:407
+#: ../src/sendmsg-window.c:429
+#, fuzzy
+#| msgid "F_cc:"
+msgid "F_cc"
+msgstr "F_cc:"
+
+#: ../src/sendmsg-window.c:432
 msgid "_Request Disposition Notification"
 msgstr "_Pyydä poistamisilmoitus"
 
-#: ../src/sendmsg-window.c:409
+#: ../src/sendmsg-window.c:433
+#, fuzzy
+#| msgid "_Request Disposition Notification"
+msgid "Request Message Disposition Notification"
+msgstr "_Pyydä poistamisilmoitus"
+
+#: ../src/sendmsg-window.c:435
 msgid "_Format = Flowed"
 msgstr "_Muotoilu = Rivitetty"
 
-#: ../src/sendmsg-window.c:413 ../src/sendmsg-window.c:418
+#. Send as message/alternative with text/plain and text/html parts
+#: ../src/sendmsg-window.c:438
+msgid "Send as plain text and _HTML"
+msgstr ""
+
+#: ../src/sendmsg-window.c:442 ../src/sendmsg-window.c:448
 msgid "_Sign Message"
 msgstr "_Allekirjoita viesti"
 
-#: ../src/sendmsg-window.c:415 ../src/sendmsg-window.c:421
+#: ../src/sendmsg-window.c:443
+msgid "Sign message using GPG"
+msgstr "Allekirjoita viesti digitaalisesti GPG:llä"
+
+#: ../src/sendmsg-window.c:444 ../src/sendmsg-window.c:451
 msgid "_Encrypt Message"
 msgstr "_Salaaa viesti"
 
-#: ../src/sendmsg-window.c:419
+#: ../src/sendmsg-window.c:445
+msgid "Encrypt message using GPG"
+msgstr "Salaa viesti digitaalisesti GPG:llä"
+
+#: ../src/sendmsg-window.c:449
 msgid "signs the message using GnuPG"
 msgstr "Allekirjoittaa viestin GnuPG:llä"
 
-#: ../src/sendmsg-window.c:422
+#: ../src/sendmsg-window.c:453
 msgid "signs the message using GnuPG for all To: and CC: recipients"
 msgstr ""
 "Allekirjoittaa viestin GnuPG:llä kaikille To: ja Cc: kenttien "
 "vastaanottajille"
 
-#: ../src/sendmsg-window.c:432
+#: ../src/sendmsg-window.c:463
 msgid "_GnuPG uses MIME mode"
 msgstr "_GnuPG käyttää MIME-tilaa"
 
-#: ../src/sendmsg-window.c:434
+#: ../src/sendmsg-window.c:465
 msgid "_GnuPG uses old OpenPGP mode"
 msgstr "_GnuPG käyttää vanhaa OpenPGP-tilaa"
 
-#: ../src/sendmsg-window.c:437
+#: ../src/sendmsg-window.c:468
 msgid "_S/MIME mode (GpgSM)"
 msgstr "_S/MIME-tila (GpgSM)"
 
-#: ../src/sendmsg-window.c:647
+#: ../src/sendmsg-window.c:680
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../src/sendmsg-window.c:647
+#: ../src/sendmsg-window.c:680
 msgid "Inline"
 msgstr "Sisäkkäisesti"
 
-#: ../src/sendmsg-window.c:647
+#: ../src/sendmsg-window.c:680
 msgid "Reference"
 msgstr "Viittaus"
 
-#: ../src/sendmsg-window.c:874
+#: ../src/sendmsg-window.c:921
+#, fuzzy
+#| msgid "(No sender)"
+msgid "(No name)"
+msgstr "(ei lähettäjää)"
+
+#: ../src/sendmsg-window.c:927
 #, c-format
 msgid ""
 "The message to '%s' is modified.\n"
@@ -5869,15 +6864,15 @@ msgstr ""
 "Viestiä henkilölle '%s' on muokattu.\n"
 "Tallenna viesti luonnoskansioon?"
 
-#: ../src/sendmsg-window.c:1201
+#: ../src/sendmsg-window.c:1225
 msgid "Gnome editor is not defined in your preferred applications."
 msgstr "Gnomen oletussovelluksissa ei ole valittu tekstieditoria."
 
-#: ../src/sendmsg-window.c:1252
+#: ../src/sendmsg-window.c:1281
 msgid "Select Identity"
 msgstr "Valitse henkilöllisyys"
 
-#: ../src/sendmsg-window.c:1660
+#: ../src/sendmsg-window.c:1758
 #, c-format
 msgid ""
 "Saying yes will not send the file `%s' itself, but just a MIME message/"
@@ -5892,15 +6887,15 @@ msgstr ""
 "\n"
 "Haluatko todella liittää tämän tiedoston viitteenä?"
 
-#: ../src/sendmsg-window.c:1671
+#: ../src/sendmsg-window.c:1771
 msgid "Attach as Reference?"
 msgstr "Liitä viittauksena?"
 
-#: ../src/sendmsg-window.c:1784
+#: ../src/sendmsg-window.c:1864
 msgid "Choose charset"
 msgstr "Valitse merkistö"
 
-#: ../src/sendmsg-window.c:1791
+#: ../src/sendmsg-window.c:1871
 #, c-format
 msgid ""
 "File\n"
@@ -5913,66 +6908,57 @@ msgstr ""
 "sisältö ei ole US-ASCII tai UTF-8 merkistössä.\n"
 "Valitse merkistö, jota käytetään tiedoston koodaukseen."
 
-#: ../src/sendmsg-window.c:1807
+#: ../src/sendmsg-window.c:1891
 msgid "Attach as MIME type:"
 msgstr "Liitä MIME-tyypillä:"
 
-#: ../src/sendmsg-window.c:1863
+#: ../src/sendmsg-window.c:1960
 #, c-format
 msgid "Character set for file %s changed from \"%s\" to \"%s\"."
 msgstr "Tiedoston %s merkistö vaihdettu, \"%s\" -> \"%s\"."
 
-#: ../src/sendmsg-window.c:1906 ../src/sendmsg-window.c:5680
+#: ../src/sendmsg-window.c:2003 ../src/sendmsg-window.c:5766
 msgid "(no subject)"
 msgstr "(ei aihetta)"
 
-#: ../src/sendmsg-window.c:1996
+#: ../src/sendmsg-window.c:2041
+#, c-format
+msgid "Cannot create file URI object for %s"
+msgstr ""
+
+#: ../src/sendmsg-window.c:2049
+#, fuzzy
+#| msgid "Unknown error"
+msgid "unknown error"
+msgstr "Tuntematon virhe"
+
+#: ../src/sendmsg-window.c:2096
 msgid "forwarded message"
 msgstr "välitetty viesti"
 
-#: ../src/sendmsg-window.c:2001
+#: ../src/sendmsg-window.c:2101
 #, c-format
 msgid "Message from %s, subject: \"%s\""
 msgstr "Viesti lähettäjältä %s aiheena \"%s\""
 
-#: ../src/sendmsg-window.c:2019
-#, c-format
-msgid "Error converting \"%s\" to UTF-8: %s\n"
-msgstr "Virhe muunnettaessa \"%s\" merkistöön UTF-8: %s\n"
-
-#: ../src/sendmsg-window.c:2089 ../src/sendmsg-window.c:2160
+#: ../src/sendmsg-window.c:2177 ../src/sendmsg-window.c:2250
 msgid "Remove"
 msgstr "Poista"
 
-#: ../src/sendmsg-window.c:2172
+#: ../src/sendmsg-window.c:2262
 msgid "Open..."
 msgstr "Avaa..."
 
-#: ../src/sendmsg-window.c:2184
+#: ../src/sendmsg-window.c:2274
 msgid "(URL)"
 msgstr "(URL)"
 
-#: ../src/sendmsg-window.c:2205
-#, c-format
-msgid "Cannot get info on file '%s': %s"
-msgstr "Ei saa tietoja tiedostosta: '%s' : '%s'"
-
-#: ../src/sendmsg-window.c:2210
-#, c-format
-msgid "Attachment %s is not a regular file."
-msgstr "Liitetiedosto %s ei ole tavallinen tiedosto."
-
-#: ../src/sendmsg-window.c:2213
-#, c-format
-msgid "File %s cannot be read\n"
-msgstr "Tiedostoa %s ei voida lukea\n"
-
-#: ../src/sendmsg-window.c:2261
+#: ../src/sendmsg-window.c:2332
 msgid "Attach file"
 msgstr "Liitä tiedosto"
 
-#: ../src/sendmsg-window.c:2354 ../src/sendmsg-window.c:2462
-#: ../src/sendmsg-window.c:4845
+#: ../src/sendmsg-window.c:2433 ../src/sendmsg-window.c:2543
+#: ../src/sendmsg-window.c:5023
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -5980,159 +6966,152 @@ msgstr ""
 "Viestin liittäminen epäonnistui\n"
 "Mahdollinen syy: ei tarpeeksi väliaikaistilaa"
 
-#: ../src/sendmsg-window.c:2684
+#: ../src/sendmsg-window.c:2797
 msgid "F_rom:"
 msgstr "_Lähettäjä:"
 
 #. Subject:
-#: ../src/sendmsg-window.c:2820
+#: ../src/sendmsg-window.c:2939
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
 #. fcc: mailbox folder where the message copy will be written to
-#: ../src/sendmsg-window.c:2834
+#: ../src/sendmsg-window.c:2950
 msgid "F_cc:"
 msgstr "F_cc:"
 
-#. Reply To:
-#: ../src/sendmsg-window.c:2866
-msgid "_Reply To:"
-msgstr "_Vastausosoite:"
-
 #. Attachment list
-#: ../src/sendmsg-window.c:2871
+#: ../src/sendmsg-window.c:2979
 msgid "_Attachments:"
 msgstr "_Liitteet:"
 
-#: ../src/sendmsg-window.c:2917
+#: ../src/sendmsg-window.c:3028
 msgid "Mode"
 msgstr "Tila"
 
-#: ../src/sendmsg-window.c:2940
-msgid "Description"
-msgstr "Kuvaus"
-
-#: ../src/sendmsg-window.c:3245
+#: ../src/sendmsg-window.c:3375
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "Liitettä ei voi tallentaa: %s"
 
-#: ../src/sendmsg-window.c:3266
+#: ../src/sendmsg-window.c:3399
 msgid "No subject"
 msgstr "Ei aihetta"
 
-#: ../src/sendmsg-window.c:3298
-#, c-format
-msgid "%s file \"%s\" (%s)"
+#: ../src/sendmsg-window.c:3432
+#, fuzzy, c-format
+#| msgid "%s file \"%s\" (%s)"
+msgid "inlined file \"%s\" (%s)"
 msgstr "%s tiedosto \"%s\" (%s)"
 
-#: ../src/sendmsg-window.c:3299 ../src/sendmsg-window.c:3303
-msgid "inlined"
-msgstr "sisäkkäinen"
+#: ../src/sendmsg-window.c:3435
+#, fuzzy, c-format
+#| msgid "%s file \"%s\" (%s)"
+msgid "attached file \"%s\" (%s)"
+msgstr "%s tiedosto \"%s\" (%s)"
 
-#: ../src/sendmsg-window.c:3299 ../src/sendmsg-window.c:3303
-msgid "attached"
-msgstr "liitetty"
+#: ../src/sendmsg-window.c:3439
+#, fuzzy, c-format
+#| msgid "signed parts"
+msgid "inlined %s part"
+msgstr "allekirjoitetut osat"
 
-#: ../src/sendmsg-window.c:3302
-#, c-format
-msgid "%s %s part"
-msgstr "%s %s-osa"
+#: ../src/sendmsg-window.c:3441
+#, fuzzy, c-format
+#| msgid "attached"
+msgid "attached %s part"
+msgstr "liitetty"
 
-#: ../src/sendmsg-window.c:3371
+#: ../src/sendmsg-window.c:3509
 #, c-format
 msgid "message from %s, subject \"%s\""
 msgstr "viesti lähettäjältä %s, aihe \"%s\""
 
-#: ../src/sendmsg-window.c:3501
+#: ../src/sendmsg-window.c:3636
 msgid "quoted"
 msgstr "lainattu"
 
-#: ../src/sendmsg-window.c:3506 ../src/sendmsg-window.c:3509
+#: ../src/sendmsg-window.c:3641 ../src/sendmsg-window.c:3644
 msgid "quoted attachment"
 msgstr "lainattu liite"
 
-#: ../src/sendmsg-window.c:3534
+#: ../src/sendmsg-window.c:3670
 msgid "Select parts for quotation"
 msgstr "Valitse lainattavat osat"
 
-#: ../src/sendmsg-window.c:3540
+#: ../src/sendmsg-window.c:3679
 msgid "Select the parts of the message which shall be quoted in the reply"
 msgstr "Valitse viestin osat, jotka lainataan vastattaessa"
 
-#: ../src/sendmsg-window.c:3677
+#: ../src/sendmsg-window.c:3821
 msgid "you"
 msgstr "sinä"
 
-#: ../src/sendmsg-window.c:3686
+#: ../src/sendmsg-window.c:3830
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------välitetty viesti osoitteesta %s------\n"
 
-#: ../src/sendmsg-window.c:3723
+#: ../src/sendmsg-window.c:3867
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "Message-ID: %s\n"
 
-#: ../src/sendmsg-window.c:3729
+#: ../src/sendmsg-window.c:3873
 msgid "References:"
 msgstr "Viittaukset:"
 
-#: ../src/sendmsg-window.c:3740
+#: ../src/sendmsg-window.c:3884
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "%s, %s kirjoitti:\n"
 
-#: ../src/sendmsg-window.c:3742
+#: ../src/sendmsg-window.c:3886
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s kirjoitti:\n"
 
-#: ../src/sendmsg-window.c:3850
+#: ../src/sendmsg-window.c:3996
 msgid "No signature found!"
 msgstr "Allekirjoitusta ei löydy!"
 
-#: ../src/sendmsg-window.c:4032
+#: ../src/sendmsg-window.c:4184
 msgid "Could not save message."
 msgstr "Viestin tallennus epäonnistui."
 
-#: ../src/sendmsg-window.c:4039
+#: ../src/sendmsg-window.c:4191
 #, c-format
 msgid "Could not open draftbox: %s"
 msgstr "Luonnoskansiota ei voi avata: %s"
 
-#: ../src/sendmsg-window.c:4060
+#: ../src/sendmsg-window.c:4216
 msgid "Message saved."
 msgstr "Viestin tallennettu."
 
-#: ../src/sendmsg-window.c:5008 ../src/sendmsg-window.c:5015
-#: ../src/sendmsg-window.c:5021 ../src/sendmsg-window.c:5027
-#: ../src/sendmsg-window.c:5050
+#: ../src/sendmsg-window.c:5203 ../src/sendmsg-window.c:5211
+#: ../src/sendmsg-window.c:5218 ../src/sendmsg-window.c:5225
+#: ../src/sendmsg-window.c:5249
 #, c-format
 msgid "Could not attach the file %s: %s."
 msgstr "Tiedostoa \"%s\" ei voi liittää: %s."
 
-#: ../src/sendmsg-window.c:5009
+#: ../src/sendmsg-window.c:5204
 msgid "not an absolute path"
 msgstr "ei absoluuttinen polku"
 
-#: ../src/sendmsg-window.c:5016
+#: ../src/sendmsg-window.c:5212
 msgid "not in your directory"
 msgstr "ei omassa kansiossasi"
 
-#: ../src/sendmsg-window.c:5022
+#: ../src/sendmsg-window.c:5219
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
-#: ../src/sendmsg-window.c:5028
-msgid "not a regular file"
-msgstr "ei ole tavallinen tiedosto"
-
-#: ../src/sendmsg-window.c:5051
+#: ../src/sendmsg-window.c:5250
 msgid "not in current directory"
 msgstr "ei nykyisessä kansiossa"
 
-#: ../src/sendmsg-window.c:5091
+#: ../src/sendmsg-window.c:5300
 msgid ""
 "The link that you selected created\n"
 "a \"Blind copy\" (Bcc) address.\n"
@@ -6142,101 +7121,121 @@ msgstr ""
 "Linkki, jonka valitsit, loi \"Sokea kopio\" (BCC) -osoitteen.\n"
 "Tarkista, että osoite on oikein."
 
-#: ../src/sendmsg-window.c:5171
+#: ../src/sendmsg-window.c:5384
 #, c-format
 msgid "Could not open the file %s.\n"
 msgstr "Tiedoston %s avaaminen ei onnistu.\n"
 
-#: ../src/sendmsg-window.c:5227
+#: ../src/sendmsg-window.c:5432
 msgid "Include file"
 msgstr "Sisällytä tiedosto"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:5439
+#: ../src/sendmsg-window.c:5618
 #, c-format
 msgid "Could not load Face header file %s: %s"
 msgstr "Otsikon kasvotiedostoa \"%s\" ei voi ladata: %s"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:5442
+#: ../src/sendmsg-window.c:5621
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "X-Face-otsikkotiedostoa \"%s\" ei voi ladata: %s"
 
-#: ../src/sendmsg-window.c:5522
-msgid "Message contains national (8-bit) characters"
-msgstr "Viesti sisältää kansallisia (8-bittisiä) merkkejä"
-
-#: ../src/sendmsg-window.c:5526
-msgid ""
-"Balsa will encode the message in UTF-8.\n"
-"Cancel the operation to choose a different language."
-msgstr ""
-"Viesti koodataan UTF-8-merkistöllä.\n"
-"Keskeytä toiminto, jos haluat valita toisen merkistön."
-
-#: ../src/sendmsg-window.c:5532
-msgid ""
-"<b><big>Message contains national (8-bit) characters.</big></b> Balsa will "
-"encode the message in UTF-8.\n"
-"Cancel the operation to choose a different language."
-msgstr ""
-"<b><big>Viesti sisältää kansallisia (8-bittisiä) merkkejä.</big></b> Balsa "
-"koodaa viestin UTF-8-merkistöllä.\n"
-"Keskeytä toiminto, jos haluat valita toisen kielen."
-
-#: ../src/sendmsg-window.c:5664
+#: ../src/sendmsg-window.c:5750
 msgid "You did not specify a subject for this message"
 msgstr "Viestille ei annettu aihetta"
 
-#: ../src/sendmsg-window.c:5665
+#: ../src/sendmsg-window.c:5751
 msgid "If you would like to provide one, enter it below."
 msgstr "Syötä se alle olevaan kenttään jos haluat."
 
-#: ../src/sendmsg-window.c:5706
+#: ../src/sendmsg-window.c:5801
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../src/sendmsg-window.c:5764
+#: ../src/sendmsg-window.c:5884
+#, c-format
+msgid ""
+"You did not select encryption for this message, although %s public keys are "
+"available for all recipients. In order to protect your privacy, the message "
+"could be %s encrypted."
+msgstr ""
+
+#: ../src/sendmsg-window.c:5911
+#, fuzzy
+#| msgid "encrypted: "
+msgid "Send _encrypted"
+msgstr "salattu:"
+
+#: ../src/sendmsg-window.c:5929
+#, fuzzy
+#| msgid "encrypted: "
+msgid "Send _unencrypted"
+msgstr "salattu:"
+
+#: ../src/sendmsg-window.c:5992
+#, fuzzy
+#| msgid "You did not specify a subject for this message"
+msgid "You selected OpenPGP security for this message.\n"
+msgstr "Viestille ei annettu aihetta"
+
+#: ../src/sendmsg-window.c:5997
+msgid ""
+"The message text will be sent as plain text and as HTML, but only the plain "
+"part can be signed.\n"
+msgstr ""
+
+#: ../src/sendmsg-window.c:6002
 msgid ""
-"You selected OpenPGP mode for a message with attachments. In this mode, only "
-"the first part will be signed and/or encrypted. You should select MIME mode "
-"if the complete message shall be protected. Do you really want to proceed?"
+"The message contains attachments, which cannot be signed or encrypted.\n"
+msgstr ""
+
+#: ../src/sendmsg-window.c:6006
+#, fuzzy
+#| msgid ""
+#| "You selected OpenPGP mode for a message with attachments. In this mode, "
+#| "only the first part will be signed and/or encrypted. You should select "
+#| "MIME mode if the complete message shall be protected. Do you really want "
+#| "to proceed?"
+msgid ""
+"You should select MIME mode if the complete message shall be protected. Do "
+"you really want to proceed?"
 msgstr ""
 "Valitsit OpenPGP-tilan viestille, jossa on liitteitä. Tässä tilassa vain "
 "viestin ensimmäinen osa allekirjoitetaan tai salataan. Valitse MIME-tila, "
 "jos haluat suojata koko viestin sisällön. Haluatko varmasti jatkaa?"
 
-#: ../src/sendmsg-window.c:5780
+#: ../src/sendmsg-window.c:6031
 #, c-format
 msgid "sending message with gpg mode %d"
 msgstr "lähetään viesti gpg-tilassa %d"
 
-#: ../src/sendmsg-window.c:5817
+#: ../src/sendmsg-window.c:6068
 msgid "Message could not be created"
 msgstr "Viestiä ei voi luoda"
 
-#: ../src/sendmsg-window.c:5819
+#: ../src/sendmsg-window.c:6070
 msgid "Message could not be queued in outbox"
 msgstr "Viestiä ei voi lisätä lähtevien kansioon"
 
-#: ../src/sendmsg-window.c:5821
+#: ../src/sendmsg-window.c:6072
 msgid "Message could not be saved in sentbox"
 msgstr "Viestiä ei voi tallentaa lähetettyjen kansioon"
 
-#: ../src/sendmsg-window.c:5823
+#: ../src/sendmsg-window.c:6074
 msgid "Message could not be sent"
 msgstr "Viestiä ei voi lähettää"
 
-#: ../src/sendmsg-window.c:5826
+#: ../src/sendmsg-window.c:6077
 msgid "Message could not be signed"
 msgstr "Viestiä ei voitu allekirjoittaa"
 
-#: ../src/sendmsg-window.c:5828
+#: ../src/sendmsg-window.c:6079
 msgid "Message could not be encrypted"
 msgstr "Viestiä ei voitu salata"
 
-#: ../src/sendmsg-window.c:5834
+#: ../src/sendmsg-window.c:6085
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -6245,147 +7244,207 @@ msgstr ""
 "Lähetys epäonnistui: %s\n"
 "%s"
 
-#: ../src/sendmsg-window.c:5839
+#: ../src/sendmsg-window.c:6090
 #, c-format
 msgid "Send failed: %s"
 msgstr "Lähetys epäonnistui: %s"
 
-#: ../src/sendmsg-window.c:5921 ../src/sendmsg-window.c:5940
-msgid "Could not postpone message."
+#: ../src/sendmsg-window.c:6181
+#, fuzzy, c-format
+#| msgid "Could not postpone message."
+msgid "Could not postpone message: %s"
 msgstr "Viestin lähetystä ei voi viivästää."
 
-#: ../src/sendmsg-window.c:5935
+#: ../src/sendmsg-window.c:6198
 msgid "Message postponed."
 msgstr "Viestin lähetys viivästetty."
 
-#: ../src/sendmsg-window.c:6096
+#: ../src/sendmsg-window.c:6203
+msgid "Could not postpone message."
+msgstr "Viestin lähetystä ei voi viivästää."
+
+#: ../src/sendmsg-window.c:6356
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Virhe käynnistettäessä oikolukijaa: %s"
 
-#: ../src/sendmsg-window.c:6254
+#: ../src/sendmsg-window.c:6523
 #, c-format
 msgid "Could not compile %s"
 msgstr "%s ei voi kääntää"
 
-#: ../src/sendmsg-window.c:6255
+#: ../src/sendmsg-window.c:6524
 msgid "Quoted Text Regular Expression"
 msgstr "Lainauksen säännöllinen lauseke"
 
-#: ../src/sendmsg-window.c:6744
+#: ../src/sendmsg-window.c:7031
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Vastaa osoitteeseen %s: %s"
 
-#: ../src/sendmsg-window.c:6749
+#: ../src/sendmsg-window.c:7036
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Välitä edelleen osoitteeseen %s: %s"
 
-#: ../src/sendmsg-window.c:6753
-#, c-format
-msgid "Continue message to %s: %s"
-msgstr "Jatka viestiä osoitteeseen %s: %s"
-
-#: ../src/sendmsg-window.c:6757
+#: ../src/sendmsg-window.c:7040
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Uusi viesti osoitteeseen %s: %s"
 
-#: ../src/spell-check.c:512 ../src/spell-check.c:516
+#: ../src/spell-check.c:509
+#, fuzzy
+#| msgid "Change..."
+msgid "_Change"
+msgstr "Muuta..."
+
+#: ../src/spell-check.c:511
 msgid "Replace the current word with the selected suggestion"
 msgstr "Korvaa sana ehdotuksella"
 
-#: ../src/spell-check.c:526 ../src/spell-check.c:530
+#: ../src/spell-check.c:516
+#, fuzzy
+#| msgid "Change..."
+msgid "Change _All"
+msgstr "Muuta..."
+
+#: ../src/spell-check.c:518
 msgid ""
 "Replace all occurrences of the current word with the selected suggestion"
 msgstr "Korvaa valitun sanan kaikki ilmentymät valitulla ehdotuksella"
 
-#: ../src/spell-check.c:544 ../src/spell-check.c:547
+#: ../src/spell-check.c:527
+msgid "_Ignore"
+msgstr ""
+
+#: ../src/spell-check.c:530
 msgid "Skip the current word"
 msgstr "Ohita sana"
 
-#: ../src/spell-check.c:555 ../src/spell-check.c:558
+#: ../src/spell-check.c:534
+msgid "Ignore A_ll"
+msgstr ""
+
+#: ../src/spell-check.c:536
 msgid "Skip all occurrences of the current word"
 msgstr "Ohita valitun sanan kaikki ilmentymät"
 
-#: ../src/spell-check.c:570 ../src/spell-check.c:573
+#: ../src/spell-check.c:542
+msgid "_Learn"
+msgstr ""
+
+#: ../src/spell-check.c:544
 msgid "Add the current word to your personal dictionary"
 msgstr "Lisää sana henkilökohtaiseen sanakirjaan"
 
-#: ../src/spell-check.c:583 ../src/spell-check.c:586
+#: ../src/spell-check.c:549
+msgid "_Done"
+msgstr ""
+
+#: ../src/spell-check.c:550
 msgid "Finish spell checking"
 msgstr "Lopeta oikoluku"
 
-#: ../src/spell-check.c:593 ../src/spell-check.c:596
+#: ../src/spell-check.c:555
 msgid "Revert all changes and finish spell checking"
 msgstr "Peruuta muutokset ja lopeta oikoluku"
 
-#: ../src/spell-check.c:628
+#: ../src/spell-check.c:584
 msgid "Spell check"
 msgstr "Oikoluku"
 
-#: ../src/store-address.c:106
+#: ../src/spell-check.c:862
+msgid "BalsaSpellCheck: Quoted text regular expression compilation failed\n"
+msgstr ""
+
+#: ../src/spell-check.c:986
+#, c-format
+msgid ""
+"BalsaSpellCheck: Learn operation failed;\n"
+"%s\n"
+msgstr ""
+
+#: ../src/spell-check.c:992
+msgid "BalsaSpellCheck: Learn operation failed.\n"
+msgstr ""
+
+#: ../src/spell-check.c:1191
+#, c-format
+msgid "BalsaSpellCheck: Suggest %s (%s)\n"
+msgstr ""
+
+#: ../src/spell-check.c:1293
+#, c-format
+msgid "BalsaSpellCheck: Pspell Error: %s\n"
+msgstr ""
+
+#: ../src/store-address.c:109
 msgid "Store address: no addresses"
 msgstr "Tallenna osoite: ei osoitteita"
 
-#: ../src/store-address.c:201
+#: ../src/store-address.c:204
 msgid "Store Address"
 msgstr "Tallenna osoite"
 
-#: ../src/store-address.c:219
+#: ../src/store-address.c:225
 msgid "Save this address and close the dialog?"
 msgstr "Tallenna tämä osoite ja sulje ikkuna?"
 
-#: ../src/store-address.c:237
+#: ../src/store-address.c:243
 msgid "No address book selected...."
 msgstr "Ei valittuja osoitekirjoja..."
 
-#: ../src/store-address.c:250
+#: ../src/store-address.c:256
 msgid "Address could not be written to this address book."
 msgstr "Osoitetta ei voida lisätä tähän osoitekirjaan."
 
-#: ../src/store-address.c:253
+#: ../src/store-address.c:259
 msgid "Address book could not be accessed."
 msgstr "Osoitekirjaa ei voi käyttää."
 
-#: ../src/store-address.c:255
+#: ../src/store-address.c:261
 msgid "This mail address is already in this address book."
 msgstr "Sähköpostiosoite on jo tässä osoitekirjassa."
 
-#: ../src/store-address.c:258
+#: ../src/store-address.c:264
 msgid "Unexpected address book error. Report it."
 msgstr "Odottamaton osoitekirjan virhe, ole hyvä ja raportoi se."
 
-#: ../src/store-address.c:274
+#: ../src/store-address.c:280
 msgid "Choose Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../src/store-address.c:313
+#: ../src/store-address.c:328
 msgid "Choose Address"
 msgstr "Valitse osoite"
 
-#: ../src/toolbar-factory.c:120
+#: ../src/toolbar-factory.c:133
 msgid "Separator"
 msgstr "Erotin"
 
-#: ../src/toolbar-factory.c:121
+#: ../src/toolbar-factory.c:134
+#, fuzzy
+#| msgid "_Quit"
+msgid "Quit"
+msgstr "_Lopeta"
+
+#: ../src/toolbar-factory.c:135
 msgid "Check"
 msgstr "Vastaanota"
 
-#: ../src/toolbar-factory.c:122
+#: ../src/toolbar-factory.c:136
 msgid "Compose"
 msgstr "Kirjoita"
 
-#: ../src/toolbar-factory.c:123
+#: ../src/toolbar-factory.c:137
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../src/toolbar-factory.c:124
+#: ../src/toolbar-factory.c:138
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../src/toolbar-factory.c:125
+#: ../src/toolbar-factory.c:139
 msgid ""
 "Reply\n"
 "to all"
@@ -6393,7 +7452,7 @@ msgstr ""
 "Vastaa \n"
 "kaikille"
 
-#: ../src/toolbar-factory.c:126
+#: ../src/toolbar-factory.c:140
 msgid ""
 "Reply\n"
 "to group"
@@ -6401,19 +7460,11 @@ msgstr ""
 "Vastaa\n"
 "kaikille"
 
-#: ../src/toolbar-factory.c:127
+#: ../src/toolbar-factory.c:141
 msgid "Forward"
 msgstr "Välitä"
 
-#: ../src/toolbar-factory.c:128
-msgid "Previous"
-msgstr "Edellinen"
-
-#: ../src/toolbar-factory.c:129
-msgid "Next"
-msgstr "Seuraava"
-
-#: ../src/toolbar-factory.c:130
+#: ../src/toolbar-factory.c:144
 msgid ""
 "Next\n"
 "unread"
@@ -6421,7 +7472,7 @@ msgstr ""
 "Seuraava \n"
 "lukematon"
 
-#: ../src/toolbar-factory.c:131
+#: ../src/toolbar-factory.c:145
 msgid ""
 "Next\n"
 "flagged"
@@ -6429,7 +7480,7 @@ msgstr ""
 "Seuraava\n"
 "liputettu"
 
-#: ../src/toolbar-factory.c:132
+#: ../src/toolbar-factory.c:146
 msgid ""
 "Previous\n"
 "part"
@@ -6437,7 +7488,7 @@ msgstr ""
 "Edellinen\n"
 "osa"
 
-#: ../src/toolbar-factory.c:133
+#: ../src/toolbar-factory.c:147
 msgid ""
 "Next\n"
 "part"
@@ -6445,7 +7496,7 @@ msgstr ""
 "Seuraava\n"
 "osa"
 
-#: ../src/toolbar-factory.c:134
+#: ../src/toolbar-factory.c:148
 msgid ""
 "Trash /\n"
 "Delete"
@@ -6453,39 +7504,45 @@ msgstr ""
 "Roskiin /\n"
 "Poista"
 
-#: ../src/toolbar-factory.c:135
+#: ../src/toolbar-factory.c:149
 msgid "Postpone"
 msgstr "Jatka myöhemmin"
 
-#: ../src/toolbar-factory.c:136
+#: ../src/toolbar-factory.c:150
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../src/toolbar-factory.c:137
+#: ../src/toolbar-factory.c:151
+msgid ""
+"Request\n"
+"MDN"
+msgstr ""
+
+#: ../src/toolbar-factory.c:152
 msgid "Send"
 msgstr "Lähetä"
 
-#: ../src/toolbar-factory.c:138
+#: ../src/toolbar-factory.c:153
 msgid "Exchange"
 msgstr "Hae ja lähetä viestit"
 
-#: ../src/toolbar-factory.c:139
+#: ../src/toolbar-factory.c:154
 msgid "Attach"
 msgstr "Liitä"
 
-#: ../src/toolbar-factory.c:140
+#: ../src/toolbar-factory.c:155
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/toolbar-factory.c:141
+#: ../src/toolbar-factory.c:156
 msgid "Identity"
 msgstr "Henkilöllisyys"
 
-#: ../src/toolbar-factory.c:143 ../src/toolbar-factory.c:148
+#: ../src/toolbar-factory.c:158
 msgid "Close"
 msgstr "Sulje"
 
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:159
 msgid ""
 "Toggle\n"
 "new"
@@ -6493,368 +7550,147 @@ msgstr ""
 "Merkitse\n"
 "uudeksi"
 
-#: ../src/toolbar-factory.c:145
+#: ../src/toolbar-factory.c:160
 msgid "Mark all"
 msgstr "Merkitse kaikki"
 
-#: ../src/toolbar-factory.c:147
-msgid "Empty Trash"
-msgstr "Tyhjennä roskat"
+#: ../src/toolbar-factory.c:162
+#, fuzzy
+#| msgid "_Reset Filter"
+msgid ""
+"Reset\n"
+"Filter"
+msgstr "Nollaa _suodatin"
 
-#: ../src/toolbar-factory.c:151
+#: ../src/toolbar-factory.c:165
 msgid "Sign"
 msgstr "Allekirjoita"
 
-#: ../src/toolbar-factory.c:152
+#: ../src/toolbar-factory.c:166
 msgid "Encrypt"
 msgstr "Salaa"
 
-#: ../src/toolbar-factory.c:154
+#: ../src/toolbar-factory.c:168
 msgid "Undo"
 msgstr "Peru"
 
-#: ../src/toolbar-factory.c:155
+#: ../src/toolbar-factory.c:169
 msgid "Redo"
 msgstr "Tee uudestaan"
 
-#: ../src/toolbar-factory.c:156
-msgid ""
-"Expunge\n"
-"Deleted"
+#: ../src/toolbar-factory.c:170
+#, fuzzy
+#| msgid ""
+#| "Expunge\n"
+#| "Deleted"
+msgid "Expunge"
 msgstr ""
 "Poista\n"
 "poistetut"
 
-#: ../src/toolbar-factory.c:287
+#: ../src/toolbar-factory.c:171
+#, fuzzy
+#| msgid "Empty Trash"
+msgid ""
+"Empty\n"
+"Trash"
+msgstr "Tyhjennä roskat"
+
+#: ../src/toolbar-factory.c:172
+#, fuzzy
+#| msgid "_Edit"
+msgid "Edit"
+msgstr "_Muokkaa"
+
+#: ../src/toolbar-factory.c:185
+msgid "Queue"
+msgstr "Laita jonoon"
+
+#: ../src/toolbar-factory.c:390
 #, c-format
 msgid "Unknown toolbar icon \"%s\""
 msgstr "Tuntematon työkalupalkin kuvake \"%s\""
 
-#: ../src/toolbar-factory.c:338
-msgid "Queue"
-msgstr "Laita jonoon"
+#: ../src/toolbar-factory.c:461
+msgid "Queue this message for sending"
+msgstr "Lisää viesti lähetysjonoon"
 
-#: ../src/toolbar-prefs.c:125
-msgid "Customize Toolbars"
+#: ../src/toolbar-factory.c:527
+msgid "Text Be_low Icons"
+msgstr ""
+
+#: ../src/toolbar-factory.c:528
+msgid "Priority Text Be_side Icons"
+msgstr ""
+
+#: ../src/toolbar-factory.c:530
+msgid "_Icons Only"
+msgstr ""
+
+#: ../src/toolbar-factory.c:531
+msgid "_Text Only"
+msgstr ""
+
+#: ../src/toolbar-factory.c:754
+#, c-format
+msgid "Use Desktop _Default (%s)"
+msgstr ""
+
+#: ../src/toolbar-factory.c:784
+#, fuzzy
+#| msgid "Customize Toolbars"
+msgid "_Customize Toolbars..."
 msgstr "Muokkaa työkalupalkkeja"
 
-#: ../src/toolbar-prefs.c:148
-msgid "Main window"
-msgstr "Pääikkuna"
+#: ../src/toolbar-prefs.c:138
+msgid "Customize Toolbars"
+msgstr "Muokkaa työkalupalkkeja"
 
-#: ../src/toolbar-prefs.c:154
+#: ../src/toolbar-prefs.c:175
 msgid "Compose window"
 msgstr "Kirjoitusikkuna"
 
-#: ../src/toolbar-prefs.c:160
-msgid "Message window"
-msgstr "Viesti-ikkuna"
-
-#: ../src/toolbar-prefs.c:162
+#: ../src/toolbar-prefs.c:184
 msgid "Toolbar options"
 msgstr "Työkalurivin asetukset"
 
-#: ../src/toolbar-prefs.c:172
+#: ../src/toolbar-prefs.c:193
 msgid "_Wrap button labels"
 msgstr "Rivitä _kuvatekstit"
 
-#: ../src/toolbar-prefs.c:370
+#: ../src/toolbar-prefs.c:408
 #, c-format
 msgid "Error displaying toolbar help: %s\n"
 msgstr "Virhe näytettäessä työkalupalkin ohjetta: %s\n"
 
 #. Preview display
-#: ../src/toolbar-prefs.c:405
+#: ../src/toolbar-prefs.c:444
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: ../src/toolbar-prefs.c:439
+#: ../src/toolbar-prefs.c:481
 msgid "_Restore toolbar to standard buttons"
 msgstr "_Palauta työkalupalkin oletuspainikkeet"
 
-#: ../src/toolbar-prefs.c:458
+#. Style button
+#: ../src/toolbar-prefs.c:485
+#, fuzzy
+#| msgid "_Toolbars..."
+msgid "Toolbar _style..."
+msgstr "_Työkalupalkit..."
+
+#: ../src/toolbar-prefs.c:502
 msgid "Available buttons"
 msgstr "Mahdolliset napit"
 
-#: ../src/toolbar-prefs.c:474
+#: ../src/toolbar-prefs.c:518
 msgid "Current toolbar"
 msgstr "Nykyinen työkalupalkki"
 
-#: ../src/toolbar-prefs.c:491
+#: ../src/toolbar-prefs.c:535
 msgid "Up"
 msgstr "Ylös"
 
-#: ../src/toolbar-prefs.c:507
+#: ../src/toolbar-prefs.c:551
 msgid "Down"
 msgstr "Alas"
-
-#~ msgid "_Toggle flag"
-#~ msgstr "Vaihtele _lippua"
-
-#~ msgid "_Hide messages"
-#~ msgstr "_Piilota viestit"
-
-#~ msgid "Mail_box"
-#~ msgstr "_Kansio"
-
-#~ msgid "_Message"
-#~ msgstr "_Viesti"
-
-#~ msgid "_Compress Mailbox"
-#~ msgstr "_Pakkaa kansio"
-
-#~ msgid "Mail_boxes"
-#~ msgstr "_Kansiot"
-
-#~ msgid "_Headers"
-#~ msgstr "_Otsikot"
-
-#~ msgid "_Sort Mailbox"
-#~ msgstr "_Järjestä kansio"
-
-#~ msgid "H_ide messages"
-#~ msgstr "P_iilota viestit"
-
-#~ msgid "_More"
-#~ msgstr "_Lisää"
-
-#~ msgid "_New..."
-#~ msgstr "_Uusi"
-
-#~ msgid "_Manage..."
-#~ msgstr "_Hallitse..."
-
-#~ msgid "_Select Filters"
-#~ msgstr "_Valitse suodattimet"
-
-#~ msgid "_Filters"
-#~ msgstr "_Suodattimet..."
-
-#~ msgid "_Tools"
-#~ msgstr "_Työkalurivi"
-
-#~ msgid "Reply to this message"
-#~ msgstr "Vastaa viestiin"
-
-#~ msgid "Reply to all recipients of this message"
-#~ msgstr "Vastaa viestin kaikille vastaanottajille."
-
-#~ msgid "Forward this message as attachment"
-#~ msgstr "Välitä tämä viesti liitetiedostona"
-
-#~ msgid "Forward inline..."
-#~ msgstr "Välitä viestissä..."
-
-#~ msgid "Forward this message inline"
-#~ msgstr "Välitä tämä viesti viestissä"
-
-#~ msgid "Next Part"
-#~ msgstr "Seuraava osa"
-
-#~ msgid "Previous Part"
-#~ msgstr "Edellinen osa"
-
-#~ msgid "Save current part in message"
-#~ msgstr "Tallenna viestin tämä osa"
-
-#~ msgid "_Next Message"
-#~ msgstr "_Seuraava viesti"
-
-#~ msgid "Next message"
-#~ msgstr "Seuraava viesti"
-
-#~ msgid "_Previous Message"
-#~ msgstr "_Edellinen viesti"
-
-#~ msgid "M_ove"
-#~ msgstr "_Siirrä"
-
-#~ msgid "_Show"
-#~ msgstr "_Näytä"
-
-#~ msgid "_Language"
-#~ msgstr "_Kieli"
-
-#~ msgid "_Options"
-#~ msgstr "_Asetukset"
-
-#~ msgid "Toggle Spell C_hecker"
-#~ msgstr "Käytä/Älä käytä _oikolukua"
-
-#~ msgid "Check for new email"
-#~ msgstr "Tarkista uudet viestit"
-
-#~ msgid "Continue message"
-#~ msgstr "Jatka viestiä"
-
-#~ msgid "Reply to all recipients"
-#~ msgstr "Vastaa kaikille vastaanottajille"
-
-#~ msgid "Open previous"
-#~ msgstr "Avaa edellinen"
-
-#~ msgid "Open next"
-#~ msgstr "Avaa seuraava"
-
-#~ msgid "Open next unread message"
-#~ msgstr "Avaa seuraava lukematon viesti"
-
-#~ msgid "Open next flagged message"
-#~ msgstr "Avaa seuraava liputettu viesti"
-
-#~ msgid "View previous part of message"
-#~ msgstr "Näytä viestin edellinen osa"
-
-#~ msgid "View next part of message"
-#~ msgstr "Näytä viestin seuraava osa"
-
-#~ msgid "Move the current message to trash"
-#~ msgstr "Siirrä valittu viesti roskiin"
-
-#~ msgid "Postpone current message"
-#~ msgstr "Jatka viestin lähetystä myöhemmin"
-
-#~ msgid "Add attachments to this message"
-#~ msgstr "Lisää liitetiedosto tähän viestiin"
-
-#~ msgid "Save the current item"
-#~ msgstr "Tallenna valittu kohde"
-
-#~ msgid "Set identity to use for this message"
-#~ msgstr "Aseta tässä viestissä käytettävä henkilöllisyys"
-
-#~ msgid "Toggle spell checker"
-#~ msgstr "Käytä/Älä käytä oikolukua"
-
-#~ msgid "Run a spell check"
-#~ msgstr "Suorita oikoluku"
-
-#~ msgid "Close the compose window"
-#~ msgstr "Sulje kirjoitusikkuna"
-
-#~ msgid "Toggle new message flag"
-#~ msgstr "Muuta viestin uutuus"
-
-#~ msgid "Mark all messages in current mailbox"
-#~ msgstr "Merkitse kaikki valitun kansion viestit"
-
-#~ msgid "Close current mailbox"
-#~ msgstr "Sulje kansio"
-
-#~ msgid "Sign message using GPG"
-#~ msgstr "Allekirjoita viesti digitaalisesti GPG:llä"
-
-#~ msgid "Encrypt message using GPG"
-#~ msgstr "Salaa viesti digitaalisesti GPG:llä"
-
-#~ msgid "Expunge messages marked as deleted"
-#~ msgstr "Poista pysyvästi viestit, jotka on merkitty poistetuiksi"
-
-#~ msgid "Queue this message for sending"
-#~ msgstr "Lisää viesti lähetysjonoon"
-
-#~ msgid "%s: signing failed: %s"
-#~ msgstr "%s: allekirjoitus epäonnistui: %s"
-
-#~ msgid "%s: signature verification failed: %s"
-#~ msgstr "%s: allekirjoituksen tarkistus epäonnistui: %s"
-
-#~ msgid "%s: signing and encryption failed: %s"
-#~ msgstr "%s: allekirjoitus ja salaus epäonnistui: %s"
-
-#~ msgid "%s: encryption failed: %s"
-#~ msgstr "%s: salaus epäonnistui: %s"
-
-#~ msgid "%s: decryption failed: %s"
-#~ msgstr "%s: salauksen purku epäonnistui: %s"
-
-#~ msgid "signing failed: %s"
-#~ msgstr "allekirjoitus epäonnistui: %s"
-
-#~ msgid "encryption failed: %s"
-#~ msgstr "salaus epäonnistui: %s"
-
-#~ msgid ""
-#~ "The message to '%s' was saved in Draftbox.\n"
-#~ "Remove message from Draftbox?"
-#~ msgstr ""
-#~ "Viesti henkilölle \"%s\" oli tallennettu luonnoksiin.\n"
-#~ "Poistetaanko viesti luonnoksista?"
-
-#~ msgid "_Expand aliases as you type"
-#~ msgstr "_Yritä arvata nimi kirjoittaessa"
-
-#~ msgid "Shown mailbox: %s with %d message, "
-#~ msgid_plural "Shown mailbox: %s with %d messages, "
-#~ msgstr[0] "Näkyvä kansio: %s - %d viesti, "
-#~ msgstr[1] "Näkyvä kansio: %s - %d viestiä, "
-
-#~ msgid ""
-#~ "\n"
-#~ "Subkey attributes:%s"
-#~ msgstr ""
-#~ "\n"
-#~ "Aliavaimen ominaisuudet:%s"
-
-#~ msgid "_Server"
-#~ msgstr "P_alvelin"
-
-#~ msgid "Failed to copy messages to mailbox \"%s\": %s"
-#~ msgstr "Viestejä ei voi kopioida kansioon \"%s\": %s"
-
-#~ msgid "Show address:"
-#~ msgstr "Näytä osoite:"
-
-#~ msgid "_From"
-#~ msgstr "_Lähettäjä"
-
-#~ msgid "Display"
-#~ msgstr "Ulkoasu"
-
-#~ msgid "Misc"
-#~ msgstr "Muut"
-
-#~ msgid "Local Mail"
-#~ msgstr "Paikallinen posti"
-
-#~ msgid "Encoding"
-#~ msgstr "Koodaus"
-
-#~ msgid "Message Subject Font"
-#~ msgstr "Viestin aiheen kirjasin"
-
-#~ msgid "Options"
-#~ msgstr "Asetukset"
-
-#~ msgid "Expand aliases"
-#~ msgstr "Ennusta nimet"
-
-#~ msgid "_Brazilian"
-#~ msgstr "_Brasilialainen"
-
-#~ msgid "C_heck spelling"
-#~ msgstr "Tarkista _oikeinkirjoitus"
-
-#~ msgid "Cannot connect to server"
-#~ msgstr "Palvelimeen ei voida ottaa yhteyttä"
-
-#~ msgid "Error loading face: %s"
-#~ msgstr "Virhe ladattaessa kasvokuvaa %s"
-
-#~ msgid "Could not create temporary file %s: "
-#~ msgstr "Väliaikaistiedostoa %s ei voi luoda: "
-
-#~ msgid "Could not get part: %s"
-#~ msgstr "Osaa ei voi hakea: %s"
-
-#~ msgid "Cannot read message"
-#~ msgstr "Viestiä ei voi lukea"
-
-#~ msgid "%s: could not get message stream."
-#~ msgstr "%s: ei voi avata viestivirtaa."
-
-#~ msgid "Error setting flags on messages in mailbox %s"
-#~ msgstr "Virhe asetettaessa viestien lippuja kansiossa %s"
-
-#~ msgid "POP3 mailbox %s temp mailbox error:\n"
-#~ msgstr "POP3-kansion %s tilapäinen virhe:\n"


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