diff --git a/po/hu.po b/po/hu.po
index 1cd42261..814cf3f8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,18 +1,18 @@
 # Hungarian translation for geary.
-# Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Free Software Foundation, Inc.
+# Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
 # This file is distributed under the same license as the geary package.
 #
 # lukibeni <lukacs.bence1 at gmail dot com>, 2012, 2013.
 # metalsasi <metalsasi at gmail dot com>, 2012.
-# Balázs Úr <ur.balazs at fsf dot hu>, 2014, 2015, 2017, 2018, 2019, 2020.
+# Balázs Úr <ur.balazs at fsf dot hu>, 2014, 2015, 2017, 2018, 2019, 2020, 2021.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2014.
-# Balázs Meskó <mesko.balazs at fsf dot hu>, 2018, 2020.
+# Balázs Meskó <mesko.balazs at fsf dot hu>, 2018, 2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2020-02-16 20:26+0000\n"
-"PO-Revision-Date: 2020-03-04 23:00+0100\n"
+"POT-Creation-Date: 2021-01-27 12:08+0000\n"
+"PO-Revision-Date: 2021-02-18 23:04+0100\n"
 "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 19.04.3\n"
+"X-Generator: Lokalize 19.12.3\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -32,10 +32,10 @@ msgstr "Fájlok küldése a Geary használatával"
 
 #. Translators: The application name
 #: desktop/geary-autostart.desktop.in.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:555
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:648
 msgid "Geary"
 msgstr "Geary"
 
@@ -46,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/application-client.vala:32
+#: src/client/application/application-client.vala:33
 msgid "Send and receive email"
 msgstr "E-mailek küldése és fogadása"
 
@@ -58,11 +58,11 @@ msgid "Email;E-mail;Mail;"
 msgstr "Email;E-mail;Levél;"
 
 #. 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 "Geary fejlesztőcsapat"
 
-#: 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, "
@@ -72,7 +72,7 @@ msgstr ""
 "GNOME 3 asztalhoz készült. Segítségével e-maileket olvashat, kereshet és "
 "küldhet egy lényegre törő és modern felületen."
 
-#: 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."
@@ -80,43 +80,43 @@ msgstr ""
 "A társalgások segítségével teljes beszélgetéseket olvashat el anélkül, hogy "
 "egyesével végig kellene kattintania a leveleken."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "A Geary néhány funkciója:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Gyors e-mailfiók beállítás"
 
-#: 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 "A kapcsolódó leveleket együtt jeleníti meg a beszélgetésekben"
 
-#: 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 "Gyors, teljes szöveges és kulcsszavas keresés"
 
-#: 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 "Teljes funkcionalitású HTML és egyszerű szöveges levélszerkesztő"
 
-#: 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 "Asztali értesítések új levél érkezésekor"
 
-#: 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 ""
 "Kompatibilis a GMaillel, a Yahoo! Maillel, az Outlook.commal és más IMAP "
 "kiszolgálókkal"
 
 #. 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 "A Geary egy beszélgetést jelenít meg"
 
 #. 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 "A Geary gazdag szövegszerkesztője"
 
@@ -158,78 +158,35 @@ msgid "The last recorded height of the application window."
 msgstr "Az alkalmazásablak legutóbb mentett magassága."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
-msgid "Position of folder list pane"
-msgstr "A mappalista ablaktábla pozíciója"
-
-#: desktop/org.gnome.Geary.gschema.xml:27
-msgid "Position of the folder list Paned grabber."
-msgstr "A mappalista ablaktábla fogantyújának helyzete."
-
-#: desktop/org.gnome.Geary.gschema.xml:32
-msgid "Position of folder list pane when horizontal"
-msgstr "A mappalista ablaktábla pozíciója, ha vízszintes"
-
-#: desktop/org.gnome.Geary.gschema.xml:33
-msgid ""
-"Position of the folder list Paned grabber in the horizontal orientation."
-msgstr "A mappalista ablaktábla fogantyújának helyzete vízszintes tájolásban."
-
-#: desktop/org.gnome.Geary.gschema.xml:38
-msgid "Position of folder list pane when vertical"
-msgstr "A mappalista ablaktábla pozíciója, ha függőleges"
-
-#: desktop/org.gnome.Geary.gschema.xml:39
-msgid "Position of the folder list Paned grabber in the vertical orientation."
-msgstr "A mappalista ablaktábla fogantyújának helyzete függőleges tájolásban."
-
-#: desktop/org.gnome.Geary.gschema.xml:44
-msgid "Orientation of the folder list pane"
-msgstr "A mappalista ablaktábla tájolása"
-
-#: desktop/org.gnome.Geary.gschema.xml:45
-msgid "True if the folder list Paned is in the horizontal orientation."
-msgstr "Igaz, ha a mappalista ablaktábla vízszintesen tájolt."
-
-#: desktop/org.gnome.Geary.gschema.xml:50
 msgid "Show/hide formatting toolbar"
 msgstr "Formázási eszköztár megjelenítése/elrejtése"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:27
 msgid "True if the formatting toolbar in the composer is shown."
 msgstr "Igaz, ha a formázási eszköztár megjelenik a levélíróban."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
-msgid "Position of message list pane"
-msgstr "A levéllista ablaktábla pozíciója"
-
-#: desktop/org.gnome.Geary.gschema.xml:57
-msgid "Position of the message list Paned grabber."
-msgstr "A levéllista ablaktábla fogantyújának helyzete."
-
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:32
 msgid "Autoselect next message"
 msgstr "Következő levél automatikus kiválasztása"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:33
 msgid "True if we should autoselect the next available conversation."
 msgstr ""
 "Igaz, ha a következő elérhető beszélgetést automatikusan ki kell választani."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:38
 msgid "Display message previews"
 msgstr "Beszélgetés előnézetek megjelenítése"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: desktop/org.gnome.Geary.gschema.xml:39
 msgid "True if we should display a short preview of each message."
 msgstr "Igaz, ha minden levélről jelenjen meg egy rövid előnézet."
 
-#: desktop/org.gnome.Geary.gschema.xml:74
-#| msgctxt "shortcut window"
-#| msgid "Single-key shortcuts"
+#: desktop/org.gnome.Geary.gschema.xml:44
 msgid "Use single key shortcuts"
 msgstr "Egybillentyűs gyorsbillentyűk használata"
 
-#: desktop/org.gnome.Geary.gschema.xml:75
+#: desktop/org.gnome.Geary.gschema.xml:45
 msgid ""
 "Enables shortcuts for email actions that do not require pressing <Ctrl> to "
 "emulate those used by Gmail."
@@ -237,11 +194,11 @@ msgstr ""
 "Engedélyezi a gyorsbillentyűket az olyan e-mail-műveleteknél, amelyek nem "
 "igénylik a <Ctrl> lenyomását, a Gmail által használtak utánzása érdekében."
 
-#: desktop/org.gnome.Geary.gschema.xml:82
+#: desktop/org.gnome.Geary.gschema.xml:52
 msgid "Languages that shall be used in the spell checker"
 msgstr "A nyelvek, amelyek használva lesznek a helyesírás-ellenőrzőben"
 
-#: desktop/org.gnome.Geary.gschema.xml:83
+#: desktop/org.gnome.Geary.gschema.xml:53
 msgid ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
@@ -249,11 +206,11 @@ msgstr ""
 "POSIX területi beállítások listája, az üres listával letiltja a helyesírás-"
 "ellenőrzést, és a null lista az asztal nyelveit használja alapértelmezetten."
 
-#: desktop/org.gnome.Geary.gschema.xml:90
+#: desktop/org.gnome.Geary.gschema.xml:60
 msgid "Languages that are displayed in the spell checker popover"
 msgstr "A nyelvek, melyek megjelennek a helyesírás-ellenőrző felugróban"
 
-#: desktop/org.gnome.Geary.gschema.xml:91
+#: desktop/org.gnome.Geary.gschema.xml:61
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
@@ -261,64 +218,63 @@ msgstr ""
 "A nyelvek listája, amely mindig megjelenik a helyesírás-ellenőrző "
 "felugrójában."
 
-#: desktop/org.gnome.Geary.gschema.xml:96
+#: desktop/org.gnome.Geary.gschema.xml:66
 msgid "Notify of new mail at startup"
 msgstr "Értesítés az új levelekről indításkor"
 
-#: desktop/org.gnome.Geary.gschema.xml:97
+#: desktop/org.gnome.Geary.gschema.xml:67
 msgid "True to notify of new mail at startup."
 msgstr "Igaz, ha értesítsen az új levekről indításkor."
 
-#: desktop/org.gnome.Geary.gschema.xml:102
+#: desktop/org.gnome.Geary.gschema.xml:72
 msgid "Ask when opening an attachment"
 msgstr "Kérdezzen egy melléklet megnyitásakor"
 
-#: desktop/org.gnome.Geary.gschema.xml:103
+#: desktop/org.gnome.Geary.gschema.xml:73
 msgid "True to ask when opening an attachment."
 msgstr "Igaz, ha kérdezzen egy melléklet megnyitásakor."
 
-#: desktop/org.gnome.Geary.gschema.xml:108
+#: desktop/org.gnome.Geary.gschema.xml:78
 msgid "Whether to compose emails in HTML"
 msgstr "Az e-mailek írása HTML-ben történjen-e"
 
-#: desktop/org.gnome.Geary.gschema.xml:109
+#: desktop/org.gnome.Geary.gschema.xml:79
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
 "Igaz, ha a levelek HTML-ben legyenek megírva; hamis esetén egyszerű szöveg."
 
-#: desktop/org.gnome.Geary.gschema.xml:114
+#: desktop/org.gnome.Geary.gschema.xml:84
 msgid "Advisory strategy for full-text searching"
 msgstr "Tanácsadó stratégia a teljes szöveges keresésnél"
 
-#: desktop/org.gnome.Geary.gschema.xml:115
+#: desktop/org.gnome.Geary.gschema.xml:85
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 "Az elfogadható értékek: „exact” (pontos), „conservative” (konzervatív), "
 "„aggressive” (agresszív) és „horizon” (horizont)."
 
-#: desktop/org.gnome.Geary.gschema.xml:120
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Zoom of conversation viewer"
 msgstr "A beszélgetésmegjelenítő nagyítása"
 
-#: desktop/org.gnome.Geary.gschema.xml:121
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid "The zoom to apply on the conservation view."
 msgstr "A beszélgetés nézeten alkalmazandó nagyítás."
 
-#: desktop/org.gnome.Geary.gschema.xml:126
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Size of detached composer window"
 msgstr "A leválasztott levélíró ablak mérete"
 
-#: desktop/org.gnome.Geary.gschema.xml:127
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "The last recorded size of the detached composer window."
 msgstr "A leválasztott levélíró ablak legutóbb elmentett mérete."
 
-#: desktop/org.gnome.Geary.gschema.xml:132
-#| msgid "Error sending email"
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Undo sending email delay"
 msgstr "Levélküldési késleltetés visszavonása"
 
-#: desktop/org.gnome.Geary.gschema.xml:133
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid ""
 "The number of seconds to wait before sending an email. Set to zero or less "
 "to disable."
@@ -326,21 +282,29 @@ msgstr ""
 "A levelek kiküldése előtti várakozás másodpercben. A letiltáshoz állítsa "
 "nullára vagy kevesebbre."
 
-#: desktop/org.gnome.Geary.gschema.xml:139
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "Brief notification display time"
 msgstr "Rövid értesítések megjelenítési ideje"
 
-#: desktop/org.gnome.Geary.gschema.xml:140
+#: desktop/org.gnome.Geary.gschema.xml:110
 msgid ""
 "The length of time in seconds for which brief notifications should be "
 "displayed."
 msgstr "A rövid értesítések megjelenítési ideje másodpercben."
 
-#: desktop/org.gnome.Geary.gschema.xml:146
+#: desktop/org.gnome.Geary.gschema.xml:116
+msgid "List of optional plugins"
+msgstr "Válaszható bővítmények listája"
+
+#: desktop/org.gnome.Geary.gschema.xml:117
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Az itt felsorolt bővítmények betöltésre kerülnek indításkor."
+
+#: desktop/org.gnome.Geary.gschema.xml:122
 msgid "Whether we migrated the old settings"
 msgstr "A régi beállítások migrálva lettek-e"
 
-#: desktop/org.gnome.Geary.gschema.xml:147
+#: desktop/org.gnome.Geary.gschema.xml:123
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -356,19 +320,19 @@ msgstr "A tanúsítvány tárolása meghiúsult"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:108
+#: src/client/accounts/accounts-editor-add-pane.vala:109
 msgid "All others"
 msgstr "Az összes többi"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-add-pane.vala:196
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
 msgid "Check your receiving login and password"
 msgstr "Ellenőrizze a fogadó bejelentkezési nevet és jelszót"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-add-pane.vala:211
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
 msgid "Check your receiving server details"
 msgstr "Ellenőrizze a fogadó kiszolgáló részleteit"
 
@@ -377,51 +341,51 @@ msgstr "Ellenőrizze a fogadó kiszolgáló részleteit"
 #. succeeded, so the user probably needs to
 #. specify custom creds here
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:232
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-add-pane.vala:233
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
 msgid "Check your sending login and password"
 msgstr "Ellenőrizze a küldő bejelentkezési nevet és jelszót"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-add-pane.vala:247
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
 msgid "Check your sending server details"
 msgstr "Ellenőrizze a küldő kiszolgáló részleteit"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:261
+#: src/client/accounts/accounts-editor-add-pane.vala:262
 msgid "Check your email address and password"
 msgstr "Ellenőrizze az e-mail címét és jelszavát"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:272
+#: src/client/accounts/accounts-editor-add-pane.vala:273
 msgid "Could not connect, check your network"
 msgstr "Nem sikerült kapcsolódni, ellenőrizze a hálózatot"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:285
+#: src/client/accounts/accounts-editor-add-pane.vala:286
 msgid "An unexpected problem occurred"
 msgstr "Váratlan probléma történt"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:303
+#: src/client/accounts/accounts-editor-add-pane.vala:304
 #, c-format
 msgid "Account not created: %s"
 msgstr "A fiók nincs létrehozva: %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:558
+#: src/client/accounts/accounts-editor-add-pane.vala:584
 msgid "Your name"
 msgstr "Az Ön neve"
 
 #. 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:575
-#: src/client/accounts/accounts-editor-edit-pane.vala:513
+#: src/client/accounts/accounts-editor-add-pane.vala:601
+#: src/client/accounts/accounts-editor-edit-pane.vala:536
 msgid "Email address"
 msgstr "E-mail cím"
 
@@ -430,8 +394,8 @@ msgstr "E-mail cím"
 #. 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:579
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-add-pane.vala:605
+#: src/client/accounts/accounts-editor-edit-pane.vala:502
 msgid "person@example.com"
 msgstr "szemely@example.com"
 
@@ -439,16 +403,16 @@ msgstr "szemely@example.com"
 #. 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:593
-#: src/client/accounts/accounts-editor-servers-pane.vala:884
+#: src/client/accounts/accounts-editor-add-pane.vala:619
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
 msgid "Login name"
 msgstr "Bejelentkezési név"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:607
-#: src/client/accounts/accounts-editor-servers-pane.vala:1006
-#: ui/password-dialog.glade:108
+#: src/client/accounts/accounts-editor-add-pane.vala:633
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
+#: ui/password-dialog.glade:98
 msgid "Password"
 msgstr "Jelszó"
 
@@ -456,14 +420,14 @@ msgstr "Jelszó"
 #. 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:629
-#: src/client/accounts/accounts-editor-servers-pane.vala:728
+#: src/client/accounts/accounts-editor-add-pane.vala:655
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "IMAP server"
 msgstr "IMAP-kiszolgáló"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:632
+#: src/client/accounts/accounts-editor-add-pane.vala:658
 msgid "imap.example.com"
 msgstr "imap.example.com"
 
@@ -471,21 +435,50 @@ msgstr "imap.example.com"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:638
-#: src/client/accounts/accounts-editor-servers-pane.vala:734
+#: src/client/accounts/accounts-editor-add-pane.vala:664
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
 msgid "SMTP server"
 msgstr "SMTP-kiszolgáló"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:641
+#: src/client/accounts/accounts-editor-add-pane.vala:667
 msgid "smtp.example.com"
 msgstr "smtp.example.com"
 
+#. This is the remove account button in the account settings.
+#: src/client/accounts/accounts-editor-edit-pane.vala:220
+#: ui/accounts_editor_edit_pane.ui:239
+msgid "Remove Account"
+msgstr "Fiók eltávolítása"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:228
+#, c-format
+#| msgid "Remove Account"
+msgid "Remove Account: %s"
+msgstr "Fiók eltávolítása: %s"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:230
+#| msgid ""
+#| "Removing an account will remove it from Geary and delete locally cached "
+#| "email data from your computer, but not from your service provider."
+msgid ""
+"This will remove it from Geary and delete locally cached email data from "
+"your computer. Nothing will be deleted from your service provider."
+msgstr ""
+"Ez eltávolítja azt a Geary programból, és törli a helyileg gyorsítótárazott"
+" e-mail adatokat a számítógépéről. Semmi sem lesz törölve a szolgáltatójától."
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:232
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:182
+msgid "_Cancel"
+msgstr "Mé_gse"
+
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:277
-#: ui/accounts_editor_remove_pane.ui:123
+#: src/client/accounts/accounts-editor-edit-pane.vala:298
 msgid "Account name"
 msgstr "Fiók neve"
 
@@ -493,46 +486,46 @@ msgstr "Fiók neve"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:318
+#: src/client/accounts/accounts-editor-edit-pane.vala:339
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "Fiók nevének visszaváltoztatása erre: „%s”"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:342
+#: src/client/accounts/accounts-editor-edit-pane.vala:363
 msgid "Add a new sender email address"
 msgstr "Új küldő e-mail cím hozzáadása"
 
 #. 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:423
+#: src/client/accounts/accounts-editor-edit-pane.vala:446
 msgid "Name not set"
 msgstr "Név nincs beállítva"
 
 #. 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:464
+#: src/client/accounts/accounts-editor-edit-pane.vala:487
 msgid "Sender Name"
 msgstr "Küldő neve"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:491
+#: src/client/accounts/accounts-editor-edit-pane.vala:514
 msgid "Remove"
 msgstr "Eltávolítás"
 
 #. 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:506
+#: src/client/accounts/accounts-editor-edit-pane.vala:529
 msgid "Sender name"
 msgstr "Küldő neve"
 
 #. 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:573
+#: src/client/accounts/accounts-editor-edit-pane.vala:596
 #, c-format
 msgid "Remove “%s”"
 msgstr "„%s” eltávolítása"
@@ -540,7 +533,7 @@ msgstr "„%s” eltávolítása"
 #. 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:613
+#: src/client/accounts/accounts-editor-edit-pane.vala:636
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "„%s” változtatásainak visszavonása"
@@ -548,7 +541,7 @@ msgstr "„%s” változtatásainak visszavonása"
 #. 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:700
+#: src/client/accounts/accounts-editor-edit-pane.vala:723
 #, c-format
 msgid "Add “%s” back"
 msgstr "„%s” újra hozzáadása"
@@ -556,14 +549,14 @@ msgstr "„%s” újra hozzáadása"
 #. 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:742
+#: src/client/accounts/accounts-editor-edit-pane.vala:765
 msgid "Undo signature changes"
 msgstr "Aláírás-változtatások visszavonása"
 
 #. 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:790
+#: src/client/accounts/accounts-editor-edit-pane.vala:813
 msgid "Download mail"
 msgstr "Levél letöltése"
 
@@ -572,44 +565,44 @@ msgstr "Levél letöltése"
 #. 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:822
+#: src/client/accounts/accounts-editor-edit-pane.vala:845
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Letöltési időszak visszaváltoztatása erre: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:866
 msgid "Everything"
 msgstr "Minden"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:870
 msgid "2 weeks back"
 msgstr "2 hétre visszamenőleg"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:874
 msgid "1 month back"
 msgstr "1 hónapra visszamenőleg"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:878
 msgid "3 months back"
 msgstr "3 hónapra visszamenőleg"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:882
 msgid "6 months back"
 msgstr "6 hónapra visszamenőleg"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:863
+#: src/client/accounts/accounts-editor-edit-pane.vala:886
 msgid "1 year back"
 msgstr "1 évre visszamenőleg"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:867
+#: src/client/accounts/accounts-editor-edit-pane.vala:890
 msgid "2 years back"
 msgstr "2 évre visszamenőleg"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:871
+#: src/client/accounts/accounts-editor-edit-pane.vala:894
 msgid "4 years back"
 msgstr "4 évre visszamenőleg"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:877
+#: src/client/accounts/accounts-editor-edit-pane.vala:900
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
@@ -617,55 +610,54 @@ msgstr[0] "%d napra visszamenőleg"
 msgstr[1] "%d napra visszamenőleg"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2053
+#: src/client/application/application-main-window.vala:2158
 msgid "Undo"
 msgstr "Visszavonás"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2036
+#: src/client/application/application-main-window.vala:2141
 msgid "Redo"
 msgstr "Újra"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:362
-#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-list-pane.vala:458
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:366
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:462
 #: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:384
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has been disabled"
 msgstr "Ezt a fiókot letiltották"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but because of some error are not able to be
 #. used.
-#: src/client/accounts/accounts-editor-list-pane.vala:393
+#: src/client/accounts/accounts-editor-list-pane.vala:397
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Ennél a fióknál probléma történt és nem érhető el"
 
-#. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: src/client/accounts/accounts-editor-list-pane.vala:466
 msgid "Other email providers"
 msgstr "Egyéb e-mail szolgáltatók"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:560
+#: src/client/accounts/accounts-editor-list-pane.vala:572
 #, c-format
 msgid "Account “%s” removed"
 msgstr "A(z) „%s” fiók eltávolítva"
@@ -673,7 +665,7 @@ msgstr "A(z) „%s” fiók eltávolítva"
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:567
+#: src/client/accounts/accounts-editor-list-pane.vala:579
 #, c-format
 msgid "Account “%s” restored"
 msgstr "A(z) „%s” fiók visszaállítva"
@@ -686,67 +678,66 @@ msgstr "Húzza az elem mozgatásához"
 #. 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 "Szolgáltató"
 
 #. 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 "Kapcsolat biztonsága"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:479
-#: src/client/accounts/accounts-editor-servers-pane.vala:755
-#: src/client/accounts/accounts-editor-servers-pane.vala:970
-#: src/engine/api/geary-special-folder-type.vala:58
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
 msgid "None"
 msgstr "Nincs"
 
-#: src/client/accounts/accounts-editor-row.vala:486
+#: src/client/accounts/accounts-editor-row.vala:491
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:493
+#: src/client/accounts/accounts-editor-row.vala:498
 msgid "TLS"
 msgstr "TLS"
 
 #. Translators: Label for source of SMTP authentication
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
-#. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:534
-#: ui/application-main-window.ui:346
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:594
 msgid "Login"
 msgstr "Bejelentkezés"
 
 #. 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 "Nem szükséges bejelentkezés"
 
 #. 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 "Ugyanazon bejelentkezési név használata mint fogadáshoz"
 
 #. 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 "Eltérő bejelentkezési név használata"
 
 #. 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 "A fiók nincs frissítve: %s"
@@ -754,23 +745,23 @@ msgstr "A fiók nincs frissítve: %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 "Fiók forrása"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
 msgid "GNOME Online Accounts"
 msgstr "GNOME Online fiókok"
 
 #. 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 "Piszkozat e-mail mentése a kiszolgálón"
 
 #. 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 "Elküldött e-mail mentése a kiszolgálón"
 
@@ -779,12 +770,12 @@ msgstr "Elküldött e-mail mentése a kiszolgálón"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:956
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s OAuth2 használatával"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:966
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
 msgid "Use receiving server login"
 msgstr "Fogadó kiszolgáló bejelentkezési nevének használata"
 
@@ -817,150 +808,146 @@ msgstr ""
 msgid "_Replace"
 msgstr "_Csere"
 
-#: src/client/application/application-client.vala:33
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/application-client.vala:34
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Copyright 2016-2019 A Geary fejlesztőcsapat."
+#: src/client/application/application-client.vala:35
+#| msgid "Copyright 2016-2019 Geary Development Team."
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Copyright 2016-2020 A Geary fejlesztőcsapat."
 
-#: src/client/application/application-client.vala:36
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Keresse fel a Geary weboldalát"
 
 #. / Command line option
-#: src/client/application/application-client.vala:94
+#: src/client/application/application-client.vala:102
 msgid "Print debug logging"
 msgstr "Hibakeresési naplózás kiírása"
 
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:105
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Indítás rejtett főablakkal (elavult)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:108
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "WebKitGTK vizsgáló engedélyezése a webes nézetekben"
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:111
 msgid "Log conversation monitoring"
 msgstr "Beszélgetésfigyelés naplózása"
 
 #. / Command line option
-#: src/client/application/application-client.vala:106
+#: src/client/application/application-client.vala:114
 msgid "Log IMAP network deserialization"
 msgstr "IMAP hálózati visszafejtés naplózása"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:110
+#: src/client/application/application-client.vala:118
 msgid "Log folder normalization"
 msgstr "Mappa-normalizálás naplózása"
 
 #. / Command line option
-#: src/client/application/application-client.vala:113
-msgid "Log network activity"
-msgstr "Hálózati tevékenység naplózása"
-
-#. / Command line option
-#: src/client/application/application-client.vala:116
-msgid "Log periodic activity"
-msgstr "Időszakos tevékenység naplózása"
+#: src/client/application/application-client.vala:121
+#| msgid "Log network activity"
+msgid "Log IMAP network activity"
+msgstr "IMAP hálózati tevékenység naplózása"
 
 #. / 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/application-client.vala:121
+#: src/client/application/application-client.vala:126
 msgid "Log IMAP replay queue"
 msgstr "IMAP eseménysor naplózása"
 
-#. / Command line option. Serialization is how commands and
-#. / responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/application-client.vala:126
-msgid "Log IMAP network serialization"
-msgstr "IMAP hálózati sorosítás naplózása"
-
 #. / Command line option
 #: src/client/application/application-client.vala:129
+#| msgid "Log network activity"
+msgid "Log SMTP network activity"
+msgstr "SMTP hálózati tevékenység naplózása"
+
+#. / Command line option
+#: src/client/application/application-client.vala:132
 msgid "Log database queries (generates lots of messages)"
 msgstr "Adatbázis lekérdezések naplózása (sok üzenetet állít elő)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:135
 msgid "Perform a graceful quit"
 msgstr "Elegáns kilépés végrehajtása"
 
-#: src/client/application/application-client.vala:134
+#: src/client/application/application-client.vala:137
 msgid "Open a new window"
 msgstr "Új ablak megnyitása"
 
 #. / Command line option
-#: src/client/application/application-client.vala:137
+#: src/client/application/application-client.vala:140
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Az összes rögzített TLS kiszolgáló tanúsítvány visszavonása"
 
 #. / Command line option
-#: src/client/application/application-client.vala:140
+#: src/client/application/application-client.vala:143
 msgid "Display program version"
 msgstr "A program verziójának megjelenítése"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:264
+#: src/client/application/application-client.vala:275
 msgid "Geary version"
 msgstr "Geary verzió"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:266
+#: src/client/application/application-client.vala:277
 msgid "Geary revision"
 msgstr "Geary revízió"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:268
+#: src/client/application/application-client.vala:279
 msgid "GTK version"
 msgstr "GTK verzió"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:275
+#: src/client/application/application-client.vala:286
 msgid "GLib version"
 msgstr "GLib verzió"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:282
+#: src/client/application/application-client.vala:293
 msgid "WebKitGTK version"
 msgstr "WebKitGTK verzió"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:289
+#: src/client/application/application-client.vala:300
 msgid "Desktop environment"
 msgstr "Asztali környezet"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:291
+#: src/client/application/application-client.vala:302
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Ismeretlen"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:321
+#: src/client/application/application-client.vala:306
 msgid "Distribution name"
 msgstr "Disztribúció neve"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:326
+#: src/client/application/application-client.vala:311
 msgid "Distribution release"
 msgstr "Disztribúció kiadása"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:334
+#: src/client/application/application-client.vala:316
 msgid "Installation prefix"
 msgstr "Telepítési előtag"
 
-#: src/client/application/application-client.vala:587
+#: src/client/application/application-client.vala:574
 #, c-format
 msgid "About %s"
 msgstr "%s névjegye"
@@ -968,7 +955,7 @@ msgstr "%s névjegye"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada.taro@example.com>
-#: src/client/application/application-client.vala:591
+#: src/client/application/application-client.vala:578
 msgid "translator-credits"
 msgstr ""
 "Kelemen Gábor <kelemeng at gnome dot hu>\n"
@@ -978,39 +965,37 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:937
+#: src/client/application/application-client.vala:1097
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "A „--hidden” kapcsoló elavult, és el lesz távolítva a jövőben."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:970
+#: src/client/application/application-client.vala:1130
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Felismerhetetlen programargumentum: „%s”"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:458
+#: src/client/application/application-controller.vala:490
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Hiba történt a(z) %s fióknak történő levélküldéskor"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:462
+#: src/client/application/application-controller.vala:494
 msgid "Email will not be sent until re-connected"
 msgstr "A levél nem lesz elküldve, amíg nem kapcsolódik újra"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:568
-#| msgid "Conversation Shortcuts"
+#: src/client/application/application-controller.vala:593
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Beszélgetés megjelölve"
 msgstr[1] "Beszélgetések megjelölve"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:574
-#| msgid "No conversations found"
+#: src/client/application/application-controller.vala:599
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Beszélgetés megjelölésének visszavonása"
@@ -1019,10 +1004,9 @@ msgstr[1] "Beszélgetések megjelölésének visszavonása"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:600
-#: src/client/application/application-controller.vala:684
+#: src/client/application/application-controller.vala:625
+#: src/client/application/application-controller.vala:709
 #, c-format
-#| msgid "Conversation Shortcuts"
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
 msgstr[0] "Beszélgetés áthelyezve ide: %s"
@@ -1033,18 +1017,16 @@ msgstr[1] "Beszélgetések áthelyezve ide: %s"
 #. / of the source folder.
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:608
-#: src/client/application/application-controller.vala:630
+#: src/client/application/application-controller.vala:633
+#: src/client/application/application-controller.vala:655
 #, c-format
-#| msgid "Conversation Shortcuts"
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
 msgstr[0] "Beszélgetés visszaállítva ide: %s"
 msgstr[1] "Beszélgetések visszaállítva ide: %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:651
-#| msgid "Conversation Shortcuts"
+#: src/client/application/application-controller.vala:676
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Beszélgetés archiválva"
@@ -1052,17 +1034,15 @@ msgstr[1] "Beszélgetések archiválva"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:707
+#: src/client/application/application-controller.vala:732
 #, c-format
-#| msgid "Message not saved"
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
 msgstr[0] "Üzenet visszaállítva erre: %s"
 msgstr[1] "Üzenetek visszaállítva erre: %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:728
-#| msgid "Message not saved"
+#: src/client/application/application-controller.vala:753
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Üzenet archiválva"
@@ -1071,9 +1051,8 @@ msgstr[1] "Üzenetek archiválva"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:763
+#: src/client/application/application-controller.vala:788
 #, c-format
-#| msgid "Message not saved"
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
 msgstr[0] "Üzenet áthelyezve ide: %s"
@@ -1082,9 +1061,8 @@ msgstr[1] "Üzenetek áthelyezve ide: %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:791
+#: src/client/application/application-controller.vala:816
 #, c-format
-#| msgid "No conversations selected"
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
 msgstr[0] "Beszélgetés megcímkézve ekként: %s"
@@ -1093,19 +1071,19 @@ msgstr[1] "Beszélgetések megcímkézve ekként: %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:799
+#: src/client/application/application-controller.vala:824
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] "Beszélgetés ekként címkézésének visszavonása: %s"
 msgstr[1] "Beszélgetések ekként címkézésének visszavonása: %s"
 
-#: src/client/application/application-controller.vala:1222
+#: src/client/application/application-controller.vala:1331
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Nem sikerült megnyitni az adatbázist ehhez: %s"
 
-#: src/client/application/application-controller.vala:1223
+#: src/client/application/application-controller.vala:1332
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1129,20 +1107,20 @@ msgstr ""
 "Az adatbázis újjáépítése törölni fogja az összes helyi levelet és azok "
 "mellékleteit. <b>A kiszolgálón lévő levelek nem érintettek.</b>"
 
-#: src/client/application/application-controller.vala:1225
+#: src/client/application/application-controller.vala:1334
 msgid "_Rebuild"
 msgstr "Ú_jráépítés"
 
-#: src/client/application/application-controller.vala:1225
+#: src/client/application/application-controller.vala:1334
 msgid "E_xit"
 msgstr "_Kilépés"
 
-#: src/client/application/application-controller.vala:1235
+#: src/client/application/application-controller.vala:1344
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Nem sikerült újjáépíteni az adatbázist ehhez: „%s”"
 
-#: src/client/application/application-controller.vala:1236
+#: src/client/application/application-controller.vala:1345
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1155,91 +1133,152 @@ msgstr ""
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:1559
+#: src/client/application/application-controller.vala:1512
 #, c-format
 msgid "Email sent to %s"
 msgstr "E-mail elküldve ide: %s"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2642
+#: src/client/application/application-controller.vala:2502
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "A(z) „%s” címre küldendő e-mail sorba állítva kiküldéshez"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2706
+#: src/client/application/application-controller.vala:2566
 #, c-format
 msgid "Email to %s saved"
 msgstr "A(z) „%s” címre küldendő e-mail mentve"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2721
-#: src/client/application/application-controller.vala:2779
+#: src/client/application/application-controller.vala:2581
+#: src/client/application/application-controller.vala:2639
 msgid "Composer could not be restored"
 msgstr "A levélíró nem állítható vissza"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2764
+#: src/client/application/application-controller.vala:2624
 #, c-format
 msgid "Email to %s discarded"
 msgstr "A(z) „%s” címre küldendő e-mail elvetve"
 
+#. / Translators: Label for account database upgrade dialog
+#: src/client/application/application-database-manager.vala:74
+#| msgid "Geary update in progress…"
+msgid "Account update in progress"
+msgstr "Fiókfrissítés folyamatban"
+
+#. / Translators: Window title for account database upgrade
+#. / dialog
+#: src/client/application/application-database-manager.vala:80
+#| msgid "Account name"
+msgid "Account update"
+msgstr "Fiókfrissítés"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:580
+msgid "Working offline"
+msgstr "Kapcsolat nélküli munka"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:582
+msgid "You will not be able to send or receive email until re-connected."
+msgstr ""
+"Nem lesz képes leveleket küldeni vagy fogadni, amíg nem kapcsolódik újra."
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:589
+msgid "Login problem"
+msgstr "Bejelentkezési probléma"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:591
+msgid "An account has reported an incorrect login or password."
+msgstr "Egy fiók helytelen bejelentkezési nevet vagy jelszót jelentett."
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:598
+msgid "Retry login, you will be prompted for your password"
+msgstr "Bejelentkezés újrapróbálása, a jelszava bekérésre fog kerülni"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:605
+msgid "Security problem"
+msgstr "Biztonsági probléma"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:607
+msgid "An account has reported an untrusted server."
+msgstr "Egy fiók nem megbízható kiszolgálót jelentett."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:610
+msgid "Check"
+msgstr "Ellenőrzés"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:614
+msgid "Check the security details for the connection"
+msgstr "A kapcsolat biztonsági részleteinek ellenőrzése"
+
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
 #. / the second being the selected account name.
-#: src/client/application/application-main-window.vala:560
+#: src/client/application/application-main-window.vala:657
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: src/client/application/application-main-window.vala:967
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:1048
+#: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Címkék"
 
+#: src/client/application/application-main-window.vala:1366
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Minden levelet kiürít a(z) %s mappából?"
+
+#: src/client/application/application-main-window.vala:1367
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+"Ez eltávolítja a levelet a Geary programból és a levelezőkiszolgálóról."
+
+#: src/client/application/application-main-window.vala:1368
+msgid "This cannot be undone."
+msgstr "Ez nem vonható vissza."
+
+#: src/client/application/application-main-window.vala:1369
+#, c-format
+msgid "Empty %s"
+msgstr "%s ürítése"
+
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1306
-#| msgid "Do you want to permanently delete this message?"
-#| msgid_plural "Do you want to permanently delete these messages?"
+#: src/client/application/application-main-window.vala:1426
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Véglegesen törölni szeretné ezt a beszélgetést?"
 msgstr[1] "Véglegesen törölni szeretné ezeket a beszélgetéseket?"
 
-#: src/client/application/application-main-window.vala:1311
-#: src/client/application/application-main-window.vala:1326
+#: src/client/application/application-main-window.vala:1431
+#: src/client/application/application-main-window.vala:1446
 msgid "Delete"
 msgstr "Törlés"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1321
+#: src/client/application/application-main-window.vala:1441
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Véglegesen törölni szeretné ezt a levelet?"
 msgstr[1] "Véglegesen törölni szeretné ezeket a leveleket?"
 
-#: src/client/application/application-main-window.vala:1334
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Minden levelet kiürít a(z) %s mappából?"
-
-#: src/client/application/application-main-window.vala:1337
-msgid "This removes the email from Geary and your email server."
-msgstr ""
-"Ez eltávolítja a levelet a Geary programból és a levelezőkiszolgálóról."
-
-#: src/client/application/application-main-window.vala:1338
-msgid "This cannot be undone."
-msgstr "Ez nem vonható vissza."
-
-#: src/client/application/application-main-window.vala:1339
-#, c-format
-msgid "Empty %s"
-msgstr "%s ürítése"
-
-#: src/client/application/application-main-window.vala:1669
+#: src/client/application/application-main-window.vala:1732
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1250,7 +1289,7 @@ msgstr "%s (%d)"
 #. Document (100.9MB)
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
 #: src/client/components/components-attachment-pane.vala:107
-#: src/client/composer/composer-widget.vala:1834
+#: src/client/composer/composer-widget.vala:1875
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1271,63 +1310,109 @@ msgstr ""
 msgid "Don’t _ask me again"
 msgstr "Ne _kérdezze újra"
 
-#: src/client/components/components-inspector.vala:72
+#: src/client/components/components-conversation-actions.vala:90
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Beszélgetés megjelölése"
+msgstr[1] "Beszélgetések megjelölése"
+
+#: src/client/components/components-conversation-actions.vala:95
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Címke hozzáadása a beszélgetéshez"
+msgstr[1] "Címke hozzáadása a beszélgetésekhez"
+
+#: src/client/components/components-conversation-actions.vala:100
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Beszélgetés áthelyezése"
+msgstr[1] "Beszélgetések áthelyezése"
+
+#: src/client/components/components-conversation-actions.vala:105
+#: src/client/conversation-list/conversation-list-view.vala:445
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Beszélgetés archiválása"
+msgstr[1] "Beszélgetések archiválása"
+
+#: src/client/components/components-conversation-actions.vala:116
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Beszélgetés áthelyezése a Kukába"
+msgstr[1] "Beszélgetések áthelyezése a Kukába"
+
+#: src/client/components/components-conversation-actions.vala:126
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Beszélgetés törlése"
+msgstr[1] "Beszélgetések törlése"
+
+#: src/client/components/components-info-bar.vala:252
+msgid "Information"
+msgstr "Információ"
+
+#: src/client/components/components-info-bar.vala:256
+msgid "Question"
+msgstr "Kérdés"
+
+#: src/client/components/components-info-bar.vala:260
+msgid "Warning"
+msgstr "Figyelmeztetés"
+
+#: src/client/components/components-info-bar.vala:264
+msgid "Error"
+msgstr "Hiba"
+
+#: src/client/components/components-inspector.vala:78
 msgid "Inspector"
 msgstr "Vizsgáló"
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:87
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
+#: src/client/components/components-inspector.vala:93
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
 msgid "Logs"
 msgstr "Naplók"
 
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
 #. / pane
-#: src/client/components/components-inspector.vala:91
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
+#: src/client/components/components-inspector.vala:97
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
 msgid "System"
 msgstr "Rendszer"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:208
-#: src/client/components/components-inspector.vala:211
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: 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:42
 msgid "Save As"
 msgstr "Mentés másként"
 
-#: src/client/components/components-inspector.vala:212
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
-#: ui/accounts_editor_servers_pane.ui:17
+#: src/client/components/components-inspector.vala:230
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: ui/accounts_editor_servers_pane.ui:15 ui/composer-headerbar.ui:55
 msgid "Cancel"
 msgstr "Mégse"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:43
+#: src/client/components/components-preferences-window.vala:124
 msgid "_Automatically select next message"
 msgstr "Következő levél _automatikus kiválasztása"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:53
+#: src/client/components/components-preferences-window.vala:134
 msgid "_Display conversation preview"
 msgstr "_Beszélgetés előnézetének megjelenítése"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:63
-msgid "Use _three pane view"
-msgstr "_Három ablaktábla nézet használata"
-
-#. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:73
-#| msgctxt "shortcut window"
-#| msgid "Single-key shortcuts"
+#: src/client/components/components-preferences-window.vala:144
 msgid "Use _single key email shortcuts"
 msgstr "_Egybillentyűs e-mail-gyorsbillentyűk használata"
 
-#: src/client/components/components-preferences-window.vala:75
+#: src/client/components/components-preferences-window.vala:146
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1336,25 +1421,104 @@ msgstr ""
 "igénylik a <Ctrl> lenyomását"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:86
+#: src/client/components/components-preferences-window.vala:157
 msgid "_Watch for new mail when closed"
 msgstr "Zárt állapotban is _figyeljen az új levél érkezésére"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:90
+#: src/client/components/components-preferences-window.vala:161
 msgid "Geary will keep running after all windows are closed"
 msgstr "A Geary továbbra is futni fog az összes ablak bezárása után"
 
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:178
+#| msgid "_Preferences"
+msgid "Preferences"
+msgstr "Beállítások"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:234
+msgid "Plugins"
+msgstr "Bővítmények"
+
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:36
+msgid "Account problem"
+msgstr "Fiókprobléma"
+
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/components-problem-report-info-bar.vala:40
+#, c-format
+msgid "Geary has encountered a problem with %s."
+msgstr "A Geary problémát észlelt ezzel: %s."
+
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/components-problem-report-info-bar.vala:53
+#, c-format
+msgid "Geary encountered a problem checking mail for %s."
+msgstr "A Geary problémába ütközött a(z) %s fiók leveleinek ellenőrzésekor."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
+msgid "Try reconnecting"
+msgstr "Próbáljon meg újrakapcsolódni"
+
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/components-problem-report-info-bar.vala:65
+#, c-format
+msgid "Geary encountered a problem sending email for %s."
+msgstr "A Geary problémába ütközött a(z) %s fiók leveleinek elküldésekor."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
+msgid "Retry sending queued messages"
+msgstr "Postázandó levelek elküldésének újrapróbálása"
+
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:76
+msgid "Geary has encountered a problem"
+msgstr "A Geary problémát észlelt"
+
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/components-problem-report-info-bar.vala:80
+msgid "Please report the details if it persists."
+msgstr "Jelentse a részleteket, ha továbbra is fennáll."
+
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
+msgid "_Details"
+msgstr "_Részletek"
+
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:97
+msgid "View technical details about the error"
+msgstr "A hiba műszaki részleteinek megtekintése"
+
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
+msgid "_Retry"
+msgstr "Ú_jra"
+
 #. / Translators: Search entry placeholder text
 #: src/client/components/components-search-bar.vala:12
 #: src/client/folder-list/folder-list-search-branch.vala:53
-#: src/engine/api/geary-special-folder-type.vala:51
+#: src/client/util/util-i18n.vala:298
 msgid "Search"
 msgstr "Keresés"
 
 #. / Translators: Search entry tooltip
 #: src/client/components/components-search-bar.vala:32
-#| msgid "Search all mail in account for keywords (Ctrl+S)"
 msgid "Search all mail in account for keywords"
 msgstr "A fiók minden levélének keresése kulcsszavakra"
 
@@ -1368,135 +1532,30 @@ msgstr "%s fiók keresése"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:390
+#: src/client/components/components-validator.vala:394
 msgid "An email address is required"
 msgstr "Egy e-mail cím szükséges"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:394
+#: src/client/components/components-validator.vala:398
 msgid "Not a valid email address"
 msgstr "Nem érvénytelen e-mail cím"
 
 #. Translators: Tooltip used when an entry requires a valid,
 #. resolvable server name to be entered, but one is not
 #. provided.
-#: src/client/components/components-validator.vala:440
+#: src/client/components/components-validator.vala:444
 msgid "A server name is required"
 msgstr "Egy kiszolgálónév szükséges"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. server name to be entered, but it was unable to be
 #. looked-up in the DNS.
-#: src/client/components/components-validator.vala:445
+#: src/client/components/components-validator.vala:449
 msgid "Could not look up server name"
 msgstr "Nem sikerült megkeresni a kiszolgáló nevét"
 
-#: src/client/components/main-toolbar.vala:116
-msgid "Mark conversation"
-msgid_plural "Mark conversations"
-msgstr[0] "Beszélgetés megjelölése"
-msgstr[1] "Beszélgetések megjelölése"
-
-#: src/client/components/main-toolbar.vala:121
-msgid "Add label to conversation"
-msgid_plural "Add label to conversations"
-msgstr[0] "Címke hozzáadása a beszélgetéshez"
-msgstr[1] "Címke hozzáadása a beszélgetésekhez"
-
-#: src/client/components/main-toolbar.vala:126
-msgid "Move conversation"
-msgid_plural "Move conversations"
-msgstr[0] "Beszélgetés áthelyezése"
-msgstr[1] "Beszélgetések áthelyezése"
-
-#: src/client/components/main-toolbar.vala:131
-msgid "Archive conversation"
-msgid_plural "Archive conversations"
-msgstr[0] "Beszélgetés archiválása"
-msgstr[1] "Beszélgetések archiválása"
-
-#: src/client/components/main-toolbar.vala:142
-msgid "Move conversation to Trash"
-msgid_plural "Move conversations to Trash"
-msgstr[0] "Beszélgetés áthelyezése a Kukába"
-msgstr[1] "Beszélgetések áthelyezése a Kukába"
-
-#: src/client/components/main-toolbar.vala:152
-msgid "Delete conversation"
-msgid_plural "Delete conversations"
-msgstr[0] "Beszélgetés törlése"
-msgstr[1] "Beszélgetések törlése"
-
-#. Translators: Info bar title for a generic account
-#. problem.
-#: src/client/components/main-window-info-bar.vala:44
-msgid "Account problem"
-msgstr "Fiókprobléma"
-
-#. Translators: Info bar sub-title for a generic account
-#. problem. String substitution is the account name.
-#: src/client/components/main-window-info-bar.vala:48
-#, c-format
-msgid "Geary has encountered a problem with %s."
-msgstr "A Geary problémát észlelt ezzel: %s."
-
-#. Translators: Info bar sub-title for a generic
-#. account problem. String substitution is the
-#. account name.
-#: src/client/components/main-window-info-bar.vala:61
-#, c-format
-msgid "Geary encountered a problem checking mail for %s."
-msgstr "A Geary problémába ütközött a(z) %s fiók leveleinek ellenőrzésekor."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:65
-msgid "Try reconnecting"
-msgstr "Próbáljon meg újrakapcsolódni"
-
-#. Translators: Info bar title for an outgoing
-#. account problem. String substitution is the
-#. account name
-#: src/client/components/main-window-info-bar.vala:73
-#, c-format
-msgid "Geary encountered a problem sending email for %s."
-msgstr "A Geary problémába ütközött a(z) %s fiók leveleinek elküldésekor."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:77
-msgid "Retry sending queued messages"
-msgstr "Postázandó levelek elküldésének újrapróbálása"
-
-#. Translators: Info bar title for a generic application
-#. problem.
-#: src/client/components/main-window-info-bar.vala:84
-msgid "Geary has encountered a problem"
-msgstr "A Geary problémát észlelt"
-
-#. Translators: Info bar sub-title for a generic
-#. application problem.
-#: src/client/components/main-window-info-bar.vala:88
-msgid "Please report the details if it persists."
-msgstr "Jelentse a részleteket, ha továbbra is fennáll."
-
-#. Translators: Button label for viewing technical details
-#. for a problem report.
-#: src/client/components/main-window-info-bar.vala:99
-msgid "_Details"
-msgstr "_Részletek"
-
-#. Translators: Tooltip for viewing technical details for
-#. a problem report.
-#: src/client/components/main-window-info-bar.vala:102
-msgid "View technical details about the error"
-msgstr "A hiba műszaki részleteinek megtekintése"
-
-#. Translators: Button label for retrying a server
-#. connection
-#: src/client/components/main-window-info-bar.vala:108
-msgid "_Retry"
-msgstr "Ú_jra"
-
 #. / 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…"
@@ -1517,10 +1576,6 @@ msgstr "Hiba az elküldött levél mentésekor"
 msgid "_OK"
 msgstr "_OK"
 
-#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
-msgid "_Cancel"
-msgstr "Mé_gse"
-
 #: src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Névjegy"
@@ -1537,15 +1592,17 @@ msgstr "_Bezárás"
 msgid "_Discard"
 msgstr "El_dobás"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "_Súgó"
 
-#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "_Beállítások"
 
@@ -1571,6 +1628,10 @@ msgstr "_Mentés"
 msgid "_Keep"
 msgstr "_Megtartás"
 
+#: src/client/composer/composer-editor.vala:680
+msgid "Select Color"
+msgstr "Szín kiválasztása"
+
 #: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com"
 msgstr "A hivatkozás URL nem helyesen formázott, például http://example.com"
@@ -1584,23 +1645,23 @@ msgid "Invalid email address"
 msgstr "Érvénytelen e-mail cím"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:30
+#: src/client/composer/composer-widget.vala:32
 msgid "New Message"
 msgstr "Új levél"
 
-#: src/client/composer/composer-widget.vala:217
+#: src/client/composer/composer-widget.vala:233
 msgid "Saved"
 msgstr "Elmentve"
 
-#: src/client/composer/composer-widget.vala:218
+#: src/client/composer/composer-widget.vala:234
 msgid "Saving"
 msgstr "Mentés"
 
-#: src/client/composer/composer-widget.vala:219
+#: src/client/composer/composer-widget.vala:235
 msgid "Error saving"
 msgstr "Hiba a mentéskor"
 
-#: src/client/composer/composer-widget.vala:220
+#: src/client/composer/composer-widget.vala:236
 msgid "Press Backspace to delete quote"
 msgstr "Nyomja meg a Backspace billentyűt az idézet törléséhez"
 
@@ -1609,7 +1670,7 @@ msgstr "Nyomja meg a Backspace billentyűt az idézet törléséhez"
 #. checking, include all variants of each word. No spaces are
 #. allowed. The words will be converted to lower case based on
 #. locale and English versions included automatically.
-#: src/client/composer/composer-widget.vala:236
+#: src/client/composer/composer-widget.vala:252
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1624,118 +1685,140 @@ msgstr ""
 "önéletrajzot|önéletrajzom|önéletrajzomat|.doc|.docx|.pdf|.xls|.xlsx|.ppt|."
 "pptx|.rtf|.pps|.odt|.ods|.odp|.odg|.odb"
 
+#. / Translators: Label for composer From address entry
+#: src/client/composer/composer-widget.vala:488
+#| msgid "_From:"
+msgid "_From"
+msgstr "_Feladó"
+
+#. / Translators: Label for composer To address entry
+#: src/client/composer/composer-widget.vala:498
+msgid "_To"
+msgstr "_Címzett"
+
+#. / Translators: Label for composer CC address entry
+#: src/client/composer/composer-widget.vala:507
+msgid "_Cc"
+msgstr "_Másolat"
+
+#. / Translators: Label for composer BCC address entry
+#: src/client/composer/composer-widget.vala:515
+msgid "_Bcc"
+msgstr "Titk_os másolat"
+
+#. / Translators: Label for composer Reply-To address entry
+#: src/client/composer/composer-widget.vala:523
+#| msgid "Reply to:"
+msgid "_Reply to"
+msgstr "_Válasz neki"
+
+#. / Translators: Label for composer Subject line entry
+#: src/client/composer/composer-widget.vala:531
+msgid "_Subject"
+msgstr "_Tárgy"
+
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:843
+#: src/client/composer/composer-widget.vala:909
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Megtartja vagy eldobja ezt a piszkozatlevelet?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:869
+#: src/client/composer/composer-widget.vala:935
 msgid "Do you want to discard this draft message?"
 msgstr "El szeretné dobni ezt a piszkozatlevelet?"
 
-#: src/client/composer/composer-widget.vala:1503
+#: src/client/composer/composer-widget.vala:1508
 msgid "Send message with an empty subject and body?"
 msgstr "Elküldi a levelet üres tárggyal és törzzsel?"
 
-#: src/client/composer/composer-widget.vala:1505
+#: src/client/composer/composer-widget.vala:1510
 msgid "Send message with an empty subject?"
 msgstr "Elküldi a levelet üres tárggyal?"
 
-#: src/client/composer/composer-widget.vala:1507
+#: src/client/composer/composer-widget.vala:1512
 msgid "Send message with an empty body?"
 msgstr "Elküldi a levelet üres törzzsel?"
 
-#: src/client/composer/composer-widget.vala:1516
+#: src/client/composer/composer-widget.vala:1521
 msgid "Send message without an attachment?"
 msgstr "Elküldi a levelet melléklet nélkül?"
 
-#: src/client/composer/composer-widget.vala:1820
+#: src/client/composer/composer-widget.vala:1863
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "„%s” már csatolva van a küldeményhez."
 
-#: src/client/composer/composer-widget.vala:1856
-#: src/client/composer/composer-widget.vala:1906
+#: src/client/composer/composer-widget.vala:1895
+#: src/client/composer/composer-widget.vala:1945
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "„%s” egy üres fájl."
 
-#: src/client/composer/composer-widget.vala:1894
+#: src/client/composer/composer-widget.vala:1933
 #, c-format
 msgid "“%s” could not be found."
 msgstr "„%s” nem található."
 
-#: src/client/composer/composer-widget.vala:1900
+#: src/client/composer/composer-widget.vala:1939
 #, c-format
 msgid "“%s” is a folder."
 msgstr "„%s” egy mappa."
 
-#: src/client/composer/composer-widget.vala:1919
+#: src/client/composer/composer-widget.vala:1958
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "„%s” nem nyitható meg olvasásra."
 
-#: src/client/composer/composer-widget.vala:1927
+#: src/client/composer/composer-widget.vala:1966
 msgid "Cannot add attachment"
 msgstr "Nem sikerült mellékletet hozzáadni"
 
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:2037
+msgid "Images"
+msgstr "Képek"
+
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1984
-#: src/client/conversation-viewer/conversation-email.vala:559
-#: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:2101
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:267 ui/conversation-message.ui:283
 msgid "To:"
 msgstr "Címzett:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1990
-#: src/client/conversation-viewer/conversation-email.vala:564
-#: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:2107
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:272 ui/conversation-message.ui:324
 msgid "Cc:"
 msgstr "Másolat:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1996
-#: src/client/conversation-viewer/conversation-email.vala:569
-#: ui/conversation-message.ui:402
+#: src/client/composer/composer-widget.vala:2113
+#: src/client/conversation-viewer/conversation-email.vala:552
+#: ui/conversation-message.ui:365
 msgid "Bcc:"
 msgstr "Rejtett másolat:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2002
+#: src/client/composer/composer-widget.vala:2119
 msgid "Reply-To: "
 msgstr "Válaszcím: "
 
-#: src/client/composer/composer-widget.vala:2254
-msgid "Select Color"
-msgstr "Szín kiválasztása"
-
 #. 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:2439
+#: src/client/composer/composer-widget.vala:2237
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s ezen keresztül: %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:2495
-msgid "_From:"
-msgstr "_Feladó:"
-
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2800
-msgid "Images"
-msgstr "Képek"
-
 #: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Nyelv eltávolítása az előnyben részesített listáról"
@@ -1749,51 +1832,51 @@ msgid "Search for more languages"
 msgstr "Több nyelv keresése"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:335
+#: src/client/conversation-list/conversation-list-view.vala:389
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Beszélgetés áthelyezése a _Kukába"
 msgstr[1] "Beszélgetések áthelyezése a _Kukába"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
+#: src/client/conversation-list/conversation-list-view.vala:401
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "Beszélgetés _törlése"
 msgstr[1] "Beszélgetések _törlése"
 
-#: src/client/conversation-list/conversation-list-view.vala:360
+#: src/client/conversation-list/conversation-list-view.vala:414
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Megjelölés _olvasottként"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:422
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Megjelölés ol_vasatlanként"
 
-#: src/client/conversation-list/conversation-list-view.vala:376
+#: src/client/conversation-list/conversation-list-view.vala:430
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "C_sillagozás megszüntetése"
 
-#: src/client/conversation-list/conversation-list-view.vala:383
+#: src/client/conversation-list/conversation-list-view.vala:437
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Csillagozás"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:392
+#: src/client/conversation-list/conversation-list-view.vala:454
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Válasz"
 
-#: src/client/conversation-list/conversation-list-view.vala:398
+#: src/client/conversation-list/conversation-list-view.vala:460
 msgid "R_eply All"
 msgstr "Válasz _mindenkinek"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:404
+#: src/client/conversation-list/conversation-list-view.vala:466
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "T_ovábbítás"
@@ -1803,20 +1886,20 @@ msgid "Me"
 msgstr "Én"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:554
-#: src/client/util/util-email.vala:226
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:258
 msgid "From:"
 msgstr "Feladó:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:574
-#: src/client/util/util-email.vala:231
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:263
 msgid "Date:"
 msgstr "Dátum:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:584
-#: src/client/util/util-email.vala:229
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:261
 msgid "Subject:"
 msgstr "Tárgy:"
 
@@ -1824,48 +1907,90 @@ msgstr "Tárgy:"
 msgid "This email address may have been forged"
 msgstr "Ez az e-mail cím hamisított lehet"
 
+#. 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 Images"
+msgid "Show less"
+msgstr "Kevesebb megjelenítése"
+
+#. 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…"
+msgid_plural "%d more…"
+msgstr[0] "%d további…"
+msgstr[1] "%d további…"
+
 #. 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:438
+#: src/client/conversation-viewer/conversation-message.vala:552
 msgid "No sender"
 msgstr "Nincs feladó"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:830
+#: src/client/conversation-viewer/conversation-message.vala:1044
 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:950
+#: src/client/conversation-viewer/conversation-message.vala:1166
 msgid "Image"
 msgstr "Kép"
 
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1438
+msgid "Remote images not shown"
+msgstr "A távoli képek nincsenek megjelenítve"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1440
+msgid "Only show remote images from senders you trust."
+msgstr "A távoli képek megjelenítése csak a megbízható feladóktól."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1444
+#| msgctxt "shortcut window"
+#| msgid "Show help"
+msgid "Show"
+msgstr "Megjelenítés"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1448
+#| msgid "Always Show From Sender"
+msgid "Always show from sender"
+msgstr "Mindig jelenítse meg a feladótól"
+
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:83
+#: src/client/conversation-viewer/conversation-viewer.vala:95
 msgid "No conversations selected"
 msgstr "Nincs beszélgetés kiválasztva"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:87
+#: src/client/conversation-viewer/conversation-viewer.vala:99
 msgid "Selecting a conversation from the list will display it here"
 msgstr "A listában kiválasztott beszélgetés itt fog megjelenni"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:96
+#: src/client/conversation-viewer/conversation-viewer.vala:108
 msgid "Multiple conversations selected"
 msgstr "Több beszélgetés kijelölve"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:100
+#: src/client/conversation-viewer/conversation-viewer.vala:112
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "A kiválasztott művelet minden beszélgetésen végre lesz hajtva"
 
@@ -1873,20 +1998,20 @@ msgstr "A kiválasztott művelet minden beszélgetésen végre lesz hajtva"
 #. 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:109
-#: src/client/conversation-viewer/conversation-viewer.vala:122
+#: src/client/conversation-viewer/conversation-viewer.vala:121
+#: src/client/conversation-viewer/conversation-viewer.vala:134
 msgid "No conversations found"
 msgstr "Nem találhatóak beszélgetések"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:113
+#: src/client/conversation-viewer/conversation-viewer.vala:125
 msgid "This folder does not contain any conversations"
 msgstr "Ez a mappa nem tartalmaz beszélgetést"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:126
+#: src/client/conversation-viewer/conversation-viewer.vala:138
 msgid "Your search returned no results, try refining your search terms"
 msgstr "A keresés nem adott találatokat, finomítsa a keresési kifejezéseket"
 
@@ -1979,8 +2104,8 @@ msgstr "Hiba történt a kiszolgáló tanúsítványának feldolgozása során"
 #. / Translators: Title for problem report dialog error
 #. / information pane
 #. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:100
-#: ui/problem-details-dialog.ui:12
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:15
 msgid "Details"
 msgstr "Részletek"
 
@@ -1991,26 +2116,32 @@ msgstr "Részletek"
 msgid "Geary requires your email password to continue"
 msgstr "A Geary az e-mail jelszavát igényli a folytatáshoz"
 
-#. 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"
 msgstr[0] "%d levél"
 msgstr[1] "%d levél"
 
-#. / 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"
 msgstr[0] "%d olvasatlan"
 msgstr[1] "%d olvasatlan"
 
-#. / 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"
@@ -2026,45 +2157,242 @@ msgid_plural "%d results"
 msgstr[0] "%d találat"
 msgstr[1] "%d találat"
 
-#. / 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 for %s)"
+#| msgid_plural ""
+#| "%s\n"
+#| "(%d other new messages for %s)"
+msgid ""
+"%s\n"
+"(%d other new message)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages)"
+msgstr[0] ""
+"%s\n"
+"(%d további új levél)"
+msgstr[1] ""
+"%s\n"
+"(%d további új levél)"
+
+#. / 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"
 msgstr[0] "%d új levél"
 msgstr[1] "%d új levél"
 
-#. / 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"
 msgstr[0] "%s, összesen %d új levél"
 msgstr[1] "%s, összesen %d új levél"
 
-#: 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"
-"(további %d új levél ehhez: %s)"
-msgstr[1] ""
-"%s\n"
-"(további %d új levél ehhez: %s)"
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
+#| msgid "New Message"
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Új levél"
+msgstr[1] "Új levelek"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+#| msgid "Email address"
+msgid "Email Templates"
+msgstr "E-mail sablonok"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Újrahasználható sablonok létrehozása levélküldéshez"
+
+#. Translators: Templates folder name alternatives. Separate names
+#. using a vertical bar and put the most common localized name to
+#. the front for the default. English names do not need to be
+#. included.
+#: src/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
+#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr "Sablonok | Sablonlevelek | Sablon e-mailek"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Sablonok"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:282
+#| msgid "Now"
+msgid "New"
+msgstr "Új"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+#| msgid "Message not saved"
+msgid "Message template"
+msgstr "Levélsablon"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+#| msgctxt "shortcut window"
+#| msgid "Send"
+msgid "Send"
+msgstr "Küldés"
+
+#. 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
+#| msgctxt "shortcut window"
+#| msgid "Editing"
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#. / 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 "Körlevél"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr "Töltsön ki és küldjön e-mail-sablonokat egy munkafüzet segítségével"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+#| msgid "_Star"
+msgid "Start"
+msgstr "Kezdés"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Szüneteltetés"
+
+#. 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] "%u / %u elküldve"
+msgstr[1] "%u / %u elküldve"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr "Körlevélsablon"
+
+#. 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 "Egyesítés"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+#| msgid "Insert an image"
+msgid "Insert field"
+msgstr "Mező beszúrása"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Vesszővel elválasztott értékek (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Levelezési menü"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+#| msgid "Desktop notification of new mail"
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Megjeleníti a Unity levelezési menü értesítéseket az új leveleknél"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s — Új levelek"
 
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+msgid "Sent Sound"
+msgstr "Elküldési hang"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr ""
+"Lejátssza az asztali környezet elküldési hangját, ha egy e-mail elküldésre"
+" került"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+#| msgid "Empty %s"
+msgid "Empty"
+msgstr "Üres"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Piszkozat"
+
+#. 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 "Ez a levél még nem lett elküldve."
+
+#. 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 "A levél nincs mentve"
+
+#. 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 ""
+"Ez a levél sikeresen el lett küldve, de nem sikerült elmenteni a fiókjába."
+
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:69
@@ -2133,33 +2461,17 @@ msgstr "Tegnap"
 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
-msgid "%a, %b %-e, %Y at %l:%M %P"
-msgstr "%Y. %b. %-e., %a. %H:%M-kor"
-
-#. / 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
-msgid "%a, %b %-e, %Y at %H:%M"
-msgstr "%Y. %b. %-e., %a. %H:%M-kor"
-
-#. / 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 %X"
-msgstr "%Y. %b. %-e., %a %X-kor"
-
-#: src/client/util/util-email.vala:38
-#: src/engine/rfc822/rfc822-message.vala:1000
-msgid "(no subject)"
-msgstr "(nincs tárgy)"
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:52
+#| msgid "(no subject)"
+msgid "(No subject)"
+msgstr "(Nincs tárgy)"
 
 #. / Translators: This is shown for displaying a list of email
 #. / recipients that happens to be empty, i.e. contains no
 #. / email addresses.
-#: src/client/util/util-email.vala:134
+#: src/client/util/util-email.vala:150
 msgid "(No recipients)"
 msgstr "(Nincsenek címzettek)"
 
@@ -2168,39 +2480,226 @@ msgstr "(Nincsenek címzettek)"
 #. / addresses. The first (string) substitution is
 #. / address of the first, the second substitution is
 #. / the number of n - 1 remaining recipients.
-#: src/client/util/util-email.vala:146
+#: src/client/util/util-email.vala:162
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
 msgstr[0] "%s és %d másik"
 msgstr[1] "%s és %d másik"
 
+#. / GLib g_date_time_format format string for the date and
+#. / time that a message being replied to was
+#. / received. This should be roughly similar to an RFC
+#. / 822-style date header value with optional additional
+#. / punctuation for readability. Note that this date may
+#. / be sent to someone in a different locale than the
+#. / sender, so should be unambiguous (for example, do not
+#. / use mm/dd/yyyy since it could be confused with
+#. / dd/mm/yyyy) and must include the time zone.
+#: src/client/util/util-email.vala:194
+#| msgid "%a, %b %-e, %Y at %X"
+msgid "%a, %b %-e %Y at %X %Z"
+msgstr "%Y. %b. %-e., %a %X-kor (%Z)"
+
 #. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: src/client/util/util-email.vala:179
+#. / %1$s will be substituted for the date, and %2$s
+#. / will be substituted for the original sender.
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "%1$s-kor, %2$s írta:"
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:186
+#. / 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:211
 #, c-format
 msgid "%s wrote:"
 msgstr "%s írta:"
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:192
+#. / 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:221
 #, c-format
 msgid "On %s:"
 msgstr "Ekkor: %s:"
 
-#: src/client/util/util-email.vala:221
+#: src/client/util/util-email.vala:253
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Továbbított levél -----------"
 
+#. / Translators: Can be typed in the search box like
+#. / "attachment:file.txt" to find messages with attachments
+#. / with a particular name.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:605
+msgctxt "Search operator"
+msgid "attachment"
+msgstr "melléklet"
+
+#. / Translators: Can be typed in the search box like
+#. / "bcc:johndoe@example.com" to find messages bcc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:618
+msgctxt "Search operator"
+msgid "bcc"
+msgstr "rejtett másolat"
+
+#. / Translators: Can be typed in the search box like
+#. / "body:word" to find "word" only if it occurs in the body
+#. / of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:630
+msgctxt "Search operator"
+msgid "body"
+msgstr "törzs"
+
+#. / Translators: Can be typed in the search box like
+#. / "cc:johndoe@example.com" to find messages cc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:642
+msgctxt "Search operator"
+msgid "cc"
+msgstr "másolat"
+
+#. / Translators: Can be typed in the search box like
+#. / "from:johndoe@example.com" to find messages from a
+#. / particular sender.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:654
+msgctxt "Search operator"
+msgid "from"
+msgstr "feladó"
+
+#. / Translators: Can be typed in the search box like
+#. / "subject:word" to find "word" only if it occurs in the
+#. / subject of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:668
+msgctxt "Search operator"
+msgid "subject"
+msgstr "tárgy"
+
+#. / Translators: Can be typed in the search box like
+#. / "to:johndoe@example.com" to find messages received by a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:680
+msgctxt "Search operator"
+msgid "to"
+msgstr "címzett"
+
+#. / Translators: Can be typed in the search box after "to:",
+#. / "cc:" and "bcc:" e.g.: "to:me". Matches conversations that
+#. / are addressed to the user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:691
+msgctxt "Search operator value - mail addressed to the user"
+msgid "me"
+msgstr "én"
+
+#. / Translators: Can be typed in the search box after "from:"
+#. / i.e.: "from:me". Matches conversations were sent by the
+#. / user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:704
+msgctxt "Search operator value - mail sent by the user"
+msgid "me"
+msgstr "én"
+
+#. Boolean operators
+#. /////////////////////////////////////////////////////////
+#. / Translators: Can be typed in the search box like
+#. / "is:unread" to find messages that are read, unread, or
+#. / starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:719
+msgctxt "Search operator"
+msgid "is"
+msgstr "ilyen"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:unread". Matches conversations that are flagged
+#. / unread.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:729
+msgctxt "'is:' search operator value"
+msgid "unread"
+msgstr "olvasatlan"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:read". Matches conversations that are flagged as
+#. / read.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:739
+msgctxt "'is:' search operator value"
+msgid "read"
+msgstr "olvasatlan"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:starred". Matches conversations that are flagged
+#. / as starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:749
+msgctxt "'is:' search operator value"
+msgid "starred"
+msgstr "csillagozott"
+
 #: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bájt"
@@ -2225,219 +2724,52 @@ 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 "Beérkezett üzenetek"
 
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Piszkozatok"
 
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Elküldött levelek"
+#: src/client/util/util-i18n.vala:277
+#| msgid "Sent by:"
+msgid "Sent"
+msgstr "Elküldött"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Csillagozott"
 
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Fontos"
 
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Minden levél"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "Postázandó"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Archívum"
 
-#. Map of possibly translated search operator names and values
-#. to English/internal names and values. We include the
-#. English version anyway so that when translations provide a
-#. localised version of the operator names but have not also
-#. translated the user manual, the English version in the
-#. manual still works.
-#. Can be typed in the search box like "attachment:file.txt"
-#. to find messages with attachments with a particular name.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:130
-msgctxt "Search operator"
-msgid "attachment"
-msgstr "melléklet"
-
-#. Can be typed in the search box like
-#. "bcc:johndoe@example.com" to find messages bcc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:139
-msgctxt "Search operator"
-msgid "bcc"
-msgstr "rejtett másolat"
-
-#. Can be typed in the search box like "body:word" to find
-#. "word" only if it occurs in the body of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:147
-msgctxt "Search operator"
-msgid "body"
-msgstr "törzs"
-
-#. Can be typed in the search box like
-#. "cc:johndoe@example.com" to find messages cc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:156
-msgctxt "Search operator"
-msgid "cc"
-msgstr "másolat"
-
-#. Can be typed in the search box like
-#. "from:johndoe@example.com" to find messages from a
-#. particular sender.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:165
-msgctxt "Search operator"
-msgid "from"
-msgstr "feladó"
-
-#. Can be typed in the search box like "is:unread" to find
-#. messages that are read, unread, or starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:173
-msgctxt "Search operator"
-msgid "is"
-msgstr "ilyen"
-
-#. Can be typed in the search box like "subject:word" to find
-#. "word" only if it occurs in the subject of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary
-#. User Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:181
-msgctxt "Search operator"
-msgid "subject"
-msgstr "tárgy"
-
-#. Can be typed in the search box like
-#. "to:johndoe@example.com" to find messages received by a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:190
-msgctxt "Search operator"
-msgid "to"
-msgstr "címzett"
-
-#. Can be typed in the search box after "to:", "cc:" and
-#. "bcc:" e.g.: "to:me". Matches conversations that are
-#. addressed to the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:211
-msgctxt "Search operator value - mail addressed to the user"
-msgid "me"
-msgstr "én"
-
-#. Can be typed in the search box after "from:" i.e.:
-#. "from:me". Matches conversations were sent by the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:223
-msgctxt "Search operator value - mail sent by the user"
-msgid "me"
-msgstr "én"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:read". Matches conversations that are flagged as read.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:235
-msgctxt "'is:' search operator value"
-msgid "read"
-msgstr "olvasatlan"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:starred". Matches conversations that are flagged as
-#. starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:246
-msgctxt "'is:' search operator value"
-msgid "starred"
-msgstr "csillagozott"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:unread". Matches conversations that are flagged unread.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:256
-msgctxt "'is:' search operator value"
-msgid "unread"
-msgstr "olvasatlan"
-
 #. List of general possible folder names to match for the
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:882
+#: src/engine/imap-engine/imap-engine-generic-account.vala:999
 msgid "Drafts | Draft"
 msgstr "Piszkozatok | Piszkozat"
 
@@ -2445,22 +2777,22 @@ msgstr "Piszkozatok | Piszkozat"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:891
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1008
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Elküldött | Elküldött levelek | Elküldött üzenetek"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:896
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1013
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Elküldött elemek"
 
 #. List of general possible folder names to match for the
-#. Spam mailbox. Separate names using a vertical bar and
-#. put the most common localized name to the front for the
-#. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:906
+#. Junk/Spam mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1023
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2470,13 +2802,13 @@ msgstr "Szemét | Spam | Levélszemét"
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:916
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1033
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Kuka | Szemét"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:921
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1038
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Törölt elemek"
@@ -2485,603 +2817,471 @@ msgstr "Törölt elemek"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:931
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1048
 msgid "Archive | Archives"
 msgstr "Archívum | Archívumok | Archiváltak"
 
-#: src/engine/rfc822/rfc822-message.vala:458
+#: src/engine/rfc822/rfc822-message.vala:544
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "A(z) „%s” MIME-típusa nem határozható meg."
 
-#: src/engine/rfc822/rfc822-message.vala:469
+#: src/engine/rfc822/rfc822-message.vala:555
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr "A(z) „%s” MIME-típus tartalomtípusa nem határozható meg ennél: „%s”."
 
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
+#: src/engine/rfc822/rfc822-message.vala:1008
+msgid "(no subject)"
+msgstr "(nincs tárgy)"
+
+#: ui/accounts_editor_add_pane.ui:7 ui/accounts_editor_list_pane.ui:122
 msgid "Add an account"
 msgstr "Fiók hozzáadása"
 
-#: ui/accounts_editor_add_pane.ui:53
-msgid "Create"
-msgstr "Létrehozás"
+#: ui/accounts_editor_add_pane.ui:47
+#| msgid "Create"
+msgid "_Create"
+msgstr "_Létrehozás"
 
-#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:119 ui/accounts_editor_servers_pane.ui:115
 msgid "Receiving"
 msgstr "Fogadás"
 
-#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:163 ui/accounts_editor_servers_pane.ui:151
 msgid "Sending"
 msgstr "Küldés"
 
-#: ui/accounts_editor_edit_pane.ui:8
+#: ui/accounts_editor_edit_pane.ui:7
 msgid "Edit Account"
 msgstr "Fiók szerkesztése"
 
-#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
+#: ui/accounts_editor_edit_pane.ui:8 ui/accounts_editor_servers_pane.ui:8
 msgid "Account Name"
 msgstr "Fiók neve"
 
-#: ui/accounts_editor_edit_pane.ui:124
+#: ui/accounts_editor_edit_pane.ui:114
 msgid "Email addresses"
 msgstr "E-mail címek"
 
-#: ui/accounts_editor_edit_pane.ui:164
+#: ui/accounts_editor_edit_pane.ui:151
 msgid "Signature"
 msgstr "Aláírás"
 
-#: ui/accounts_editor_edit_pane.ui:201
+#: ui/accounts_editor_edit_pane.ui:186
 msgid "Settings"
 msgstr "Beállítások"
 
 #. This is a button in the account settings to show server settings.
-#: ui/accounts_editor_edit_pane.ui:243 ui/accounts_editor_servers_pane.ui:8
+#: ui/accounts_editor_edit_pane.ui:225 ui/accounts_editor_servers_pane.ui:7
 msgid "Server Settings"
 msgstr "Kiszolgáló beállításai"
 
-#. This is the remove account button in the account settings.
-#: ui/accounts_editor_edit_pane.ui:258 ui/accounts_editor_remove_pane.ui:23
-msgid "Remove Account"
-msgstr "Fiók eltávolítása"
-
-#: ui/accounts_editor_edit_pane.ui:262 ui/accounts_editor_remove_pane.ui:27
+#: ui/accounts_editor_edit_pane.ui:242
 msgid "Remove this account from Geary"
 msgstr "Fiók eltávolítása a Geary programból"
 
-#: ui/accounts_editor_list_pane.ui:8
+#: ui/accounts_editor_list_pane.ui:7
 msgid "Accounts"
 msgstr "Fiókok"
 
-#: ui/accounts_editor_list_pane.ui:62
+#: ui/accounts_editor_list_pane.ui:59
 msgid "To get started, select an email provider below."
 msgstr "Kezdéshez válasszon egy e-mail szolgáltatót lent."
 
-#: ui/accounts_editor_list_pane.ui:75
+#: ui/accounts_editor_list_pane.ui:73
 msgid "Welcome to Geary"
 msgstr "Üdvözli a Geary"
 
-#. This title is shown to users when confirming if they want to remove an account. The string substitution is replaced with the account's name.
-#: ui/accounts_editor_remove_pane.ui:73
-#, c-format
-msgid "Confirm removing: %s"
-msgstr "Eltávolítás megerősítése: %s"
-
-#: ui/accounts_editor_remove_pane.ui:91
-msgid ""
-"Removing an account will remove it from Geary and delete locally cached "
-"email data from your computer, but not from your service provider."
-msgstr ""
-"Egy fiók eltávolítása eltávolítja azt a Geary programból, és törli a "
-"helyileg gyorsítótárazott e-mail adatokat a számítógépről, de nem törli "
-"azokat a szolgáltatótól."
-
-#: ui/accounts_editor_remove_pane.ui:122
-msgid "Remove account"
-msgstr "Fiók eltávolítása"
-
-#: ui/accounts_editor_servers_pane.ui:47
+#: ui/accounts_editor_servers_pane.ui:42
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#. Infobar title when one or more accounts are offline
-#: ui/application-main-window.ui:185
-msgid "Working offline"
-msgstr "Kapcsolat nélküli munka"
-
-#. Label and tooltip for offline infobar
-#: ui/application-main-window.ui:199
-msgid ""
-"Your computer does not appear to be connected to the Internet.\n"
-"You will not be able to send or receive email until it is re-connected."
-msgstr ""
-"Úgy tűnik, hogy a számítógépe nem kapcsolódik az internethez.\n"
-"Nem lesz képes leveleket küldeni vagy fogadni, amíg nem kapcsolódik újra."
-
-#. Label and tooltip for offline infobar
-#: ui/application-main-window.ui:202
-msgid "You will not be able to send or receive email until re-connected."
-msgstr ""
-"Nem lesz képes leveleket küldeni vagy fogadni, amíg nem kapcsolódik újra."
-
-#. Button label for retrying TLS cert validation
-#: ui/application-main-window.ui:249
-msgid "Check"
-msgstr "Ellenőrzés"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/application-main-window.ui:253
-msgid "Check the security details for the connection"
-msgstr "A kapcsolat biztonsági részleteinek ellenőrzése"
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/application-main-window.ui:282
-msgid "Security problem"
-msgstr "Biztonsági probléma"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/application-main-window.ui:296
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-"Egy fiók nem megbízható kiszolgálót jelentett.\n"
-"Ellenőrizze a kiszolgáló beállításai, és próbálja újra."
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/application-main-window.ui:299
-msgid "An account has reported an untrusted server."
-msgstr "Egy fiók nem megbízható kiszolgálót jelentett."
-
-#. Button tooltip for retrying when a login error has occurred
-#: ui/application-main-window.ui:350
-msgid "Retry login, you will be prompted for your password"
-msgstr "Bejelentkezés újrapróbálása, a jelszava bekérésre fog kerülni"
-
-#. Infobar title when one or more accounts have a login error
-#: ui/application-main-window.ui:379
-msgid "Login problem"
-msgstr "Bejelentkezési probléma"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/application-main-window.ui:393
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-"Egy fiók helytelen bejelentkezési nevet vagy jelszót jelentett.\n"
-"Ellenőrizze a bejelentkezési nevét, és próbálja újra."
-
-#. Label and tooltip for authentication problem infobar
-#: ui/application-main-window.ui:396
-msgid "An account has reported an incorrect login or password."
-msgstr "Egy fiók helytelen bejelentkezési nevet vagy jelszót jelentett."
-
-#: ui/certificate_warning_dialog.glade:7
+#: ui/certificate_warning_dialog.glade:6
 msgid "Untrusted Connection"
 msgstr "Nem megbízható kapcsolat"
 
-#: ui/certificate_warning_dialog.glade:29
+#: ui/certificate_warning_dialog.glade:26
 msgid "_Always Trust This Server"
 msgstr "Min_dig megbízom a kiszolgálóban"
 
-#: ui/certificate_warning_dialog.glade:43
+#: ui/certificate_warning_dialog.glade:39
 msgid "_Trust This Server"
 msgstr "_Megbízom a kiszolgálóban"
 
-#: ui/certificate_warning_dialog.glade:57
+#: ui/certificate_warning_dialog.glade:52
 msgid "_Don’t Trust This Server"
 msgstr "_Nem bízom meg a kiszolgálóban"
 
-#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
-#| msgctxt "shortcut window"
-#| msgid "Detach composer window"
-msgid "Detach the composer from the window"
-msgstr "Levélíró ablak leválasztása az ablakról"
+#: ui/composer-editor.ui:89
+msgid "Bold text"
+msgstr "Szöveg félkövérré tétele"
 
-#: ui/composer-headerbar.ui:135
-msgid "_Send"
-msgstr "_Küldés"
+#: ui/composer-editor.ui:111
+msgid "Italic text"
+msgstr "Szöveg dőltté tétele"
 
-#: ui/composer-headerbar.ui:162
-msgid "Discard and Close"
-msgstr "Elvetés és bezárás"
+#: ui/composer-editor.ui:133
+msgid "Underline text"
+msgstr "Szöveg aláhúzása"
 
-#: ui/composer-headerbar.ui:186
-msgid "Save and Close"
-msgstr "Mentés és bezárás"
+#: ui/composer-editor.ui:155
+msgid "Strikethrough text"
+msgstr "Szöveg áthúzása"
 
-#. 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 "Az új hivatkozás beszúrása ezzel az URL-lel"
+#: ui/composer-editor.ui:185
+msgid "Insert bulleted list"
+msgstr "Felsorolás beszúrása"
 
-#: ui/composer-link-popover.ui:43
-#| msgid "_Add"
-msgid "Add"
-msgstr "Hozzáadás"
+#: ui/composer-editor.ui:207
+msgid "Insert numbered list"
+msgstr "Számozott lista beszúrása"
 
-#: ui/composer-link-popover.ui:47
-msgid "Link URL"
-msgstr "Hivatkozás URL"
+#: ui/composer-editor.ui:237
+msgid "Indent or quote text"
+msgstr "Szöveg behúzása vagy idézése"
 
-#. 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 "Hivatkozás URL-ének frissítése"
+#: ui/composer-editor.ui:259
+msgid "Un-indent or unquote text"
+msgstr "Szöveg behúzásának vagy idézésének visszavonása"
 
-#: ui/composer-link-popover.ui:62
-msgid "Update"
-msgstr "Frissítés"
+#: ui/composer-editor.ui:286
+msgid "Remove text formatting"
+msgstr "Szövegformázás eltávolítása"
 
-#: ui/composer-link-popover.ui:75
-msgid "Delete this link"
-msgstr "Hivatkozás törlése"
+#: ui/composer-editor.ui:303
+msgid "Change font type"
+msgstr "Betűkészlet módosítása"
 
-#: ui/composer-menus.ui:8
+#: ui/composer-editor.ui:315
+msgid "Sans Serif"
+msgstr "Talpatlan"
+
+#: ui/composer-editor.ui:325
+msgid "Serif"
+msgstr "Talpas"
+
+#: ui/composer-editor.ui:335
+msgid "Fixed Width"
+msgstr "Rögzített szélességű"
+
+#: ui/composer-editor.ui:359
+msgid "Change font color"
+msgstr "Betűszín módosítása"
+
+#: ui/composer-editor.ui:372
+msgid "Change font size"
+msgstr "Betűméret módosítása"
+
+#: ui/composer-editor.ui:402
+msgid "Insert or update text link"
+msgstr "Szöveghivatkozás beszúrása vagy frissítése"
+
+#: ui/composer-editor.ui:424
+msgid "Insert an image"
+msgstr "Kép beszúrása"
+
+#: ui/composer-editor.ui:463
+msgid "Undo last edit"
+msgstr "Utolsó szerkesztés visszavonása"
+
+#: ui/composer-editor.ui:485
+msgid "Redo last edit"
+msgstr "Utolsó szerkesztés ismétlése"
+
+#: ui/composer-editor.ui:512 ui/composer-editor.ui:534
+msgid "Attach a file"
+msgstr "Fájl csatolása"
+
+#: ui/composer-editor.ui:556
+msgid "Add original attachments"
+msgstr "Eredeti mellékletek hozzáadása"
+
+#: ui/composer-editor.ui:598
+msgid "More options"
+msgstr "További beállítások"
+
+#: ui/composer-editor.ui:617
+msgid "Show formatting toolbar"
+msgstr "Formázási eszköztár megjelenítése"
+
+#: ui/composer-editor.ui:634
+msgid "Select spell checking languages"
+msgstr "Helyesírás-ellenőrzés nyelvének kiválasztása"
+
+#: ui/composer-editor.ui:658
+msgid "S_ans Serif"
+msgstr "T_alpatlan betűkészlet"
+
+#: ui/composer-editor.ui:663
+msgid "S_erif"
+msgstr "Talpas b_etűkészlet"
+
+#: ui/composer-editor.ui:668
+msgid "_Fixed Width"
+msgstr "_Rögzített szélességű"
+
+#: ui/composer-editor.ui:678
+msgid "_Small"
+msgstr "Ki_csi"
+
+#: ui/composer-editor.ui:683
+msgid "_Medium"
+msgstr "_Közepes"
+
+#: ui/composer-editor.ui:688
+msgid "Lar_ge"
+msgstr "_Nagy"
+
+#: ui/composer-editor.ui:698
+msgid "_Rich Text"
+msgstr "_Rich Text"
+
+#: ui/composer-editor.ui:703
+msgid "_Plain Text"
+msgstr "_Egyszerű szöveg"
+
+#: ui/composer-editor-menus.ui:8
 msgid "_Undo"
 msgstr "_Visszavonás"
 
-#: ui/composer-menus.ui:12
+#: ui/composer-editor-menus.ui:12
 msgid "_Redo"
 msgstr "Új_ra"
 
-#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
 msgid "Cu_t"
 msgstr "_Kivágás"
 
-#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Másolás"
 
-#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: ui/composer-menus.ui:30
+#: ui/composer-editor-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "Beillesztés formázás _nélkül"
 
-#: ui/composer-menus.ui:50
+#: ui/composer-editor-menus.ui:50
 msgid "Select _All"
 msgstr "Ö_sszes kijelölése"
 
-#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "_Vizsgálat…"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:60
-msgid "From"
-msgstr "Feladó"
+#: ui/composer-headerbar.ui:20 ui/composer-headerbar.ui:96
+msgid "Detach the composer from the window"
+msgstr "Levélíró ablak leválasztása az ablakról"
 
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:130
-msgid "_To"
-msgstr "_Címzett"
+#: ui/composer-headerbar.ui:123
+msgid "_Send"
+msgstr "_Küldés"
 
-#: ui/composer-widget.ui:158
-msgid "Show Cc, Bcc, and Reply-To fields"
-msgstr "Másolat, rejtett másolat és válaszcím mezők megjelenítése"
+#: ui/composer-headerbar.ui:147
+msgid "Discard and Close"
+msgstr "Elvetés és bezárás"
 
-#: ui/composer-widget.ui:219
-msgid "_Cc"
-msgstr "_Másolat"
+#: ui/composer-headerbar.ui:169
+msgid "Save and Close"
+msgstr "Mentés és bezárás"
 
-#: ui/composer-widget.ui:267
-msgid "_Bcc"
-msgstr "Titk_os másolat"
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:38
+msgid "Insert the new link with this URL"
+msgstr "Az új hivatkozás beszúrása ezzel az URL-lel"
 
-#: ui/composer-widget.ui:315
-msgid "_Reply-To"
-msgstr "_Válaszcím"
+#: ui/composer-link-popover.ui:39
+msgid "Add"
+msgstr "Hozzáadás"
 
-#: ui/composer-widget.ui:372
-msgid "_Subject"
-msgstr "_Tárgy"
+#: ui/composer-link-popover.ui:43
+msgid "Link URL"
+msgstr "Hivatkozás URL"
 
-#: ui/composer-widget.ui:445
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:56
+msgid "Update this link’s URL"
+msgstr "Hivatkozás URL-ének frissítése"
+
+#: ui/composer-link-popover.ui:57
+msgid "Update"
+msgstr "Frissítés"
+
+#: ui/composer-link-popover.ui:69
+msgid "Delete this link"
+msgstr "Hivatkozás törlése"
+
+#: ui/composer-widget.ui:119
 msgid "Drop files here"
 msgstr "Ejtse ide a fájlokat"
 
-#: ui/composer-widget.ui:461
+#: ui/composer-widget.ui:134
 msgid "To add them as attachments"
 msgstr "Mellékletként való hozzáadáshoz"
 
-#: ui/composer-widget.ui:602
-#| msgctxt "shortcut window"
-#| msgid "Bold text"
-msgid "Bold text"
-msgstr "Szöveg félkövérré tétele"
+#: ui/composer-widget.ui:217
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Másolat, rejtett másolat és válaszcím mezők megjelenítése"
 
-#: ui/composer-widget.ui:626
-#| msgctxt "shortcut window"
-#| msgid "Italicize text"
-msgid "Italic text"
-msgstr "Szöveg dőltté tétele"
-
-#: ui/composer-widget.ui:650
-#| msgctxt "shortcut window"
-#| msgid "Underline text"
-msgid "Underline text"
-msgstr "Szöveg aláhúzása"
-
-#: ui/composer-widget.ui:674
-#| msgctxt "shortcut window"
-#| msgid "Strike text"
-msgid "Strikethrough text"
-msgstr "Szöveg áthúzása"
-
-#: ui/composer-widget.ui:707
-#| msgid "Insert unordered list"
-msgid "Insert bulleted list"
-msgstr "Felsorolás beszúrása"
-
-#: ui/composer-widget.ui:731
-#| msgid "Insert unordered list"
-msgid "Insert numbered list"
-msgstr "Számozott lista beszúrása"
-
-#: ui/composer-widget.ui:764
-#| msgctxt "shortcut window"
-#| msgid "Unquote text"
-msgid "Indent or quote text"
-msgstr "Szöveg behúzása vagy idézése"
-
-#: ui/composer-widget.ui:788
-#| msgctxt "shortcut window"
-#| msgid "Unquote text"
-msgid "Un-indent or unquote text"
-msgstr "Szöveg behúzásának vagy idézésének visszavonása"
-
-#: ui/composer-widget.ui:817
-#| msgctxt "shortcut window"
-#| msgid "Remove formatting"
-msgid "Remove text formatting"
-msgstr "Szövegformázás eltávolítása"
-
-#: ui/composer-widget.ui:836
-msgid "Change font type"
-msgstr "Betűkészlet módosítása"
-
-#: ui/composer-widget.ui:851
-#| msgid "S_ans Serif"
-msgid "Sans Serif"
-msgstr "Talpatlan"
-
-#: ui/composer-widget.ui:862
-#| msgid "S_erif"
-msgid "Serif"
-msgstr "Talpas"
-
-#: ui/composer-widget.ui:873
-#| msgid "_Fixed Width"
-msgid "Fixed Width"
-msgstr "Rögzített szélességű"
-
-#: ui/composer-widget.ui:899
-msgid "Change font color"
-msgstr "Betűszín módosítása"
-
-#: ui/composer-widget.ui:914
-msgid "Change font size"
-msgstr "Betűméret módosítása"
-
-#: ui/composer-widget.ui:949
-#| msgid "Insert or update selection link (Ctrl+L)"
-msgid "Insert or update text link"
-msgstr "Szöveghivatkozás beszúrása vagy frissítése"
-
-#: ui/composer-widget.ui:973
-#| msgctxt "shortcut window"
-#| msgid "Insert an image"
-msgid "Insert an image"
-msgstr "Kép beszúrása"
-
-#: ui/composer-widget.ui:1015
-#| msgid "Undo last edit (Ctrl+Z)"
-msgid "Undo last edit"
-msgstr "Utolsó szerkesztés visszavonása"
-
-#: ui/composer-widget.ui:1039
-#| msgid "Undo last edit (Ctrl+Z)"
-msgid "Redo last edit"
-msgstr "Utolsó szerkesztés ismétlése"
-
-#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
-#| msgid "Choose a file"
-msgid "Attach a file"
-msgstr "Fájl csatolása"
-
-#: ui/composer-widget.ui:1117
-#| msgid "Include Original Attachments"
-msgid "Add original attachments"
-msgstr "Eredeti mellékletek hozzáadása"
-
-#: ui/composer-widget.ui:1162
-#| msgid "Move conversation"
-#| msgid_plural "Move conversations"
-msgid "More options"
-msgstr "További beállítások"
-
-#: ui/composer-widget.ui:1182
-msgid "Show formatting toolbar"
-msgstr "Formázási eszköztár megjelenítése"
-
-#: ui/composer-widget.ui:1200
-msgid "Select spell checking languages"
-msgstr "Helyesírás-ellenőrzés nyelvének kiválasztása"
-
-#: ui/composer-widget.ui:1263
-msgid "S_ans Serif"
-msgstr "T_alpatlan betűkészlet"
-
-#: ui/composer-widget.ui:1268
-msgid "S_erif"
-msgstr "Talpas b_etűkészlet"
-
-#: ui/composer-widget.ui:1273
-msgid "_Fixed Width"
-msgstr "_Rögzített szélességű"
-
-#: ui/composer-widget.ui:1283
-msgid "_Small"
-msgstr "Ki_csi"
-
-#: ui/composer-widget.ui:1288
-msgid "_Medium"
-msgstr "_Közepes"
-
-#: ui/composer-widget.ui:1293
-msgid "Lar_ge"
-msgstr "_Nagy"
-
-#: ui/composer-widget.ui:1303
-msgid "_Rich Text"
-msgstr "_Rich Text"
-
-#: ui/composer-widget.ui:1308
-#| msgid "_Rich Text"
-msgid "_Plain Text"
-msgstr "_Egyszerű szöveg"
-
-#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+#: ui/components-attachment-pane.ui:25 ui/components-attachment-pane.ui:41
 msgid "Select all attachments"
 msgstr "Minden melléklet kiválasztása"
 
-#: ui/components-attachment-pane.ui:66
+#: ui/components-attachment-pane.ui:58
 msgid "Save selected attachments"
 msgstr "Kiválasztott mellékletek mentése"
 
-#: ui/components-attachment-pane.ui:85
+#: ui/components-attachment-pane.ui:75
 msgid "Open selected attachments"
 msgstr "Kiválasztott mellékletek megnyitása"
 
 #: ui/components-attachment-pane-menus.ui:17
-#| msgid "_Save All"
 msgid "Save _All"
 msgstr "_Mind mentése"
 
-#: ui/components-inspector-error-view.ui:33
+#: ui/components-conversation-actions.ui:76
+msgid "Reply"
+msgstr "Válasz"
+
+#: ui/components-conversation-actions.ui:97
+msgid "Reply All"
+msgstr "Válasz mindenkinek"
+
+#: ui/components-conversation-actions.ui:118
+msgid "Forward"
+msgstr "Továbbítás"
+
+#: ui/components-conversation-actions.ui:147
+msgid "_Archive"
+msgstr "_Archiválás"
+
+#: ui/components-conversation-actions.ui:191
+msgid "Toggle find bar"
+msgstr "Keresősáv ki- vagy bekapcsolása"
+
+#: ui/components-conversation-header-bar.ui:20 ui/main-toolbar.ui:76
+msgid "Back"
+msgstr "Vissza"
+
+#: ui/components-inspector-error-view.ui:27
+#| 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>."
 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 ""
 "Ha a probléma komoly, és továbbra is fennáll, akkor mentse el és küldje el a "
 "részleteket a <a href=\"https://wiki.gnome.org/Apps/Geary/Contact"
-"\">levelezőlistára</a> vagy mellékelje egy <a href=\"https://wiki.gnome.org/"
-"Apps/Geary/ReportingABug\">új hibajelentéshez</a>."
+"\">kapcsoalti csatornák egyikére</a>, vagy mellékelje egy <a href=\"https://"
+"wiki.gnome.org/Apps/Geary/ReportingABug\">új hibajelentéshez</a>."
 
-#: ui/components-inspector-error-view.ui:49
+#: ui/components-inspector-error-view.ui:42
 msgid "Details:"
 msgstr "Részletek:"
 
-#. Tooltip for inspector button
-#: ui/components-inspector.ui:20
-msgid "Toggle appending new log entries"
-msgstr "Új naplóbejegyzések hozzáfűzésének ki- és bekapcsolása"
-
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
+#: ui/components-inspector.ui:16 ui/problem-details-dialog.ui:21
 msgid "Search for matching log entries"
 msgstr "Egyező naplóbejegyzések keresése"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:30
+msgid "Toggle appending new log entries"
+msgstr "Új naplóbejegyzések hozzáfűzésének ki- és bekapcsolása"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:48
+msgid "Add a marker entry to the log"
+msgstr "Jelölő bejegyzés hozzáadása a naplóhoz"
+
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:71 ui/problem-details-dialog.ui:45
 msgid "Save logs entries and details"
 msgstr "Naplóbejegyzések és részletek mentése"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:89 ui/problem-details-dialog.ui:60
 msgid "Copy to clipboard"
 msgstr "Másolás a vágólapra"
 
-#: ui/conversation-contact-popover.ui:146
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:107
+#| msgid "Search for matching log entries"
+msgid "Clears all log entries"
+msgstr "Törli az összes naplóbejegyzést"
+
+#: ui/conversation-contact-popover.ui:132
 msgid "New Conversation…"
 msgstr "Új beszélgetés…"
 
-#: ui/conversation-contact-popover.ui:159
+#: ui/conversation-contact-popover.ui:144
 msgid "Copy Email Address"
 msgstr "E-mail cím másolása"
 
-#: ui/conversation-contact-popover.ui:182
+#: ui/conversation-contact-popover.ui:165
 msgid "Save in Contacts…"
 msgstr "Mentés a címjegyzékbe…"
 
-#: ui/conversation-contact-popover.ui:195
+#: ui/conversation-contact-popover.ui:177
 msgid "Show Conversations"
 msgstr "Beszélgetések megjelenítése"
 
-#: ui/conversation-contact-popover.ui:208
+#: ui/conversation-contact-popover.ui:189
 msgid "Open in Contacts"
 msgstr "Megnyitás a címjegyzékben"
 
-#: ui/conversation-contact-popover.ui:221
+#: ui/conversation-contact-popover.ui:201
 msgid "Always Load Remote Images"
 msgstr "Mindig töltse be a távoli képeket"
 
 #. Title label on contact popover
-#: ui/conversation-contact-popover.ui:264
+#: ui/conversation-contact-popover.ui:240
 msgid "Deceptive email address"
 msgstr "Megtévesztő e-mail cím"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:294
+#: ui/conversation-contact-popover.ui:268
 msgid "This email address is:"
 msgstr "Ez az e-mail cím:"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:319
+#: ui/conversation-contact-popover.ui:291
 msgid "But was forged as:"
 msgstr "De hamisították, mivel:"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:344
+#: ui/conversation-contact-popover.ui:314
 msgid "The sender may not be trustworthy"
 msgstr "Lehet, hogy a feladó nem megbízható"
 
-#: ui/conversation-email.ui:27
+#: ui/conversation-email.ui:24
 msgid "Save all attachments"
 msgstr "Minden melléklet mentése"
 
 #. Note: The application will never show this button at the same time as unstar_button, one will always be hidden.
-#: ui/conversation-email.ui:50
+#: ui/conversation-email.ui:45
 msgid "Mark this message as starred"
 msgstr "Levél megjelölése csillagozottként"
 
 #. Note: The application will never show this button at the same time as star_button, one will always be hidden.
-#: ui/conversation-email.ui:72
+#: ui/conversation-email.ui:65
 msgid "Mark this message as not starred"
 msgstr "Levél megjelölése nem csillagozottként"
 
-#: ui/conversation-email.ui:124
-msgid "Edit Draft"
-msgstr "Piszkozat szerkesztése"
-
-#: ui/conversation-email.ui:151
-msgid "Draft message"
-msgstr "Piszkozat"
-
-#: ui/conversation-email.ui:167
-msgid "This message has not yet been sent."
-msgstr "Ez a levél még nem lett elküldve."
-
-#: ui/conversation-email.ui:213
-msgid "Message not saved"
-msgstr "A levél nincs mentve"
-
-#: ui/conversation-email.ui:229
-msgid "This message was sent, but has not been saved to your account."
-msgstr ""
-"Ez a levél sikeresen el lett küldve, de nem sikerült elmenteni a fiókjába."
-
 #. Translators: Menu item to reply to a specific message.
 #: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
@@ -3119,23 +3319,23 @@ msgstr "Levél _törlése…"
 msgid "_View Source"
 msgstr "_Forrás megtekintése"
 
-#: ui/conversation-message-link-popover.ui:54
+#: ui/conversation-message-link-popover.ui:49
 msgid "But actually goes to:"
 msgstr "De valójában ide:"
 
-#: ui/conversation-message-link-popover.ui:84
+#: ui/conversation-message-link-popover.ui:77
 msgid "The link appears to go to:"
 msgstr "Úgy tűnik, ez a hivatkozás ide mutat:"
 
-#: ui/conversation-message-link-popover.ui:96
+#: ui/conversation-message-link-popover.ui:88
 msgid "Deceptive link found"
 msgstr "Megtévesztő hivatkozás található"
 
-#: ui/conversation-message-link-popover.ui:111
+#: ui/conversation-message-link-popover.ui:102
 msgid "The email sender may be leading you to the wrong web site."
 msgstr "Az e-mail küldője talán a rossz weboldalra vezeti Önt."
 
-#: ui/conversation-message-link-popover.ui:124
+#: ui/conversation-message-link-popover.ui:114
 msgid "If unsure, contact the sender and ask before continuing."
 msgstr ""
 "Ha bizonytalan, vegye fel a kapcsolatot a küldővel, és kérdezzen rá a "
@@ -3165,458 +3365,409 @@ msgstr "_Kép mentése másként…"
 msgid "_Select All"
 msgstr "Ö_sszes kijelölése"
 
-#: ui/conversation-message.ui:63
+#: ui/conversation-message.ui:54
 msgid "From <email>"
 msgstr "Feladó: <email>"
 
-#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
+#: ui/conversation-message.ui:69 ui/conversation-message.ui:160
 msgid "1/1/1970\t"
 msgstr "1/1/1970\t"
 
-#: ui/conversation-message.ui:102
+#: ui/conversation-message.ui:91
 msgid "Preview body text."
 msgstr "Levéltörzs előnézete."
 
-#: ui/conversation-message.ui:202
+#: ui/conversation-message.ui:182
 msgid "Sent by:"
 msgstr "Feladó:"
 
-#: ui/conversation-message.ui:247
+#: ui/conversation-message.ui:223
 msgid "Reply to:"
 msgstr "Válasz:"
 
-#: ui/conversation-message.ui:291
+#: ui/conversation-message.ui:264
 msgid "Subject"
 msgstr "Tárgy"
 
-#: ui/conversation-message.ui:501
-msgid "Show Images"
-msgstr "Képek megjelenítése"
-
-#: ui/conversation-message.ui:514
-msgid "Always Show From Sender"
-msgstr "Mindig jelenítse meg a feladótól"
-
-#: ui/conversation-message.ui:542
-msgid "Remote images not shown"
-msgstr "A távoli képek nincsenek megjelenítve"
-
-#: ui/conversation-message.ui:559
-msgid "Only show remote images from senders you trust."
-msgstr "A távoli képek megjelenítése csak a megbízható feladóktól."
-
-#: ui/conversation-viewer.ui:60
+#: ui/conversation-viewer.ui:53
 msgid "Find in conversation"
 msgstr "Keresés a beszélgetésben"
 
-#: ui/conversation-viewer.ui:75
+#: ui/conversation-viewer.ui:67
 msgid "Find the previous occurrence of the search string."
 msgstr "Előző keresése a beszélgetésben."
 
-#: ui/conversation-viewer.ui:96
+#: ui/conversation-viewer.ui:86
 msgid "Find the next occurrence of the search string."
 msgstr "Következő keresése a beszélgetésben."
 
-#: ui/find_bar.glade:66
+#: ui/find_bar.glade:58
 msgid "Find:"
 msgstr "Keresés:"
 
-#: ui/find_bar.glade:89
+#: ui/find_bar.glade:80
 msgid "_Previous"
 msgstr "_Előző"
 
-#: ui/find_bar.glade:107
+#: ui/find_bar.glade:97
 msgid "_Next"
 msgstr "_Következő"
 
-#: ui/find_bar.glade:125
+#: ui/find_bar.glade:114
 msgid "_Case sensitive"
 msgstr "K_is- és nagybetűk megkülönböztetése"
 
-#: ui/find_bar.glade:145
+#: ui/find_bar.glade:132
 msgid "label"
 msgstr "címke"
 
-#: ui/gtk/help-overlay.ui:9
+#: ui/gtk/help-overlay.ui:8
 msgid "Conversation Shortcuts"
 msgstr "Beszélgetési gyorsbillentyűk"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
+#: ui/gtk/help-overlay.ui:12 ui/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Műveletek"
 
-#: ui/gtk/help-overlay.ui:17
+#: ui/gtk/help-overlay.ui:16
 msgctxt "shortcut window"
 msgid "New conversation"
 msgstr "Új beszélgetés"
 
-#: ui/gtk/help-overlay.ui:24
+#: ui/gtk/help-overlay.ui:23
 msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Válasz a feladónak"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
+#: ui/gtk/help-overlay.ui:30 ui/gtk/help-overlay.ui:450
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
+#: ui/gtk/help-overlay.ui:37 ui/gtk/help-overlay.ui:457
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Továbbítás"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
+#: ui/gtk/help-overlay.ui:44 ui/gtk/help-overlay.ui:464
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "Megjelölés olvasatlanként/olvasottként"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
+#: ui/gtk/help-overlay.ui:51 ui/gtk/help-overlay.ui:471
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "Megjelölés/eltávolítás csillagozottként"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
-#| msgid "Archive conversation"
-#| msgid_plural "Archive conversations"
+#: ui/gtk/help-overlay.ui:58 ui/gtk/help-overlay.ui:478
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "Beszélgetések archiválása"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
-#| msgid "Move conversation"
-#| msgid_plural "Move conversations"
+#: ui/gtk/help-overlay.ui:65 ui/gtk/help-overlay.ui:495
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "Beszélgetések áthelyezése"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
-#| msgctxt "shortcut window"
-#| msgid "Label conversation"
+#: ui/gtk/help-overlay.ui:72 ui/gtk/help-overlay.ui:502
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "Beszélgetések címkézése"
 
-#: ui/gtk/help-overlay.ui:80
-#| msgctxt "shortcut window"
-#| msgid "Trash conversation"
+#: ui/gtk/help-overlay.ui:79
 msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "Beszélgetések törlése"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
-#| msgid "Mark conversation"
-#| msgid_plural "Mark conversations"
+#: ui/gtk/help-overlay.ui:86 ui/gtk/help-overlay.ui:509
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "Beszélgetések megjelölése szemétként"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
-#| msgid "Delete conversation"
-#| msgid_plural "Delete conversations"
+#: ui/gtk/help-overlay.ui:94 ui/gtk/help-overlay.ui:516
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "Beszélgetések törlése"
 
-#: ui/gtk/help-overlay.ui:104
+#: ui/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Keresés"
 
-#: ui/gtk/help-overlay.ui:108
+#: ui/gtk/help-overlay.ui:107
 msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "Beszélgetések keresése"
 
-#: ui/gtk/help-overlay.ui:115
+#: ui/gtk/help-overlay.ui:114 ui/gtk/help-overlay.ui:523
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Keresés a jelenlegi beszélgetésben"
 
-#: ui/gtk/help-overlay.ui:141
+#: ui/gtk/help-overlay.ui:140
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Visszavonás"
 
-#: ui/gtk/help-overlay.ui:145
+#: ui/gtk/help-overlay.ui:144
 msgctxt "shortcut window"
 msgid "Undo the last action"
 msgstr "Az utolsó művelet visszavonása"
 
-#: ui/gtk/help-overlay.ui:152
+#: ui/gtk/help-overlay.ui:151
 msgctxt "shortcut window"
 msgid "Redo the last action"
 msgstr "Az utolsó művelet ismétlése"
 
-#: ui/gtk/help-overlay.ui:161
+#: ui/gtk/help-overlay.ui:160
 msgctxt "shortcut window"
 msgid "View"
 msgstr "Nézet"
 
-#: ui/gtk/help-overlay.ui:165
+#: ui/gtk/help-overlay.ui:164
 msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "Nagyítás"
 
-#: ui/gtk/help-overlay.ui:172
+#: ui/gtk/help-overlay.ui:171
 msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "Kicsinyítés"
 
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:178
 msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Nagyítás visszaállítása"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Általános"
-
-#: ui/gtk/help-overlay.ui:192
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Súgó megjelenítése"
-
-#: ui/gtk/help-overlay.ui:199
-msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Gyorsbillentyűk megjelenítése"
-
-#: ui/gtk/help-overlay.ui:206
-msgctxt "shortcut window"
-msgid "Open a new window"
-msgstr "Új ablak megnyitása"
-
-#: ui/gtk/help-overlay.ui:213
-#| msgctxt "shortcut window"
-#| msgid "Close current window"
-msgctxt "shortcut window"
-msgid "Close the current window"
-msgstr "Jelenlegi ablak bezárása"
-
-#: ui/gtk/help-overlay.ui:220
-msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Kilépés az alkalmazásból"
-
-#: ui/gtk/help-overlay.ui:229
-msgctxt "shortcut window"
-msgid "Keyboard navigation"
-msgstr "Billentyűzet navigáció"
-
-#: ui/gtk/help-overlay.ui:233
-#| msgctxt "shortcut window"
-#| msgid "Focus the previous pane"
-msgctxt "shortcut window"
-msgid "Go to next/previous pane"
-msgstr "Ugrás az előző/következő ablaktáblára"
-
-#: ui/gtk/help-overlay.ui:241
-#| msgctxt "shortcut window"
-#| msgid "Select the conversation up"
-msgctxt "shortcut window"
-msgid "Select next/previous conversation"
-msgstr "Elősző/következő beszélgetés kijelölése"
-
-#: ui/gtk/help-overlay.ui:248
-msgctxt "shortcut window"
-msgid "Focus next/previous message"
-msgstr "Fókusz átvitele a következő/előző üzenetre"
-
-#: ui/gtk/help-overlay.ui:258
-msgctxt "shortcut window"
-msgid "Single-key shortcuts"
-msgstr "Egybillentyűs gyorsbillentyűk"
-
-#: ui/gtk/help-overlay.ui:262
-msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Válasz a feladónak "
-
-#: ui/gtk/help-overlay.ui:332
-#| msgctxt "shortcut window"
-#| msgid "Find in current conversation"
-msgctxt "shortcut window"
-msgid "Find in current conversations"
-msgstr "Keresés a jelenlegi beszélgetésekben"
-
-#: ui/gtk/help-overlay.ui:339
-#| msgctxt "shortcut window"
-#| msgid "Select the conversation up"
-msgctxt "shortcut window"
-msgid "Select next/previous conversations"
-msgstr "Előző/következő beszélgetések kijelölése"
-
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:190
 msgid "Composer Shortcuts"
 msgstr "Szerkesztő gyorsbillentyűk"
 
-#: ui/gtk/help-overlay.ui:359
+#: ui/gtk/help-overlay.ui:198
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Küldés"
 
-#: ui/gtk/help-overlay.ui:366
+#: ui/gtk/help-overlay.ui:205
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Melléklet hozzáadása"
 
-#: ui/gtk/help-overlay.ui:379
+#: ui/gtk/help-overlay.ui:212
+#| msgctxt "shortcut window"
+#| msgid "Detach composer window"
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "Levélíró leválasztása"
+
+#: ui/gtk/help-overlay.ui:221 ui/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Általános"
+
+#: ui/gtk/help-overlay.ui:225
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Levélíró ablak bezárása"
 
-#: ui/gtk/help-overlay.ui:386
+#: ui/gtk/help-overlay.ui:232
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Levélíró ablak leválasztása"
 
-#: ui/gtk/help-overlay.ui:393
+#: ui/gtk/help-overlay.ui:239
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Szerkesztés"
 
-#: ui/gtk/help-overlay.ui:398
+#: ui/gtk/help-overlay.ui:244
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Kijelölés áthelyezése a vágólapra"
 
-#: ui/gtk/help-overlay.ui:405
+#: ui/gtk/help-overlay.ui:251
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Kijelölés másolása a vágólapra"
 
-#: ui/gtk/help-overlay.ui:412
+#: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Beillesztés a vágólapról"
 
-#: ui/gtk/help-overlay.ui:419
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Szöveg idézése"
 
-#: ui/gtk/help-overlay.ui:426
+#: ui/gtk/help-overlay.ui:272
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Szöveg idézésének visszavonása"
 
-#: ui/gtk/help-overlay.ui:435
+#: ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Rich text szerkesztés"
 
-#: ui/gtk/help-overlay.ui:439
+#: ui/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Beillesztés formázás nélkül"
 
-#: ui/gtk/help-overlay.ui:446
+#: ui/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Szöveg félkövérré tétele"
 
-#: ui/gtk/help-overlay.ui:453
+#: ui/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Szöveg dőltté tétele"
 
-#: ui/gtk/help-overlay.ui:460
+#: ui/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Szöveg aláhúzása"
 
-#: ui/gtk/help-overlay.ui:467
+#: ui/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Szöveg áthúzása"
 
-#: ui/gtk/help-overlay.ui:474
+#: ui/gtk/help-overlay.ui:320
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Formázás eltávolítása"
 
-#: ui/gtk/help-overlay.ui:481
+#: ui/gtk/help-overlay.ui:327
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Kép beszúrása"
 
-#: ui/gtk/help-overlay.ui:488
+#: ui/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Hivatkozás beszúrása"
 
-#: ui/main-toolbar.ui:24
+#: ui/gtk/help-overlay.ui:346
+#| msgid "Conversation Shortcuts"
+msgid "Application Shortcuts"
+msgstr "Alkalmazás gyorsbillentyűk"
+
+#: ui/gtk/help-overlay.ui:354
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Súgó megjelenítése"
+
+#: ui/gtk/help-overlay.ui:361
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "Gyorsbillentyűk megjelenítése"
+
+#: ui/gtk/help-overlay.ui:368
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr "Új ablak megnyitása"
+
+#: ui/gtk/help-overlay.ui:375
+msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "Jelenlegi ablak bezárása"
+
+#: ui/gtk/help-overlay.ui:382
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Kilépés az alkalmazásból"
+
+#: ui/gtk/help-overlay.ui:391
+msgctxt "shortcut window"
+msgid "Keyboard navigation"
+msgstr "Billentyűzet navigáció"
+
+#: ui/gtk/help-overlay.ui:395
+#| msgid "Select Color"
+msgctxt "shortcut window"
+msgid "Select Inbox"
+msgstr "Beérkezett üzenetek kiválasztása"
+
+#: ui/gtk/help-overlay.ui:402
+msgctxt "shortcut window"
+msgid "Go to next/previous pane"
+msgstr "Ugrás az előző/következő ablaktáblára"
+
+#: ui/gtk/help-overlay.ui:410
+msgctxt "shortcut window"
+msgid "Select next/previous conversation"
+msgstr "Elősző/következő beszélgetés kijelölése"
+
+#: ui/gtk/help-overlay.ui:417
+msgctxt "shortcut window"
+msgid "Focus next/previous message"
+msgstr "Fókusz átvitele a következő/előző üzenetre"
+
+#: ui/gtk/help-overlay.ui:429
+#| msgctxt "shortcut window"
+#| msgid "Single-key shortcuts"
+msgid "Single-key Shortcuts"
+msgstr "Egybillentyűs gyorsbillentyűk"
+
+#: ui/gtk/help-overlay.ui:434
+#| msgctxt "shortcut window"
+#| msgid "Single-key shortcuts"
+msgctxt "shortcut window"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Egybillentyűs gyorsbillentyűk (ha engedélyezett)"
+
+#: ui/gtk/help-overlay.ui:443
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "Válasz a feladónak "
+
+#: ui/gtk/help-overlay.ui:530
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "Előző/következő beszélgetések kijelölése"
+
+#: ui/main-toolbar.ui:93
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "Levél írása"
 
-#: ui/main-toolbar.ui:62
+#: ui/main-toolbar.ui:109
 msgid "Toggle search bar"
 msgstr "Keresősáv ki- vagy bekapcsolása"
 
-#: ui/main-toolbar.ui:114
-msgid "Reply"
-msgstr "Válasz"
-
-#: ui/main-toolbar.ui:137
-msgid "Reply All"
-msgstr "Válasz mindenkinek"
-
-#: ui/main-toolbar.ui:160
-msgid "Forward"
-msgstr "Továbbítás"
-
-#: ui/main-toolbar.ui:265
-msgid "Toggle find bar"
-msgstr "Keresősáv ki- vagy bekapcsolása"
-
-#: ui/main-toolbar.ui:286
-msgid "_Archive"
-msgstr "_Archiválás"
-
 #: ui/main-toolbar-menus.ui:21
-#| msgid "Mark as S_pam"
-msgid "Toggle as S_pam"
-msgstr "Levél_szemétnek jelölés ki- vagy bekapcsolása"
+#| msgid "Toggle as S_pam"
+msgid "Toggle as _Junk"
+msgstr "Levél_szemétnek jelölés be/ki"
 
 #: ui/main-toolbar-menus.ui:28
-msgid "Empty _Spam…"
-msgstr "_Levélszemét ürítése…"
-
-#: ui/main-toolbar-menus.ui:32
-msgid "Empty _Trash…"
-msgstr "_Kuka ürítése…"
-
-#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "_Fiókok"
 
-#: ui/main-toolbar-menus.ui:46
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "Gyorsbille_ntyűk"
 
-#: ui/main-toolbar-menus.ui:57
+#: ui/main-toolbar-menus.ui:47
 msgid "_About Geary"
 msgstr "A Geary _névjegye"
 
-#: ui/password-dialog.glade:74
+#: ui/password-dialog.glade:66
 msgid "SMTP Credentials"
 msgstr "SMTP hitelesítési adatok"
 
-#: ui/password-dialog.glade:91
+#: ui/password-dialog.glade:82
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: ui/password-dialog.glade:152
+#: ui/password-dialog.glade:140
 msgid "_Remember password"
 msgstr "Jelszó _megjegyzése"
 
-#: ui/password-dialog.glade:210
+#: ui/password-dialog.glade:195
 msgid "_Authenticate"
 msgstr "_Hitelesítés"
-
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Geary frissítés folyamatban…"