[geary] Update Finnish translation



commit b3a44d14835acea57897595998c5b91ccb059836
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Sun Aug 18 14:55:14 2019 +0000

    Update Finnish translation

 po/fi.po | 1916 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1130 insertions(+), 786 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index de5b8233..2a83e4a3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2019-03-11 03:57+0000\n"
-"PO-Revision-Date: 2019-03-14 20:49+0200\n"
+"POT-Creation-Date: 2019-08-18 11:39+0000\n"
+"PO-Revision-Date: 2019-08-18 17:54+0300\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -25,18 +25,13 @@ msgstr ""
 msgid "Send by email"
 msgstr "Lähetä sähköpostitse"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-attach.contract.desktop.in:5
-msgid "mail-send"
-msgstr "mail-send"
-
 #: desktop/geary-attach.contract.desktop.in:6
 msgid "Send files using Geary"
 msgstr "Lähetä tiedostoja Gearylla"
 
 #. Translators: The application name
 #: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:11
+#: desktop/org.gnome.Geary.appdata.xml.in:12
 #: desktop/org.gnome.Geary.desktop.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
 msgid "Geary"
@@ -48,9 +43,9 @@ msgstr "Sähköposti"
 
 #. Translators: The application's summary / tagline
 #: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:15
+#: desktop/org.gnome.Geary.appdata.xml.in:16
 #: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:23
+#: src/client/application/geary-application.vala:24
 msgid "Send and receive email"
 msgstr "Lähetä ja vastaanota sähköpostia"
 
@@ -59,17 +54,12 @@ msgstr "Lähetä ja vastaanota sähköpostia"
 msgid "Email;E-mail;Mail;"
 msgstr "Email;E-mail;Mail;Sähköposti;Maili;posti;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-autostart.desktop.in:9 desktop/org.gnome.Geary.desktop.in:9
-msgid "org.gnome.Geary"
-msgstr "org.gnome.Geary"
-
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:13
+#: desktop/org.gnome.Geary.appdata.xml.in:14
 msgid "Geary Development Team"
 msgstr "Geary-kehitystiimi"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:17
+#: desktop/org.gnome.Geary.appdata.xml.in:18
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
@@ -79,7 +69,7 @@ msgstr ""
 "keskusteluihin. Sen avulla voit lukea, etsiä ja lähettää sähköpostia "
 "modernin käyttöliittymän kautta."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:22
+#: desktop/org.gnome.Geary.appdata.xml.in:23
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -87,43 +77,43 @@ msgstr ""
 "Keskusteluiden avulla voit lukea koko viestiketjun ilman, että joudut "
 "napsauttamaan viestistä toiseen itse."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:26
+#: desktop/org.gnome.Geary.appdata.xml.in:27
 msgid "Geary’s features include:"
 msgstr "Gearyn ominaisuuksiin kuuluu muun muassa:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:28
+#: desktop/org.gnome.Geary.appdata.xml.in:29
 msgid "Quick email account setup"
 msgstr "Nopea sähköpostitilin asetusten teko"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in:30
 msgid "Shows related messages together in conversations"
 msgstr "Näyttää toisiinsa liittyvät viestit yhdessä keskustelumuodossa"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in:31
 msgid "Fast, full text and keyword search"
 msgstr "Nopea haku koko tekstin ja avainsanojen tuella"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in:32
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Monipuolinen HTML- ja raakatekstilähetys"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in:33
 msgid "Desktop notification of new mail"
 msgstr "Työpöytäilmoitukset uusista viesteistä"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in:34
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Yhteensopiva GMailin, Yahoo! Mailin, Outlook.comin ja muiden IMAP-"
 "palvelinten kanssa"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:47
+#: desktop/org.gnome.Geary.appdata.xml.in:48
 msgid "Geary displaying a conversation"
 msgstr "Geary ja viestiketju"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:52
+#: desktop/org.gnome.Geary.appdata.xml.in:59
 msgid "Geary showing the rich text composer"
 msgstr "Geary ja viestin kirjoitusikkuna"
 
@@ -132,7 +122,7 @@ msgstr "Geary ja viestin kirjoitusikkuna"
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;sähköposti;"
 
-#: desktop/org.gnome.Geary.desktop.in:21
+#: desktop/org.gnome.Geary.desktop.in:22
 msgid "Compose Message"
 msgstr "Lähetä viesti"
 
@@ -222,94 +212,96 @@ msgid "Languages that shall be used in the spell checker"
 msgstr "Oikoluvussa käytettävät kielet"
 
 #: desktop/org.gnome.Geary.gschema.xml:69
-msgid "List of the languages to use in the spell checker."
+msgid ""
+"A list of POSIX locales, with the empty list disabling spell checking and "
+"the null list using desktop languages by default."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:74
+#: desktop/org.gnome.Geary.gschema.xml:76
 msgid "Languages that are displayed in the spell checker popover"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:75
+#: desktop/org.gnome.Geary.gschema.xml:77
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:80
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Enable notification sounds"
 msgstr "Käytä ilmoitusääniä"
 
-#: desktop/org.gnome.Geary.gschema.xml:81
+#: desktop/org.gnome.Geary.gschema.xml:83
 msgid "True to play sounds for notifications and sending."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:86
+#: desktop/org.gnome.Geary.gschema.xml:88
 msgid "Show notifications for new mail"
 msgstr "Näytä ilmoitus uusista viesteistä"
 
-#: desktop/org.gnome.Geary.gschema.xml:87
+#: desktop/org.gnome.Geary.gschema.xml:89
 msgid "True to show notification bubbles."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:92
+#: desktop/org.gnome.Geary.gschema.xml:94
 msgid "Notify of new mail at startup"
 msgstr "Ilmoita uusista viesteistä käynnistyksen yhteydessä"
 
-#: desktop/org.gnome.Geary.gschema.xml:93
+#: desktop/org.gnome.Geary.gschema.xml:95
 #, fuzzy
 #| msgid "Notify of new mail at start_up"
 msgid "True to notify of new mail at startup."
 msgstr "_Ilmoita uusista viesteistä käynnistyksen yhteydessä"
 
-#: desktop/org.gnome.Geary.gschema.xml:98
+#: desktop/org.gnome.Geary.gschema.xml:100
 msgid "Ask when opening an attachment"
 msgstr "Kysy liitettä avattaessa"
 
-#: desktop/org.gnome.Geary.gschema.xml:99
+#: desktop/org.gnome.Geary.gschema.xml:101
 #, fuzzy
 #| msgid "To add them as attachments"
 msgid "True to ask when opening an attachment."
 msgstr "lisätäksesi ne liitteiksi"
 
-#: desktop/org.gnome.Geary.gschema.xml:104
+#: desktop/org.gnome.Geary.gschema.xml:106
 msgid "Whether to compose emails in HTML"
 msgstr "Muodostetaanko lähetettävät viestit HTML-muodossa"
 
-#: desktop/org.gnome.Geary.gschema.xml:105
+#: desktop/org.gnome.Geary.gschema.xml:107
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:110
+#: desktop/org.gnome.Geary.gschema.xml:112
 msgid "Advisory strategy for full-text searching"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:111
+#: desktop/org.gnome.Geary.gschema.xml:113
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 "Hyväksyttävät arvot ovat “exact”, “conservative”, “aggressive” ja “horizon”."
 
-#: desktop/org.gnome.Geary.gschema.xml:116
+#: desktop/org.gnome.Geary.gschema.xml:118
 msgid "Zoom of conversation viewer"
 msgstr "Keskustelunäkymän suurennus"
 
-#: desktop/org.gnome.Geary.gschema.xml:117
+#: desktop/org.gnome.Geary.gschema.xml:119
 msgid "The zoom to apply on the conservation view."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:122
+#: desktop/org.gnome.Geary.gschema.xml:124
 msgid "Size of detached composer window"
 msgstr "Irrotetun lähetysikkunan koko"
 
-#: desktop/org.gnome.Geary.gschema.xml:123
+#: desktop/org.gnome.Geary.gschema.xml:125
 msgid "The last recorded size of the detached composer window."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:128
+#: desktop/org.gnome.Geary.gschema.xml:130
 msgid "Whether we migrated the old settings"
 msgstr "Tehtiinkö vanhojen asetusten migraatio"
 
-#: desktop/org.gnome.Geary.gschema.xml:129
+#: desktop/org.gnome.Geary.gschema.xml:131
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -584,6 +576,7 @@ msgstr[0] "%d päivän ajalta"
 msgstr[1] "%d päivän ajalta"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:243
+#: src/client/application/application-controller.vala:2405
 msgid "Undo"
 msgstr "Kumoa"
 
@@ -593,19 +586,19 @@ msgstr "Tee uudelleen"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:345
 #: src/client/accounts/accounts-editor-list-pane.vala:433
-#: src/client/accounts/accounts-editor-row.vala:278
+#: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:349
 #: src/client/accounts/accounts-editor-list-pane.vala:437
-#: src/client/accounts/accounts-editor-row.vala:282
+#: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:353
 #: src/client/accounts/accounts-editor-list-pane.vala:441
-#: src/client/accounts/accounts-editor-row.vala:286
+#: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
@@ -644,38 +637,38 @@ msgid "Account “%s” restored"
 msgstr "Tili “%s” palautettu"
 
 #. Translators: Tooltip for dragging list items
-#: src/client/accounts/accounts-editor-row.vala:49
+#: src/client/accounts/accounts-editor-row.vala:50
 msgid "Drag to move this item"
 msgstr "Raahaa liikuttaaksesi tätä kohdetta"
 
 #. Translators: Label describes the service provider
 #. hosting the email account, e.g. Gmail, Yahoo, or some
 #. other generic IMAP service.
-#: src/client/accounts/accounts-editor-row.vala:294
+#: src/client/accounts/accounts-editor-row.vala:295
 msgid "Service provider"
 msgstr "Palveluntarjoaja"
 
 #. Translators: This label describes what form of transport
 #. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
 #. service.
-#: src/client/accounts/accounts-editor-row.vala:467
+#: src/client/accounts/accounts-editor-row.vala:468
 msgid "Connection security"
 msgstr "Yhteyden salaus"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:478
+#: src/client/accounts/accounts-editor-row.vala:479
 #: src/client/accounts/accounts-editor-servers-pane.vala:752
 #: src/client/accounts/accounts-editor-servers-pane.vala:964
 #: src/engine/api/geary-special-folder-type.vala:58
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/client/accounts/accounts-editor-row.vala:485
+#: src/client/accounts/accounts-editor-row.vala:486
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:492
+#: src/client/accounts/accounts-editor-row.vala:493
 msgid "TLS"
 msgstr "TLS"
 
@@ -683,28 +676,28 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:533 ui/main-window.ui:455
+#: src/client/accounts/accounts-editor-row.vala:534 ui/main-window.ui:346
 msgid "Login"
 msgstr "Kirjaudu"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:540
+#: src/client/accounts/accounts-editor-row.vala:541
 msgid "No login needed"
 msgstr "Kirjautumista ei vaadita"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:548
+#: src/client/accounts/accounts-editor-row.vala:549
 msgid "Use same login as receiving"
 msgstr "Käytä samoja kirjautumistietoja kuin lähettäessä"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:556
+#: src/client/accounts/accounts-editor-row.vala:557
 msgid "Use a different login"
 msgstr "Käytä eri kirjautumistietoja"
 
@@ -729,8 +722,8 @@ msgstr "Gnomen verkkotilit"
 #. Translators: This label describes an account
 #. preference.
 #: src/client/accounts/accounts-editor-servers-pane.vala:611
-msgid "Save drafts on server"
-msgstr "Tallenna luonnokset palvelimelle"
+msgid "Save draft email on server"
+msgstr "Tallenna luonnosviestit palvelimelle"
 
 #. Translators: This label describes an account
 #. preference.
@@ -752,133 +745,37 @@ msgstr "%s käyttää OAuth2:ta"
 msgid "Use receiving server login"
 msgstr "Käytä vastaanottavan palvelimen kirjautumistietoja"
 
-#: src/client/application/geary-application.vala:24
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Tekijänoikeus 2016 Software Freedom Conservancy Inc."
-
-#: src/client/application/geary-application.vala:25
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Tekijänoikeus 2016-2019 Geary-kehitystiimi."
-
-#: src/client/application/geary-application.vala:27
-msgid "Visit the Geary web site"
-msgstr "Vieraile Gearyn verkkosivustolla"
-
-#: src/client/application/geary-application.vala:454
-#, c-format
-msgid "About %s"
-msgstr "Tietoja %ssta"
-
-#. 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-application.vala:458
-msgid "translator-credits"
-msgstr "Jiri Grönroos"
-
-#: src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Käynnistä Geary pääikkuna piilotettuna"
-
-#: src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr ""
-
-#: src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Lokita keskustelujen tarkkailu"
-
-#: src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr ""
-
-#: src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Lokita verkkotoiminta"
-
-#. / 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:17
-msgid "Log IMAP replay queue"
-msgstr ""
-
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/geary-args.vala:20
-msgid "Log network serialization"
-msgstr ""
-
-#: src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr ""
-
-#: src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Lokita tietokantaan kohdistuvat kyselyt (luo paljon viestejä)"
-
-#. / "Normalization" can also be called "synchronization"
-#: src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Lokita kansioiden normalisointi"
-
-#: src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr ""
-
-#: src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Kumoa kaikki palvelinvarmenteet, joissa on TLS-varoituksia"
-
-#: src/client/application/geary-args.vala:27
-msgid "Perform a graceful quit"
-msgstr "Suorita siisti lopetus"
-
-#: src/client/application/geary-args.vala:28
-msgid "Display program version"
-msgstr "Näytä sovelluksen versio"
-
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: src/client/application/geary-args.vala:53
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Käytä %s uuden lähetysikkunan avaamista varten"
-
-#: src/client/application/geary-args.vala:56
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Kommentoi, ehdota uusia ideoita ja ilmoita vioista:"
-
-#. i18n: Command line arguments are invalid
-#: src/client/application/geary-args.vala:63
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Komentorivivalintojen jäsennys epäonnistui: %s\n"
-
-#: src/client/application/geary-args.vala:74
-#, c-format
-msgid "Unrecognized command line option “%s”\n"
-msgstr ""
-"Tunnistamaton komentorivivalinta “%s”\n"
-"\n"
-
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/geary-controller.vala:58
+#: src/client/application/application-controller.vala:59
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: src/client/application/geary-controller.vala:954
+#. / Notification title.
+#: src/client/application/application-controller.vala:564
+#, fuzzy, c-format
+#| msgid "A problem occurred sending mail for %s"
+msgid "A problem occurred sending email for %s"
+msgstr "Tilin  %s viestejä lähettäessä tapahtui virhe"
+
+#. / Notification body
+#: src/client/application/application-controller.vala:568
+msgid "Email will not be sent until re-connected"
+msgstr "Sähköpostia ei lähetetä, ennen kuin yhteys on muodostettu uudelleen"
+
+#: src/client/application/application-controller.vala:919
 msgid "Labels"
 msgstr "Tunnisteet"
 
 #. 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:967
+#: src/client/application/application-controller.vala:932
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Kohteen %s tietokannan avaaminen epäonnistui"
 
-#: src/client/application/geary-controller.vala:968
+#: src/client/application/application-controller.vala:933
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -904,20 +801,20 @@ msgstr ""
 "niiden liitteet. <b>Toimenpiteellä ei ole vaikutusta palvelimella oleviin "
 "viesteihin ja liitteisiin.</b>"
 
-#: src/client/application/geary-controller.vala:970
+#: src/client/application/application-controller.vala:935
 msgid "_Rebuild"
 msgstr "Ra_kenna uudelleen"
 
-#: src/client/application/geary-controller.vala:970
+#: src/client/application/application-controller.vala:935
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: src/client/application/geary-controller.vala:979
+#: src/client/application/application-controller.vala:944
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Tietokannan jälleenrakennus tilille “%s” epäonnistui"
 
-#: src/client/application/geary-controller.vala:980
+#: src/client/application/application-controller.vala:945
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -928,15 +825,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/geary-controller.vala:1835
-msgid "Undo move (Ctrl+Z)"
-msgstr "Kumoa siirtäminen (Ctrl+Z)"
+#: src/client/application/application-controller.vala:1739
+#, fuzzy, c-format
+#| msgid "%d message"
+#| msgid_plural "%d messages"
+msgid "Moved %d message to %s"
+msgid_plural "Moved %d messages to %s"
+msgstr[0] "%d viesti"
+msgstr[1] "%d viestiä"
 
-#: src/client/application/geary-controller.vala:1845
+#: src/client/application/application-controller.vala:1749
 msgid "Are you sure you want to open these attachments?"
 msgstr "Haluatko varmasti avata nämä liitteet?"
 
-#: src/client/application/geary-controller.vala:1846
+#: src/client/application/application-controller.vala:1750
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -944,14 +846,14 @@ msgstr ""
 "Liitetiedostot saattavat sisältää haitallista sisältöä.  Avaa liitteet "
 "ainoastaan, jos luotat niiden lähettäjään."
 
-#: src/client/application/geary-controller.vala:1847
+#: src/client/application/application-controller.vala:1751
 msgid "Don’t _ask me again"
 msgstr "_Älä kysy uudelleen"
 
 #. Translators: Dialog primary label when prompting to
 #. overwrite a file. The string substitution is the file'sx
 #. name.
-#: src/client/application/geary-controller.vala:1976
+#: src/client/application/application-controller.vala:1874
 #, 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?"
@@ -959,7 +861,7 @@ msgstr "Tiedosto nimellä “%s” on jo olemassa.  Haluatko korvata sen?"
 #. Translators: Dialog secondary label when prompting to
 #. overwrite a file. The string substitution is the parent
 #. folder's name.
-#: src/client/application/geary-controller.vala:1983
+#: src/client/application/application-controller.vala:1881
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
@@ -967,72 +869,288 @@ msgstr ""
 "Tiedosto on jo olemassa kohteessa “%s”.  Tiedoston korvaaminen korvaa "
 "nykyisen tiedoston sisällön."
 
-#: src/client/application/geary-controller.vala:1987
+#: src/client/application/application-controller.vala:1885
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: src/client/application/geary-controller.vala:2263
-msgid "Close the draft message?"
-msgid_plural "Close all draft messages?"
-msgstr[0] "Suljetaanko luonnosviesti?"
-msgstr[1] "Suljetaanko kaikki luonnosviestit?"
-
-#: src/client/application/geary-controller.vala:2389
+#: src/client/application/application-controller.vala:2245
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Poistetaanko kaikki viesit \"%s\"-kansiosta?"
 
-#: src/client/application/geary-controller.vala:2390
+#: src/client/application/application-controller.vala:2246
 msgid "This removes the email from Geary and your email server."
 msgstr "Tämä poistaa viestit Gearysta ja sähköpostipalvelimelta."
 
-#: src/client/application/geary-controller.vala:2391
+#: src/client/application/application-controller.vala:2247
 msgid "This cannot be undone."
 msgstr "Toimintoa ei voi perua."
 
-#: src/client/application/geary-controller.vala:2392
+#: src/client/application/application-controller.vala:2248
 #, c-format
 msgid "Empty %s"
 msgstr "Tyhjennä %s"
 
-#: src/client/application/geary-controller.vala:2409
+#: src/client/application/application-controller.vala:2265
 #, c-format
 msgid "Error emptying %s"
 msgstr "Virhe tyhjennettäessä kohdetta %s"
 
-#: src/client/application/geary-controller.vala:2441
+#: src/client/application/application-controller.vala:2296
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Haluatko poistaa tämän viestin pysyvästi?"
 msgstr[1] "Haluatko poistaa nämä viestit pysyvästi?"
 
-#: src/client/application/geary-controller.vala:2443
+#: src/client/application/application-controller.vala:2298
 msgid "Delete"
 msgstr "Poista"
 
-#: src/client/application/geary-controller.vala:2457
-msgid "Undo trash (Ctrl+Z)"
-msgstr "Kumoa roskakoriin siirto (Ctrl+Z)"
-
-#: src/client/application/geary-controller.vala:2507
-msgid "Undo archive (Ctrl+Z)"
-msgstr "Kumoa arkistointi (Ctrl+Z)"
+#: src/client/application/application-controller.vala:2312
+#, fuzzy, c-format
+#| msgid "%d message"
+#| msgid_plural "%d messages"
+msgid "Trashed %d message"
+msgid_plural "Trashed %d messages"
+msgstr[0] "%d viesti"
+msgstr[1] "%d viestiä"
 
-#: src/client/application/geary-controller.vala:2552
-msgid "Undo (Ctrl+Z)"
-msgstr "Kumoa (Ctrl+Z)"
+#: src/client/application/application-controller.vala:2359
+#, c-format
+msgid "Archived %d message"
+msgid_plural "Archived %d messages"
+msgstr[0] "Arkistoitu %d viesti"
+msgstr[1] "Arkistoitu %d viestiä"
 
 #. Translators: The label for an in-app notification. The
 #. string substitution is a list of recipients of the email.
-#: src/client/application/geary-controller.vala:2633
+#: src/client/application/application-controller.vala:2487
 #, c-format
 msgid "Successfully sent mail to %s."
 msgstr "Lähetetty onnistuneesti sähköpostia vastaanottajille %s."
 
-#: src/client/application/geary-controller.vala:2715
+#: src/client/application/application-controller.vala:2565
 msgid "Failed to open default text editor."
 msgstr "Oletustekstimuokkaimen avaus epäonnistui."
 
+#: src/client/application/geary-application.vala:25
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Tekijänoikeus 2016 Software Freedom Conservancy Inc."
+
+#: src/client/application/geary-application.vala:26
+msgid "Copyright 2016-2019 Geary Development Team."
+msgstr "Tekijänoikeus 2016-2019 Geary-kehitystiimi."
+
+#: src/client/application/geary-application.vala:28
+msgid "Visit the Geary web site"
+msgstr "Vieraile Gearyn verkkosivustolla"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:104
+msgid "Print debug logging"
+msgstr ""
+
+#. / Command line option
+#: src/client/application/geary-application.vala:107
+#, fuzzy
+#| msgid "Start Geary with hidden main window"
+msgid "Start with the main window hidden (deprecated)"
+msgstr "Käynnistä Geary pääikkuna piilotettuna"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:110
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr ""
+
+#. / Command line option
+#: src/client/application/geary-application.vala:113
+msgid "Log conversation monitoring"
+msgstr "Lokita keskustelujen tarkkailu"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:116
+#, fuzzy
+#| msgid "Log folder normalization"
+msgid "Log IMAP network deserialization"
+msgstr "Lokita kansioiden normalisointi"
+
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/geary-application.vala:120
+msgid "Log folder normalization"
+msgstr "Lokita kansioiden normalisointi"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:123
+msgid "Log network activity"
+msgstr "Lokita verkkotoiminta"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:126
+msgid "Log periodic activity"
+msgstr ""
+
+#. / Command line option. 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-application.vala:131
+msgid "Log IMAP replay queue"
+msgstr ""
+
+#. / Command line option. Serialization is how commands and
+#. / responses are converted into a stream of bytes for
+#. / network transmission
+#: src/client/application/geary-application.vala:136
+#, fuzzy
+#| msgid "Log folder normalization"
+msgid "Log IMAP network serialization"
+msgstr "Lokita kansioiden normalisointi"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:139
+msgid "Log database queries (generates lots of messages)"
+msgstr "Lokita tietokantaan kohdistuvat kyselyt (luo paljon viestejä)"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:142
+msgid "Perform a graceful quit"
+msgstr "Suorita siisti lopetus"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:145
+#, fuzzy
+#| msgid "Revoke all server certificates with TLS warnings"
+msgid "Revoke all pinned TLS server certificates"
+msgstr "Kumoa kaikki palvelinvarmenteet, joissa on TLS-varoituksia"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:148
+msgid "Display program version"
+msgstr "Näytä sovelluksen versio"
+
+#. Use this to specify arguments in the help section
+#. / Command line option
+#: src/client/application/geary-application.vala:152
+#, fuzzy
+#| msgid "Display program version"
+msgid "Display program version and revision id"
+msgstr "Näytä sovelluksen versio"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:279
+msgid "Geary version"
+msgstr "Geary-versio"
+
+#: src/client/application/geary-application.vala:280
+msgid "Geary revision"
+msgstr ""
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:282
+msgid "GTK version"
+msgstr "GTK-versio"
+
+#. / Applciation runtime information label
+#: src/client/application/geary-application.vala:289
+msgid "GLib version"
+msgstr "GLib-versio"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:296
+msgid "WebKitGTK version"
+msgstr "WebKitGTK-versio"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:303
+msgid "Desktop environment"
+msgstr "Työpöytäympäristö"
+
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/application/geary-application.vala:305
+#: src/client/conversation-viewer/conversation-email.vala:159
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:335
+msgid "Distribution name"
+msgstr "Jakelun nimi"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:340
+msgid "Distribution release"
+msgstr "Jakelun versio"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:348
+msgid "Installation prefix"
+msgstr ""
+
+#: src/client/application/geary-application.vala:513
+#, c-format
+msgid "About %s"
+msgstr "Tietoja %ssta"
+
+#. 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-application.vala:517
+msgid "translator-credits"
+msgstr "Jiri Grönroos"
+
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/geary-application.vala:790
+msgid "The `--hidden` option is deprecated and will be removed in the future."
+msgstr ""
+
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/geary-application.vala:822
+#, fuzzy, c-format
+#| msgid "Unrecognized command line option “%s”\n"
+msgid "Unrecognised program argument: “%s”"
+msgstr ""
+"Tunnistamaton komentorivivalinta “%s”\n"
+"\n"
+
+#: src/client/components/components-inspector.vala:68
+#, fuzzy
+#| msgid "_Inspect…"
+msgid "Inspector"
+msgstr "T_utki…"
+
+#. / Translators: Title for Inspector logs pane
+#. / Translators: Title for problem report dialog logs pane
+#: src/client/components/components-inspector.vala:77
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:91
+msgid "Logs"
+msgstr "Lokit"
+
+#. / Translators: Title for Inspector system system information pane
+#. / Translators: Title for problem report system information
+#. / pane
+#: src/client/components/components-inspector.vala:81
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:94
+msgid "System"
+msgstr "Järjestelmä"
+
+#. Button label for saving problem report information
+#: src/client/components/components-inspector.vala:198
+#: src/client/components/components-inspector.vala:201
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:210
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:213
+#: ui/problem-details-dialog.ui:42
+msgid "Save As"
+msgstr "Tallenna nimellä"
+
+#: src/client/components/components-inspector.vala:202
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:214
+#: ui/accounts_editor_servers_pane.ui:17
+msgid "Cancel"
+msgstr "Peru"
+
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
 #: src/client/components/components-validator.vala:378
@@ -1059,234 +1177,121 @@ msgstr "Palvelimen nimi vaaditaan"
 msgid "Could not look up server name"
 msgstr "Palvelimen nimeä ei voitu kysellä"
 
-#: src/client/components/main-toolbar.vala:151
+#: src/client/components/main-toolbar.vala:139
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "Merkitse keskustelu"
 msgstr[1] "Merkitse keskustelut"
 
-#: src/client/components/main-toolbar.vala:156
+#: src/client/components/main-toolbar.vala:144
 msgid "Add label to conversation"
 msgid_plural "Add label to conversations"
 msgstr[0] "Lisää tunniste keskusteluun"
 msgstr[1] "Lisää tunniste keskusteluihin"
 
-#: src/client/components/main-toolbar.vala:161
+#: src/client/components/main-toolbar.vala:149
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "Siirrä keskustelu"
 msgstr[1] "Siirrä keskustelut"
 
-#: src/client/components/main-toolbar.vala:166
-msgid "Archive conversation (A)"
-msgid_plural "Archive conversations (A)"
-msgstr[0] "Arkistoi keskustelu (A)"
-msgstr[1] "Arkistoi keskustelut (A)"
-
-#: src/client/components/main-toolbar.vala:175
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgid_plural "Move conversations to Trash (Delete, Backspace)"
-msgstr[0] "Siirrä keskustelu roskakoriin (Delete, Backspace)"
-msgstr[1] "Siirrä keskustelut roskakoriin (Delete, Backspace)"
-
-#: src/client/components/main-toolbar.vala:183
-msgid "Delete conversation (Shift+Delete)"
-msgid_plural "Delete conversations (Shift+Delete)"
-msgstr[0] "Poista keskustelu (Shift+Delete)"
-msgstr[1] "Poista keskustelut (Shift+Delete)"
-
-#: src/client/components/main-window.vala:503
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:47
-#, c-format
-msgid "Problem connecting to incoming server for %s"
-msgstr "Virhe yhdistäessä tilin %s saapuvan postin palvelimeen"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:49
-#: src/client/components/main-window-info-bar.vala:58
-#, c-format
-msgid ""
-"Could not connect to %s, check your Internet access and the server name and "
-"try again"
-msgstr ""
-"Ei voitu yhdistää palvelimeen %s. Tarkista internetyhteytesi tila ja "
-"palvelimen nimi, yritä sen jälkeen uudelleen"
-
-#. Translators: Tooltip label for Retry button
-#. Button tooltip for retrying an account problem
-#: src/client/components/main-window-info-bar.vala:51
-#: src/client/components/main-window-info-bar.vala:60
-#: src/client/components/main-window-info-bar.vala:69
-#: src/client/components/main-window-info-bar.vala:78
-#: src/client/components/main-window-info-bar.vala:87
-#: src/client/components/main-window-info-bar.vala:96
-#: src/client/components/main-window-info-bar.vala:136 ui/main-window.ui:265
-msgid "Try reconnecting"
-msgstr "Yritä yhdistää uudelleen"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:56
-#, c-format
-msgid "Problem connecting to outgoing server for %s"
-msgstr "Virhe yhdistäessä tilin %s lähtevän postin palvelimeen"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:65
-#: src/client/components/main-window-info-bar.vala:83
-#, c-format
-msgid "Problem communicating with incoming server for %s"
-msgstr "Ongelma oltaessa yhteydessä tilin %s saapuvan postin palvelimeen"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:67
-#: src/client/components/main-window-info-bar.vala:76
-#, c-format
-msgid "Network error talking to %s, check your Internet access and try again"
-msgstr ""
-"Verkkovirhe palvelimeen %s. Tarkista internetyhteytesi tila ja yritä "
-"uudelleen"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:74
-#: src/client/components/main-window-info-bar.vala:91
-msgid "Problem communicating with outgoing mail server"
-msgstr "Ongelma oltaessa yhteydessä lähtevän postin palvelimeen"
+#: src/client/components/main-toolbar.vala:154
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Arkistoi keskustelu"
+msgstr[1] "Arkistoi keskustelut"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:85
-#, c-format
-msgid ""
-"Geary did not understand a message from %s or vice versa, please file a bug "
-"report"
-msgstr ""
-"Geary ei ymmärtänyt palvelimen %s viestiä tai palvelin ei ymmärtänyt Gearyn "
-"viestiä.. Ilmoita tästä ongelmasta."
-
-#. Translators: First string substitution is the server
-#. name, second is the account name
-#: src/client/components/main-window-info-bar.vala:94
-#, c-format
-msgid ""
-"Could not communicate with %s for %s, check the server name and try again in "
-"a moment"
-msgstr ""
-"Yhteys palvelimeen %s tilillä %s asiointia varten ei onnistunut, tarkista "
-"palvelimen nimi ja yritä uudelleen hetken kuluttua"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:101
-#, c-format
-msgid "Incoming mail server password required for %s"
-msgstr "Tilin %s saapuvan postin palvelin vaatii salasanan"
-
-#: src/client/components/main-window-info-bar.vala:102
-msgid "Messages cannot be received without the correct password."
-msgstr "Viestejä ei voi vastaanottaa ilman oikeaa salasanaa."
+#: src/client/components/main-toolbar.vala:163
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Siirrä keskustelu roskakoriin"
+msgstr[1] "Siirrä keskustelut roskakoriin"
 
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:104
-msgid "Retry receiving email, you will be prompted for a password"
-msgstr ""
+#: src/client/components/main-toolbar.vala:171
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Poista keskustelu"
+msgstr[1] "Poista keskustelut"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:109
+#: src/client/components/main-window.vala:733
 #, c-format
-msgid "Outgoing mail server password required for %s"
-msgstr "Tilin %s salasana vaaditaan lähtevän postin palvelimelle"
-
-#: src/client/components/main-window-info-bar.vala:110
-msgid "Messages cannot be sent without the correct password."
-msgstr "Viestejä ei voi lähettää ilman oikeaa salasanaa."
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:112
-msgid "Retry sending queued messages, you will be prompted for a password"
-msgstr ""
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/main-window-info-bar.vala:44
+msgid "Account problem"
+msgstr "Tiliongelma"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:117
-#, c-format
-msgid "Incoming mail server security is not trusted for %s"
-msgstr "Tilin %s saapuvan postin palvelimen turvallisuuteen ei luoteta"
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/main-window-info-bar.vala:48
+#, fuzzy, c-format
+#| msgid "Geary has encountered a problem"
+msgid "Geary has encountered a problem with %s."
+msgstr "Geary kohtasi ongelman"
 
-#: src/client/components/main-window-info-bar.vala:118
-msgid "Messages will not be received until checked."
-msgstr "Viestejä ei voi vastaanottaa ennen tarkistusta."
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/main-window-info-bar.vala:61
+#, fuzzy, c-format
+#| msgid "Geary encountered a problem connecting to an account."
+msgid "Geary encountered a problem checking mail for %s."
+msgstr "Geary kohtasi ongelman yhdistäessä tiliin."
 
 #. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:120
-#: src/client/components/main-window-info-bar.vala:128
-msgid "Check security details"
-msgstr "Tarkista salaustiedot"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:125
-#, c-format
-msgid "Outgoing mail server security is not trusted for %s"
-msgstr "Tilin %s lähtevän postin palvelimen turvallisuuteen ei luoteta"
-
-#: src/client/components/main-window-info-bar.vala:126
-msgid "Messages cannot be sent until checked."
-msgstr "Viestejä ei voi lähettää ennen tarkistusta."
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:133
-#, c-format
-msgid "A problem occurred checking mail for %s"
-msgstr "Tilin %s viestejä tarkastaessa tapahtui virhe"
-
-#: src/client/components/main-window-info-bar.vala:134
-#: src/client/components/main-window-info-bar.vala:142
-msgid "Something went wrong, please file a bug report if the problem persists"
-msgstr "Jokin meni vikaan. Tee vikailmoitus, jos ongelma ilmenee uudelleen"
+#: src/client/components/main-window-info-bar.vala:65
+msgid "Try reconnecting"
+msgstr "Yritä yhdistää uudelleen"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:141
-#, c-format
-msgid "A problem occurred sending mail for %s"
-msgstr "Tilin  %s viestejä lähettäessä tapahtui virhe"
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/main-window-info-bar.vala:73
+#, fuzzy, c-format
+#| msgid "Geary encountered a problem connecting to an account."
+msgid "Geary encountered a problem sending email for %s."
+msgstr "Geary kohtasi ongelman yhdistäessä tiliin."
 
 #. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:144
+#: src/client/components/main-window-info-bar.vala:77
 msgid "Retry sending queued messages"
 msgstr "Yritä lähettää uudelleen jonossa olevat viestit"
 
-#: src/client/components/main-window-info-bar.vala:155
-msgid "A database problem has occurred"
-msgstr "Havaittiin tietokantaongelma"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:157
-#, c-format
-msgid "Messages for %s must be downloaded again."
-msgstr "Tilin %s viestit tulee ladata uudelleen."
-
-#: src/client/components/main-window-info-bar.vala:170
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/main-window-info-bar.vala:84
 msgid "Geary has encountered a problem"
 msgstr "Geary kohtasi ongelman"
 
-#: src/client/components/main-window-info-bar.vala:171
-msgid ""
-"Please check the technical details and report the problem if it persists."
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/main-window-info-bar.vala:88
+#, fuzzy
+#| msgid ""
+#| "Please check the technical details and report the problem if it persists."
+msgid "Please report the details if it persists."
 msgstr ""
 "Katso tekniset yksityiskohdat ja ilmoita ongelmasta, jos se ilmenee "
 "uudelleen."
 
-#: src/client/components/main-window-info-bar.vala:179
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/main-window-info-bar.vala:99
 msgid "_Details"
 msgstr "_Tiedot"
 
-#. Button tooltip for displaying technical details about an account problem
-#: src/client/components/main-window-info-bar.vala:180 ui/main-window.ui:250
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/main-window-info-bar.vala:102
 msgid "View technical details about the error"
 msgstr "Näytä virheen tekniset yksityiskohdat"
 
-#: src/client/components/main-window-info-bar.vala:184
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/main-window-info-bar.vala:108
 msgid "_Retry"
 msgstr "_Yritä uudelleen"
 
@@ -1301,12 +1306,12 @@ msgstr "Etsi"
 msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr "Etsi hakusanoilla kaikista tilin sähköpostiviesteistä (Ctrl+S)"
 
-#: src/client/components/search-bar.vala:101
+#: src/client/components/search-bar.vala:83
 #, c-format
 msgid "Indexing %s account"
 msgstr "Indeksoidaan tiliä %s"
 
-#: src/client/components/search-bar.vala:112
+#: src/client/components/search-bar.vala:110
 #: src/client/folder-list/folder-list-search-branch.vala:39
 #, c-format
 msgid "Search %s account"
@@ -1397,19 +1402,19 @@ msgstr "Virheellinen linkin osoite"
 msgid "Invalid email address"
 msgstr "Virheellinen sähköpostiosoite"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:156
 msgid "Saved"
 msgstr "Tallennettu"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:157
 msgid "Saving"
 msgstr "Tallennetaan"
 
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:158
 msgid "Error saving"
 msgstr "Virhe tallentaessa"
 
-#: src/client/composer/composer-widget.vala:161
+#: src/client/composer/composer-widget.vala:159
 msgid "Press Backspace to delete quote"
 msgstr "Paina askelpalautinta poistaaksesi lainauksen"
 
@@ -1417,7 +1422,7 @@ msgstr "Paina askelpalautinta poistaaksesi lainauksen"
 #. characters, that suggest an attachment; since this is full-word
 #. checking, include all variants of each word.  No spaces are
 #. allowed.
-#: src/client/composer/composer-widget.vala:170
+#: src/client/composer/composer-widget.vala:168
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1429,34 +1434,34 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1130
+#: src/client/composer/composer-widget.vala:1181
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Haluatko säilyttää vai hylätä tämän luonnosviestin?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1158
+#: src/client/composer/composer-widget.vala:1211
 msgid "Do you want to discard this draft message?"
 msgstr "Haluatko hylätä tämän luonnosviestin?"
 
-#: src/client/composer/composer-widget.vala:1275
+#: src/client/composer/composer-widget.vala:1330
 msgid "Send message with an empty subject and body?"
 msgstr "Lähetetäänkö viesti ilman aihetta ja sisältöä?"
 
-#: src/client/composer/composer-widget.vala:1277
+#: src/client/composer/composer-widget.vala:1332
 msgid "Send message with an empty subject?"
 msgstr "Lähetetäänkö viesti ilman aihetta?"
 
-#: src/client/composer/composer-widget.vala:1279
+#: src/client/composer/composer-widget.vala:1334
 msgid "Send message with an empty body?"
 msgstr "Lähetetäänkö viesti ilman sisältöä?"
 
-#: src/client/composer/composer-widget.vala:1283
+#: src/client/composer/composer-widget.vala:1338
 msgid "Send message without an attachment?"
 msgstr "Lähetetäänkö viesti ilman liitettä?"
 
-#: src/client/composer/composer-widget.vala:1588
+#: src/client/composer/composer-widget.vala:1652
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s” on jo liitetty lähetystä varten."
@@ -1466,63 +1471,63 @@ msgstr "“%s” on jo liitetty lähetystä varten."
 #. description of the document type, the second will
 #. be a human-friendly size string. For example:
 #. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1596
+#: src/client/composer/composer-widget.vala:1660
 #: src/client/conversation-viewer/conversation-email.vala:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/composer/composer-widget.vala:1633
+#: src/client/composer/composer-widget.vala:1697
 #, c-format
 msgid "“%s” could not be found."
 msgstr "Kohdetta “%s” ei löytynyt."
 
-#: src/client/composer/composer-widget.vala:1639
+#: src/client/composer/composer-widget.vala:1703
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s” on kansio."
 
-#: src/client/composer/composer-widget.vala:1645
+#: src/client/composer/composer-widget.vala:1709
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s” on tyhjä tiedosto."
 
-#: src/client/composer/composer-widget.vala:1658
+#: src/client/composer/composer-widget.vala:1722
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "Kohteen “%s” avaus lukua varten epäonnistui."
 
-#: src/client/composer/composer-widget.vala:1666
+#: src/client/composer/composer-widget.vala:1730
 msgid "Cannot add attachment"
 msgstr "Liitteen lisäys epäonnistui"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1716
-#: src/client/conversation-viewer/conversation-email.vala:981
-#: src/engine/rfc822/rfc822-utils.vala:298 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:1787
+#: src/client/conversation-viewer/conversation-email.vala:976
+#: src/client/util/util-email.vala:216 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Vastaanottaja:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1722
-#: src/client/conversation-viewer/conversation-email.vala:986
-#: src/engine/rfc822/rfc822-utils.vala:303 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:1793
+#: src/client/conversation-viewer/conversation-email.vala:981
+#: src/client/util/util-email.vala:221 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Kopio:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1728
-#: src/client/conversation-viewer/conversation-email.vala:991
+#: src/client/composer/composer-widget.vala:1799
+#: src/client/conversation-viewer/conversation-email.vala:986
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Piilokopio:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1734
+#: src/client/composer/composer-widget.vala:1805
 msgid "Reply-To: "
 msgstr "Vastausosoite: "
 
-#: src/client/composer/composer-widget.vala:1874
+#: src/client/composer/composer-widget.vala:1945
 msgid "Select Color"
 msgstr "Valitse väri"
 
@@ -1531,20 +1536,20 @@ msgstr "Valitse väri"
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2064
+#: src/client/composer/composer-widget.vala:2137
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s välityksellä %2$s"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2125
+#: src/client/composer/composer-widget.vala:2192
 msgid "_From:"
 msgstr "_Lähettäjä:"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2357
+#: src/client/composer/composer-widget.vala:2472
 msgid "Images"
 msgstr "Kuvat"
 
@@ -1552,131 +1557,136 @@ msgstr "Kuvat"
 msgid "New Message"
 msgstr "Uusi viesti"
 
-#: src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/spell-check-popover.vala:108
 msgid "Remove this language from the preferred list"
 msgstr "Poista tämä kieli suositeltujen listalta"
 
-#: src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:112
 msgid "Add this language to the preferred list"
 msgstr "Lisää tämä kieli suositeltujen listalle"
 
-#: src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:199
 msgid "Search for more languages"
 msgstr "Etsi lisää kieliä"
 
-#: src/client/conversation-list/conversation-list-view.vala:283
-msgid "Delete conversation"
-msgstr "Poista keskustelu"
-
-#: src/client/conversation-list/conversation-list-view.vala:286
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:337
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "Siirrä keskustelu _roskakoriin"
+msgstr[1] "Siirrä keskustelut _roskakoriin"
+
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:347
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "_Poista keskustelu"
+msgstr[1] "_Poista keskustelut"
+
+#: src/client/conversation-list/conversation-list-view.vala:356
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Merkitse _luetuksi"
 
-#: src/client/conversation-list/conversation-list-view.vala:289
+#: src/client/conversation-list/conversation-list-view.vala:359
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Merkitse l_ukemattomaksi"
 
-#: src/client/conversation-list/conversation-list-view.vala:292
+#: src/client/conversation-list/conversation-list-view.vala:362
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Poista tähti"
 
-#: src/client/conversation-list/conversation-list-view.vala:294
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Merkitse tähdellä"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:297
+#: src/client/conversation-list/conversation-list-view.vala:367
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:368
 msgid "R_eply All"
 msgstr "_Vastaa kaikille"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:299
+#: src/client/conversation-list/conversation-list-view.vala:369
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Lähetä edelleen"
 
-#: src/client/conversation-list/formatted-conversation-data.vala:11
+#: src/client/conversation-list/formatted-conversation-data.vala:18
 msgid "Me"
 msgstr "Minä"
 
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: src/client/conversation-viewer/conversation-email.vala:159
-msgid "Unknown"
-msgstr "Tuntematon"
-
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:976
-#: src/engine/rfc822/rfc822-utils.vala:289
+#: src/client/conversation-viewer/conversation-email.vala:971
+#: src/client/util/util-email.vala:207
 msgid "From:"
 msgstr "Lähettäjä:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:996
-#: src/engine/rfc822/rfc822-utils.vala:294
+#: src/client/conversation-viewer/conversation-email.vala:991
+#: src/client/util/util-email.vala:212
 msgid "Date:"
 msgstr "Päiväys:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
 #: src/client/conversation-viewer/conversation-email.vala:1001
-#: src/engine/rfc822/rfc822-utils.vala:292
+#: src/client/util/util-email.vala:210
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: src/client/conversation-viewer/conversation-message.vala:65
+#: src/client/conversation-viewer/conversation-message.vala:129
 msgid "This email address may have been forged"
 msgstr "Tämä sähköpostiosoite saattaa olla väärennetty"
 
-#. Compact headers
+#. Compact headers. These are partially done here and partially
+#. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:394
+#: src/client/conversation-viewer/conversation-message.vala:445
 msgid "No sender"
 msgstr "Ei lähettäjää"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:766
+#: src/client/conversation-viewer/conversation-message.vala:838
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:869
+#: src/client/conversation-viewer/conversation-message.vala:958
 msgid "Image"
 msgstr "Kuva"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:81
+#: src/client/conversation-viewer/conversation-viewer.vala:82
 msgid "No conversations selected"
 msgstr "Keskusteluja ei ole valittu"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:85
+#: src/client/conversation-viewer/conversation-viewer.vala:86
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Keskustelun valitseminen luettelosta näyttää sen tässä"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:94
+#: src/client/conversation-viewer/conversation-viewer.vala:95
 msgid "Multiple conversations selected"
 msgstr "Useita keskusteluja valittu"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:98
+#: src/client/conversation-viewer/conversation-viewer.vala:99
 msgid "Choosing an action will apply to all selected conversations"
 msgstr ""
 "Toiminnon valitseminen toteuttaa sen kaikkiin valittuihin keskusteluihin"
@@ -1685,20 +1695,20 @@ msgstr ""
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:107
-#: src/client/conversation-viewer/conversation-viewer.vala:120
+#: src/client/conversation-viewer/conversation-viewer.vala:108
+#: src/client/conversation-viewer/conversation-viewer.vala:121
 msgid "No conversations found"
 msgstr "Keskusteluja ei löytynyt"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:111
+#: src/client/conversation-viewer/conversation-viewer.vala:112
 msgid "This folder does not contain any conversations"
 msgstr "Tämä kansio ei sisällä keskusteluja"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:124
+#: src/client/conversation-viewer/conversation-viewer.vala:125
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Hakuehtosi eivät tuottaneet tuloksia. Yritä uudelleen eri hakuehdoilla"
 
@@ -1784,6 +1794,14 @@ msgstr "Palvelimen varmennetta kohdellaan turvattomana"
 msgid "An error has occurred processing the server’s certificate"
 msgstr "Virhe palvelimen varmennetta käsiteltäessä"
 
+#. / Translators: Title for problem report dialog error
+#. / information pane
+#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:89
+#: ui/problem-details-dialog.ui:12
+msgid "Details"
+msgstr "Yksityiskohdat"
+
 #. 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
@@ -1831,21 +1849,26 @@ msgstr[1] "%d tulosta"
 msgid "%s — New Messages"
 msgstr "%s — Uusia viestejä"
 
-#: src/client/notification/libnotify.vala:75
+#. / Notification body text for new email when no other
+#. / new messages are already awaiting.
+#: src/client/notification/notification-desktop.vala:90
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d uusi viesti"
 msgstr[1] "%d uutta viestiä"
 
-#: src/client/notification/libnotify.vala:78
+#. / Notification body text for new email when
+#. / other new messages have already been notified
+#. / about
+#: src/client/notification/notification-desktop.vala:98
 #, 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ä"
 
-#: src/client/notification/libnotify.vala:112
+#: src/client/notification/notification-desktop.vala:130
 #, c-format
 msgid ""
 "%s\n"
@@ -1860,91 +1883,99 @@ msgstr[1] ""
 "%s\n"
 "(%d muuta uutta viestiä tilille %s)"
 
-#: src/client/notification/libnotify.vala:155
-msgid "Open"
-msgstr "Avaa"
-
 #. / 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
+#: src/client/util/util-date.vala:69
 msgid "%l:%M %P"
 msgstr "%l:%M %P"
 
 #. / 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
+#: src/client/util/util-date.vala:72
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. / 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 "%l:%M %P"
-
 #. / 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
+#: src/client/util/util-date.vala:79
 msgid "%b %-e"
 msgstr "%-e. %b"
 
-#. / 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"
-
 #. / 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
+#: src/client/util/util-date.vala:84
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e. %Bta %Y, %-l:%M %P"
 
 #. / 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
+#: src/client/util/util-date.vala:87
 msgid "%B %-e, %Y %-H:%M"
 msgstr "%-e. %Bta %Y, %-H:%M"
 
 #. / 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
+#: src/client/util/util-date.vala:90
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e. %Bta %Y, %-l:%M %P"
 
-#: src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:159
 msgid "Now"
 msgstr "Nyt"
 
-#: src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:162
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "%d min sitten"
 msgstr[1] "%d min sitten"
 
-#: src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "%d t sitten"
 msgstr[1] "%d t sitten"
 
-#: src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:173
 msgid "Yesterday"
 msgstr "Eilen"
 
 #. / 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:183
+#: src/client/util/util-date.vala:178
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:862
+#. / 12 hours format for 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/client/util/util-date.vala:216
+#, fuzzy
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %l:%M %P"
+msgstr "%a, %e. %b %Y klo %H.%M"
+
+#. / 24 hours 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/client/util/util-date.vala:220
+#, fuzzy
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %H:%M"
+msgstr "%a, %e. %b %Y klo %H.%M"
+
+#. / 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/client/util/util-date.vala:224
+#, fuzzy
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %X"
+msgstr "%a, %e. %b %Y klo %H.%M"
+
+#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:944
 msgid "(no subject)"
 msgstr "(ei aihetta)"
 
@@ -1967,6 +1998,32 @@ msgid_plural "%s and %d others"
 msgstr[0] "%s ja %d muu"
 msgstr[1] "%s ja %d muuta"
 
+#. / 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/client/util/util-email.vala:160
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s %2$s kirjoitti:"
+
+#. / 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/client/util/util-email.vala:167
+#, c-format
+msgid "%s wrote:"
+msgstr "%s kirjoitti:"
+
+#. / 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/client/util/util-email.vala:173
+#, c-format
+msgid "On %s:"
+msgstr "%s:"
+
+#: src/client/util/util-email.vala:202
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Edelleenlähetetty viesti ----------"
+
 #: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "tavua"
@@ -2044,7 +2101,7 @@ msgstr "Arkisto"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:125
+#: src/engine/imap-db/imap-db-account.vala:117
 #, fuzzy
 #| msgid "attachment"
 msgctxt "Search operator"
@@ -2059,7 +2116,7 @@ msgstr "liite"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:134
+#: src/engine/imap-db/imap-db-account.vala:126
 #, fuzzy
 #| msgid "bcc"
 msgctxt "Search operator"
@@ -2073,7 +2130,7 @@ msgstr "piilokopio"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:142
+#: src/engine/imap-db/imap-db-account.vala:134
 #, fuzzy
 #| msgid "body"
 msgctxt "Search operator"
@@ -2088,7 +2145,7 @@ msgstr "sisältö"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:151
+#: src/engine/imap-db/imap-db-account.vala:143
 #, fuzzy
 #| msgid "cc"
 msgctxt "Search operator"
@@ -2103,7 +2160,7 @@ msgstr "kopio"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:160
+#: src/engine/imap-db/imap-db-account.vala:152
 #, fuzzy
 #| msgid "from"
 msgctxt "Search operator"
@@ -2117,7 +2174,7 @@ msgstr "lähettäjä"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:168
+#: src/engine/imap-db/imap-db-account.vala:160
 #, fuzzy
 #| msgid "is"
 msgctxt "Search operator"
@@ -2131,7 +2188,7 @@ msgstr "on"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: src/engine/imap-db/imap-db-account.vala:176
+#: src/engine/imap-db/imap-db-account.vala:168
 #, fuzzy
 #| msgid "subject"
 msgctxt "Search operator"
@@ -2146,7 +2203,7 @@ msgstr "aihe"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:185
+#: src/engine/imap-db/imap-db-account.vala:177
 #, fuzzy
 #| msgid "to"
 msgctxt "Search operator"
@@ -2161,7 +2218,7 @@ msgstr "vastaanottaja"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:206
+#: src/engine/imap-db/imap-db-account.vala:198
 #, fuzzy
 #| msgid "me"
 msgctxt "Search operator value - mail addressed to the user"
@@ -2175,7 +2232,7 @@ msgstr "minä"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:218
+#: src/engine/imap-db/imap-db-account.vala:210
 #, fuzzy
 #| msgid "me"
 msgctxt "Search operator value - mail sent by the user"
@@ -2189,7 +2246,7 @@ msgstr "minä"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:230
+#: src/engine/imap-db/imap-db-account.vala:222
 #, fuzzy
 #| msgid "read"
 msgctxt "'is:' search operator value"
@@ -2204,7 +2261,7 @@ msgstr "luettu"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:241
+#: src/engine/imap-db/imap-db-account.vala:233
 #, fuzzy
 #| msgid "starred"
 msgctxt "'is:' search operator value"
@@ -2218,7 +2275,7 @@ msgstr "tähdellinen"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:251
+#: src/engine/imap-db/imap-db-account.vala:243
 #, fuzzy
 #| msgid "unread"
 msgctxt "'is:' search operator value"
@@ -2229,7 +2286,7 @@ msgstr "lukematon"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:935
+#: src/engine/imap-engine/imap-engine-generic-account.vala:950
 msgid "Drafts | Draft"
 msgstr "Luonnokset | Luonnos | Drafts | Draft"
 
@@ -2237,13 +2294,13 @@ msgstr "Luonnokset | Luonnos | Drafts | Draft"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:944
+#: src/engine/imap-engine/imap-engine-generic-account.vala:959
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Lähetetyt | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:949
+#: src/engine/imap-engine/imap-engine-generic-account.vala:964
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Lähetetyt"
@@ -2252,7 +2309,7 @@ msgstr "Lähetetyt"
 #. Spam mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:959
+#: src/engine/imap-engine/imap-engine-generic-account.vala:974
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2264,13 +2321,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:969
+#: src/engine/imap-engine/imap-engine-generic-account.vala:984
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Roskakori | Trash | Rubbish | Rubbish Bin"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:974
+#: src/engine/imap-engine/imap-engine-generic-account.vala:989
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Poistetut"
@@ -2279,42 +2336,10 @@ msgstr "Poistetut"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:984
+#: src/engine/imap-engine/imap-engine-generic-account.vala:999
 msgid "Archive | Archives"
 msgstr "Arkisto | Arkistot | Archive | Archives"
 
-#. / 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:236
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %e. %b %Y klo %H.%M"
-
-#. / 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:242
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s %2$s kirjoitti:"
-
-#. / 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:249
-#, c-format
-msgid "%s wrote:"
-msgstr "%s kirjoitti:"
-
-#. / 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:255
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
-
-#: src/engine/rfc822/rfc822-utils.vala:284
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Edelleenlähetetty viesti ----------"
-
 #: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
 msgid "Add an account"
 msgstr "Lisää tili"
@@ -2395,10 +2420,6 @@ msgstr ""
 msgid "Remove account"
 msgstr "Poista tili"
 
-#: ui/accounts_editor_servers_pane.ui:17
-msgid "Cancel"
-msgstr "Peru"
-
 #: ui/accounts_editor_servers_pane.ui:47
 msgid "Apply"
 msgstr "Toteuta"
@@ -2535,7 +2556,7 @@ msgstr "Liit_ä ilman muotoilua"
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
+#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "T_utki…"
 
@@ -2629,6 +2650,108 @@ msgstr "Poista muotoilu valinnasta (Ctrl+Space)"
 msgid "Select spell checking languages"
 msgstr "Valitse oikoluvun kielet"
 
+#: ui/components-inspector-error-view.ui:33
+#, fuzzy
+#| msgid ""
+#| "If the problem is serious or persists, please copy and send these details "
+#| "to the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing "
+#| "list</a> or file a <a href=\"https://wiki.gnome.org/Apps/Geary/";
+#| "ReportingABug\">new bug report</a>."
+msgid ""
+"If the problem is serious or persists, please save and send these details to "
+"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
+"or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
+"\">new bug report</a>."
+msgstr ""
+"Jos ongelma on vakava tai se toistuu, kopioi ja lähetä virheen "
+"yksityiskohtaiset tiedot <a href=\"https://wiki.gnome.org/Apps/Geary/Contact";
+"\">postituslistalle</a> tai tee <a href=\"https://wiki.gnome.org/Apps/Geary/";
+"ReportingABug\">uusi vikailmoitus</a>."
+
+#: ui/components-inspector-error-view.ui:49
+msgid "Details:"
+msgstr "Tiedot:"
+
+#: ui/components-inspector-log-view.ui:13
+msgid "Inspector opened"
+msgstr ""
+
+#: ui/components-inspector-log-view.ui:65
+msgid "column"
+msgstr "sarake"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:20
+msgid "Toggle appending new log entries"
+msgstr ""
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
+#, fuzzy
+#| msgid "Search for more languages"
+msgid "Search for matching log entries"
+msgstr "Etsi lisää kieliä"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+msgid "Save logs entries and details"
+msgstr "Tallenna lokitietueet ja yksityiskohdat"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+msgid "Copy to clipboard"
+msgstr "Kopioi leikepöydälle"
+
+#: ui/conversation-contact-popover.ui:146
+#| msgid "Move conversation"
+#| msgid_plural "Move conversations"
+msgid "New Conversation…"
+msgstr "Uusi keskustelu…"
+
+#: ui/conversation-contact-popover.ui:159
+msgid "Copy Email Address"
+msgstr "Kopioi sähköpostiosoite"
+
+#: ui/conversation-contact-popover.ui:182
+#| msgid "Save and Close"
+msgid "Save in Contacts…"
+msgstr "Tallenna yhteystietosovellukseen…"
+
+#: ui/conversation-contact-popover.ui:195
+msgid "Show Conversations"
+msgstr "Näytä keskustelut"
+
+#: ui/conversation-contact-popover.ui:208
+msgid "Open in Contacts"
+msgstr "Avaa yhteystietosovelluksessa"
+
+#: ui/conversation-contact-popover.ui:221
+msgid "Always Load Remote Images"
+msgstr "Lataa aina etäkuvat"
+
+#. Title label on contact popover
+#: ui/conversation-contact-popover.ui:264
+msgid "Deceptive email address"
+msgstr "Harhaanjohtava sähköpostiosoite"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:294
+msgid "This email address is:"
+msgstr "Tämä sähköpostiosoite on:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:319
+msgid "But was forged as:"
+msgstr ""
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:344
+msgid "The sender may not be trustworthy"
+msgstr "Lähettäjä ei välttämättä ole luotettava"
+
 #: ui/conversation-email.ui:27
 msgid "Save all attachments"
 msgstr "Tallenna kaikki liitteet"
@@ -2703,15 +2826,15 @@ msgid "Mark Unread From _Here"
 msgstr "Merkitse lukemattomaksi tästä e_delleen"
 
 #. Translators: Menu item to move a single, specific message
-#. to the trash
+#. to the trash folder
 #: ui/conversation-email-menus.ui:50
-msgid "_Trash"
-msgstr "Siirr_ä roskakoriin"
+msgid "Move message to _Trash"
+msgstr "Siirrä viesti _roskakoriin"
 
 #. Translators: Menu item to delete a single, specific message
 #: ui/conversation-email-menus.ui:57
-msgid "_Delete…"
-msgstr "_Poista…"
+msgid "_Delete message…"
+msgstr "_Poista viesti…"
 
 #. Translators: Menu item to view the source for a message
 #: ui/conversation-email-menus.ui:69
@@ -2731,8 +2854,8 @@ msgid "Copy Link _Address"
 msgstr "Kopioi _linkin osoite"
 
 #: ui/conversation-message-menus.ui:17
-msgid "Send New _Message…"
-msgstr "L_ähetä uusi viesti…"
+msgid "_New Conversation…"
+msgstr "_Uusi keskustelu…"
 
 #: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
@@ -2746,10 +2869,6 @@ msgstr "T_allenna kuva nimellä…"
 msgid "_Select All"
 msgstr "Valitse _kaikki"
 
-#: ui/conversation-message-menus.ui:43
-msgid "Search for messages from"
-msgstr "Etsi viestejä lähettäjältä"
-
 #: ui/conversation-message.ui:63
 msgid "From <email>"
 msgstr "Lähettäjä <email>"
@@ -2816,11 +2935,11 @@ msgstr ""
 msgid "Find in conversation"
 msgstr "Etsi keskustelusta"
 
-#: ui/conversation-viewer.ui:74
+#: ui/conversation-viewer.ui:75
 msgid "Find the previous occurrence of the search string."
 msgstr "Etsi hakuehdon edellinen ilmentymä."
 
-#: ui/conversation-viewer.ui:95
+#: ui/conversation-viewer.ui:96
 msgid "Find the next occurrence of the search string."
 msgstr "Etsi hakuehdon seuraava ilmentymä."
 
@@ -2848,261 +2967,352 @@ msgstr "nimike"
 msgid "Conversation Shortcuts"
 msgstr "Keskustelun pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
-msgid "General"
-msgstr "Yleiset"
+msgid "Actions"
+msgstr "Toiminnot"
 
 #: ui/gtk/help-overlay.ui:17
 msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "Siirrä kohdistus seuraavaan/edelliseen osioon"
+msgid "New conversation"
+msgstr "Uusi keskustelu"
 
 #: ui/gtk/help-overlay.ui:24
 msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "Siirrä kohdistus keskusteluluetteloon"
+msgid "Reply to sender"
+msgstr "Vastaa lähettäjälle"
 
-#: ui/gtk/help-overlay.ui:31
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
 msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "Irrota lähetysikkuna"
+msgid "Reply to all"
+msgstr "Vastaa kaikille"
 
-#: ui/gtk/help-overlay.ui:38
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:289
 msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "Sulje lähetysikkuna"
+msgid "Forward"
+msgstr "Lähetä edelleen"
 
 #: ui/gtk/help-overlay.ui:45
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Mark read"
 msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Näytä pikanäppäimet"
+msgid "Un-mark/mark read"
+msgstr "Merkitse luetuksi"
 
-#: ui/gtk/help-overlay.ui:52
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
 msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Näytä ohje"
+msgid "Mark/un-mark starred"
+msgstr ""
 
-#: ui/gtk/help-overlay.ui:59
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
 msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Lopeta sovellus"
+msgid "Archive conversation"
+msgstr "Arkistoi keskustelu"
+
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
+msgctxt "shortcut window"
+msgid "Move conversation"
+msgstr "Siirrä keskustelu"
+
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Label the conversation"
+msgctxt "shortcut window"
+msgid "Label conversation"
+msgstr "Merkitse tunniste keskusteluun"
+
+#: ui/gtk/help-overlay.ui:80
+msgctxt "shortcut window"
+msgid "Trash conversation"
+msgstr "Siirrä keskustelu roskakoriin"
+
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move to trash"
+msgctxt "shortcut window"
+msgid "Move to Spam"
+msgstr "Siirrä roskakoriin"
+
+#: ui/gtk/help-overlay.ui:95
+msgctxt "shortcut window"
+msgid "Delete conversation"
+msgstr "Poista keskustelu"
 
-#: ui/gtk/help-overlay.ui:68
+#: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Haku"
 
-#: ui/gtk/help-overlay.ui:72
+#: ui/gtk/help-overlay.ui:108
 msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "Siirry hakukenttään"
+msgid "Search for conversations"
+msgstr "Etsi keskusteluja"
 
-#: ui/gtk/help-overlay.ui:79
+#: ui/gtk/help-overlay.ui:115
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Etsi nykyisestä keskustelusta"
 
-#: ui/gtk/help-overlay.ui:86
-msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "Etsi seuraava/edellinen nykyisestä keskustelusta"
-
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
+#: ui/gtk/help-overlay.ui:141
 msgctxt "shortcut window"
-msgid "Actions"
-msgstr "Toiminnot"
+msgid "Undo"
+msgstr "Kumoa"
 
-#: ui/gtk/help-overlay.ui:99
+#: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "Luo uusi viesti"
+msgid "Undo the last action"
+msgstr "Kumoa viimeisin toiminto"
 
-#: ui/gtk/help-overlay.ui:106
+#: ui/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Vastaa lähettäjälle "
+msgid "Redo the last action"
+msgstr "Tee uudelleen viimeisin toiminto"
 
-#: ui/gtk/help-overlay.ui:113
+#: ui/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
-msgid "Reply to all"
-msgstr "Vastaa kaikille"
+msgid "View"
+msgstr "Näkymä"
 
-#: ui/gtk/help-overlay.ui:120
+#: ui/gtk/help-overlay.ui:165
 msgctxt "shortcut window"
-msgid "Forward"
-msgstr "Lähetä edelleen"
+msgid "Zoom in"
+msgstr "Lähennä"
 
-#: ui/gtk/help-overlay.ui:127
+#: ui/gtk/help-overlay.ui:172
 msgctxt "shortcut window"
-msgid "Archive"
-msgstr "Arkistoi"
+msgid "Zoom out"
+msgstr "Loitonna"
 
-#: ui/gtk/help-overlay.ui:134
+#: ui/gtk/help-overlay.ui:179
 msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "Siirrä roskakoriin"
+msgid "Reset zoom"
+msgstr "Palauta mittakaava"
 
-#: ui/gtk/help-overlay.ui:141
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:367
 msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "Merkitse roskapostiksi/poista roskapostimerkintä"
+msgid "General"
+msgstr "Yleiset"
 
-#: ui/gtk/help-overlay.ui:148
+#: ui/gtk/help-overlay.ui:192
 msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "Siirrä keskustelu"
+msgid "Show help"
+msgstr "Näytä ohje"
 
-#: ui/gtk/help-overlay.ui:155
+#: ui/gtk/help-overlay.ui:199
 msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "Merkitse tunniste keskusteluun"
+msgid "Show keyboard shortcuts"
+msgstr "Näytä pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:163
+#: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "Merkitse luetuksi"
+msgid "Close current window"
+msgstr "Sulje nykyinen ikkuna"
 
-#: ui/gtk/help-overlay.ui:170
+#: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "Merkitse lukemattomaksi"
+msgid "Quit the application"
+msgstr "Lopeta sovellus"
 
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:222
 msgctxt "shortcut window"
-msgid "View"
-msgstr "Näkymä"
+msgid "Keyboard navigation"
+msgstr "Näppäimistöllä liikkuminen"
 
-#: ui/gtk/help-overlay.ui:183
+#: ui/gtk/help-overlay.ui:226
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
-msgid "Zoom in"
-msgstr "Lähennä"
+msgid "Focus the next pane"
+msgstr "Siirrä kohdistus seuraavaan/edelliseen osioon"
 
-#: ui/gtk/help-overlay.ui:190
+#: ui/gtk/help-overlay.ui:233
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
-msgid "Zoom out"
-msgstr "Loitonna"
+msgid "Focus the previous pane"
+msgstr "Siirrä kohdistus seuraavaan/edelliseen osioon"
 
-#: ui/gtk/help-overlay.ui:197
+#: ui/gtk/help-overlay.ui:240
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move focus to conversation list"
 msgctxt "shortcut window"
-msgid "Reset zoom"
-msgstr "Palauta mittakaava"
+msgid "Focus the conversation list"
+msgstr "Siirrä kohdistus keskusteluluetteloon"
 
-#: ui/gtk/help-overlay.ui:206
+#: ui/gtk/help-overlay.ui:247
+#, fuzzy
+#| msgid "Delete conversation"
 msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "Muut pikanäppäimet"
+msgid "Select the conversation down"
+msgstr "Poista keskustelu"
 
-#: ui/gtk/help-overlay.ui:210
+#: ui/gtk/help-overlay.ui:254
+#, fuzzy
+#| msgid "Delete conversation"
 msgctxt "shortcut window"
-msgid "Star"
-msgstr "Merkitse tähdellä"
+msgid "Select the conversation up"
+msgstr "Poista keskustelu"
 
-#: ui/gtk/help-overlay.ui:217
+#: ui/gtk/help-overlay.ui:261
 msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "Poista tähti"
+msgid "Focus next/previous message"
+msgstr "Kohdista edelliseen/seuraavaan viestiin"
 
-#: ui/gtk/help-overlay.ui:224
+#: ui/gtk/help-overlay.ui:271
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Show keyboard shortcuts"
 msgctxt "shortcut window"
-msgid "Delete"
-msgstr "Poista"
+msgid "Single-key shortcuts"
+msgstr "Näytä pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:231
+#: ui/gtk/help-overlay.ui:275
 msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "Siirry seuravaan (vanhempaan) keskusteluun"
+msgid "Reply to sender "
+msgstr "Vastaa lähettäjälle "
 
-#: ui/gtk/help-overlay.ui:238
+#: ui/gtk/help-overlay.ui:296
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Mark unread"
 msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "Siirry edelliseen (uudempaan) keskusteluun"
+msgid "Mark/un-mark read"
+msgstr "Merkitse lukemattomaksi"
 
-#: ui/gtk/help-overlay.ui:250
+#: ui/gtk/help-overlay.ui:343
 msgid "Composer Shortcuts"
 msgstr "Lähettämisen pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:258
+#: ui/gtk/help-overlay.ui:351
+msgctxt "shortcut window"
+msgid "Send"
+msgstr "Lähetä"
+
+#: ui/gtk/help-overlay.ui:358
+msgctxt "shortcut window"
+msgid "Add attachment"
+msgstr "Lisää liite"
+
+#: ui/gtk/help-overlay.ui:371
+msgctxt "shortcut window"
+msgid "Close composer window"
+msgstr "Sulje lähetysikkuna"
+
+#: ui/gtk/help-overlay.ui:378
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "Irrota lähetysikkuna"
+
+#: ui/gtk/help-overlay.ui:385
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Muokkaus"
+
+#: ui/gtk/help-overlay.ui:390
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr "Siirrä valinta leikepöydälle"
+
+#: ui/gtk/help-overlay.ui:397
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "Kopioi valinta leikepöydälle"
+
+#: ui/gtk/help-overlay.ui:404
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr "Liitä leikepöydältä"
+
+#: ui/gtk/help-overlay.ui:411
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Lainaa tekstiä"
 
-#: ui/gtk/help-overlay.ui:265
+#: ui/gtk/help-overlay.ui:418
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Poista tekstin lainaus"
 
-#: ui/gtk/help-overlay.ui:278
-msgctxt "shortcut window"
-msgid "Send"
-msgstr "Lähetä"
-
-#: ui/gtk/help-overlay.ui:285
+#: ui/gtk/help-overlay.ui:427
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Rich text mode"
 msgctxt "shortcut window"
-msgid "Add attachment"
-msgstr "Lisää liite"
+msgid "Rich text editing"
+msgstr "Muotoilutila"
 
-#: ui/gtk/help-overlay.ui:294
+#: ui/gtk/help-overlay.ui:431
 msgctxt "shortcut window"
-msgid "Rich text mode"
-msgstr "Muotoilutila"
+msgid "Paste without formatting"
+msgstr "Liitä ilman muotoilua"
 
-#: ui/gtk/help-overlay.ui:298
+#: ui/gtk/help-overlay.ui:438
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Lihavoitu teksti"
 
-#: ui/gtk/help-overlay.ui:305
+#: ui/gtk/help-overlay.ui:445
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Kursivoitu teksti"
 
-#: ui/gtk/help-overlay.ui:312
+#: ui/gtk/help-overlay.ui:452
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Alleviivattu teksti"
 
-#: ui/gtk/help-overlay.ui:319
+#: ui/gtk/help-overlay.ui:459
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Yliviivattu teksti"
 
-#: ui/gtk/help-overlay.ui:326
-msgctxt "shortcut window"
-msgid "Insert a link"
-msgstr "Lisää linkki"
-
-#: ui/gtk/help-overlay.ui:333
+#: ui/gtk/help-overlay.ui:466
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Poista muotoilu"
 
+#: ui/gtk/help-overlay.ui:473
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "Lisää kuva"
+
+#: ui/gtk/help-overlay.ui:480
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "Lisää linkki"
+
 #: ui/main-toolbar.ui:23
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "Lähetä viesti"
 
-#: ui/main-toolbar.ui:52
+#: ui/main-toolbar.ui:61
 msgid "Toggle search bar"
 msgstr "Hakupalkki päälle/pois"
 
-#: ui/main-toolbar.ui:112
+#: ui/main-toolbar.ui:113
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ui/main-toolbar.ui:135
+#: ui/main-toolbar.ui:136
 msgid "Reply All"
 msgstr "Vastaa kaikille"
 
-#: ui/main-toolbar.ui:158
+#: ui/main-toolbar.ui:159
 msgid "Forward"
 msgstr "Lähetä edelleen"
 
-#: ui/main-toolbar.ui:264
+#: ui/main-toolbar.ui:265
 msgid "Toggle find bar"
 msgstr "Hakupalkki päälle/pois"
 
-#: ui/main-toolbar.ui:306
+#: ui/main-toolbar.ui:286
 msgid "_Archive"
 msgstr "_Arkistoi"
 
@@ -3135,12 +3345,12 @@ msgid "_About Geary"
 msgstr "_Tietoja - Geary"
 
 #. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:183
+#: ui/main-window.ui:185
 msgid "Working offline"
 msgstr "Työskennellään offline-tilassa"
 
 #. Label and tooltip for offline infobar
-#: ui/main-window.ui:197
+#: ui/main-window.ui:199
 msgid ""
 "Your computer does not appear to be connected to the Internet.\n"
 "You will not be able to send or receive email until it is re-connected."
@@ -3150,61 +3360,29 @@ msgstr ""
 "muodostettu uudelleen."
 
 #. Label and tooltip for offline infobar
-#: ui/main-window.ui:200
+#: ui/main-window.ui:202
 msgid "You will not be able to send or receive email until re-connected."
 msgstr ""
 "Viestien vastaanottaminen tai lähettäminen ei onnistu, ennen kuin yhteys on "
 "muodostettu uudelleen."
 
-#. Button label for displaying technical details about an account problem
-#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: ui/main-window.ui:247 ui/problem-details-dialog.ui:13
-msgid "Details"
-msgstr "Yksityiskohdat"
-
-#. Button label for retrying an account problem
-#: ui/main-window.ui:261
-msgid "Retry"
-msgstr "Yritä uudelleen"
-
-#. Infobar title when one or more accounts have encounted an error
-#: ui/main-window.ui:294
-msgid "Account problem"
-msgstr "Tiliongelma"
-
-#. Label and tooltip for account service problem infobar
-#: ui/main-window.ui:308
-msgid ""
-"Geary encountered a problem connecting to an account.\n"
-"Please check your Internet connection, the server configuration and try "
-"again."
-msgstr ""
-"Geary kohtasi ongelman yhdistäessä tiliin.\n"
-"Tarkista internetyhteytesi tila ja palvelimen asetukset, yritä sen jälkeen "
-"uudelleen."
-
-#. Label and tooltip for account service problem infobar
-#: ui/main-window.ui:311
-msgid "Geary encountered a problem connecting to an account."
-msgstr "Geary kohtasi ongelman yhdistäessä tiliin."
-
 #. Button label for retrying TLS cert validation
-#: ui/main-window.ui:358
+#: ui/main-window.ui:249
 msgid "Check"
 msgstr "Tarkista"
 
 #. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:362
+#: ui/main-window.ui:253
 msgid "Check the security details for the connection"
 msgstr "Tarkista yhteyden salaustiedot"
 
 #. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/main-window.ui:391
+#: ui/main-window.ui:282
 msgid "Security problem"
 msgstr "Tietoturvaongelma"
 
 #. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:405
+#: ui/main-window.ui:296
 msgid ""
 "An account has reported an untrusted server.\n"
 "Please check the server configuration and try again."
@@ -3213,22 +3391,22 @@ msgstr ""
 "Tarkista palvelimen asetukset ja yritä uudelleen."
 
 #. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:408
+#: ui/main-window.ui:299
 msgid "An account has reported an untrusted server."
 msgstr "Tili on ilmoittanut ei-luotetusta palvelimesta."
 
 #. Button tooltip for retrying when a login error has occurred
-#: ui/main-window.ui:459
+#: ui/main-window.ui:350
 msgid "Retry login, you will be prompted for your password"
 msgstr "Yritä uudelleen kirjautumista, sinulta kysytään salasanaa"
 
 #. Infobar title when one or more accounts have a login error
-#: ui/main-window.ui:488
+#: ui/main-window.ui:379
 msgid "Login problem"
 msgstr "Kirjautumisongelma"
 
 #. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:502
+#: ui/main-window.ui:393
 msgid ""
 "An account has reported an incorrect login or password.\n"
 "Please check your login name and try again."
@@ -3237,7 +3415,7 @@ msgstr ""
 "Tarkista käyttäjätunnus ja yritä uudelleen."
 
 #. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:505
+#: ui/main-window.ui:396
 msgid "An account has reported an incorrect login or password."
 msgstr "Tili ilmoitti väärästä käyttäjätunnuksesta tai salasanasta."
 
@@ -3297,38 +3475,219 @@ msgstr "Geary jatkaa käynnissä olemista kun kaikki ikkunat on suljettu"
 msgid "Preferences"
 msgstr "Asetukset"
 
-#. Button label for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:17
-msgid "Copy to Clipboard"
-msgstr "Kopioi leikepöydälle"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Gearyn päivitys on meneillään…"
 
-#. Button tooltip for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:21
-msgid ""
-"Copy technical details to clipboard for pasting into an email or bug report"
-msgstr ""
-"Kopioi tekniset yksityiskohdat leikepöydälle, jotta voit liittää ne "
-"sähköpostiviestiin tai vikailmoitukseen"
+#~ msgid "mail-send"
+#~ msgstr "mail-send"
 
-#: ui/problem-details-dialog.ui:73
-msgid ""
-"If the problem is serious or persists, please copy and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
-"bug report</a>."
-msgstr ""
-"Jos ongelma on vakava tai se toistuu, kopioi ja lähetä virheen "
-"yksityiskohtaiset tiedot <a href=\"https://wiki.gnome.org/Apps/Geary/Contact";
-"\">postituslistalle</a> tai tee <a href=\"https://wiki.gnome.org/Apps/Geary/";
-"ReportingABug\">uusi vikailmoitus</a>."
+#~ msgid "org.gnome.Geary"
+#~ msgstr "org.gnome.Geary"
 
-#: ui/problem-details-dialog.ui:89
-msgid "Details:"
-msgstr "Tiedot:"
+#~ msgid "Save drafts on server"
+#~ msgstr "Tallenna luonnokset palvelimelle"
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Gearyn päivitys on meneillään…"
+#~ msgid "Use %s to open a new composer window"
+#~ msgstr "Käytä %s uuden lähetysikkunan avaamista varten"
+
+#~ msgid "Please report comments, suggestions and bugs to:"
+#~ msgstr "Kommentoi, ehdota uusia ideoita ja ilmoita vioista:"
+
+#~ msgid "Failed to parse command line options: %s\n"
+#~ msgstr "Komentorivivalintojen jäsennys epäonnistui: %s\n"
+
+#~ msgid "Undo move (Ctrl+Z)"
+#~ msgstr "Kumoa siirtäminen (Ctrl+Z)"
+
+#~ msgid "Close the draft message?"
+#~ msgid_plural "Close all draft messages?"
+#~ msgstr[0] "Suljetaanko luonnosviesti?"
+#~ msgstr[1] "Suljetaanko kaikki luonnosviestit?"
+
+#~ msgid "Undo trash (Ctrl+Z)"
+#~ msgstr "Kumoa roskakoriin siirto (Ctrl+Z)"
+
+#~ msgid "Undo archive (Ctrl+Z)"
+#~ msgstr "Kumoa arkistointi (Ctrl+Z)"
+
+#~ msgid "Undo (Ctrl+Z)"
+#~ msgstr "Kumoa (Ctrl+Z)"
+
+#~ msgid "Move conversation to Trash (Delete, Backspace)"
+#~ msgid_plural "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr[0] "Siirrä keskustelu roskakoriin (Delete, Backspace)"
+#~ msgstr[1] "Siirrä keskustelut roskakoriin (Delete, Backspace)"
+
+#~ msgid "Delete conversation (Shift+Delete)"
+#~ msgid_plural "Delete conversations (Shift+Delete)"
+#~ msgstr[0] "Poista keskustelu (Shift+Delete)"
+#~ msgstr[1] "Poista keskustelut (Shift+Delete)"
+
+#~ msgid "Problem connecting to incoming server for %s"
+#~ msgstr "Virhe yhdistäessä tilin %s saapuvan postin palvelimeen"
+
+#~ msgid ""
+#~ "Could not connect to %s, check your Internet access and the server name "
+#~ "and try again"
+#~ msgstr ""
+#~ "Ei voitu yhdistää palvelimeen %s. Tarkista internetyhteytesi tila ja "
+#~ "palvelimen nimi, yritä sen jälkeen uudelleen"
+
+#~ msgid "Problem connecting to outgoing server for %s"
+#~ msgstr "Virhe yhdistäessä tilin %s lähtevän postin palvelimeen"
+
+#~ msgid "Problem communicating with incoming server for %s"
+#~ msgstr "Ongelma oltaessa yhteydessä tilin %s saapuvan postin palvelimeen"
+
+#~ msgid ""
+#~ "Network error talking to %s, check your Internet access and try again"
+#~ msgstr ""
+#~ "Verkkovirhe palvelimeen %s. Tarkista internetyhteytesi tila ja yritä "
+#~ "uudelleen"
+
+#~ msgid "Problem communicating with outgoing mail server"
+#~ msgstr "Ongelma oltaessa yhteydessä lähtevän postin palvelimeen"
+
+#~ msgid ""
+#~ "Geary did not understand a message from %s or vice versa, please file a "
+#~ "bug report"
+#~ msgstr ""
+#~ "Geary ei ymmärtänyt palvelimen %s viestiä tai palvelin ei ymmärtänyt "
+#~ "Gearyn viestiä.. Ilmoita tästä ongelmasta."
+
+#~ msgid ""
+#~ "Could not communicate with %s for %s, check the server name and try again "
+#~ "in a moment"
+#~ msgstr ""
+#~ "Yhteys palvelimeen %s tilillä %s asiointia varten ei onnistunut, tarkista "
+#~ "palvelimen nimi ja yritä uudelleen hetken kuluttua"
+
+#~ msgid "Incoming mail server password required for %s"
+#~ msgstr "Tilin %s saapuvan postin palvelin vaatii salasanan"
+
+#~ msgid "Messages cannot be received without the correct password."
+#~ msgstr "Viestejä ei voi vastaanottaa ilman oikeaa salasanaa."
+
+#~ msgid "Outgoing mail server password required for %s"
+#~ msgstr "Tilin %s salasana vaaditaan lähtevän postin palvelimelle"
+
+#~ msgid "Messages cannot be sent without the correct password."
+#~ msgstr "Viestejä ei voi lähettää ilman oikeaa salasanaa."
+
+#~ msgid "Incoming mail server security is not trusted for %s"
+#~ msgstr "Tilin %s saapuvan postin palvelimen turvallisuuteen ei luoteta"
+
+#~ msgid "Messages will not be received until checked."
+#~ msgstr "Viestejä ei voi vastaanottaa ennen tarkistusta."
+
+#~ msgid "Check security details"
+#~ msgstr "Tarkista salaustiedot"
+
+#~ msgid "Outgoing mail server security is not trusted for %s"
+#~ msgstr "Tilin %s lähtevän postin palvelimen turvallisuuteen ei luoteta"
+
+#~ msgid "Messages cannot be sent until checked."
+#~ msgstr "Viestejä ei voi lähettää ennen tarkistusta."
+
+#~ msgid "A problem occurred checking mail for %s"
+#~ msgstr "Tilin %s viestejä tarkastaessa tapahtui virhe"
+
+#~ msgid ""
+#~ "Something went wrong, please file a bug report if the problem persists"
+#~ msgstr "Jokin meni vikaan. Tee vikailmoitus, jos ongelma ilmenee uudelleen"
+
+#~ msgid "A database problem has occurred"
+#~ msgstr "Havaittiin tietokantaongelma"
+
+#~ msgid "Messages for %s must be downloaded again."
+#~ msgstr "Tilin %s viestit tulee ladata uudelleen."
+
+#~ msgid "Open"
+#~ msgstr "Avaa"
+
+#~ msgctxt "Default clock format"
+#~ msgid "%l:%M %P"
+#~ msgstr "%l:%M %P"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "_Trash"
+#~ msgstr "Siirr_ä roskakoriin"
+
+#~ msgid "Send New _Message…"
+#~ msgstr "L_ähetä uusi viesti…"
+
+#~ msgid "Search for messages from"
+#~ msgstr "Etsi viestejä lähettäjältä"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to search box"
+#~ msgstr "Siirry hakukenttään"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Find next/previous in current conversation"
+#~ msgstr "Etsi seuraava/edellinen nykyisestä keskustelusta"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Compose a new message"
+#~ msgstr "Luo uusi viesti"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive"
+#~ msgstr "Arkistoi"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Toggle spam"
+#~ msgstr "Merkitse roskapostiksi/poista roskapostimerkintä"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move the conversation"
+#~ msgstr "Siirrä keskustelu"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Additional Shortcuts"
+#~ msgstr "Muut pikanäppäimet"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Star"
+#~ msgstr "Merkitse tähdellä"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Unstar"
+#~ msgstr "Poista tähti"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete"
+#~ msgstr "Poista"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to next (older) conversation"
+#~ msgstr "Siirry seuravaan (vanhempaan) keskusteluun"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to previous (newer) conversation"
+#~ msgstr "Siirry edelliseen (uudempaan) keskusteluun"
+
+#~ msgid "Retry"
+#~ msgstr "Yritä uudelleen"
+
+#~ msgid ""
+#~ "Geary encountered a problem connecting to an account.\n"
+#~ "Please check your Internet connection, the server configuration and try "
+#~ "again."
+#~ msgstr ""
+#~ "Geary kohtasi ongelman yhdistäessä tiliin.\n"
+#~ "Tarkista internetyhteytesi tila ja palvelimen asetukset, yritä sen "
+#~ "jälkeen uudelleen."
+
+#~ msgid ""
+#~ "Copy technical details to clipboard for pasting into an email or bug "
+#~ "report"
+#~ msgstr ""
+#~ "Kopioi tekniset yksityiskohdat leikepöydälle, jotta voit liittää ne "
+#~ "sähköpostiviestiin tai vikailmoitukseen"
 
 #~ msgid ""
 #~ "A Gravatar or Libravatar compatible URL, set to the empty string to "
@@ -3343,9 +3702,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Empty Spam or Trash folders"
 #~ msgstr "Tyhjennä roskaposti- tai roskakorikansiot"
 
-#~ msgid "Email address:"
-#~ msgstr "Sähköpostiosoite:"
-
 #~ msgid "Delete conversations (Shift+Delete)"
 #~ msgstr "Poista keskustelut (Shift+Delete)"
 
@@ -3355,15 +3711,9 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Archive conversations (A)"
 #~ msgstr "Arkistoi keskustelut (A)"
 
-#~ msgid "Mark conversations"
-#~ msgstr "Merkitse keskustelut"
-
 #~ msgid "Add label to conversations"
 #~ msgstr "Lisää tunniste keskusteluihin"
 
-#~ msgid "Move conversations"
-#~ msgstr "Siirrä keskustelut"
-
 #~ msgid "Retry connecting now"
 #~ msgstr "Yritä yhdistää uudelleen nyt"
 
@@ -3409,9 +3759,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Enter your account information to get started."
 #~ msgstr "Anna tilisi tiedot, jotta voit aloittaa käytön."
 
-#~ msgid "Edit"
-#~ msgstr "Muokkaa"
-
 #~ msgid "Preview"
 #~ msgstr "Esikatsele"
 
@@ -3735,9 +4082,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid " (Invalid?)"
 #~ msgstr " (Virheellinen?)"
 
-#~ msgid "_Save As..."
-#~ msgstr "_Tallenna nimellä..."
-
 #~ msgid "Save A_ttachment..."
 #~ msgid_plural "Save All A_ttachments..."
 #~ msgstr[0] "_Tallenna liite"


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