From 104b4979a77230144aab5298a0161b091d42b2df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= <marek@manet.cz>
Date: Wed, 14 Oct 2020 11:11:09 +0200
Subject: [PATCH 101/124] Updated Czech translation

---
 help/cs/cs.po |  677 +++++++++----
 po/cs.po      | 2551 ++++++++++++++++++++++++++++---------------------
 2 files changed, 1924 insertions(+), 1304 deletions(-)

diff --git a/help/cs/cs.po b/help/cs/cs.po
index 4b574fe9..6861fade 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
-"POT-Creation-Date: 2019-09-27 12:58+0000\n"
+"POT-Creation-Date: 2020-06-25 02:39+0000\n"
 "PO-Revision-Date: 2019-10-01 17:41+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
@@ -202,69 +202,117 @@ msgstr ""
 "se do spodní části okna a zmáčkněte <gui>Odebrat účet</gui>."
 
 #. (itstool) path: page/title
-#: C/archive.page:10
-msgid "Delete or archive a message"
-msgstr "Mazání a archivace zpráv"
+#: C/archive.page:8
+msgid "Archive, trash and delete messages"
+msgstr "Archivování, vyhazování a mazání zpráv"
 
 #. (itstool) path: page/p
-#: C/archive.page:12
+#: C/archive.page:10
 msgid ""
-"When you use Geary with a Gmail account, Geary lets you <em>archive</em> "
-"messages. The <gui>Archive</gui> toolbar button archives the selected "
-"conversation(s). Archived messages appear in the <gui>All Mail</gui> folder."
+"Geary lets you archive messages if your server supports it. Clicking the "
+"<gui style=\"button\">Archive</gui> toolbar button moves the conversation "
+"from the current folder to the <gui>Archive</gui> folder for most email "
+"services, or to <gui>All Mail</gui> for GMail. Archiving helps keep your "
+"email organised by moving old and replied-to email out of the way."
 msgstr ""
-"Pokud používáte Geary s účtem Gmail, umožní vám Geary zprávy <em>archivovat</"
-"em>. Tlačítko <gui>Archivovat</gui> na nástrojové liště archivuje vybranou "
-"konverzaci. Archivované zprávy se objeví ve složce <gui>Všechny zprávy</gui>."
+"Geary vám dává možnost si zprávy archivovat, pokud to podporuje server. "
+"Kliknutím na tlačítko <gui style=\"button\">Archivovat</gui> na nástrojové "
+"liště přesunete konverzaci z aktuální složky do složky <gui>Archiv</gui> (u "
+"většiny poštovních služeb) nebo <gui>Všechny zprávy</gui> (GMAil). "
+"Archivování pomáhá udržet v poště pořádek přesunutím starých a zodpovězených "
+"zpráv pryč."
 
 #. (itstool) path: page/p
-#: C/archive.page:16
-msgid ""
-"With other mail servers, you can trash or delete, but not archive, messages. "
-"To move one or more conversations to the <gui>Trash</gui> folder, select "
-"them and press the <gui>Trash</gui> button on the toolbar. To permanently "
-"delete the conversations, hold down <key>Shift</key> and press the "
-"<gui>Delete</gui> button that appears in place of the <gui>Trash</gui> "
-"button."
-msgstr ""
-"U ostatních poštovních serverů můžete zprávy mazat a přesouvat do koše, ale "
-"ne je archivovat. Když chcete jednu nebo více konverzací přesunout do složky "
-"<gui>Koš</gui>, vyberte je a zmáčkněte tlačítko <gui>Koš</gui> na nástrojové "
-"liště. Abyste konverzaci smazali trvale, držte zmáčknutý <key>Shift</key> a "
-"zmáčkněte tlačítko <gui>Smazat</gui> vyskytující se vedle tlačítka <gui>Koš</"
-"gui>."
+#: C/archive.page:17
+msgid ""
+"To move conversations to the <gui>Trash</gui> folder, select them and click "
+"the <gui style=\"button\">Trash</gui> toolbar button. To permanently delete "
+"conversations, hold down <key>Shift</key> and click the <gui style=\"button"
+"\">Delete</gui> button that appears in place of the <gui>Trash</gui> button, "
+"or open the conversation in the <gui>Trash</gui> folder and click <gui style="
+"\"button\">Delete</gui> there."
+msgstr ""
+"Když chcete konverzace přesunout do složky <gui>Koš</gui>, vyberte je a "
+"zmáčkněte tlačítko <gui style=\"button\">Koš</gui> na nástrojové liště. "
+"Abyste konverzaci smazali trvale, držte zmáčknutý <key>Shift</key> a "
+"zmáčkněte tlačítko <gui style=\"button\">Smazat</gui>, které se objeví "
+"namísto tlačítka <gui>Koš</gui>, nebo konverzaci ve složce <gui>Koš</gui> "
+"otevřete a klikněte na tlačítko <gui style=\"button\">Smazat</gui> tam."
+
+#. (itstool) path: note/title
+#: C/archive.page:26
+msgid "Undoing changes"
+msgstr "Vracení změn"
+
+#. (itstool) path: note/p
+#: C/archive.page:27
+msgid ""
+"Note that you can always undo archiving or trashing a message if you change "
+"your mind. Click <gui style=\"button\">Undo</gui> on the pop-up notification "
+"that appears, or type <keyseq><key>Ctrl</key><key>Z</key></keyseq>, or open "
+"the folder, find the message, then move it back to your <gui>Inbox</gui>"
+msgstr ""
+"Pamatujte, že archivované a vyhozené zprávy můžete vždy, kdy si to "
+"rozmyslíte, vrátit zpět. Stačí zmáčknout <gui style=\"button\">Zpět</gui> ve "
+"vyskakovacím upozornění, které se objeví, nebo zmáčknout <keyseq><key>Ctrl"
+"</key><key>Z</key></keyseq>, a nebo otevřít složku, najít zprávu a přesunout "
+"ji zpět do <gui>Doručené</gui>."
 
 #. (itstool) path: page/p
-#: C/archive.page:21
-msgid ""
-"Delete is not available from every folder, such as Search. Delete is also "
-"unavailable for Gmail. For Gmail, <gui>Trash</gui> will move messages to the "
-"Trash folder on the server, where the user can then manually delete them. "
-"The server will automatically remove trashed messages after 30 days."
-msgstr ""
-"Mázání není k dispozici u každé složky, např. není u složky Hledání. Rovněž "
-"není k dispozici pro Gmail. U něj tlačítko <gui>Koš</gui> přesune zprávy do "
-"složky koš na serveru, kde je uživatel může smazat ručně. Případně je smaže "
-"server automaticky po 30 dnech."
+#: C/archive.page:34
+msgid ""
+"While both <gui style=\"button\">Archive</gui> and <gui style=\"button"
+"\">Trash</gui> removes conversations from your <gui>Inbox</gui> folder, "
+"there is an important difference. Clicking <gui style=\"button\">Archive</"
+"gui> will ensure your conversations are kept so you can find them again "
+"later. Clicking <gui style=\"button\">Trash</gui> will cause conversations "
+"to be hidden from <link xref=\"search\"/>, and they will likely be deleted "
+"in the future."
+msgstr ""
+"Přestože, jak <gui style=\"button\">Archivovat</gui>, tak <gui style=\"button"
+"\">Vyhodit do koše</gui>, přesune konverzaci ze složky <gui>Doručené</gui>, "
+"je mezi nimi podstatný rozdíl. Zatím co archivované konverzace se uchovávají "
+"tak, že je lze později vyhledat, vyhození do koše způsobí, že konverzace se "
+"skryje pro <link xref=\"search\"/> a v budoucnu bude nejspíše smazána."
 
 #. (itstool) path: page/title
 #: C/bugs.page:10
-msgid "Found a bug?"
-msgstr "Našli jste chybu?"
+msgid "Need help with Geary?"
+msgstr "Potřebujete s Geary pomoct?"
 
-#. (itstool) path: page/p
-#: C/bugs.page:12
+#. (itstool) path: section/title
+#: C/bugs.page:13
+msgid "Getting support"
+msgstr "Získání podpory"
+
+#. (itstool) path: section/p
+#: C/bugs.page:15
 msgid ""
-"If you suspect you've found a bug in Geary, please <link href=\"https://wiki."
-"gnome.org/Apps/Geary/Contact\">get in touch</link> about it so it can be "
-"fixed."
+"If you are having trouble using Geary, please <link href=\"https://wiki."
+"gnome.org/Apps/Geary/Contact\">get in touch</link> with the Geary community "
+"about the problem."
 msgstr ""
-"Jestliže předpokládáte, že jste v Geary našli chybu, <link href=\"https://"
-"wiki.gnome.org/Apps/Geary/Contact\">informujte o tom vývojáře</link>, aby ji "
-"mohli opravit."
+"Pokud máte s používáním Geary problémy, <link href=\"https://wiki.gnome.org/"
+"Apps/Geary/Contact\">dejte o tom prosím vědět</link> komunitě okolo Geary."
 
-#. (itstool) path: page/p
-#: C/bugs.page:16
+#. (itstool) path: section/title
+#: C/bugs.page:21
+msgid "Reporting bugs"
+msgstr "Hlášení chyb"
+
+#. (itstool) path: section/p
+#: C/bugs.page:23
+msgid ""
+"If you suspect you have found a bug in Geary, please follow the <link href="
+"\"https://wiki.gnome.org/Apps/Geary/ReportingABug\">bug reporting "
+"guidelines</link> so the problem can be diagnosed and fixed."
+msgstr ""
+"Jestliže předpokládáte, že jste v Geary našli chybu, postupujte prosím podle "
+"<link href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\">návodu k "
+"hlášení chyb</link>, aby bylo možné problém diagnostikovat a opravit."
+
+#. (itstool) path: section/p
+#: C/bugs.page:28
 msgid ""
 "To help diagnose the problem as fast as possible, please include the "
 "following information:"
@@ -273,47 +321,53 @@ msgstr ""
 "zprávy tyto informace:"
 
 #. (itstool) path: item/p
-#: C/bugs.page:20
+#: C/bugs.page:32
 msgid "Geary version and installation method (Package? Flathub? Source code?)"
 msgstr ""
 "Verze aplikace Geary a způsob její instalace (distribuční balíček, Flathub, "
 "zdrojový kód, …)"
 
 #. (itstool) path: item/p
-#: C/bugs.page:22
+#: C/bugs.page:34
 msgid "Your desktop (GNOME? KDE? Something else?)"
 msgstr "Vaše uživatelské prostředí (GNOME, KDE, Xfce, …)"
 
 #. (itstool) path: item/p
-#: C/bugs.page:23
+#: C/bugs.page:35
 msgid ""
 "Your operating system and version (Ubuntu 16.04? Fedora 28? Rolled your own?)"
 msgstr "Váš operační systém a jeho verze (Ubuntu 18.04, Fedora 28, FreeBSD, …)"
 
 #. (itstool) path: item/p
-#: C/bugs.page:25
+#: C/bugs.page:37
 msgid "Email provider (Gmail, Yahoo!, Outlook.com, or someone else?)"
 msgstr "Poskytovatel e-mailu (Gmail, Yahoo!, Outlook.com, …)"
 
 #. (itstool) path: item/p
-#: C/bugs.page:27
+#: C/bugs.page:39
 msgid "Steps to reproduce the bug"
 msgstr "Kroky vedoucí k zopakování chyby"
 
 #. (itstool) path: item/p
-#: C/bugs.page:28
+#: C/bugs.page:40
 msgid "What happened?"
 msgstr "Co se stalo"
 
 #. (itstool) path: item/p
-#: C/bugs.page:29
+#: C/bugs.page:41
 msgid "What did you expect to happen?"
 msgstr "Co jste očekávali, že se má stát"
 
-#. (itstool) path: page/p
-#: C/bugs.page:32
-msgid "Thanks for your help!"
-msgstr "Děkujeme za vaši pomoc!"
+#. (itstool) path: section/p
+#: C/bugs.page:44
+msgid ""
+"Log files can be accessed via the Geary Inspector, press <keyseq><key>Alt</"
+"key><key>I</key></keyseq> to open it, select and save any relevant log "
+"files, and attach them to the bug report."
+msgstr ""
+"K souborům se záznamy se dostanete pomocí Inspektora Geary. Otevřete jej "
+"zmáčknutím <keyseq><key>Alt</key><key>I</key></keyseq>, vyberte a uložte "
+"příslušný soubor se záznamy a připojte jej k hlášení chyby."
 
 #. (itstool) path: page/title
 #: C/contributing.page:10
@@ -340,25 +394,6 @@ msgstr ""
 #. (itstool) path: item/p
 #: C/contributing.page:19
 msgid ""
-"<link href=\"https://wiki.gnome.org/Apps/Geary/Design\">User Experience "
-"Design</link>—research and develop Geary’s user experience"
-msgstr ""
-"<link href=\"https://wiki.gnome.org/Apps/Geary/Design\">Návrh grafiky a "
-"ovládání</link> — zkoumejte a rozvíjejte uživatelskou přívětivost aplikace "
-"Geary"
-
-#. (itstool) path: item/p
-#: C/contributing.page:20
-msgid ""
-"<link href=\"https://wiki.gnome.org/Apps/Geary/Development\">Development</"
-"link>—fix bugs and add new features"
-msgstr ""
-"<link href=\"https://wiki.gnome.org/Apps/Geary/Development\">Programátorský "
-"vývoj</link> — opravujte chyby a přidávejte nové funkce"
-
-#. (itstool) path: item/p
-#: C/contributing.page:21
-msgid ""
 "<link href=\"https://wiki.gnome.org/Apps/Geary/Translating\">Translating</"
 "link>—translate Geary’s user interface and user manual into new languages"
 msgstr ""
@@ -367,53 +402,43 @@ msgstr ""
 "příručku do svého rodného jazyka"
 
 #. (itstool) path: item/p
-#: C/contributing.page:22
+#: C/contributing.page:20
 msgid ""
-"<link href=\"https://wiki.gnome.org/Apps/Geary/Contact\">Join the "
-"discussion</link>—on the mailing list or IRC channel"
+"<link href=\"https://wiki.gnome.org/Apps/Geary/Development\">Development</"
+"link>—fix bugs and add new features"
 msgstr ""
-"<link href=\"https://wiki.gnome.org/Apps/Geary/Contact\">Zapojení do "
-"diskuzí</link> — v poštovní konferenci nebo na kanále IRC"
+"<link href=\"https://wiki.gnome.org/Apps/Geary/Development\">Programátorský "
+"vývoj</link> — opravujte chyby a přidávejte nové funkce"
 
 #. (itstool) path: page/p
-#: C/contributing.page:25
-msgid "Thanks for your help making Geary better!"
-msgstr "Děkujeme za vaši pomoc ve snaze udělat Geary stále lepším!"
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:6
-msgctxt "_"
-msgid "external ref='figures/geary.svg' md5='1c66fe237d546362fda9f209840da4a8'"
+#: C/contributing.page:23
+msgid ""
+"See <link href=\"https://wiki.gnome.org/Apps/Geary/Contribute\">the wiki</"
+"link> for more information and options for contributing financially to "
+"Geary's development."
 msgstr ""
-"external ref='figures/geary.svg' md5='1c66fe237d546362fda9f209840da4a8'"
+"Více informací a možností finančního přispívání na vývoj Geary viz <link href="
+"\"https://wiki.gnome.org/Apps/Geary/Contribute\">wiki</link>"
 
 #. (itstool) path: page/title
-#: C/index.page:5
-msgid ""
-"<media type=\"image\" src=\"figures/geary.svg\" width=\"64\" height=\"64\"/> "
-"<span>Geary</span>"
-msgstr ""
-"<media type=\"image\" src=\"figures/geary.svg\" width=\"64\" height=\"64\"/> "
-"<span>Geary</span>"
+#: C/index.page:6
+msgid "<_:media-1/> <span>Geary</span>"
+msgstr "<_:media-1/> <span>Geary</span>"
 
 #. (itstool) path: section/title
-#: C/index.page:11
+#: C/index.page:12
 msgid "Introduction"
 msgstr "Úvod"
 
 #. (itstool) path: section/title
-#: C/index.page:15
+#: C/index.page:16
 msgid "Using Geary"
 msgstr "Používání Geary"
 
 #. (itstool) path: section/title
-#: C/index.page:19
-msgid "Contributing and bug reporting"
-msgstr "Přispívání a hlášení chyb"
+#: C/index.page:20
+msgid "Contributing and getting support"
+msgstr "Přispívání a podpora"
 
 #. (itstool) path: page/title
 #: C/label.page:10
@@ -529,7 +554,8 @@ msgstr ""
 "\">wikistránku</link> projektu Geary."
 
 #. (itstool) path: page/title
-#: C/overview.page:9
+#. (itstool) path: section/title
+#: C/overview.page:9 C/shortcuts.page:13
 msgid "Overview"
 msgstr "Přehled"
 
@@ -736,14 +762,14 @@ msgstr "Předvolby"
 #. (itstool) path: page/p
 #: C/preferences.page:12
 msgid ""
-"Geary allows you to customise how it works via its <gui>Preferences</gui> "
-"window. To open the window, select <gui>Preferences</gui> from the "
-"application menu on the main window's toolbar. You can change the following "
-"options:"
+"Geary allows you to customise how it works via its <gui style=\"group"
+"\">Preferences</gui> window. To open the window, select <gui style=\"menuitem"
+"\">Preferences</gui> from the application menu on the main window's toolbar. "
+"You can change the following options:"
 msgstr ""
-"Pomocí okna <gui>Předvolby</gui> si můžete přizpůsobit, jak má pošťák Geary "
-"fungovat. <gui>Předvolby</gui> otevřete pomocí nabídky aplikace v záhlavní "
-"liště. Měnit můžete následující věci:"
+"Pomocí okna <gui style=\"group\">Předvolby</gui> si můžete přizpůsobit, jak "
+"má pošťák Geary fungovat. <gui style=\"menuitem\">Předvolby</gui> otevřete "
+"pomocí nabídky aplikace v záhlavní liště. Měnit můžete následující věci:"
 
 #. (itstool) path: item/title
 #: C/preferences.page:19
@@ -793,11 +819,27 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/preferences.page:38
+msgid "<gui>Use single key email shortcuts</gui>"
+msgstr "<gui>Používat pro e-maily jednoklávesové zkratky</gui>"
+
+#. (itstool) path: item/p
+#: C/preferences.page:39
+msgid ""
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<key>Ctrl</key>. These match the shortcuts used by GMail. See <link xref="
+"\"shortcuts\"/> for details."
+msgstr ""
+"Povolí pro činnosti s e-maily klávesové zkratky, které nevyžadují zmáčknutí "
+"klávesy <key>Ctrl</key>. Jsou stejné jako klávesové zkratky v GMailu. "
+"Podrobnosti viz <link xref=\"shortcuts\"/>"
+
+#. (itstool) path: item/title
+#: C/preferences.page:44
 msgid "<gui>Watch for new mail when closed</gui>"
 msgstr "<gui>Sledovat novou poštu při zavřené aplikaci</gui>"
 
 #. (itstool) path: item/p
-#: C/preferences.page:39
+#: C/preferences.page:45
 msgid ""
 "Geary will watch your accounts for new mail even when the main window is not "
 "open. To do this, it will silently start when you log in to your computer, "
@@ -985,21 +1027,21 @@ msgstr ""
 msgid "Keyboard shortcuts"
 msgstr "Klávesové zkratky"
 
-#. (itstool) path: page/p
-#: C/shortcuts.page:12
+#. (itstool) path: section/p
+#: C/shortcuts.page:14
 msgid ""
 "Geary has keyboard shortcuts for most common operations. Use the built-in "
-"keyboard shortcuts help in Geary to discover the full list. This can be "
-"accessed via the application menu: <guiseq><gui>Geary</gui><gui>Keyboard "
-"Shortcuts</gui></guiseq> or using the keyboard shortcuts listed below."
+"help to discover the full list. To open the shortcuts help, select <gui "
+"style=\"menuitem\">Keyboard Shortcuts</gui> from the application menu on the "
+"main window's toolbar, or using the keyboard shortcuts listed below."
 msgstr ""
 "Geary má pro nejpoužívanější operace klávesové zkratky. Jejich seznam "
-"najdete v zabudované nápovědě ke klávesovým zkratkám. K té se dostanete přes "
-"nabídku aplikace: <guiseq><gui>Geary</gui> <gui>Keyboard Shortcuts</gui></"
-"guiseq> nebo pomocí níže uvedených klávesových zkratek."
+"najdete v zabudované nápovědě. Tu otevřete pomocí <gui style=\"menuitem\">"
+"Klávesové zkratky</gui> v nabídce aplikace na nástrojové liště hlavního okna, "
+"nebo pomocí níže uvedené klávesové zkratky."
 
-#. (itstool) path: page/p
-#: C/shortcuts.page:18
+#. (itstool) path: section/p
+#: C/shortcuts.page:20
 msgid ""
 "The following keyboard shortcuts can be used to access on-line help from "
 "Geary:"
@@ -1008,28 +1050,49 @@ msgstr ""
 "aplikace Geary:"
 
 #. (itstool) path: td/p
-#: C/shortcuts.page:22
-msgid "Display this User Manual"
-msgstr "Zobrazit tuto uživatelskou příručku"
+#: C/shortcuts.page:24
+msgid "Display this online help manual"
+msgstr "Zobrazit tuto příručku s nápovědou"
 
 #. (itstool) path: td/p
-#: C/shortcuts.page:23
+#: C/shortcuts.page:25
 msgid "<keyseq><key>F1</key></keyseq>"
 msgstr "<keyseq><key>F1</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/shortcuts.page:26
+#: C/shortcuts.page:28
 msgid "Display all keyboard shortcuts"
 msgstr "Zobrazit všechny klávesové zkratky"
 
 #. (itstool) path: td/p
-#: C/shortcuts.page:27
+#: C/shortcuts.page:29
+msgid "<keyseq><key>Ctrl</key><key>?</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>?</key></keyseq>"
+
+#. (itstool) path: section/title
+#: C/shortcuts.page:37
+msgid "Single key shortcuts"
+msgstr "Jednoklávesové zkratky"
+
+#. (itstool) path: section/p
+#: C/shortcuts.page:39
 msgid ""
-"<keyseq><key>Ctrl</key><key>?</key></keyseq> or <keyseq><key>Ctrl</"
-"key><key>F1</key></keyseq>"
+"You can enable keyboard shortcuts for email actions that do not require "
+"pressing <key>Ctrl</key>. These match the shortcuts used by GMail. See <link "
+"xref=\"preferences\"/> for details."
 msgstr ""
-"<keyseq><key>Ctrl</key><key>?</key></keyseq> nebo <keyseq><key>Ctrl</"
-"key><key>F1</key></keyseq>"
+"Můžete povolit pro činnosti s e-maily klávesové zkratky, které nevyžadují "
+"zmáčknutí klávesy <key>Ctrl</key>. Jsou stejné jako klávesové zkratky v "
+"GMailu. Podrobnosti viz <link xref=\"preferences\"/>"
+
+#. (itstool) path: section/p
+#: C/shortcuts.page:43
+msgid ""
+"The full list of single key shortcuts enabled by this preference can be "
+"found via the keyboard shortcuts help, above."
+msgstr ""
+"Kompletní seznam jednoklávesových zkratek, které se povolí touto předvolbou, "
+"najdete výše v nápovědě ke klávesovým zkratkám."
 
 #. (itstool) path: page/title
 #: C/star.page:10
@@ -1100,90 +1163,195 @@ msgstr ""
 "přečtené</gui> v rozbalovací nabídce."
 
 #. (itstool) path: page/title
-#: C/write.page:9
-msgid "Write a message"
-msgstr "Psaní zprávy"
+#: C/write.page:7
+msgid "Writing new email and replying"
+msgstr "Psaní nových e-mailů a odpovídání"
 
 #. (itstool) path: section/title
-#: C/write.page:12
+#: C/write.page:10
 msgid "Composing and replying"
 msgstr "Psaní zpráv a odpovídání"
 
 #. (itstool) path: section/p
-#: C/write.page:13
+#: C/write.page:12
 msgid ""
-"To compose a new message in Geary, press the <gui>New Message</gui> button "
-"on the toolbar."
+"To start a new email conversation, click the <gui style=\"button\">Compose</"
+"gui> button on the toolbar. Type the email address of the people to receive "
+"the message in the <gui style=\"input\">To</gui> text field, and a subject "
+"line in the <gui style=\"input\">Subject</gui> field. You can then type your "
+"message in the text area below these. Once the message is ready to send, "
+"click <gui style=\"button\">Send</gui> or type <keyseq><key>Ctrl</"
+"key><key>Enter</key></keyseq> to send the message."
+msgstr ""
+"Abyste začali novou e-mailovou konverzaci, klikněte na tlačítko <gui style="
+"\"button\">Napsat zprávu</gui> na nástrojové liště. Zadejte e-mailové adresy "
+"lidí, kterým se má zpráva poslat, do textového pole <gui style=\"input\">Komu"
+"</gui> a do pole <gui style=\"input\">Předmět</gui> zadejte předmět zprávy. "
+"Vlastní text zprávy se píše do textové oblasti pod těmito poli. Až je zpráva "
+"nachystaná k odeslání, klikněte na <gui style=\"button\">Odeslat</gui>, nebo "
+"zmáčkněte <keyseq><key>Ctrl</key><key>Enter</key></keyseq>, a zpráva se "
+"odešle."
+
+#. (itstool) path: note/title
+#: C/write.page:23
+msgid "Undoing sending"
+msgstr "Zrušení odesílání"
+
+#. (itstool) path: note/p
+#: C/write.page:24
+msgid ""
+"When sending an email, Geary will wait 5 seconds before delivering the "
+"message. During this time, you will be able to click <gui style=\"button"
+"\">Undo</gui> on the pop-up notification that appears or type "
+"<keyseq><key>Ctrl</key><key>Z</key></keyseq> to re-open the email, and make "
+"more changes to it."
 msgstr ""
-"Když chcete v Geary napsat novou zprávu, zmáčkněte na nástrojové liště "
-"tlačítko <gui>Nová zpráva</gui>."
+"Při odesílání e-mailu Geary čeká 5 sekund před tím, než zprávu skutečně "
+"doručí. Během této doby máte šanci odeslání zastavit kliknutím na <gui style="
+"\"button\">Zpět</gui> ve vyskakovacím upozornění, které se objeví, nebo "
+"zmáčknutím <keyseq><key>Ctrl</key><key>Z</key></keyseq>. Zpráva se znovu "
+"otevře v editoru a můžete pokračovat v úpravách."
+
+#. (itstool) path: section/p
+#: C/write.page:32
+msgid ""
+"To show the <gui style=\"input\">Cc</gui>, <gui style=\"input\">Bcc</gui>, "
+"and <gui style=\"input\">Reply-to</gui> fields, click the <gui style=\"input"
+"\">More options</gui> button at the end of the <gui style=\"input\">To</gui> "
+"field. Cc allows you to send a copy of the email to other, secondary "
+"recipients. Bcc is similar, but the Bcc list is hidden from recipients. The "
+"Reply-To field specifies an email address to reply to, if recipients should "
+"reply to a different email address than the sender's."
+msgstr ""
+"Aby se vám zobrazila pole <gui style=\"input\">Kopie</gui>, <gui style="
+"\"input\">Skrytá kopie</gui> a <gui style=\"input\">Odpověď</gui>, klikněte "
+"na tlačítko <gui style=\"input\">Další volby</gui> na konci pole <gui style="
+"\"input\">Komu</gui>. „Kopie“ slouží k zaslání kopie zprávy dalším příjemcům, "
+"kteří by měli vzít zprávu na vědomí. „Skrytá kopie“ funguje podobně, jen "
+"hlavní příjemci neuvidí příjmce kopií. Pole „Odpověď“ určuje e-mailovou "
+"adresu, na kterou se má odpovídat v případě, že chcete aby se lišila od "
+"adresy odesílatele."
 
 #. (itstool) path: section/p
-#: C/write.page:16
+#: C/write.page:41
 msgid ""
-"To reply to a message, open the message menu in the upper right corner of "
-"the message and choose <gui>Reply</gui>, <gui>Reply All</gui> or "
-"<gui>Forward</gui>. You can also reply to the last message in a conversation "
-"via the <gui>Reply</gui>, <gui>Reply All</gui> or <gui>Forward</gui> buttons "
-"on the toolbar."
+"When entering an email address into any of these fields, Geary will provide "
+"suggestions from your desktop address book and from previously sent and "
+"received email messages. To choose one of these suggestions, simply click on "
+"it."
 msgstr ""
-"Když chcete odpovědět na zprávu, otevřete nabídku zprávy v pravém horním "
-"rohu zprávy a zvolte <gui>Odpovědět</gui>, <gui>Odpovědět všem</gui> nebo "
-"<gui>Přeposlat</gui>. Můžete také odpovědět na poslední zprávu v konverzaci "
-"přes tlačítka <gui>Odpovědět</gui>, <gui>Odpovědět všem</gui> nebo "
-"<gui>Přeposlat</gui> na nástrojové liště."
+"Když zadáváte e-mailovou adresu do některého z těchto polí, Geary vám bude "
+"nabízet návrhy z vašeho adresáře a z dříve odeslaných a přijatých e-mailových "
+"zpráv. Pokud se pro některý z návrhů rozhodnete, stačí na něj kliknout."
 
-#. (itstool) path: section/title
-#: C/write.page:21
-msgid "Features"
-msgstr "Funkce"
+#. (itstool) path: section/p
+#: C/write.page:46
+msgid ""
+"To reply to the currently selected conversation, click one of the <gui style="
+"\"button\">Reply</gui>, <gui style=\"button\">Reply All</gui> or <gui style="
+"\"button\">Forward</gui> toolbar buttons. This will open a new reply or "
+"forwarded email composer for the latest message in the conversation."
+msgstr ""
+"Pokud chcete odpovědět na právě vybranou konverzaci, klikněte na tlačítko <gui "
+"style=\"button\">Odpovědět</gui>, <gui style=\"button\">Odpovědět všem</gui> "
+"nebo <gui style=\"button\">Přeposlat</gui> na nástrojové liště. Otevře se "
+"editor s novou odpovědí, respektive přeposílanou zprávou, vycházející z "
+"poslední zprávy v konverzaci."
 
 #. (itstool) path: section/p
-#: C/write.page:23
+#: C/write.page:52
 msgid ""
-"Geary's email composer lets you adjust the font, size and color of text. You "
-"can also insert hyperlinks into messages."
+"When replying, the message being replied to will be quoted and copied into "
+"the footer of the new reply. This can be deleted before typing a reply by "
+"pressing <key>Backspace</key>. Alternatively, text can be selectively quoted "
+"by selecting the desired text in a message and clicking <gui style=\"button"
+"\">Reply</gui> or <gui style=\"button\">Reply All</gui>, only the selected "
+"text will be quoted."
 msgstr ""
-"Při psaní e-mailů v Geary si můžete přizpůsobit písmo, velikost a barvu "
-"textu. Rovněž můžete do zpráv vkládat hypertextové odkazy."
+"Při odpovídání je původní zpráva označena jako citace a zkopírována do spodní "
+"části odpovědi. Než začnete psát, můžet ji smazat zmáčknutím <key>Backspace"
+"</key>. Případně lze citovat jen vybranou část zprávy tím, že ve zprávě "
+"vyberete požadovaný text a kliknete na <gui style=\"button\">Odpovědět</gui>, "
+"<gui style=\"button\">Odpovědět všem</gui>. Pak se ocituje jen vybraná část."
 
 #. (itstool) path: section/p
-#: C/write.page:25
+#: C/write.page:60
 msgid ""
-"Geary can also send plain text messages. In the drop-down menu, check or "
-"uncheck \"Rich Text\" to toggle between plain text and rich text mode."
+"To reply to a specific email message, open the message menu in the top "
+"corner of the message and choose <gui>Reply</gui>, <gui>Reply All</gui> or "
+"<gui>Forward</gui>."
 msgstr ""
-"Zprávy je možné posílat i jako čistě textové. V rozbalovací nabídce "
-"zaškrtněte nebo zrušte zaškrtnutí „Formátovaný text“, abyste se přepnuli "
-"mezi režimy prostého textu a formátovaného textu."
+"Když chcete odpovědět na konkrétní zprávu, otevřete nabídku zprávy v pravém "
+"horním rohu zprávy a zvolte <gui>Odpovědět</gui>, <gui>Odpovědět všem</gui> "
+"nebo <gui>Přeposlat</gui>."
+
+#. (itstool) path: section/title
+#: C/write.page:66
+msgid "Text formatting, images and attachments"
+msgstr "Formátování textu, obrázky a přílohy"
 
 #. (itstool) path: section/p
-#: C/write.page:28
+#: C/write.page:68
 msgid ""
-"You can attach a file to a message you're writing in either of these ways:"
-msgstr "K napsané zprávě můžete přiložit soubory a to následujícími způsoby:"
+"Geary's email composer lets you use text styles such as <em>bold</em> and "
+"<em>italic</em>, indent text to quote it, and links to web pages. Simply "
+"select the text and click the appropriate button on the formatting toolbar "
+"at the bottom of the composer area."
+msgstr ""
+"V Geary v editoru zpráv můžete používat různé styly textu, jako <em>tučný"
+"</em> nebo <em>kurzíva</em>, odsazení citací a odkazy na webové stránky. "
+"Stačí text vybrat a pak kliknout na příslušné tlačítko na nástrojové liště v "
+"dolní části editoru."
 
-#. (itstool) path: item/p
-#: C/write.page:30
+#. (itstool) path: section/p
+#: C/write.page:74
 msgid ""
-"Press the <gui>Attach File</gui> button at the lower left of the composer "
-"window, then select a file to attach."
+"Bulleted and numbered lists can be inserted or removed by clicking the <gui "
+"style=\"button\">Bulleted list</gui> and <gui style=\"button\">Numbered "
+"list</gui> buttons on the formatting toolbar. The level of indentation of "
+"list items can be adjusted using the <gui style=\"button\">Indent</gui> and "
+"<gui style=\"button\">Un-indent</gui> formatting toolbar buttons."
 msgstr ""
-"Zmáčkněte tlačítko <gui>Přiložit soubor</gui> v levém dolním rohu okna "
-"editoru a následně vyberte soubor, který chcete přiložit."
+"Seznamy s odrážkami a číslované seznamy lze vytvářet a rušit kliknutím na "
+"<gui style=\"button\">Seznam s odrážkami</gui> a <gui style=\"button\">"
+"Číslovaný seznam</gui> na nástrojové liště formátování. Úroveň odsazení "
+"položek seznamu se dá upravit pomocí tlačítek <gui style=\"button\">Osadit"
+"</gui> a <gui style=\"button\">Zrušit odsazení</gui> na téže liště."
 
-#. (itstool) path: item/p
-#: C/write.page:32
+#. (itstool) path: section/p
+#: C/write.page:81
 msgid ""
-"Drag the file from the Nautilus file manager to the composer window, and "
-"drop it either on the text fields at the top of the window or on the toolbar "
-"at the bottom."
+"Images can be inserted into rich text messages by clicking the <gui style="
+"\"button\">Insert Image</gui> button on the formatting toolbar and selecting "
+"the image to attach, by dragging an image from the <gui>Files</gui> "
+"application into the email body and then dropping it, or by pasting an image "
+"that has been copied to the clipboard from another application."
 msgstr ""
-"Přetáhněte soubor ze správce souborů Nautilus do okna editoru a upusťte jej "
-"buď na textových polích v horní části okna nebo na nástrojové liště dole."
+"Obrázky se do formátovaného textu vkládají kliknutím na tlačítko <gui style="
+"\"button\">Vložit obrázek</gui> na nástrojové liště formátování a následným "
+"vybráním obrázku, nebo přetažením obrázku z aplikace <gui>Soubory</gui> do "
+"těla zprávy a následným upuštěním, a nebo vložením obrázku ze schránky, kam "
+"jste jej předtím zkopírovali z jiné aplikace."
+
+#. (itstool) path: section/p
+#: C/write.page:88
+msgid ""
+"Documents, music, videos, and other files can be attached to the email by "
+"clicking the <gui style=\"button\">Attach File</gui> button at the bottom of "
+"the composer window and selecting the document to attach, or by dragging a "
+"file from the <gui>Files</gui> application to the composer window, and "
+"dropping it either on the text fields at the top of the window or on the "
+"toolbar at the bottom."
+msgstr ""
+"Dokumenty, hudbu, videa a další soubory lze do e-mailu připojit jako přílohu "
+"kliknutím na tlačítko <gui style=\"button\">Přiložit soubor</gui> v dolní "
+"části okna editoru a následným vybráním souboru, který chcete přiložit. Nebo "
+"můžete soubor přetáhnout z aplikace <gui>Soubory</gui> do okna editoru a tam "
+"jej upustit buď na některé z textových polí v horní části okna nebo na "
+"nástrojovou lištu v dolní části."
 
 #. (itstool) path: section/p
-#: C/write.page:36
+#: C/write.page:96
 msgid ""
 "A number of keyboard shortcuts are available in the composer; see <link xref="
 "\"shortcuts\"/> for details."
@@ -1192,41 +1360,126 @@ msgstr ""
 "xref=\"shortcuts\"/>."
 
 #. (itstool) path: section/p
-#: C/write.page:38
+#: C/write.page:99
 msgid ""
-"You may specify a signature to be inserted into the composer in the <link "
-"xref=\"accounts\"/> dialog."
+"You may specify a signature to be inserted into the footer of email in the "
+"composer via the <link xref=\"accounts\"/> dialog."
 msgstr ""
-"V dialogovém okně <link xref=\"accounts\"/> můžete zadat patičku, která se "
-"bude vkládat do editoru."
+"V dialogovém okně <link xref=\"accounts\"/> v editoru můžete vytvořit podpis, "
+"který se bude vkládat do patičky e-mailu."
 
 #. (itstool) path: section/title
-#: C/write.page:43
-msgid "Drafts"
-msgstr "Koncepty"
+#: C/write.page:104
+msgid "Checking spelling"
+msgstr "Kontrola pravopisu"
 
 #. (itstool) path: section/p
-#: C/write.page:45
+#: C/write.page:106
+msgid ""
+"Geary supports spell-checking your composed email in one or more languages, "
+"as you type. To enable spell-checking, first ensure your computer has spell-"
+"check dictionaries installed for the desired languages. Consult your "
+"computer's help to determine how to install dictionaries if not present."
+msgstr ""
+"Geary podporuje kontrolu pravopisu během psaní e-mailu v jednom či více "
+"jazycích. Když ji chcete zapnout, nejprve si ověřte, že máte v počítači "
+"nainstalované slovníky pro kontrolu pravopisu v požadovaných jazycích. Pokud "
+"je nemáte, najdete v nápovědě svého systému, jak slovníky nainstalovat."
+
+#. (itstool) path: section/p
+#: C/write.page:112
+msgid ""
+"To select languages for spell-checking, click the <gui style=\"button"
+"\">Spell check</gui> button on the formatting toolbar, and the language "
+"selection popover will appear. Click on a language in the list to toggle it "
+"on or off, and click the <gui style=\"button\">-</gui> button to remove it "
+"from the list. If a language does not appear in the list, search for it by "
+"typing its name in the search box, then click the <gui style=\"button\">+</"
+"gui> button to add it."
+msgstr ""
+"Pro vybrání kontrolovaného jazyka klikněte na tlačítko <gui style=\"button"
+"\">Vybrat jazyk pro kontrolu pravopisu</gui> na nástrojové liště formátování "
+"a objeví se vyskakovací dialogové okno s výběrem jazyka. Kliknutím na jazyk v "
+"seznamu jej povolíte nebo zakážete a kliknutím na tlačítko <gui style=\""
+"button\">-</gui> jej ze seznamu odeberete pryč. Jestliže se jazyk v seznamu "
+"nenachází, vyhledejte jej zapsáním jeho názvu do vyhledávacího pole a pak jej "
+"kliknutím na tlačítko <gui style=\"button\">+</gui> přidejte."
+
+#. (itstool) path: section/title
+#: C/write.page:123
+msgid "Saving drafts and restoring discarded messages"
+msgstr "Ukládání konceptů a obnovování zahozených zpráv"
+
+#. (itstool) path: section/p
+#: C/write.page:125
 msgid ""
 "For mail servers that support drafts, Geary will automatically save the "
-"message as you type. If you close the composer without sending, Geary will "
-"prompt you to keep the draft or to discard it."
+"message as you type on the server after a short delay."
 msgstr ""
-"Na serverech, které podporují koncepty, ukládá Gerary zprávy automaticky "
-"během psaní. Pokud zavřete okno editoru, aniž byste zprávu odeslali, Geary "
-"se vás dotáže, jestli má zprávu uchovat v konceptech nebo ji zahodit."
+"Na poštovních serverech, které podporují koncepty, ukládá Gerary zprávy "
+"automaticky v krátkých intervalech během psaní na dotyčný server."
 
 #. (itstool) path: section/p
-#: C/write.page:48
+#: C/write.page:129
 msgid ""
-"To edit an existing draft, select the Drafts folder in the folder list, "
-"select the message, and click \"Edit Draft\" in the message viewer."
+"To edit an existing draft, select the <gui>Drafts</gui> folder in the folder "
+"list, select the message, and click \"Edit Draft\" in the conversation "
+"viewer."
 msgstr ""
-"Až chcete ve psaní stávajícího konceptu pokračovat, vyberte v seznamu složek "
-"složku Koncepty, vyberte zprávu a klikněte v prohlížeči zpráv na „Upravit "
-"koncept“ ."
+"Když chcete pokračovat ve psaní stávajícího konceptu, vyberte v seznamu "
+"složek složku <gui>Koncepty</gui>, vyberte zprávu a klikněte v prohlížeči "
+"konverzací na „Upravit koncept“ ."
 
 #. (itstool) path: section/p
-#: C/write.page:51
-msgid "Geary deletes the draft when you send the message."
+#: C/write.page:133
+msgid "Geary will delete the draft when you send the message."
 msgstr "Po odeslání zprávy Geary koncept smaže."
+
+#. (itstool) path: note/p
+#: C/write.page:136
+msgid ""
+"If you save or discard a composed email, you can re-open it by clicking <gui "
+"style=\"button\">Undo</gui> on the pop-up notification that appears or by "
+"typing <keyseq><key>Ctrl</key><key>Z</key></keyseq>. Composers can be "
+"reopened for up to 30 minutes after they are closed. After that, you will "
+"need to re-open the message via the <gui>Drafts</gui> folder, if present."
+msgstr ""
+"Když uložíte nebo zahodíte rozepsaný e-mail, můžete jej znovu otevřít "
+"kliknutím na <gui style=\"button\">Zpět</gui> ve vyskakovacím upozornění, "
+"které se objeví, nebo zmáčknkutím <keyseq><key>Ctrl</key><key>Z</key>"
+"</keyseq>. Editor lze znovu otevřít do 30 minut od chvíle, kdy byl zavřen. Po "
+"uplynutí této doby již musíte zprávu znovu otevřít jedině ze složky <gui>"
+"Koncepty</gui>, pokud se tam nachází."
+
+#. (itstool) path: section/title
+#: C/write.page:146
+msgid "Plain text messages"
+msgstr "Čistě textové zprávy"
+
+#. (itstool) path: section/p
+#: C/write.page:148
+msgid ""
+"Geary can also send plain text messages. Press the <gui style=\"button"
+"\">More options</gui> button at the end of the bottom toolbar, then choose "
+"\"Rich Text\" or \"Plain Text\". Plain text mode is useful when sending "
+"email to mailing lists that prohibit rich text (HTML) messages, or when "
+"sending email to people that do no use modern clients like Geary."
+msgstr ""
+"Geary může odesílat také zprávy v podobě prostého textu. Zmáčkněte tlačítko "
+"<gui style=\"button\">Další volby</gui> na konci dolní nástrojové lišty a pak "
+"si vyberte mezi „Formátovaným textem“ nebo „Prostým textem“. Prostý text se "
+"hodí, když posíláte e-mail do poštovní konference, které často zprávy s "
+"formátovaným textem (HTML) zakazují, nebo když posíláte zprávy lidem, kteří "
+"nemají takový moderní poštovní program, jako je Geary."
+
+#. (itstool) path: section/p
+#: C/write.page:155
+msgid ""
+"In plain text mode, text will be automatically wrapped using soft line "
+"breaks so that it is no longer than 74 characters wide, and indented text "
+"will be wrapped and quoted using a “&gt;” character for each level of "
+"quoting."
+msgstr ""
+"V režimu prostého textu bude text automaticky zalamován pomocí měkkého "
+"zalomení tak, aby nebyl širší než 74 zanků, a odsazený text bude uvozen "
+"pomocí znaku „&gt;“ pro každou úroveň odsazení."
diff --git a/po/cs.po b/po/cs.po
index 61689282..99bdd31a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,14 +5,14 @@
 #
 # Translators:
 # petr.simacek <petr.simacek@gmail.com>, 2012, 2013.
-# Marek Černocký <marek@manet.cz>, 2014, 2015, 2016, 2017, 2018, 2019.
+# Marek Černocký <marek@manet.cz>, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2019-09-27 12:57+0000\n"
-"PO-Revision-Date: 2019-10-01 17:48+0200\n"
+"POT-Creation-Date: 2020-08-29 01:59+0000\n"
+"PO-Revision-Date: 2020-10-11 00:33+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -32,9 +32,10 @@ msgstr "Odeslat soubory pomocí 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/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
@@ -45,9 +46,9 @@ msgstr "E-mail"
 
 #. 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/geary-application.vala:31
+#: src/client/application/application-client.vala:33
 msgid "Send and receive email"
 msgstr "Odesílejte a přijímejte e-maily"
 
@@ -57,11 +58,11 @@ msgid "Email;E-mail;Mail;"
 msgstr "email;e-mail;mail;pošta;e-pošta;zpráva;zprávy;"
 
 #. 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 "Vývojářský tým aplikace 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 +72,7 @@ msgstr ""
 "soustředí na konverzace jako celek. Umožňuje číst, vyhledávat a odesílat e-"
 "maily v přímočarém a moderním prostředí."
 
-#: 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,41 +80,41 @@ msgstr ""
 "Díky zaměření na konverzace můžete číst ucelené diskuze bez nutnosti "
 "vyhledávat jednotlivé navazující zprávy a klikat na ně."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "Mezi funkcemi aplikace Geary najdete:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Rychlé nastavení poštovní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 "Zobrazení souvisejících zprávy dohromady v podobě konverzace"
 
-#: 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 "Rychlé vyhledávání v celém textu a na základě klíčových slov"
 
-#: 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ý editor zpráv v HTML i prostém textu"
 
-#: 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 "Upozornění na nové zprávy přímo v uživatelském prostředí"
 
-#: 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 "Kompatibilitu s GMail, Yahoo! Mail, Outlook.com a dalšími servery 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 "Geary zobrazující konverzaci"
 
 #. 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 "Geary se zobrazeným editorem formátovaného textu"
 
@@ -126,6 +127,10 @@ msgstr "pošta;mail;e-mail;elektronická pošta;imap;gmail;yahoo;hotmail;outlook
 msgid "Compose Message"
 msgstr "Napsat zprávu"
 
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "Nové okno"
+
 #: desktop/org.gnome.Geary.gschema.xml:8
 msgid "Maximize window"
 msgstr "Maximalizované okno"
@@ -186,34 +191,56 @@ msgid "True if the folder list Paned is in the horizontal orientation."
 msgstr "Zapnuto, když má být panel se seznamem složek otočený vodorovně."
 
 #: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Show/hide formatting toolbar"
+msgstr "Zobrazovat/skrývat lištu nástrojů pro formátování"
+
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "True if the formatting toolbar in the composer is shown."
+msgstr ""
+"Zapnuto, když je v editoru zobrazená nástrojová lišta s formátovacími "
+"nástroji."
+
+#: desktop/org.gnome.Geary.gschema.xml:56
 msgid "Position of message list pane"
 msgstr "Umístění panelu se seznamem zprávy"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:57
 msgid "Position of the message list Paned grabber."
 msgstr "Umístění úchytu panelu se seznamem zpráv."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
+#: desktop/org.gnome.Geary.gschema.xml:62
 msgid "Autoselect next message"
 msgstr "Automatický výběr další zprávy"
 
-#: desktop/org.gnome.Geary.gschema.xml:57
+#: desktop/org.gnome.Geary.gschema.xml:63
 msgid "True if we should autoselect the next available conversation."
 msgstr "Zapnuto, pokud se má automaticky vybírat další dostupná konverzace."
 
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:68
 msgid "Display message previews"
 msgstr "Zobrazit náhledy zpráv"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:69
 msgid "True if we should display a short preview of each message."
 msgstr "Zapnuto, když se má zobrazovat krátký náhled u jednotlivých zpráv."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Use single key shortcuts"
+msgstr "Používat jednoklávesové zkratky"
+
+#: desktop/org.gnome.Geary.gschema.xml:75
+msgid ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
+msgstr ""
+"Pro činnosti s e-maily pouvolit klávesové zkratky, které nepotřebují "
+"zmáčknutí <Ctrl>, aby se tak emulovalo chování Gmailu."
+
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Languages that shall be used in the spell checker"
 msgstr "Jazyky používané v kontrole pravopisu"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: desktop/org.gnome.Geary.gschema.xml:83
 msgid ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
@@ -222,11 +249,11 @@ msgstr ""
 "vypnutou kontrolu pravopisu a prázdná hodnota (null) znamená použití "
 "výchozího nastavení z uživatelského prostředí."
 
-#: desktop/org.gnome.Geary.gschema.xml:76
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Languages that are displayed in the spell checker popover"
 msgstr "Jazyky zobrazované ve vyskakovací nabídce kontroly pravopisu"
 
-#: desktop/org.gnome.Geary.gschema.xml:77
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
@@ -234,37 +261,37 @@ msgstr ""
 "Seznam jazyků, které se mají zobrazit ve vyskakovací nabídce kontroly "
 "pravopisu."
 
-#: desktop/org.gnome.Geary.gschema.xml:82
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Notify of new mail at startup"
 msgstr "Upozorňovat na novou poštu při spuštění"
 
-#: desktop/org.gnome.Geary.gschema.xml:83
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "True to notify of new mail at startup."
 msgstr "Zapnuto, když se má upozorňovat na novou poštu při spuštění aplikace."
 
-#: desktop/org.gnome.Geary.gschema.xml:88
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
 msgstr "Dotazovat se při otevírání přílohy"
 
-#: desktop/org.gnome.Geary.gschema.xml:89
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid "True to ask when opening an attachment."
 msgstr "Zapnuto, pokud máte být dotazováni, když otevíráte přílohu."
 
-#: desktop/org.gnome.Geary.gschema.xml:94
+#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
 msgstr "Zda psát e-maily v HTML"
 
-#: desktop/org.gnome.Geary.gschema.xml:95
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
 "Zapnuto, když se mají vytvářet e-maily ve formátu HTML, vypnuto, když v "
 "prostém textu."
 
-#: desktop/org.gnome.Geary.gschema.xml:100
+#: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
 msgstr "Strategie pro hledání v celém textu"
 
-#: desktop/org.gnome.Geary.gschema.xml:101
+#: desktop/org.gnome.Geary.gschema.xml:115
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
@@ -272,27 +299,58 @@ msgstr ""
 "sada variant hledaného výrazu a drobné rozdíly ve shodě), „aggresive“ (širší "
 "sada variant a větší rozdíly ve shodě) a „horizon“ (všechny varianty výrazu)."
 
-#: desktop/org.gnome.Geary.gschema.xml:106
+#: desktop/org.gnome.Geary.gschema.xml:120
 msgid "Zoom of conversation viewer"
 msgstr "Příblížení zobrazení konverzace"
 
-#: desktop/org.gnome.Geary.gschema.xml:107
+#: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
 msgstr "Přiblížení, které se má použit při zobrazení konverzace."
 
-#: desktop/org.gnome.Geary.gschema.xml:112
+#: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
 msgstr "Velikost odpojeného okno pro psaní zprávy"
 
-#: desktop/org.gnome.Geary.gschema.xml:113
+#: desktop/org.gnome.Geary.gschema.xml:127
 msgid "The last recorded size of the detached composer window."
 msgstr "Poslední zaznamenaná velikost odpojeného okna pro psaní zprávy."
 
-#: desktop/org.gnome.Geary.gschema.xml:118
+#: desktop/org.gnome.Geary.gschema.xml:132
+msgid "Undo sending email delay"
+msgstr "Prodleva pro zrušení odeslání e-mailu"
+
+#: desktop/org.gnome.Geary.gschema.xml:133
+msgid ""
+"The number of seconds to wait before sending an email. Set to zero or less "
+"to disable."
+msgstr ""
+"Počet sekund, po které se bude čekat s odesláním e-mailu, aby bylo možné akci "
+"vzít zpět. Nastavením na nulu nebo méně se tato možnost zakáže."
+
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr "Doba zobrazení stručného upozornění"
+
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr ""
+"Množství času v sekundách, po které se budou zobrazovat stručná upozornění."
+
+#: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr "Seznam volitelných zásuvných modulů"
+
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Zásuvné moduly na tomto seznamu budou načteny při spuštění."
+
+#: desktop/org.gnome.Geary.gschema.xml:152
 msgid "Whether we migrated the old settings"
 msgstr "Zda bylo přeneseno staré nastavení"
 
-#: desktop/org.gnome.Geary.gschema.xml:119
+#: desktop/org.gnome.Geary.gschema.xml:153
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -302,25 +360,25 @@ msgstr ""
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:204
+#: src/client/accounts/accounts-editor.vala:210
 msgid "Failed to store certificate"
 msgstr "Selhalo uložení certifikátu"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:109
+#: src/client/accounts/accounts-editor-add-pane.vala:108
 msgid "All others"
 msgstr "Všechny ostatní"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:196
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-add-pane.vala:195
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
 msgid "Check your receiving login and password"
 msgstr "Zkontrolujte své přihlašovací jméno a heslo pro příjem"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:211
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-add-pane.vala:210
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
 msgid "Check your receiving server details"
 msgstr "Zkontrolujte údaje přijimacího serveru"
 
@@ -329,51 +387,51 @@ msgstr "Zkontrolujte údaje přijimacího serveru"
 #. succeeded, so the user probably needs to
 #. specify custom creds here
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:233
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-add-pane.vala:232
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
 msgid "Check your sending login and password"
 msgstr "Zkontrolujte své přihlašovací jméno a heslo pro odesílání"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:247
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-add-pane.vala:246
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
 msgid "Check your sending server details"
 msgstr "Zkontrolujte údaje odesilacího serveru"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:262
+#: src/client/accounts/accounts-editor-add-pane.vala:261
 msgid "Check your email address and password"
 msgstr "Zkontrolujte svoji e-mailovou adresu a heslo"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:273
+#: src/client/accounts/accounts-editor-add-pane.vala:272
 msgid "Could not connect, check your network"
 msgstr "Nelze se připojit, zkontrolujte svoji síť"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:286
+#: src/client/accounts/accounts-editor-add-pane.vala:285
 msgid "An unexpected problem occurred"
 msgstr "Vyskytl se neočekávaný problém"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:304
+#: src/client/accounts/accounts-editor-add-pane.vala:303
 #, c-format
 msgid "Account not created: %s"
 msgstr "Účet nebyl vytvořen: %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:551
+#: src/client/accounts/accounts-editor-add-pane.vala:558
 msgid "Your name"
 msgstr "Vaše jméno"
 
 #. Translators: Label used for the address part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:568
-#: src/client/accounts/accounts-editor-edit-pane.vala:501
+#: src/client/accounts/accounts-editor-add-pane.vala:575
+#: src/client/accounts/accounts-editor-edit-pane.vala:513
 msgid "Email address"
 msgstr "E-mailová adresa"
 
@@ -382,8 +440,8 @@ msgstr "E-mailová adresa"
 #. Translators: This is used as a placeholder for the
 #. address part of an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:571
-#: src/client/accounts/accounts-editor-edit-pane.vala:469
+#: src/client/accounts/accounts-editor-add-pane.vala:579
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
 msgid "person@example.com"
 msgstr "osoba@priklad.cz"
 
@@ -391,15 +449,15 @@ msgstr "osoba@priklad.cz"
 #. when adding an account
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:585
-#: src/client/accounts/accounts-editor-servers-pane.vala:880
+#: src/client/accounts/accounts-editor-add-pane.vala:593
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
 msgid "Login name"
 msgstr "Přihlašovací jméno"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:599
-#: src/client/accounts/accounts-editor-servers-pane.vala:999
+#: src/client/accounts/accounts-editor-add-pane.vala:607
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Heslo"
@@ -408,14 +466,14 @@ msgstr "Heslo"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:621
-#: src/client/accounts/accounts-editor-servers-pane.vala:727
+#: src/client/accounts/accounts-editor-add-pane.vala:629
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "IMAP server"
 msgstr "Server IMAP"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:624
+#: src/client/accounts/accounts-editor-add-pane.vala:632
 msgid "imap.example.com"
 msgstr "imap.priklad.cz"
 
@@ -423,20 +481,20 @@ msgstr "imap.priklad.cz"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:630
-#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#: src/client/accounts/accounts-editor-add-pane.vala:638
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
 msgid "SMTP server"
 msgstr "Server SMTP"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:633
+#: src/client/accounts/accounts-editor-add-pane.vala:641
 msgid "smtp.example.com"
 msgstr "smtp.priklad.cz"
 
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:278
+#: src/client/accounts/accounts-editor-edit-pane.vala:277
 #: ui/accounts_editor_remove_pane.ui:123
 msgid "Account name"
 msgstr "Název účtu"
@@ -445,46 +503,46 @@ msgstr "Název účtu"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:312
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "Změnit název účtu zpět na „%s“"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:336
+#: src/client/accounts/accounts-editor-edit-pane.vala:342
 msgid "Add a new sender email address"
 msgstr "Přidat novou e-mailovou adresu odesilatele"
 
 #. Translators: Label used to indicate the user has
 #. provided no display name for one of their sender
 #. email addresses in their account settings.
-#: src/client/accounts/accounts-editor-edit-pane.vala:417
+#: src/client/accounts/accounts-editor-edit-pane.vala:423
 msgid "Name not set"
 msgstr "Název není nastavený"
 
 #. Translators: This is used as a placeholder for the
 #. display name for an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:456
+#: src/client/accounts/accounts-editor-edit-pane.vala:464
 msgid "Sender Name"
 msgstr "Jméno odesilatele"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
 msgid "Remove"
 msgstr "Odebrat"
 
 #. Translators: Label used for the display name part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:494
+#: src/client/accounts/accounts-editor-edit-pane.vala:506
 msgid "Sender name"
 msgstr "Jméno odesilatele"
 
 #. Translators: Label used as the undo tooltip after adding an
 #. new sender email address to an account. The string
 #. substitution is the email address added.
-#: src/client/accounts/accounts-editor-edit-pane.vala:561
+#: src/client/accounts/accounts-editor-edit-pane.vala:573
 #, c-format
 msgid "Remove “%s”"
 msgstr "Odebrat „%s“"
@@ -492,7 +550,7 @@ msgstr "Odebrat „%s“"
 #. Translators: Label used as the undo tooltip after editing a
 #. sender address for an account. The string substitution is
 #. the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:601
+#: src/client/accounts/accounts-editor-edit-pane.vala:613
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "Vrátit změny na „%s“"
@@ -500,7 +558,7 @@ msgstr "Vrátit změny na „%s“"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:688
+#: src/client/accounts/accounts-editor-edit-pane.vala:700
 #, c-format
 msgid "Add “%s” back"
 msgstr "Přidat zpět „%s“"
@@ -508,14 +566,14 @@ msgstr "Přidat zpět „%s“"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:730
+#: src/client/accounts/accounts-editor-edit-pane.vala:742
 msgid "Undo signature changes"
 msgstr "Vrátit zpět změny v podpisu"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:778
+#: src/client/accounts/accounts-editor-edit-pane.vala:790
 msgid "Download mail"
 msgstr "Stahovat e-maily"
 
@@ -524,44 +582,44 @@ msgstr "Stahovat e-maily"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:810
+#: src/client/accounts/accounts-editor-edit-pane.vala:822
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Změnit stahované období zpět na %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:831
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
 msgid "Everything"
 msgstr "Vše"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:835
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "2 weeks back"
 msgstr "2 týdny zpětně"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:839
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 month back"
 msgstr "1 měsíc zpětně"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "3 months back"
 msgstr "3 měsíce zpětně"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "6 months back"
 msgstr "6 měsíců zpětně"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
 msgid "1 year back"
 msgstr "1 rok zpětně"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
 msgid "2 years back"
 msgstr "2 roky zpětně"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
 msgid "4 years back"
 msgstr "4 roky zpětně"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:865
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
@@ -569,55 +627,55 @@ msgstr[0] "%d den zpětně"
 msgstr[1] "%d dny zpětně"
 msgstr[2] "%d dní zpětně"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:248
-#: src/client/application/application-controller.vala:2370
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2061
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:257
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2044
 msgid "Redo"
 msgstr "Znovu"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:351
-#: src/client/accounts/accounts-editor-list-pane.vala:439
+#: src/client/accounts/accounts-editor-list-pane.vala:358
+#: 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:355
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: 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:359
-#: src/client/accounts/accounts-editor-list-pane.vala:447
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: 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:377
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has been disabled"
 msgstr "Tento účet byl zakázán"
 
 #. 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:386
+#: src/client/accounts/accounts-editor-list-pane.vala:397
 msgid "This account has encountered a problem and is unavailable"
 msgstr "U tohoto účtu účtu se objevil problém a proto je nedostupný"
 
-#. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:436
+#: src/client/accounts/accounts-editor-list-pane.vala:466
 msgid "Other email providers"
 msgstr "Jiný poskytovatel e-mailu"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:553
+#: src/client/accounts/accounts-editor-list-pane.vala:572
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Účet „%s“ byl odebrán"
@@ -625,7 +683,7 @@ msgstr "Účet „%s“ byl odebrán"
 #. 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:560
+#: src/client/accounts/accounts-editor-list-pane.vala:579
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Účet „%s“ byl obnoven"
@@ -638,66 +696,66 @@ msgstr "Položku můžete přesunout přetažením"
 #. 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 "Poskytovatel 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čení připojení"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:479
-#: src/client/accounts/accounts-editor-servers-pane.vala:752
-#: src/client/accounts/accounts-editor-servers-pane.vala:964
-#: src/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 "Žádné"
 
-#: 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/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 "Přihlášení"
 
 #. 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 "přihlášení není zapotřebí"
 
 #. 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žívat stejné přihlášení jako pro příjem"
 
 #. 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žívat jiné přihlášení"
 
 #. 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 nebyl aktualizován: %s"
@@ -705,23 +763,23 @@ msgstr "Účet nebyl aktualizován: %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 "Původ úč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 on-line 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 "Ukládat koncepty zpráv na server"
 
 #. 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 "Ukládat odeslané zpravy na server"
 
@@ -730,338 +788,179 @@ msgstr "Ukládat odeslané zpravy na server"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:950
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s pomocí OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:960
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
 msgid "Use receiving server login"
 msgstr "Používat přihlášení přijimacího serveru"
 
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/application-controller.vala:59
+#: src/client/application/application-attachment-manager.vala:21
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#. / Notification title.
-#: src/client/application/application-controller.vala:532
-#, c-format
-msgid "A problem occurred sending email for %s"
-msgstr "Vyskytl se problém při odesílání pošty z účtu %s"
-
-#. / Notification body
-#: src/client/application/application-controller.vala:536
-msgid "Email will not be sent until re-connected"
-msgstr "Dokud se znovu nepřipojíte, nebudou se odesílat zprávy."
-
-#: src/client/application/application-controller.vala:887
-msgid "Labels"
-msgstr "Štítky"
-
-#. give the user two options: reset the Account local store, or exit Geary.  A third
-#. could be done to leave the Account in an unopened state, but we don't currently
-#. have provisions for that.
-#: src/client/application/application-controller.vala:900
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "Nelze otevřít databázi pro %s"
-
-#: src/client/application/application-controller.vala:901
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronize with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
-msgstr ""
-"Došlo k chybě při otevírání místní databáze e-mailů pro tento účet. Je to "
-"možná kvůli poškození databázového souboru v této složce:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary může znovu sestavit databázi a synchronizovat ji se serverem nebo "
-"skončit.\n"
-"\n"
-"Opětovné sestavení databáze zničí všechny místně uložené e-maily a jejich "
-"přílohy <b>Na e-maily na vašem serveru to nebude mít vliv.</b>"
-
-#: src/client/application/application-controller.vala:903
-msgid "_Rebuild"
-msgstr "Znovu _sestavit"
-
-#: src/client/application/application-controller.vala:903
-msgid "E_xit"
-msgstr "S_končit"
-
-#: src/client/application/application-controller.vala:912
-#, c-format
-msgid "Unable to rebuild database for “%s”"
-msgstr "Nelze znovu sestavit databázi pro „%s“"
-
-#: src/client/application/application-controller.vala:913
-#, c-format
-msgid ""
-"Error during rebuild:\n"
-"\n"
-"%s"
-msgstr ""
-"Chyba při opětovném sestavení:\n"
-"\n"
-"%s"
-
-#: src/client/application/application-controller.vala:1703
-#, c-format
-msgid "Moved %d message to %s"
-msgid_plural "Moved %d messages to %s"
-msgstr[0] "Byla přesunuta %d zpráva do složky %s"
-msgstr[1] "Byly přesunuty %d zprávy do složky %s"
-msgstr[2] "Bylo přesunutu %d zpráv do složky %s"
-
-#: src/client/application/application-controller.vala:1713
-msgid "Are you sure you want to open these attachments?"
-msgstr "Opravdu chcete otevřít tuto přílohu?"
-
-#: src/client/application/application-controller.vala:1714
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Příloha by po otevření mohla poškodit váš počítač. Otevírejte pouze soubory "
-"z důvěryhodných zdrojů. "
-
-#: src/client/application/application-controller.vala:1715
-msgid "Don’t _ask me again"
-msgstr "Příště se nept_at"
-
-#. Translators: Dialog primary label when prompting to
-#. overwrite a file. The string substitution is the file'sx
-#. name.
-#: src/client/application/application-controller.vala:1838
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Soubor s názvem „%s“ již existuje. Chcete ho nahradit?"
 
-#. Translators: Dialog secondary label when prompting to
-#. overwrite a file. The string substitution is the parent
-#. folder's name.
-#: src/client/application/application-controller.vala:1845
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr "Soubor již existuje v „%s“. Nahrazením přepíšete jeho obsah."
 
-#: src/client/application/application-controller.vala:1849
+#: src/client/application/application-attachment-manager.vala:236
 msgid "_Replace"
 msgstr "Nah_radit"
 
-#: src/client/application/application-controller.vala:2209
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Vyprázdnit všechny zprávy z vaší složky %s?"
-
-#: src/client/application/application-controller.vala:2210
-msgid "This removes the email from Geary and your email server."
-msgstr "Tímto se odstraní pošta z aplikace Geary i z poštovního serveru."
-
-#: src/client/application/application-controller.vala:2211
-msgid "This cannot be undone."
-msgstr "Nebude možné to vrátit zpět."
-
-#: src/client/application/application-controller.vala:2212
-#, c-format
-msgid "Empty %s"
-msgstr "Vyprázdnit %s"
-
-#: src/client/application/application-controller.vala:2229
-#, c-format
-msgid "Error emptying %s"
-msgstr "Chyba při vyprazďňování složky %s"
-
-#: src/client/application/application-controller.vala:2260
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Chcete trvale smazat tuto zprávu?"
-msgstr[1] "Chcete trvale smazat tyto zprávy?"
-msgstr[2] "Chcete trvale smazat tyto zprávy?"
-
-#: src/client/application/application-controller.vala:2262
-msgid "Delete"
-msgstr "Smazat"
-
-#: src/client/application/application-controller.vala:2276
-#, c-format
-msgid "Trashed %d message"
-msgid_plural "Trashed %d messages"
-msgstr[0] "Byla vyhozen %d zpráva do koše"
-msgstr[1] "Byla vyhozeny %d zprávy do koše"
-msgstr[2] "Bylo vyhozeno %d zpráv do koše"
-
-#: src/client/application/application-controller.vala:2323
-#, c-format
-msgid "Archived %d message"
-msgid_plural "Archived %d messages"
-msgstr[0] "Byla archovována %d zpráva"
-msgstr[1] "Byly archovovány %d zprávy"
-msgstr[2] "Bylo archovováno %d zprá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:2452
-#, c-format
-msgid "Successfully sent mail to %s."
-msgstr "Byl úspěšně odeslán e-mail na %s."
-
-#: src/client/application/application-controller.vala:2531
-msgid "Failed to open default text editor."
-msgstr "Nepodařilo se otevřít výchozí textový editor."
-
-#: src/client/application/geary-application.vala:32
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:33
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "© 2016 - 2019 Vývojářský tým aplikace Geary"
+#: src/client/application/application-client.vala:35
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "© 2016 - 2020 Vývojářský tým aplikace Geary"
 
-#: src/client/application/geary-application.vala:35
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Navštívit webové stránky Geary"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:110
+#: src/client/application/application-client.vala:97
 msgid "Print debug logging"
 msgstr "Vypisovat ladicí záznamy"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:113
+#: src/client/application/application-client.vala:100
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Spustit se skrytým hlavním oknem (zavrženo)"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:116
+#: src/client/application/application-client.vala:103
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Povolit inspektora WebKitGTK v zobrazeních formátovaných pomocí HTML"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:119
+#: src/client/application/application-client.vala:106
 msgid "Log conversation monitoring"
 msgstr "Zaznamenávat sledování konverzace"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:122
+#: src/client/application/application-client.vala:109
 msgid "Log IMAP network deserialization"
 msgstr "Zaznamenávat síťové deserializace protokolu IMAP"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/geary-application.vala:126
+#: src/client/application/application-client.vala:113
 msgid "Log folder normalization"
 msgstr "Zaznamenávat normalizace složky"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:129
-msgid "Log network activity"
-msgstr "Zaznamenávat aktivity sítě"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:132
-msgid "Log periodic activity"
-msgstr "Zaznamenávat opakující se aktivity"
+#: src/client/application/application-client.vala:116
+msgid "Log IMAP network activity"
+msgstr "Zaznamenávat síťové aktivity IMAP"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
 #. / also be called the IMAP events queue.
-#: src/client/application/geary-application.vala:137
+#: src/client/application/application-client.vala:121
 msgid "Log IMAP replay queue"
 msgstr "Zaznamenávat frontu událostí IMAP"
 
-#. / Command line option. Serialization is how commands and
-#. / responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/geary-application.vala:142
-msgid "Log IMAP network serialization"
-msgstr "Zaznamenávat síťové serializace protokolu IMAP"
+#. / Command line option
+#: src/client/application/application-client.vala:124
+msgid "Log SMTP network activity"
+msgstr "Zaznamenávat síťové aktivity SMTP"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:145
+#: src/client/application/application-client.vala:127
 msgid "Log database queries (generates lots of messages)"
 msgstr "Zaznamenávat databázové dotazy (generuje velké množství zpráv)"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:148
+#: src/client/application/application-client.vala:130
 msgid "Perform a graceful quit"
 msgstr "Korektně ukončit"
 
+#: src/client/application/application-client.vala:132
+msgid "Open a new window"
+msgstr "Otevřít nové okno"
+
 #. / Command line option
-#: src/client/application/geary-application.vala:151
+#: src/client/application/application-client.vala:135
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Odvolat všechny spjaté serverové certifikáty TLS"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:154
+#: src/client/application/application-client.vala:138
 msgid "Display program version"
 msgstr "Zobrazit verzi programu"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:285
+#: src/client/application/application-client.vala:262
 msgid "Geary version"
 msgstr "Verze Geary"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:287
+#: src/client/application/application-client.vala:264
 msgid "Geary revision"
 msgstr "Revize Geary"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:289
+#: src/client/application/application-client.vala:266
 msgid "GTK version"
 msgstr "Verze GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/geary-application.vala:296
+#: src/client/application/application-client.vala:273
 msgid "GLib version"
 msgstr "Verze GLib"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:303
+#: src/client/application/application-client.vala:280
 msgid "WebKitGTK version"
 msgstr "Verze WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:310
+#: src/client/application/application-client.vala:287
 msgid "Desktop environment"
 msgstr "Uživatelské prostředí"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/geary-application.vala:312
-#: src/client/conversation-viewer/conversation-email.vala:159
+#: src/client/application/application-client.vala:289
+#: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Neznámý"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:342
+#: src/client/application/application-client.vala:293
 msgid "Distribution name"
 msgstr "Název distribuce"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:347
+#: src/client/application/application-client.vala:298
 msgid "Distribution release"
 msgstr "Vydání distribuce"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:355
+#: src/client/application/application-client.vala:303
 msgid "Installation prefix"
 msgstr "Prefix instalace"
 
-#: src/client/application/geary-application.vala:515
+#: src/client/application/application-client.vala:559
 #, c-format
 msgid "About %s"
 msgstr "O aplikaci %s"
@@ -1069,7 +968,7 @@ msgstr "O aplikaci %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/geary-application.vala:519
+#: src/client/application/application-client.vala:563
 msgid "translator-credits"
 msgstr ""
 "Petr Šimáček <petr.simacek@gmail.com>\n"
@@ -1077,133 +976,439 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/geary-application.vala:841
+#: src/client/application/application-client.vala:1047
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "Volba „--hidden“ je zavržená a v budoucnu bude odstraněna."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/geary-application.vala:873
+#: src/client/application/application-client.vala:1080
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Nerozpoznaný argument aplikace: „%s“"
 
-#: src/client/components/components-inspector.vala:68
-msgid "Inspector"
-msgstr "Inspektor"
-
-#. / Translators: Title for Inspector logs pane
-#. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:77
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:91
-msgid "Logs"
-msgstr "Záznamy"
+#. / Notification title.
+#: src/client/application/application-controller.vala:479
+#, c-format
+msgid "A problem occurred sending email for %s"
+msgstr "Vyskytl se problém při odesílání pošty z účtu %s"
 
-#. / Translators: Title for Inspector system system information pane
-#. / Translators: Title for problem report system information
-#. / pane
-#: src/client/components/components-inspector.vala:81
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:94
-msgid "System"
-msgstr "Systém"
+#. / Notification body
+#: src/client/application/application-controller.vala:483
+msgid "Email will not be sent until re-connected"
+msgstr "Dokud se znovu nepřipojíte, nebudou se odesílat zprávy."
 
-#. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:198
-#: src/client/components/components-inspector.vala:201
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:210
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:213
-#: ui/problem-details-dialog.ui:42
-msgid "Save As"
-msgstr "Uložit jako"
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:582
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Konverzace byla označena"
+msgstr[1] "Konverzace byly označeny"
+msgstr[2] "Konverzace byly označeny"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:588
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Označení konverzace bylo zrušeno"
+msgstr[1] "Označení konverzací bylo zrušeno"
+msgstr[2] "Označení konverzací bylo zrušeno"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: 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"
+msgstr[0] "Konverzace byla přesunuta do složky %s"
+msgstr[1] "Konverzace byly přesunuty do složky %s"
+msgstr[2] "Konverzace byly přesunuty do složky %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the source folder.
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
+#, c-format
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "Konverzace byla obnovena do složky %s"
+msgstr[1] "Konverzace byly obnoveny do složky %s"
+msgstr[2] "Konverzace byly obnoveny do složky %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:665
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "Konverzace byla archivována"
+msgstr[1] "Konverzace byly archivovány"
+msgstr[2] "Konverzace byly archivovány"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:721
+#, c-format
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "Zpráva byla obnovena do složky %s"
+msgstr[1] "Zprávy byly obnoveny do složky %s"
+msgstr[2] "Zprávy byly obnoveny do složky %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:742
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "Zpráva byla archivována"
+msgstr[1] "Zpráva byly archivovány"
+msgstr[2] "Zpráva byly archivovány"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:777
+#, c-format
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "Zpráva byla přesunuta do složky %s"
+msgstr[1] "Zprávy byly přesunuty do složky %s"
+msgstr[2] "Zprávy byly přesunuty do složky %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:805
+#, c-format
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "Konverzaci byl přiřazen štítek %s"
+msgstr[1] "Konverzacím byl přiřazen štítek %s"
+msgstr[2] "Konverzacím byl přiřazen štítek %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:813
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] "Konverzaci byl odebrán štítek %s"
+msgstr[1] "Konverzacím byl odebrán štítek %s"
+msgstr[2] "Konverzacím byl odebrán štítek %s"
 
-#: src/client/components/components-inspector.vala:202
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:214
-#: ui/accounts_editor_servers_pane.ui:17
-msgid "Cancel"
-msgstr "Zrušit"
+#: src/client/application/application-controller.vala:1320
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "Nelze otevřít databázi pro %s"
 
-#. Translators: Tooltip used when an entry requires a valid
-#. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:378
-msgid "An email address is required"
-msgstr "Je vyžadována e-mailová adresa"
+#: src/client/application/application-controller.vala:1321
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronize with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
+msgstr ""
+"Došlo k chybě při otevírání místní databáze e-mailů pro tento účet. Je to "
+"možná kvůli poškození databázového souboru v této složce:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary může znovu sestavit databázi a synchronizovat ji se serverem nebo "
+"skončit.\n"
+"\n"
+"Opětovné sestavení databáze zničí všechny místně uložené e-maily a jejich "
+"přílohy <b>Na e-maily na vašem serveru to nebude mít vliv.</b>"
 
-#. Translators: Tooltip used when an entry requires a valid
-#. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:382
-msgid "Not a valid email address"
-msgstr "E-mailová adresa není platná"
+#: src/client/application/application-controller.vala:1323
+msgid "_Rebuild"
+msgstr "Znovu _sestavit"
 
-#. Translators: Tooltip used when an entry requires a valid,
-#. resolvable server name to be entered, but one is not
-#. provided.
-#: src/client/components/components-validator.vala:428
-msgid "A server name is required"
-msgstr "Je vyžadován název serveru"
+#: src/client/application/application-controller.vala:1323
+msgid "E_xit"
+msgstr "S_končit"
 
-#. Translators: Tooltip used when an entry requires a valid
-#. server name to be entered, but it was unable to be
-#. looked-up in the DNS.
-#: src/client/components/components-validator.vala:433
-msgid "Could not look up server name"
-msgstr "Nelze najít název serveru"
+#: src/client/application/application-controller.vala:1333
+#, c-format
+msgid "Unable to rebuild database for “%s”"
+msgstr "Nelze znovu sestavit databázi pro „%s“"
 
-#: src/client/components/main-toolbar.vala:139
-msgid "Mark conversation"
-msgid_plural "Mark conversations"
-msgstr[0] "Označit konverzaci"
-msgstr[1] "Označit konverzace"
-msgstr[2] "Označit konverzace"
+#: src/client/application/application-controller.vala:1334
+#, c-format
+msgid ""
+"Error during rebuild:\n"
+"\n"
+"%s"
+msgstr ""
+"Chyba při opětovném sestavení:\n"
+"\n"
+"%s"
 
-#: src/client/components/main-toolbar.vala:144
-msgid "Add label to conversation"
-msgid_plural "Add label to conversations"
-msgstr[0] "Přiřadit konverzaci štítek"
-msgstr[1] "Přiřadit konverzacím štítek"
-msgstr[2] "Přiřadit konverzacím štítek"
+#. / 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:1501
+#, c-format
+msgid "Email sent to %s"
+msgstr "E-mail pro příjemce %s byl odeslán"
 
-#: src/client/components/main-toolbar.vala:149
-msgid "Move conversation"
-msgid_plural "Move conversations"
-msgstr[0] "Přesunout konverzaci"
-msgstr[1] "Přesunout konverzace"
-msgstr[2] "Přesunout konverzace"
+#. / 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:2491
+#, c-format
+msgid "Email to %s queued for delivery"
+msgstr "E-mail pro příjemce %s byl zařazen do doručovací fronty"
 
-#: src/client/components/main-toolbar.vala:154
-msgid "Archive conversation"
-msgid_plural "Archive conversations"
-msgstr[0] "Archivovat konverzaci (A)"
-msgstr[1] "Archivovat konverzace (A)"
-msgstr[2] "Archivovat konverzace (A)"
+#. / 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:2555
+#, c-format
+msgid "Email to %s saved"
+msgstr "E-mail pro příjemce %s byl uložen"
+
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
+msgid "Composer could not be restored"
+msgstr "Nezdařílo se obnovit předchozí stav editoru"
+
+#. / 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:2613
+#, c-format
+msgid "Email to %s discarded"
+msgstr "E-mail pro příjemce %s byl zahozen"
 
-#: src/client/components/main-toolbar.vala:163
-msgid "Move conversation to Trash"
-msgid_plural "Move conversations to Trash"
-msgstr[0] "Přesunout konverzaci"
-msgstr[1] "Přesunout konverzace"
-msgstr[2] "Přesunout konverzace"
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:540
+msgid "Working offline"
+msgstr "Pracuje se v režimu odpojení"
 
-#: src/client/components/main-toolbar.vala:171
-msgid "Delete conversation"
-msgid_plural "Delete conversations"
-msgstr[0] "Vymazat konverzaci"
-msgstr[1] "Vymazat konverzace"
-msgstr[2] "Vymazat konverzace"
+#. 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 "Dokud se znovu nepřipojíte, nebudete moci odesílat a přijímat e-maily."
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:549
+msgid "Login problem"
+msgstr "Problém s přihlášení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 oznámil nesprávné přihlašovací jméno nebo 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 "Zkusit znovu přihlásit, budete dotázáni na heslo"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:565
+msgid "Security problem"
+msgstr "Problém se 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 oznámil nedůvěryhodný server."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:570
+msgid "Check"
+msgstr "Zkontrolovat"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:574
+msgid "Check the security details for the connection"
+msgstr "Zkontrolovat údaje zabezpečení pro připojení"
+
+#. / 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:617
+#, c-format
+msgid "%s — %s"
+msgstr "%s — %s"
+
+#. 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 "Štítky"
+
+#: src/client/application/application-main-window.vala:1293
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Vyprázdnit všechny zprávy z vaší složky %s?"
+
+#: src/client/application/application-main-window.vala:1294
+msgid "This removes the email from Geary and your email server."
+msgstr "Tímto se odstraní pošta z aplikace Geary i z poštovního serveru."
+
+#: src/client/application/application-main-window.vala:1295
+msgid "This cannot be undone."
+msgstr "Nebude možné to vrátit zpět."
+
+#: src/client/application/application-main-window.vala:1296
+#, c-format
+msgid "Empty %s"
+msgstr "Vyprázdnit %s"
+
+#. / Translators: Primary text for a confirmation dialog
+#: 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 trvale smazat tuto konverzaci?"
+msgstr[1] "Chcete trvale smazat tyto konverzace?"
+msgstr[2] "Chcete trvale smazat tyto konverzace?"
 
-#: src/client/components/main-window.vala:738
+#: src/client/application/application-main-window.vala:1358
+#: src/client/application/application-main-window.vala:1373
+msgid "Delete"
+msgstr "Smazat"
+
+#. / Translators: Primary text for a confirmation dialog
+#: 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 trvale smazat tuto zprávu?"
+msgstr[1] "Chcete trvale smazat tyto zprávy?"
+msgstr[2] "Chcete trvale smazat tyto zprávy?"
+
+#: src/client/application/application-main-window.vala:1691
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: src/client/components/components-attachment-pane.vala:107
+#: src/client/composer/composer-widget.vala:1784
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/client/components/components-attachment-pane.vala:379
+msgid "Are you sure you want to open these attachments?"
+msgstr "Opravdu chcete otevřít tuto přílohu?"
+
+#: src/client/components/components-attachment-pane.vala:380
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Příloha by po otevření mohla poškodit váš počítač. Otevírejte pouze soubory "
+"z důvěryhodných zdrojů. "
+
+#: src/client/components/components-attachment-pane.vala:381
+msgid "Don’t _ask me again"
+msgstr "Příště se nept_at"
+
+#: src/client/components/components-inspector.vala:78
+msgid "Inspector"
+msgstr "Inspektor"
+
+#. / Translators: Title for Inspector logs pane
+#. / Translators: Title for problem report dialog logs pane
+#: 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: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: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žit jako"
+
+#: 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šit"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:124
+msgid "_Automatically select next message"
+msgstr "_Automaticky vybírat další zprávu"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:134
+msgid "_Display conversation preview"
+msgstr "_Zobrazovat náhled konverzace"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:144
+msgid "Use _three pane view"
+msgstr "Používat _třípanelové zobrazení"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:154
+msgid "Use _single key email shortcuts"
+msgstr "Používat pro e-maily jednokláve_sové zkratky"
+
+#: src/client/components/components-preferences-window.vala:156
+msgid ""
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
+msgstr ""
+"Pro činnosti s e-maily povolit klávesové zkratky, které nepotřebují zmáčknout "
+"<Ctrl>"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:167
+msgid "_Watch for new mail when closed"
+msgstr "S_ledovat novou poštu při zavřené aplikaci"
+
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:171
+msgid "Geary will keep running after all windows are closed"
+msgstr "Aplikace Geary zůstane po zavření všech oken spuštěná na pozadí"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:189
+msgid "Preferences"
+msgstr "Předvolby"
+
+#. / 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/main-window-info-bar.vala:44
+#: src/client/components/components-problem-report-info-bar.vala:36
 msgid "Account problem"
 msgstr "Problém s účtem"
 
 #. 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
+#: src/client/components/components-problem-report-info-bar.vala:40
 #, c-format
 msgid "Geary has encountered a problem with %s."
 msgstr "Aplikace Geary narazila na problém s účtem %s."
@@ -1211,81 +1416,147 @@ msgstr "Aplikace Geary narazila na problém s účtem %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
+#: src/client/components/components-problem-report-info-bar.vala:53
 #, c-format
 msgid "Geary encountered a problem checking mail for %s."
 msgstr "Aplikace Geary narazila na problém při kontrole pošty na účtu %s."
 
 #. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:65
+#: src/client/components/components-problem-report-info-bar.vala:57
 msgid "Try reconnecting"
 msgstr "Zkusit znovu připojit"
 
 #. Translators: Info bar title for an outgoing
 #. account problem. String substitution is the
 #. account name
-#: src/client/components/main-window-info-bar.vala:73
+#: src/client/components/components-problem-report-info-bar.vala:65
 #, c-format
 msgid "Geary encountered a problem sending email for %s."
 msgstr "Aplikace Geary narazila na problém při odesílání pošty z účtu %s."
 
 #. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:77
+#: src/client/components/components-problem-report-info-bar.vala:69
 msgid "Retry sending queued messages"
 msgstr "Zkusit znovu odeslat frontu zpráv"
 
 #. Translators: Info bar title for a generic application
 #. problem.
-#: src/client/components/main-window-info-bar.vala:84
+#: src/client/components/components-problem-report-info-bar.vala:76
 msgid "Geary has encountered a problem"
 msgstr "Aplikace Geary narazila na problém"
 
 #. Translators: Info bar sub-title for a generic
 #. application problem.
-#: src/client/components/main-window-info-bar.vala:88
+#: src/client/components/components-problem-report-info-bar.vala:80
 msgid "Please report the details if it persists."
 msgstr "Pokud bude problém přetrvávat, nahlaste jej prosím."
 
 #. Translators: Button label for viewing technical details
 #. for a problem report.
-#: src/client/components/main-window-info-bar.vala:99
+#: src/client/components/components-problem-report-info-bar.vala:94
 msgid "_Details"
 msgstr "Po_drobnosti"
 
 #. Translators: Tooltip for viewing technical details for
 #. a problem report.
-#: src/client/components/main-window-info-bar.vala:102
+#: src/client/components/components-problem-report-info-bar.vala:97
 msgid "View technical details about the error"
 msgstr "Zobrazit technické podrobnosti o chybě"
 
 #. Translators: Button label for retrying a server
 #. connection
-#: src/client/components/main-window-info-bar.vala:108
+#: src/client/components/components-problem-report-info-bar.vala:103
 msgid "_Retry"
 msgstr "Zkusit z_novu"
 
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:38
-#: src/engine/api/geary-special-folder-type.vala:51
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/client/util/util-i18n.vala:298
 msgid "Search"
 msgstr "Hledat"
 
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Prohledat všechny e-maily v účtu podle klíčového slova (Ctrl+S)"
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+msgid "Search all mail in account for keywords"
+msgstr "Prohledat všechny e-maily v účtu podle klíčového slova"
 
-#: src/client/components/search-bar.vala:83
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexuje se účet %s"
-
-#: src/client/components/search-bar.vala:110
-#: src/client/folder-list/folder-list-search-branch.vala:39
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
 #, c-format
 msgid "Search %s account"
 msgstr "Prohledat úč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:394
+msgid "An email address is required"
+msgstr "Je vyžadována e-mailová 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:398
+msgid "Not a valid email address"
+msgstr "E-mailová adresa není platná"
+
+#. 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:444
+msgid "A server name is required"
+msgstr "Je vyžadován název 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:449
+msgid "Could not look up server name"
+msgstr "Nelze najít název serveru"
+
+#: src/client/components/main-toolbar.vala:116
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Označit konverzaci"
+msgstr[1] "Označit konverzace"
+msgstr[2] "Označit konverzace"
+
+#: src/client/components/main-toolbar.vala:121
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Přiřadit konverzaci štítek"
+msgstr[1] "Přiřadit konverzacím štítek"
+msgstr[2] "Přiřadit konverzacím štítek"
+
+#: src/client/components/main-toolbar.vala:126
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Přesunout konverzaci"
+msgstr[1] "Přesunout konverzace"
+msgstr[2] "Přesunout konverzace"
+
+#: src/client/components/main-toolbar.vala:131
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Archivovat konverzaci (A)"
+msgstr[1] "Archivovat konverzace (A)"
+msgstr[2] "Archivovat konverzace (A)"
+
+#: src/client/components/main-toolbar.vala:142
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Přesunout konverzaci"
+msgstr[1] "Přesunout konverzace"
+msgstr[2] "Přesunout konverzace"
+
+#: src/client/components/main-toolbar.vala:152
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Vymazat konverzaci"
+msgstr[1] "Vymazat konverzace"
+msgstr[2] "Vymazat konverzace"
+
 #. / 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…"
@@ -1306,7 +1577,9 @@ msgstr "Chyba při ukládání odeslané pošty"
 msgid "_OK"
 msgstr "_Budiž"
 
-#: 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šit"
 
@@ -1324,17 +1597,19 @@ msgstr "_Zavřít"
 
 #: src/client/components/stock.vala:24
 msgid "_Discard"
-msgstr "_Vyřadit"
+msgstr "Zaho_dit"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "Nápo_věda"
 
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: 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 "_Otevřít"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "_Předvolby"
 
@@ -1351,47 +1626,58 @@ msgstr "U_končit"
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
 msgid "_Save"
 msgstr "_Uložit"
 
 #: src/client/components/stock.vala:32
 msgid "_Keep"
-msgstr "_Zachovat"
+msgstr "Z_achovat"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Vybrat barvu"
+
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com"
 msgstr "Adresa URL odkazu není ve správném formátu, např. http://example.com"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Neplatná adresa URL odkazu"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Neplatná e-mailová adresa"
 
-#: src/client/composer/composer-widget.vala:156
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:32
+msgid "New Message"
+msgstr "Nová zpráva"
+
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "Uloženo"
 
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
 msgstr "Ukládá se"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "Chyba při ukládání"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "Citaci smažete zmáčknutím Backspace"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. characters, that suggest an attachment; since this is full-word
-#. checking, include all variants of each word.  No spaces are
-#. allowed.
-#: src/client/composer/composer-widget.vala:168
+#. checking, include all variants of each word. No spaces are
+#. allowed. The words will be converted to lower case based on
+#. locale and English versions included automatically.
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1403,143 +1689,119 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1181
+#: src/client/composer/composer-widget.vala:862
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Chcete tento koncept zprávy zachovat nebo zahodit?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1211
+#: src/client/composer/composer-widget.vala:888
 msgid "Do you want to discard this draft message?"
 msgstr "Chcete zahodit tento koncept zprávy?"
 
-#: src/client/composer/composer-widget.vala:1330
+#: src/client/composer/composer-widget.vala:1440
 msgid "Send message with an empty subject and body?"
 msgstr "Poslat zprávu s prázdným předmětem a tělem?"
 
-#: src/client/composer/composer-widget.vala:1332
+#: src/client/composer/composer-widget.vala:1442
 msgid "Send message with an empty subject?"
 msgstr "Poslat zprávu s prázdným předmětem?"
 
-#: src/client/composer/composer-widget.vala:1334
+#: src/client/composer/composer-widget.vala:1444
 msgid "Send message with an empty body?"
 msgstr "Poslat zprávu s prázdným tělem?"
 
-#: src/client/composer/composer-widget.vala:1338
+#: src/client/composer/composer-widget.vala:1453
 msgid "Send message without an attachment?"
 msgstr "Poslat zprávu bez přílohy?"
 
-#: src/client/composer/composer-widget.vala:1652
+#: src/client/composer/composer-widget.vala:1772
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "Soubor „%s“ už byl pro doručení přiložen."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. description of the document type, the second will
-#. be a human-friendly size string. For example:
-#. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1660
-#: src/client/conversation-viewer/conversation-email.vala:173
+#: src/client/composer/composer-widget.vala:1804
+#: src/client/composer/composer-widget.vala:1854
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” is an empty file."
+msgstr "Soubor „%s“ je prázdný."
 
-#: src/client/composer/composer-widget.vala:1697
+#: src/client/composer/composer-widget.vala:1842
 #, c-format
 msgid "“%s” could not be found."
 msgstr "Soubor „%s“ nebyl nalezen."
 
-#: src/client/composer/composer-widget.vala:1703
+#: src/client/composer/composer-widget.vala:1848
 #, c-format
 msgid "“%s” is a folder."
 msgstr "„%s“ je složka."
 
-#: src/client/composer/composer-widget.vala:1709
-#, c-format
-msgid "“%s” is an empty file."
-msgstr "Soubor „%s“ je prázdný."
-
-#: src/client/composer/composer-widget.vala:1722
+#: src/client/composer/composer-widget.vala:1867
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "Soubor „%s“ se nezdařilo otevřít pro čtení."
 
-#: src/client/composer/composer-widget.vala:1730
+#: src/client/composer/composer-widget.vala:1875
 msgid "Cannot add attachment"
 msgstr "Nelze připojit přílohu"
 
+#. 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:1787
-#: src/client/conversation-viewer/conversation-email.vala:976
-#: src/client/util/util-email.vala:216 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:2010
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Komu:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1793
-#: src/client/conversation-viewer/conversation-email.vala:981
-#: src/client/util/util-email.vala:221 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:2016
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Kopie:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1799
-#: src/client/conversation-viewer/conversation-email.vala:986
+#: src/client/composer/composer-widget.vala:2022
+#: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1805
+#: src/client/composer/composer-widget.vala:2028
 msgid "Reply-To: "
 msgstr "Odpověď:"
 
-#: src/client/composer/composer-widget.vala:1945
-msgid "Select Color"
-msgstr "Vybrat barvu"
-
 #. 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:2137
+#: src/client/composer/composer-widget.vala:2146
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s přes %2$s"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2192
-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:2472
-msgid "Images"
-msgstr "Obrázky"
-
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "Nová zpráva"
-
-#: src/client/composer/spell-check-popover.vala:108
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Odebrat tento jazyk ze seznamu upřednostňovaných"
 
-#: src/client/composer/spell-check-popover.vala:112
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Přidat tento jazyk do seznamu upřednostňovaných"
 
-#: src/client/composer/spell-check-popover.vala:199
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Vyhledat další jazyky"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:337
+#: src/client/conversation-list/conversation-list-view.vala:339
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Přesunou_t konverzaci do koše"
@@ -1547,45 +1809,45 @@ msgstr[1] "Přesunou_t konverzace do koše"
 msgstr[2] "Přesunou_t konverzace do koše"
 
 #. / 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] "Vy_mazat konverzaci"
 msgstr[1] "Vy_mazat konverzace"
 msgstr[2] "Vy_mazat konverzace"
 
-#: src/client/conversation-list/conversation-list-view.vala:356
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Označit jako _přečtené"
 
-#: src/client/conversation-list/conversation-list-view.vala:359
+#: src/client/conversation-list/conversation-list-view.vala:372
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Označit jako _nepřečtené"
 
-#: src/client/conversation-list/conversation-list-view.vala:362
+#: src/client/conversation-list/conversation-list-view.vala:380
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "O_debrat hvězdičku"
 
-#: src/client/conversation-list/conversation-list-view.vala:364
+#: src/client/conversation-list/conversation-list-view.vala:387
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Hvězdička"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:367
+#: src/client/conversation-list/conversation-list-view.vala:396
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "O_dpovědět všem"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:369
+#: src/client/conversation-list/conversation-list-view.vala:408
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Přeposlat"
@@ -1595,69 +1857,105 @@ msgid "Me"
 msgstr "Já"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:971
-#: src/client/util/util-email.vala:207
+#: src/client/conversation-viewer/conversation-email.vala: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:991
-#: src/client/util/util-email.vala:212
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:245
 msgid "Date:"
 msgstr "Datum:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:1001
-#: src/client/util/util-email.vala:210
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:243
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/client/conversation-viewer/conversation-message.vala:129
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr "Tato e-mailová adresa může být falešná"
 
+#. 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 "Zobrazit méně"
+
+#. 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 ""
+
 #. 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:447
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Bez odesilatele"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:840
+#: 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:960
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Obrázek"
 
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "Vzdálené obrázky nejsou zobrazené"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr "Vzdálené obrázky se zobrazují jen od odesilatelů, kterým důvěřujete."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+msgid "Show"
+msgstr "Zobrazit"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+msgid "Always show from sender"
+msgstr "Vždy zobrazovat odesílatele"
+
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:82
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
 msgstr "Nebyla vybrána žádná konverzace"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:86
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Konverzace vybraná v seznamu se objeví zde"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
 msgstr "Je vybráno více konverzací"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:99
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "Když zvolíte nějakou činnost, použije se na všechny vybrané konverzace"
 
@@ -1665,20 +1963,20 @@ msgstr "Když zvolíte nějakou činnost, použije se na všechny vybrané konve
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:108
-#: src/client/conversation-viewer/conversation-viewer.vala:121
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 msgid "No conversations found"
 msgstr "Nebyla nalezena žádná konverzace"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:112
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 msgid "This folder does not contain any conversations"
 msgstr "Tato složka neobsahuje žádnou konverzaci"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:125
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Hledání nevrátilo žádný výsledek, zkuste upravit podmínky"
 
@@ -1768,8 +2066,8 @@ msgstr "Při zpracování certifikátu serveru nastala chyba"
 #. / Translators: Title for problem report dialog error
 #. / information pane
 #. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:89
-#: ui/problem-details-dialog.ui:12
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -1780,8 +2078,10 @@ msgstr "Podrobnosti"
 msgid "Geary requires your email password to continue"
 msgstr "Aby se mohlo pokračovat, potřebuje Geary heslo k vašemu e-mailu"
 
-#. 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"
@@ -1789,8 +2089,10 @@ msgstr[0] "%d zpráva"
 msgstr[1] "%d zprávy"
 msgstr[2] "%d zpráv"
 
-#. / 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"
@@ -1798,10 +2100,12 @@ msgstr[0] "%d nepřečtená"
 msgstr[1] "%d nepřečtené"
 msgstr[2] "%d nepřečtených"
 
-#. / 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"
@@ -1810,7 +2114,7 @@ msgstr "%s, %s"
 msgid "Inboxes"
 msgstr "Schránky"
 
-#: src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -1818,9 +2122,34 @@ msgstr[0] "%d výsledek"
 msgstr[1] "%d výsledky"
 msgstr[2] "%d výsledků"
 
-#. / 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 další nová zpráva)"
+msgstr[1] ""
+"%s\n"
+"(%d další nové zprávy)"
+msgstr[2] ""
+"%s\n"
+"(%d dalších nových zpráv)"
+
+#. / 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"
@@ -1828,10 +2157,13 @@ msgstr[0] "%d nová zpráva"
 msgstr[1] "%d nové zprávy"
 msgstr[2] "%d nových zpráv"
 
-#. / 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"
@@ -1839,29 +2171,180 @@ msgstr[0] "%s, %d nová zpráva celkem"
 msgstr[1] "%s, %d nové zprávy celkem"
 msgstr[2] "%s, %d nových zpráv celkem"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d další nová zpráva pro %s)"
-msgstr[1] ""
-"%s\n"
-"(%d další nové zprávy pro %s)"
-msgstr[2] ""
-"%s\n"
-"(%d dalších nových zpráv pro %s)"
+#. / 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á zpráva"
+msgstr[1] "Nové zprávy"
+msgstr[2] "Nové zprávy"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+msgid "Email Templates"
+msgstr "Šablony e-mailů"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Vytvářejte znovupoužitelné šablony pro odesílání e-mailů"
+
+#. 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 "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr "Šablony | Šabony zpráv | Šablony e-mailů"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Šablony"
+
+#. 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 "šablona zprávy"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+msgid "Send"
+msgstr "Odeslat"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#. 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 "Upravit"
+
+#. / 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 "Hromadná pošta"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr ""
+"Vyplňujte a odesílejte hromadné e-maily pomocí šablon a dat z tabulkového "
+"kalkulátoru"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Spustit"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Pozastavit"
+
+#. 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 "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] "Odeslána %u z %u"
+msgstr[1] "Odeslány %u z %u"
+msgstr[2] "Odesláno %u z %u"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr "Šablona hromadné pošty"
+
+#. 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 "Sloučit"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "Vložit pole"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Hodnoty oddělené čárkou (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Nabídka konverzace"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Zobrazuje v Unity v upozornění na nový e-mail nabídku konverzace"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s – nové zprávy"
 
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+msgid "Sent Sound"
+msgstr "Zvuk při odeslání"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr "Přehraje systémový zvuk „Odeslán e-mail“ když je odeslána zpráva"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "Vyprázdnit"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Koncept zprávy"
+
+#. 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 "Tato zpráva zatím nebyla odeslána."
+
+#. 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 "Zpráva není 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 "Tato zpráva byla úspěšně odeslána, ale nebyla uložena do vašeho úč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
@@ -1932,41 +2415,46 @@ 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. %d %Y v %-l∶%M %p"
 
-#. / 24 hours format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:220
+#. / 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 v %-k∶%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 v %-k∶%M"
 
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:948
-msgid "(no subject)"
+#. 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 předmětu)"
 
-#. Translators: This is shown for displaying a list of
-#. email recipients that happens to be empty,
-#. i.e. contains no email addresses.
-#: src/client/util/util-email.vala:116
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:148
 msgid "(No recipients)"
 msgstr "(bez příjemců)"
 
-#. Translators: This is used for displaying a short list of
-#. email recipients lists with two or more addresses. The
-#. first (string) substitution is address of the first, the
-#. second substitution is the number of n - 1 remaining
-#. recipients.
-#: src/client/util/util-email.vala:130
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / addresses. The first (string) substitution is
+#. / address of the first, the second substitution is
+#. / the number of n - 1 remaining recipients.
+#: src/client/util/util-email.vala:160
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -1977,26 +2465,26 @@ msgstr[2] "%s a %d dalších"
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: src/client/util/util-email.vala:160
+#: src/client/util/util-email.vala:193
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "%2$s napsal %1$s:"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:167
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "%s wrote:"
 msgstr "%s napsal:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:173
+#: src/client/util/util-email.vala:206
 #, c-format
 msgid "On %s:"
 msgstr "%s:"
 
-#: src/client/util/util-email.vala:202
+#: src/client/util/util-email.vala:235
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Přeposlaná zpráva ----------"
 
@@ -2024,43 +2512,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"
+msgstr "Doručené"
 
-#: 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"
-msgstr "Odeslaná pošta"
+#: src/client/util/util-i18n.vala:277
+msgid "Sent"
+msgstr "Odeslané"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "S hvězdič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šechny zprávy"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Nevyžádaná"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
+msgstr "Nevyžádané"
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Koš"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "K odeslání"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Archiv"
 
@@ -2077,7 +2565,7 @@ msgstr "Archiv"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:73
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "příloha"
@@ -2090,7 +2578,7 @@ msgstr "příloha"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:82
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "skrytá kopie"
@@ -2102,7 +2590,7 @@ msgstr "skrytá kopie"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:90
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "tělo"
@@ -2115,7 +2603,7 @@ msgstr "tělo"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:99
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "kopie"
@@ -2128,7 +2616,7 @@ msgstr "kopie"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:108
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr "od"
@@ -2140,7 +2628,7 @@ msgstr "od"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:116
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr "je"
@@ -2152,7 +2640,7 @@ msgstr "je"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:124
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "předmět"
@@ -2165,7 +2653,7 @@ msgstr "předmět"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:133
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr "komu"
@@ -2178,7 +2666,7 @@ msgstr "komu"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:154
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "já"
@@ -2190,7 +2678,7 @@ msgstr "já"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:166
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "já"
@@ -2202,7 +2690,7 @@ msgstr "já"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:178
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "přečtená"
@@ -2215,7 +2703,7 @@ msgstr "přečtená"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:189
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "s hvězdičkou"
@@ -2227,7 +2715,7 @@ msgstr "s hvězdičkou"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:199
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "nepřečtená"
@@ -2236,7 +2724,7 @@ msgstr "nepřečtená"
 #. 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:953
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
 msgid "Drafts | Draft"
 msgstr ""
 "Drafts | Koncepty | Koncept | Rozepsané | Rozepsané zprávy | Rozepsané e-"
@@ -2246,22 +2734,22 @@ msgstr ""
 #. 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:962
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Sent | Odeslané | Odeslaná pošta  | Odeslané zprávy | Odeslané 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:967
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Odeslaná 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:977
+#. 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"
@@ -2273,13 +2761,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:987
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Trash | Koš | Smazané | Smazané zprávy | Smazaná pošta"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:992
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Smazaná pošta"
@@ -2288,23 +2776,37 @@ msgstr "Smazaná 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:1002
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgid "Archive | Archives"
 msgstr "Archiv | Archív | Archivy | Archívy | Archive | Archives"
 
+#: src/engine/rfc822/rfc822-message.vala:528
+#, c-format
+msgid "Could not determine mime type for “%s”."
+msgstr "Nezdařilo se určit typ MIME pro „%s“"
+
+#: src/engine/rfc822/rfc822-message.vala:539
+#, c-format
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr "Nezdařilo se určit typ obsahu pro typ MIME „%s“ u „%s“"
+
+#: src/engine/rfc822/rfc822-message.vala:1013
+msgid "(no subject)"
+msgstr "(bez předmětu)"
+
 #: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Přidat účet"
 
 #: ui/accounts_editor_add_pane.ui:53
-msgid "Create"
-msgstr "Vytvořit"
+msgid "_Create"
+msgstr "_Vytvořit"
 
-#: 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 "Příjem"
 
-#: 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 "Odesílání"
 
@@ -2393,263 +2895,313 @@ msgstr "_Důvěřovat tomuto serveru"
 msgid "_Don’t Trust This Server"
 msgstr "_Nedůvěřovat tomuto serveru"
 
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "Odpojit (Ctrl+D)"
+#: ui/composer-editor.ui:100
+msgid "Bold text"
+msgstr "Tučně"
 
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "Přiložit soubor (Ctrl+T)"
+#: ui/composer-editor.ui:124
+msgid "Italic text"
+msgstr "Kurzívou"
 
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "Vložit původní přílohy"
+#: ui/composer-editor.ui:148
+msgid "Underline text"
+msgstr "Podtrhnout"
 
-#: ui/composer-headerbar.ui:202
-msgid "_Send"
-msgstr "_Odeslat"
+#: ui/composer-editor.ui:172
+msgid "Strikethrough text"
+msgstr "Přeškrtnout"
 
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "Odeslat (Ctrl+Enter)"
+#: ui/composer-editor.ui:205
+msgid "Insert bulleted list"
+msgstr "Seznam s odrážkami"
 
-#: ui/composer-headerbar.ui:230
-msgid "Discard and Close"
-msgstr "Zahodit a zavřít"
+#: ui/composer-editor.ui:229
+msgid "Insert numbered list"
+msgstr "Číslovaný seznam"
 
-#: ui/composer-headerbar.ui:254
-msgid "Save and Close"
-msgstr "Uložit a zavřít"
+#: ui/composer-editor.ui:262
+msgid "Indent or quote text"
+msgstr "Odsadit nebo citovat"
 
-#. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:41
-msgid "Insert the new link with this URL"
-msgstr "Vložit nový odkaz s touto adresou URL"
+#: ui/composer-editor.ui:286
+msgid "Un-indent or unquote text"
+msgstr "Zrušit odsazení nebo citaci"
 
-#: ui/composer-link-popover.ui:52
-msgid "Link URL"
-msgstr "Adresa URL odkazu"
+#: ui/composer-editor.ui:315
+msgid "Remove text formatting"
+msgstr "Odstranit formátování"
 
-#. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
-msgid "Update this link’s URL"
-msgstr "Aktualizovat tuto adresu URL odkazu"
+#: ui/composer-editor.ui:334
+msgid "Change font type"
+msgstr "Změnit font"
 
-#: ui/composer-link-popover.ui:86
-msgid "Delete this link"
-msgstr "Smazat tento odkaz"
+#: ui/composer-editor.ui:349
+msgid "Sans Serif"
+msgstr "Bezpatkové"
+
+#: ui/composer-editor.ui:360
+msgid "Serif"
+msgstr "Patkové"
+
+#: ui/composer-editor.ui:371
+msgid "Fixed Width"
+msgstr "Pevná šířka"
+
+#: ui/composer-editor.ui:397
+msgid "Change font color"
+msgstr "Změnit barvu textu"
+
+#: ui/composer-editor.ui:412
+msgid "Change font size"
+msgstr "Změnit velikost textu"
+
+#: ui/composer-editor.ui:447
+msgid "Insert or update text link"
+msgstr "Vložit nebo aktualizovat textový odkaz"
+
+#: ui/composer-editor.ui:471
+msgid "Insert an image"
+msgstr "Vložit obrázek"
+
+#: ui/composer-editor.ui:513
+msgid "Undo last edit"
+msgstr "Zpět poslední úpravu"
+
+#: ui/composer-editor.ui:537
+msgid "Redo last edit"
+msgstr "Znovu poslední úpravu"
+
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
+msgid "Attach a file"
+msgstr "Přiložit soubor"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Otevřít tento odkaz"
+#: ui/composer-editor.ui:615
+msgid "Add original attachments"
+msgstr "Přidat původní přílohy"
 
-#: ui/composer-menus.ui:7
+#: ui/composer-editor.ui:660
+msgid "More options"
+msgstr "Další volby"
+
+#: ui/composer-editor.ui:680
+msgid "Show formatting toolbar"
+msgstr "Zobrazovat nástrojovou lištu formátování"
+
+#: ui/composer-editor.ui:698
+msgid "Select spell checking languages"
+msgstr "Vybrat jazyky pro kontrolu pravopisu"
+
+#: ui/composer-editor.ui:723
 msgid "S_ans Serif"
 msgstr "B_ezpatkové"
 
-#: ui/composer-menus.ui:12
+#: ui/composer-editor.ui:728
 msgid "S_erif"
 msgstr "P_atkové"
 
-#: ui/composer-menus.ui:17
+#: ui/composer-editor.ui:733
 msgid "_Fixed Width"
 msgstr "_Pevná šířka"
 
-#: ui/composer-menus.ui:24
+#: ui/composer-editor.ui:743
 msgid "_Small"
 msgstr "_Malé"
 
-#: ui/composer-menus.ui:29
+#: ui/composer-editor.ui:748
 msgid "_Medium"
 msgstr "_Střední"
 
-#: ui/composer-menus.ui:34
+#: ui/composer-editor.ui:753
 msgid "Lar_ge"
 msgstr "Vel_ké"
 
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "B_arva"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
+#: ui/composer-editor.ui:763
 msgid "_Rich Text"
 msgstr "Fo_rmátovaný text"
 
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Zobrazit rozšiřující pole"
+#: ui/composer-editor.ui:768
+msgid "_Plain Text"
+msgstr "_Prostý text"
 
-#: ui/composer-menus.ui:78
+#: ui/composer-editor-menus.ui:8
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-editor-menus.ui:12
 msgid "_Redo"
 msgstr "Zno_vu"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: ui/composer-menus.ui:100
+#: ui/composer-editor-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "Vložit _bez formátování"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-editor-menus.ui:50
 msgid "Select _All"
 msgstr "Vybrat _vše"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:43
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "_Kontrolovat…"
 
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "Odpojit editor do samostatného okna"
+
+#: ui/composer-headerbar.ui:135
+msgid "_Send"
+msgstr "_Odeslat"
+
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "Zahodit a zavřít"
+
+#: ui/composer-headerbar.ui:186
+msgid "Save and Close"
+msgstr "Uložit a zavřít"
+
+#. 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žit nový odkaz s touto adresou URL"
+
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Přidat"
+
+#: ui/composer-link-popover.ui:47
+msgid "Link URL"
+msgstr "Adresa URL odkazu"
+
+#. 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 "Aktualizovat tuto adresu URL odkazu"
+
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Aktualizovat"
+
+#: ui/composer-link-popover.ui:75
+msgid "Delete this link"
+msgstr "Smazat 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:56
+#: ui/composer-widget.ui:131
 msgid "_To"
 msgstr "_Komu"
 
-#: ui/composer-widget.ui:75
+#: ui/composer-widget.ui:159
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Zobrazovat pole Kopie, Skrytá kopie a Odpovědět"
+
+#: ui/composer-widget.ui:220
 msgid "_Cc"
 msgstr "Ko_pie"
 
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "_Předmět"
-
-#: ui/composer-widget.ui:149
+#: ui/composer-widget.ui:268
 msgid "_Bcc"
 msgstr "_Skrytá kopie"
 
-#: ui/composer-widget.ui:179
+#: ui/composer-widget.ui:316
 msgid "_Reply-To"
 msgstr "_Odpověď"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
-msgid "From"
-msgstr "Od"
+#: ui/composer-widget.ui:373
+msgid "_Subject"
+msgstr "_Předmět"
 
-#: ui/composer-widget.ui:293
+#: ui/composer-widget.ui:446
 msgid "Drop files here"
 msgstr "upusťte soubory zde"
 
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:462
 msgid "To add them as attachments"
 msgstr "Chcete-li je přidat jako přílohy"
 
-#: ui/composer-widget.ui:353
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Zpět poslední úpravu (Ctrl+Z)"
-
-#: ui/composer-widget.ui:377
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "Znovu poslední úpravu (Ctrl+Shift+Z)"
-
-#: ui/composer-widget.ui:415
-msgid "Bold (Ctrl+B)"
-msgstr "Tučný (Ctrl+B)"
-
-#: ui/composer-widget.ui:439
-msgid "Italic (Ctrl+I)"
-msgstr "Kurzíva (Ctrl+I)"
-
-#: ui/composer-widget.ui:463
-msgid "Underline (Ctrl+U)"
-msgstr "Podtržený (Ctrl+U)"
-
-#: ui/composer-widget.ui:487
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Přeškrtnutý (Ctrl+K)"
-
-#: ui/composer-widget.ui:525
-msgid "Insert unordered list"
-msgstr "Vložit neseřazený seznam"
-
-#: ui/composer-widget.ui:549
-msgid "Insert ordered list"
-msgstr "Vložit seřazený seznam"
-
-#: ui/composer-widget.ui:587
-msgid "Quote text  (Ctrl+])"
-msgstr "Citace textu (Ctrl+])"
-
-#: ui/composer-widget.ui:611
-msgid "Unquote text  (Ctrl+[)"
-msgstr "Konec citace textu (Ctrl+[)"
-
-#: ui/composer-widget.ui:649
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Vložit nebo aktualizovat vybraný odkaz (Ctrl+L)"
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "Vybrat všechny přílohy"
 
-#: ui/composer-widget.ui:673
-msgid "Insert an image (Ctrl+G)"
-msgstr "Vložit obrázek (Ctrl+G)"
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Uložit vybrané přílohy"
 
-#: ui/composer-widget.ui:707
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Odstranit vybrané formátování (Ctrl+Space)"
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Otevřít vybrané přílohy"
 
-#: ui/composer-widget.ui:731
-msgid "Select spell checking languages"
-msgstr "Vybrat jazyky pro kontrolu pravopisu"
+#: ui/components-attachment-pane-menus.ui:17
+msgid "Save _All"
+msgstr "_Uložit vše"
 
-#: ui/components-inspector-error-view.ui:33
+#: 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 ""
 "Pokud je problém vážný, nebo přetrvává, uložte a odešlete prosím tyto údaje "
-"do <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">poštovní "
-"konference</a> nebo zadejte <a href=\"https://wiki.gnome.org/Apps/Geary/"
+"na jeden z <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">kontaktních "
+"kanálů</a>, nebo zadejte <a href=\"https://wiki.gnome.org/Apps/Geary/"
 "ReportingABug\">nové hlášení chyby</a>."
 
-#: ui/components-inspector-error-view.ui:49
+#: ui/components-inspector-error-view.ui:47
 msgid "Details:"
 msgstr "Podrobnosti:"
 
-#: ui/components-inspector-log-view.ui:13
-msgid "Inspector opened"
-msgstr ""
-
-#: ui/components-inspector-log-view.ui:65
-msgid "column"
-msgstr ""
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
+msgid "Search for matching log entries"
+msgstr "Vyhledat odpovídající položky v záznamu"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:20
+#: ui/components-inspector.ui:35
 msgid "Toggle appending new log entries"
 msgstr "Zapnout/vypnout přidávání nových položek do záznamu"
 
 #. Tooltip for inspector button
-#. Tooltip for problem report button
-#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
-msgid "Search for matching log entries"
-msgstr "Vyhledat odpovídající položky v záznamu"
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
+msgstr "Přidat značkovací položku do záznamu"
 
 #. 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žit 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 "Zkopírovat do schránky"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+msgid "Clears all log entries"
+msgstr "Vymaže všechny položky v záznamu"
+
 #: ui/conversation-contact-popover.ui:146
 msgid "New Conversation…"
 msgstr "Nová konverzace…"
@@ -2708,42 +3260,6 @@ msgstr "Označit tuto zprávu hvězdičkou"
 msgid "Mark this message as not starred"
 msgstr "Zrušit označení této zprávy hvězdičkou"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Zobrazit nabídku zpráv"
-
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Otevřít vybrané přílohy"
-
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Uložit vybrané přílohy"
-
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "Vybrat všechny přílohy"
-
-#: ui/conversation-email.ui:240
-msgid "Edit Draft"
-msgstr "Upravit koncept"
-
-#: ui/conversation-email.ui:267
-msgid "Draft message"
-msgstr "Koncept zprávy"
-
-#: ui/conversation-email.ui:283
-msgid "This message has not yet been sent."
-msgstr "Tato zpráva zatím nebyla odeslána."
-
-#: ui/conversation-email.ui:329
-msgid "Message not saved"
-msgstr "Zpráva není uložená"
-
-#: ui/conversation-email.ui:345
-msgid "This message was sent, but has not been saved to your account."
-msgstr "Tato zpráva byla úspěšně odeslána, ale nebyla uložena do vašeho účtu."
-
 #. Translators: Menu item to reply to a specific message.
 #: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
@@ -2781,9 +3297,27 @@ msgstr "_Smazat zprávu…"
 msgid "_View Source"
 msgstr "_Zobrazit zdrojový kód"
 
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "_Uložit vše"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "ale ve skutečnosti jde na:"
+
+#: ui/conversation-message-link-popover.ui:84
+msgid "The link appears to go to:"
+msgstr "Tento odkaz vypadá, že míří na:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "Nalezen klamný odkaz"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr "Odesilatel zprávy se vás snaží navést na nesprávné webové stránky."
+
+#: ui/conversation-message-link-popover.ui:124
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
+"Pokud máte pochybnosti, před pokračování kontaktujte odesilatele a vše si "
+"ověřte."
 
 #: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
@@ -2833,44 +3367,6 @@ msgstr "Odpovědět:"
 msgid "Subject"
 msgstr "Předmět"
 
-#: ui/conversation-message.ui:501
-msgid "Show Images"
-msgstr "Zobrazit obrázky"
-
-#: ui/conversation-message.ui:514
-msgid "Always Show From Sender"
-msgstr "Vždy zobrazovat Od odesílatele"
-
-#: ui/conversation-message.ui:542
-msgid "Remote images not shown"
-msgstr "Vzdálené obrázky nejsou zobrazené"
-
-#: ui/conversation-message.ui:559
-msgid "Only show remote images from senders you trust."
-msgstr "Vzdálené obrázky se zobrazují jen od odesilatelů, kterým důvěřujete."
-
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "ale ve skutečnosti jde na:"
-
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "Tento odkaz vypadá, že míří na:"
-
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "Nalezen klamný odkaz"
-
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr "Odesilatel zprávy se vás snaží navést na nesprávné webové stránky."
-
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr ""
-"Pokud máte pochybnosti, před pokračování kontaktujte odesilatele a vše si "
-"ověřte."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Najít v konverzaci"
@@ -2907,7 +3403,7 @@ msgstr "štítek"
 msgid "Conversation Shortcuts"
 msgstr "Klávesové zkratky konverzace"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:347
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Činnosti"
@@ -2922,54 +3418,54 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Odpovědět odesilateli"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Odpovědět všem"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:289
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Přeposlat"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:296
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "Označit jako přečtené/nepřečtené"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "Označit jako s hvězdičkou/bez hvězdičky"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
 msgctxt "shortcut window"
-msgid "Archive conversation"
+msgid "Archive conversations"
 msgstr "Archivovat konverzaci"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
 msgctxt "shortcut window"
-msgid "Move conversation"
+msgid "Move conversations"
 msgstr "Přesunout konverzaci"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
 msgctxt "shortcut window"
-msgid "Label conversation"
+msgid "Label conversations"
 msgstr "Přidat konverzaci štítek"
 
 #: ui/gtk/help-overlay.ui:80
 msgctxt "shortcut window"
-msgid "Trash conversation"
+msgid "Trash conversations"
 msgstr "Vyhodit konverzaci do koše"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
 msgctxt "shortcut window"
-msgid "Move to Spam"
-msgstr "Přesunout do nevyžádané"
+msgid "Junk conversations"
+msgstr "Označit konverzaci jako nevyžádanou"
 
-#: ui/gtk/help-overlay.ui:95
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
-msgid "Delete conversation"
+msgid "Delete conversations"
 msgstr "Smazat konverzaci"
 
 #: ui/gtk/help-overlay.ui:104
@@ -2982,7 +3478,7 @@ msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "Hledat konverzace"
 
-#: 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 "Najít v aktuální konverzaci"
@@ -3022,7 +3518,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Výchozí přiblížení"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:367
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Obecné"
@@ -3039,176 +3535,180 @@ msgstr "Zobrazit klávesové zkratky"
 
 #: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
-msgid "Close current window"
-msgstr "Zavřít aktuální okno"
+msgid "Open a new window"
+msgstr "Otevřít nové okno"
 
 #: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "Zavřít aktuální okno"
+
+#: ui/gtk/help-overlay.ui:220
+msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "Ukončit aplikaci"
 
-#: ui/gtk/help-overlay.ui:222
+#: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Keyboard navigation"
 msgstr "Navigace z klávesnice"
 
-#: ui/gtk/help-overlay.ui:226
-msgctxt "shortcut window"
-msgid "Focus the next pane"
-msgstr "Přesunout zaměření na následující panel"
-
 #: ui/gtk/help-overlay.ui:233
 msgctxt "shortcut window"
-msgid "Focus the previous pane"
-msgstr "Přesunout zaměření na předchozí panel"
-
-#: ui/gtk/help-overlay.ui:240
-msgctxt "shortcut window"
-msgid "Focus the conversation list"
-msgstr "Přesunout zaměření na seznam konverzací"
+msgid "Go to next/previous pane"
+msgstr "Přejít na následující/předchozí panel"
 
-#: ui/gtk/help-overlay.ui:247
+#: ui/gtk/help-overlay.ui:241
 msgctxt "shortcut window"
-msgid "Select the conversation down"
-msgstr "Vybrat konverzaci o jednu niže"
+msgid "Select next/previous conversation"
+msgstr "Vybrat následující/předchozí konverzaci"
 
-#: ui/gtk/help-overlay.ui:254
-msgctxt "shortcut window"
-msgid "Select the conversation up"
-msgstr "Vybrat konverzaci o jednu výše"
-
-#: ui/gtk/help-overlay.ui:261
+#: ui/gtk/help-overlay.ui:248
 msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "Přesunout zaměření na následující/předchozí zprávu"
 
-#: ui/gtk/help-overlay.ui:271
-msgctxt "shortcut window"
-msgid "Single-key shortcuts"
+#: ui/gtk/help-overlay.ui:260
+msgid "Single-key Shortcuts"
 msgstr "Jednoklávesové zkratky"
 
-#: ui/gtk/help-overlay.ui:275
+#: ui/gtk/help-overlay.ui:265
+msgctxt "shortcut window"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Jednoklávesové zkratky (pokud je povoleno)"
+
+#: ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "Odpovědět odesilateli"
 
-#: ui/gtk/help-overlay.ui:343
+#: ui/gtk/help-overlay.ui:361
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "Vybrat následující/předchozí konverzaci"
+
+#: ui/gtk/help-overlay.ui:373
 msgid "Composer Shortcuts"
 msgstr "Klávesové zkratky editoru"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Odeslat"
 
-#: ui/gtk/help-overlay.ui:358
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Přidat přílohu"
 
-#: ui/gtk/help-overlay.ui:371
+#: ui/gtk/help-overlay.ui:395
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "Odpojit editor do samostatného okna"
+
+#: ui/gtk/help-overlay.ui:408
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Zavřít okno pro psaní zprávy"
 
-#: ui/gtk/help-overlay.ui:378
+#: ui/gtk/help-overlay.ui:415
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Odpojit okno pro psaní zprávy"
 
-#: ui/gtk/help-overlay.ui:385
+#: ui/gtk/help-overlay.ui:422
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Úpravy"
 
-#: ui/gtk/help-overlay.ui:390
+#: ui/gtk/help-overlay.ui:427
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Přesunout výběr do schránky"
 
-#: ui/gtk/help-overlay.ui:397
+#: ui/gtk/help-overlay.ui:434
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Zkopírovat výběr do schránky"
 
-#: ui/gtk/help-overlay.ui:404
+#: ui/gtk/help-overlay.ui:441
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Vložit ze schránky"
 
-#: ui/gtk/help-overlay.ui:411
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Citovat text"
 
-#: ui/gtk/help-overlay.ui:418
+#: ui/gtk/help-overlay.ui:455
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Zrušit citaci textu"
 
-#: ui/gtk/help-overlay.ui:427
+#: ui/gtk/help-overlay.ui:464
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Upravovat jako formátovaný text"
 
-#: ui/gtk/help-overlay.ui:431
+#: ui/gtk/help-overlay.ui:468
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Vložit bez formátování"
 
-#: ui/gtk/help-overlay.ui:438
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Tučný text"
 
-#: ui/gtk/help-overlay.ui:445
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Kurzíva"
 
-#: ui/gtk/help-overlay.ui:452
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Podtržený text"
 
-#: ui/gtk/help-overlay.ui:459
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Přeškrtnutý text"
 
-#: ui/gtk/help-overlay.ui:466
+#: ui/gtk/help-overlay.ui:503
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Odstranit formátování"
 
-#: ui/gtk/help-overlay.ui:473
+#: ui/gtk/help-overlay.ui:510
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Vložit obrázek"
 
-#: ui/gtk/help-overlay.ui:480
+#: ui/gtk/help-overlay.ui:517
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Vložit odkaz"
 
-#: ui/main-toolbar.ui:23
+#: ui/main-toolbar.ui:24
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "Napsat zprávu"
 
-#: ui/main-toolbar.ui:61
+#: ui/main-toolbar.ui:62
 msgid "Toggle search bar"
 msgstr "Přepnout vyhledávací lištu"
 
-#: ui/main-toolbar.ui:113
+#: ui/main-toolbar.ui:114
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: ui/main-toolbar.ui:136
+#: ui/main-toolbar.ui:137
 msgid "Reply All"
 msgstr "Odpovědět všem"
 
-#: ui/main-toolbar.ui:159
+#: ui/main-toolbar.ui:160
 msgid "Forward"
 msgstr "Přeposlat"
 
@@ -3221,105 +3721,21 @@ msgid "_Archive"
 msgstr "_Archivovat"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Mark as S_pam"
-msgstr "Označit jako nevyžá_dané"
-
-#: ui/main-toolbar-menus.ui:25
-msgid "Mark as not S_pam"
-msgstr "Označit, že není nevyžá_dané"
+msgid "Toggle as _Junk"
+msgstr "Přepnout jako nevyžá_danou"
 
-#: ui/main-toolbar-menus.ui:32
-msgid "Empty _Spam…"
-msgstr "Vyprázdnit _nevyžádanou…"
-
-#: ui/main-toolbar-menus.ui:36
-msgid "Empty _Trash…"
-msgstr "Vyprázdnit koš…"
-
-#: ui/main-toolbar-menus.ui:42
+#: ui/main-toolbar-menus.ui:28
 msgid "_Accounts"
 msgstr "Úč_ty"
 
-#: ui/main-toolbar-menus.ui:50
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "_Klávesové zkratky"
 
-#: ui/main-toolbar-menus.ui:61
+#: ui/main-toolbar-menus.ui:47
 msgid "_About Geary"
 msgstr "O _aplikaci Geary"
 
-#. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:185
-msgid "Working offline"
-msgstr "Pracuje se v režimu odpojení"
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:199
-msgid ""
-"Your computer does not appear to be connected to the Internet.\n"
-"You will not be able to send or receive email until it is re-connected."
-msgstr ""
-"Vypadá to, že váš počítač není připojený k Internetu.\n"
-"Dokud se znovu nepřipojí, nebudete moci odesílat a přijímat e-maily."
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:202
-msgid "You will not be able to send or receive email until re-connected."
-msgstr "Dokud se znovu nepřipojíte, nebudete moci odesílat a přijímat e-maily."
-
-#. Button label for retrying TLS cert validation
-#: ui/main-window.ui:249
-msgid "Check"
-msgstr "Zkontrolovat"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:253
-msgid "Check the security details for the connection"
-msgstr "Zkontrolovat údaje zabezpečení pro připojení"
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/main-window.ui:282
-msgid "Security problem"
-msgstr "Problém se zabezpečením"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:296
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-"Účet oznámil nedůvěryhodný server.\n"
-"Zkontrolujte prosím nastavení serveru a zkuste to znovu."
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:299
-msgid "An account has reported an untrusted server."
-msgstr "Účet oznámil nedůvěryhodný server."
-
-#. Button tooltip for retrying when a login error has occurred
-#: ui/main-window.ui:350
-msgid "Retry login, you will be prompted for your password"
-msgstr "Zkusit znovu přihlásit, budete dotázáni na heslo"
-
-#. Infobar title when one or more accounts have a login error
-#: ui/main-window.ui:379
-msgid "Login problem"
-msgstr "Problém s přihlášením"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:393
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-"Účet oznámil nesprávné přihlašovací jméno nebo heslo.\n"
-"Zkontrolujte prosím své přihlašovací jméno a zkuste to znovu."
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:396
-msgid "An account has reported an incorrect login or password."
-msgstr "Účet oznámil nesprávné přihlašovací jméno nebo heslo."
-
 #: ui/password-dialog.glade:74
 msgid "SMTP Credentials"
 msgstr "Přihlašovací údaje SMTP"
@@ -3336,55 +3752,6 @@ msgstr "_Pamatovat si heslo"
 msgid "_Authenticate"
 msgstr "_Ověřit"
 
-#: ui/preferences-dialog.ui:15
-msgid "Preferences"
-msgstr "Předvolby"
-
-#: ui/preferences-dialog.ui:43
-msgid "_Automatically select next message"
-msgstr "_Automaticky vybrat další zprávu"
-
-#: ui/preferences-dialog.ui:64
-msgid "_Display conversation preview"
-msgstr "_Zobrazit náhled konverzace"
-
-#: ui/preferences-dialog.ui:85
-msgid "Use _three pane view"
-msgstr "Používat _třípanelové zobrazení"
-
-#: ui/preferences-dialog.ui:106
-msgid "_Watch for new mail when closed"
-msgstr "S_ledovat novou poštu při zavřené aplikaci"
-
-#: ui/preferences-dialog.ui:110
-msgid "Geary will keep running after all windows are closed"
-msgstr "Aplikace Geary zůstane po zavření všech oken spuštěná na pozadí"
-
 #: ui/upgrade_dialog.glade:60
 msgid "Geary update in progress…"
 msgstr "Probíhá aktualizace aplikace Geary…"
-
-#~ msgid "Enable notification sounds"
-#~ msgstr "Povolit zvuková upozornění"
-
-#~ msgid "True to play sounds for notifications and sending."
-#~ msgstr ""
-#~ "Zapnuto, když se mají přehrávat zvuky při upozornění nebo odesílání."
-
-#~ msgid "Show notifications for new mail"
-#~ msgstr "Zobrazovat upozornění na nový e-mail"
-
-#~ msgid "True to show notification bubbles."
-#~ msgstr "Zapnuto, když se mají zobrazovat bubliny s upozorněními."
-
-#~ msgid "Reading"
-#~ msgstr "Čtení"
-
-#~ msgid "Notifications"
-#~ msgstr "Upozornění"
-
-#~ msgid "_Play notification sounds"
-#~ msgstr "_Přehrávat zvuková upozornění"
-
-#~ msgid "Show _notifications for new mail"
-#~ msgstr "Zobrazit _upozornění na nový e-mail"
-- 
2.29.2

