[geary] Finnish translation update by Jiri Grönroos

[Ville-Pekka Vainio <vpv src gnome org>]

commit eaa0e5a0f1e14fa2573e3c846f46b7fcb7592975
Author: Ville-Pekka Vainio <vpvainio iki fi>
Date:   Sat Mar 1 20:11:56 2014 +0200

    Finnish translation update by Jiri Grönroos

 po/fi.po | 2505 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1337 insertions(+), 1168 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 81cd9fa..b6a15d0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,528 +4,467 @@
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
-# Jiri Grönroos <jiri gronroos iki fi>, 2012-2013
+# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012-2013, 2014.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2013-09-20 12:16-0700\n"
-"PO-Revision-Date: 2013-10-24 18:30+0000\n"
-"Last-Translator: Jiri Grönroos <jiri gronroos iki fi>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/geary/language/";
-"fi/)\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=geary&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-01-13 21:59+0000\n"
+"PO-Revision-Date: 2014-01-24 22:00+0200\n"
+"Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
+"Language-Team: suomi <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: Gtranslator 2.91.6\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Yhteysvirhe.\n"
+#: ../desktop/geary.desktop.in.h:1
+#| msgid "Geary Mail"
+msgid "Geary"
+msgstr "Geary"
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Sähköpostiosoite on jo lisätty Gearyyn.\n"
+#: ../desktop/geary.desktop.in.h:2
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Sähköpostisovellus"
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP-yhteysvirhe.\n"
+#: ../desktop/geary.desktop.in.h:3
+msgid "Geary Mail"
+msgstr "Geary-sähköposti"
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP-käyttäjätunnus tai -salasana on väärin.\n"
+#: ../desktop/geary.desktop.in.h:4
+msgid "Send and receive email"
+msgstr "Lähetä ja vastaanota sähköpostia"
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Virheellinen tilin nimi.\n"
+#: ../desktop/geary.desktop.in.h:5
+msgid "Email;E-mail;Mail;"
+msgstr "Email;E-mail;Mail;Sähköposti;Maili;"
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP-yhteysvirhe.\n"
+#: ../desktop/geary.desktop.in.h:6
+msgid "Compose Message"
+msgstr "Lähetä viesti"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP-käyttäjätunnus tai -salasana on väärin.\n"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Tallenna"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Käyttäjätunnus tai salasana on väärin.\n"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Lisää"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr " (Virheellinen?)"
+#. Sets min size.
+#: ../src/client/accounts/account-dialog.vala:19
+msgid "Accounts"
+msgstr "Tilit"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" on jo liitetty lähetystä varten."
+#. Copyright 2011-2013 Yorba Foundation
+#. *
+#. * This software is licensed under the GNU Lesser General Public License
+#. * (version 2.1 or later).  See the COPYING file in this distribution.
+#.
+#. Page for adding or editing an account.
+#. / Placeholder text indicating that the user should type their first name and last name
+#: ../src/client/accounts/add-edit-page.vala:10
+msgid "First Last"
+msgstr "Etunimi Sukunimi"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Kohdetta \"%s\" ei löytynyt."
+#: ../src/client/accounts/add-edit-page.vala:190
+msgid "Welcome to Geary."
+msgstr "Tervetuloa, käytössäsi on Geary."
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Kohteen \"%s\" avaus lukua varten epäonnistui."
+#: ../src/client/accounts/add-edit-page.vala:190
+msgid "Enter your account information to get started."
+msgstr "Anna tilisi tiedot, jotta voit aloittaa käytön."
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" on kansio."
+#: ../src/client/accounts/add-edit-page.vala:210
+msgid "2 weeks back"
+msgstr "2 viikkoa sitten"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" on tyhjä tiedosto."
+#. IDs are # of days
+#: ../src/client/accounts/add-edit-page.vala:211
+msgid "1 month back"
+msgstr "1 kuukausi sitten"
 
-#. / Date format that shows the weekday (Monday, Tuesday, ...)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:182
-#, c-format
-msgid "%A"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:212
+msgid "3 months back"
+msgstr "3 kuukautta sitten"
 
-#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:91
-msgid "%B %-e, %Y %-H:%M"
-msgstr "%-e. %Bta %Y, %-H:%M"
+#: ../src/client/accounts/add-edit-page.vala:213
+msgid "6 months back"
+msgstr "6 kuukautta sitten"
 
-#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:88
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%-e. %Bta %Y, %-l:%M %P"
+#: ../src/client/accounts/add-edit-page.vala:214
+msgid "1 year back"
+msgstr "1 vuosi sitten"
 
-#. / Verbose datetime format for the locale default (full month, day and time)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:94
-msgctxt "Default full date"
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%-e. %Bta %Y, %-l:%M %P"
+#. Separator
+#: ../src/client/accounts/add-edit-page.vala:216
+msgid "Everything"
+msgstr "Kaikki"
 
-#. / Datetime format for 24-hour time, i.e. 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:71
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../src/client/accounts/add-edit-page.vala:583
+msgid "Remem_ber passwords"
+msgstr "M_uista salasanat"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/engine/rfc822/rfc822-utils.vala:165
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:590 ../ui/login.glade.h:6
+msgid "Remem_ber password"
+msgstr "_Muista salasana"
 
-#. / Date format for dates within the current year, i.e. Nov 8
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:78
-msgid "%b %-e"
-msgstr "%-e. %b"
+#: ../src/client/accounts/add-edit-page.vala:619
+msgid "Unable to validate:\n"
+msgstr "Tarkistaminen epäonnistui:\n"
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d viesti"
-msgstr[1] "%d viestiä"
+#: ../src/client/accounts/add-edit-page.vala:621
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Virheellinen tilin nimi.\n"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d uusi viesti"
-msgstr[1] "%d uutta viestiä"
+#: ../src/client/accounts/add-edit-page.vala:624
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Sähköpostiosoite on jo lisätty Gearyyn.\n"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
-msgstr "%d tulosta"
+#: ../src/client/accounts/add-edit-page.vala:628
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP-yhteysvirhe.\n"
 
-#. / Label displaying number of unread email messages in a folder
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:37
-#, c-format
-msgid "%d unread"
-msgid_plural "%d unread"
-msgstr[0] "%d lukematon"
-msgstr[1] "%d lukematonta"
+#: ../src/client/accounts/add-edit-page.vala:631
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP-käyttäjätunnus tai -salasana on väärin.\n"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
-msgstr "%d t sitten"
+#: ../src/client/accounts/add-edit-page.vala:634
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP-yhteysvirhe.\n"
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr "%d min sitten"
+#: ../src/client/accounts/add-edit-page.vala:637
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP-käyttäjätunnus tai -salasana on väärin.\n"
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr "%i tulosta"
+#: ../src/client/accounts/add-edit-page.vala:641
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Yhteysvirhe.\n"
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
-msgstr "%i tulosta (yhteensä)"
+#: ../src/client/accounts/add-edit-page.vala:645
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Käyttäjätunnus tai salasana on väärin.\n"
 
-#. / Datetime format for 12-hour time, i.e. 8:31 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:68
-msgid "%l:%M %P"
-msgstr ""
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2013 Yorba Foundation"
+msgstr "Tekijänoikeus 2011-2013 Yorba Foundation"
 
-#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr ""
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Vieraile Yorban verkkosivustolla"
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d muu uusi viesti tilille %s)"
-msgstr[1] ""
-"%s\n"
-"(%d muuta uutta viestiä tilille %s)"
+#: ../src/client/application/geary-args.vala:10
+msgid "Output debugging information"
+msgstr ""
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../../src/client/composer/composer-window.vala:981
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Log conversation monitoring"
+msgstr "Lokita keskustelujen tarkkailu"
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log network deserialization"
 msgstr ""
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Uusia viestejä"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network activity"
+msgstr "Lokita verkkotoiminta"
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will be replaced by the original sender.
-#: ../../src/engine/rfc822/rfc822-utils.vala:178
-#, c-format
-msgid "%s wrote:"
-msgstr "%s kirjoitti:"
+#. / The IMAP replay queue is how changes on the server are replicated on the client.
+#. / It could also be called the IMAP events queue.
+#: ../src/client/application/geary-args.vala:16
+msgid "Log IMAP replay queue"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, %d uusi viesti yhteensä"
-msgstr[1] "%s, %d uutta viestiä yhteensä"
+#. / Serialization is how commands and responses are converted into a stream of bytes for
+#. / network transmission
+#: ../src/client/application/geary-args.vala:19
+msgid "Log network serialization"
+msgstr ""
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:43
-#, c-format
-msgid "%s, %s"
-msgstr "%s, %s"
+#: ../src/client/application/geary-args.vala:20
+msgid "Log periodic activity"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u keskustelua valittu."
+#: ../src/client/application/geary-args.vala:21
+msgid "Log database queries (generates lots of messages)"
+msgstr "Lokita tietokantaan kohdistuvat kyselyt (luo paljon viestejä)"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u luettua viestiä"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:23
+msgid "Log folder normalization"
+msgstr "Lokita kansioiden normalisointi"
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
+#: ../src/client/application/geary-args.vala:24
+msgid "Allow inspection of WebView"
+msgstr ""
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(ei aihetta)"
+#: ../src/client/application/geary-args.vala:25
+msgid "Display program version"
+msgstr "Näytä sovelluksen versio"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Edelleenlähetetty viesti ----------"
+#: ../src/client/application/geary-args.vala:47
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Kommentoi, ehdota uusia ideoita ja ilmoita vioista:"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 kuukausi sitten"
+#. i18n: Command line arguments are invalid
+#: ../src/client/application/geary-args.vala:54
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr "Komentorivivalintojen jäsennys epäonnistui: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 vuosi sitten"
+#: ../src/client/application/geary-args.vala:65
+#, c-format
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Tunnistamaton komentorivivalinta \"%s\"\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 viikkoa sitten"
+#: ../src/client/application/geary-controller.vala:44
+msgid "_Delete"
+msgstr "_Poista"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 kuukautta sitten"
+#: ../src/client/application/geary-controller.vala:45
+#| msgid "Delete conversation (Delete, Backspace, A)"
+msgid "Delete conversation (Shift+Delete)"
+msgstr "Poista keskustelu (Shift+Delete)"
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 kuukautta sitten"
+#: ../src/client/application/geary-controller.vala:46
+#| msgid "Delete conversations (Delete, Backspace, A)"
+msgid "Delete conversations (Shift+Delete)"
+msgstr "Poista keskustelut (Shift+Delete)"
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Haluatko varmasti poistaa tämän tilin?"
-"</span> "
+#: ../src/client/application/geary-controller.vala:49
+#| msgid "Trash"
+msgid "_Trash"
+msgstr "Siirr_ä roskakoriin"
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Tilin poistaminen epäonnistui</span> "
+#: ../src/client/application/geary-controller.vala:50
+#| msgid "Archive conversations (Delete, Backspace, A)"
+msgid "Move conversation to trash (Delete, Backspace)"
+msgstr "Siirrä keskustelu roskakoriin (Delete, Backspace)"
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Viestin lähetysikkuna tälle tilille on jo avoinna. Lähetä tai hylkää viesti, "
-"ja yritä sitten uudelleen."
+#: ../src/client/application/geary-controller.vala:51
+#| msgid "Archive conversations (Delete, Backspace, A)"
+msgid "Move conversations to trash (Delete, Backspace)"
+msgstr "Siirrä keskustelut roskakoriin (Delete, Backspace)"
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Tiedosto nimellä \"%s\" on jo olemassa.  Haluatko korvata sen?"
+#: ../src/client/application/geary-controller.vala:54
+msgid "_Archive"
+msgstr "_Arkistoi"
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "_Tilit"
+#: ../src/client/application/geary-controller.vala:55
+#| msgid "Move conversation"
+msgid "Archive conversation (A)"
+msgstr "Arkistoi keskustelu (A)"
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "Tietoja %ssta"
+#: ../src/client/application/geary-controller.vala:56
+#| msgid "Move conversations"
+msgid "Archive conversations (A)"
+msgstr "Arkistoi keskustelut (A)"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Tilit"
+#: ../src/client/application/geary-controller.vala:59
+msgid "Mark as S_pam"
+msgstr "Me_rkitse roskapostiksi"
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
-msgstr "Lisää tili"
+#: ../src/client/application/geary-controller.vala:60
+msgid "Mark as not S_pam"
+msgstr "Poista _roskapostimerkintä"
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr "Lisää tunniste"
+#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:272
+msgid "Mark conversation"
+msgstr "Merkitse keskustelu"
+
+#: ../src/client/application/geary-controller.vala:63
+msgid "Mark conversations"
+msgstr "Merkitse keskustelut"
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:64
 msgid "Add label to conversation"
 msgstr "Lisää tunniste keskusteluun"
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:65
 msgid "Add label to conversations"
 msgstr "Lisää tunniste keskusteluihin"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Kaikki"
-
-#: ../../ui/remove_confirm.glade:58
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Kaikki tähän tiliin liittyvä posti poistetaan koneeltasi. Mitään postia ei "
-"poisteta palvelimelta."
-
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:311
+msgid "Move conversation"
+msgstr "Siirrä keskustelu"
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr "Näytä aina lähettäjältä"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversations"
+msgstr "Siirrä keskustelut"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arkisto"
+#: ../src/client/application/geary-controller.vala:248
+msgid "A_ccounts"
+msgstr "_Tilit"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "Arkistoi keskustelu (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:253
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Asetukset"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "Arkistoi keskustelut (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:257
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Ohje"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Haluatko varmasti avata kohteen \"%s\"?"
+#: ../src/client/application/geary-controller.vala:261
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_Tietoja"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Liitetiedostot saattavat sisältää haitallista sisältöä.  Avaa liitteet "
-"ainoastaan, jos luotat niiden lähettäjään."
+#: ../src/client/application/geary-controller.vala:265
+msgid "_Donate"
+msgstr "La_hjoita"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Piilokopio:"
+#: ../src/client/application/geary-controller.vala:269
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_Lopeta"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "Lihavoitu (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:274
+msgid "_Mark as..."
+msgstr "_Merkitse..."
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "Vä_ri"
+#: ../src/client/application/geary-controller.vala:280
+msgid "Mark as _Read"
+msgstr "Merkitse _luetuksi"
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Liitteen lisäys epäonnistui"
+#: ../src/client/application/geary-controller.vala:286
+msgid "Mark as _Unread"
+msgstr "Merkitse l_ukemattomaksi"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Kopio:"
+#: ../src/client/application/geary-controller.vala:292
+msgid "_Star"
+msgstr "_Merkitse tähdellä"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Kopio: %s\n"
+#: ../src/client/application/geary-controller.vala:297
+msgid "U_nstar"
+msgstr "_Poista tähti"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Valitse tiedosto"
+#: ../src/client/application/geary-controller.vala:307
+msgid "Add label"
+msgstr "Lisää tunniste"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "_Jatka"
+#: ../src/client/application/geary-controller.vala:308
+msgid "_Label"
+msgstr "_Tunniste"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Lähetä viesti"
+#: ../src/client/application/geary-controller.vala:312
+msgid "_Move"
+msgstr "_Siirrä"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:316
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Kirjoita uusi viesti (Ctrl+N, N)"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Lähettäminen"
-
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Kopioi _sähköpostiosoite"
+#. Reply to a message.
+#: ../src/client/application/geary-controller.vala:320
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1549
+msgid "_Reply"
+msgstr "_Vastaa"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Kopioi _linkki"
+#: ../src/client/application/geary-controller.vala:321
+msgid "Reply (Ctrl+R, R)"
+msgstr "Vastaa (Ctrl+R, R)"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Tekijänoikeus 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:325
+msgid "R_eply All"
+msgstr "_Vastaa kaikille"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
-msgstr "_Leikkaa"
+#: ../src/client/application/geary-controller.vala:326
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr "Vastaa kaikille (Ctrl+Shift+R, Shift+R)"
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Päiväys:"
+#. Forward a message.
+#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1559
+msgid "_Forward"
+msgstr "_Lähetä edelleen"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Päiväys: %s\n"
+#: ../src/client/application/geary-controller.vala:332
+msgid "Forward (Ctrl+L, F)"
+msgstr "Lähetä edelleen (Ctrl+L, F)"
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "Poista keskustelu (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:615
+msgid "Your settings are insecure"
+msgstr "Asetuksesi eivät ole turvalliset"
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "Poista keskustelut (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:616
+msgid ""
+"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
+"username and password could be read by another person on the network.  Are "
+"you sure you want to do this?"
+msgstr ""
+"Käytössäsi olevat IMAP- ja/tai SMTP-asetukset eivät määritä salausasetuksesi "
+"SSL:ää tai TLS:ää. Tämä tarkoittaa, että käyttäjätunnuksesi ja salasanasi on "
+"mahdollista lukea verkkoliikenteestä. Haluatko varmasti sallia tämän?"
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Näytä sovelluksen versio"
+#: ../src/client/application/geary-controller.vala:617
+msgid "Co_ntinue"
+msgstr "_Jatka"
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "Haluatko hylätä tallentamattoman viestin?"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:689
+#: ../src/client/components/status-bar.vala:28
+msgid "Error sending email"
+msgstr "Virhe sähköpostia lähettäessä"
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
-msgstr "Haluatko hylätä tämän viestin?"
+#: ../src/client/application/geary-controller.vala:690
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
+msgstr ""
+"Geary kohtasi virheen viestiä lähettäessä. Jos ongelma toistuu, poista käsin "
+"kyseinen viesti Lähtevät-kansiosta."
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "_Älä kysy uudelleen"
+#: ../src/client/application/geary-controller.vala:753
+msgid "Labels"
+msgstr "Tunnisteet"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Luonnokset"
+#. give the user two options: reset the Account local store, or exit Geary.  A third
+#. could be done to leave the Account in an unopened state, but we don't currently
+#. have provisions for that.
+#: ../src/client/application/geary-controller.vala:765
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "Kohteen %s tietokannan avaaminen epäonnistui"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Pudota tiedostot tähän"
+#: ../src/client/application/geary-controller.vala:766
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronize with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
+msgstr ""
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr "_Sähköpostiosoite:"
+#: ../src/client/application/geary-controller.vala:768
+msgid "_Rebuild"
+msgstr "Ra_kenna uudelleen"
 
-#: ../../src/client/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:768
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
-msgstr "Muokkaa luonnosta"
-
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
-msgstr "Muokkaa tiliä"
-
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Sähköpostiosoite:"
-
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;Sähköposti;Maili;"
-
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "_Käytä oikolukua"
-
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "Sala_us:"
-
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Salau_s:"
-
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Anna tilisi tiedot, jotta voit aloittaa käytön."
+#: ../src/client/application/geary-controller.vala:777
+#, c-format
+msgid "Unable to rebuild database for \"%s\""
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
+#: ../src/client/application/geary-controller.vala:778
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -536,1003 +475,1233 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Virhe tallentaessa"
-
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../../src/client/geary-controller.vala:625
-#: ../../src/client/ui/status-bar.vala:28
-msgid "Error sending email"
-msgstr "Virhe sähköpostia lähettäessä"
-
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "Kaikki"
-
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "Oletustekstimuokkaimen avaus epäonnistui."
-
-#: ../../src/client/geary-args.vala:54
+#. some other problem opening the account ... as with other flow path, can't run
+#. Geary today with an account in unopened state, so have to exit
+#: ../src/client/application/geary-controller.vala:800
+#: ../src/client/application/geary-controller.vala:810
+#: ../src/client/application/geary-controller.vala:821
 #, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Komentorivivalintojen jäsennys epäonnistui: %s\n"
-
-#. / Placeholder text indicating that the user should type their first name and last name
-#: ../../src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
-msgstr "Etunimi Sukunimi"
+msgid "Unable to open local mailbox for %s"
+msgstr ""
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-msgstr "Tasalevyinen"
+#: ../src/client/application/geary-controller.vala:801
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to a file permissions problem.\n"
+"\n"
+"Please check that you have read/write permissions for all files in this "
+"directory:\n"
+"\n"
+"%s"
+msgstr ""
+"Tämän tilin paikallista viestitietokantaa avattaessa tapahtui virhe. Se "
+"johtuu mitä luultavimmin puutteellisista käyttöoikeuksista.\n"
+"\n"
+"Varmista, että sinulla on luku- ja kirjoitusoikeus kaikkiin tiedostoihin "
+"seuraavassa kansiossa:\n"
+"\n"
+"%s"
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
-msgstr "Lähetä edelleen (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:811
+msgid ""
+"The version number of the local mail database is formatted for a newer "
+"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
+"work with this version of Geary.\n"
+"\n"
+"Please install the latest version of Geary and try again."
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "Lähettäjä:"
+#: ../src/client/application/geary-controller.vala:822
+msgid ""
+"There was an error opening the local account. This is probably due to "
+"connectivity issues.\n"
+"\n"
+"Please check your network connection and restart Geary."
+msgstr ""
+"Paikallista tiliä avattaessa tapahtui virhe. Se johtuu luultavasti verkko-"
+"ongelmista.\n"
+"\n"
+"Tarkista yhteyden tila ja käynnistä Geary uudelleen."
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
+#: ../src/client/application/geary-controller.vala:1292
 #, c-format
-msgid "From: %s\n"
-msgstr "Lähettäjä: %s\n"
+msgid "About %s"
+msgstr "Tietoja %ssta"
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "Gt"
+#. / Translators: add your name and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <yamada taro example com>
+#: ../src/client/application/geary-controller.vala:1295
+msgid "translator-credits"
+msgstr "Jiri Grönroos"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary-sähköposti"
+#: ../src/client/application/geary-controller.vala:1552
+#, c-format
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Haluatko varmasti avata kohteen \"%s\"?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:1553
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
 msgstr ""
-"Geary kohtasi virheen viestiä lähettäessä. Jos ongelma toistuu, poista käsin "
-"kyseinen viesti Lähtevät-kansiosta."
+"Liitetiedostot saattavat sisältää haitallista sisältöä.  Avaa liitteet "
+"ainoastaan, jos luotat niiden lähettäjään."
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr "Yleiset"
+#: ../src/client/application/geary-controller.vala:1554
+msgid "Don't _ask me again"
+msgstr "_Älä kysy uudelleen"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:1572
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "Tiedosto nimellä \"%s\" on jo olemassa.  Haluatko korvata sen?"
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "IMAP-tunnukset"
+#: ../src/client/application/geary-controller.vala:1574
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+"Tiedosto on jo olemassa kohteessa \"%s\".  Tiedoston korvaaminen korvaa "
+"nykyisen tiedoston sisällön."
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
-msgstr "IMAP-salasana"
+#: ../src/client/application/geary-controller.vala:1577
+msgid "_Replace"
+msgstr "_Korvaa"
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "IMAP-asetukset"
+#: ../src/client/components/conversation-find-bar.vala:214
+#, c-format
+#| msgid "%i matches"
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i tulos"
+msgstr[1] "%i tulosta"
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
-msgstr "IMAP-käyttäjätunnus"
+#: ../src/client/components/conversation-find-bar.vala:216
+#, c-format
+#| msgid "%i matches (wrapped)"
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i tulos (yhteensä)"
+msgstr[1] "%i tulosta (yhteensä)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Tärkeä"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "ei löytynyt"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Saapuneet"
+#: ../src/client/components/main-toolbar.vala:11
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "Etsi"
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr ""
+#. Spacer.
+#. Search bar.
+#: ../src/client/components/main-toolbar.vala:84
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Etsi hakusanoilla kaikista tilin sähköpostiviesteistä (Ctrl+S)"
 
-#: ../../src/client/ui/main-toolbar.vala:163
+#: ../src/client/components/main-toolbar.vala:205
 #, c-format
 msgid "Indexing %s account"
 msgstr "Indeksoidaan tiliä %s"
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "Kursivoitu (Ctrl+I)"
-
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "kt"
-
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Tunnisteet"
-
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr "_Suuri"
+#: ../src/client/components/main-toolbar.vala:212
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#, c-format
+msgid "Search %s account"
+msgstr "Etsi tililtä %s"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Suuri"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:25
+msgid "Sending..."
+msgstr "Lähetetään..."
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "Linkki (Ctrl+L)"
+#: ../src/client/components/stock.vala:18
+#: ../ui/account_cannot_remove.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: ../../src/client/geary-args.vala:16
-msgid "Log IMAP replay queue"
-msgstr ""
+#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
+msgid "_Cancel"
+msgstr "_Peru"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Lokita keskustelujen tarkkailu"
+#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
+#: ../ui/composer.glade.h:46 ../ui/preferences.glade.h:1
+msgid "_Close"
+msgstr "_Sulje"
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "Lokita tietokantaan kohdistuvat kyselyt (luo paljon viestejä)"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Hylkää"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "Lokita kansioiden normalisointi"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Avaa"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Lokita verkkotoiminta"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Tulosta..."
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr ""
+#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
+msgid "_Remove"
+msgstr "_Poista"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../../src/client/geary-args.vala:19
-msgid "Log network serialization"
-msgstr ""
+#. Select all.
+#: ../src/client/components/stock.vala:32
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1018
+msgid "Select _All"
+msgstr "Valitse _kaikki"
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr ""
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "Säil_ytä"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "Mt"
+#: ../src/client/composer/composer-window.vala:40
+msgid "New Message"
+msgstr "Uusi viesti"
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Sähköpostisovellus"
+#: ../src/client/composer/composer-window.vala:41
+msgid "Saved"
+msgstr "Tallennettu"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
-msgstr "Merkitse lukemattomaksi tästä e_delleen"
+#: ../src/client/composer/composer-window.vala:42
+msgid "Saving"
+msgstr "Tallennetaan"
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr "Me_rkitse roskapostiksi"
+#: ../src/client/composer/composer-window.vala:43
+msgid "Error saving"
+msgstr "Virhe tallentaessa"
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr "Merkitse _luetuksi"
+#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
+#: ../src/client/composer/composer-window.vala:95
+msgid "attach|enclosed|enclosing|cover letter"
+msgstr ""
+"attach|enclosed|enclosing|cover letter|liite|tiedosto|liitteenä|liitetiedosto"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr "Merkitse l_ukemattomaksi"
+#: ../src/client/composer/composer-window.vala:681
+msgid "Do you want to discard the unsaved message?"
+msgstr "Haluatko hylätä tallentamattoman viestin?"
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr "Poista _roskapostimerkintä"
+#: ../src/client/composer/composer-window.vala:684
+msgid "Do you want to discard this message?"
+msgstr "Haluatko hylätä tämän viestin?"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "Merkitse keskustelu"
+#: ../src/client/composer/composer-window.vala:761
+msgid "Send message with an empty subject and body?"
+msgstr "Lähetetäänkö viesti ilman aihetta ja sisältöä?"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "Merkitse keskustelut"
+#: ../src/client/composer/composer-window.vala:763
+msgid "Send message with an empty subject?"
+msgstr "Lähetetäänkö viesti ilman aihetta?"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Minä"
+#: ../src/client/composer/composer-window.vala:765
+msgid "Send message with an empty body?"
+msgstr "Lähetetäänkö viesti ilman sisältöä?"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Normaali"
+#: ../src/client/composer/composer-window.vala:767
+msgid "Send message without an attachment?"
+msgstr "Lähetetäänkö viesti ilman liitettä?"
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr "Lisää valintoja"
+#: ../src/client/composer/composer-window.vala:950
+msgid "Cannot add attachment"
+msgstr "Liitteen lisäys epäonnistui"
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "Siirrä keskustelu"
+#: ../src/client/composer/composer-window.vala:961
+#, c-format
+msgid "\"%s\" could not be found."
+msgstr "Kohdetta \"%s\" ei löytynyt."
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "Siirrä keskustelut"
+#: ../src/client/composer/composer-window.vala:968
+#, c-format
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" on kansio."
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "_Nimi:"
+#: ../src/client/composer/composer-window.vala:975
+#, c-format
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" on tyhjä tiedosto."
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "K_utsumanimi:"
+#: ../src/client/composer/composer-window.vala:989
+#, c-format
+msgid "\"%s\" could not be opened for reading."
+msgstr "Kohteen \"%s\" avaus lukua varten epäonnistui."
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Uusi viesti"
+#: ../src/client/composer/composer-window.vala:996
+#, c-format
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" on jo liitetty lähetystä varten."
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Kutsumanimi:"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-window.vala:1005
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "Tunnistautumista ei _vaadita"
+#: ../src/client/composer/composer-window.vala:1267
+msgid "Select Color"
+msgstr "Valitse väri"
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
-msgstr "Kansio ei sisällä keskusteluja."
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Minä"
 
-#: ../../src/client/views/conversation-viewer.vala:244
+#: ../src/client/conversation-viewer/conversation-viewer.vala:254
 msgid "No conversations selected."
 msgstr "Keskusteluja ei ole valittu."
 
-#: ../../src/client/views/conversation-viewer.vala:273
+#: ../src/client/conversation-viewer/conversation-viewer.vala:256
+#, c-format
+#| msgid "%u conversations selected."
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u keskustelu valittu."
+msgstr[1] "%u keskustelua valittu."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:285
 msgid "No search results found."
 msgstr "Hakutuloksia ei löytynyt."
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "Ei mitään"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:287
+msgid "No conversations in folder."
+msgstr "Kansio ei sisällä keskusteluja."
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Ilmoitukset"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:526
+msgid "This message contains remote images."
+msgstr "Tämä viesti sisältää etäkuvia."
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Nyt"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:526
+msgid "Show Images"
+msgstr "Näytä kuvat"
 
-#. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: ../../src/engine/rfc822/rfc822-utils.vala:171
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s %2$s kirjoitti:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+msgid "Always Show From Sender"
+msgstr "Näytä aina lähettäjältä"
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: ../../src/engine/rfc822/rfc822-utils.vala:184
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:551
+msgid "Edit Draft"
+msgstr "Muokkaa luonnosta"
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Avaa"
+#. Geary account mail will be sent from
+#: ../src/client/conversation-viewer/conversation-viewer.vala:623
+#: ../ui/composer.glade.h:41
+msgid "From:"
+msgstr "Lähettäjä:"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Muu"
+#. Address(es) e-mail is to be sent to
+#: ../src/client/conversation-viewer/conversation-viewer.vala:626
+#: ../ui/composer.glade.h:36
+msgid "To:"
+msgstr "Vastaanottaja:"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Lähetetyt"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:629
+#: ../ui/composer.glade.h:37
+msgid "Cc:"
+msgstr "Kopio:"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:632
+#: ../ui/composer.glade.h:39
+msgid "Bcc:"
+msgstr "Piilokopio:"
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:635
+#: ../ui/composer.glade.h:38
+msgid "Subject:"
+msgstr "Aihe:"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "P_ortti:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:638
+msgid "Date:"
+msgstr "Päiväys:"
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "_Salasana:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:845
+#, c-format
+#| msgid "%u read messages"
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u luettu viesti"
+msgstr[1] "%u luettua viestiä"
+
+#. Add a menu item for copying the current selection.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:991
+#: ../ui/composer.glade.h:4
+msgid "_Copy"
+msgstr "_Kopioi"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr "Salasana"
+#. Add a menu item for copying the address.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:999
+msgid "Copy _Email Address"
+msgstr "Kopioi _sähköpostiosoite"
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Salasana:"
+#. Add a menu item for copying the link.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1004
+#: ../ui/composer.glade.h:17
+msgid "Copy _Link"
+msgstr "Kopioi _linkki"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr "Lii_tä muotoilujen kera"
+#. Select message.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1012
+msgid "Select _Message"
+msgstr "_Valitse viesti"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Anna sähköpostitilisi salasana"
+#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1024
+msgid "_Inspect"
+msgstr "T_utki"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Kommentoi, ehdota uusia ideoita ja ilmoita vioista:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1249
+msgid "This link appears to go to"
+msgstr "Tämä linkki vaikuttaa johtavan kohteeseen"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Odota hetki, Geary tarkistaa tiliäsi."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1250
+msgid "but actually goes to"
+msgstr "mutta viekin kohteeseen"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "Portt_i:"
+#. If href doesn't look like a URL, something is fishy, so warn the user
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid " (Invalid?)"
+msgstr " (Virheellinen?)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1497
+msgid "_Save As..."
+msgstr "_Tallenna nimellä..."
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Portti:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1502
+msgid "Save All A_ttachments..."
+msgstr "_Tallenna kaikki liitteet"
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr "Lainaa tekstiä (Ctrl+])"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1516
+msgid "_Save Image As..."
+msgstr "T_allenna kuva nimellä..."
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1539
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "_Tallenna liite"
+msgstr[1] "_Tallenna liitteet"
+
+#. Reply to all on a message.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1554
+msgid "Reply to _All"
 msgstr "_Vastaa kaikille"
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Lukeminen"
+#. Mark as read/unread.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1571
+msgid "_Mark as Read"
+msgstr "_Merkitse luetuksi"
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Oikea nimi:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1575
+msgid "_Mark as Unread"
+msgstr "_Merkitse lukemattomaksi"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
-msgstr "_Muista salasana"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1581
+msgid "Mark Unread From _Here"
+msgstr "Merkitse lukemattomaksi tästä e_delleen"
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
-msgstr "M_uista salasanat"
+#. Separator.
+#. View original message source.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1596
+msgid "_View Source"
+msgstr "Näytä lä_hde"
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr "Poista tili"
+#. Generate the attachment table.
+#. / Placeholder filename for attachments with no filename.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1901
+#: ../src/engine/rfc822/rfc822-utils.vala:327
+msgid "none"
+msgstr "ei mitään"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Poista muotoilu (Ctrl+Space)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2031
+msgid "Failed to open default text editor."
+msgstr "Oletustekstimuokkaimen avaus epäonnistui."
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
-msgstr "Vastaa (Ctrl+R, R)"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:293
+#, c-format
+msgid "%s - Conversation Inspector"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Vastaa kaikille (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Valitse tiedosto"
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "_Vastaa kaikille"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Liitä"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "SMTP-tunnukset"
+#. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
+#. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
+#. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
+#: ../src/client/dialogs/password-dialog.vala:16
+#| msgid "Please enter your email password"
+msgid "Please enter your password"
+msgstr "Anna salasana"
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr "SMTP-salasana"
+#. Label displaying total number of email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:30
+#, c-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d viesti"
+msgstr[1] "%d viestiä"
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "SMTP-asetukset"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:37
+#, c-format
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d lukematon"
+msgstr[1] "%d lukematonta"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
-msgstr "SMTP-käyttäjätunnus"
+#. / This string represents the divider between two messages: "n messages" and "n unread",
+#. / shown in the folder list as a tooltip.  Please use your languages conventions for
+#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:43
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS-salaus:"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#, c-format
+#| msgid "%d results"
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d tulos"
+msgstr[1] "%d tulosta"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ../src/client/notification/libmessagingmenu.vala:75
+#, c-format
+msgid "%s - New Messages"
+msgstr "%s - Uusia viestejä"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
-msgstr "_Päätteetön"
+#: ../src/client/notification/libnotify.vala:72
+#, c-format
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d uusi viesti"
+msgstr[1] "%d uutta viestiä"
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
-msgstr "P_äätteellinen"
+#: ../src/client/notification/libnotify.vala:75
+#, c-format
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d uusi viesti yhteensä"
+msgstr[1] "%s, %d uutta viestiä yhteensä"
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
-msgstr "_Palvelu:"
+#: ../src/client/notification/libnotify.vala:107
+#, c-format
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d muu uusi viesti tilille %s)"
+msgstr[1] ""
+"%s\n"
+"(%d muuta uutta viestiä tilille %s)"
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Päätteetön"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Avaa"
 
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "_Tallenna liite"
-msgstr[1] "_Tallenna liitteet"
+#. / Datetime format for 12-hour time, i.e. 8:31 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:68
+msgid "%l:%M %P"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "_Tallenna kaikki liitteet"
+#. / Datetime format for 24-hour time, i.e. 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:71
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Tallennettu"
+#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:74
+msgctxt "Default clock format"
+msgid "%l:%M %P"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Tallennetaan"
+#. / Date format for dates within the current year, i.e. Nov 8
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:78
+msgid "%b %-e"
+msgstr "%-e. %b"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "P_alvelin:"
+#. / Date format for dates within a different year, i.e. 02/04/10
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:83
+#, no-c-format
+msgid "%x"
+msgstr "%x"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../../src/client/ui/main-toolbar.vala:10
-#: ../../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Etsi"
+#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:88
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%-e. %Bta %Y, %-l:%M %P"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
-msgstr "Etsi tililtä %s"
+#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:91
+msgid "%B %-e, %Y %-H:%M"
+msgstr "%-e. %Bta %Y, %-H:%M"
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Etsi hakusanoilla kaikista tilin sähköpostiviesteistä (Ctrl+S)"
+#. / Verbose datetime format for the locale default (full month, day and time)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:94
+msgctxt "Default full date"
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%-e. %Bta %Y, %-l:%M %P"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "Valitse väri"
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Nyt"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Valitse _kaikki"
+#: ../src/client/util/util-date.vala:167
+#, c-format
+#| msgid "%dm ago"
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%d min sitten"
+msgstr[1] "%d min sitten"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr "_Valitse viesti"
+#: ../src/client/util/util-date.vala:170
+#, c-format
+#| msgid "%dh ago"
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%d t sitten"
+msgstr[1] "%d t sitten"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Lähetä ja vastaanota sähköpostia"
+#: ../src/client/util/util-date.vala:177
+msgid "Yesterday"
+msgstr "Eilen"
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr "Lähetetäänkö viesti ilman sisältöä?"
+#. / Date format that shows the weekday (Monday, Tuesday, ...)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:182
+#, c-format
+msgid "%A"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
-msgstr "Lähetetäänkö viesti ilman aihetta ja sisältöä?"
+#: ../src/client/util/util-email.vala:30
+#: ../src/engine/rfc822/rfc822-message.vala:734
+msgid "(no subject)"
+msgstr "(ei aihetta)"
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
-msgstr "Lähetetäänkö viesti ilman aihetta?"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "tavua"
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
-msgstr "Lähetetäänkö viesti ilman liitettä?"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "Tt"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
-msgid "Sending..."
-msgstr "Lähetetään..."
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "Gt"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Lähetetyt"
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "Mt"
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Pal_velin:"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "kt"
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Päätteellinen"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Palvelin:"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Palvelu:"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr "Näytä kuvat"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Muu"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "_Näytä ilmoitus uuden viestin saapuessa"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Saapuneet"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Pieni"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Luonnokset"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Roskaposti"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Lähetetyt"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
+#: ../src/engine/api/geary-special-folder-type.vala:33
 msgid "Starred"
 msgstr "Tähdelliset"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "Varastointi"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Tärkeä"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Yliviivattu (Ctrl+K)"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Kaikki"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Aihe:"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Roskaposti"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Aihe: %s\n"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Roskakori"
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "Tt"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Lähetetyt"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arkisto"
+
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:24
+msgid "None"
+msgstr "Ei mitään"
+
+#. Map of user-supplied search field names to column names.
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.
+#: ../src/engine/imap-db/imap-db-account.vala:632
+#, fuzzy
+#| msgid "Save A_ttachment..."
+#| msgid_plural "Save All A_ttachments..."
+msgid "attachment"
+msgstr "_Tallenna liite"
+
+#. / Can be typed in the search box like bcc:johndoe example com to find
+#. / messages bcc'd to a particular person.
+#: ../src/engine/imap-db/imap-db-account.vala:635
+msgid "bcc"
 msgstr ""
-"Tiedosto on jo olemassa kohteessa \"%s\".  Tiedoston korvaaminen korvaa "
-"nykyisen tiedoston sisällön."
 
-#: ../../src/client/geary-controller.vala:747
-msgid ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.
+#: ../src/engine/imap-db/imap-db-account.vala:638
+msgid "body"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:758
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
+#. / Can be typed in the search box like cc:johndoe example com to find
+#. / messages cc'd to a particular person.
+#: ../src/engine/imap-db/imap-db-account.vala:641
+#, fuzzy
+#| msgid "Bcc:"
+msgid "cc"
+msgstr "Piilokopio:"
+
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.
+#: ../src/engine/imap-db/imap-db-account.vala:644
+msgid "from"
 msgstr ""
-"Paikallista tiliä avattaessa tapahtui virhe. Se johtuu luultavasti verkko-"
-"ongelmista.\n"
-"\n"
-"Tarkista yhteyden tila ja käynnistä Geary uudelleen."
 
-#: ../../src/client/geary-controller.vala:737
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.
+#: ../src/engine/imap-db/imap-db-account.vala:647
+#, fuzzy
+#| msgid "Subject:"
+msgid "subject"
+msgstr "Aihe:"
+
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.
+#: ../src/engine/imap-db/imap-db-account.vala:650
+msgid "to"
 msgstr ""
-"Tämän tilin paikallista viestitietokantaa avattaessa tapahtui virhe. Se "
-"johtuu mitä luultavimmin puutteellisista käyttöoikeuksista.\n"
-"\n"
-"Varmista, että sinulla on luku- ja kirjoitusoikeus kaikkiin tiedostoihin "
-"seuraavassa kansiossa:\n"
-"\n"
-"%s"
 
-#: ../../src/client/geary-controller.vala:702
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronize with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
+#. / Format for the datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/engine/rfc822/rfc822-utils.vala:165
+msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
-msgstr "Tämä linkki vaikuttaa johtavan kohteeseen"
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: ../src/engine/rfc822/rfc822-utils.vala:171
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s %2$s kirjoitti:"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
-msgstr "Tämä viesti sisältää etäkuvia."
+#. / The quoted header for a message being replied to (in case the date is not known).
+#. / %s will be replaced by the original sender.
+#: ../src/engine/rfc822/rfc822-utils.vala:178
+#, c-format
+msgid "%s wrote:"
+msgstr "%s kirjoitti:"
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "lisätäksesi ne liitteiksi"
+#. / The quoted header for a message being replied to (in case the sender is not known).
+#. / %s will be replaced by the original date
+#: ../src/engine/rfc822/rfc822-utils.vala:184
+#, c-format
+msgid "On %s:"
+msgstr "%s:"
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "Vastaanottaja:"
+#: ../src/engine/rfc822/rfc822-utils.vala:211
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Edelleenlähetetty viesti ----------"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
+#: ../src/engine/rfc822/rfc822-utils.vala:215
 #, c-format
-msgid "To: %s\n"
-msgstr "Vastaanottaja: %s\n"
-
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Roskakori"
+msgid "From: %s\n"
+msgstr "Lähettäjä: %s\n"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "_Poista tähti"
+#: ../src/engine/rfc822/rfc822-utils.vala:216
+#, c-format
+msgid "Subject: %s\n"
+msgstr "Aihe: %s\n"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Sähköpostipalvelimelle kirjautuminen epäonnistui"
+#: ../src/engine/rfc822/rfc822-utils.vala:217
+#, c-format
+msgid "Date: %s\n"
+msgstr "Päiväys: %s\n"
 
-#: ../../src/client/geary-controller.vala:736
-#: ../../src/client/geary-controller.vala:746
-#: ../../src/client/geary-controller.vala:757
+#: ../src/engine/rfc822/rfc822-utils.vala:220
 #, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr ""
+msgid "To: %s\n"
+msgstr "Vastaanottaja: %s\n"
 
-#: ../../src/client/geary-controller.vala:701
+#: ../src/engine/rfc822/rfc822-utils.vala:223
 #, c-format
-msgid "Unable to open the database for %s"
+msgid "Cc: %s\n"
+msgstr "Kopio: %s\n"
+
+#: ../ui/account_cannot_remove.glade.h:1
+msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">Tilin poistaminen epäonnistui</span> "
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
+#: ../ui/account_cannot_remove.glade.h:2
+msgid ""
+"A composer window associated with this account is currently open. Send or "
+"discard the message and try again."
 msgstr ""
+"Viestin lähetysikkuna tälle tilille on jo avoinna. Lähetä tai hylkää viesti, "
+"ja yritä sitten uudelleen."
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "Tarkistaminen epäonnistui:\n"
+#: ../ui/account_list.glade.h:1
+msgid "Add account"
+msgstr "Lisää tili"
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "Alleviivattu (Ctrl+U)"
+#: ../ui/account_list.glade.h:2
+msgid "Edit account"
+msgstr "Muokkaa tiliä"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr "Poista tekstin lainaus (Ctrl+[)"
+#: ../ui/account_list.glade.h:3
+msgid "Remove account"
+msgstr "Poista tili"
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Tunnistamaton komentorivivalinta \"%s\"\n"
+#: ../ui/account_spinner.glade.h:1
+msgid "Please wait while Geary validates your account."
+msgstr "Odota hetki, Geary tarkistaa tiliäsi."
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "_Käyttäjätunnus:"
+#: ../ui/composer.glade.h:1
+msgid "_Undo"
+msgstr "_Kumoa"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Käyttäjätunnus:"
+#: ../ui/composer.glade.h:2
+msgid "_Redo"
+msgstr "_Tee uudelleen"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Vieraile Yorban verkkosivustolla"
+#: ../ui/composer.glade.h:3
+msgid "Cu_t"
+msgstr "_Leikkaa"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Tervetuloa, käytössäsi on Geary."
+#: ../ui/composer.glade.h:5
+msgid "_Paste"
+msgstr "L_iitä"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr "Koti, työ tms."
+#: ../ui/composer.glade.h:6
+msgid "_Left"
+msgstr "_Vasemmalle"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../ui/composer.glade.h:7
+msgid "_Right"
+msgstr "_Oikealle"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr "Eilen"
+#: ../ui/composer.glade.h:8
+msgid "_Center"
+msgstr "_Keskelle"
 
-#: ../../src/client/geary-controller.vala:552
-msgid ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
-msgstr ""
-"Käytössäsi olevat IMAP- ja/tai SMTP-asetukset eivät määritä salausasetuksesi "
-"SSL:ää tai TLS:ää. Tämä tarkoittaa, että käyttäjätunnuksesi ja salasanasi on "
-"mahdollista lukea verkkoliikenteestä. Haluatko varmasti sallia tämän?"
+#: ../ui/composer.glade.h:9
+msgid "_Justify"
+msgstr "_Tasaa"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Asetuksesi eivät ole turvalliset"
+#: ../ui/composer.glade.h:10
+msgid "Link (Ctrl+L)"
+msgstr "Linkki (Ctrl+L)"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_Tietoja"
+#: ../ui/composer.glade.h:11
+msgid "C_olor"
+msgstr "Vä_ri"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "_Lisää"
+#: ../ui/composer.glade.h:12
+msgid "More options"
+msgstr "Lisää valintoja"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Arkistoi"
+#: ../ui/composer.glade.h:13
+msgid "Quote text  (Ctrl+])"
+msgstr "Lainaa tekstiä (Ctrl+])"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Liitä"
+#: ../ui/composer.glade.h:14
+msgid "Unquote text (Ctrl+[)"
+msgstr "Poista tekstin lainaus (Ctrl+[)"
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "Liit_ä tiedosto"
+#: ../ui/composer.glade.h:15
+msgid "Remove formatting (Ctrl+Space)"
+msgstr "Poista muotoilu (Ctrl+Space)"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "_Valitse automaattisesti seuraava viesti"
+#: ../ui/composer.glade.h:16
+#| msgid "Paste _With Formatting"
+msgctxt "Clipboard paste with rich text"
+msgid "Paste _With Formatting"
+msgstr "Lii_tä muotoilujen kera"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "_Peru"
+#: ../ui/composer.glade.h:18
+msgid "Bold (Ctrl+B)"
+msgstr "Lihavoitu (Ctrl+B)"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_Keskelle"
+#: ../ui/composer.glade.h:19
+msgid "Italic (Ctrl+I)"
+msgstr "Kursivoitu (Ctrl+I)"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr "_Sulje"
+#: ../ui/composer.glade.h:20
+msgid "Underline (Ctrl+U)"
+msgstr "Alleviivattu (Ctrl+U)"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Kopioi"
+#: ../ui/composer.glade.h:21
+msgid "Strikethrough (Ctrl+K)"
+msgstr "Yliviivattu (Ctrl+K)"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Poista"
+#: ../ui/composer.glade.h:22
+msgid "_Rich Text"
+msgstr "Muotoilu - _RTF"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_Tiedot"
+#: ../ui/composer.glade.h:23
+msgid "Lar_ge"
+msgstr "_Suuri"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr "_Hylkää"
+#: ../ui/composer.glade.h:24
+msgid "Large"
+msgstr "Suuri"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr "N_äytä keskustelun esikatselu"
+#: ../ui/composer.glade.h:25
+msgid "_Medium"
+msgstr "Ta_vallinen"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr "La_hjoita"
+#: ../ui/composer.glade.h:26
+msgid "Medium"
+msgstr "Normaali"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "_Lataa sähköposti ajalta:"
+#: ../ui/composer.glade.h:27
+msgid "_Small"
+msgstr "_Pieni"
+
+#: ../ui/composer.glade.h:28
+msgid "Small"
+msgstr "Pieni"
 
-#: ../../ui/composer.glade:181
+#: ../ui/composer.glade.h:29
+msgid "S_ans Serif"
+msgstr "_Päätteetön"
+
+#: ../ui/composer.glade.h:30
+msgid "Sans Serif"
+msgstr "Päätteetön"
+
+#: ../ui/composer.glade.h:31
+msgid "S_erif"
+msgstr "P_äätteellinen"
+
+#: ../ui/composer.glade.h:32
+msgid "Serif"
+msgstr "Päätteellinen"
+
+#: ../ui/composer.glade.h:33
 msgid "_Fixed Width"
 msgstr "_Tasalevyinen"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Lähetä edelleen"
+#: ../ui/composer.glade.h:34
+msgid "Fixed Width"
+msgstr "Tasalevyinen"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_Ohje"
+#: ../ui/composer.glade.h:42
+msgid "Drop files here"
+msgstr "Pudota tiedostot tähän"
+
+#: ../ui/composer.glade.h:43
+msgid "To add them as attachments"
+msgstr "lisätäksesi ne liitteiksi"
+
+#: ../ui/composer.glade.h:44
+msgid "_Attach File"
+msgstr "Liit_ä tiedosto"
 
-#: ../../ui/composer.glade:542
+#: ../ui/composer.glade.h:45
 msgid "_Include Original Attachments"
 msgstr "_Sisällytä alkuperäiset liitteet"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "T_utki"
+#: ../ui/composer.glade.h:47
+msgid "_Send"
+msgstr "_Lähetä"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Tasaa"
+#: ../ui/find_bar.glade.h:1
+msgid "Find:"
+msgstr "Etsi:"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr "Säil_ytä"
+#: ../ui/find_bar.glade.h:2
+msgid "_Previous"
+msgstr "_Edellinen"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Tunniste"
+#: ../ui/find_bar.glade.h:3
+msgid "_Next"
+msgstr "_Seuraava"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_Vasemmalle"
+#: ../ui/find_bar.glade.h:4
+msgid "_Case sensitive"
+msgstr "_Huomioi kirjainkoko"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Merkitse luetuksi"
+#: ../ui/find_bar.glade.h:5
+#, fuzzy
+#| msgid "Labels"
+msgid "label"
+msgstr "Tunnisteet"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Merkitse lukemattomaksi"
+#: ../ui/login.glade.h:1
+msgid "Password"
+msgstr "Salasana"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Merkitse..."
+#: ../ui/login.glade.h:2
+msgid "E_mail address:"
+msgstr "_Sähköpostiosoite:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr "Ta_vallinen"
+#: ../ui/login.glade.h:3
+msgid "_Password:"
+msgstr "_Salasana:"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_Siirrä"
+#: ../ui/login.glade.h:4
+msgid "S_ervice:"
+msgstr "_Palvelu:"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr "_OK"
+#: ../ui/login.glade.h:5
+msgid "N_ame:"
+msgstr "_Nimi:"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr "_Avaa"
+#: ../ui/login.glade.h:7
+msgid "N_ickname:"
+msgstr "K_utsumanimi:"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
+#: ../ui/login.glade.h:8
+msgid "Work, Home, etc."
+msgstr "Koti, työ tms."
+
+#: ../ui/login.glade.h:9
+msgid "IMAP settings"
+msgstr "IMAP-asetukset"
+
+#: ../ui/login.glade.h:10
+msgid "Se_rver:"
+msgstr "P_alvelin:"
+
+#: ../ui/login.glade.h:11
+msgid "P_ort:"
+msgstr "P_ortti:"
+
+#: ../ui/login.glade.h:12
+msgid "Ser_ver:"
+msgstr "Pal_velin:"
+
+#: ../ui/login.glade.h:13
+msgid "Por_t:"
+msgstr "Portt_i:"
+
+#: ../ui/login.glade.h:14
+msgid "SMTP settings"
+msgstr "SMTP-asetukset"
+
+#: ../ui/login.glade.h:15
+msgid "User_name:"
+msgstr "_Käyttäjätunnus:"
+
+#: ../ui/login.glade.h:16
+msgid "Pass_word:"
 msgstr "_Salasana:"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr "L_iitä"
+#: ../ui/login.glade.h:17
+msgid "SMTP username"
+msgstr "SMTP-käyttäjätunnus"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Toista ilmoitusäänet"
+#: ../ui/login.glade.h:18
+msgid "SMTP password"
+msgstr "SMTP-salasana"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Asetukset"
+#: ../ui/login.glade.h:19
+msgid "_Username:"
+msgstr "K_äyttäjätunnus:"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr "_Tulosta..."
+#: ../ui/login.glade.h:20
+msgid "IMAP username"
+msgstr "IMAP-käyttäjätunnus"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_Lopeta"
+#: ../ui/login.glade.h:21
+msgid "IMAP password"
+msgstr "IMAP-salasana"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr "Ra_kenna uudelleen"
+#: ../ui/login.glade.h:22
+msgid "Encr_yption:"
+msgstr "Sala_us:"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr "_Tee uudelleen"
+#: ../ui/login.glade.h:23
+msgid "Encrypt_ion:"
+msgstr "Salau_s:"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "_Muista salasanat"
+#: ../ui/login.glade.h:25
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "_Poista"
+#: ../ui/login.glade.h:26
+msgid "STARTTLS"
+msgstr "STARTTLS"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Korvaa"
+#: ../ui/login.glade.h:27
+msgid "No authentication re_quired"
+msgstr "Tunnistautumista ei _vaadita"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Vastaa"
+#: ../ui/login.glade.h:28
+msgid "Storage"
+msgstr "Varastointi"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr "Muotoilu - _RTF"
+#: ../ui/login.glade.h:29
+msgid "_Download mail:"
+msgstr "_Lataa sähköposti ajalta:"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_Oikealle"
+#: ../ui/password-dialog.glade.h:1
+msgid "SMTP Credentials"
+msgstr "SMTP-tunnukset"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "_Tallenna"
+#: ../ui/password-dialog.glade.h:2
+msgid "Username:"
+msgstr "Käyttäjätunnus:"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_Tallenna nimellä..."
+#: ../ui/password-dialog.glade.h:3
+msgid "Password:"
+msgstr "Salasana:"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr "T_allenna kuva nimellä..."
+#: ../ui/password-dialog.glade.h:4
+#| msgid "_Remember passwords"
+msgid "_Remember password"
+msgstr "_Muista salasana"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Lähetä"
+#: ../ui/preferences.glade.h:2
+msgid "Reading"
+msgstr "Lukeminen"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr "_Pieni"
+#: ../ui/preferences.glade.h:3
+msgid "_Automatically select next message"
+msgstr "_Valitse automaattisesti seuraava viesti"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_Merkitse tähdellä"
+#: ../ui/preferences.glade.h:4
+msgid "_Display conversation preview"
+msgstr "N_äytä keskustelun esikatselu"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr "_Kumoa"
+#: ../ui/preferences.glade.h:5
+msgid "Composer"
+msgstr "Lähettäminen"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "K_äyttäjätunnus:"
+#: ../ui/preferences.glade.h:6
+msgid "Enable _spell checking"
+msgstr "_Käytä oikolukua"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "Näytä lä_hde"
+#: ../ui/preferences.glade.h:7
+msgid "Notifications"
+msgstr "Ilmoitukset"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../../src/client/composer/composer-window.vala:90
-msgid "attach|enclosed|enclosing|cover letter"
+#: ../ui/preferences.glade.h:8
+msgid "_Play notification sounds"
+msgstr "_Toista ilmoitusäänet"
+
+#: ../ui/preferences.glade.h:9
+msgid "Show _notifications for new mail"
+msgstr "_Näytä ilmoitus uuden viestin saapuessa"
+
+#: ../ui/remove_confirm.glade.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+"account?</span> "
 msgstr ""
-"attach|enclosed|enclosing|cover letter|liite|tiedosto|liitteenä|liitetiedosto"
+"<span weight=\"bold\" size=\"larger\">Haluatko varmasti poistaa tämän tilin?"
+"</span> "
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr "mutta viekin kohteeseen"
+#: ../ui/remove_confirm.glade.h:2
+msgid ""
+"All email associated with this account will be removed from your computer. "
+"This will not affect email on the server."
+msgstr ""
+"Kaikki tähän tiliin liittyvä posti poistetaan koneeltasi. Mitään postia ei "
+"poisteta palvelimelta."
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "tavua"
+#: ../ui/remove_confirm.glade.h:3
+msgid "Nickname:"
+msgstr "Kutsumanimi:"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "ei mitään"
+#: ../ui/remove_confirm.glade.h:4
+msgid "Email address:"
+msgstr "Sähköpostiosoite:"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr "ei löytynyt"
+#: ../ui/upgrade_dialog.glade.h:1
+msgid "Geary upgrade in progress."
+msgstr "Gearyn päivitys on meneillään."
 
-#. / Translators: add your name and email address to receive credit in the About dialog
-#. / For example: Yamada Taro <yamada taro example com>
-#: ../../src/client/geary-controller.vala:1230
-msgid "translator-credits"
-msgstr "Jiri Grönroos"
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "Arkistoi keskustelu (Delete, Backspace, A)"
+
+#~ msgid "General"
+#~ msgstr "Yleiset"
+
+#~ msgid "IMAP Credentials"
+#~ msgstr "IMAP-tunnukset"
+
+#~ msgid "Port:"
+#~ msgstr "Portti:"
+
+#~ msgid "Real name:"
+#~ msgstr "Oikea nimi:"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "SSL/TLS-salaus:"
+
+#~ msgid "Server:"
+#~ msgstr "Palvelin:"
+
+#~ msgid "Service:"
+#~ msgstr "Palvelu:"
+
+#~ msgid "Unable to login to email server"
+#~ msgstr "Sähköpostipalvelimelle kirjautuminen epäonnistui"
+
+#~ msgid "_Details"
+#~ msgstr "_Tiedot"