From e56e2a8e5483ad7a4273e6b6851233ed33b6b153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Kazik?= <prescott66@gmail.com>
Date: Wed, 16 Sep 2020 11:28:54 +0000
Subject: [PATCH 016/124] Update Slovak translation

---
 po/sk.po | 1730 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 973 insertions(+), 757 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index 1b1196ae..8fc3e1f4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,16 +10,16 @@ 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: 2020-05-04 08:24+0000\n"
-"PO-Revision-Date: 2020-05-08 14:50+0200\n"
+"POT-Creation-Date: 2020-08-29 01:59+0000\n"
+"PO-Revision-Date: 2020-09-16 13:28+0200\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0\n"
-"X-Generator: Gtranslator 3.36.0\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+"X-Generator: Poedit 2.4.1\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -31,10 +31,10 @@ msgstr "Odošle súbory pomocou aplikácie Geary"
 
 #. Translators: The application name
 #: desktop/geary-autostart.desktop.in.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: 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
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
@@ -45,9 +45,9 @@ msgstr "Email"
 
 #. Translators: The application's summary / tagline
 #: desktop/geary-autostart.desktop.in.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.appdata.xml.in.in:15
 #: desktop/org.gnome.Geary.desktop.in.in:5
-#: src/client/application/application-client.vala:32
+#: src/client/application/application-client.vala:33
 msgid "Send and receive email"
 msgstr "Odosiela a prijíma emaily"
 
@@ -57,11 +57,11 @@ msgid "Email;E-mail;Mail;"
 msgstr "email;e-mail;pošta;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in.in:14
+#: desktop/org.gnome.Geary.appdata.xml.in.in:13
 msgid "Geary Development Team"
 msgstr "Tím vývojárov aplikácie Geary"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:18
+#: desktop/org.gnome.Geary.appdata.xml.in.in:17
 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, "
@@ -71,7 +71,7 @@ msgstr ""
 "Umožňuje vám prečítať, hľadať a odosielať emaily s jasným a moderným "
 "rozhraním."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:23
+#: desktop/org.gnome.Geary.appdata.xml.in.in:22
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -79,43 +79,43 @@ msgstr ""
 "Rozhovory vám umožňujú prečítať kompletnú diskusiu bez nutnosti vyhľadania a "
 "klikania zo správy na správu."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "Funkcie aplikácie Geary zahŕňajú:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Rýchle nastavenie emailového účtu"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Shows related messages together in conversations"
 msgstr "Zobrazenie spolu súvisiacich správ v rozhovoroch"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Fast, full text and keyword search"
 msgstr "Rýchle, fulltextové vyhľadávanie a hľadanie podľa kľúčového slova"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Plnohodnotný nástroj na tvorbu správ vo formáte HTML a v čistom texte"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Desktop notification of new mail"
 msgstr "Upozornenie pracovného prostredia na novú poštu"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:34
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Kompatibilita so servermi GMail, Yahoo! Mail, Outlook.com a inými servermi "
 "typu IMAP"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:48
+#: desktop/org.gnome.Geary.appdata.xml.in.in:47
 msgid "Geary displaying a conversation"
 msgstr "Aplikácia Geary zobrazujúca rozhovor"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:59
+#: desktop/org.gnome.Geary.appdata.xml.in.in:58
 msgid "Geary showing the rich text composer"
 msgstr "Aplikácia Geary zobrazujúca tvorcu správ s formátovaným textom"
 
@@ -323,10 +323,18 @@ msgid ""
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr "Zoznam voliteľných zásuvných modulov"
+
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Zásuvné moduly z tohto zoznamu budú načítané po spustení."
+
+#: desktop/org.gnome.Geary.gschema.xml:152
 msgid "Whether we migrated the old settings"
 msgstr "Či sa majú migrovať staré nastavenia"
 
-#: desktop/org.gnome.Geary.gschema.xml:147
+#: desktop/org.gnome.Geary.gschema.xml:153
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -346,13 +354,13 @@ msgstr "Všetci ostatní"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
 msgid "Check your receiving login and password"
 msgstr "Skontrolujte vaše prihlasovacie meno a heslo pre prijímanie"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
 msgid "Check your receiving server details"
 msgstr "Skontrolujte vaše podrobnosti serveru prijímania"
 
@@ -362,13 +370,13 @@ msgstr "Skontrolujte vaše podrobnosti serveru prijímania"
 #. specify custom creds here
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:232
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
 msgid "Check your sending login and password"
 msgstr "Skontrolujte vaše prihlasovacie meno a heslo pre odosielanie"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
 msgid "Check your sending server details"
 msgstr "Skontrolujte vaše podrobnosti serveru odosielania"
 
@@ -424,14 +432,14 @@ msgstr "osoba@priklad.sk"
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:593
-#: src/client/accounts/accounts-editor-servers-pane.vala:884
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
 msgid "Login name"
 msgstr "Prihlasovacie meno"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:607
-#: src/client/accounts/accounts-editor-servers-pane.vala:1006
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Heslo"
@@ -441,7 +449,7 @@ msgstr "Heslo"
 #. 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:629
-#: src/client/accounts/accounts-editor-servers-pane.vala:728
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "IMAP server"
 msgstr "Server IMAP"
 
@@ -456,7 +464,7 @@ msgstr "imap.priklad.sk"
 #. 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:638
-#: src/client/accounts/accounts-editor-servers-pane.vala:734
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
 msgid "SMTP server"
 msgstr "Server SMTP"
 
@@ -602,55 +610,54 @@ msgstr[1] "starú %d deň"
 msgstr[2] "starú %d dni"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2053
+#: src/client/application/application-main-window.vala:2061
 msgid "Undo"
 msgstr "Vrátiť späť"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2036
+#: src/client/application/application-main-window.vala:2044
 msgid "Redo"
 msgstr "Znovu vykonať"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:362
-#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-list-pane.vala:458
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:366
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:462
 #: 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:384
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has been disabled"
 msgstr "Tento účet bol zakázaný"
 
 #. 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:393
+#: src/client/accounts/accounts-editor-list-pane.vala:397
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Tento účet narazil na problém a nie je dostupný"
 
-#. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: src/client/accounts/accounts-editor-list-pane.vala:466
 msgid "Other email providers"
 msgstr "Iní poskytovatelia emailu"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:560
+#: src/client/accounts/accounts-editor-list-pane.vala:572
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Účet „%s“ bol odstránený"
@@ -658,7 +665,7 @@ msgstr "Účet „%s“ bol odstránený"
 #. 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:567
+#: src/client/accounts/accounts-editor-list-pane.vala:579
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Účet „%s“ bol obnovený"
@@ -671,67 +678,66 @@ msgstr "Ťahaním presuniete túto položku"
 #. Translators: Label describes the service provider
 #. hosting the email account, e.g. Gmail, Yahoo, or some
 #. other generic IMAP service.
-#: src/client/accounts/accounts-editor-row.vala:295
+#: src/client/accounts/accounts-editor-row.vala:299
 msgid "Service provider"
 msgstr "Poskytovateľ služby"
 
 #. Translators: This label describes what form of transport
 #. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
 #. service.
-#: src/client/accounts/accounts-editor-row.vala:468
+#: src/client/accounts/accounts-editor-row.vala:473
 msgid "Connection security"
 msgstr "Zabezpečenie pripojenia"
 
 #. 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:755
-#: src/client/accounts/accounts-editor-servers-pane.vala:970
-#: src/engine/api/geary-special-folder-type.vala:58
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
 msgid "None"
 msgstr "Nič"
 
-#: src/client/accounts/accounts-editor-row.vala:486
+#: src/client/accounts/accounts-editor-row.vala:491
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:493
+#: src/client/accounts/accounts-editor-row.vala:498
 msgid "TLS"
 msgstr "TLS"
 
 #. Translators: Label for source of SMTP authentication
 #. 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/application-main-window.ui:346
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
 msgid "Login"
 msgstr "Prihlásenie"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:541
+#: src/client/accounts/accounts-editor-row.vala:546
 msgid "No login needed"
 msgstr "Nie je potrebné prihlásenie"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:549
+#: src/client/accounts/accounts-editor-row.vala:554
 msgid "Use same login as receiving"
 msgstr "Použiť rovnaké prihlásenie ako pre prijímanie"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:557
+#: src/client/accounts/accounts-editor-row.vala:562
 msgid "Use a different login"
 msgstr "Použiť iné prihlásenie"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-servers-pane.vala:377
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
 #, c-format
 msgid "Account not updated: %s"
 msgstr "Účet nebol aktualizovaný: %s"
@@ -739,23 +745,23 @@ msgstr "Účet nebol aktualizovaný: %s"
 #. Translators: This label describes the program that
 #. created the account, e.g. an SSO service like GOA, or
 #. locally by Geary.
-#: src/client/accounts/accounts-editor-servers-pane.vala:540
+#: src/client/accounts/accounts-editor-servers-pane.vala:545
 msgid "Account source"
 msgstr "Zdroj účtu"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
 msgid "GNOME Online Accounts"
 msgstr "Účty služieb prostredia GNOME"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:611
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
 msgid "Save draft email on server"
 msgstr "Uložiť koncepty na serveri"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
 msgid "Save sent email on server"
 msgstr "Uložiť odoslanú poštu na serveri"
 
@@ -764,12 +770,12 @@ msgstr "Uložiť odoslanú poštu na serveri"
 #. 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:956
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s s použitím OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:966
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
 msgid "Use receiving server login"
 msgstr "Použiť prihlasovacie údaje ako pre server prijímania"
 
@@ -800,63 +806,55 @@ msgstr "Súbor v „%s“ už existuje.  Nahradením sa prepíše jeho obsah."
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: src/client/application/application-client.vala:33
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Autorské práva 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/application-client.vala:34
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Autorské práva 2016-2019 Tím vývojárov aplikácie Geary."
+#: src/client/application/application-client.vala:35
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Autorské práva 2016-2020 Tím vývojárov aplikácie Geary."
 
-#: src/client/application/application-client.vala:36
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Navštívte webovú stránku aplikácie Geary"
 
 #. / Command line option
-#: src/client/application/application-client.vala:94
+#: src/client/application/application-client.vala:97
 msgid "Print debug logging"
 msgstr "Vypíše ladiaci záznam"
 
 # cmd line desc
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:100
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Spustí aplikáciu Geary so skrytým hlavným oknom (zastarané)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:103
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Povolí inšpektora WebKitGTK vo webových zobrazeniach"
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:106
 msgid "Log conversation monitoring"
 msgstr "Zaznamená monitorovanie rozhovorov"
 
 # cmd line desc
 #. / Command line option
-#: src/client/application/application-client.vala:106
-#, fuzzy
-#| msgid "Log network deserialization"
+#: src/client/application/application-client.vala:109
 msgid "Log IMAP network deserialization"
-msgstr "Zaznamená deserializáciu siete"
+msgstr "Zaznamená deserializáciu sieťového protokolu IMAP"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:110
+#: src/client/application/application-client.vala:113
 msgid "Log folder normalization"
 msgstr "Zaznamená normalizáciu priečinkov"
 
-#. / Command line option
-#: src/client/application/application-client.vala:113
-msgid "Log network activity"
-msgstr "Zaznamená aktivitu siete"
-
-# cmd line desc
 #. / Command line option
 #: src/client/application/application-client.vala:116
-msgid "Log periodic activity"
-msgstr "Periodicky zaznamená aktivitu"
+msgid "Log IMAP network activity"
+msgstr "Zaznamená aktivitu sieťového protokolu IMAP"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
@@ -865,92 +863,88 @@ msgstr "Periodicky zaznamená aktivitu"
 msgid "Log IMAP replay queue"
 msgstr "Zaznamená frontu udalostí servera IMAP"
 
-#. / Command line option. Serialization is how commands and
-#. / responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/application-client.vala:126
-#, fuzzy
-#| msgid "Log network serialization"
-msgid "Log IMAP network serialization"
-msgstr "Zaznamená serializáciu siete"
+#. / Command line option
+#: src/client/application/application-client.vala:124
+msgid "Log SMTP network activity"
+msgstr "Zaznamená aktivitu sieťového protokolu SMTP"
 
 #. / Command line option
-#: src/client/application/application-client.vala:129
+#: src/client/application/application-client.vala:127
 msgid "Log database queries (generates lots of messages)"
 msgstr "Zaznamená požiadavky databázy (vygeneruje množstvo správ)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:130
 msgid "Perform a graceful quit"
 msgstr "Vykoná ukončenie podľa správnosti"
 
-#: src/client/application/application-client.vala:134
+#: src/client/application/application-client.vala:132
 msgid "Open a new window"
 msgstr "Otvorí nové okno"
 
 #. / Command line option
-#: src/client/application/application-client.vala:137
+#: src/client/application/application-client.vala:135
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Odvolá všetky certifikáty pripnutých serverov TLS"
 
 #. / Command line option
-#: src/client/application/application-client.vala:140
+#: src/client/application/application-client.vala:138
 msgid "Display program version"
 msgstr "Zobrazí verziu aplikácie"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:264
+#: src/client/application/application-client.vala:262
 msgid "Geary version"
 msgstr "Verzia aplikácie Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:266
+#: src/client/application/application-client.vala:264
 msgid "Geary revision"
 msgstr "Revízia aplikácie Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:268
+#: src/client/application/application-client.vala:266
 msgid "GTK version"
 msgstr "Verzia rozhrania GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:275
+#: src/client/application/application-client.vala:273
 msgid "GLib version"
 msgstr "Verzia knižnice GLib"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:282
+#: src/client/application/application-client.vala:280
 msgid "WebKitGTK version"
 msgstr "Verzia WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:289
+#: src/client/application/application-client.vala:287
 msgid "Desktop environment"
 msgstr "Pracovné prostredie"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:291
+#: src/client/application/application-client.vala:289
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Neznámy"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:321
+#: src/client/application/application-client.vala:293
 msgid "Distribution name"
 msgstr "Názov distribúcie"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:326
+#: src/client/application/application-client.vala:298
 msgid "Distribution release"
 msgstr "Vydanie distribúcie"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:334
+#: src/client/application/application-client.vala:303
 msgid "Installation prefix"
 msgstr "Predpona inštalácie"
 
-#: src/client/application/application-client.vala:587
+#: src/client/application/application-client.vala:559
 #, c-format
 msgid "About %s"
 msgstr "O %s"
@@ -958,36 +952,36 @@ msgstr "O %s"
 #. 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/application-client.vala:591
+#: src/client/application/application-client.vala:563
 msgid "translator-credits"
 msgstr "Dušan Kazik <prescott66@gmail.com>"
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:937
+#: src/client/application/application-client.vala:1047
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "Voľba „--hidden“ je zastaraná a bude v budúcnosti odstránená."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:970
+#: src/client/application/application-client.vala:1080
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Nerozpoznaný parameter programu: „%s“"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:458
+#: src/client/application/application-controller.vala:479
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Vyskytol sa problém pri odosielaní emailu z účtu %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:462
+#: src/client/application/application-controller.vala:483
 msgid "Email will not be sent until re-connected"
 msgstr "Email nebude odoslaný až do opätovného pripojenia"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:568
+#: src/client/application/application-controller.vala:582
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Rozhovory boli označené"
@@ -995,7 +989,7 @@ msgstr[1] "Rozhovor bol označený"
 msgstr[2] "Rozhovory boli označené"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:574
+#: src/client/application/application-controller.vala:588
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Rozhovorom bolo zrušené označenie"
@@ -1005,8 +999,8 @@ msgstr[2] "Rozhovorom bolo zrušené označenie"
 #. / 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
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1019,8 +1013,8 @@ msgstr[2] "Rozhovory boli presunuté do priečinka %s"
 #. / 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
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1029,7 +1023,7 @@ msgstr[1] "Rozhovor bol obnovený do priečinka %s"
 msgstr[2] "Rozhovory boli obnovené do priečinka %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:651
+#: src/client/application/application-controller.vala:665
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Rozhovory boli archivované"
@@ -1038,7 +1032,7 @@ msgstr[2] "Rozhovory boli archivované"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:707
+#: src/client/application/application-controller.vala:721
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1047,7 +1041,7 @@ msgstr[1] "Správy boli obnovené do priečinka %s"
 msgstr[2] "Správy boli obnovené do priečinka %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:728
+#: src/client/application/application-controller.vala:742
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Správa bola archivovaná"
@@ -1057,7 +1051,7 @@ msgstr[2] "Správy boli archivované"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:763
+#: src/client/application/application-controller.vala:777
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1068,7 +1062,7 @@ msgstr[2] "Správy boli presunuté do priečinka %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:791
+#: src/client/application/application-controller.vala:805
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1079,7 +1073,7 @@ msgstr[2] "Rozhovory boli označené ako %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:799
+#: src/client/application/application-controller.vala:813
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
@@ -1087,12 +1081,12 @@ msgstr[0] "Rozhovorom bola zrušená menovka %s"
 msgstr[1] "Rozhovoru bola zrušená menovka %s"
 msgstr[2] "Rozhovorom bola zrušená menovka %s"
 
-#: src/client/application/application-controller.vala:1223
+#: src/client/application/application-controller.vala:1320
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Nie je možné otvoriť databázu pre %s"
 
-#: src/client/application/application-controller.vala:1224
+#: src/client/application/application-controller.vala:1321
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1117,20 +1111,20 @@ msgstr ""
 "Znovu zostavenie databázy zničí všetku miestnu poštu a jej prílohy. <b>Pošta "
 "na serveri nebude ovplyvnená.</b>"
 
-#: src/client/application/application-controller.vala:1226
+#: src/client/application/application-controller.vala:1323
 msgid "_Rebuild"
 msgstr "_Znovu zostaviť"
 
-#: src/client/application/application-controller.vala:1226
+#: src/client/application/application-controller.vala:1323
 msgid "E_xit"
 msgstr "_Ukončiť"
 
-#: src/client/application/application-controller.vala:1236
+#: src/client/application/application-controller.vala:1333
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Nie je možné znovu zostaviť databázu účtu „%s“"
 
-#: src/client/application/application-controller.vala:1237
+#: src/client/application/application-controller.vala:1334
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1143,92 +1137,142 @@ msgstr ""
 
 #. / 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:1561
+#: src/client/application/application-controller.vala:1501
 #, c-format
 msgid "Email sent to %s"
 msgstr "Email pre %s bol odoslaný"
 
 #. / 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:2656
+#: src/client/application/application-controller.vala:2491
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "Email pre %s bol zaradený do fronty na doručenie"
 
 #. / 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:2720
+#: src/client/application/application-controller.vala:2555
 #, c-format
 msgid "Email to %s saved"
 msgstr "Email pre %s bol uložený"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2735
-#: src/client/application/application-controller.vala:2793
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
 msgid "Composer could not be restored"
 msgstr "Nepodarilo sa obnoviť tvorcu správ"
 
 #. / 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:2778
+#: src/client/application/application-controller.vala:2613
 #, c-format
 msgid "Email to %s discarded"
 msgstr "Email pre %s bol zahodený"
 
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:540
+msgid "Working offline"
+msgstr "Práca bez pripojenia"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:542
+msgid "You will not be able to send or receive email until re-connected."
+msgstr ""
+"Nebudete môcť odoslať alebo prijať email, pokiaľ sa opätovne nepripojíte."
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:549
+msgid "Login problem"
+msgstr "Problém s prihlásením"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:551
+msgid "An account has reported an incorrect login or password."
+msgstr "Účet nahlásil nesprávne prihlasovacie meno alebo heslo."
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:558
+msgid "Retry login, you will be prompted for your password"
+msgstr "Znovu sa pokúsi o prihlásenie, budete vyzvaný na zadanie hesla"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:565
+msgid "Security problem"
+msgstr "Problém so zabezpečením"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
+msgstr "Účet nahlásil nedôveryhodný server."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:570
+msgid "Check"
+msgstr "Skontrolovať"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:574
+msgid "Check the security details for the connection"
+msgstr "Skontroluje podrobnosti zabezpečenia pre pripojenie"
+
 #. / 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
+#: src/client/application/application-main-window.vala:617
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: src/client/application/application-main-window.vala:967
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:996
+#: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Menovky"
 
+#: src/client/application/application-main-window.vala:1293
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Vyprázdniť všetky emaily z vášho priečinka %s?"
+
+#: src/client/application/application-main-window.vala:1294
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+"Týmto sa odstránia všetky emaily z aplikácie Geary a vášho emailového "
+"servera."
+
+#: src/client/application/application-main-window.vala:1295
+msgid "This cannot be undone."
+msgstr "Táto akcia sa nebude dať vrátiť späť."
+
+#: src/client/application/application-main-window.vala:1296
+#, c-format
+msgid "Empty %s"
+msgstr "Vyprázdniť priečinok %s"
+
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1306
+#: src/client/application/application-main-window.vala:1353
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Chcete natrvalo odstrániť tieto rozhovory?"
 msgstr[1] "Chcete natrvalo odstrániť tento rozhovor?"
 msgstr[2] "Chcete natrvalo odstrániť tieto rozhovory?"
 
-#: src/client/application/application-main-window.vala:1311
-#: src/client/application/application-main-window.vala:1326
+#: src/client/application/application-main-window.vala:1358
+#: src/client/application/application-main-window.vala:1373
 msgid "Delete"
 msgstr "Odstrániť"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1321
+#: src/client/application/application-main-window.vala:1368
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Chcete natrvalo odstrániť túto správu?"
 msgstr[1] "Chcete natrvalo odstrániť tieto správy?"
 msgstr[2] "Chcete natrvalo odstrániť tieto správy?"
 
-#: src/client/application/application-main-window.vala:1334
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Vyprázdniť všetky emaily z vášho priečinka %s?"
-
-#: src/client/application/application-main-window.vala:1337
-msgid "This removes the email from Geary and your email server."
-msgstr ""
-"Týmto sa odstránia všetky emaily z aplikácie Geary a vášho emailového "
-"servera."
-
-#: src/client/application/application-main-window.vala:1338
-msgid "This cannot be undone."
-msgstr "Táto akcia sa nebude dať vrátiť späť."
-
-#: src/client/application/application-main-window.vala:1339
-#, c-format
-msgid "Empty %s"
-msgstr "Vyprázdniť priečinok %s"
-
-#: src/client/application/application-main-window.vala:1669
+#: src/client/application/application-main-window.vala:1691
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1239,7 +1283,7 @@ msgstr "%s (%d)"
 #. 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:1839
+#: src/client/composer/composer-widget.vala:1784
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1260,61 +1304,61 @@ msgstr ""
 msgid "Don’t _ask me again"
 msgstr "Nepýtať s_a znovu"
 
-#: src/client/components/components-inspector.vala:72
+#: src/client/components/components-inspector.vala:78
 msgid "Inspector"
 msgstr "Inšpektor"
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:87
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
+#: src/client/components/components-inspector.vala:93
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
 msgid "Logs"
 msgstr "Záznamy"
 
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
 #. / pane
-#: src/client/components/components-inspector.vala:91
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
+#: src/client/components/components-inspector.vala:97
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
 msgid "System"
 msgstr "Systém"
 
 #. Button label for saving problem report information
-#: 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
+#: src/client/components/components-inspector.vala:226
+#: src/client/components/components-inspector.vala:229
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
+#: ui/problem-details-dialog.ui:47
 msgid "Save As"
 msgstr "Uložiť ako"
 
-#: src/client/components/components-inspector.vala:212
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
+#: src/client/components/components-inspector.vala:230
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
 #: ui/accounts_editor_servers_pane.ui:17
 msgid "Cancel"
 msgstr "Zrušiť"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:43
+#: src/client/components/components-preferences-window.vala:124
 msgid "_Automatically select next message"
 msgstr "_Automaticky vybrať ďalšiu správu"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:53
+#: src/client/components/components-preferences-window.vala:134
 msgid "_Display conversation preview"
 msgstr "_Zobraziť náhľad rozhovoru"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:63
+#: src/client/components/components-preferences-window.vala:144
 msgid "Use _three pane view"
 msgstr "Použiť zobrazenie s _troma panelmi"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:73
+#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr "Použiť emailové klávesové skratky o _jednom klávese"
 
-#: src/client/components/components-preferences-window.vala:75
+#: src/client/components/components-preferences-window.vala:156
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1323,19 +1367,99 @@ msgstr ""
 "klávesu <Ctrl>"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:86
+#: src/client/components/components-preferences-window.vala:167
 msgid "_Watch for new mail when closed"
 msgstr "_Sledovať novú poštu, keď je aplikácia zavretá"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:90
+#: src/client/components/components-preferences-window.vala:171
 msgid "Geary will keep running after all windows are closed"
 msgstr "Aplikácia Geary bude naďalej spustená aj po uzavretí všetkých okien"
 
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:189
+msgid "Preferences"
+msgstr "Nastavenia"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:250
+msgid "Plugins"
+msgstr "Zásuvné moduly"
+
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:36
+msgid "Account problem"
+msgstr "Problém s účtom"
+
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/components-problem-report-info-bar.vala:40
+#, c-format
+msgid "Geary has encountered a problem with %s."
+msgstr "Aplikácia Geary narazila na problém s účtom %s."
+
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/components-problem-report-info-bar.vala:53
+#, c-format
+msgid "Geary encountered a problem checking mail for %s."
+msgstr "Aplikácia Geary narazila na problém pri kontrole pošty na účte %s."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
+msgid "Try reconnecting"
+msgstr "Skúsiť znovu pripojenie"
+
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/components-problem-report-info-bar.vala:65
+#, c-format
+msgid "Geary encountered a problem sending email for %s."
+msgstr "Aplikácia Geary narazila na problém pri odosielaní pošty z účtu %s."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
+msgid "Retry sending queued messages"
+msgstr "Skúsiť znovu odoslať správy vo fronte"
+
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:76
+msgid "Geary has encountered a problem"
+msgstr "Aplikácia Geary narazila na problém"
+
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/components-problem-report-info-bar.vala:80
+msgid "Please report the details if it persists."
+msgstr "Prosím, ak problém pretrváva., nahláste podrobnosti."
+
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
+msgid "_Details"
+msgstr "Po_drobnosti"
+
+# tooltip
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:97
+msgid "View technical details about the error"
+msgstr "Zobrazí technické podrobnosti o chybe"
+
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
+msgid "_Retry"
+msgstr "_Skúsiť znova"
+
 #. / 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
+#: src/client/util/util-i18n.vala:298
 msgid "Search"
 msgstr "Vyhľadať"
 
@@ -1354,27 +1478,27 @@ msgstr "Prehľadať účet %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:390
+#: src/client/components/components-validator.vala:394
 msgid "An email address is required"
 msgstr "Vyžaduje sa emailová adresa"
 
 #. 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:394
+#: src/client/components/components-validator.vala:398
 msgid "Not a valid email address"
 msgstr "Nie je platnou emailovou adresou"
 
 #. 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:440
+#: src/client/components/components-validator.vala:444
 msgid "A server name is required"
 msgstr "Vyžaduje sa názov serveru"
 
 #. 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:445
+#: src/client/components/components-validator.vala:449
 msgid "Could not look up server name"
 msgstr "Nepodarilo sa nájsť názov serveru"
 
@@ -1420,76 +1544,6 @@ msgstr[0] "Odstráni rozhovory"
 msgstr[1] "Odstráni rozhovor"
 msgstr[2] "Odstráni rozhovory"
 
-#. Translators: Info bar title for a generic account
-#. problem.
-#: src/client/components/main-window-info-bar.vala:44
-msgid "Account problem"
-msgstr "Problém s účtom"
-
-#. 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
-#, c-format
-msgid "Geary has encountered a problem with %s."
-msgstr "Aplikácia Geary narazila na problém s účtom %s."
-
-#. 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
-#, c-format
-msgid "Geary encountered a problem checking mail for %s."
-msgstr "Aplikácia Geary narazila na problém pri kontrole pošty na účte %s."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:65
-msgid "Try reconnecting"
-msgstr "Skúsiť znovu pripojenie"
-
-#. Translators: Info bar title for an outgoing
-#. account problem. String substitution is the
-#. account name
-#: src/client/components/main-window-info-bar.vala:73
-#, c-format
-msgid "Geary encountered a problem sending email for %s."
-msgstr "Aplikácia Geary narazila na problém pri odosielaní pošty z účtu %s."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:77
-msgid "Retry sending queued messages"
-msgstr "Skúsiť znovu odoslať správy vo fronte"
-
-#. Translators: Info bar title for a generic application
-#. problem.
-#: src/client/components/main-window-info-bar.vala:84
-msgid "Geary has encountered a problem"
-msgstr "Aplikácia Geary narazila na problém"
-
-#. Translators: Info bar sub-title for a generic
-#. application problem.
-#: src/client/components/main-window-info-bar.vala:88
-msgid "Please report the details if it persists."
-msgstr "Prosím, ak problém pretrváva., nahláste podrobnosti."
-
-#. Translators: Button label for viewing technical details
-#. for a problem report.
-#: src/client/components/main-window-info-bar.vala:99
-msgid "_Details"
-msgstr "Po_drobnosti"
-
-# tooltip
-#. Translators: Tooltip for viewing technical details for
-#. a problem report.
-#: src/client/components/main-window-info-bar.vala:102
-msgid "View technical details about the error"
-msgstr "Zobrazí technické podrobnosti o chybe"
-
-#. Translators: Button label for retrying a server
-#. connection
-#: src/client/components/main-window-info-bar.vala:108
-msgid "_Retry"
-msgstr "_Skúsiť znova"
-
 #. / 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…"
@@ -1510,7 +1564,9 @@ msgstr "Chyba pri ukladaní odoslanej pošty"
 msgid "_OK"
 msgstr "_OK"
 
-#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
@@ -1530,15 +1586,17 @@ msgstr "_Zavrieť"
 msgid "_Discard"
 msgstr "Za_hodiť"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "Po_mocník"
 
-#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "N_astavenia"
 
@@ -1564,6 +1622,10 @@ msgstr "_Uložiť"
 msgid "_Keep"
 msgstr "_Ponechať"
 
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Výber farby"
+
 #: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com"
 msgstr "URL odkazu nie je v správnom formáte, napr. http://priklad.sk"
@@ -1577,23 +1639,23 @@ msgid "Invalid email address"
 msgstr "Neplatná emailová adresa"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:30
+#: src/client/composer/composer-widget.vala:32
 msgid "New Message"
 msgstr "Nová správa"
 
-#: src/client/composer/composer-widget.vala:217
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "Uložené"
 
-#: src/client/composer/composer-widget.vala:218
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
 msgstr "Ukladá sa"
 
-#: src/client/composer/composer-widget.vala:219
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "Chyba pri ukladaní"
 
-#: src/client/composer/composer-widget.vala:220
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "Stlačte kláves Backspace na odstránenie citácie"
 
@@ -1602,7 +1664,7 @@ msgstr "Stlačte kláves Backspace na odstránenie citácie"
 #. 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
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1614,115 +1676,105 @@ 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:843
+#: src/client/composer/composer-widget.vala:862
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Chcete ponechať alebo zahodiť tento koncept?"
 
 #. 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:869
+#: src/client/composer/composer-widget.vala:888
 msgid "Do you want to discard this draft message?"
 msgstr "Chcete zahodiť tento koncept?"
 
-#: src/client/composer/composer-widget.vala:1508
+#: src/client/composer/composer-widget.vala:1440
 msgid "Send message with an empty subject and body?"
 msgstr "Odoslať správu bez predmetu a s prázdnym telom?"
 
-#: src/client/composer/composer-widget.vala:1510
+#: src/client/composer/composer-widget.vala:1442
 msgid "Send message with an empty subject?"
 msgstr "Odoslať správu bez predmetu?"
 
-#: src/client/composer/composer-widget.vala:1512
+#: src/client/composer/composer-widget.vala:1444
 msgid "Send message with an empty body?"
 msgstr "Odoslať správu s prázdnym telom?"
 
-#: src/client/composer/composer-widget.vala:1521
+#: src/client/composer/composer-widget.vala:1453
 msgid "Send message without an attachment?"
 msgstr "Odoslať správu bez prílohy?"
 
-#: src/client/composer/composer-widget.vala:1825
+#: src/client/composer/composer-widget.vala:1772
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "„%s“ je už priložený na doručenie."
 
-#: src/client/composer/composer-widget.vala:1861
-#: src/client/composer/composer-widget.vala:1911
+#: src/client/composer/composer-widget.vala:1804
+#: src/client/composer/composer-widget.vala:1854
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "„%s“ je prázdny súbor."
 
-#: src/client/composer/composer-widget.vala:1899
+#: src/client/composer/composer-widget.vala:1842
 #, c-format
 msgid "“%s” could not be found."
 msgstr "„%s“ sa nepodarilo nájsť."
 
-#: src/client/composer/composer-widget.vala:1905
+#: src/client/composer/composer-widget.vala:1848
 #, c-format
 msgid "“%s” is a folder."
 msgstr "„%s“ je priečinok."
 
-#: src/client/composer/composer-widget.vala:1924
+#: src/client/composer/composer-widget.vala:1867
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "„%s“ sa nepodarilo otvoriť na čítanie."
 
-#: src/client/composer/composer-widget.vala:1932
+#: src/client/composer/composer-widget.vala:1875
 msgid "Cannot add attachment"
 msgstr "Nedá sa pridať príloha"
 
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:1946
+msgid "Images"
+msgstr "Obrázky"
+
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1989
-#: src/client/conversation-viewer/conversation-email.vala:559
-#: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:2010
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Pre:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1995
-#: src/client/conversation-viewer/conversation-email.vala:564
-#: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:2016
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Kópia:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2001
-#: src/client/conversation-viewer/conversation-email.vala:569
+#: src/client/composer/composer-widget.vala:2022
+#: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Skrytá kópia:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2007
+#: src/client/composer/composer-widget.vala:2028
 msgid "Reply-To: "
 msgstr "Komu odpovedať: "
 
-#: src/client/composer/composer-widget.vala:2259
-msgid "Select Color"
-msgstr "Výber farby"
-
 #. 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:2445
+#: src/client/composer/composer-widget.vala:2146
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s prostredníctvom účtu %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:2501
-msgid "_From:"
-msgstr "Od:"
-
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2806
-msgid "Images"
-msgstr "Obrázky"
-
 # tooltip
 #: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
@@ -1739,7 +1791,7 @@ msgid "Search for more languages"
 msgstr "Vyhľadajte viac jazykov"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:335
+#: src/client/conversation-list/conversation-list-view.vala:339
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Presunúť rozhovory do _Koša"
@@ -1747,45 +1799,45 @@ msgstr[1] "Presunúť rozhovor do _Koša"
 msgstr[2] "Presunúť rozhovory do _Koša"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
+#: src/client/conversation-list/conversation-list-view.vala:351
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "O_dstrániť rozhovory"
 msgstr[1] "O_dstrániť rozhovor"
 msgstr[2] "O_dstrániť rozhovory"
 
-#: src/client/conversation-list/conversation-list-view.vala:360
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Označiť ako _prečítanú"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:372
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: src/client/conversation-list/conversation-list-view.vala:376
+#: src/client/conversation-list/conversation-list-view.vala:380
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "Zrušiť oz_načenie hviezdičkou"
 
-#: src/client/conversation-list/conversation-list-view.vala:383
+#: src/client/conversation-list/conversation-list-view.vala:387
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "Označiť _hviezdičkou"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:392
+#: src/client/conversation-list/conversation-list-view.vala:396
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: src/client/conversation-list/conversation-list-view.vala:398
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "Odpov_edať všetkým"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:404
+#: src/client/conversation-list/conversation-list-view.vala:408
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Preposlať"
@@ -1795,20 +1847,20 @@ msgid "Me"
 msgstr "Ja"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:554
-#: src/client/util/util-email.vala:226
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:240
 msgid "From:"
 msgstr "Od:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:574
-#: src/client/util/util-email.vala:231
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:245
 msgid "Date:"
 msgstr "Dátum:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:584
-#: src/client/util/util-email.vala:229
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:243
 msgid "Subject:"
 msgstr "Predmet:"
 
@@ -1816,32 +1868,68 @@ msgstr "Predmet:"
 msgid "This email address may have been forged"
 msgstr "Táto emailová adresa mohla byť zabudnutá"
 
+#. Translators: Label text displayed when there are too
+#. many email addresses to be shown by default in an
+#. email's header, but they are all being shown anyway.
+#: src/client/conversation-viewer/conversation-message.vala:234
+msgid "Show less"
+msgstr "Zobraziť menej"
+
+#. Translators: Label text displayed when there are
+#. too many email addresses to be shown by default in
+#. an email's header. The string substitution is the
+#. number of extra email to be shown.
+#: src/client/conversation-viewer/conversation-message.vala:260
+#, c-format
+msgid "%d more…"
+msgstr "%d ďalších…"
+
 #. Compact headers. These are partially done here and partially
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:439
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Žiadny odosielateľ"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:831
+#: src/client/conversation-viewer/conversation-message.vala:920
 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:951
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Obrázok"
 
-#. Translators: Title label for placeholder when no
-#. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:83
-msgid "No conversations selected"
-msgstr "Žiadne vybrané rozhovory"
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "Vzdialené obrázky neboli zobrazené"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr "Vzdialené obrázky zobrazujte od odosielateľov, ktorým dôverujete."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+msgid "Show"
+msgstr "Zobraziť"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+msgid "Always show from sender"
+msgstr "Vždy zobraziť od odosielateľa"
+
+#. Translators: Title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:83
+msgid "No conversations selected"
+msgstr "Žiadne vybrané rozhovory"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
@@ -1969,8 +2057,8 @@ msgstr "Vyskytla sa chyba počas spracovávania certifikátu servera"
 #. / 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:100
-#: ui/problem-details-dialog.ui:12
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -1981,8 +2069,10 @@ msgstr "Podrobnosti"
 msgid "Geary requires your email password to continue"
 msgstr "Aplikácia Geary vyžaduje pre pokračovanie heslo k vášmu emailu"
 
-#. Label displaying total number of email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:32
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1990,8 +2080,10 @@ msgstr[0] "%d správ"
 msgstr[1] "%d správa"
 msgstr[2] "%d správy"
 
-#. / Label displaying number of unread email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:39
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1999,10 +2091,12 @@ msgstr[0] "%d neprečítaných"
 msgstr[1] "%d neprečítaná"
 msgstr[2] "%d neprečítané"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: src/client/folder-list/folder-list-folder-entry.vala:45
+#. Translators: This string represents the divider between two
+#. messages: "n messages" and "n unread", shown in the folder
+#. list as a tooltip.  Please use your languages conventions
+#. for combining the two, i.e. a comma (",") for English; "6
+#. messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:60
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -2019,9 +2113,34 @@ msgstr[0] "%d výsledkov"
 msgstr[1] "%d výsledok"
 msgstr[2] "%d výsledky"
 
-#. / Notification body text for new email when no other
-#. / new messages are already awaiting.
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:68
+#. / Notification body when a message as been received
+#. / and other unread messages have not been
+#. / seen. First string substitution is the message
+#. / subject and the second is the number of unseen
+#. / messages
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
+#, c-format
+msgid ""
+"%s\n"
+"(%d other new message)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages)"
+msgstr[0] ""
+"%s\n"
+"(%d ďalších nových správ)"
+msgstr[1] ""
+"%s\n"
+"(%d ďalšia nová správa)"
+msgstr[2] ""
+"%s\n"
+"(%d ďalšie nové správy)"
+
+#. / Notification body when multiple messages have been
+#. / received at the same time and other unseen messages
+#. / exist. String substitution is the number of new
+#. / messages that have arrived.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:157
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -2029,10 +2148,13 @@ msgstr[0] "%d nových správ"
 msgstr[1] "%d nová správa"
 msgstr[2] "%d nové správy"
 
-#. / Notification body text for new email when
-#. / other new messages have already been notified
-#. / about
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:83
+#. / Notification body when multiple messages have been
+#. / received at the same time and some unseen messages
+#. / already exist. String substitution is the message
+#. / above with the number of new messages that have
+#. / arrived, number substitution is the total number
+#. / of unseen messages.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:167
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
@@ -2040,29 +2162,183 @@ msgstr[0] "%s, celkom %d nových správ"
 msgstr[1] "%s, celkom %d nová správa"
 msgstr[2] "%s, celkom %d nové správy"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Nové správy"
+msgstr[1] "Nová správa"
+msgstr[2] "Nové správy"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+msgid "Email Templates"
+msgstr "Šablóny e-mailov"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Vytvára opakovane použiteľné šablóny na odosielanie emailov"
+
+#. Translators: Templates folder name alternatives. 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/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
+#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr "Šablóny | Poštová šablóna | Šablóna emailu | Šablóna e-mailu"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Šablóny"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:282
+msgid "New"
+msgstr "Nový"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+msgid "Message template"
+msgstr "Šablóna správy"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+msgid "Send"
+msgstr "Odoslať"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
+msgid "Edit"
+msgstr "Upraviť"
+
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr ""
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr ""
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Spustiť"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Pozastaviť"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
 #, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
 msgstr[0] ""
-"%s\n"
-"(%d iných nových správ na účte %s)"
 msgstr[1] ""
-"%s\n"
-"(%d iná nová správa na účte %s)"
 msgstr[2] ""
-"%s\n"
-"(%d iné nové správy na účte %s)"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr ""
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr ""
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "Vložiť pole"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Čiarkou oddelené hodnoty (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Ponuka správ"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+#, fuzzy
+#| msgid "Show notifications for new mail"
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Zobraziť upozornenia pre novú poštu"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s — Nové správy"
 
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+#, fuzzy
+#| msgid "not found"
+msgid "Sent Sound"
+msgstr "nenájdené"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr ""
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "Vyprázdniť"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Koncept"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:182
+msgid "This message has not yet been sent."
+msgstr "Táto správa ešte nebola odoslaná."
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:198
+msgid "Message not saved"
+msgstr "Správa nebola uložená"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:201
+msgid "This message was sent, but has not been saved to your account."
+msgstr "Táto správa bola odoslaná, ale nebola uložená do vášho účtu."
+
 #. / 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
@@ -2133,33 +2409,37 @@ msgstr "Včera"
 msgid "%A"
 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
+#. / 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:218
 msgid "%a, %b %-e, %Y at %l:%M %P"
 msgstr "%A, %-e. %B %Y o %H:%M"
 
-#. / 24 hours format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:220
+#. / 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:224
 msgid "%a, %b %-e, %Y at %H:%M"
 msgstr "%A, %-e. %B %Y o %H:%M"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:224
+#. / 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:230
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%A, %-e. %B %Y o %H:%M"
 
-#: src/client/util/util-email.vala:38
-#: src/engine/rfc822/rfc822-message.vala:1003
-msgid "(no subject)"
-msgstr "(žiadny predmet)"
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
+msgid "(No subject)"
+msgstr "(Bez predmetu)"
 
 #. / 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
+#: src/client/util/util-email.vala:148
 msgid "(No recipients)"
 msgstr "(Žiadni príjemcovia)"
 
@@ -2168,7 +2448,7 @@ msgstr "(Žiadni príjemcovia)"
 #. / 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
+#: src/client/util/util-email.vala:160
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2179,26 +2459,26 @@ msgstr[2] "%s a %d ďalší"
 #. / 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:179
+#: src/client/util/util-email.vala:193
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "Dňa %1$s, %2$s napísal(a):"
 
 #. / 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:186
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "%s wrote:"
 msgstr "%s napísal/a:"
 
 #. / 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:192
+#: src/client/util/util-email.vala:206
 #, c-format
 msgid "On %s:"
 msgstr "Dňa %s:"
 
-#: src/client/util/util-email.vala:221
+#: src/client/util/util-email.vala:235
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Preposlaná správa ----------"
 
@@ -2226,43 +2506,43 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
+#: src/client/util/util-i18n.vala:277
+msgid "Sent"
 msgstr "Odoslaná pošta"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Označené hviezdičkou"
 
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Dôležité"
 
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Všetka pošta"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
 msgstr "Nevyžiadaná pošta"
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Kôš"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "Pošta na odoslanie"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Archív"
 
@@ -2438,7 +2718,7 @@ msgstr "neprečítaná"
 #. 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:882
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
 msgid "Drafts | Draft"
 msgstr "Koncepty | Koncept"
 
@@ -2446,22 +2726,22 @@ msgstr "Koncepty | Koncept"
 #. 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:891
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Odoslané správy | Odoslaná poštal | Odoslané emaily | Odoslané E-Maily"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:896
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Odoslaná pošta"
 
 #. List of general possible folder names to match for the
-#. 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:906
+#. Junk/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:1020
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2471,13 +2751,13 @@ msgstr "Nevyžiadaná pošta | Spam | Nevyžiadané emaily"
 #. 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:916
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Kôš"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:921
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Odstránená pošta"
@@ -2486,33 +2766,37 @@ msgstr "Odstránená pošta"
 #. 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:931
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgid "Archive | Archives"
 msgstr "Archív | Archívy | Archivované"
 
-#: src/engine/rfc822/rfc822-message.vala:461
+#: src/engine/rfc822/rfc822-message.vala:528
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "Nepodarilo sa určiť typ MIME pre „%s“."
 
-#: src/engine/rfc822/rfc822-message.vala:472
+#: src/engine/rfc822/rfc822-message.vala:539
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr "Nepodarilo sa určiť typ obsahu pre typ MIME „%s“ na „%s“."
 
+#: src/engine/rfc822/rfc822-message.vala:1013
+msgid "(no subject)"
+msgstr "(žiadny predmet)"
+
 #: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Pridanie účtu"
 
 #: ui/accounts_editor_add_pane.ui:53
-msgid "Create"
-msgstr "Vytvoriť"
+msgid "_Create"
+msgstr "Vy_tvoriť"
 
-#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
 msgid "Receiving"
 msgstr "Prijímanie"
 
-#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
 msgid "Sending"
 msgstr "Odosielanie"
 
@@ -2584,79 +2868,6 @@ msgstr "Odstráni účet"
 msgid "Apply"
 msgstr "Použiť"
 
-#. Infobar title when one or more accounts are offline
-#: ui/application-main-window.ui:185
-msgid "Working offline"
-msgstr "Práca bez pripojenia"
-
-#. 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 ""
-"Zdá sa, že váš počítač nie je pripojený k internetu.\n"
-"Nebudete môcť odoslať alebo prijať email, pokiaľ sa opätovne nepripojíte."
-
-#. 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 ""
-"Nebudete môcť odoslať alebo prijať email, pokiaľ sa opätovne nepripojíte."
-
-#. Button label for retrying TLS cert validation
-#: ui/application-main-window.ui:249
-msgid "Check"
-msgstr "Skontrolovať"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/application-main-window.ui:253
-msgid "Check the security details for the connection"
-msgstr "Skontroluje podrobnosti zabezpečenia pre pripojenie"
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/application-main-window.ui:282
-msgid "Security problem"
-msgstr "Problém so zabezpečením"
-
-#. 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 ""
-"Účet nahlásil nedôveryhodný server.\n"
-"Prosím, skontrolujte konfiguráciu servera a skúste to znovu."
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/application-main-window.ui:299
-msgid "An account has reported an untrusted server."
-msgstr "Účet nahlásil nedôveryhodný server."
-
-#. 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 "Znovu sa pokúsi o prihlásenie, budete vyzvaný na zadanie hesla"
-
-#. Infobar title when one or more accounts have a login error
-#: ui/application-main-window.ui:379
-msgid "Login problem"
-msgstr "Problém s prihlásením"
-
-#. 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 ""
-"Účet nahlásil nesprávne prihlasovacie meno alebo heslo.\n"
-"Prosím, skontrolujte vaše prihlasovacie meno a skúste to znovu."
-
-#. Label and tooltip for authentication problem infobar
-#: ui/application-main-window.ui:396
-msgid "An account has reported an incorrect login or password."
-msgstr "Účet nahlásil nesprávne prihlasovacie meno alebo heslo."
-
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "Nedôveryhodné pripojenie"
@@ -2673,262 +2884,262 @@ msgstr "_Dôverovať tomuto serveru"
 msgid "_Don’t Trust This Server"
 msgstr "_Nedôverovať tomuto serveru"
 
-#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
-msgid "Detach the composer from the window"
-msgstr "Odpojí tvorcu správy od okna"
-
-#: ui/composer-headerbar.ui:135
-msgid "_Send"
-msgstr "_Odoslať"
-
-# tooltip
-#: ui/composer-headerbar.ui:162
-msgid "Discard and Close"
-msgstr "Zahodí a zavrie"
-
-# tooltip
-#: ui/composer-headerbar.ui:186
-msgid "Save and Close"
-msgstr "Uloží a zavrie"
-
-# tooltip
-#. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:42
-msgid "Insert the new link with this URL"
-msgstr "Vloží nový odkaz s týmto URL"
-
-#: ui/composer-link-popover.ui:43
-msgid "Add"
-msgstr "Pridať"
-
-#: ui/composer-link-popover.ui:47
-msgid "Link URL"
-msgstr "URL odkazu"
-
-# tooltip
-#. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:61
-msgid "Update this link’s URL"
-msgstr "Aktualizuje URL tohto odkazu"
-
-#: ui/composer-link-popover.ui:62
-msgid "Update"
-msgstr "Aktualizovať"
-
-# tooltip
-#: ui/composer-link-popover.ui:75
-msgid "Delete this link"
-msgstr "Odstráni tento odkaz"
-
-#: ui/composer-menus.ui:8
-msgid "_Undo"
-msgstr "Vrátiť _späť"
-
-#: ui/composer-menus.ui:12
-msgid "_Redo"
-msgstr "_Znovu vykonať"
-
-#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
-msgid "Cu_t"
-msgstr "Vys_trihnúť"
-
-#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
-#: ui/conversation-message-menus.ui:37
-msgid "_Copy"
-msgstr "_Skopírovať"
-
-#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
-msgid "_Paste"
-msgstr "_Vložiť"
-
-#: ui/composer-menus.ui:30
-msgctxt "Clipboard paste as plain text"
-msgid "Paste _Without Formatting"
-msgstr "Vložiť _bez formátovania"
-
-#: ui/composer-menus.ui:50
-msgid "Select _All"
-msgstr "Vybr_ať všetko"
-
-#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
-msgid "_Inspect…"
-msgstr "_Preskúmať…"
-
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:60
-msgid "From"
-msgstr "Od"
-
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:130
-msgid "_To"
-msgstr "_Pre"
-
-#: ui/composer-widget.ui:158
-msgid "Show Cc, Bcc, and Reply-To fields"
-msgstr "Zobrazí polia Kópia, Skrytá kópia a Komu odpovedať"
-
-#: ui/composer-widget.ui:219
-msgid "_Cc"
-msgstr "_Kópia"
-
-#: ui/composer-widget.ui:267
-msgid "_Bcc"
-msgstr "_Skrytá kópia"
-
-#: ui/composer-widget.ui:315
-msgid "_Reply-To"
-msgstr "_Komu odpovedať"
-
-#: ui/composer-widget.ui:372
-msgid "_Subject"
-msgstr "P_redmet"
-
-#: ui/composer-widget.ui:445
-msgid "Drop files here"
-msgstr "Sem pustite súbory"
-
-#: ui/composer-widget.ui:461
-msgid "To add them as attachments"
-msgstr "Na ich pridanie do prílohy"
-
-#: ui/composer-widget.ui:602
+#: ui/composer-editor.ui:100
 msgid "Bold text"
 msgstr "Tučný text"
 
-#: ui/composer-widget.ui:626
+#: ui/composer-editor.ui:124
 msgid "Italic text"
 msgstr "Kurzíva textu"
 
-#: ui/composer-widget.ui:650
+#: ui/composer-editor.ui:148
 msgid "Underline text"
 msgstr "Podčiarknutý text"
 
-#: ui/composer-widget.ui:674
+#: ui/composer-editor.ui:172
 msgid "Strikethrough text"
 msgstr "Preškrtnutý text"
 
 # tooltip
-#: ui/composer-widget.ui:707
+#: ui/composer-editor.ui:205
 msgid "Insert bulleted list"
 msgstr "Vloží zoznam s odrážkami"
 
 # tooltip
-#: ui/composer-widget.ui:731
+#: ui/composer-editor.ui:229
 msgid "Insert numbered list"
 msgstr "Vloží číslovaný zoznam"
 
 # tooltip
-#: ui/composer-widget.ui:764
+#: ui/composer-editor.ui:262
 msgid "Indent or quote text"
 msgstr "Odsadí alebo cituje text"
 
 # tooltip
-#: ui/composer-widget.ui:788
+#: ui/composer-editor.ui:286
 msgid "Un-indent or unquote text"
 msgstr "Zruší odsadenie alebo citáciu textu"
 
-#: ui/composer-widget.ui:817
+#: ui/composer-editor.ui:315
 msgid "Remove text formatting"
 msgstr "Odstráni formátovanie textu"
 
-#: ui/composer-widget.ui:836
+#: ui/composer-editor.ui:334
 msgid "Change font type"
 msgstr "Zmení typ písma"
 
-#: ui/composer-widget.ui:851
+#: ui/composer-editor.ui:349
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ui/composer-widget.ui:862
+#: ui/composer-editor.ui:360
 msgid "Serif"
 msgstr "Serif"
 
-#: ui/composer-widget.ui:873
+#: ui/composer-editor.ui:371
 msgid "Fixed Width"
 msgstr "Pevná šírka"
 
-#: ui/composer-widget.ui:899
+#: ui/composer-editor.ui:397
 msgid "Change font color"
 msgstr "Zmení farbu písma"
 
-#: ui/composer-widget.ui:914
+#: ui/composer-editor.ui:412
 msgid "Change font size"
 msgstr "Zmení veľkosť písma"
 
 # tooltip
-#: ui/composer-widget.ui:949
+#: ui/composer-editor.ui:447
 msgid "Insert or update text link"
 msgstr "Vloží alebo aktualizuje textový odkaz"
 
 # tooltip
-#: ui/composer-widget.ui:973
+#: ui/composer-editor.ui:471
 msgid "Insert an image"
 msgstr "Vloží obrázok"
 
 # tooltip
-#: ui/composer-widget.ui:1015
+#: ui/composer-editor.ui:513
 msgid "Undo last edit"
 msgstr "Vráti späť poslednú úpravu"
 
 # tooltip
-#: ui/composer-widget.ui:1039
+#: ui/composer-editor.ui:537
 msgid "Redo last edit"
 msgstr "Znovu vykoná poslednú úpravu"
 
-#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
 msgid "Attach a file"
 msgstr "Priloží súbor"
 
-#: ui/composer-widget.ui:1117
+#: ui/composer-editor.ui:615
 msgid "Add original attachments"
 msgstr "Pridá pôvodné prílohy"
 
-#: ui/composer-widget.ui:1162
+#: ui/composer-editor.ui:660
 msgid "More options"
 msgstr "Viac volieb"
 
-#: ui/composer-widget.ui:1182
+#: ui/composer-editor.ui:680
 msgid "Show formatting toolbar"
 msgstr "Zobrazí lištu nástrojov s formátovaním"
 
 # tooltip
-#: ui/composer-widget.ui:1200
+#: ui/composer-editor.ui:698
 msgid "Select spell checking languages"
 msgstr "Vyberie jazyky kontroly pravopisu"
 
-#: ui/composer-widget.ui:1263
+#: ui/composer-editor.ui:723
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ui/composer-widget.ui:1268
+#: ui/composer-editor.ui:728
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ui/composer-widget.ui:1273
+#: ui/composer-editor.ui:733
 msgid "_Fixed Width"
 msgstr "_Pevná šírka"
 
-#: ui/composer-widget.ui:1283
+#: ui/composer-editor.ui:743
 msgid "_Small"
 msgstr "_Malé"
 
-#: ui/composer-widget.ui:1288
+#: ui/composer-editor.ui:748
 msgid "_Medium"
 msgstr "_Stredné"
 
-#: ui/composer-widget.ui:1293
+#: ui/composer-editor.ui:753
 msgid "Lar_ge"
 msgstr "_Veľké"
 
-#: ui/composer-widget.ui:1303
+#: ui/composer-editor.ui:763
 msgid "_Rich Text"
 msgstr "_Formátovaný text"
 
-#: ui/composer-widget.ui:1308
+#: ui/composer-editor.ui:768
 msgid "_Plain Text"
 msgstr "Č_istý text"
 
+#: ui/composer-editor-menus.ui:8
+msgid "_Undo"
+msgstr "Vrátiť _späť"
+
+#: ui/composer-editor-menus.ui:12
+msgid "_Redo"
+msgstr "_Znovu vykonať"
+
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
+msgid "Cu_t"
+msgstr "Vys_trihnúť"
+
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
+#: ui/conversation-message-menus.ui:37
+msgid "_Copy"
+msgstr "_Skopírovať"
+
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
+msgid "_Paste"
+msgstr "_Vložiť"
+
+#: ui/composer-editor-menus.ui:30
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
+msgstr "Vložiť _bez formátovania"
+
+#: ui/composer-editor-menus.ui:50
+msgid "Select _All"
+msgstr "Vybr_ať všetko"
+
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
+msgid "_Inspect…"
+msgstr "_Preskúmať…"
+
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "Odpojí tvorcu správy od okna"
+
+#: ui/composer-headerbar.ui:135
+msgid "_Send"
+msgstr "_Odoslať"
+
+# tooltip
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "Zahodí a zavrie"
+
+# tooltip
+#: ui/composer-headerbar.ui:186
+msgid "Save and Close"
+msgstr "Uloží a zavrie"
+
+# tooltip
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:42
+msgid "Insert the new link with this URL"
+msgstr "Vloží nový odkaz s týmto URL"
+
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Pridať"
+
+#: ui/composer-link-popover.ui:47
+msgid "Link URL"
+msgstr "URL odkazu"
+
+# tooltip
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:61
+msgid "Update this link’s URL"
+msgstr "Aktualizuje URL tohto odkazu"
+
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Aktualizovať"
+
+# tooltip
+#: ui/composer-link-popover.ui:75
+msgid "Delete this link"
+msgstr "Odstráni tento odkaz"
+
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:61
+msgid "_From"
+msgstr "_Od"
+
+#. Address(es) e-mail is to be sent to
+#: ui/composer-widget.ui:131
+msgid "_To"
+msgstr "_Pre"
+
+#: ui/composer-widget.ui:159
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Zobrazí polia Kópia, Skrytá kópia a Komu odpovedať"
+
+#: ui/composer-widget.ui:220
+msgid "_Cc"
+msgstr "_Kópia"
+
+#: ui/composer-widget.ui:268
+msgid "_Bcc"
+msgstr "_Skrytá kópia"
+
+#: ui/composer-widget.ui:316
+msgid "_Reply-To"
+msgstr "_Komu odpovedať"
+
+#: ui/composer-widget.ui:373
+msgid "_Subject"
+msgstr "P_redmet"
+
+#: ui/composer-widget.ui:446
+msgid "Drop files here"
+msgstr "Sem pustite súbory"
+
+#: ui/composer-widget.ui:462
+msgid "To add them as attachments"
+msgstr "Na ich pridanie do prílohy"
+
 # tooltip
 #: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
 msgid "Select all attachments"
@@ -2948,52 +3159,57 @@ msgstr "Otvorí vybrané prílohy"
 msgid "Save _All"
 msgstr "_Uložiť všetko"
 
-#: 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>."
+#: ui/components-inspector-error-view.ui:31
 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>."
+"one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">contact "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/"
+"ReportingABug\">new bug report</a>."
 msgstr ""
-"Ak je problém vážny alebo pretrváva, prosím, skopírujte a odošlite tieto "
-"podrobnosti do <a href=\"https://wiki.gnome.org/Apps/Geary/Contact"
-"\">poštovej konferencie</a> alebo nahláste <a href=\"https://wiki.gnome.org/"
-"Apps/Geary/ReportingABug\">nové chybové hlásenie</a>."
+"Ak je problém vážny alebo pretrváva, prosím, uložte a odošlite tieto "
+"podrobnosti do jedného z <a href=\"https://wiki.gnome.org/Apps/Geary/Contact"
+"\">kontaktných kanálov</a> alebo ich priložte k <a href=\"https://wiki.gnome."
+"org/Apps/Geary/ReportingABug\">novému chybovému hláseniu</a>."
 
-#: ui/components-inspector-error-view.ui:49
+#: ui/components-inspector-error-view.ui:47
 msgid "Details:"
 msgstr "Podrobnosti:"
 
-#. Tooltip for inspector button
-#: ui/components-inspector.ui:20
-msgid "Toggle appending new log entries"
-msgstr "Prepne pridávanie nových položiek záznamu"
-
 # placeholder
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
 msgid "Search for matching log entries"
 msgstr "Vyhľadá zhodné položky záznamu"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:35
+msgid "Toggle appending new log entries"
+msgstr "Prepne pridávanie nových položiek záznamu"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
+msgstr ""
+
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
 msgid "Save logs entries and details"
 msgstr "Uloží položky záznamu a podrobnosti"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
 msgid "Copy to clipboard"
 msgstr "Skopíruje to schránky"
 
+# tooltip
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+msgid "Clears all log entries"
+msgstr "Vymaže všetky položky záznamu"
+
 #: ui/conversation-contact-popover.ui:146
 msgid "New Conversation…"
 msgstr "Nový rozhovor…"
@@ -3058,26 +3274,6 @@ msgstr "Označí túto správu hviezdičkou"
 msgid "Mark this message as not starred"
 msgstr "Zruší označenie tejto správy hviezdičkou"
 
-#: ui/conversation-email.ui:124
-msgid "Edit Draft"
-msgstr "Upraviť koncept"
-
-#: ui/conversation-email.ui:151
-msgid "Draft message"
-msgstr "Koncept"
-
-#: ui/conversation-email.ui:167
-msgid "This message has not yet been sent."
-msgstr "Táto správa ešte nebola odoslaná."
-
-#: ui/conversation-email.ui:213
-msgid "Message not saved"
-msgstr "Správa nebola uložená"
-
-#: ui/conversation-email.ui:229
-msgid "This message was sent, but has not been saved to your account."
-msgstr "Táto správa bola odoslaná, ale nebola uložená do vášho účtu."
-
 #. Translators: Menu item to reply to a specific message.
 #: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
@@ -3183,22 +3379,6 @@ msgstr "Komu odpovedať:"
 msgid "Subject"
 msgstr "Predmet"
 
-#: ui/conversation-message.ui:501
-msgid "Show Images"
-msgstr "Zobraziť obrázky"
-
-#: ui/conversation-message.ui:514
-msgid "Always Show From Sender"
-msgstr "Vždy zobraziť od odosielateľa"
-
-#: ui/conversation-message.ui:542
-msgid "Remote images not shown"
-msgstr "Vzdialené obrázky neboli zobrazené"
-
-#: ui/conversation-message.ui:559
-msgid "Only show remote images from senders you trust."
-msgstr "Vzdialené obrázky zobrazujte od odosielateľov, ktorým dôverujete."
-
 # placeholder
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
@@ -3237,7 +3417,7 @@ msgstr "menovka"
 msgid "Conversation Shortcuts"
 msgstr "Skratky rozhovorov"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Akcie"
@@ -3252,37 +3432,37 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Odpovedanie odosielateľovi"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Odpovedanie všetkým"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Preposlanie"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "Označenie ako prečítané/neprečítané"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "Označenie/zrušenie označenia hviezdičkou"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "Archivácia rozhovorov"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "Presun rozhovorov"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "Pridanie menovky rozhovorom"
@@ -3292,12 +3472,12 @@ msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "Presunutie rozhovorov do Koša"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "Presunutie rozhovorov do Nevyžiadanej pošty"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "Odstránenie rozhovorov"
@@ -3312,7 +3492,7 @@ msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "Vyhľadanie rozhovorov"
 
-#: ui/gtk/help-overlay.ui:115
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Nájdenie v aktuálnom rozhovore"
@@ -3352,7 +3532,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Obnovenie priblíženia"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Všeobecné"
@@ -3402,82 +3582,86 @@ msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "Zameranie na nasledovnú/predošlú správu"
 
-#: ui/gtk/help-overlay.ui:258
-msgctxt "shortcut window"
-msgid "Single-key shortcuts"
+#: ui/gtk/help-overlay.ui:260
+msgid "Single-key Shortcuts"
 msgstr "Klávesové skratky o jednom klávese"
 
-#: ui/gtk/help-overlay.ui:262
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Odpovedanie odosielateľovi"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Klávesové skratky o jednom klávese (ak sú povolené)"
 
-#: ui/gtk/help-overlay.ui:332
+#: ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
-msgid "Find in current conversations"
-msgstr "Nájdenie v aktuálnych rozhovoroch"
+msgid "Reply to sender "
+msgstr "Odpovedanie odosielateľovi"
 
-#: ui/gtk/help-overlay.ui:339
+#: ui/gtk/help-overlay.ui:361
 msgctxt "shortcut window"
 msgid "Select next/previous conversations"
 msgstr "Výber ďalších/predošlých rozhovorov"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:373
 msgid "Composer Shortcuts"
 msgstr "Skratky tvorcu správ"
 
-#: ui/gtk/help-overlay.ui:359
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Odoslanie"
 
-#: ui/gtk/help-overlay.ui:366
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Pridanie prílohy"
 
-#: ui/gtk/help-overlay.ui:379
+#: ui/gtk/help-overlay.ui:395
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "Odpojenie okna tvorcu správy"
+
+#: ui/gtk/help-overlay.ui:408
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Zavretie okna tvorcu správy"
 
-#: ui/gtk/help-overlay.ui:386
+#: ui/gtk/help-overlay.ui:415
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Odpojenie okna tvorcu správy"
 
-#: ui/gtk/help-overlay.ui:393
+#: ui/gtk/help-overlay.ui:422
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Upravovanie"
 
-#: ui/gtk/help-overlay.ui:398
+#: ui/gtk/help-overlay.ui:427
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Presun výberu do schránky"
 
-#: ui/gtk/help-overlay.ui:405
+#: ui/gtk/help-overlay.ui:434
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Skopírovanie výberu do schránky"
 
-#: ui/gtk/help-overlay.ui:412
+#: ui/gtk/help-overlay.ui:441
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Vloženie zo schránky"
 
-#: ui/gtk/help-overlay.ui:419
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Citácia textu"
 
 # tooltip
-#: ui/gtk/help-overlay.ui:426
+#: ui/gtk/help-overlay.ui:455
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Zrušenie citácie textu"
 
-#: ui/gtk/help-overlay.ui:435
+#: ui/gtk/help-overlay.ui:464
 #, fuzzy
 #| msgctxt "shortcut window"
 #| msgid "Rich text mode"
@@ -3485,43 +3669,43 @@ msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Formátovanie textu"
 
-#: ui/gtk/help-overlay.ui:439
+#: ui/gtk/help-overlay.ui:468
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Vloženie bez formátovania"
 
-#: ui/gtk/help-overlay.ui:446
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Tučný text"
 
-#: ui/gtk/help-overlay.ui:453
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Kurzíva textu"
 
-#: ui/gtk/help-overlay.ui:460
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Podčiarknutie textu"
 
-#: ui/gtk/help-overlay.ui:467
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Preškrtnutie textu"
 
-#: ui/gtk/help-overlay.ui:474
+#: ui/gtk/help-overlay.ui:503
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Odstránenie formátovania"
 
 # tooltip
-#: ui/gtk/help-overlay.ui:481
+#: ui/gtk/help-overlay.ui:510
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Vloženie obrázku"
 
-#: ui/gtk/help-overlay.ui:488
+#: ui/gtk/help-overlay.ui:517
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Vloženie odkazu"
@@ -3557,26 +3741,18 @@ msgid "_Archive"
 msgstr "_Archivovať"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Toggle as S_pam"
+msgid "Toggle as _Junk"
 msgstr "Prepnúť ako _nevyžiadanú poštu"
 
 #: ui/main-toolbar-menus.ui:28
-msgid "Empty _Spam…"
-msgstr "Vyprázdniť _Nevyžiadanú poštu…"
-
-#: ui/main-toolbar-menus.ui:32
-msgid "Empty _Trash…"
-msgstr "Vyprázdniť _Kôš…"
-
-#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "Účt_y"
 
-#: ui/main-toolbar-menus.ui:46
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "Klávesové _skratky"
 
-#: ui/main-toolbar-menus.ui:57
+#: ui/main-toolbar-menus.ui:47
 msgid "_About Geary"
 msgstr "_O aplikácii Geary"
 
@@ -3600,15 +3776,64 @@ msgstr "_Overiť totožnosť"
 msgid "Geary update in progress…"
 msgstr "Prebieha aktualizácia aplikácie Geary…"
 
+# cmd line desc
+#~ msgid "Log periodic activity"
+#~ msgstr "Periodicky zaznamená aktivitu"
+
+#, fuzzy
+#~| msgid "Log network serialization"
+#~ msgid "Log IMAP network serialization"
+#~ msgstr "Zaznamená serializáciu siete"
+
+#~ msgid "Sent Mail"
+#~ msgstr "Odoslaná pošta"
+
+#~ msgid "Spam"
+#~ msgstr "Nevyžiadaná pošta"
+
+#~ 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 ""
+#~ "Zdá sa, že váš počítač nie je pripojený k internetu.\n"
+#~ "Nebudete môcť odoslať alebo prijať email, pokiaľ sa opätovne nepripojíte."
+
+#~ msgid ""
+#~ "An account has reported an untrusted server.\n"
+#~ "Please check the server configuration and try again."
+#~ msgstr ""
+#~ "Účet nahlásil nedôveryhodný server.\n"
+#~ "Prosím, skontrolujte konfiguráciu servera a skúste to znovu."
+
+#~ msgid ""
+#~ "An account has reported an incorrect login or password.\n"
+#~ "Please check your login name and try again."
+#~ msgstr ""
+#~ "Účet nahlásil nesprávne prihlasovacie meno alebo heslo.\n"
+#~ "Prosím, skontrolujte vaše prihlasovacie meno a skúste to znovu."
+
+#~ msgid "From"
+#~ msgstr "Od"
+
+#~ msgid "Edit Draft"
+#~ msgstr "Upraviť koncept"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Find in current conversations"
+#~ msgstr "Nájdenie v aktuálnych rozhovoroch"
+
+#~ msgid "Empty _Spam…"
+#~ msgstr "Vyprázdniť _Nevyžiadanú poštu…"
+
+#~ msgid "Empty _Trash…"
+#~ msgstr "Vyprázdniť _Kôš…"
+
 #~ msgid "mail-send"
 #~ msgstr "mail-send"
 
 #~ msgid "Enable notification sounds"
 #~ msgstr "Povoliť zvuky oznámení"
 
-#~ msgid "Show notifications for new mail"
-#~ msgstr "Zobraziť upozornenia pre novú poštu"
-
 #~ msgid "Additional addresses for %s"
 #~ msgstr "Dodatočné adresy pre %s"
 
@@ -4152,9 +4377,6 @@ msgstr "Prebieha aktualizácia aplikácie Geary…"
 #~ msgid "Show _notifications for new mail"
 #~ msgstr "Zobraziť _upozornenia pre novú poštu"
 
-#~ msgid "Preferences"
-#~ msgstr "Nastavenia"
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove "
 #~ "this account?</span> "
@@ -4248,9 +4470,6 @@ msgstr "Prebieha aktualizácia aplikácie Geary…"
 #~ msgid "Enable _spell checking"
 #~ msgstr "Povoliť _kontrolu pravopisu"
 
-#~ msgid "Empty"
-#~ msgstr "Vyprázdniť"
-
 #~ msgid "_Inspect..."
 #~ msgstr "_Preskúmať…"
 
@@ -4274,9 +4493,6 @@ msgstr "Prebieha aktualizácia aplikácie Geary…"
 #~ msgstr[1] "%i zhody (zalomené)"
 #~ msgstr[2] "%i zhôd (zalomených)"
 
-#~ msgid "not found"
-#~ msgstr "nenájdené"
-
 #~ msgid "No conversations selected."
 #~ msgstr "Žiadne vybraté rozhovory."
 
-- 
2.29.2

