gjdwebserver-overlay/mail-client/geary/files/0044-Update-Greek-translation.patch

From da9ed0751201db8e8fcd0571d219cd63f0bd5c7a Mon Sep 17 00:00:00 2001
From: Efstathios Iosifidis <eiosifidis@gnome.org>
Date: Wed, 7 Oct 2020 08:09:10 +0000
Subject: [PATCH 044/124] Update Greek translation

(cherry picked from commit 2cb7aa0394c351338fbdd110ec381479e24107ea)
---
 po/el.po | 1831 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 991 insertions(+), 840 deletions(-)

diff --git a/po/el.po b/po/el.po
index 88a3eaae..f81ec318 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2020-03-21 18:58+0000\n"
-"PO-Revision-Date: 2020-04-14 10:57+0300\n"
-"Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
+"POT-Creation-Date: 2020-09-19 08:49+0000\n"
+"PO-Revision-Date: 2020-10-07 11:07+0300\n"
+"Last-Translator: Efstathios Iosifidis <eiosifidis@gnome.org>\n"
 "Language-Team: Ελληνικά <>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
@@ -36,10 +36,10 @@ msgstr "Αποστολή αρχείων χρησιμοποιώντας το Gear
 
 #. Translators: The application name
 #: desktop/geary-autostart.desktop.in.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:555
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
@@ -50,9 +50,9 @@ msgstr "Ηλεκτρονικό ταχυδρομείο"
 
 #. 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 "Αποστολή και λήψη ηλεκτρονικού ταχυδρομείου"
 
@@ -62,11 +62,11 @@ msgid "Email;E-mail;Mail;"
 msgstr "μήνυμα;ηλεκτρονικό ταχυδρομείο;αλληλογραφία;Email;E-mail;Mail;"
 
 #. 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"
 
-#: 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, "
@@ -76,7 +76,7 @@ msgstr ""
 "συνομιλίες για το GNOME 3. Σας επιτρέπει να διαβάζετε, να βρίσκετε και να "
 "στέλνετε μηνύματα ηλεκτρονικού ταχυδρομείου με μια απλή, σύγχρονη διεπαφή."
 
-#: 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."
@@ -84,45 +84,44 @@ msgstr ""
 "Οι συνομιλίες σάς επιτρέπουν να διαβάσετε μια πλήρη συζήτηση χωρίς να "
 "χρειαστεί να βρείτε και να κάνετε κλικ από μήνυμα σε μήνυμα."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "Τα χαρακτηριστικά του Geary περιλαμβάνουν:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Γρήγορη ρύθμιση λογαριασμού ηλεκτρονικού ταχυδρομείου"
 
-#: 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 "Εμφανίζει τα σχετικά μηνύματα μαζί σε συνομιλίες"
 
-#: 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 "Γρήγορη πλήρης αναζήτηση κειμένου και λέξεων-κλειδιών"
 
-#: 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 ""
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:33
-#| msgid "Show _notifications for new mail"
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Desktop notification of new mail"
 msgstr "Εμφάνιση ειδοποιήσεων για νέα μηνύματα"
 
-#: 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 ""
 "Συμβατό με το GMail, το Yahoo! Mail, Outlook.com και άλλους διακομιστές IMAP"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:48
+#: desktop/org.gnome.Geary.appdata.xml.in.in:47
 #, fuzzy
 #| msgid "_Display conversation preview"
 msgid "Geary displaying a conversation"
 msgstr "Να ε_μφανίζεται η προεπισκόπηση συνομιλίας"
 
 #. 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 ""
 
@@ -215,7 +214,6 @@ msgid "Position of the message list Paned grabber."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:62
-#| msgid "_Automatically select next message"
 msgid "Autoselect next message"
 msgstr "Αυτόματη επιλογή επόμενου μηνύματος"
 
@@ -345,10 +343,18 @@ msgid ""
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:146
-msgid "Whether we migrated the old settings"
+msgid "List of optional plugins"
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:152
+msgid "Whether we migrated the old settings"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:153
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -364,17 +370,17 @@ msgstr ""
 #. account for a generic IMAP service provider.
 #: src/client/accounts/accounts-editor-add-pane.vala:108
 msgid "All others"
-msgstr ""
+msgstr "Όλοι οι άλλοι"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
 msgid "Check your receiving login and password"
 msgstr ""
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
 msgid "Check your receiving server details"
 msgstr ""
 
@@ -384,13 +390,13 @@ msgstr ""
 #. specify custom creds here
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:232
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
 msgid "Check your sending login and password"
 msgstr ""
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
 msgid "Check your sending server details"
 msgstr ""
 
@@ -446,14 +452,14 @@ msgstr "person@example.com"
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:593
-#: src/client/accounts/accounts-editor-servers-pane.vala:884
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
 msgid "Login name"
 msgstr "Όνομα εισόδου"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:607
-#: src/client/accounts/accounts-editor-servers-pane.vala:1006
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Συνθηματικό"
@@ -463,7 +469,7 @@ msgstr "Συνθηματικό"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:629
-#: src/client/accounts/accounts-editor-servers-pane.vala:728
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "IMAP server"
 msgstr "Διακομιστής IMAP"
 
@@ -478,7 +484,7 @@ msgstr "imap.example.com"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:638
-#: src/client/accounts/accounts-editor-servers-pane.vala:734
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
 msgid "SMTP server"
 msgstr "Διακομιστής SMTP"
 
@@ -624,55 +630,54 @@ msgstr[0] "πριν 1 χρόνο"
 msgstr[1] "πριν 1 χρόνο"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2053
+#: src/client/application/application-main-window.vala:2061
 msgid "Undo"
 msgstr "Αναίρεση"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2036
+#: src/client/application/application-main-window.vala:2044
 msgid "Redo"
 msgstr "Επανάληψη"
 
 #: 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 "Ο λογαριασμός έχει απενεργοποιηθεί"
 
 #. 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 ""
 
-#. 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 "Άλλοι πάροχοι ηλεκτρονικού ταχυδρομείου"
 
 #. 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 ""
@@ -680,7 +685,7 @@ msgstr ""
 #. 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 ""
@@ -693,67 +698,66 @@ msgstr ""
 #. 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 "Πάροχος υπηρεσίας"
 
 #. 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 ""
 
 #. 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 "Kανένας"
 
-#: src/client/accounts/accounts-editor-row.vala:486
+#: src/client/accounts/accounts-editor-row.vala:491
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:493
+#: src/client/accounts/accounts-editor-row.vala:498
 msgid "TLS"
 msgstr "TLS"
 
 #. Translators: Label for source of SMTP authentication
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
-#. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:534
-#: ui/application-main-window.ui:346
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
 msgid "Login"
 msgstr "Σύνδεση"
 
 #. 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 "Δεν απαιτείται σύνδεση"
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
@@ -761,41 +765,37 @@ msgstr ""
 #. 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 "Πηγή λογαριασμού"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
 msgid "GNOME Online Accounts"
-msgstr ""
+msgstr "Διαδικτυακοί λογαριασμοί του GNOME"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:611
-#, fuzzy
-#| msgid "_Save sent mail"
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
 msgid "Save draft email on server"
-msgstr "Απο_θήκευση απεσταλμένων μηνυμάτων"
+msgstr "Αποθήκευση πρόχειρου μηνύματος στον διακομιστή"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:666
-#, fuzzy
-#| msgid "_Save sent mail"
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
 msgid "Save sent email on server"
-msgstr "Απο_θήκευση απεσταλμένων μηνυμάτων"
+msgstr "Αποθήκευση απεσταλμένου μηνύματος στον διακομιστή"
 
 #. Add a suffix for OAuth2 auth so people know they
 #. shouldn't expect to be prompted for a password
 #. 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 ""
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:966
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
 msgid "Use receiving server login"
 msgstr ""
 
@@ -832,42 +832,42 @@ msgstr ""
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/client/application/application-client.vala:33
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr ""
 
-#: src/client/application/application-client.vala:34
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr ""
+#: src/client/application/application-client.vala:35
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Πνευματικά διακαιώματα 2016-2020 Ομάδα ανάπτυξης Geary"
 
-#: src/client/application/application-client.vala:36
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Επισκεφθείτε την ιστοσελίδα του Geary"
 
 #. / Command line option
-#: src/client/application/application-client.vala:94
+#: src/client/application/application-client.vala:97
 msgid "Print debug logging"
 msgstr ""
 
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:100
 #, fuzzy
 #| msgid "Start Geary with hidden main window"
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Εκκίνηση του Geary με κρυφό κύριο παράθυρο"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:103
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr ""
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:106
 msgid "Log conversation monitoring"
 msgstr "Καταγραφή παρακολούθησης της συνομιλίας"
 
 #. / Command line option
-#: src/client/application/application-client.vala:106
+#: src/client/application/application-client.vala:109
 #, fuzzy
 #| msgid "Log network deserialization"
 msgid "Log IMAP network deserialization"
@@ -875,19 +875,16 @@ msgstr "Καταγραφή δραματοποίησης δικτύου"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:110
+#: src/client/application/application-client.vala:113
 msgid "Log folder normalization"
 msgstr "Καταγραφή ομαλοποίησης φάκελου"
 
-#. / Command line option
-#: src/client/application/application-client.vala:113
-msgid "Log network activity"
-msgstr "Καταγραφή δραστηριότητας του δικτύου"
-
 #. / Command line option
 #: src/client/application/application-client.vala:116
-msgid "Log periodic activity"
-msgstr "Καταγραφή περιοδικής δραστηριότητας"
+#, fuzzy
+#| msgid "Log network activity"
+msgid "Log IMAP network activity"
+msgstr "Καταγραφή δραστηριότητας του δικτύου"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
@@ -896,95 +893,92 @@ msgstr "Καταγραφή περιοδικής δραστηριότητας"
 msgid "Log IMAP replay queue"
 msgstr "Καταγραφή ουράς επανάληψης IMAP"
 
-#. / Command line option. Serialization is how commands and
-#. / responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/application-client.vala:126
+#. / Command line option
+#: src/client/application/application-client.vala:124
 #, fuzzy
-#| msgid "Log network serialization"
-msgid "Log IMAP network serialization"
-msgstr "Καταγραφή δραματοποίησης δικτύου"
+#| msgid "Log network activity"
+msgid "Log SMTP network activity"
+msgstr "Καταγραφή δραστηριότητας του δικτύου"
 
 #. / Command line option
-#: src/client/application/application-client.vala:129
+#: src/client/application/application-client.vala:127
 msgid "Log database queries (generates lots of messages)"
 msgstr "Καταγραφή ερωτημάτων βάσης δεδομένων (παράγει πολλά μηνύματα)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:130
 msgid "Perform a graceful quit"
 msgstr ""
 
-#: src/client/application/application-client.vala:134
+#: src/client/application/application-client.vala:132
 msgid "Open a new window"
 msgstr "Άνοιγμα νέου παραθύρου"
 
 #. / Command line option
-#: src/client/application/application-client.vala:137
+#: src/client/application/application-client.vala:135
 #, fuzzy
 #| msgid "Revoke all server certificates with TLS warnings"
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Ανάκληση όλων των πιστοποιητικών διακομιστή με προειδοποιήσεις TLS"
 
 #. / Command line option
-#: src/client/application/application-client.vala:140
+#: src/client/application/application-client.vala:138
 msgid "Display program version"
 msgstr "Εμφάνιση έκδοσης του προγράμματος"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:264
-#| msgid "Mark conversation"
+#: src/client/application/application-client.vala:262
 msgid "Geary version"
 msgstr "Έκδοση Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:266
+#: src/client/application/application-client.vala:264
 msgid "Geary revision"
 msgstr "Αναθεώρηση Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:268
+#: src/client/application/application-client.vala:266
 msgid "GTK version"
 msgstr "Έκδοση GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:275
+#: src/client/application/application-client.vala:273
 msgid "GLib version"
 msgstr "Έκδοση GLib"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:282
+#: src/client/application/application-client.vala:280
 msgid "WebKitGTK version"
 msgstr "Έκδοση WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:289
+#: src/client/application/application-client.vala:287
 msgid "Desktop environment"
 msgstr ""
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:291
+#: src/client/application/application-client.vala:289
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Άγνωστο"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:321
+#: src/client/application/application-client.vala:293
 msgid "Distribution name"
 msgstr "Όνομα διανομής"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:326
+#: src/client/application/application-client.vala:298
 msgid "Distribution release"
 msgstr "Κυκλοφορία διανομής"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:334
+#: src/client/application/application-client.vala:303
 msgid "Installation prefix"
 msgstr ""
 
-#: src/client/application/application-client.vala:587
+#: src/client/application/application-client.vala:559
 #, c-format
 msgid "About %s"
 msgstr "Σχετικά %s"
@@ -992,7 +986,7 @@ msgstr "Σχετικά %s"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada.taro@example.com>
-#: src/client/application/application-client.vala:591
+#: src/client/application/application-client.vala:563
 msgid "translator-credits"
 msgstr ""
 "Ελληνική μεταφραστική ομάδα GNOME\n"
@@ -1009,31 +1003,31 @@ 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:1045
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr ""
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:970
+#: src/client/application/application-client.vala:1078
 #, fuzzy, c-format
 #| msgid "Unrecognized command line option \"%s\"\n"
 msgid "Unrecognised program argument: “%s”"
 msgstr "Άγνωστη επιλογή της γραμμής εντολών \"%s\"\n"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:458
+#: src/client/application/application-controller.vala:479
 #, c-format
 msgid "A problem occurred sending email for %s"
-msgstr ""
+msgstr "Παρουσιάστηκε πρόβλημα κατά την αποστολή μηνύματος στον %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:462
+#: src/client/application/application-controller.vala:483
 msgid "Email will not be sent until re-connected"
 msgstr ""
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:568
+#: src/client/application/application-controller.vala:582
 #, fuzzy
 #| msgid "%s - Conversation Inspector"
 msgid "Conversation marked"
@@ -1042,7 +1036,7 @@ msgstr[0] "%s - Επόπτης συνομιλίας"
 msgstr[1] "%s - Επόπτης συνομιλίας"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:574
+#: src/client/application/application-controller.vala:588
 #, fuzzy
 #| msgid "No conversations in folder."
 msgid "Conversation un-marked"
@@ -1053,8 +1047,8 @@ msgstr[1] "Δεν υπάρχουν συνομιλίες στον φάκελο."
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:600
-#: src/client/application/application-controller.vala:684
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
 #, fuzzy, c-format
 #| msgid "%s - Conversation Inspector"
 msgid "Conversation moved to %s"
@@ -1067,8 +1061,8 @@ msgstr[1] "%s - Επόπτης συνομιλίας"
 #. / of the source folder.
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:608
-#: src/client/application/application-controller.vala:630
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
 #, fuzzy, c-format
 #| msgid "%s - Conversation Inspector"
 msgid "Conversation restored to %s"
@@ -1077,7 +1071,7 @@ msgstr[0] "%s - Επόπτης συνομιλίας"
 msgstr[1] "%s - Επόπτης συνομιλίας"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:651
+#: src/client/application/application-controller.vala:665
 #, fuzzy
 #| msgid "%s - Conversation Inspector"
 msgid "Conversation archived"
@@ -1087,7 +1081,7 @@ msgstr[1] "%s - Επόπτης συνομιλίας"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:707
+#: src/client/application/application-controller.vala:721
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1095,16 +1089,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:728
+#: src/client/application/application-controller.vala:742
 msgid "Message archived"
 msgid_plural "Messages archived"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Το μήνυμα αρχειοθετήθηκε"
+msgstr[1] "Τα μηνύματα αρχειοθετήθηκαν"
 
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:763
+#: src/client/application/application-controller.vala:777
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1114,7 +1108,7 @@ msgstr[1] ""
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:791
+#: src/client/application/application-controller.vala:805
 #, fuzzy, c-format
 #| msgid "No conversations selected."
 msgid "Conversation labelled as %s"
@@ -1125,19 +1119,19 @@ msgstr[1] "Δεν επιλέχθηκαν συνομιλίες."
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:799
+#: src/client/application/application-controller.vala:813
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/client/application/application-controller.vala:1222
+#: src/client/application/application-controller.vala:1320
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Αδύνατο το άνοιγμα της βάσης δεδομένων για το %s"
 
-#: src/client/application/application-controller.vala:1223
+#: src/client/application/application-controller.vala:1321
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1163,21 +1157,21 @@ msgstr ""
 "και τα συνημμένα της. <b>Η αλληλογραφία στον διακομιστή σας δεν θα "
 "επηρεαστεί.</b>"
 
-#: src/client/application/application-controller.vala:1225
+#: src/client/application/application-controller.vala:1323
 msgid "_Rebuild"
 msgstr "Αναδόμη_ση"
 
-#: src/client/application/application-controller.vala:1225
+#: src/client/application/application-controller.vala:1323
 msgid "E_xit"
 msgstr "Έ_ξοδος"
 
-#: src/client/application/application-controller.vala:1235
+#: src/client/application/application-controller.vala:1333
 #, fuzzy, c-format
 #| msgid "Unable to rebuild database for \"%s\""
 msgid "Unable to rebuild database for “%s”"
 msgstr "Αδύνατη η αναδόμηση της βάσης δεδομένων για το \"%s\""
 
-#: src/client/application/application-controller.vala:1236
+#: src/client/application/application-controller.vala:1334
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1190,52 +1184,121 @@ 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:1560
+#: src/client/application/application-controller.vala:1501
 #, c-format
 msgid "Email sent to %s"
 msgstr "Η αλληλογραφία απεστάλη στον %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:2643
+#: src/client/application/application-controller.vala:2491
 #, c-format
 msgid "Email to %s queued for delivery"
 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:2707
+#: src/client/application/application-controller.vala:2555
 #, c-format
 msgid "Email to %s saved"
 msgstr ""
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2722
-#: src/client/application/application-controller.vala:2780
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
 msgid "Composer could not be restored"
 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:2765
+#: src/client/application/application-controller.vala:2613
 #, c-format
 msgid "Email to %s discarded"
 msgstr ""
 
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:540
+msgid "Working offline"
+msgstr "Εργασία εκτός σύνδεσης"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:542
+msgid "You will not be able to send or receive email until re-connected."
+msgstr ""
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:549
+msgid "Login problem"
+msgstr "Πρόβλημα εισόδου"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:551
+msgid "An account has reported an incorrect login or password."
+msgstr ""
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:558
+msgid "Retry login, you will be prompted for your password"
+msgstr ""
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:565
+msgid "Security problem"
+msgstr "Πρόβλημα ασφαλείας"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
+msgstr ""
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:570
+msgid "Check"
+msgstr "Έλεγχος"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:574
+msgid "Check the security details for the connection"
+msgstr ""
+
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
 #. / the second being the selected account name.
-#: src/client/application/application-main-window.vala:560
+#: src/client/application/application-main-window.vala:617
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: src/client/application/application-main-window.vala:967
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:996
+#: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Ετικέτες"
 
+#: src/client/application/application-main-window.vala:1293
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Άδειασμα όλης της ηλεκτρονικής αλληλογγραφίας από το φάκελο %s;"
+
+#: src/client/application/application-main-window.vala:1294
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+"Αυτό αφαιρεί το email από το  Geary και τον διακομιστή ηλεκτρονικής "
+"αλληλογγραφίας σας."
+
+#: src/client/application/application-main-window.vala:1295
+msgid "This cannot be undone."
+msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
+
+#: src/client/application/application-main-window.vala:1296
+#, c-format
+msgid "Empty %s"
+msgstr "Άδειασμα %s"
+
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1306
+#: src/client/application/application-main-window.vala:1353
 #, fuzzy
 #| msgid "Do you want to permanently delete this message?"
 #| msgid_plural "Do you want to permanently delete these messages?"
@@ -1244,39 +1307,19 @@ msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Θέλετε να διαγράψετε οριστικά αυτό το μήνυμα;"
 msgstr[1] "Θέλετε να διαγράψετε οριστικά αυτά τα μηνύματα;"
 
-#: src/client/application/application-main-window.vala:1311
-#: src/client/application/application-main-window.vala:1326
+#: src/client/application/application-main-window.vala:1358
+#: src/client/application/application-main-window.vala:1373
 msgid "Delete"
 msgstr "Διαγραφή"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1321
+#: src/client/application/application-main-window.vala:1368
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Θέλετε να διαγράψετε οριστικά αυτό το μήνυμα;"
 msgstr[1] "Θέλετε να διαγράψετε οριστικά αυτά τα μηνύματα;"
 
-#: src/client/application/application-main-window.vala:1334
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Άδειασμα όλης της ηλεκτρονικής αλληλογγραφίας από το φάκελο %s;"
-
-#: src/client/application/application-main-window.vala:1337
-msgid "This removes the email from Geary and your email server."
-msgstr ""
-"Αυτό αφαιρεί το email από το  Geary και τον διακομιστή ηλεκτρονικής "
-"αλληλογγραφίας σας."
-
-#: src/client/application/application-main-window.vala:1338
-msgid "This cannot be undone."
-msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
-
-#: src/client/application/application-main-window.vala:1339
-#, c-format
-msgid "Empty %s"
-msgstr "Άδειασμα %s"
-
-#: src/client/application/application-main-window.vala:1669
+#: src/client/application/application-main-window.vala:1691
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1287,7 +1330,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:1784
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1308,82 +1351,161 @@ msgstr ""
 msgid "Don’t _ask me again"
 msgstr "Να μην _ερωτηθώ ξανά"
 
-#: src/client/components/components-inspector.vala:72
+#: src/client/components/components-inspector.vala:78
 msgid "Inspector"
 msgstr "Επόπτης"
 
 #. / 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 "Ιστορικό"
 
 #. / 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 "Σύστημα"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:208
-#: src/client/components/components-inspector.vala:211
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
-#: ui/problem-details-dialog.ui:42
+#: src/client/components/components-inspector.vala:226
+#: src/client/components/components-inspector.vala:229
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
+#: ui/problem-details-dialog.ui:47
 msgid "Save As"
 msgstr "Αποθήκευση ως"
 
-#: 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:17 ui/composer-headerbar.ui:61
 msgid "Cancel"
 msgstr "Ακύρωση"
 
 #. / 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 "_Αυτόματη επιλογή επόμενου μηνύματας"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:53
+#: src/client/components/components-preferences-window.vala:134
 msgid "_Display conversation preview"
 msgstr "Να ε_μφανίζεται η προεπισκόπηση συνομιλίας"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:63
+#: src/client/components/components-preferences-window.vala:144
 msgid "Use _three pane view"
 msgstr ""
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:73
+#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr ""
 
-#: src/client/components/components-preferences-window.vala:75
+#: src/client/components/components-preferences-window.vala:156
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
 msgstr ""
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:86
+#: src/client/components/components-preferences-window.vala:167
 #, fuzzy
 #| msgid "Show _notifications for new mail"
 msgid "_Watch for new mail when closed"
 msgstr "Εμφάνιση ειδοποιήσεων για _νέα μηνύματα"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:90
+#: src/client/components/components-preferences-window.vala:171
 msgid "Geary will keep running after all windows are closed"
 msgstr ""
 
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:189
+msgid "Preferences"
+msgstr "Προτιμήσεις"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:250
+msgid "Plugins"
+msgstr "Πρόσθετα"
+
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:36
+msgid "Account problem"
+msgstr "Πρόβλημα λογαριασμού"
+
+#. 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 ""
+
+#. 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 ""
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
+msgid "Try reconnecting"
+msgstr "Δοκιμή επανασύνδεσης"
+
+#. 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 ""
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
+msgid "Retry sending queued messages"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
+msgid "_Details"
+msgstr "_Λεπτομέρειες"
+
+#. 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 ""
+
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
+msgid "_Retry"
+msgstr "_Επανάληψη"
+
 #. / 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 "Αναζήτηση"
 
@@ -1405,29 +1527,27 @@ msgstr "Αναζήτηση λογαριασμού %s"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:390
+#: src/client/components/components-validator.vala:394
 msgid "An email address is required"
-msgstr ""
+msgstr "Απαιτείται διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
 #. 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
-#, fuzzy
-#| msgid "E_mail address"
+#: src/client/components/components-validator.vala:398
 msgid "Not a valid email address"
-msgstr "Διεύθυνση ηλεκτρονικού _ταχυδρομίου"
+msgstr "Μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομίου"
 
 #. 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 ""
+msgstr "Απαιτείται όνομα διακομιστή"
 
 #. 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 ""
 
@@ -1448,20 +1568,16 @@ msgstr[0] "Προσθήκη ετικέτας στην συνομιλία"
 msgstr[1] "Προσθήκη ετικέτας στην συνομιλία"
 
 #: src/client/components/main-toolbar.vala:126
-#, fuzzy
-#| msgid "Move conversation"
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "Μετακίνηση συνομιλίας"
-msgstr[1] "Μετακίνηση συνομιλίας"
+msgstr[1] "Μετακίνηση συνομιλιών"
 
 #: src/client/components/main-toolbar.vala:131
-#, fuzzy
-#| msgid "Archive conversation (A)"
 msgid "Archive conversation"
 msgid_plural "Archive conversations"
-msgstr[0] "Αρχειοθέτηση συνομιλίας (Α)"
-msgstr[1] "Αρχειοθέτηση συνομιλίας (Α)"
+msgstr[0] "Αρχειοθέτηση συνομιλίας"
+msgstr[1] "Αρχειοθέτηση συνομιλιών"
 
 #: src/client/components/main-toolbar.vala:142
 #, fuzzy
@@ -1477,75 +1593,6 @@ msgid_plural "Delete conversations"
 msgstr[0] "Διαγραφή συνομιλίας"
 msgstr[1] "Διαγραφή συνομιλιών"
 
-#. Translators: Info bar title for a generic account
-#. problem.
-#: src/client/components/main-window-info-bar.vala:44
-msgid "Account problem"
-msgstr "Πρόβλημα λογαριασμού"
-
-#. 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 ""
-
-#. 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 ""
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:65
-msgid "Try reconnecting"
-msgstr "Δοκιμή επανασύνδεσης"
-
-#. 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 ""
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:77
-msgid "Retry sending queued messages"
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. Translators: Button label for viewing technical details
-#. for a problem report.
-#: src/client/components/main-window-info-bar.vala:99
-msgid "_Details"
-msgstr "_Λεπτομέρειες"
-
-#. 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 ""
-
-#. Translators: Button label for retrying a server
-#. connection
-#: src/client/components/main-window-info-bar.vala:108
-msgid "_Retry"
-msgstr "_Επανάληψη"
-
 #. / 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…"
@@ -1566,7 +1613,9 @@ msgstr "Σφάλμα κατά την αποθήκευση του μηνύματ
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
@@ -1586,15 +1635,17 @@ msgstr "_Κλείσιμο"
 msgid "_Discard"
 msgstr "Απόρρι_ψη"
 
-#: 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 "_Βοήθεια"
 
-#: 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 "Άνοι_γμα"
 
-#: 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 "_Προτιμήσεις"
 
@@ -1620,36 +1671,40 @@ msgstr "_Αποθήκευση"
 msgid "_Keep"
 msgstr "Δια_τήρηση"
 
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Επιλογή χρώματος"
+
 #: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com"
 msgstr ""
 
 #: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
-msgstr ""
+msgstr "Μη έγκυρος σύνδεσμος URL"
 
 #: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
 #. / 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 "Νέο μήνυμα"
 
-#: src/client/composer/composer-widget.vala:217
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "Αποθηκεύτηκε"
 
-#: src/client/composer/composer-widget.vala:218
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
 msgstr "Αποθηκεύεται"
 
-#: src/client/composer/composer-widget.vala:219
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "Σφάλμα κατά την αποθήκευση"
 
-#: src/client/composer/composer-widget.vala:220
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "Πατήστε το πλήκτρο Backspace για να διαγράψετε το απόσπασμα"
 
@@ -1658,7 +1713,7 @@ msgstr "Πατήστε το πλήκτρο Backspace για να διαγράψ
 #. checking, include all variants of each word. No spaces are
 #. allowed. The words will be converted to lower case based on
 #. locale and English versions included automatically.
-#: src/client/composer/composer-widget.vala:236
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1669,7 +1724,7 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:843
+#: src/client/composer/composer-widget.vala:862
 #, fuzzy
 #| msgid "Do you want to discard this message?"
 msgid "Do you want to keep or discard this draft message?"
@@ -1678,115 +1733,101 @@ msgstr "Θέλετε να απορρίψετε αυτό το μήνυμα;"
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:869
+#: src/client/composer/composer-widget.vala:888
 #, fuzzy
 #| msgid "Do you want to discard this message?"
 msgid "Do you want to discard this draft message?"
 msgstr "Θέλετε να απορρίψετε αυτό το μήνυμα;"
 
-#: src/client/composer/composer-widget.vala:1503
+#: src/client/composer/composer-widget.vala:1440
 msgid "Send message with an empty subject and body?"
 msgstr "Να αποσταλεί το μήνυμα με κενό θέμα και περιεχόμενο;"
 
-#: src/client/composer/composer-widget.vala:1505
+#: src/client/composer/composer-widget.vala:1442
 msgid "Send message with an empty subject?"
 msgstr "Να αποσταλεί το μήνυμα με κενό θέμα;"
 
-#: src/client/composer/composer-widget.vala:1507
+#: src/client/composer/composer-widget.vala:1444
 msgid "Send message with an empty body?"
 msgstr "Να αποσταλεί το μήνυμα με κενό περιεχόμενο;"
 
-#: src/client/composer/composer-widget.vala:1516
+#: src/client/composer/composer-widget.vala:1453
 msgid "Send message without an attachment?"
 msgstr "Να αποσταλεί το μήνυμα χωρίς συνημμένο;"
 
-#: src/client/composer/composer-widget.vala:1820
+#: src/client/composer/composer-widget.vala:1772
 #, fuzzy, c-format
 #| msgid "\"%s\" already attached for delivery."
 msgid "“%s” already attached for delivery."
 msgstr "Το αρχείο \"%s\" έχει ήδη επισυναφθεί για παράδοση."
 
-#: src/client/composer/composer-widget.vala:1856
-#: src/client/composer/composer-widget.vala:1906
-#, fuzzy, c-format
-#| msgid "\"%s\" is an empty file."
+#: src/client/composer/composer-widget.vala:1804
+#: src/client/composer/composer-widget.vala:1854
+#, c-format
 msgid "“%s” is an empty file."
-msgstr "Το \"%s\" είναι ένα άδειο αρχείο."
+msgstr "Το «%s» είναι ένα κενό αρχείο."
 
-#: src/client/composer/composer-widget.vala:1894
-#, fuzzy, c-format
-#| msgid "\"%s\" could not be found."
+#: src/client/composer/composer-widget.vala:1842
+#, c-format
 msgid "“%s” could not be found."
-msgstr "Το \"%s\" δεν ήταν δυνατό να βρεθεί."
+msgstr "Το «%s» δεν ήταν δυνατό να βρεθεί."
 
-#: src/client/composer/composer-widget.vala:1900
-#, fuzzy, c-format
-#| msgid "\"%s\" is a folder."
+#: src/client/composer/composer-widget.vala:1848
+#, c-format
 msgid "“%s” is a folder."
-msgstr "Το \"%s\" είναι ένας φάκελος."
+msgstr "Το «%s» είναι ένας φάκελος."
 
-#: src/client/composer/composer-widget.vala:1919
-#, fuzzy, c-format
-#| msgid "\"%s\" could not be opened for reading."
+#: src/client/composer/composer-widget.vala:1867
+#, c-format
 msgid "“%s” could not be opened for reading."
-msgstr "Το \"%s\" δεν ήταν δυνατό να ανοιχτεί για ανάγνωση."
+msgstr "Το «%s» δεν ήταν δυνατό να ανοιχτεί για ανάγνωση."
 
-#: src/client/composer/composer-widget.vala:1927
+#: src/client/composer/composer-widget.vala:1875
 msgid "Cannot add attachment"
 msgstr "Δεν είναι δυνατή η προσθήκη συνημμένου"
 
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:1946
+msgid "Images"
+msgstr "Εικόνες"
+
 #. 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:2010
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Προς:"
 
 #. 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:2016
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
 #. 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
+#: src/client/composer/composer-widget.vala:2022
+#: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Κρυφή κοιν.:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2002
+#: src/client/composer/composer-widget.vala:2028
 msgid "Reply-To: "
 msgstr "Απάντηση σε: "
 
-#: src/client/composer/composer-widget.vala:2254
-msgid "Select Color"
-msgstr "Επιλογή χρώματος"
-
 #. 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:2440
+#: src/client/composer/composer-widget.vala:2146
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s μέσω %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:2496
-msgid "_From:"
-msgstr "_Από:"
-
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2801
-msgid "Images"
-msgstr "Εικόνες"
-
 #: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Αφαίρεση αυτής της γλώσσας από την προτιμώμενη λίστα"
@@ -1800,55 +1841,51 @@ msgid "Search for more languages"
 msgstr "Αναζήτηση για περισσότερες γλώσσες"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:335
-#, fuzzy
-#| msgid "Move conversation"
+#: src/client/conversation-list/conversation-list-view.vala:339
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
-msgstr[0] "Μετακίνηση συνομιλίας"
-msgstr[1] "Μετακίνηση συνομιλίας"
+msgstr[0] "Μετακίνηση συνομιλίας στα _απορρίματα"
+msgstr[1] "Μετακίνηση συνομιλιών στα _απορρίματα"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
-#, fuzzy
-#| msgid "Delete conversation"
+#: src/client/conversation-list/conversation-list-view.vala:351
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
-msgstr[0] "Διαγραφή συνομιλίας"
-msgstr[1] "Διαγραφή συνομιλίας"
+msgstr[0] "_Διαγραφή συνομιλίας"
+msgstr[1] "_Διαγραφή συνομιλιών"
 
-#: src/client/conversation-list/conversation-list-view.vala:360
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Σήμανση ως α_ναγνωσμένο"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:372
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Σήμανση ως α_διάβαστο"
 
-#: src/client/conversation-list/conversation-list-view.vala:376
+#: src/client/conversation-list/conversation-list-view.vala:380
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "Κα_τάργηση αστεριού"
 
-#: src/client/conversation-list/conversation-list-view.vala:383
+#: src/client/conversation-list/conversation-list-view.vala:387
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Αστέρι"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:392
+#: src/client/conversation-list/conversation-list-view.vala:396
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Απάντηση"
 
-#: src/client/conversation-list/conversation-list-view.vala:398
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "Α_πάντηση σε όλους"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:404
+#: src/client/conversation-list/conversation-list-view.vala:408
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Μπροστά"
@@ -1858,20 +1895,20 @@ msgid "Me"
 msgstr "Εγώ"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:554
-#: src/client/util/util-email.vala:226
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:240
 msgid "From:"
 msgstr "Από:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:574
-#: src/client/util/util-email.vala:231
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:245
 msgid "Date:"
 msgstr "Ημερομηνία:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:584
-#: src/client/util/util-email.vala:229
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:243
 msgid "Subject:"
 msgstr "Θέμα:"
 
@@ -1879,34 +1916,70 @@ msgstr "Θέμα:"
 msgid "This email address may have been forged"
 msgstr ""
 
+#. Translators: Label text displayed when there are too
+#. many email addresses to be shown by default in an
+#. email's header, but they are all being shown anyway.
+#: src/client/conversation-viewer/conversation-message.vala:234
+msgid "Show less"
+msgstr "Προβολή λιγότερων"
+
+#. Translators: Label text displayed when there are
+#. too many email addresses to be shown by default in
+#. an email's header. The string substitution is the
+#. number of extra email to be shown.
+#: src/client/conversation-viewer/conversation-message.vala:260
+#, c-format
+msgid "%d more…"
+msgstr "%d περισσότερα…"
+
 #. Compact headers. These are partially done here and partially
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:439
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Κανένας αποστολέας"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:831
+#: src/client/conversation-viewer/conversation-message.vala:920
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:951
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Εικόνα"
 
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "Δεν εμφανίζονται οι απομακρυσμένες εικόνες"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr ""
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+msgid "Show"
+msgstr "Προβολή"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+#, fuzzy
+#| msgid "Always Show From Sender"
+msgid "Always show from sender"
+msgstr "Να εμφανίζεται πάντοτε ο αποστολέας"
+
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
 #: src/client/conversation-viewer/conversation-viewer.vala:83
-#, fuzzy
-#| msgid "No conversations selected."
 msgid "No conversations selected"
-msgstr "Δεν επιλέχθηκαν συνομιλίες."
+msgstr "Δεν επιλέχθηκαν συνομιλίες"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
@@ -1917,11 +1990,8 @@ msgstr ""
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
 #: src/client/conversation-viewer/conversation-viewer.vala:96
-#, fuzzy
-#| msgid "%u conversation selected."
-#| msgid_plural "%u conversations selected."
 msgid "Multiple conversations selected"
-msgstr "%u συνομιλία επιλέχθηκε."
+msgstr "Επιλέχθηκαν πολλαπλές συνομιλίες"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
@@ -1935,10 +2005,8 @@ msgstr ""
 #. conversations have been found in a search.
 #: src/client/conversation-viewer/conversation-viewer.vala:109
 #: src/client/conversation-viewer/conversation-viewer.vala:122
-#, fuzzy
-#| msgid "No conversations in folder."
 msgid "No conversations found"
-msgstr "Δεν υπάρχουν συνομιλίες στον φάκελο."
+msgstr "Δεν βρέθηκαν συνομιλίες"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
@@ -1969,7 +2037,8 @@ msgstr "Αναξιόπιστη σύνδεση: %s"
 #, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
-"Αδύνατη η επαλήθευση της ταυτότητας του διακομιστή αλληλογραφίας %s στο %s:%u"
+"Αδύνατη η επαλήθευση της ταυτότητας του διακομιστή αλληλογραφίας %s στο %s:"
+"%u."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:48
 #, fuzzy
@@ -2038,14 +2107,10 @@ msgstr ""
 "Η ταυτότητα του διακομιστή δεν ταιριάζει με την ταυτότητα του πιστοποιητικού"
 
 #: src/client/dialogs/certificate-warning-dialog.vala:82
-#, fuzzy
-#| msgid "The server's certificate has expired"
 msgid "The server’s certificate has expired"
 msgstr "Το πιστοποιητικό του διακομιστή έχει λήξει"
 
 #: src/client/dialogs/certificate-warning-dialog.vala:85
-#, fuzzy
-#| msgid "The server's certificate has not been activated"
 msgid "The server’s certificate has not been activated"
 msgstr "Το πιστοποιητικό του διακομιστή δεν έχει ενεργοποιηθεί"
 
@@ -2072,8 +2137,8 @@ msgstr ""
 #. / Translators: Title for problem report dialog error
 #. / information pane
 #. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:100
-#: ui/problem-details-dialog.ui:12
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
@@ -2086,26 +2151,32 @@ msgstr ""
 "Το Geary απαιτεί τον κωδικό πρόσβασης του ηλεκτρονικού ταχυδρομείου σας για "
 "να συνεχίσει"
 
-#. 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 μήνυμα"
 msgstr[1] "%d μηνύματα"
 
-#. / 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 μη αναγνωσμένο"
 msgstr[1] "%d μη αναγνωσμένα"
 
-#. / 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"
@@ -2121,45 +2192,234 @@ msgid_plural "%d results"
 msgstr[0] "%d αποτέλεσμα"
 msgstr[1] "%d αποτελέσματα"
 
-#. / 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
+#, fuzzy, 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 άλλο μήνυμα για το %s)"
+msgstr[1] ""
+"%s\n"
+"(%d άλλα μηνύματα για το %s)"
+
+#. / 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 νέο μήνυμα"
 msgstr[1] "%d νέα μηνύματα"
 
-#. / 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, συνολικά %d νέο μήνυμα"
 msgstr[1] "%s, συνολικά %d νέα μηνύματα"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Νέο μήνυμα"
+msgstr[1] "Νέα μηνύματα"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+msgid "Email Templates"
+msgstr "Πρότυπα ηλεκτρονικού ταχυδρομείου"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr ""
+
+#. 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
+#, fuzzy
+#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr ""
+"Απεσταλμένα | Απεσταλμένα μηνύματα | Απεσταλμένα μηνύματα ηλ. ταχυδρομείου | "
+"Sent | Sent Mail | Sent Email | Sent E-Mail"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Πρότυπα"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:282
+msgid "New"
+msgstr "Νέο"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+msgid "Message template"
+msgstr "Πρότυπο μηνύματος"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+msgid "Send"
+msgstr "Αποστολή"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr "Συγχώνευση Αλληλογραφίας"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr ""
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Έναρξη"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Παύση"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
 #, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d άλλο μήνυμα για το %s)"
-msgstr[1] ""
-"%s\n"
-"(%d άλλα μηνύματα για το %s)"
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] "Απεστάλη %u από %u"
+msgstr[1] "Απεστάλησαν %u από %u"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:90
-#, fuzzy, c-format
-#| msgid "%s - New Messages"
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr ""
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr "Συγχώνευση"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "Εισαγωγή πεδίου"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr ""
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr ""
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+#, fuzzy
+#| msgid "Show _notifications for new mail"
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Εμφάνιση ειδοποιήσεων για _νέα μηνύματα"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
+#, c-format
 msgid "%s — New Messages"
-msgstr "%s - Νέα μηνύματα"
+msgstr "%s — Νέα μηνύματα"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+msgid "Sent Sound"
+msgstr "Ήχος απεσταλμένου"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr ""
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "Άδειασμα"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Πρόχειρο μήνυμα"
+
+#. 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 "Αυτό το μήνυμα δεν έχει αποσταλεί ακόμα."
+
+#. 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 "Το μήνυμα δεν αποθηκεύτηκε"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:201
+#, fuzzy
+#| msgid "This message was sent successfully, but could not be saved to %s."
+msgid "This message was sent, but has not been saved to your account."
+msgstr ""
+"Αυτό το μήνυμα στάλθηκε με επιτυχία, αλλά δεν μπόρεσε να αποθηκευτεί στο %s."
 
 #. / 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
@@ -2229,47 +2489,46 @@ msgstr "Χθές"
 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"
+#. / 12 hours format for datetime that a message being replied
+#. / to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:218
 msgid "%a, %b %-e, %Y at %l:%M %P"
 msgstr "%a, %b %-e, %Y at %l:%M %P"
 
-#. / 24 hours format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:220
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+#. / 24 hours format for the datetime that a message being
+#. / replied to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:224
 msgid "%a, %b %-e, %Y at %H:%M"
 msgstr "%a, %b %-e, %Y at %H:%M"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:224
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+#. / Format for the datetime that a message being replied to
+#. / was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:230
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%a, %b %-e, %Y at %X"
 
-#: src/client/util/util-email.vala:38
-#: src/engine/rfc822/rfc822-message.vala:1000
-msgid "(no subject)"
-msgstr "(χωρίς θέμα)"
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
+msgid "(No subject)"
+msgstr "(Χωρίς θέμα)"
 
 #. / 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
-#, fuzzy
-#| msgid "Edit recipients"
+#: src/client/util/util-email.vala:148
 msgid "(No recipients)"
-msgstr "Επεξεργασία παραληπτών"
+msgstr "(Χωρίς παραλήπτες)"
 
 #. / Translators: This is used for displaying a short
 #. / list of email recipients lists with two or more
 #. / addresses. The first (string) substitution is
 #. / address of the first, the second substitution is
 #. / the number of n - 1 remaining recipients.
-#: src/client/util/util-email.vala:146
+#: src/client/util/util-email.vala:160
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2279,26 +2538,26 @@ msgstr[1] ""
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: src/client/util/util-email.vala:179
+#: src/client/util/util-email.vala:193
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "Στις %1$s, ο/η %2$s έγραψε:"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:186
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "%s wrote:"
 msgstr "%s έγραψε:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:192
+#: src/client/util/util-email.vala:206
 #, c-format
 msgid "On %s:"
 msgstr "Στις %s:"
 
-#: src/client/util/util-email.vala:221
+#: src/client/util/util-email.vala:235
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Προωθημένο μήνυμα ----------"
 
@@ -2326,43 +2585,43 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
+#: src/client/util/util-i18n.vala:277
+msgid "Sent"
 msgstr "Απεσταλμένα"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Διακεκριμένα"
 
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Σημαντικό"
 
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Όλο το ταχυδρομείο"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Ανεπιθύμητα"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
+msgstr ""
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "Εξερχόμενα"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Αρχειοθέτηση"
 
@@ -2393,8 +2652,6 @@ msgstr "συνημμένο"
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
 #: src/engine/imap-db/imap-db-search-query.vala:139
-#, fuzzy
-#| msgid "bcc"
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "κρυφή κοινοποίηση"
@@ -2420,8 +2677,6 @@ msgstr "σώμα"
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
 #: src/engine/imap-db/imap-db-search-query.vala:156
-#, fuzzy
-#| msgid "cc"
 msgctxt "Search operator"
 msgid "cc"
 msgstr "κοινοποίηση"
@@ -2546,7 +2801,7 @@ msgstr "μη αναγνωσμένο"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:882
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
 msgid "Drafts | Draft"
 msgstr "Πρόχειρα | Πρόχειρο | Drafts | Draft"
 
@@ -2554,7 +2809,7 @@ msgstr "Πρόχειρα | Πρόχειρο | Drafts | Draft"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:891
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Απεσταλμένα | Απεσταλμένα μηνύματα | Απεσταλμένα μηνύματα ηλ. ταχυδρομείου | "
@@ -2562,16 +2817,16 @@ msgstr ""
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:896
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Απεσταλμένα"
 
 #. List of general possible folder names to match for the
-#. Spam mailbox. Separate names using a vertical bar and
-#. put the most common localized name to the front for the
-#. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:906
+#. Junk/Spam mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2584,7 +2839,7 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:916
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 "Απορρίμματα | Κάδος απορριμμάτων | Κάδος Ανακύκλωσης | Trash | Rubbish | "
@@ -2592,7 +2847,7 @@ msgstr ""
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:921
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Διαγεγραμμένα"
@@ -2601,33 +2856,37 @@ msgstr "Διαγεγραμμένα"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:931
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgid "Archive | Archives"
 msgstr "Αρχείο | Αρχεία"
 
-#: src/engine/rfc822/rfc822-message.vala:458
+#: src/engine/rfc822/rfc822-message.vala:528
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr ""
 
-#: src/engine/rfc822/rfc822-message.vala:469
+#: src/engine/rfc822/rfc822-message.vala:539
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr ""
 
+#: src/engine/rfc822/rfc822-message.vala:1013
+msgid "(no subject)"
+msgstr "(χωρίς θέμα)"
+
 #: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Προσθήκη λογαριασμού"
 
 #: ui/accounts_editor_add_pane.ui:53
-msgid "Create"
-msgstr "Δημιουργία"
+msgid "_Create"
+msgstr "_Δημιουργία"
 
-#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
 msgid "Receiving"
 msgstr "Γίνεται λήψη"
 
-#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
 msgid "Sending"
 msgstr "Γίνεται η αποστολή"
 
@@ -2697,72 +2956,6 @@ msgstr "Αφαίρεση λογαριασμού"
 msgid "Apply"
 msgstr "Εφαρμογή"
 
-#. Infobar title when one or more accounts are offline
-#: ui/application-main-window.ui:185
-msgid "Working offline"
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. Button label for retrying TLS cert validation
-#: ui/application-main-window.ui:249
-msgid "Check"
-msgstr "Έλεγχος"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/application-main-window.ui:253
-msgid "Check the security details for the connection"
-msgstr ""
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/application-main-window.ui:282
-msgid "Security problem"
-msgstr "Πρόβλημα ασφαλείας"
-
-#. 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 ""
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/application-main-window.ui:299
-msgid "An account has reported an untrusted server."
-msgstr ""
-
-#. 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 ""
-
-#. Infobar title when one or more accounts have a login error
-#: ui/application-main-window.ui:379
-msgid "Login problem"
-msgstr "Πρόβλημα εισόδου"
-
-#. 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 ""
-
-#. Label and tooltip for authentication problem infobar
-#: ui/application-main-window.ui:396
-msgid "An account has reported an incorrect login or password."
-msgstr ""
-
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "Μη έμπιστη σύνδεση"
@@ -2781,272 +2974,264 @@ msgstr "Έμ_πιστος διακομιστής"
 msgid "_Don’t Trust This Server"
 msgstr "Μη έμπιστος _διακομιστής"
 
-#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
-#, fuzzy
-#| msgid "Use %s to open a new composer window"
-msgid "Detach the composer from the window"
-msgstr "Χρησιμοποιήστε το % s για να ανοίξετε ένα νέο παράθυρο σύνθεσης"
-
-#: ui/composer-headerbar.ui:135
-msgid "_Send"
-msgstr "Α_ποστολή"
-
-#: ui/composer-headerbar.ui:162
-msgid "Discard and Close"
-msgstr "Απόρριψη και κλείσμο"
-
-#: ui/composer-headerbar.ui:186
-msgid "Save and Close"
-msgstr "Αποθήκευση και κλείσιμο"
-
-#. 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 ""
-
-#: ui/composer-link-popover.ui:43
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: ui/composer-link-popover.ui:47
-msgid "Link URL"
-msgstr "Σύνδεσμος URL"
-
-#. 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 ""
-
-#: ui/composer-link-popover.ui:62
-msgid "Update"
-msgstr "Ενημέρωση"
-
-#: ui/composer-link-popover.ui:75
-msgid "Delete this link"
-msgstr "Διαγραφή αυτού του συνδέσμου"
-
-#: ui/composer-menus.ui:8
-msgid "_Undo"
-msgstr "Α_ναίρεση"
-
-#: ui/composer-menus.ui:12
-msgid "_Redo"
-msgstr "Επανάλη_ψη"
-
-#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
-msgid "Cu_t"
-msgstr "_Αποκοπή"
-
-#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
-#: ui/conversation-message-menus.ui:37
-msgid "_Copy"
-msgstr "_Αντιγραφή"
-
-#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
-msgid "_Paste"
-msgstr "_Επικόλληση"
-
-#: ui/composer-menus.ui:30
-msgctxt "Clipboard paste as plain text"
-msgid "Paste _Without Formatting"
-msgstr "Επικόλληση _χωρίς μορφοποίηση"
-
-#: ui/composer-menus.ui:50
-msgid "Select _All"
-msgstr "Ε_πιλογή όλων"
-
-#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
-msgid "_Inspect…"
-msgstr "_Επιθεώρηση…"
-
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:60
-msgid "From"
-msgstr "Από"
-
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:130
-msgid "_To"
-msgstr "Πρ_ος"
-
-#: ui/composer-widget.ui:158
-msgid "Show Cc, Bcc, and Reply-To fields"
-msgstr ""
-
-#: ui/composer-widget.ui:219
-msgid "_Cc"
-msgstr "_Κοινοποίηση"
-
-#: ui/composer-widget.ui:267
-msgid "_Bcc"
-msgstr "Κρ_υφή κοιν."
-
-#: ui/composer-widget.ui:315
-msgid "_Reply-To"
-msgstr "Απά_ντηση σε:"
-
-#: ui/composer-widget.ui:372
-msgid "_Subject"
-msgstr "_Θέμα"
-
-#: ui/composer-widget.ui:445
-msgid "Drop files here"
-msgstr "Αφήστε τα αρχεία εδώ"
-
-#: ui/composer-widget.ui:461
-msgid "To add them as attachments"
-msgstr "Για να τα προσθέσετε ως συνημμένα"
-
-#: ui/composer-widget.ui:602
+#: ui/composer-editor.ui:100
 msgid "Bold text"
 msgstr "Κείμενο με έντονη γραφή"
 
-#: ui/composer-widget.ui:626
+#: ui/composer-editor.ui:124
 msgid "Italic text"
 msgstr "Κείμενο με πλάγια γραφή"
 
-#: ui/composer-widget.ui:650
+#: ui/composer-editor.ui:148
 msgid "Underline text"
 msgstr "Υπογραμμισμένο κείμενο"
 
-#: ui/composer-widget.ui:674
-#, fuzzy
-#| msgid "Strikethrough (Ctrl+K)"
+#: ui/composer-editor.ui:172
 msgid "Strikethrough text"
-msgstr "Επιγραμμισμένη γραφή (Ctrl+K)"
+msgstr "Επιγραμμισμένο κείμενο"
 
-#: ui/composer-widget.ui:707
+#: ui/composer-editor.ui:205
 #, fuzzy
 #| msgctxt "shortcut window"
 #| msgid "Insert a link"
 msgid "Insert bulleted list"
 msgstr "Εισαγωγή συνδέσμου"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-editor.ui:229
 #, fuzzy
 #| msgctxt "shortcut window"
 #| msgid "Insert a link"
 msgid "Insert numbered list"
 msgstr "Εισαγωγή συνδέσμου"
 
-#: ui/composer-widget.ui:764
+#: ui/composer-editor.ui:262
 #, fuzzy
 #| msgid "Unquote text (Ctrl+[)"
 msgid "Indent or quote text"
 msgstr "Κείμενο αφαίρεσης παραπομπής (Ctrl+[)"
 
-#: ui/composer-widget.ui:788
+#: ui/composer-editor.ui:286
 #, fuzzy
 #| msgid "Unquote text (Ctrl+[)"
 msgid "Un-indent or unquote text"
 msgstr "Κείμενο αφαίρεσης παραπομπής (Ctrl+[)"
 
-#: ui/composer-widget.ui:817
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Remove formatting"
+#: ui/composer-editor.ui:315
 msgid "Remove text formatting"
-msgstr "Κατάργηση μορφοποίησης"
+msgstr "Κατάργηση μορφοποίησης κειμένου"
 
-#: ui/composer-widget.ui:836
+#: ui/composer-editor.ui:334
 msgid "Change font type"
 msgstr "Αλλαγή τύπου γραμματοσειράς"
 
-#: ui/composer-widget.ui:851
+#: ui/composer-editor.ui:349
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ui/composer-widget.ui:862
+#: ui/composer-editor.ui:360
 msgid "Serif"
 msgstr "Serif"
 
-#: ui/composer-widget.ui:873
+#: ui/composer-editor.ui:371
 msgid "Fixed Width"
 msgstr "Σταθερό πλάτος"
 
-#: ui/composer-widget.ui:899
+#: ui/composer-editor.ui:397
 msgid "Change font color"
 msgstr "Αλλαγή χρώματος γραμματοσειράς"
 
-#: ui/composer-widget.ui:914
+#: ui/composer-editor.ui:412
 msgid "Change font size"
 msgstr "Αλλαγή μεγέθους γραμματοσειράς"
 
-#: ui/composer-widget.ui:949
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Insert a link"
+#: ui/composer-editor.ui:447
 msgid "Insert or update text link"
-msgstr "Εισαγωγή συνδέσμου"
+msgstr "Εισαγωγή ή ενημέρωση συνδέσμου κειμένου"
 
-#: ui/composer-widget.ui:973
+#: ui/composer-editor.ui:471
 msgid "Insert an image"
 msgstr "Εισαγωγή εικόνας"
 
-#: ui/composer-widget.ui:1015
+#: ui/composer-editor.ui:513
 msgid "Undo last edit"
 msgstr "Αναίρεση της πρόσφατης επεξεργασίας"
 
-#: ui/composer-widget.ui:1039
+#: ui/composer-editor.ui:537
 msgid "Redo last edit"
 msgstr "Επαναφορά της πρόσφατης επεξεργασίας"
 
-#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
 msgid "Attach a file"
 msgstr "Επισύναψη αρχείου"
 
-#: ui/composer-widget.ui:1117
+#: ui/composer-editor.ui:615
 #, fuzzy
 #| msgid "Include Original Attachments"
 msgid "Add original attachments"
 msgstr "Να συμπεριλαμβάνονται τα αρχικά συνημμένα"
 
-#: ui/composer-widget.ui:1162
+#: ui/composer-editor.ui:660
 msgid "More options"
 msgstr "Περισσότερες επιλογές"
 
-#: ui/composer-widget.ui:1182
+#: ui/composer-editor.ui:680
 msgid "Show formatting toolbar"
 msgstr ""
 
-#: ui/composer-widget.ui:1200
+#: ui/composer-editor.ui:698
 #, fuzzy
 #| msgid "Enable _spell checking"
 msgid "Select spell checking languages"
 msgstr "Ενεργοποίηση _ορθογράφου"
 
-#: ui/composer-widget.ui:1263
+#: ui/composer-editor.ui:723
 msgid "S_ans Serif"
 msgstr "_Χωρίς πατούρα (Sans Serif)"
 
-#: ui/composer-widget.ui:1268
+#: ui/composer-editor.ui:728
 msgid "S_erif"
 msgstr "_Με πατούρα (Serif)"
 
-#: ui/composer-widget.ui:1273
+#: ui/composer-editor.ui:733
 msgid "_Fixed Width"
 msgstr "_Σταθερό πλάτος"
 
-#: ui/composer-widget.ui:1283
+#: ui/composer-editor.ui:743
 msgid "_Small"
 msgstr "Μι_κρά"
 
-#: ui/composer-widget.ui:1288
+#: ui/composer-editor.ui:748
 msgid "_Medium"
 msgstr "Με_σαία"
 
-#: ui/composer-widget.ui:1293
+#: ui/composer-editor.ui:753
 msgid "Lar_ge"
 msgstr "_Μεγάλα"
 
-#: ui/composer-widget.ui:1303
+#: ui/composer-editor.ui:763
 msgid "_Rich Text"
 msgstr "Κείμενο _πλούσιας μορφής"
 
-#: ui/composer-widget.ui:1308
+#: ui/composer-editor.ui:768
 msgid "_Plain Text"
 msgstr "_Απλό κείμενο"
 
+#: ui/composer-editor-menus.ui:8
+msgid "_Undo"
+msgstr "Α_ναίρεση"
+
+#: ui/composer-editor-menus.ui:12
+msgid "_Redo"
+msgstr "Επανάλη_ψη"
+
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
+msgid "Cu_t"
+msgstr "_Αποκοπή"
+
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
+#: ui/conversation-message-menus.ui:37
+msgid "_Copy"
+msgstr "_Αντιγραφή"
+
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
+msgid "_Paste"
+msgstr "_Επικόλληση"
+
+#: ui/composer-editor-menus.ui:30
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
+msgstr "Επικόλληση _χωρίς μορφοποίηση"
+
+#: ui/composer-editor-menus.ui:50
+msgid "Select _All"
+msgstr "Ε_πιλογή όλων"
+
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
+msgid "_Inspect…"
+msgstr "_Επιθεώρηση…"
+
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+#, fuzzy
+#| msgid "Use %s to open a new composer window"
+msgid "Detach the composer from the window"
+msgstr "Χρησιμοποιήστε το % s για να ανοίξετε ένα νέο παράθυρο σύνθεσης"
+
+#: ui/composer-headerbar.ui:135
+msgid "_Send"
+msgstr "Α_ποστολή"
+
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "Απόρριψη και κλείσμο"
+
+#: ui/composer-headerbar.ui:186
+msgid "Save and Close"
+msgstr "Αποθήκευση και κλείσιμο"
+
+#. 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 ""
+
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: ui/composer-link-popover.ui:47
+msgid "Link URL"
+msgstr "Σύνδεσμος URL"
+
+#. 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 ""
+
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Ενημέρωση"
+
+#: ui/composer-link-popover.ui:75
+msgid "Delete this link"
+msgstr "Διαγραφή αυτού του συνδέσμου"
+
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:61
+msgid "_From"
+msgstr "_Από"
+
+#. Address(es) e-mail is to be sent to
+#: ui/composer-widget.ui:131
+msgid "_To"
+msgstr "Πρ_ος"
+
+#: ui/composer-widget.ui:159
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr ""
+
+#: ui/composer-widget.ui:220
+msgid "_Cc"
+msgstr "_Κοινοποίηση"
+
+#: ui/composer-widget.ui:268
+msgid "_Bcc"
+msgstr "Κρ_υφή κοιν"
+
+#: ui/composer-widget.ui:316
+msgid "_Reply-To"
+msgstr "Απά_ντηση σε"
+
+#: ui/composer-widget.ui:373
+msgid "_Subject"
+msgstr "_Θέμα"
+
+#: ui/composer-widget.ui:446
+msgid "Drop files here"
+msgstr "Αφήστε τα αρχεία εδώ"
+
+#: ui/composer-widget.ui:462
+msgid "To add them as attachments"
+msgstr "Για να τα προσθέσετε ως συνημμένα"
+
 #: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
 msgid "Select all attachments"
 msgstr "Επιλογή όλων των συνημμένων"
@@ -3060,46 +3245,54 @@ msgid "Open selected attachments"
 msgstr "Άνοιγμα επιλεγμένων συνημμένων"
 
 #: ui/components-attachment-pane-menus.ui:17
-#, fuzzy
-#| msgid "_Save All"
 msgid "Save _All"
-msgstr "_Αποθήκευση όλων"
+msgstr "Αποθήκευση ό_λων"
 
-#: ui/components-inspector-error-view.ui:33
+#: ui/components-inspector-error-view.ui:31
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">mailing list</a> "
-"or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug"
-"\">new bug report</a>."
+"one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">contact "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/"
+"ReportingABug\">new bug report</a>."
 msgstr ""
 
-#: ui/components-inspector-error-view.ui:49
+#: ui/components-inspector-error-view.ui:47
 msgid "Details:"
 msgstr "Λεπτομέρειες:"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:20
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
+msgid "Search for matching log entries"
+msgstr ""
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:35
 msgid "Toggle appending new log entries"
 msgstr ""
 
 #. Tooltip for inspector button
-#. Tooltip for problem report button
-#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
-msgid "Search for matching log entries"
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
 msgstr ""
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
 msgid "Save logs entries and details"
 msgstr ""
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
 msgid "Copy to clipboard"
 msgstr "Αντιγραφή στο πρόχειρο"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+msgid "Clears all log entries"
+msgstr "Εκκαθάριση όλων των εγγραφών του ιστορικού"
+
 #: ui/conversation-contact-popover.ui:146
 msgid "New Conversation…"
 msgstr "Νέα συνομιλίας…"
@@ -3160,29 +3353,6 @@ msgstr ""
 msgid "Mark this message as not starred"
 msgstr ""
 
-#: ui/conversation-email.ui:124
-msgid "Edit Draft"
-msgstr "Επεξεργασία πρόχειρου μηνύματος"
-
-#: ui/conversation-email.ui:151
-msgid "Draft message"
-msgstr "Πρόχειρο μήνυμα"
-
-#: ui/conversation-email.ui:167
-msgid "This message has not yet been sent."
-msgstr "Αυτό το μήνυμα δεν έχει αποσταλεί ακόμα."
-
-#: ui/conversation-email.ui:213
-msgid "Message not saved"
-msgstr "Το μήνυμα δεν αποθηκεύτηκε"
-
-#: ui/conversation-email.ui:229
-#, fuzzy
-#| msgid "This message was sent successfully, but could not be saved to %s."
-msgid "This message was sent, but has not been saved to your account."
-msgstr ""
-"Αυτό το μήνυμα στάλθηκε με επιτυχία, αλλά δεν μπόρεσε να αποθηκευτεί στο %s."
-
 #. Translators: Menu item to reply to a specific message.
 #: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
@@ -3248,32 +3418,24 @@ msgid "If unsure, contact the sender and ask before continuing."
 msgstr ""
 
 #: ui/conversation-message-menus.ui:7
-#, fuzzy
-#| msgid "_Open"
 msgid "_Open Link"
-msgstr "Άνοι_γμα"
+msgstr "Άν_οιγμα συνδέσμου"
 
 #: ui/conversation-message-menus.ui:11
 msgid "Copy Link _Address"
 msgstr "Αντιγραφή _διεύθυνσης συνδέσμου"
 
 #: ui/conversation-message-menus.ui:17
-#, fuzzy
-#| msgid "Move conversation"
 msgid "_New Conversation…"
-msgstr "Μετακίνηση συνομιλίας"
+msgstr "Νέα _συζήτηση…"
 
 #: ui/conversation-message-menus.ui:21
-#, fuzzy
-#| msgid "Copy _Email Address"
 msgid "Copy Email _Address"
-msgstr "Αντιγραφή _διεύθυνσης ηλεκτρονικού ταχυδρομείου"
+msgstr "Αντιγραφή _διεύθυνσης αλληλογραφίας"
 
 #: ui/conversation-message-menus.ui:27
-#, fuzzy
-#| msgid "_Save Image As..."
 msgid "Save _Image As…"
-msgstr "Αποθήκευ_ση εικόνας ως..."
+msgstr "Αποθήκευση _εικόνας ως…"
 
 #: ui/conversation-message-menus.ui:33
 msgid "_Select All"
@@ -3289,7 +3451,7 @@ msgstr "1/1/1970\t"
 
 #: ui/conversation-message.ui:102
 msgid "Preview body text."
-msgstr ""
+msgstr "Προεπισκόπηση κειμένου σώματος."
 
 #: ui/conversation-message.ui:202
 msgid "Sent by:"
@@ -3303,22 +3465,6 @@ msgstr "Απάντηση σε:"
 msgid "Subject"
 msgstr "Θέμα"
 
-#: ui/conversation-message.ui:501
-msgid "Show Images"
-msgstr "Προβολή εικόνων"
-
-#: ui/conversation-message.ui:514
-msgid "Always Show From Sender"
-msgstr "Να εμφανίζεται πάντοτε ο αποστολέας"
-
-#: ui/conversation-message.ui:542
-msgid "Remote images not shown"
-msgstr "Δεν εμφανίζονται οι απομακρυσμένες εικόνες"
-
-#: ui/conversation-message.ui:559
-msgid "Only show remote images from senders you trust."
-msgstr ""
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Εύρεση στην συνομιλία"
@@ -3355,7 +3501,7 @@ msgstr "ετικέτα"
 msgid "Conversation Shortcuts"
 msgstr "Συντομεύσεις συνομιλίας"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Ενέργειες"
@@ -3370,17 +3516,17 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Απάντηση στον αποστολέα"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
 #, fuzzy
 #| msgctxt "shortcut window"
 #| msgid "Mark read"
@@ -3388,22 +3534,22 @@ msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "Σήμανση ως ανεγνωσμένου"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr ""
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "Αρχειοθέτηση συνομιλιών"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "Μετακίνηση συνομιλιών"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
 #, fuzzy
 #| msgid "Move conversation"
 msgctxt "shortcut window"
@@ -3417,14 +3563,14 @@ msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "Σήμανση συνομιλιών"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
 #, fuzzy
 #| msgid "Mark conversations"
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "Σήμανση συνομιλιών"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "Διαγραφή συνομιλιών"
@@ -3439,7 +3585,7 @@ msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "Αναζήτηση για συνομιλίες"
 
-#: ui/gtk/help-overlay.ui:115
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Εύρεση στην τρέχουσα συνομιλία"
@@ -3479,7 +3625,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Επαναφορά εστίασης"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Γενικά"
@@ -3533,104 +3679,110 @@ msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "_Αυτόματη επιλογή επόμενου μηνύματας"
 
-#: ui/gtk/help-overlay.ui:258
+#: ui/gtk/help-overlay.ui:260
+#, fuzzy
+#| msgid "_Keyboard Shortcuts"
+msgid "Single-key Shortcuts"
+msgstr "_Συντομεύσεις πληκτρολογίου"
+
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
-msgid "Single-key shortcuts"
+msgid "Single-key shortcuts (if enabled)"
 msgstr ""
 
-#: ui/gtk/help-overlay.ui:262
+#: ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "Απάντηση στον αποστολέα "
 
-#: ui/gtk/help-overlay.ui:332
-#, fuzzy
-#| msgid "Add label to conversation"
-msgctxt "shortcut window"
-msgid "Find in current conversations"
-msgstr "Προσθήκη ετικέτας στην συνομιλία"
-
-#: ui/gtk/help-overlay.ui:339
+#: ui/gtk/help-overlay.ui:361
 #, fuzzy
 #| msgid "Delete conversation"
 msgctxt "shortcut window"
 msgid "Select next/previous conversations"
 msgstr "Διαγραφή συνομιλίας"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:373
 #, fuzzy
 #| msgid "Composer"
 msgid "Composer Shortcuts"
 msgstr "Συνθέτης"
 
-#: ui/gtk/help-overlay.ui:359
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Αποστολή"
 
-#: ui/gtk/help-overlay.ui:366
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Προσθήκη συνημμένου"
 
-#: ui/gtk/help-overlay.ui:379
+#: ui/gtk/help-overlay.ui:395
+#, fuzzy
+#| msgid "Use %s to open a new composer window"
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "Χρησιμοποιήστε το % s για να ανοίξετε ένα νέο παράθυρο σύνθεσης"
+
+#: ui/gtk/help-overlay.ui:408
 #, fuzzy
 #| msgid "Use %s to open a new composer window"
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Χρησιμοποιήστε το % s για να ανοίξετε ένα νέο παράθυρο σύνθεσης"
 
-#: ui/gtk/help-overlay.ui:386
+#: ui/gtk/help-overlay.ui:415
 #, fuzzy
 #| msgid "Use %s to open a new composer window"
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Χρησιμοποιήστε το % s για να ανοίξετε ένα νέο παράθυρο σύνθεσης"
 
-#: ui/gtk/help-overlay.ui:393
+#: ui/gtk/help-overlay.ui:422
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Eπεξεργασία"
 
-#: ui/gtk/help-overlay.ui:398
+#: ui/gtk/help-overlay.ui:427
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
-msgstr ""
+msgstr "Μετακίνηση επιλογής στο πρόχειρο"
 
-#: ui/gtk/help-overlay.ui:405
+#: ui/gtk/help-overlay.ui:434
 #, fuzzy
 #| msgid "Copy to Clipboard"
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Αντιγραφή στο πρόχειρο"
 
-#: ui/gtk/help-overlay.ui:412
+#: ui/gtk/help-overlay.ui:441
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
-msgstr ""
+msgstr "Επικόλληση από το πρόχειρο"
 
-#: ui/gtk/help-overlay.ui:419
+#: ui/gtk/help-overlay.ui:448
 #, fuzzy
 #| msgid "Quote text  (Ctrl+])"
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Κείμενο παραπομπής (Ctrl+])"
 
-#: ui/gtk/help-overlay.ui:426
+#: ui/gtk/help-overlay.ui:455
 #, fuzzy
 #| msgid "Unquote text (Ctrl+[)"
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Κείμενο αφαίρεσης παραπομπής (Ctrl+[)"
 
-#: ui/gtk/help-overlay.ui:435
+#: ui/gtk/help-overlay.ui:464
 #, fuzzy
 #| msgid "_Rich Text"
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Κείμενο _πλούσιας μορφής"
 
-#: ui/gtk/help-overlay.ui:439
+#: ui/gtk/help-overlay.ui:468
 #, fuzzy
 #| msgctxt "Clipboard paste as plain text"
 #| msgid "Paste _Without Formatting"
@@ -3638,39 +3790,39 @@ msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Επικόλληση _χωρίς μορφοποίηση"
 
-#: ui/gtk/help-overlay.ui:446
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Κείμενο με έντονη γραφή"
 
-#: ui/gtk/help-overlay.ui:453
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Κείμενο με πλάγια γραφή"
 
-#: ui/gtk/help-overlay.ui:460
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Υπογραμμισμένο κείμενο"
 
-#: ui/gtk/help-overlay.ui:467
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Επιγράμμιση κειμένου"
 
-#: ui/gtk/help-overlay.ui:474
+#: ui/gtk/help-overlay.ui:503
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Κατάργηση μορφοποίησης"
 
-#: ui/gtk/help-overlay.ui:481
+#: ui/gtk/help-overlay.ui:510
 #, fuzzy
 #| msgid "Underline (Ctrl+U)"
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Υπογραμμισμένη γραφή (Ctrl+U)"
 
-#: ui/gtk/help-overlay.ui:488
+#: ui/gtk/help-overlay.ui:517
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Εισαγωγή συνδέσμου"
@@ -3709,26 +3861,18 @@ msgstr "_Αρχείο"
 #: ui/main-toolbar-menus.ui:21
 #, fuzzy
 #| msgid "Toggle search bar"
-msgid "Toggle as S_pam"
+msgid "Toggle as _Junk"
 msgstr "Εναλλαγή γραμμή αναζήτησης"
 
 #: ui/main-toolbar-menus.ui:28
-msgid "Empty _Spam…"
-msgstr ""
-
-#: ui/main-toolbar-menus.ui:32
-msgid "Empty _Trash…"
-msgstr ""
-
-#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "_Λογαριασμοί"
 
-#: ui/main-toolbar-menus.ui:46
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "_Συντομεύσεις πληκτρολογίου"
 
-#: ui/main-toolbar-menus.ui:57
+#: ui/main-toolbar-menus.ui:47
 msgid "_About Geary"
 msgstr "_Περί του Geary"
 
@@ -3752,16 +3896,37 @@ msgstr "_Πιστοποίηση"
 msgid "Geary update in progress…"
 msgstr "Η αναβάθμιση του Geary είναι σε εξέλιξη…"
 
+#~ msgid "Log periodic activity"
+#~ msgstr "Καταγραφή περιοδικής δραστηριότητας"
+
+#, fuzzy
+#~| msgid "Log network serialization"
+#~ msgid "Log IMAP network serialization"
+#~ msgstr "Καταγραφή δραματοποίησης δικτύου"
+
+#~ msgid "Sent Mail"
+#~ msgstr "Απεσταλμένα"
+
+#~ msgid "Spam"
+#~ msgstr "Ανεπιθύμητα"
+
+#~ msgid "From"
+#~ msgstr "Από"
+
+#~ msgid "Edit Draft"
+#~ msgstr "Επεξεργασία πρόχειρου μηνύματος"
+
+#, fuzzy
+#~| msgid "Add label to conversation"
+#~ msgctxt "shortcut window"
+#~ msgid "Find in current conversations"
+#~ msgstr "Προσθήκη ετικέτας στην συνομιλία"
+
 #, fuzzy
 #~| msgid "_Play notification sounds"
 #~ msgid "Enable notification sounds"
 #~ msgstr "Α_ναπαραγωγή ήχων ειδοποίησης"
 
-#, fuzzy
-#~| msgid "Show _notifications for new mail"
-#~ msgid "Show notifications for new mail"
-#~ msgstr "Εμφάνιση ειδοποιήσεων για _νέα μηνύματα"
-
 #, fuzzy
 #~| msgid "Save dra_fts on server"
 #~ msgid "Save drafts on server"
@@ -3922,11 +4087,6 @@ msgstr "Η αναβάθμιση του Geary είναι σε εξέλιξη…"
 #~ msgid "Mark unread"
 #~ msgstr "Σήμανση ως αδιάβαστο"
 
-#~| msgid "_Star"
-#~ msgctxt "shortcut window"
-#~ msgid "Star"
-#~ msgstr "Επισήμανση με αστέρι"
-
 #~| msgid "U_nstar"
 #~ msgctxt "shortcut window"
 #~ msgid "Unstar"
@@ -3964,9 +4124,6 @@ msgstr "Η αναβάθμιση του Geary είναι σε εξέλιξη…"
 #~ msgid "Show _notifications for new mail"
 #~ msgstr "Εμφάνιση ειδοποιήσεων για _νέα μηνύματα"
 
-#~ msgid "Preferences"
-#~ msgstr "Προτιμήσεις"
-
 #~ msgid "Mail Client"
 #~ msgstr "Πελάτης αλληλογραφίας"
 
@@ -4069,9 +4226,6 @@ msgstr "Η αναβάθμιση του Geary είναι σε εξέλιξη…"
 #~ msgid "Forward (Ctrl+L, F)"
 #~ msgstr "Προώθηση (Ctrl+F, F)"
 
-#~ msgid "Empty"
-#~ msgstr "Άδειασμα"
-
 #~ msgid "Empty Spam or Trash folders"
 #~ msgstr "Άδειασμα φακέλων ανεπιθύμητων ή απορριμμάτων"
 
@@ -4165,9 +4319,6 @@ msgstr "Η αναβάθμιση του Geary είναι σε εξέλιξη…"
 #~ msgstr[0] "%i ταίριασμα (από την αρχή)"
 #~ msgstr[1] "%i ταιριάσματα (από την αρχή)"
 
-#~ msgid "not found"
-#~ msgstr "δεν βρέθηκε"
-
 #~ msgid "To: "
 #~ msgstr "Προς:"
 
-- 
2.29.2