From 043df1a47d60edc67bf8494209a6a0cad8f8d6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= <jiri.gronroos@iki.fi>
Date: Wed, 27 Sep 2017 14:43:17 +0000
Subject: [PATCH] Update Finnish translation

---
 po/fi.po | 388 ++++++++++++++++++++-----------------------------------
 1 file changed, 143 insertions(+), 245 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index d5ff6ae2..6dace773 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=internationalization\n"
-"POT-Creation-Date: 2017-02-15 22:23+0000\n"
-"PO-Revision-Date: 2017-02-22 21:17+0200\n"
+"POT-Creation-Date: 2017-09-26 12:56+0000\n"
+"PO-Revision-Date: 2017-09-27 17:40+0300\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -20,21 +20,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:1
+#. Translators: The application name
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:2
 #: ../desktop/org.gnome.Geary.desktop.in.h:1
 #: ../desktop/geary-autostart.desktop.in.h:1
 msgid "Geary"
 msgstr "Geary"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:2
+#. Translators: The development team's name
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:4
+msgid "Geary Development Team"
+msgstr "Geary-kehitystiimi"
+
+#. Translators: The application's summary / tagline
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:6
 #: ../desktop/org.gnome.Geary.desktop.in.h:4
 #: ../desktop/geary-autostart.desktop.in.h:4
 msgid "Send and receive email"
 msgstr "Lähetä ja vastaanota sähköpostia"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:3
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:7
 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, "
@@ -44,7 +51,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.h:4
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:8
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -52,37 +59,46 @@ msgstr ""
 "Keskusteluiden avulla voit lukea koko viestiketjun ilman, että joudut "
 "napsauttamaan viestistä toiseen itse."
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:5
-#| msgid "Geary's features include:"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:9
 msgid "Geary’s features include:"
 msgstr "Gearyn ominaisuuksiin kuuluu muun muassa:"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:6
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:10
 msgid "Quick email account setup"
 msgstr "Nopea sähköpostitilin asetusten teko"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:7
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:11
 msgid "Shows related messages together in conversations"
 msgstr "Näyttää toisiinsa liittyvät viestit yhdessä keskustelumuodossa"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:8
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:12
 msgid "Fast, full text and keyword search"
 msgstr "Nopea haku koko tekstin ja avainsanojen tuella"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:9
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:13
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Monipuolinen HTML- ja raakatekstilähetys"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:10
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:14
 msgid "Desktop notification of new mail"
 msgstr "Työpöytäilmoitukset uusista viesteistä"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:11
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:15
 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.h:17
+msgid "Geary displaying a conversation"
+msgstr "Geary ja viestiketju"
+
+#. Translators: A screenshot description.
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:19
+msgid "Geary showing the rich text composer"
+msgstr "Geary ja viestin kirjoitusikkuna"
+
 #: ../desktop/org.gnome.Geary.desktop.in.h:2
 msgid "Email"
 msgstr "Sähköposti"
@@ -204,55 +220,47 @@ msgstr "Muokkaa"
 msgid "Preview"
 msgstr "Esikatsele"
 
-#: ../src/client/accounts/add-edit-page.vala:739
+#: ../src/client/accounts/add-edit-page.vala:751
 msgid "Remem_ber passwords"
 msgstr "M_uista salasanat"
 
-#: ../src/client/accounts/add-edit-page.vala:746 ../ui/login.glade.h:7
+#: ../src/client/accounts/add-edit-page.vala:758 ../ui/login.glade.h:7
 msgid "Remem_ber password"
 msgstr "_Muista salasana"
 
-#: ../src/client/accounts/add-edit-page.vala:780
+#: ../src/client/accounts/add-edit-page.vala:792
 msgid "Unable to validate:\n"
 msgstr "Tarkistaminen epäonnistui:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-#| msgid "        &#8226; Invalid account nickname.\n"
+#: ../src/client/accounts/add-edit-page.vala:794
 msgid "        • Invalid account nickname.\n"
 msgstr "        • Virheellinen tilin nimi.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:785
-#| msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/client/accounts/add-edit-page.vala:797
 msgid "        • Email address already added to Geary.\n"
 msgstr "        • Sähköpostiosoite on jo lisätty Gearyyn.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:789
-#| msgid "        &#8226; IMAP connection error.\n"
+#: ../src/client/accounts/add-edit-page.vala:801
 msgid "        • IMAP connection error.\n"
 msgstr "        • IMAP-yhteysvirhe.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:792
-#| msgid "        &#8226; IMAP username or password incorrect.\n"
+#: ../src/client/accounts/add-edit-page.vala:804
 msgid "        • IMAP username or password incorrect.\n"
 msgstr "        • IMAP-käyttäjätunnus tai -salasana on väärin.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:795
-#| msgid "        &#8226; SMTP connection error.\n"
+#: ../src/client/accounts/add-edit-page.vala:807
 msgid "        • SMTP connection error.\n"
 msgstr "        • SMTP-yhteysvirhe.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:798
-#| msgid "        &#8226; SMTP username or password incorrect.\n"
+#: ../src/client/accounts/add-edit-page.vala:810
 msgid "        • SMTP username or password incorrect.\n"
 msgstr "        • SMTP-käyttäjätunnus tai -salasana on väärin.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:802
-#| msgid "        &#8226; Connection error.\n"
+#: ../src/client/accounts/add-edit-page.vala:814
 msgid "        • Connection error.\n"
 msgstr "        • Yhteysvirhe.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:806
-#| msgid "        &#8226; Username or password incorrect.\n"
+#: ../src/client/accounts/add-edit-page.vala:818
 msgid "        • Username or password incorrect.\n"
 msgstr "        • Käyttäjätunnus tai salasana on väärin.\n"
 
@@ -264,7 +272,7 @@ msgstr "Tekijänoikeus 2016 Software Freedom Conservancy Inc."
 msgid "Visit the Geary web site"
 msgstr "Vieraile Gearyn verkkosivustolla"
 
-#: ../src/client/application/geary-application.vala:445
+#: ../src/client/application/geary-application.vala:464
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %ssta"
@@ -272,7 +280,7 @@ 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:449
+#: ../src/client/application/geary-application.vala:468
 msgid "translator-credits"
 msgstr "Jiri Grönroos"
 
@@ -355,7 +363,6 @@ msgstr "Komentorivivalintojen jäsennys epäonnistui: %s\n"
 
 #: ../src/client/application/geary-args.vala:72
 #, c-format
-#| msgid "Unrecognized command line option \"%s\"\n"
 msgid "Unrecognized command line option “%s”\n"
 msgstr ""
 "Tunnistamaton komentorivivalinta “%s”\n"
@@ -404,7 +411,7 @@ msgid "Mark as not S_pam"
 msgstr "Poista _roskapostimerkintä"
 
 #: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:449
+#: ../src/client/application/geary-controller.vala:448
 msgid "Mark conversation"
 msgstr "Merkitse keskustelu"
 
@@ -421,7 +428,7 @@ msgid "Add label to conversations"
 msgstr "Lisää tunniste keskusteluihin"
 
 #: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:488
+#: ../src/client/application/geary-controller.vala:487
 msgid "Move conversation"
 msgstr "Siirrä keskustelu"
 
@@ -429,97 +436,95 @@ msgstr "Siirrä keskustelu"
 msgid "Move conversations"
 msgstr "Siirrä keskustelut"
 
-#: ../src/client/application/geary-controller.vala:451
-#| msgid "_Mark as..."
+#: ../src/client/application/geary-controller.vala:450
 msgid "_Mark as…"
 msgstr "_Merkitse…"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:456
 msgid "Mark as _Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../src/client/application/geary-controller.vala:463
+#: ../src/client/application/geary-controller.vala:462
 msgid "Mark as _Unread"
 msgstr "Merkitse l_ukemattomaksi"
 
-#: ../src/client/application/geary-controller.vala:469
+#: ../src/client/application/geary-controller.vala:468
 msgid "_Star"
 msgstr "_Merkitse tähdellä"
 
-#: ../src/client/application/geary-controller.vala:474
+#: ../src/client/application/geary-controller.vala:473
 msgid "U_nstar"
 msgstr "_Poista tähti"
 
-#: ../src/client/application/geary-controller.vala:484
+#: ../src/client/application/geary-controller.vala:483
 msgid "Add label"
 msgstr "Lisää tunniste"
 
-#: ../src/client/application/geary-controller.vala:485
+#: ../src/client/application/geary-controller.vala:484
 msgid "_Label"
 msgstr "_Tunniste"
 
-#: ../src/client/application/geary-controller.vala:489
+#: ../src/client/application/geary-controller.vala:488
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../src/client/application/geary-controller.vala:493
+#: ../src/client/application/geary-controller.vala:492
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Kirjoita uusi viesti (Ctrl+N, N)"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:496
 #: ../ui/conversation-email-menus.ui.h:1
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../src/client/application/geary-controller.vala:498
+#: ../src/client/application/geary-controller.vala:497
 msgid "Reply (Ctrl+R, R)"
 msgstr "Vastaa (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:502
+#: ../src/client/application/geary-controller.vala:501
 msgid "R_eply All"
 msgstr "_Vastaa kaikille"
 
-#: ../src/client/application/geary-controller.vala:503
+#: ../src/client/application/geary-controller.vala:502
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Vastaa kaikille (Ctrl+Shift+R, Shift+R)"
 
-#: ../src/client/application/geary-controller.vala:508
+#: ../src/client/application/geary-controller.vala:507
 #: ../ui/conversation-email-menus.ui.h:3
 msgid "_Forward"
 msgstr "_Lähetä edelleen"
 
-#: ../src/client/application/geary-controller.vala:509
+#: ../src/client/application/geary-controller.vala:508
 msgid "Forward (Ctrl+L, F)"
 msgstr "Lähetä edelleen (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:539
+#: ../src/client/application/geary-controller.vala:538
 msgid "Empty _Spam…"
 msgstr "Tyhjennä ro_skapostikansio…"
 
-#: ../src/client/application/geary-controller.vala:543
+#: ../src/client/application/geary-controller.vala:542
 msgid "Empty _Trash…"
 msgstr "Tyhjennä _roskakorikansio…"
 
 #. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:575
+#: ../src/client/application/geary-controller.vala:574
 msgid "Toggle search bar"
 msgstr "Hakupalkki päälle/pois"
 
 #. No callback is connected, since we bind the toggle button to the find bar visibility
-#: ../src/client/application/geary-controller.vala:580
-#| msgid "Toggle search bar"
+#: ../src/client/application/geary-controller.vala:579
 msgid "Toggle find bar"
 msgstr "Hakupalkki päälle/pois"
 
-#: ../src/client/application/geary-controller.vala:758
+#: ../src/client/application/geary-controller.vala:757
 msgid "Unable to store server trust exception"
 msgstr "Palvelimen luottamuspoikkeuksen varastointi epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:993
+#: ../src/client/application/geary-controller.vala:992
 msgid "Your settings are insecure"
 msgstr "Asetuksesi eivät ole turvalliset"
 
-#: ../src/client/application/geary-controller.vala:994
+#: ../src/client/application/geary-controller.vala:993
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -529,15 +534,15 @@ msgstr ""
 "SSL:ää tai TLS:ää. Tämä tarkoittaa, että käyttäjätunnuksesi ja salasanasi on "
 "mahdollista lukea verkkoliikenteestä. Haluatko varmasti sallia tämän?"
 
-#: ../src/client/application/geary-controller.vala:995
+#: ../src/client/application/geary-controller.vala:994
 msgid "Co_ntinue"
 msgstr "_Jatka"
 
-#: ../src/client/application/geary-controller.vala:1042
+#: ../src/client/application/geary-controller.vala:1041
 msgid "Error connecting to the server"
 msgstr "Virhe yhdistäessä palvelimeen"
 
-#: ../src/client/application/geary-controller.vala:1043
+#: ../src/client/application/geary-controller.vala:1042
 msgid ""
 "Geary encountered an error while connecting to the server.  Please try again "
 "in a few moments."
@@ -546,12 +551,12 @@ msgstr ""
 "kuluttua."
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1080
+#: ../src/client/application/geary-controller.vala:1079
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Virhe sähköpostia lähettäessä"
 
-#: ../src/client/application/geary-controller.vala:1081
+#: ../src/client/application/geary-controller.vala:1080
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -561,12 +566,12 @@ msgstr ""
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1085
+#: ../src/client/application/geary-controller.vala:1084
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Virhe lähetettyä postia tallennettaessa"
 
-#: ../src/client/application/geary-controller.vala:1086
+#: ../src/client/application/geary-controller.vala:1085
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -575,19 +580,19 @@ msgstr ""
 "kansioon.  Tämä viesti säilyy Lähtevät-kansiossa niin kauan, kunnes poistat "
 "sen."
 
-#: ../src/client/application/geary-controller.vala:1155
+#: ../src/client/application/geary-controller.vala:1154
 msgid "Labels"
 msgstr "Tunnisteet"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1167
+#: ../src/client/application/geary-controller.vala:1166
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Kohteen %s tietokannan avaaminen epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:1168
+#: ../src/client/application/geary-controller.vala:1167
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -613,21 +618,20 @@ msgstr ""
 "niiden liitteet. <b>Toimenpiteellä ei ole vaikutusta palvelimella oleviin "
 "viesteihin ja liitteisiin.</b>"
 
-#: ../src/client/application/geary-controller.vala:1170
+#: ../src/client/application/geary-controller.vala:1169
 msgid "_Rebuild"
 msgstr "Ra_kenna uudelleen"
 
-#: ../src/client/application/geary-controller.vala:1170
+#: ../src/client/application/geary-controller.vala:1169
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ../src/client/application/geary-controller.vala:1179
+#: ../src/client/application/geary-controller.vala:1178
 #, c-format
-#| msgid "Unable to rebuild database for \"%s\""
 msgid "Unable to rebuild database for “%s”"
 msgstr "Tietokannan jälleenrakennus tilille “%s” epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:1180
+#: ../src/client/application/geary-controller.vala:1179
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -640,14 +644,14 @@ msgstr ""
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1202
-#: ../src/client/application/geary-controller.vala:1212
-#: ../src/client/application/geary-controller.vala:1223
+#: ../src/client/application/geary-controller.vala:1201
+#: ../src/client/application/geary-controller.vala:1211
+#: ../src/client/application/geary-controller.vala:1222
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Paikallisen postilaatikon avaaminen tilillä %s epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:1203
+#: ../src/client/application/geary-controller.vala:1202
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -666,13 +670,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1213
-#| msgid ""
-#| "The version number of the local mail database is formatted for a newer "
-#| "version of Geary. Unfortunately, the database cannot be \"rolled back\" "
-#| "to work with this version of Geary.\n"
-#| "\n"
-#| "Please install the latest version of Geary and try again."
+#: ../src/client/application/geary-controller.vala:1212
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be “rolled back” to "
@@ -686,7 +684,7 @@ msgstr ""
 "\n"
 "Asenna uusin version Gearysta ja yritä uudelleen."
 
-#: ../src/client/application/geary-controller.vala:1224
+#: ../src/client/application/geary-controller.vala:1223
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -703,7 +701,6 @@ msgid "Undo move (Ctrl+Z)"
 msgstr "Kumoa siirtäminen (Ctrl+Z)"
 
 #: ../src/client/application/geary-controller.vala:2009
-#| msgid "Are you sure you want to open \"%s\"?"
 msgid "Are you sure you want to open these attachments?"
 msgstr "Haluatko varmasti avata nämä liitteet?"
 
@@ -716,83 +713,78 @@ msgstr ""
 "ainoastaan, jos luotat niiden lähettäjään."
 
 #: ../src/client/application/geary-controller.vala:2011
-#| msgid "Don't _ask me again"
 msgid "Don’t _ask me again"
 msgstr "_Älä kysy uudelleen"
 
-#: ../src/client/application/geary-controller.vala:2146
+#: ../src/client/application/geary-controller.vala:2121
 #, c-format
-#| msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Tiedosto nimellä “%s” on jo olemassa.  Haluatko korvata sen?"
 
-#: ../src/client/application/geary-controller.vala:2148
+#: ../src/client/application/geary-controller.vala:2123
 #, c-format
-#| msgid ""
-#| "The file already exists in \"%s\".  Replacing it will overwrite its "
-#| "contents."
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr ""
 "Tiedosto on jo olemassa kohteessa “%s”.  Tiedoston korvaaminen korvaa "
 "nykyisen tiedoston sisällön."
 
-#: ../src/client/application/geary-controller.vala:2151
+#: ../src/client/application/geary-controller.vala:2126
 msgid "_Replace"
 msgstr "_Korvaa"
 
 #. Find out what to do with the inline composers.
 #. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2398
+#: ../src/client/application/geary-controller.vala:2374
 msgid "Close open draft messages?"
 msgstr "Suljetaanko luonnosviesti?"
 
-#: ../src/client/application/geary-controller.vala:2520
+#: ../src/client/application/geary-controller.vala:2496
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Poistetaanko kaikki viesit \"%s\"-kansiosta?"
 
-#: ../src/client/application/geary-controller.vala:2521
+#: ../src/client/application/geary-controller.vala:2497
 msgid "This removes the email from Geary and your email server."
 msgstr "Tämä poistaa viestit Gearysta ja sähköpostipalvelimelta."
 
-#: ../src/client/application/geary-controller.vala:2522
+#: ../src/client/application/geary-controller.vala:2498
 msgid "This cannot be undone."
 msgstr "Toimintoa ei voi perua."
 
-#: ../src/client/application/geary-controller.vala:2523
+#: ../src/client/application/geary-controller.vala:2499
 #, c-format
 msgid "Empty %s"
 msgstr "Tyhjennä %s"
 
-#: ../src/client/application/geary-controller.vala:2540
+#: ../src/client/application/geary-controller.vala:2516
 #, c-format
 msgid "Error emptying %s"
 msgstr "Virhe tyhjennettäessä kohdetta %s"
 
-#: ../src/client/application/geary-controller.vala:2570
+#: ../src/client/application/geary-controller.vala:2546
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Haluatko poistaa tämän viestin pysyvästi?"
 msgstr[1] "Haluatko poistaa nämä viestit pysyvästi?"
 
-#: ../src/client/application/geary-controller.vala:2572
+#: ../src/client/application/geary-controller.vala:2548
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2580
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Kumoa arkistointi (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2619
+#: ../src/client/application/geary-controller.vala:2595
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Kumoa roskakoriin siirto (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2673
+#: ../src/client/application/geary-controller.vala:2649
 msgid "Undo (Ctrl+Z)"
 msgstr "Kumoa (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2806
+#: ../src/client/application/geary-controller.vala:2780
 msgid "Failed to open default text editor."
 msgstr "Oletustekstimuokkaimen avaus epäonnistui."
 
@@ -825,7 +817,6 @@ 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..."
 msgid "Sending…"
 msgstr "Lähetetään…"
 
@@ -863,7 +854,6 @@ msgid "_Preferences"
 msgstr "_Asetukset"
 
 #: ../src/client/components/stock.vala:28 ../ui/conversation-email-menus.ui.h:7
-#| msgid "_Print..."
 msgid "_Print…"
 msgstr "_Tulosta…"
 
@@ -888,7 +878,6 @@ msgid "Invalid link URL"
 msgstr "Virheellinen linkin osoite"
 
 #: ../src/client/composer/composer-link-popover.vala:157
-#| msgid "Remove email address"
 msgid "Invalid email address"
 msgstr "Virheellinen sähköpostiosoite"
 
@@ -925,30 +914,29 @@ msgstr ""
 "enclosing|encloses|enclosure|enclosures|liite|liitetiedosto|liitteen|"
 "liitetiedostot|liitän"
 
-#: ../src/client/composer/composer-widget.vala:1120
-#: ../src/client/composer/composer-widget.vala:1139
+#: ../src/client/composer/composer-widget.vala:1122
+#: ../src/client/composer/composer-widget.vala:1141
 msgid "Do you want to discard this message?"
 msgstr "Haluatko hylätä tämän viestin?"
 
-#: ../src/client/composer/composer-widget.vala:1236
+#: ../src/client/composer/composer-widget.vala:1245
 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:1238
+#: ../src/client/composer/composer-widget.vala:1247
 msgid "Send message with an empty subject?"
 msgstr "Lähetetäänkö viesti ilman aihetta?"
 
-#: ../src/client/composer/composer-widget.vala:1240
+#: ../src/client/composer/composer-widget.vala:1249
 msgid "Send message with an empty body?"
 msgstr "Lähetetäänkö viesti ilman sisältöä?"
 
-#: ../src/client/composer/composer-widget.vala:1244
+#: ../src/client/composer/composer-widget.vala:1253
 msgid "Send message without an attachment?"
 msgstr "Lähetetäänkö viesti ilman liitettä?"
 
-#: ../src/client/composer/composer-widget.vala:1497
+#: ../src/client/composer/composer-widget.vala:1515
 #, c-format
-#| msgid "\"%s\" already attached for delivery."
 msgid "“%s” already attached for delivery."
 msgstr "“%s” on jo liitetty lähetystä varten."
 
@@ -957,78 +945,73 @@ msgstr "“%s” on jo liitetty lähetystä varten."
 #. description of the document type, the second will
 #. be a human-friendly size string. For example:
 #. Document (100.9MB)
-#: ../src/client/composer/composer-widget.vala:1505
-#: ../src/client/conversation-viewer/conversation-email.vala:135
+#: ../src/client/composer/composer-widget.vala:1523
+#: ../src/client/conversation-viewer/conversation-email.vala:138
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1542
+#: ../src/client/composer/composer-widget.vala:1560
 #, c-format
-#| msgid "\"%s\" could not be found."
 msgid "“%s” could not be found."
 msgstr "Kohdetta “%s” ei löytynyt."
 
-#: ../src/client/composer/composer-widget.vala:1548
+#: ../src/client/composer/composer-widget.vala:1566
 #, c-format
-#| msgid "\"%s\" is a folder."
 msgid "“%s” is a folder."
 msgstr "“%s” on kansio."
 
-#: ../src/client/composer/composer-widget.vala:1554
+#: ../src/client/composer/composer-widget.vala:1572
 #, c-format
-#| msgid "\"%s\" is an empty file."
 msgid "“%s” is an empty file."
 msgstr "“%s” on tyhjä tiedosto."
 
-#: ../src/client/composer/composer-widget.vala:1567
+#: ../src/client/composer/composer-widget.vala:1585
 #, c-format
-#| msgid "\"%s\" could not be opened for reading."
 msgid "“%s” could not be opened for reading."
 msgstr "Kohteen “%s” avaus lukua varten epäonnistui."
 
-#: ../src/client/composer/composer-widget.vala:1575
+#: ../src/client/composer/composer-widget.vala:1593
 msgid "Cannot add attachment"
 msgstr "Liitteen lisäys epäonnistui"
 
-#: ../src/client/composer/composer-widget.vala:1637
+#: ../src/client/composer/composer-widget.vala:1645
 msgid "To: "
 msgstr "Vastaanottaja:"
 
-#: ../src/client/composer/composer-widget.vala:1640
+#: ../src/client/composer/composer-widget.vala:1648
 msgid "Cc: "
 msgstr "Kopio:"
 
-#: ../src/client/composer/composer-widget.vala:1643
+#: ../src/client/composer/composer-widget.vala:1651
 msgid "Bcc: "
 msgstr "Piilokopio:"
 
-#: ../src/client/composer/composer-widget.vala:1646
+#: ../src/client/composer/composer-widget.vala:1654
 msgid "Reply-To: "
 msgstr "Vastausosoite:"
 
-#: ../src/client/composer/composer-widget.vala:1777
+#: ../src/client/composer/composer-widget.vala:1786
 msgid "Select Color"
 msgstr "Valitse väri"
 
 #. Displayed in the From dropdown to indicate an "alternate email address"
 #. for an account.  The first 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:1977
+#: ../src/client/composer/composer-widget.vala:1986
 #, 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:2019
+#: ../src/client/composer/composer-widget.vala:2028
 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:2242
-#| msgid "Show Images"
+#: ../src/client/composer/composer-widget.vala:2252
 msgid "Images"
 msgstr "Kuvat"
 
@@ -1050,72 +1033,67 @@ msgstr "Minä"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: ../src/client/conversation-viewer/conversation-email.vala:121
+#: ../src/client/conversation-viewer/conversation-email.vala:124
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Preview headers
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: ../src/client/conversation-viewer/conversation-message.vala:327
+#: ../src/client/conversation-viewer/conversation-message.vala:331
 msgid "No sender"
 msgstr "Ei lähettäjää"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the header preview for a message.
-#: ../src/client/conversation-viewer/conversation-message.vala:569
+#: ../src/client/conversation-viewer/conversation-message.vala:586
 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:690
-#| msgid "Show Images"
+#: ../src/client/conversation-viewer/conversation-message.vala:707
 msgid "Image"
 msgstr "Kuva"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:73
-#| msgid "No conversations selected."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:72
 msgid "No conversations selected"
 msgstr "Keskusteluja ei ole valittu"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:75
+#: ../src/client/conversation-viewer/conversation-viewer.vala:74
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Keskustelun valitseminen luettelosta näyttää sen tässä"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:80
-#| msgid "%u conversation selected."
-#| msgid_plural "%u conversations selected."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:79
 msgid "Multiple conversations selected"
 msgstr "Useita keskusteluja valittu"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:82
+#: ../src/client/conversation-viewer/conversation-viewer.vala:81
 msgid "Choosing an action will apply to all selected conversations"
 msgstr ""
 "Toiminnon valitseminen toteuttaa sen kaikkiin valittuihin keskusteluihin"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:87
-#: ../src/client/conversation-viewer/conversation-viewer.vala:94
-#| msgid "No conversations in folder."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:86
+#: ../src/client/conversation-viewer/conversation-viewer.vala:93
 msgid "No conversations found"
 msgstr "Keskusteluja ei löytynyt"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:89
+#: ../src/client/conversation-viewer/conversation-viewer.vala:88
 msgid "This folder does not contain any conversations"
 msgstr "Tämä kansio ei sisällä keskusteluja"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:96
+#: ../src/client/conversation-viewer/conversation-viewer.vala:95
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Hakuehtosi eivät tuottaneet tuloksia. Yritä uudelleen eri hakuehdoilla"
 
-#: ../src/client/dialogs/attachment-dialog.vala:24
-#: ../src/client/dialogs/attachment-dialog.vala:26
+#: ../src/client/dialogs/attachment-dialog.vala:28
+#: ../src/client/dialogs/attachment-dialog.vala:30
 msgid "Choose a file"
 msgstr "Valitse tiedosto"
 
-#: ../src/client/dialogs/attachment-dialog.vala:24
-#: ../src/client/dialogs/attachment-dialog.vala:26
+#: ../src/client/dialogs/attachment-dialog.vala:28
+#: ../src/client/dialogs/attachment-dialog.vala:30
 msgid "_Attach"
 msgstr "_Liitä"
 
@@ -1130,9 +1108,6 @@ msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr "Postipalvelimen %s identiteettiä osoitteessa %s:%u ei voitu vahvistaa."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:44
-#| msgid ""
-#| "Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-#| "your username and password to be transmitted insecurely."
 msgid ""
 "Selecting “Trust This Server” or “Always Trust This Server” may cause your "
 "username and password to be transmitted insecurely."
@@ -1141,9 +1116,6 @@ msgstr ""
 "saattaa aiheuttaa käyttäjätunnuksen ja salasanan välittämisen turvattomasti."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:52
-#| msgid ""
-#| "Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-#| "server."
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary not to access this "
 "server."
@@ -1156,9 +1128,6 @@ msgid "Geary will not add or update this email account."
 msgstr "Geary ei lisää tai päivitä tätä sähköpostitiliä."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:59
-#| msgid ""
-#| "Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-#| "this account."
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
 "account."
@@ -1179,37 +1148,30 @@ msgstr ""
 "kysymyksiä näihin asioihin liittyen."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:73
-#| msgid "The server's certificate is not signed by a known authority"
 msgid "The server’s certificate is not signed by a known authority"
 msgstr "Palvelimen varmennetta ei ole allekirjoitettu tunnetun tahon toimesta"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:76
-#| msgid "The server's identity does not match the identity in the certificate"
 msgid "The server’s identity does not match the identity in the certificate"
 msgstr "Palvelimen identiteetti ei vastaa varmenteen identiteettiä"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:79
-#| msgid "The server's certificate has expired"
 msgid "The server’s certificate has expired"
 msgstr "Palvelimen varmenne on vanhentunut"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:82
-#| msgid "The server's certificate has not been activated"
 msgid "The server’s certificate has not been activated"
 msgstr "Palvelimen varmennetta ei ole aktivoitu"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:85
-#| msgid "The server's certificate has been revoked and is now invalid"
 msgid "The server’s certificate has been revoked and is now invalid"
 msgstr "Palvelimen varmenne on kumottu, joten se on nyt virheellinen"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:88
-#| msgid "The server's certificate is considered insecure"
 msgid "The server’s certificate is considered insecure"
 msgstr "Palvelimen varmennetta kohdellaan turvattomana"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:91
-#| msgid "An error has occurred processing the server's certificate"
 msgid "An error has occurred processing the server’s certificate"
 msgstr "Virhe palvelimen varmennetta käsiteltäessä"
 
@@ -1257,7 +1219,6 @@ msgstr[1] "%d tulosta"
 
 #: ../src/client/notification/libmessagingmenu.vala:75
 #, c-format
-#| msgid "%s - New Messages"
 msgid "%s — New Messages"
 msgstr "%s — Uusia viestejä"
 
@@ -1822,7 +1783,6 @@ msgid "_Trust This Server"
 msgstr "Luota _tähän palvelimeen"
 
 #: ../ui/certificate_warning_dialog.glade.h:4
-#| msgid "_Don't Trust This Server"
 msgid "_Don’t Trust This Server"
 msgstr "_Älä luota tähän palvelimeen"
 
@@ -1869,8 +1829,6 @@ msgid "Update this link’s URL"
 msgstr "Päivitä tämän linkin osoite"
 
 #: ../ui/composer-link-popover.ui.h:6
-#| msgctxt "Outlook localised name"
-#| msgid "Deleted Items"
 msgid "Delete this link"
 msgstr "Poista tämä linkki"
 
@@ -1944,7 +1902,6 @@ msgid "Select _All"
 msgstr "Valitse _kaikki"
 
 #: ../ui/composer-menus.ui.h:17 ../ui/conversation-message-menus.ui.h:9
-#| msgid "_Inspect"
 msgid "_Inspect…"
 msgstr "T_utki…"
 
@@ -1983,7 +1940,6 @@ msgid "To add them as attachments"
 msgstr "lisätäksesi ne liitteiksi"
 
 #: ../ui/composer-widget.ui.h:11
-#| msgid "Undo trash (Ctrl+Z)"
 msgid "Undo last edit (Ctrl+Z)"
 msgstr "Kumoa viimeisin muokkaus (Ctrl+Z)"
 
@@ -2020,22 +1976,18 @@ msgid "Insert or update selection link (Ctrl+L)"
 msgstr "Lisää tai päivitä valintalinkki (Ctrl+L)"
 
 #: ../ui/composer-widget.ui.h:20
-#| msgid "Underline (Ctrl+U)"
 msgid "Insert an image (Ctrl+G)"
 msgstr "Lisää kuva (Ctrl+G)"
 
 #: ../ui/composer-widget.ui.h:21
-#| msgid "Remove formatting (Ctrl+Space)"
 msgid "Remove selection formatting (Ctrl+Space)"
 msgstr "Poista muotoilu valinnasta (Ctrl+Space)"
 
 #: ../ui/composer-widget.ui.h:22
-#| msgid "Select spell checking language"
 msgid "Select spell checking languages"
 msgstr "Valitse oikoluvun kielet"
 
 #: ../ui/conversation-email.ui.h:1
-#| msgid "Save All A_ttachments..."
 msgid "Save all attachments"
 msgstr "Tallenna kaikki liitteet"
 
@@ -2054,17 +2006,14 @@ msgid "Display the message menu"
 msgstr "Näytä viestivalikko"
 
 #: ../ui/conversation-email.ui.h:7
-#| msgid "Cannot add attachment"
 msgid "Open selected attachments"
 msgstr "Avaa valitut litteet"
 
 #: ../ui/conversation-email.ui.h:8
-#| msgid "Save All A_ttachments..."
 msgid "Save selected attachments"
 msgstr "Tallenna valitut liitteet"
 
 #: ../ui/conversation-email.ui.h:9
-#| msgid "Save All A_ttachments..."
 msgid "Select all attachments"
 msgstr "Valitse kaikki liitteet"
 
@@ -2073,13 +2022,10 @@ msgid "Edit Draft"
 msgstr "Muokkaa luonnosta"
 
 #: ../ui/conversation-email.ui.h:11
-#| msgid "%u read message"
-#| msgid_plural "%u read messages"
 msgid "Draft message"
 msgstr "Luonnosviesti"
 
 #: ../ui/conversation-email.ui.h:12
-#| msgid "This message contains remote images."
 msgid "This message has not yet been sent."
 msgstr "Tätä viestiä ei ole vielä lähetetty."
 
@@ -2092,7 +2038,6 @@ msgid "Message not saved"
 msgstr "Viestiä ei tallennettu"
 
 #: ../ui/conversation-email.ui.h:15
-#| msgid "This message was sent successfully, but could not be saved to %s."
 msgid "This message was sent, but has not been saved to your account."
 msgstr ""
 "Tämä viesti lähetettiin onnistuneesti, mutta sen tallennus tilillesi "
@@ -2103,12 +2048,10 @@ msgid "Reply to _All"
 msgstr "_Vastaa kaikille"
 
 #: ../ui/conversation-email-menus.ui.h:4
-#| msgid "_Mark as Read"
 msgid "_Mark Read"
 msgstr "Merkitse _luetuksi"
 
 #: ../ui/conversation-email-menus.ui.h:5
-#| msgid "_Mark as Unread"
 msgid "_Mark Unread"
 msgstr "_Merkitse lukemattomaksi"
 
@@ -2121,45 +2064,36 @@ msgid "_View Source"
 msgstr "Näytä lä_hde"
 
 #: ../ui/conversation-email-menus.ui.h:11
-#| msgid "_Save"
 msgid "_Save All"
 msgstr "_Tallenna kaikki"
 
 #: ../ui/conversation-message-menus.ui.h:1
-#| msgid "_Open"
 msgid "_Open Link"
 msgstr "_Avaa linkki"
 
 #: ../ui/conversation-message-menus.ui.h:2
-#| msgid "Copy _Email Address"
 msgid "Copy Link _Address"
 msgstr "Kopioi _linkin osoite"
 
 #: ../ui/conversation-message-menus.ui.h:3
-#| msgid "New Message"
 msgid "Send New _Message…"
 msgstr "L_ähetä uusi viesti…"
 
 #: ../ui/conversation-message-menus.ui.h:4
-#| msgid "Copy _Email Address"
 msgid "Copy Email _Address"
 msgstr "Kopioi _sähköpostiosoite"
 
 #: ../ui/conversation-message-menus.ui.h:5
-#| msgid "_Save Image As..."
 msgid "Save _Image As…"
 msgstr "T_allenna kuva nimellä…"
 
 #: ../ui/conversation-message-menus.ui.h:6
-#| msgid "Select _All"
 msgid "_Select All"
 msgstr "Valitse _kaikki"
 
 #: ../ui/conversation-message-menus.ui.h:8
-#, fuzzy
-#| msgid "Search for more languages"
 msgid "Search for messages from"
-msgstr "Etsi lisää kieliä"
+msgstr "Etsi viestejä lähettäjältä"
 
 #: ../ui/conversation-message.ui.h:1
 msgid "From <email>"
@@ -2178,12 +2112,10 @@ msgid "Sent by:"
 msgstr "Lähettänyt:"
 
 #: ../ui/conversation-message.ui.h:5
-#| msgid "Reply-To: "
 msgid "Reply to:"
 msgstr "Vastausosoite:"
 
 #: ../ui/conversation-message.ui.h:6
-#| msgid "Subject:"
 msgid "Subject"
 msgstr "Aihe"
 
@@ -2216,12 +2148,10 @@ msgid "Only show remote images from senders you trust."
 msgstr "Näytä etäkuvat vain lähettäjiltä, joihin luotat"
 
 #: ../ui/conversation-message.ui.h:14
-#| msgid "but actually goes to"
 msgid "But actually goes to:"
 msgstr "Mutta viekin kohteeseen:"
 
 #: ../ui/conversation-message.ui.h:15
-#| msgid "This link appears to go to"
 msgid "The link appears to go to:"
 msgstr "Tämä linkki vaikuttaa johtavan kohteeseen:"
 
@@ -2240,7 +2170,6 @@ msgstr ""
 "Jos olet epävarma, ole yhteydessä viestin lähettäjään ennen kuin jatkat."
 
 #: ../ui/conversation-viewer.ui.h:1
-#| msgid "Mark conversation"
 msgid "Find in conversation"
 msgstr "Etsi keskustelusta"
 
@@ -2290,12 +2219,10 @@ msgid "label"
 msgstr "nimike"
 
 #: ../ui/gtk/help-overlay.ui.h:1
-#| msgid "%s - Conversation Inspector"
 msgid "Conversation Shortcuts"
 msgstr "Keskustelun pikanäppäimet"
 
 #: ../ui/gtk/help-overlay.ui.h:2
-#| msgid "General"
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Yleiset"
@@ -2306,19 +2233,16 @@ msgid "Move focus to the next/previous pane"
 msgstr "Siirrä kohdistus seuraavaan/edelliseen osioon"
 
 #: ../ui/gtk/help-overlay.ui.h:4
-#| msgid "Move conversations"
 msgctxt "shortcut window"
 msgid "Move focus to conversation list"
 msgstr "Siirrä kohdistus keskusteluluetteloon"
 
 #: ../ui/gtk/help-overlay.ui.h:5
-#| msgid "Use %s to open a new composer window"
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Irrota lähetysikkuna"
 
 #: ../ui/gtk/help-overlay.ui.h:6
-#| msgid "Use %s to open a new composer window"
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Sulje lähetysikkuna"
@@ -2329,7 +2253,6 @@ msgid "Show keyboard shortcuts"
 msgstr "Näytä pikanäppäimet"
 
 #: ../ui/gtk/help-overlay.ui.h:8
-#| msgid "Show Images"
 msgctxt "shortcut window"
 msgid "Show help"
 msgstr "Näytä ohje"
@@ -2340,7 +2263,6 @@ msgid "Quit the application"
 msgstr "Lopeta sovellus"
 
 #: ../ui/gtk/help-overlay.ui.h:10
-#| msgid "Search"
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Haku"
@@ -2351,7 +2273,6 @@ msgid "Jump to search box"
 msgstr "Siirry hakukenttään"
 
 #: ../ui/gtk/help-overlay.ui.h:12
-#| msgid "Add label to conversation"
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Etsi nykyisestä keskustelusta"
@@ -2362,37 +2283,31 @@ msgid "Find next/previous in current conversation"
 msgstr "Etsi seuraava/edellinen nykyisestä keskustelusta"
 
 #: ../ui/gtk/help-overlay.ui.h:14
-#| msgid "Notifications"
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Toiminnot"
 
 #: ../ui/gtk/help-overlay.ui.h:15
-#| msgid "Compose Message"
 msgctxt "shortcut window"
 msgid "Compose a new message"
 msgstr "Luo uusi viesti"
 
 #: ../ui/gtk/help-overlay.ui.h:16
-#| msgid "Reply to _All"
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "Vastaa lähettäjälle"
 
 #: ../ui/gtk/help-overlay.ui.h:17
-#| msgid "Reply to _All"
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Vastaa kaikille"
 
 #: ../ui/gtk/help-overlay.ui.h:18
-#| msgid "_Forward"
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Lähetä edelleen"
 
 #: ../ui/gtk/help-overlay.ui.h:19
-#| msgid "Archive"
 msgctxt "shortcut window"
 msgid "Archive"
 msgstr "Arkistoi"
@@ -2403,31 +2318,26 @@ msgid "Move to trash"
 msgstr "Siirrä roskakoriin"
 
 #: ../ui/gtk/help-overlay.ui.h:21
-#| msgid "Toggle search bar"
 msgctxt "shortcut window"
 msgid "Toggle spam"
 msgstr "Merkitse roskapostiksi/poista roskapostimerkintä "
 
 #: ../ui/gtk/help-overlay.ui.h:22
-#| msgid "Move conversation"
 msgctxt "shortcut window"
 msgid "Move the conversation"
 msgstr "Siirrä keskustelu"
 
 #: ../ui/gtk/help-overlay.ui.h:23
-#| msgid "Delete conversation"
 msgctxt "shortcut window"
 msgid "Label the conversation"
 msgstr "Merkitse tunniste keskusteluun"
 
 #: ../ui/gtk/help-overlay.ui.h:24
-#| msgid "Mark as _Unread"
 msgctxt "shortcut window"
 msgid "Mark read"
 msgstr "Merkitse luetuksi"
 
 #: ../ui/gtk/help-overlay.ui.h:25
-#| msgid "Mark as _Unread"
 msgctxt "shortcut window"
 msgid "Mark unread"
 msgstr "Merkitse lukemattomaksi"
@@ -2458,25 +2368,21 @@ msgid "Additional Shortcuts"
 msgstr "Muut pikanäppäimet"
 
 #: ../ui/gtk/help-overlay.ui.h:31
-#| msgid "_Star"
 msgctxt "shortcut window"
 msgid "Star"
 msgstr "Merkitse tähdellä"
 
 #: ../ui/gtk/help-overlay.ui.h:32
-#| msgid "U_nstar"
 msgctxt "shortcut window"
 msgid "Unstar"
 msgstr "Poista tähti"
 
 #: ../ui/gtk/help-overlay.ui.h:33
-#| msgid "Delete"
 msgctxt "shortcut window"
 msgid "Delete"
 msgstr "Poista"
 
 #: ../ui/gtk/help-overlay.ui.h:34
-#| msgid "Delete conversation"
 msgctxt "shortcut window"
 msgid "Jump to next (older) conversation"
 msgstr "Siirry seuravaan (vanhempaan) keskusteluun"
@@ -2487,36 +2393,30 @@ msgid "Jump to previous (newer) conversation"
 msgstr "Siirry edelliseen (uudempaan) keskusteluun"
 
 #: ../ui/gtk/help-overlay.ui.h:36
-#| msgid "Composer"
 msgid "Composer Shortcuts"
 msgstr "Lähettämisen pikanäppäimet"
 
 #: ../ui/gtk/help-overlay.ui.h:37
-#| msgid "Quote text  (Ctrl+])"
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Lainaa tekstiä"
 
 #: ../ui/gtk/help-overlay.ui.h:38
-#| msgid "Unquote text  (Ctrl+[)"
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Poista tekstin lainaus"
 
 #: ../ui/gtk/help-overlay.ui.h:39
-#| msgid "Send"
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Lähetä"
 
 #: ../ui/gtk/help-overlay.ui.h:40
-#| msgid "attachment"
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Lisää liite"
 
 #: ../ui/gtk/help-overlay.ui.h:41
-#| msgid "_Rich Text"
 msgctxt "shortcut window"
 msgid "Rich text mode"
 msgstr "Muotoilutila"
@@ -2532,7 +2432,6 @@ msgid "Italicize text"
 msgstr "Kursivoitu teksti"
 
 #: ../ui/gtk/help-overlay.ui.h:44
-#| msgid "Underline (Ctrl+U)"
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Alleviivattu teksti"
@@ -2548,7 +2447,6 @@ msgid "Insert a link"
 msgstr "Lisää linkki"
 
 #: ../ui/gtk/help-overlay.ui.h:47
-#| msgid "Remove formatting (Ctrl+Space)"
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Poista muotoilu"