[geary] Update Finnish translation



commit 18106628e14b16cdb44751f2bd73caffc988ce24
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Sun Feb 23 12:45:20 2020 +0000

    Update Finnish translation

 po/fi.po | 2284 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1244 insertions(+), 1040 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 2a83e4a3..dc4ff5d7 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-08-18 11:39+0000\n"
-"PO-Revision-Date: 2019-08-18 17:54+0300\n"
+"POT-Creation-Date: 2020-02-16 20:26+0000\n"
+"PO-Revision-Date: 2020-02-23 14:43+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.3\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -30,36 +30,38 @@ 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:12
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
+#: src/client/application/application-main-window.vala:555
 msgid "Geary"
 msgstr "Geary"
 
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
 msgid "Email"
 msgstr "Sähköposti"
 
 #. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:16
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:24
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/application-client.vala:32
 msgid "Send and receive email"
 msgstr "Lähetä ja vastaanota sähköpostia"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
 msgstr "Email;E-mail;Mail;Sähköposti;Maili;posti;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:14
+#: desktop/org.gnome.Geary.appdata.xml.in.in:14
 msgid "Geary Development Team"
 msgstr "Geary-kehitystiimi"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:18
+#: desktop/org.gnome.Geary.appdata.xml.in.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, "
@@ -69,7 +71,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:23
+#: desktop/org.gnome.Geary.appdata.xml.in.in:23
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -77,55 +79,59 @@ msgstr ""
 "Keskusteluiden avulla voit lukea koko viestiketjun ilman, että joudut "
 "napsauttamaan viestistä toiseen itse."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:27
 msgid "Geary’s features include:"
 msgstr "Gearyn ominaisuuksiin kuuluu muun muassa:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Quick email account setup"
 msgstr "Nopea sähköpostitilin asetusten teko"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.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:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Fast, full text and keyword search"
 msgstr "Nopea haku koko tekstin ja avainsanojen tuella"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Monipuolinen HTML- ja raakatekstilähetys"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Desktop notification of new mail"
 msgstr "Työpöytäilmoitukset uusista viesteistä"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:34
+#: desktop/org.gnome.Geary.appdata.xml.in.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:48
+#: desktop/org.gnome.Geary.appdata.xml.in.in:48
 msgid "Geary displaying a conversation"
 msgstr "Geary ja viestiketju"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:59
+#: desktop/org.gnome.Geary.appdata.xml.in.in:59
 msgid "Geary showing the rich text composer"
 msgstr "Geary ja viestin kirjoitusikkuna"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/org.gnome.Geary.desktop.in:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
 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:22
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "Lähetä viesti"
 
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "Uusi ikkuna"
+
 #: desktop/org.gnome.Geary.gschema.xml:8
 msgid "Maximize window"
 msgstr "Suurenna ikkuna"
@@ -184,124 +190,148 @@ msgid "True if the folder list Paned is in the horizontal orientation."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Show/hide formatting toolbar"
+msgstr "Näytä/piilota muotoilupalkki"
+
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "True if the formatting toolbar in the composer is shown."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:56
 msgid "Position of message list pane"
 msgstr "Viestiluettelopaneelin sijainti"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:57
 msgid "Position of the message list Paned grabber."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:56
+#: desktop/org.gnome.Geary.gschema.xml:62
 msgid "Autoselect next message"
 msgstr "Valitse automaattisesti seuraava viesti"
 
-#: desktop/org.gnome.Geary.gschema.xml:57
+#: desktop/org.gnome.Geary.gschema.xml:63
 msgid "True if we should autoselect the next available conversation."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:68
 msgid "Display message previews"
 msgstr "Näytä viestien esikatselut"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:69
 msgid "True if we should display a short preview of each message."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Use single key shortcuts"
+msgstr "Käytä yhden näppäimen pikanäppäimiä"
+
+#: desktop/org.gnome.Geary.gschema.xml:75
+msgid ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Languages that shall be used in the spell checker"
 msgstr "Oikoluvussa käytettävät kielet"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: desktop/org.gnome.Geary.gschema.xml:83
 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:76
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Languages that are displayed in the spell checker popover"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:77
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:82
-msgid "Enable notification sounds"
-msgstr "Käytä ilmoitusääniä"
-
-#: desktop/org.gnome.Geary.gschema.xml:83
-msgid "True to play sounds for notifications and sending."
-msgstr ""
-
-#: 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:89
-msgid "True to show notification bubbles."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:94
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Notify of new mail at startup"
 msgstr "Ilmoita uusista viesteistä käynnistyksen yhteydessä"
 
-#: desktop/org.gnome.Geary.gschema.xml:95
+#: desktop/org.gnome.Geary.gschema.xml:97
 #, 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:100
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
 msgstr "Kysy liitettä avattaessa"
 
-#: desktop/org.gnome.Geary.gschema.xml:101
+#: desktop/org.gnome.Geary.gschema.xml:103
 #, 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:106
+#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
 msgstr "Muodostetaanko lähetettävät viestit HTML-muodossa"
 
-#: desktop/org.gnome.Geary.gschema.xml:107
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:112
+#: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:113
+#: desktop/org.gnome.Geary.gschema.xml:115
 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:118
+#: desktop/org.gnome.Geary.gschema.xml:120
 msgid "Zoom of conversation viewer"
 msgstr "Keskustelunäkymän suurennus"
 
-#: desktop/org.gnome.Geary.gschema.xml:119
+#: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:124
+#: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
 msgstr "Irrotetun lähetysikkunan koko"
 
-#: desktop/org.gnome.Geary.gschema.xml:125
+#: desktop/org.gnome.Geary.gschema.xml:127
 msgid "The last recorded size of the detached composer window."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:130
+#: desktop/org.gnome.Geary.gschema.xml:132
+#, fuzzy
+#| msgid "Error sending email"
+msgid "Undo sending email delay"
+msgstr "Virhe sähköpostia lähettäessä"
+
+#: desktop/org.gnome.Geary.gschema.xml:133
+msgid ""
+"The number of seconds to wait before sending an email. Set to zero or less "
+"to disable."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:146
 msgid "Whether we migrated the old settings"
 msgstr "Tehtiinkö vanhojen asetusten migraatio"
 
-#: desktop/org.gnome.Geary.gschema.xml:131
+#: desktop/org.gnome.Geary.gschema.xml:147
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -309,24 +339,24 @@ msgstr ""
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:203
+#: src/client/accounts/accounts-editor.vala:210
 msgid "Failed to store certificate"
 msgstr "Varmenteen tallentaminen epäonnistui"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:109
+#: src/client/accounts/accounts-editor-add-pane.vala:108
 msgid "All others"
 msgstr "Kaikki muut"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:196
+#: src/client/accounts/accounts-editor-add-pane.vala:195
 #: src/client/accounts/accounts-editor-servers-pane.vala:316
 msgid "Check your receiving login and password"
 msgstr "Tarkista vastaanottamiseen käytettävä käyttäjätunnus ja salasana"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:211
+#: src/client/accounts/accounts-editor-add-pane.vala:210
 #: src/client/accounts/accounts-editor-servers-pane.vala:329
 msgid "Check your receiving server details"
 msgstr "Tarkista vastaanottamiseen käytettävän palvelimen tiedot"
@@ -336,51 +366,51 @@ msgstr "Tarkista vastaanottamiseen käytettävän palvelimen tiedot"
 #. succeeded, so the user probably needs to
 #. specify custom creds here
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:233
+#: src/client/accounts/accounts-editor-add-pane.vala:232
 #: src/client/accounts/accounts-editor-servers-pane.vala:350
 msgid "Check your sending login and password"
 msgstr "Tarkista lähettämiseen käytettävä käyttäjätunnus ja salasana"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:247
+#: src/client/accounts/accounts-editor-add-pane.vala:246
 #: src/client/accounts/accounts-editor-servers-pane.vala:363
 msgid "Check your sending server details"
 msgstr "Tarkista lähettämiseen käytettävän palvelimen tiedot"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:262
+#: src/client/accounts/accounts-editor-add-pane.vala:261
 msgid "Check your email address and password"
 msgstr "Tarkista sähköpostiosoitteesi ja salasanasi"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:273
+#: src/client/accounts/accounts-editor-add-pane.vala:272
 msgid "Could not connect, check your network"
 msgstr "Yhdistäminen ei onnistu, tarkista verkkoyhteytesi"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:286
+#: src/client/accounts/accounts-editor-add-pane.vala:285
 msgid "An unexpected problem occurred"
 msgstr "Tapahtui odottomaton ongelma"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:304
+#: src/client/accounts/accounts-editor-add-pane.vala:303
 #, c-format
 msgid "Account not created: %s"
 msgstr "Tiliä ei luotu: %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:551
+#: src/client/accounts/accounts-editor-add-pane.vala:558
 msgid "Your name"
 msgstr "Nimi"
 
 #. Translators: Label used for the address part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:568
-#: src/client/accounts/accounts-editor-edit-pane.vala:501
+#: src/client/accounts/accounts-editor-add-pane.vala:575
+#: src/client/accounts/accounts-editor-edit-pane.vala:513
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
@@ -389,8 +419,8 @@ msgstr "Sähköpostiosoite"
 #. Translators: This is used as a placeholder for the
 #. address part of an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:571
-#: src/client/accounts/accounts-editor-edit-pane.vala:469
+#: src/client/accounts/accounts-editor-add-pane.vala:579
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
 msgid "person example com"
 msgstr "nimi verkkotunnus fi"
 
@@ -398,15 +428,15 @@ msgstr "nimi verkkotunnus fi"
 #. when adding an account
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:585
-#: src/client/accounts/accounts-editor-servers-pane.vala:880
+#: src/client/accounts/accounts-editor-add-pane.vala:593
+#: src/client/accounts/accounts-editor-servers-pane.vala:884
 msgid "Login name"
 msgstr "Käyttäjätunnus"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:599
-#: src/client/accounts/accounts-editor-servers-pane.vala:999
+#: src/client/accounts/accounts-editor-add-pane.vala:607
+#: src/client/accounts/accounts-editor-servers-pane.vala:1006
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Salasana"
@@ -415,14 +445,14 @@ msgstr "Salasana"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:621
-#: src/client/accounts/accounts-editor-servers-pane.vala:727
+#: src/client/accounts/accounts-editor-add-pane.vala:629
+#: src/client/accounts/accounts-editor-servers-pane.vala:728
 msgid "IMAP server"
 msgstr "IMAP-palvelin"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:624
+#: src/client/accounts/accounts-editor-add-pane.vala:632
 msgid "imap.example.com"
 msgstr "imap.esimerkki.com"
 
@@ -430,20 +460,20 @@ msgstr "imap.esimerkki.com"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:630
-#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#: src/client/accounts/accounts-editor-add-pane.vala:638
+#: src/client/accounts/accounts-editor-servers-pane.vala:734
 msgid "SMTP server"
 msgstr "SMTP-palvelin"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:633
+#: src/client/accounts/accounts-editor-add-pane.vala:641
 msgid "smtp.example.com"
 msgstr "smtp.esimerkki.com"
 
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:278
+#: src/client/accounts/accounts-editor-edit-pane.vala:277
 #: ui/accounts_editor_remove_pane.ui:123
 msgid "Account name"
 msgstr "Tilin nimi"
@@ -452,46 +482,46 @@ msgstr "Tilin nimi"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:312
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "Muuta takaisin tilin nimeksi “%s”"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:336
+#: src/client/accounts/accounts-editor-edit-pane.vala:342
 msgid "Add a new sender email address"
 msgstr "Lisää uusi lähettäjän sähköpostiosoite"
 
 #. Translators: Label used to indicate the user has
 #. provided no display name for one of their sender
 #. email addresses in their account settings.
-#: src/client/accounts/accounts-editor-edit-pane.vala:417
+#: src/client/accounts/accounts-editor-edit-pane.vala:423
 msgid "Name not set"
 msgstr "Nimeä ei ole asetettu"
 
 #. Translators: This is used as a placeholder for the
 #. display name for an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:456
+#: src/client/accounts/accounts-editor-edit-pane.vala:464
 msgid "Sender Name"
 msgstr "Lähettäjän nimi"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
 msgid "Remove"
 msgstr "Poista"
 
 #. Translators: Label used for the display name part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:494
+#: src/client/accounts/accounts-editor-edit-pane.vala:506
 msgid "Sender name"
 msgstr "Lähettäjän nimi"
 
 #. Translators: Label used as the undo tooltip after adding an
 #. new sender email address to an account. The string
 #. substitution is the email address added.
-#: src/client/accounts/accounts-editor-edit-pane.vala:561
+#: src/client/accounts/accounts-editor-edit-pane.vala:573
 #, c-format
 msgid "Remove “%s”"
 msgstr "Poista “%s”"
@@ -499,7 +529,7 @@ msgstr "Poista “%s”"
 #. Translators: Label used as the undo tooltip after editing a
 #. sender address for an account. The string substitution is
 #. the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:601
+#: src/client/accounts/accounts-editor-edit-pane.vala:613
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "Kumoa muutokset tiliin “%s”"
@@ -507,7 +537,7 @@ msgstr "Kumoa muutokset tiliin “%s”"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:688
+#: src/client/accounts/accounts-editor-edit-pane.vala:700
 #, c-format
 msgid "Add “%s” back"
 msgstr "Lisää “%s” takaisin"
@@ -515,14 +545,14 @@ msgstr "Lisää “%s” takaisin"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:730
+#: src/client/accounts/accounts-editor-edit-pane.vala:742
 msgid "Undo signature changes"
-msgstr ""
+msgstr "Kumoa allekirjoitusmuutokset"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:778
+#: src/client/accounts/accounts-editor-edit-pane.vala:790
 msgid "Download mail"
 msgstr "Lataa sähköposti"
 
@@ -531,99 +561,100 @@ msgstr "Lataa sähköposti"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:810
+#: src/client/accounts/accounts-editor-edit-pane.vala:822
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Muuta latausaikajaksoksi: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:831
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
 msgid "Everything"
 msgstr "Kaikki"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:835
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "2 weeks back"
 msgstr "2 viikkoa sitten"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:839
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 month back"
 msgstr "1 kuukausi sitten"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "3 months back"
 msgstr "3 kuukautta sitten"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "6 months back"
 msgstr "6 kuukautta sitten"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
 msgid "1 year back"
 msgstr "1 vuosi sitten"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
 msgid "2 years back"
 msgstr "2 vuotta sitten"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
 msgid "4 years back"
 msgstr "4 vuotta sitten"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:865
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
 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
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2053
 msgid "Undo"
 msgstr "Kumoa"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:251
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2036
 msgid "Redo"
 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-list-pane.vala:358
+#: src/client/accounts/accounts-editor-list-pane.vala:446
 #: 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-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:450
 #: 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-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:371
+#: src/client/accounts/accounts-editor-list-pane.vala:384
 msgid "This account has been disabled"
 msgstr "Tämä tili on poistettu käytöstä"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but because of some error are not able to be
 #. used.
-#: src/client/accounts/accounts-editor-list-pane.vala:380
+#: src/client/accounts/accounts-editor-list-pane.vala:393
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Tämä tili kohtasi ongelman, eikä ole käytettävissä"
 
 #. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:430
+#: src/client/accounts/accounts-editor-list-pane.vala:443
 msgid "Other email providers"
 msgstr "Muut sähköpostipalveluntarjoajat"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:547
+#: src/client/accounts/accounts-editor-list-pane.vala:560
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Tili “%s” poistettu"
@@ -631,7 +662,7 @@ msgstr "Tili “%s” poistettu"
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:554
+#: src/client/accounts/accounts-editor-list-pane.vala:567
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Tili “%s” palautettu"
@@ -658,8 +689,8 @@ 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:479
-#: src/client/accounts/accounts-editor-servers-pane.vala:752
-#: src/client/accounts/accounts-editor-servers-pane.vala:964
+#: src/client/accounts/accounts-editor-servers-pane.vala:755
+#: src/client/accounts/accounts-editor-servers-pane.vala:970
 #: src/engine/api/geary-special-folder-type.vala:58
 msgid "None"
 msgstr "Ei mitään"
@@ -676,7 +707,8 @@ 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:534 ui/main-window.ui:346
+#: src/client/accounts/accounts-editor-row.vala:534
+#: ui/application-main-window.ui:346
 msgid "Login"
 msgstr "Kirjaudu"
 
@@ -736,132 +768,33 @@ msgstr "Tallenna lähetetyt viestit palvelimelle"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:950
+#: src/client/accounts/accounts-editor-servers-pane.vala:956
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s käyttää OAuth2:ta"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:960
+#: src/client/accounts/accounts-editor-servers-pane.vala:966
 msgid "Use receiving server login"
 msgstr "Käytä vastaanottavan palvelimen kirjautumistietoja"
 
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/application-controller.vala:59
+#: src/client/application/application-attachment-manager.vala:21
 msgid "Untitled"
 msgstr "Nimetön"
 
-#. / 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/application-controller.vala:932
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "Kohteen %s tietokannan avaaminen epäonnistui"
-
-#: src/client/application/application-controller.vala:933
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronize with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
-msgstr ""
-"Tämän tilin paikallista postitietokantaa avatessa tapahtui virhe. Tämä "
-"saattaa johtua tietokannan rikkoutumisesta. Tietokanta sijaitsee seuraavassa "
-"kansiossa:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary voi rakentaa tietokannan uudelleen ja synkronoida sen uudelleen "
-"palvelimen kanssa tai sulkeutua.\n"
-"\n"
-"Tietokannan rakentaminen uudelleen poistaa kaikki paikalliset viestit ja "
-"niiden liitteet. <b>Toimenpiteellä ei ole vaikutusta palvelimella oleviin "
-"viesteihin ja liitteisiin.</b>"
-
-#: src/client/application/application-controller.vala:935
-msgid "_Rebuild"
-msgstr "Ra_kenna uudelleen"
-
-#: src/client/application/application-controller.vala:935
-msgid "E_xit"
-msgstr "_Poistu"
-
-#: 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/application-controller.vala:945
-#, c-format
-msgid ""
-"Error during rebuild:\n"
-"\n"
-"%s"
-msgstr ""
-"Virhe uudelleenrakennuksen aikana:\n"
-"\n"
-"%s"
-
-#: 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/application-controller.vala:1749
-msgid "Are you sure you want to open these attachments?"
-msgstr "Haluatko varmasti avata nämä liitteet?"
-
-#: src/client/application/application-controller.vala:1750
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Liitetiedostot saattavat sisältää haitallista sisältöä.  Avaa liitteet "
-"ainoastaan, jos luotat niiden lähettäjään."
-
-#: src/client/application/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/application-controller.vala:1874
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
 #, 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?"
 
-#. Translators: Dialog secondary label when prompting to
-#. overwrite a file. The string substitution is the parent
-#. folder's name.
-#: src/client/application/application-controller.vala:1881
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
@@ -869,106 +802,44 @@ msgstr ""
 "Tiedosto on jo olemassa kohteessa “%s”.  Tiedoston korvaaminen korvaa "
 "nykyisen tiedoston sisällön."
 
-#: src/client/application/application-controller.vala:1885
+#: src/client/application/application-attachment-manager.vala:236
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: 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/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/application-controller.vala:2247
-msgid "This cannot be undone."
-msgstr "Toimintoa ei voi perua."
-
-#: src/client/application/application-controller.vala:2248
-#, c-format
-msgid "Empty %s"
-msgstr "Tyhjennä %s"
-
-#: src/client/application/application-controller.vala:2265
-#, c-format
-msgid "Error emptying %s"
-msgstr "Virhe tyhjennettäessä kohdetta %s"
-
-#: 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/application-controller.vala:2298
-msgid "Delete"
-msgstr "Poista"
-
-#: 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/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/application-controller.vala:2487
-#, c-format
-msgid "Successfully sent mail to %s."
-msgstr "Lähetetty onnistuneesti sähköpostia vastaanottajille %s."
-
-#: 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
+#: src/client/application/application-client.vala:33
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Tekijänoikeus 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:26
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016-2019 Geary Development Team."
 msgstr "Tekijänoikeus 2016-2019 Geary-kehitystiimi."
 
-#: src/client/application/geary-application.vala:28
+#: src/client/application/application-client.vala:36
 msgid "Visit the Geary web site"
 msgstr "Vieraile Gearyn verkkosivustolla"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:104
+#: src/client/application/application-client.vala:94
 msgid "Print debug logging"
-msgstr ""
+msgstr "Tulosta vianetsintälokitus"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:107
-#, fuzzy
-#| msgid "Start Geary with hidden main window"
+#: src/client/application/application-client.vala:97
 msgid "Start with the main window hidden (deprecated)"
-msgstr "Käynnistä Geary pääikkuna piilotettuna"
+msgstr "Käynnistä pääikkuna piilotettuna (vanhennettu)"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:110
+#: src/client/application/application-client.vala:100
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr ""
 
 #. / Command line option
-#: src/client/application/geary-application.vala:113
+#: src/client/application/application-client.vala:103
 msgid "Log conversation monitoring"
 msgstr "Lokita keskustelujen tarkkailu"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:116
+#: src/client/application/application-client.vala:106
 #, fuzzy
 #| msgid "Log folder normalization"
 msgid "Log IMAP network deserialization"
@@ -976,118 +847,114 @@ msgstr "Lokita kansioiden normalisointi"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/geary-application.vala:120
+#: src/client/application/application-client.vala:110
 msgid "Log folder normalization"
 msgstr "Lokita kansioiden normalisointi"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:123
+#: src/client/application/application-client.vala:113
 msgid "Log network activity"
 msgstr "Lokita verkkotoiminta"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:126
+#: src/client/application/application-client.vala:116
 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
+#: src/client/application/application-client.vala:121
 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
+#: src/client/application/application-client.vala:126
 #, fuzzy
 #| msgid "Log folder normalization"
 msgid "Log IMAP network serialization"
 msgstr "Lokita kansioiden normalisointi"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:139
+#: src/client/application/application-client.vala:129
 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
+#: src/client/application/application-client.vala:132
 msgid "Perform a graceful quit"
 msgstr "Suorita siisti lopetus"
 
+#: src/client/application/application-client.vala:134
+msgid "Open a new window"
+msgstr "Avaa uusi ikkuna"
+
 #. / Command line option
-#: src/client/application/geary-application.vala:145
-#, fuzzy
+#: src/client/application/application-client.vala:137
 #| msgid "Revoke all server certificates with TLS warnings"
 msgid "Revoke all pinned TLS server certificates"
-msgstr "Kumoa kaikki palvelinvarmenteet, joissa on TLS-varoituksia"
+msgstr "Kumoa kaikki kiinnitetyt TLS-palvelinvarmenteet"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:148
+#: src/client/application/application-client.vala:140
 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
+#: src/client/application/application-client.vala:264
 msgid "Geary version"
 msgstr "Geary-versio"
 
-#: src/client/application/geary-application.vala:280
+#. / Application runtime information label
+#: src/client/application/application-client.vala:266
 msgid "Geary revision"
 msgstr ""
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:282
+#: src/client/application/application-client.vala:268
 msgid "GTK version"
 msgstr "GTK-versio"
 
 #. / Applciation runtime information label
-#: src/client/application/geary-application.vala:289
+#: src/client/application/application-client.vala:275
 msgid "GLib version"
 msgstr "GLib-versio"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:296
+#: src/client/application/application-client.vala:282
 msgid "WebKitGTK version"
 msgstr "WebKitGTK-versio"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:303
+#: src/client/application/application-client.vala:289
 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
+#: src/client/application/application-client.vala:291
+#: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:335
+#: src/client/application/application-client.vala:321
 msgid "Distribution name"
 msgstr "Jakelun nimi"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:340
+#: src/client/application/application-client.vala:326
 msgid "Distribution release"
 msgstr "Jakelun versio"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:348
+#: src/client/application/application-client.vala:334
 msgid "Installation prefix"
 msgstr ""
 
-#: src/client/application/geary-application.vala:513
+#: src/client/application/application-client.vala:587
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %ssta"
@@ -1095,129 +962,454 @@ 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
+#: src/client/application/application-client.vala:591
 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
+#: src/client/application/application-client.vala:937
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr ""
+"Valinta `--hidden`on vanhennettu ja se poistetaan tulevissa versioissa."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/geary-application.vala:822
-#, fuzzy, c-format
+#: src/client/application/application-client.vala:970
+#, c-format
 #| msgid "Unrecognized command line option “%s”\n"
 msgid "Unrecognised program argument: “%s”"
+msgstr "Tunnistamaton ohjelma-argumentti: “%s”"
+
+#. / Notification title.
+#: src/client/application/application-controller.vala:458
+#, c-format
+msgid "A problem occurred sending email for %s"
+msgstr "Viestiä vastaanottajalle %s lähettäessä ilmeni ongelma"
+
+#. / Notification body
+#: src/client/application/application-controller.vala:462
+msgid "Email will not be sent until re-connected"
+msgstr "Sähköpostia ei lähetetä, ennen kuin yhteys on muodostettu uudelleen"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:568
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Keskustelu merkitty"
+msgstr[1] "Keskustelut merkitty"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:574
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Keskustelun merkintä poistettu"
+msgstr[1] "Keskustelujen merkinnät poistettu"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:600
+#: src/client/application/application-controller.vala:684
+#, c-format
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "Keskustelu siirretty kansioon %s"
+msgstr[1] "Keskustelut siirretty kansioon %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the source folder.
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:608
+#: src/client/application/application-controller.vala:630
+#, c-format
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "Keskustelu palautettu kansioon %s"
+msgstr[1] "Keskustelut palautettu kansioon %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:651
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "Keskustelu arkistoitu"
+msgstr[1] "Keskustelut arkistoitu"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:707
+#, c-format
+#| msgid "Message not saved"
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "Viesti palautettu kansioon %s"
+msgstr[1] "Viestit palautettu kansioon %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:728
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "Viesti arkistoitu"
+msgstr[1] "Viestit arkistoitu"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:763
+#, c-format
+#| msgid "Message not saved"
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "Viesti siirretty kansioon %s"
+msgstr[1] "Viestit siirretty kansioon %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:791
+#, c-format
+#| msgid "No conversations selected"
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "Keskustelu merkitty tunnisteella %s"
+msgstr[1] "Keskustelut merkitty tunnisteella %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:799
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/client/application/application-controller.vala:1222
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "Kohteen %s tietokannan avaaminen epäonnistui"
+
+#: src/client/application/application-controller.vala:1223
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronize with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
 msgstr ""
-"Tunnistamaton komentorivivalinta “%s”\n"
+"Tämän tilin paikallista postitietokantaa avatessa tapahtui virhe. Tämä "
+"saattaa johtua tietokannan rikkoutumisesta. Tietokanta sijaitsee seuraavassa "
+"kansiossa:\n"
+"\n"
+"%s\n"
 "\n"
+"Geary voi rakentaa tietokannan uudelleen ja synkronoida sen uudelleen "
+"palvelimen kanssa tai sulkeutua.\n"
+"\n"
+"Tietokannan rakentaminen uudelleen poistaa kaikki paikalliset viestit ja "
+"niiden liitteet. <b>Toimenpiteellä ei ole vaikutusta palvelimella oleviin "
+"viesteihin ja liitteisiin.</b>"
+
+#: src/client/application/application-controller.vala:1225
+msgid "_Rebuild"
+msgstr "Ra_kenna uudelleen"
+
+#: src/client/application/application-controller.vala:1225
+msgid "E_xit"
+msgstr "_Poistu"
+
+#: src/client/application/application-controller.vala:1235
+#, c-format
+msgid "Unable to rebuild database for “%s”"
+msgstr "Tietokannan jälleenrakennus tilille “%s” epäonnistui"
+
+#: src/client/application/application-controller.vala:1236
+#, c-format
+msgid ""
+"Error during rebuild:\n"
+"\n"
+"%s"
+msgstr ""
+"Virhe uudelleenrakennuksen aikana:\n"
+"\n"
+"%s"
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:1559
+#, c-format
+msgid "Email sent to %s"
+msgstr "Viesti vastaanottajalle %s lähetetty"
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2642
+#, c-format
+msgid "Email to %s queued for delivery"
+msgstr "Viesti vastaanottajalle %s asetettu jonoon toimitusta varten"
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2706
+#, c-format
+msgid "Email to %s saved"
+msgstr "Viesti vastaanottajalle %s tallennettu"
+
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2721
+#: src/client/application/application-controller.vala:2779
+msgid "Composer could not be restored"
+msgstr "Lähetintä ei voitu palauttaa"
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2764
+#, c-format
+msgid "Email to %s discarded"
+msgstr "Viesti vastaanottajalle %s hylätty"
+
+#. / Translators: Main window title, first string
+#. / substitution being the currently selected folder name,
+#. / the second being the selected account name.
+#: src/client/application/application-main-window.vala:560
+#, c-format
+msgid "%s — %s"
+msgstr "%s — %s"
+
+#: src/client/application/application-main-window.vala:967
+msgid "Labels"
+msgstr "Tunnisteet"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1306
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "Haluatko poistaa tämän keskustelun pysyvästi?"
+msgstr[1] "Haluatko poistaa nämä keskustelut pysyvästi?"
+
+#: src/client/application/application-main-window.vala:1311
+#: src/client/application/application-main-window.vala:1326
+msgid "Delete"
+msgstr "Poista"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1321
+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/application-main-window.vala:1334
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Poistetaanko kaikki viesit \"%s\"-kansiosta?"
+
+#: src/client/application/application-main-window.vala:1337
+msgid "This removes the email from Geary and your email server."
+msgstr "Tämä poistaa viestit Gearysta ja sähköpostipalvelimelta."
+
+#: src/client/application/application-main-window.vala:1338
+msgid "This cannot be undone."
+msgstr "Toimintoa ei voi perua."
+
+#: src/client/application/application-main-window.vala:1339
+#, c-format
+msgid "Empty %s"
+msgstr "Tyhjennä %s"
+
+#: src/client/application/application-main-window.vala:1669
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: src/client/components/components-attachment-pane.vala:107
+#: src/client/composer/composer-widget.vala:1834
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/client/components/components-attachment-pane.vala:379
+msgid "Are you sure you want to open these attachments?"
+msgstr "Haluatko varmasti avata nämä liitteet?"
+
+#: src/client/components/components-attachment-pane.vala:380
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Liitetiedostot saattavat sisältää haitallista sisältöä.  Avaa liitteet "
+"ainoastaan, jos luotat niiden lähettäjään."
 
-#: src/client/components/components-inspector.vala:68
-#, fuzzy
-#| msgid "_Inspect…"
+#: src/client/components/components-attachment-pane.vala:381
+msgid "Don’t _ask me again"
+msgstr "_Älä kysy uudelleen"
+
+#: src/client/components/components-inspector.vala:72
 msgid "Inspector"
-msgstr "T_utki…"
+msgstr "Tutki"
 
 #. / 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
+#: src/client/components/components-inspector.vala:87
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
 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
+#: src/client/components/components-inspector.vala:91
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
 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
+#: src/client/components/components-inspector.vala:208
+#: src/client/components/components-inspector.vala:211
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
 #: 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
+#: src/client/components/components-inspector.vala:212
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
 #: ui/accounts_editor_servers_pane.ui:17
 msgid "Cancel"
 msgstr "Peru"
 
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:43
+msgid "_Automatically select next message"
+msgstr "_Valitse automaattisesti seuraava viesti"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:53
+msgid "_Display conversation preview"
+msgstr "N_äytä keskustelun esikatselu"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:63
+msgid "Use _three pane view"
+msgstr "Kä_ytä kolmen paneelin näkymää"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:73
+msgid "Use _single key email shortcuts"
+msgstr "Näytä _yhden näppäimen pikanäppäimiä"
+
+#: src/client/components/components-preferences-window.vala:75
+msgid ""
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
+msgstr ""
+"Ota käyttöön pikanäppäimet sähköpostitoiminnoille, jotka eivät vaadi <Ctrl>-"
+"näppäimen painallusta"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:86
+msgid "_Watch for new mail when closed"
+msgstr "_Tarkkaile uusia viestejä suljettuna"
+
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:90
+msgid "Geary will keep running after all windows are closed"
+msgstr "Geary jatkaa käynnissä olemista kun kaikki ikkunat on suljettu"
+
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "Etsi"
+
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+msgid "Search all mail in account for keywords"
+msgstr "Etsi hakusanoilla kaikista tilin sähköpostiviesteistä"
+
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
+#, c-format
+msgid "Search %s account"
+msgstr "Etsi tililtä %s"
+
 #. 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
+#: src/client/components/components-validator.vala:390
 msgid "An email address is required"
 msgstr "Sähköpostiosoite vaaditaan"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:382
+#: src/client/components/components-validator.vala:394
 msgid "Not a valid email address"
 msgstr "Virheellinen sähköpostiosoite"
 
 #. Translators: Tooltip used when an entry requires a valid,
 #. resolvable server name to be entered, but one is not
 #. provided.
-#: src/client/components/components-validator.vala:428
+#: src/client/components/components-validator.vala:440
 msgid "A server name is required"
 msgstr "Palvelimen nimi vaaditaan"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. server name to be entered, but it was unable to be
 #. looked-up in the DNS.
-#: src/client/components/components-validator.vala:433
+#: src/client/components/components-validator.vala:445
 msgid "Could not look up server name"
 msgstr "Palvelimen nimeä ei voitu kysellä"
 
-#: src/client/components/main-toolbar.vala:139
+#: src/client/components/main-toolbar.vala:116
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "Merkitse keskustelu"
 msgstr[1] "Merkitse keskustelut"
 
-#: src/client/components/main-toolbar.vala:144
+#: src/client/components/main-toolbar.vala:121
 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:149
+#: src/client/components/main-toolbar.vala:126
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "Siirrä keskustelu"
 msgstr[1] "Siirrä keskustelut"
 
-#: src/client/components/main-toolbar.vala:154
+#: src/client/components/main-toolbar.vala:131
 msgid "Archive conversation"
 msgid_plural "Archive conversations"
 msgstr[0] "Arkistoi keskustelu"
 msgstr[1] "Arkistoi keskustelut"
 
-#: src/client/components/main-toolbar.vala:163
+#: src/client/components/main-toolbar.vala:142
 msgid "Move conversation to Trash"
 msgid_plural "Move conversations to Trash"
 msgstr[0] "Siirrä keskustelu roskakoriin"
 msgstr[1] "Siirrä keskustelut roskakoriin"
 
-#: src/client/components/main-toolbar.vala:171
+#: src/client/components/main-toolbar.vala:152
 msgid "Delete conversation"
 msgid_plural "Delete conversations"
 msgstr[0] "Poista keskustelu"
 msgstr[1] "Poista keskustelut"
 
-#: src/client/components/main-window.vala:733
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
 #. Translators: Info bar title for a generic account
 #. problem.
 #: src/client/components/main-window-info-bar.vala:44
@@ -1227,19 +1419,17 @@ msgstr "Tiliongelma"
 #. 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"
+#, c-format
 msgid "Geary has encountered a problem with %s."
-msgstr "Geary kohtasi ongelman"
+msgstr "Geary kohtasi ongelman tilin %s kanssa."
 
 #. 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."
+#, c-format
 msgid "Geary encountered a problem checking mail for %s."
-msgstr "Geary kohtasi ongelman yhdistäessä tiliin."
+msgstr "Geary kohtasi ongelman tarkistaessa tilin %s viestejä."
 
 #. Translators: Tooltip label for Retry button
 #: src/client/components/main-window-info-bar.vala:65
@@ -1250,10 +1440,9 @@ msgstr "Yritä yhdistää uudelleen"
 #. 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."
+#, c-format
 msgid "Geary encountered a problem sending email for %s."
-msgstr "Geary kohtasi ongelman yhdistäessä tiliin."
+msgstr "Geary kohtasi ongelman lähettäessä sähköpostia vastaanottajalle %s."
 
 #. Translators: Tooltip label for Retry button
 #: src/client/components/main-window-info-bar.vala:77
@@ -1269,13 +1458,8 @@ msgstr "Geary kohtasi ongelman"
 #. 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."
+msgstr "Ilmoita tekniset yksityiskohdat jos vika ilmenee uudelleen."
 
 #. Translators: Button label for viewing technical details
 #. for a problem report.
@@ -1295,28 +1479,6 @@ msgstr "Näytä virheen tekniset yksityiskohdat"
 msgid "_Retry"
 msgstr "_Yritä uudelleen"
 
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:38
-#: src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Etsi"
-
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-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:83
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indeksoidaan tiliä %s"
-
-#: src/client/components/search-bar.vala:110
-#: src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Etsi tililtä %s"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
 msgid "Sending…"
@@ -1357,15 +1519,15 @@ msgstr "_Sulje"
 msgid "_Discard"
 msgstr "_Hylkää"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
 msgid "_Help"
 msgstr "_Ohje"
 
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Avaa"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
 msgid "_Preferences"
 msgstr "_Asetukset"
 
@@ -1382,7 +1544,8 @@ msgstr "_Lopeta"
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -1390,39 +1553,45 @@ msgstr "_Tallenna"
 msgid "_Keep"
 msgstr "Säil_ytä"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr "Linkin osoite ei ole muotoiltu kelvollisesti, esim. http://example.com";
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Virheellinen linkin osoite"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Virheellinen sähköpostiosoite"
 
-#: src/client/composer/composer-widget.vala:156
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:30
+msgid "New Message"
+msgstr "Uusi viesti"
+
+#: src/client/composer/composer-widget.vala:217
 msgid "Saved"
 msgstr "Tallennettu"
 
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:218
 msgid "Saving"
 msgstr "Tallennetaan"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:219
 msgid "Error saving"
 msgstr "Virhe tallentaessa"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:220
 msgid "Press Backspace to delete quote"
 msgstr "Paina askelpalautinta poistaaksesi lainauksen"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. 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:168
+#. checking, include all variants of each word. No spaces are
+#. allowed. The words will be converted to lower case based on
+#. locale and English versions included automatically.
+#: src/client/composer/composer-widget.vala:236
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1434,100 +1603,90 @@ 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:1181
+#: src/client/composer/composer-widget.vala:843
 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:1211
+#: src/client/composer/composer-widget.vala:869
 msgid "Do you want to discard this draft message?"
 msgstr "Haluatko hylätä tämän luonnosviestin?"
 
-#: src/client/composer/composer-widget.vala:1330
+#: src/client/composer/composer-widget.vala:1503
 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:1332
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "Lähetetäänkö viesti ilman aihetta?"
 
-#: src/client/composer/composer-widget.vala:1334
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "Lähetetäänkö viesti ilman sisältöä?"
 
-#: src/client/composer/composer-widget.vala:1338
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "Lähetetäänkö viesti ilman liitettä?"
 
-#: src/client/composer/composer-widget.vala:1652
+#: src/client/composer/composer-widget.vala:1820
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s” on jo liitetty lähetystä varten."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. 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:1660
-#: src/client/conversation-viewer/conversation-email.vala:173
+#: src/client/composer/composer-widget.vala:1856
+#: src/client/composer/composer-widget.vala:1906
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” is an empty file."
+msgstr "“%s” on tyhjä tiedosto."
 
-#: src/client/composer/composer-widget.vala:1697
+#: src/client/composer/composer-widget.vala:1894
 #, c-format
 msgid "“%s” could not be found."
 msgstr "Kohdetta “%s” ei löytynyt."
 
-#: src/client/composer/composer-widget.vala:1703
+#: src/client/composer/composer-widget.vala:1900
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s” on kansio."
 
-#: 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:1722
+#: src/client/composer/composer-widget.vala:1919
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "Kohteen “%s” avaus lukua varten epäonnistui."
 
-#: src/client/composer/composer-widget.vala:1730
+#: src/client/composer/composer-widget.vala:1927
 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:1787
-#: src/client/conversation-viewer/conversation-email.vala:976
-#: src/client/util/util-email.vala:216 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:1984
+#: src/client/conversation-viewer/conversation-email.vala:559
+#: src/client/util/util-email.vala:235 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:1793
-#: src/client/conversation-viewer/conversation-email.vala:981
-#: src/client/util/util-email.vala:221 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:1990
+#: src/client/conversation-viewer/conversation-email.vala:564
+#: src/client/util/util-email.vala:240 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:1799
-#: src/client/conversation-viewer/conversation-email.vala:986
+#: src/client/composer/composer-widget.vala:1996
+#: src/client/conversation-viewer/conversation-email.vala:569
 #: 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:1805
+#: src/client/composer/composer-widget.vala:2002
 msgid "Reply-To: "
 msgstr "Vastausosoite: "
 
-#: src/client/composer/composer-widget.vala:1945
+#: src/client/composer/composer-widget.vala:2254
 msgid "Select Color"
 msgstr "Valitse väri"
 
@@ -1536,41 +1695,37 @@ 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:2137
+#: src/client/composer/composer-widget.vala:2439
 #, 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:2192
+#: src/client/composer/composer-widget.vala:2495
 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:2472
+#: src/client/composer/composer-widget.vala:2800
 msgid "Images"
 msgstr "Kuvat"
 
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "Uusi viesti"
-
-#: src/client/composer/spell-check-popover.vala:108
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Poista tämä kieli suositeltujen listalta"
 
-#: src/client/composer/spell-check-popover.vala:112
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Lisää tämä kieli suositeltujen listalle"
 
-#: src/client/composer/spell-check-popover.vala:199
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Etsi lisää kieliä"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:337
+#: src/client/conversation-list/conversation-list-view.vala:335
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Siirrä keskustelu _roskakoriin"
@@ -1583,38 +1738,38 @@ msgid_plural "_Delete conversations"
 msgstr[0] "_Poista keskustelu"
 msgstr[1] "_Poista keskustelut"
 
-#: src/client/conversation-list/conversation-list-view.vala:356
+#: src/client/conversation-list/conversation-list-view.vala:360
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Merkitse _luetuksi"
 
-#: src/client/conversation-list/conversation-list-view.vala:359
+#: src/client/conversation-list/conversation-list-view.vala:368
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Merkitse l_ukemattomaksi"
 
-#: src/client/conversation-list/conversation-list-view.vala:362
+#: src/client/conversation-list/conversation-list-view.vala:376
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Poista tähti"
 
-#: src/client/conversation-list/conversation-list-view.vala:364
+#: src/client/conversation-list/conversation-list-view.vala:383
 #: 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:367
+#: src/client/conversation-list/conversation-list-view.vala:392
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:398
 msgid "R_eply All"
 msgstr "_Vastaa kaikille"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:369
+#: src/client/conversation-list/conversation-list-view.vala:404
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Lähetä edelleen"
@@ -1624,24 +1779,24 @@ msgid "Me"
 msgstr "Minä"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:971
-#: src/client/util/util-email.vala:207
+#: src/client/conversation-viewer/conversation-email.vala:554
+#: src/client/util/util-email.vala:226
 msgid "From:"
 msgstr "Lähettäjä:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:991
-#: src/client/util/util-email.vala:212
+#: src/client/conversation-viewer/conversation-email.vala:574
+#: src/client/util/util-email.vala:231
 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/client/util/util-email.vala:210
+#: src/client/conversation-viewer/conversation-email.vala:584
+#: src/client/util/util-email.vala:229
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: src/client/conversation-viewer/conversation-message.vala:129
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr "Tämä sähköpostiosoite saattaa olla väärennetty"
 
@@ -1649,44 +1804,44 @@ msgstr "Tämä sähköpostiosoite saattaa olla väärennetty"
 #. 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:445
+#: src/client/conversation-viewer/conversation-message.vala:438
 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:838
+#: src/client/conversation-viewer/conversation-message.vala:830
 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:958
+#: src/client/conversation-viewer/conversation-message.vala:950
 msgid "Image"
 msgstr "Kuva"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:82
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 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:86
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 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:95
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 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:99
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
 msgstr ""
 "Toiminnon valitseminen toteuttaa sen kaikkiin valittuihin keskusteluihin"
@@ -1695,20 +1850,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:108
-#: src/client/conversation-viewer/conversation-viewer.vala:121
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 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:112
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 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:125
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Hakuehtosi eivät tuottaneet tuloksia. Yritä uudelleen eri hakuehdoilla"
 
@@ -1797,7 +1952,7 @@ 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
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:100
 #: ui/problem-details-dialog.ui:12
 msgid "Details"
 msgstr "Yksityiskohdat"
@@ -1837,21 +1992,16 @@ msgstr "%s, %s"
 msgid "Inboxes"
 msgstr "Saapuneet"
 
-#: src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d tulos"
 msgstr[1] "%d tulosta"
 
-#: src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s — New Messages"
-msgstr "%s — Uusia viestejä"
-
 #. / Notification body text for new email when no other
 #. / new messages are already awaiting.
-#: src/client/notification/notification-desktop.vala:90
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:68
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -1861,14 +2011,14 @@ msgstr[1] "%d uutta viestiä"
 #. / Notification body text for new email when
 #. / other new messages have already been notified
 #. / about
-#: src/client/notification/notification-desktop.vala:98
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:83
 #, 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/notification-desktop.vala:130
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
 #, c-format
 msgid ""
 "%s\n"
@@ -1883,6 +2033,11 @@ msgstr[1] ""
 "%s\n"
 "(%d muuta uutta viestiä tilille %s)"
 
+#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#, c-format
+msgid "%s — New Messages"
+msgstr "%s — Uusia viestejä"
+
 #. / 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:69
@@ -1954,44 +2109,40 @@ msgstr "%A"
 #. / 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"
+msgstr "%a, %b %-e, %Y klo %l:%M %P"
 
 #. / 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"
+msgstr "%a, %e. %b %Y klo %X"
 
 #. / 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"
+msgstr "%a, %e. %b %Y klo %X"
 
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:944
+#: src/client/util/util-email.vala:38
+#: src/engine/rfc822/rfc822-message.vala:1000
 msgid "(no subject)"
 msgstr "(ei aihetta)"
 
-#. Translators: This is shown for displaying a list of
-#. email recipients that happens to be empty,
-#. i.e. contains no email addresses.
-#: src/client/util/util-email.vala:116
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:134
 msgid "(No recipients)"
 msgstr "(Ei vastaanottajia)"
 
-#. Translators: This is used for displaying a short list of
-#. email recipients lists with two or more addresses. The
-#. first (string) substitution is address of the first, the
-#. second substitution is the number of n - 1 remaining
-#. recipients.
-#: src/client/util/util-email.vala:130
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / addresses. The first (string) substitution is
+#. / address of the first, the second substitution is
+#. / the number of n - 1 remaining recipients.
+#: src/client/util/util-email.vala:146
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2001,26 +2152,26 @@ 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
+#: src/client/util/util-email.vala:179
 #, 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
+#: src/client/util/util-email.vala:186
 #, 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
+#: src/client/util/util-email.vala:192
 #, c-format
 msgid "On %s:"
 msgstr "%s:"
 
-#: src/client/util/util-email.vala:202
+#: src/client/util/util-email.vala:221
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Edelleenlähetetty viesti ----------"
 
@@ -2101,9 +2252,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:117
-#, fuzzy
-#| msgid "attachment"
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "liite"
@@ -2116,9 +2265,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:126
-#, fuzzy
-#| msgid "bcc"
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "piilokopio"
@@ -2130,9 +2277,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:134
-#, fuzzy
-#| msgid "body"
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "sisältö"
@@ -2145,9 +2290,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:143
-#, fuzzy
-#| msgid "cc"
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "kopio"
@@ -2160,9 +2303,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:152
-#, fuzzy
-#| msgid "from"
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr "lähettäjä"
@@ -2174,9 +2315,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:160
-#, fuzzy
-#| msgid "is"
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr "on"
@@ -2188,9 +2327,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:168
-#, fuzzy
-#| msgid "subject"
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "aihe"
@@ -2203,9 +2340,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:177
-#, fuzzy
-#| msgid "to"
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr "vastaanottaja"
@@ -2218,12 +2353,10 @@ 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:198
-#, fuzzy
-#| msgid "me"
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
-msgstr "minä"
+msgstr "minulle"
 
 #. Can be typed in the search box after "from:" i.e.:
 #. "from:me". Matches conversations were sent by the user.
@@ -2232,12 +2365,10 @@ 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:210
-#, fuzzy
-#| msgid "me"
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
-msgstr "minä"
+msgstr "minulta"
 
 #. Can be typed in the search box after "is:" i.e.:
 #. "is:read". Matches conversations that are flagged as read.
@@ -2246,9 +2377,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:222
-#, fuzzy
-#| msgid "read"
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "luettu"
@@ -2261,9 +2390,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:233
-#, fuzzy
-#| msgid "starred"
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "tähdellinen"
@@ -2275,9 +2402,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:243
-#, fuzzy
-#| msgid "unread"
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "lukematon"
@@ -2286,7 +2411,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:950
+#: src/engine/imap-engine/imap-engine-generic-account.vala:882
 msgid "Drafts | Draft"
 msgstr "Luonnokset | Luonnos | Drafts | Draft"
 
@@ -2294,13 +2419,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:959
+#: src/engine/imap-engine/imap-engine-generic-account.vala:891
 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:964
+#: src/engine/imap-engine/imap-engine-generic-account.vala:896
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Lähetetyt"
@@ -2309,7 +2434,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:974
+#: src/engine/imap-engine/imap-engine-generic-account.vala:906
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2321,13 +2446,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:984
+#: src/engine/imap-engine/imap-engine-generic-account.vala:916
 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:989
+#: src/engine/imap-engine/imap-engine-generic-account.vala:921
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Poistetut"
@@ -2336,11 +2461,21 @@ 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:999
+#: src/engine/imap-engine/imap-engine-generic-account.vala:931
 msgid "Archive | Archives"
 msgstr "Arkisto | Arkistot | Archive | Archives"
 
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
+#: src/engine/rfc822/rfc822-message.vala:458
+#, c-format
+msgid "Could not determine mime type for “%s”."
+msgstr "Kohteen “%s” MIME-tyyppia ei voitu selvittää."
+
+#: src/engine/rfc822/rfc822-message.vala:469
+#, c-format
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr ""
+
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Lisää tili"
 
@@ -2394,11 +2529,11 @@ msgstr "Poista tämä tili Gearysta"
 msgid "Accounts"
 msgstr "Tilit"
 
-#: ui/accounts_editor_list_pane.ui:63
+#: ui/accounts_editor_list_pane.ui:62
 msgid "To get started, select an email provider below."
 msgstr "Aloita valitsemalla sähköpostipalvelusi tarjoaja."
 
-#: ui/accounts_editor_list_pane.ui:76
+#: ui/accounts_editor_list_pane.ui:75
 msgid "Welcome to Geary"
 msgstr "Tervetuloa, käytössäsi on Geary"
 
@@ -2424,6 +2559,81 @@ msgstr "Poista tili"
 msgid "Apply"
 msgstr "Toteuta"
 
+#. Infobar title when one or more accounts are offline
+#: ui/application-main-window.ui:185
+msgid "Working offline"
+msgstr "Työskennellään offline-tilassa"
+
+#. Label and tooltip for offline infobar
+#: ui/application-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."
+msgstr ""
+"Tietokoneesi ei vaikuta olevan yhteydessä internetiin.\n"
+"Viestien vastaanottaminen tai lähettäminen ei onnistu, ennen kuin yhteys on "
+"muodostettu uudelleen."
+
+#. Label and tooltip for offline infobar
+#: ui/application-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 retrying TLS cert validation
+#: ui/application-main-window.ui:249
+msgid "Check"
+msgstr "Tarkista"
+
+#. Button tooltip for retrying TLS cert validation
+#: ui/application-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/application-main-window.ui:282
+msgid "Security problem"
+msgstr "Tietoturvaongelma"
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/application-main-window.ui:296
+msgid ""
+"An account has reported an untrusted server.\n"
+"Please check the server configuration and try again."
+msgstr ""
+"Tili ilmoitti ei-luotetusta palvelimesta.\n"
+"Tarkista palvelimen asetukset ja yritä uudelleen."
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/application-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/application-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/application-main-window.ui:379
+msgid "Login problem"
+msgstr "Kirjautumisongelma"
+
+#. Label and tooltip for authentication problem infobar
+#: ui/application-main-window.ui:393
+msgid ""
+"An account has reported an incorrect login or password.\n"
+"Please check your login name and try again."
+msgstr ""
+"Tili ilmoitti virheellisestä käyttäjätunnuksesta tai salasanasta.\n"
+"Tarkista käyttäjätunnus ja yritä uudelleen."
+
+#. Label and tooltip for authentication problem infobar
+#: ui/application-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."
+
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "Ei-luotettu yhteys"
@@ -2440,246 +2650,280 @@ msgstr "Luota _tähän palvelimeen"
 msgid "_Don’t Trust This Server"
 msgstr "_Älä luota tähän palvelimeen"
 
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "Irrota (Ctrl+D)"
-
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "Liitä tiedosto (Ctrl+T)"
-
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "Sisällytä alkuperäiset liitteet"
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "Irrota lähetysikkuna"
 
-#: ui/composer-headerbar.ui:202
+#: ui/composer-headerbar.ui:135
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "Lähetä (Ctrl+Enter)"
-
-#: ui/composer-headerbar.ui:230
+#: ui/composer-headerbar.ui:162
 msgid "Discard and Close"
 msgstr "Hylkää ja sulje"
 
-#: ui/composer-headerbar.ui:254
+#: ui/composer-headerbar.ui:186
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
 #. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:41
+#: ui/composer-link-popover.ui:42
 msgid "Insert the new link with this URL"
 msgstr "Lisää uusi linkki tällä osoitteella"
 
-#: ui/composer-link-popover.ui:52
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Lisää"
+
+#: ui/composer-link-popover.ui:47
 msgid "Link URL"
 msgstr "Linkin osoite"
 
 #. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
+#: ui/composer-link-popover.ui:61
 msgid "Update this link’s URL"
 msgstr "Päivitä tämän linkin osoite"
 
-#: ui/composer-link-popover.ui:86
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Päivitä"
+
+#: ui/composer-link-popover.ui:75
 msgid "Delete this link"
 msgstr "Poista tämä linkki"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Avaa tämä linkki"
-
-#: ui/composer-menus.ui:7
-msgid "S_ans Serif"
-msgstr "_Päätteetön"
-
-#: ui/composer-menus.ui:12
-msgid "S_erif"
-msgstr "P_äätteellinen"
-
-#: ui/composer-menus.ui:17
-msgid "_Fixed Width"
-msgstr "_Tasalevyinen"
-
-#: ui/composer-menus.ui:24
-msgid "_Small"
-msgstr "_Pieni"
-
-#: ui/composer-menus.ui:29
-msgid "_Medium"
-msgstr "Ta_vallinen"
-
-#: ui/composer-menus.ui:34
-msgid "Lar_ge"
-msgstr "_Suuri"
-
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "Vä_ri"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
-msgid "_Rich Text"
-msgstr "Muotoilu - _RTF"
-
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Näytä laajennetut kentät"
-
-#: ui/composer-menus.ui:78
+#: ui/composer-menus.ui:8
 msgid "_Undo"
 msgstr "_Kumoa"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-menus.ui:12
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: ui/composer-menus.ui:100
+#: ui/composer-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "Liit_ä ilman muotoilua"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-menus.ui:50
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:43
+#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "T_utki…"
 
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:60
+msgid "From"
+msgstr "Lähettäjä"
+
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:56
+#: ui/composer-widget.ui:130
 msgid "_To"
 msgstr "_Vastaanottaja"
 
-#: ui/composer-widget.ui:75
+#: ui/composer-widget.ui:158
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Näytä Kopio- (CC), Piilokopio- (BCC) ja Vastausosoite-kentät"
+
+#: ui/composer-widget.ui:219
 msgid "_Cc"
 msgstr "_Kopio"
 
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "_Aihe"
-
-#: ui/composer-widget.ui:149
+#: ui/composer-widget.ui:267
 msgid "_Bcc"
 msgstr "_Piilokopio"
 
-#: ui/composer-widget.ui:179
+#: ui/composer-widget.ui:315
 msgid "_Reply-To"
 msgstr "Vasta_usosoite"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
-msgid "From"
-msgstr "Lähettäjä"
+#: ui/composer-widget.ui:372
+msgid "_Subject"
+msgstr "_Aihe"
+
+#: ui/composer-widget.ui:445
+msgid "Drop files here"
+msgstr "Pudota tiedostot tähän"
+
+#: ui/composer-widget.ui:461
+msgid "To add them as attachments"
+msgstr "lisätäksesi ne liitteiksi"
+
+#: ui/composer-widget.ui:602
+msgid "Bold text"
+msgstr "Lihavoitu teksti"
+
+#: ui/composer-widget.ui:626
+msgid "Italic text"
+msgstr "Kursivoitu teksti"
+
+#: ui/composer-widget.ui:650
+msgid "Underline text"
+msgstr "Alleviivattu teksti"
+
+#: ui/composer-widget.ui:674
+msgid "Strikethrough text"
+msgstr "Yliviivattu teksti"
+
+#: ui/composer-widget.ui:707
+msgid "Insert bulleted list"
+msgstr "Lisää numeroimaton luettelo"
+
+#: ui/composer-widget.ui:731
+msgid "Insert numbered list"
+msgstr "Lisää numeroitu luettelo"
+
+#: ui/composer-widget.ui:764
+msgid "Indent or quote text"
+msgstr "Sisennä tai lainaa tekstiä"
+
+#: ui/composer-widget.ui:788
+msgid "Un-indent or unquote text"
+msgstr "Poista tekstin sisennys tai lainaus"
+
+#: ui/composer-widget.ui:817
+msgid "Remove text formatting"
+msgstr "Poista tekstin muotoilu"
+
+#: ui/composer-widget.ui:836
+msgid "Change font type"
+msgstr "Muuta fontin tyyppi"
+
+#: ui/composer-widget.ui:851
+msgid "Sans Serif"
+msgstr "Päätteetön"
+
+#: ui/composer-widget.ui:862
+msgid "Serif"
+msgstr "Päätteellinen"
+
+#: ui/composer-widget.ui:873
+msgid "Fixed Width"
+msgstr "Tasalevyinen"
+
+#: ui/composer-widget.ui:899
+msgid "Change font color"
+msgstr "Muuta fontin väri"
+
+#: ui/composer-widget.ui:914
+msgid "Change font size"
+msgstr "Muuta fontin koko"
+
+#: ui/composer-widget.ui:949
+msgid "Insert or update text link"
+msgstr "Lisää tai päivitä tekstilinkki"
+
+#: ui/composer-widget.ui:973
+msgid "Insert an image"
+msgstr "Lisää kuva"
+
+#: ui/composer-widget.ui:1015
+msgid "Undo last edit"
+msgstr "Kumoa viimeisin muokkaus"
+
+#: ui/composer-widget.ui:1039
+msgid "Redo last edit"
+msgstr "Tee uudelleen viimeisin muokkaus"
+
+#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+msgid "Attach a file"
+msgstr "Liitä tiedosto"
 
-#: ui/composer-widget.ui:293
-msgid "Drop files here"
-msgstr "Pudota tiedostot tähän"
+#: ui/composer-widget.ui:1117
+msgid "Add original attachments"
+msgstr "Liitä alkuperäiset liitteet"
 
-#: ui/composer-widget.ui:309
-msgid "To add them as attachments"
-msgstr "lisätäksesi ne liitteiksi"
+#: ui/composer-widget.ui:1162
+msgid "More options"
+msgstr "Lisää valintoja"
 
-#: ui/composer-widget.ui:353
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Kumoa viimeisin muokkaus (Ctrl+Z)"
+#: ui/composer-widget.ui:1182
+msgid "Show formatting toolbar"
+msgstr "Näytä muotoilupalkki"
 
-#: ui/composer-widget.ui:377
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "Tee uudelleen viimeisin muokkaus  (Ctrl+Shift+Z)"
+#: ui/composer-widget.ui:1200
+msgid "Select spell checking languages"
+msgstr "Valitse oikoluvun kielet"
 
-#: ui/composer-widget.ui:415
-msgid "Bold (Ctrl+B)"
-msgstr "Lihavoitu (Ctrl+B)"
+#: ui/composer-widget.ui:1263
+msgid "S_ans Serif"
+msgstr "_Päätteetön"
 
-#: ui/composer-widget.ui:439
-msgid "Italic (Ctrl+I)"
-msgstr "Kursivoitu (Ctrl+I)"
+#: ui/composer-widget.ui:1268
+msgid "S_erif"
+msgstr "P_äätteellinen"
 
-#: ui/composer-widget.ui:463
-msgid "Underline (Ctrl+U)"
-msgstr "Alleviivattu (Ctrl+U)"
+#: ui/composer-widget.ui:1273
+msgid "_Fixed Width"
+msgstr "_Tasalevyinen"
 
-#: ui/composer-widget.ui:487
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Yliviivattu (Ctrl+K)"
+#: ui/composer-widget.ui:1283
+msgid "_Small"
+msgstr "_Pieni"
 
-#: ui/composer-widget.ui:525
-msgid "Insert unordered list"
-msgstr "Lisää numeroimaton luettelo"
+#: ui/composer-widget.ui:1288
+msgid "_Medium"
+msgstr "Ta_vallinen"
 
-#: ui/composer-widget.ui:549
-msgid "Insert ordered list"
-msgstr "Lisää numeroitu luettelo"
+#: ui/composer-widget.ui:1293
+msgid "Lar_ge"
+msgstr "_Suuri"
 
-#: ui/composer-widget.ui:587
-msgid "Quote text  (Ctrl+])"
-msgstr "Lainaa tekstiä (Ctrl+])"
+#: ui/composer-widget.ui:1303
+msgid "_Rich Text"
+msgstr "Muotoilu - _RTF"
 
-#: ui/composer-widget.ui:611
-msgid "Unquote text  (Ctrl+[)"
-msgstr "Poista tekstin lainaus (Ctrl+[)"
+#: ui/composer-widget.ui:1308
+msgid "_Plain Text"
+msgstr "_Raakateksti"
 
-#: ui/composer-widget.ui:649
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Lisää tai päivitä valintalinkki (Ctrl+L)"
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "Valitse kaikki liitteet"
 
-#: ui/composer-widget.ui:673
-msgid "Insert an image (Ctrl+G)"
-msgstr "Lisää kuva (Ctrl+G)"
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Tallenna valitut liitteet"
 
-#: ui/composer-widget.ui:707
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Poista muotoilu valinnasta (Ctrl+Space)"
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Avaa valitut litteet"
 
-#: ui/composer-widget.ui:731
-msgid "Select spell checking languages"
-msgstr "Valitse oikoluvun kielet"
+#: ui/components-attachment-pane-menus.ui:17
+msgid "Save _All"
+msgstr "_Tallenna kaikki"
 
 #: 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 "
+"Jos ongelma on vakava tai se toistuu, tallenna 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>."
+"\">postituslistalle</a> tai liitä tiedot <a href=\"https://wiki.gnome.org/";
+"Apps/Geary/ReportingABug\">uuteen vikailmoitukseen</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"
@@ -2688,10 +2932,8 @@ 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ä"
+msgstr "Etsi vastaavia lokimerkintöjä"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
@@ -2706,8 +2948,6 @@ 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…"
 
@@ -2716,7 +2956,6 @@ 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…"
 
@@ -2745,7 +2984,7 @@ msgstr "Tämä sähköpostiosoite on:"
 #. Contact popover label
 #: ui/conversation-contact-popover.ui:319
 msgid "But was forged as:"
-msgstr ""
+msgstr "Mutta muutettiin muotoon:"
 
 #. Contact popover label
 #: ui/conversation-contact-popover.ui:344
@@ -2766,39 +3005,23 @@ msgstr "Merkitse tämä viesti tähdellä"
 msgid "Mark this message as not starred"
 msgstr "Poista tähti tältä viestiltä"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Näytä viestivalikko"
-
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Avaa valitut litteet"
-
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Tallenna valitut liitteet"
-
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "Valitse kaikki liitteet"
-
-#: ui/conversation-email.ui:240
+#: ui/conversation-email.ui:124
 msgid "Edit Draft"
 msgstr "Muokkaa luonnosta"
 
-#: ui/conversation-email.ui:267
+#: ui/conversation-email.ui:151
 msgid "Draft message"
 msgstr "Luonnosviesti"
 
-#: ui/conversation-email.ui:283
+#: ui/conversation-email.ui:167
 msgid "This message has not yet been sent."
 msgstr "Tätä viestiä ei ole vielä lähetetty."
 
-#: ui/conversation-email.ui:329
+#: ui/conversation-email.ui:213
 msgid "Message not saved"
 msgstr "Viestiä ei tallennettu"
 
-#: ui/conversation-email.ui:345
+#: ui/conversation-email.ui:229
 msgid "This message was sent, but has not been saved to your account."
 msgstr ""
 "Tämä viesti lähetettiin onnistuneesti, mutta sen tallennus tilillesi "
@@ -2841,9 +3064,27 @@ msgstr "_Poista viesti…"
 msgid "_View Source"
 msgstr "Näytä lä_hde"
 
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "_Tallenna kaikki"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "Mutta viekin kohteeseen:"
+
+#: ui/conversation-message-link-popover.ui:84
+msgid "The link appears to go to:"
+msgstr "Tämä linkki vaikuttaa johtavan kohteeseen:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "Harhaanjohtava linkki löydetty"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr ""
+"Sähköpostin lähettäjä saattaa yrittää johdattaa sinut väärälle sivulle."
+
+#: ui/conversation-message-link-popover.ui:124
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
+"Jos olet epävarma, ole yhteydessä viestin lähettäjään ennen kuin jatkat."
 
 #: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
@@ -2909,28 +3150,6 @@ msgstr "Etäkuvia ei näytetä"
 msgid "Only show remote images from senders you trust."
 msgstr "Näytä etäkuvat vain lähettäjiltä, joihin luotat."
 
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "Mutta viekin kohteeseen:"
-
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "Tämä linkki vaikuttaa johtavan kohteeseen:"
-
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "Harhaanjohtava linkki löydetty"
-
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr ""
-"Sähköpostin lähettäjä saattaa yrittää johdattaa sinut väärälle sivulle."
-
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr ""
-"Jos olet epävarma, ole yhteydessä viestin lähettäjään ennen kuin jatkat."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Etsi keskustelusta"
@@ -2967,7 +3186,7 @@ msgstr "nimike"
 msgid "Conversation Shortcuts"
 msgstr "Keskustelun pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:347
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Toiminnot"
@@ -2982,64 +3201,55 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Vastaa lähettäjälle"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Vastaa kaikille"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:289
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Lähetä edelleen"
 
-#: ui/gtk/help-overlay.ui:45
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Mark read"
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
-msgstr "Merkitse luetuksi"
+msgstr "Merkitse lukemattomaksi/luetuksi"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
-msgstr ""
+msgstr "Merkitse viesti tähdellä tai poista tähti"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
 msgctxt "shortcut window"
-msgid "Archive conversation"
-msgstr "Arkistoi keskustelu"
+msgid "Archive conversations"
+msgstr "Arkistoi keskustelut"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
 msgctxt "shortcut window"
-msgid "Move conversation"
-msgstr "Siirrä keskustelu"
+msgid "Move conversations"
+msgstr "Siirrä keskustelut"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Label the conversation"
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
 msgctxt "shortcut window"
-msgid "Label conversation"
-msgstr "Merkitse tunniste keskusteluun"
+msgid "Label conversations"
+msgstr "Merkitse keskustelut tunnisteilla"
 
 #: ui/gtk/help-overlay.ui:80
 msgctxt "shortcut window"
-msgid "Trash conversation"
-msgstr "Siirrä keskustelu roskakoriin"
+msgid "Trash conversations"
+msgstr "Siirrä keskustelut roskakoriin"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move to trash"
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
 msgctxt "shortcut window"
-msgid "Move to Spam"
-msgstr "Siirrä roskakoriin"
+msgid "Junk conversations"
+msgstr "Merkitse keskustelut roskaksi"
 
-#: ui/gtk/help-overlay.ui:95
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
 msgctxt "shortcut window"
-msgid "Delete conversation"
-msgstr "Poista keskustelu"
+msgid "Delete conversations"
+msgstr "Poista keskustelut"
 
 #: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
@@ -3091,7 +3301,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Palauta mittakaava"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:367
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Yleiset"
@@ -3108,203 +3318,176 @@ msgstr "Näytä pikanäppäimet"
 
 #: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
-msgid "Close current window"
-msgstr "Sulje nykyinen ikkuna"
+msgid "Open a new window"
+msgstr "Avaa uusi ikkuna"
 
 #: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "Sulje nykyinen ikkuna"
+
+#: ui/gtk/help-overlay.ui:220
+msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "Lopeta sovellus"
 
-#: ui/gtk/help-overlay.ui:222
+#: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Keyboard navigation"
 msgstr "Näppäimistöllä liikkuminen"
 
-#: ui/gtk/help-overlay.ui:226
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move focus to the next/previous pane"
-msgctxt "shortcut window"
-msgid "Focus the next pane"
-msgstr "Siirrä kohdistus seuraavaan/edelliseen osioon"
-
 #: ui/gtk/help-overlay.ui:233
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move focus to the next/previous pane"
-msgctxt "shortcut window"
-msgid "Focus the previous pane"
-msgstr "Siirrä kohdistus seuraavaan/edelliseen osioon"
-
-#: ui/gtk/help-overlay.ui:240
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move focus to conversation list"
-msgctxt "shortcut window"
-msgid "Focus the conversation list"
-msgstr "Siirrä kohdistus keskusteluluetteloon"
-
-#: ui/gtk/help-overlay.ui:247
-#, fuzzy
-#| msgid "Delete conversation"
 msgctxt "shortcut window"
-msgid "Select the conversation down"
-msgstr "Poista keskustelu"
+msgid "Go to next/previous pane"
+msgstr "Siirry seuraavaan/edelliseen osioon"
 
-#: ui/gtk/help-overlay.ui:254
-#, fuzzy
-#| msgid "Delete conversation"
+#: ui/gtk/help-overlay.ui:241
 msgctxt "shortcut window"
-msgid "Select the conversation up"
-msgstr "Poista keskustelu"
+msgid "Select next/previous conversation"
+msgstr "Valitse edellinen/seuraava keskustelu"
 
-#: ui/gtk/help-overlay.ui:261
+#: ui/gtk/help-overlay.ui:248
 msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "Kohdista edelliseen/seuraavaan viestiin"
 
-#: ui/gtk/help-overlay.ui:271
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Show keyboard shortcuts"
+#: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
 msgid "Single-key shortcuts"
-msgstr "Näytä pikanäppäimet"
+msgstr "Yhden näppäimen pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:275
+#: ui/gtk/help-overlay.ui:262
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "Vastaa lähettäjälle "
 
-#: ui/gtk/help-overlay.ui:296
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Mark unread"
+#: ui/gtk/help-overlay.ui:332
+msgctxt "shortcut window"
+msgid "Find in current conversations"
+msgstr "Etsi nykyisistä keskusteluista"
+
+#: ui/gtk/help-overlay.ui:339
 msgctxt "shortcut window"
-msgid "Mark/un-mark read"
-msgstr "Merkitse lukemattomaksi"
+msgid "Select next/previous conversations"
+msgstr "Valitse edelliset/seuraavat keskustelut"
 
-#: ui/gtk/help-overlay.ui:343
+#: ui/gtk/help-overlay.ui:351
 msgid "Composer Shortcuts"
 msgstr "Lähettämisen pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:359
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Lähetä"
 
-#: ui/gtk/help-overlay.ui:358
+#: ui/gtk/help-overlay.ui:366
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Lisää liite"
 
-#: ui/gtk/help-overlay.ui:371
+#: ui/gtk/help-overlay.ui:379
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Sulje lähetysikkuna"
 
-#: ui/gtk/help-overlay.ui:378
+#: ui/gtk/help-overlay.ui:386
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Irrota lähetysikkuna"
 
-#: ui/gtk/help-overlay.ui:385
+#: ui/gtk/help-overlay.ui:393
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Muokkaus"
 
-#: ui/gtk/help-overlay.ui:390
+#: ui/gtk/help-overlay.ui:398
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Siirrä valinta leikepöydälle"
 
-#: ui/gtk/help-overlay.ui:397
+#: ui/gtk/help-overlay.ui:405
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Kopioi valinta leikepöydälle"
 
-#: ui/gtk/help-overlay.ui:404
+#: ui/gtk/help-overlay.ui:412
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Liitä leikepöydältä"
 
-#: ui/gtk/help-overlay.ui:411
+#: ui/gtk/help-overlay.ui:419
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Lainaa tekstiä"
 
-#: ui/gtk/help-overlay.ui:418
+#: ui/gtk/help-overlay.ui:426
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Poista tekstin lainaus"
 
-#: ui/gtk/help-overlay.ui:427
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Rich text mode"
+#: ui/gtk/help-overlay.ui:435
 msgctxt "shortcut window"
 msgid "Rich text editing"
-msgstr "Muotoilutila"
+msgstr "Monipuolinen muotoilutila"
 
-#: ui/gtk/help-overlay.ui:431
+#: ui/gtk/help-overlay.ui:439
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Liitä ilman muotoilua"
 
-#: ui/gtk/help-overlay.ui:438
+#: ui/gtk/help-overlay.ui:446
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Lihavoitu teksti"
 
-#: ui/gtk/help-overlay.ui:445
+#: ui/gtk/help-overlay.ui:453
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Kursivoitu teksti"
 
-#: ui/gtk/help-overlay.ui:452
+#: ui/gtk/help-overlay.ui:460
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Alleviivattu teksti"
 
-#: ui/gtk/help-overlay.ui:459
+#: ui/gtk/help-overlay.ui:467
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Yliviivattu teksti"
 
-#: ui/gtk/help-overlay.ui:466
+#: ui/gtk/help-overlay.ui:474
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Poista muotoilu"
 
-#: ui/gtk/help-overlay.ui:473
+#: ui/gtk/help-overlay.ui:481
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Lisää kuva"
 
-#: ui/gtk/help-overlay.ui:480
+#: ui/gtk/help-overlay.ui:488
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Lisää linkki"
 
-#: ui/main-toolbar.ui:23
+#: ui/main-toolbar.ui:24
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "Lähetä viesti"
 
-#: ui/main-toolbar.ui:61
+#: ui/main-toolbar.ui:62
 msgid "Toggle search bar"
 msgstr "Hakupalkki päälle/pois"
 
-#: ui/main-toolbar.ui:113
+#: ui/main-toolbar.ui:114
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ui/main-toolbar.ui:136
+#: ui/main-toolbar.ui:137
 msgid "Reply All"
 msgstr "Vastaa kaikille"
 
-#: ui/main-toolbar.ui:159
+#: ui/main-toolbar.ui:160
 msgid "Forward"
 msgstr "Lähetä edelleen"
 
@@ -3317,108 +3500,29 @@ msgid "_Archive"
 msgstr "_Arkistoi"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Mark as S_pam"
-msgstr "Me_rkitse roskapostiksi"
+msgid "Toggle as S_pam"
+msgstr "Merkitse _roskapostiksi tai poista roskaposteista"
 
-#: ui/main-toolbar-menus.ui:25
-msgid "Mark as not S_pam"
-msgstr "Poista _roskapostimerkintä"
-
-#: ui/main-toolbar-menus.ui:32
+#: ui/main-toolbar-menus.ui:28
 msgid "Empty _Spam…"
 msgstr "Tyhjennä ro_skapostikansio…"
 
-#: ui/main-toolbar-menus.ui:36
+#: ui/main-toolbar-menus.ui:32
 msgid "Empty _Trash…"
 msgstr "Tyhjennä _roskakorikansio…"
 
-#: ui/main-toolbar-menus.ui:42
+#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "_Tilit"
 
-#: ui/main-toolbar-menus.ui:50
+#: ui/main-toolbar-menus.ui:46
 msgid "_Keyboard Shortcuts"
 msgstr "_Pikanäppäimet"
 
-#: ui/main-toolbar-menus.ui:61
+#: ui/main-toolbar-menus.ui:57
 msgid "_About Geary"
 msgstr "_Tietoja - Geary"
 
-#. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:185
-msgid "Working offline"
-msgstr "Työskennellään offline-tilassa"
-
-#. Label and tooltip for offline infobar
-#: 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."
-msgstr ""
-"Tietokoneesi ei vaikuta olevan yhteydessä internetiin.\n"
-"Viestien vastaanottaminen tai lähettäminen ei onnistu, ennen kuin yhteys on "
-"muodostettu uudelleen."
-
-#. Label and tooltip for offline infobar
-#: 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 retrying TLS cert validation
-#: ui/main-window.ui:249
-msgid "Check"
-msgstr "Tarkista"
-
-#. Button tooltip for retrying TLS cert validation
-#: 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:282
-msgid "Security problem"
-msgstr "Tietoturvaongelma"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:296
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-"Tili ilmoitti ei-luotetusta palvelimesta.\n"
-"Tarkista palvelimen asetukset ja yritä uudelleen."
-
-#. Label and tooltip for TLS cert validation error infobar
-#: 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: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:379
-msgid "Login problem"
-msgstr "Kirjautumisongelma"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:393
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-"Tili ilmoitti virheellisestä käyttäjätunnuksesta tai salasanasta.\n"
-"Tarkista käyttäjätunnus ja yritä uudelleen."
-
-#. Label and tooltip for authentication problem infobar
-#: 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."
-
 #: ui/password-dialog.glade:74
 msgid "SMTP Credentials"
 msgstr "SMTP-tunnukset"
@@ -3435,49 +3539,174 @@ msgstr "_Muista salasana"
 msgid "_Authenticate"
 msgstr "_Tunnistaudu"
 
-#: ui/preferences-dialog.ui:38
-msgid "Reading"
-msgstr "Lukeminen"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Gearyn päivitys on meneillään…"
 
-#: ui/preferences-dialog.ui:51
-msgid "_Automatically select next message"
-msgstr "_Valitse automaattisesti seuraava viesti"
+#~ msgid "Enable notification sounds"
+#~ msgstr "Käytä ilmoitusääniä"
 
-#: ui/preferences-dialog.ui:70
-msgid "_Display conversation preview"
-msgstr "N_äytä keskustelun esikatselu"
+#~ msgid "Show notifications for new mail"
+#~ msgstr "Näytä ilmoitus uusista viesteistä"
 
-#: ui/preferences-dialog.ui:89
-msgid "Use _three pane view"
-msgstr "Kä_ytä kolmen paneelin näkymää"
+#, fuzzy
+#~| 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ä"
 
-#: ui/preferences-dialog.ui:113
-msgid "Notifications"
-msgstr "Ilmoitukset"
+#~ msgid "Error emptying %s"
+#~ msgstr "Virhe tyhjennettäessä kohdetta %s"
 
-#: ui/preferences-dialog.ui:126
-msgid "_Play notification sounds"
-msgstr "_Toista ilmoitusäänet"
+#, fuzzy
+#~| msgid "%d message"
+#~| msgid_plural "%d messages"
+#~ msgid "Trashed %d message"
+#~ msgid_plural "Trashed %d messages"
+#~ msgstr[0] "%d viesti"
+#~ msgstr[1] "%d viestiä"
 
-#: ui/preferences-dialog.ui:145
-msgid "Show _notifications for new mail"
-msgstr "_Näytä ilmoitus uuden viestin saapuessa"
+#~ msgid "Archived %d message"
+#~ msgid_plural "Archived %d messages"
+#~ msgstr[0] "Arkistoitu %d viesti"
+#~ msgstr[1] "Arkistoitu %d viestiä"
 
-#: ui/preferences-dialog.ui:164
-msgid "_Watch for new mail when closed"
-msgstr "_Tarkkaile uusia viestejä suljettuna"
+#~ msgid "Successfully sent mail to %s."
+#~ msgstr "Lähetetty onnistuneesti sähköpostia vastaanottajille %s."
 
-#: ui/preferences-dialog.ui:168
-msgid "Geary will keep running after all windows are closed"
-msgstr "Geary jatkaa käynnissä olemista kun kaikki ikkunat on suljettu"
+#~ msgid "Failed to open default text editor."
+#~ msgstr "Oletustekstimuokkaimen avaus epäonnistui."
 
-#: ui/preferences-dialog.ui:195
-msgid "Preferences"
-msgstr "Asetukset"
+#, fuzzy
+#~| msgid "Display program version"
+#~ msgid "Display program version and revision id"
+#~ msgstr "Näytä sovelluksen versio"
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Gearyn päivitys on meneillään…"
+#~ msgid "Indexing %s account"
+#~ msgstr "Indeksoidaan tiliä %s"
+
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Irrota (Ctrl+D)"
+
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "Liitä tiedosto (Ctrl+T)"
+
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Lähetä (Ctrl+Enter)"
+
+#~ msgid "Open this link"
+#~ msgstr "Avaa tämä linkki"
+
+#~ msgid "C_olor"
+#~ msgstr "Vä_ri"
+
+#~ msgid "Show Extended Fields"
+#~ msgstr "Näytä laajennetut kentät"
+
+#~ msgid "Redo last edit  (Ctrl+Shift+Z)"
+#~ msgstr "Tee uudelleen viimeisin muokkaus  (Ctrl+Shift+Z)"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Lihavoitu (Ctrl+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kursivoitu (Ctrl+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Alleviivattu (Ctrl+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Yliviivattu (Ctrl+K)"
+
+#~ msgid "Insert ordered list"
+#~ msgstr "Lisää numeroitu luettelo"
+
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Lainaa tekstiä (Ctrl+])"
+
+#~ msgid "Unquote text  (Ctrl+[)"
+#~ msgstr "Poista tekstin lainaus (Ctrl+[)"
+
+#~ msgid "Insert an image (Ctrl+G)"
+#~ msgstr "Lisää kuva (Ctrl+G)"
+
+#~ msgid "Remove selection formatting (Ctrl+Space)"
+#~ msgstr "Poista muotoilu valinnasta (Ctrl+Space)"
+
+#~ msgid "column"
+#~ msgstr "sarake"
+
+#~ msgid "Display the message menu"
+#~ msgstr "Näytä viestivalikko"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive conversation"
+#~ msgstr "Arkistoi keskustelu"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move conversation"
+#~ msgstr "Siirrä keskustelu"
+
+#, fuzzy
+#~| msgctxt "shortcut window"
+#~| msgid "Move to trash"
+#~ msgctxt "shortcut window"
+#~ msgid "Move to Spam"
+#~ msgstr "Siirrä roskakoriin"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete conversation"
+#~ msgstr "Poista keskustelu"
+
+#, fuzzy
+#~| msgctxt "shortcut window"
+#~| msgid "Move focus to the next/previous pane"
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the next pane"
+#~ msgstr "Siirrä kohdistus seuraavaan/edelliseen osioon"
+
+#, fuzzy
+#~| msgctxt "shortcut window"
+#~| msgid "Move focus to conversation list"
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the conversation list"
+#~ msgstr "Siirrä kohdistus keskusteluluetteloon"
+
+#, fuzzy
+#~| msgid "Delete conversation"
+#~ msgctxt "shortcut window"
+#~ msgid "Select the conversation down"
+#~ msgstr "Poista keskustelu"
+
+#, fuzzy
+#~| msgctxt "shortcut window"
+#~| msgid "Mark unread"
+#~ msgctxt "shortcut window"
+#~ msgid "Mark/un-mark read"
+#~ msgstr "Merkitse lukemattomaksi"
+
+#~ msgid "Mark as S_pam"
+#~ msgstr "Me_rkitse roskapostiksi"
+
+#~ msgid "Mark as not S_pam"
+#~ msgstr "Poista _roskapostimerkintä"
+
+#~ msgid "Reading"
+#~ msgstr "Lukeminen"
+
+#~ msgid "Notifications"
+#~ msgstr "Ilmoitukset"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Toista ilmoitusäänet"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "_Näytä ilmoitus uuden viestin saapuessa"
+
+#~ msgid "Preferences"
+#~ msgstr "Asetukset"
 
 #~ msgid "mail-send"
 #~ msgstr "mail-send"
@@ -3488,9 +3717,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Save drafts on server"
 #~ msgstr "Tallenna luonnokset palvelimelle"
 
-#~ 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:"
 
@@ -3638,10 +3864,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ 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"
@@ -3908,9 +4130,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ "palvelimelle. Lisätietoja saat sähköpostipalvelun sinulle tarjoavalta "
 #~ "taholta."
 
-#~ msgid "_Update"
-#~ msgstr "P_äivitä"
-
 #~ msgid "E_mail address"
 #~ msgstr "_Sähköpostiosoite"
 
@@ -4118,9 +4337,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "_Justify"
 #~ msgstr "_Tasaa"
 
-#~ msgid "More options"
-#~ msgstr "Lisää valintoja"
-
 #~ msgctxt "Short Label"
 #~ msgid "Close and Save"
 #~ msgstr "Sulje ja tallenna"
@@ -4146,24 +4362,12 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Small"
 #~ msgstr "Pieni"
 
-#~ msgid "Sans Serif"
-#~ msgstr "Päätteetön"
-
-#~ msgid "Serif"
-#~ msgstr "Päätteellinen"
-
-#~ msgid "Fixed Width"
-#~ msgstr "Tasalevyinen"
-
 #~ msgid "Detach"
 #~ msgstr "Irrota"
 
 #~ msgid "_Attach File"
 #~ msgstr "Liit_ä tiedosto"
 
-#~ msgid "Attach File"
-#~ msgstr "Liitä tiedosto"
-
 #~ msgid "_Include Original Attachments"
 #~ msgstr "_Sisällytä alkuperäiset liitteet"
 


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