[geary] Update German translation



commit 3142b03ffeba81cc033133970d87d2573e858dbf
Author: Tim Sabsch <tim sabsch com>
Date:   Sun Mar 1 14:48:46 2020 +0000

    Update German translation

 po/de.po | 3050 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1804 insertions(+), 1246 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index f7fc6d72..4dea9ee7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,15 +13,15 @@
 # rageltus <rageltus gmail com>, 2012
 # Benjamin Steinwender <b stbe at>, 2014.
 # Wolfgang Stöggl <c72578 yahoo de>, 2016.
-# Tim Sabsch <tim sabsch com>, 2019.
+# Tim Sabsch <tim sabsch com>, 2019-2020.
 # Mario Blättermann <mario blaettermann gmail com>, 2016-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2019-03-11 08:07+0000\n"
-"PO-Revision-Date: 2019-03-11 14:03+0100\n"
+"POT-Creation-Date: 2020-02-24 15:37+0000\n"
+"PO-Revision-Date: 2020-03-01 15:47+0100\n"
 "Last-Translator: Tim Sabsch <tim sabsch com>\n"
 "Language-Team: Deutsch <translation-team-de lists sourceforge net>\n"
 "Language: de\n"
@@ -29,57 +29,49 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.3\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
 msgstr "Als E-Mail versenden"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-attach.contract.desktop.in:5
-msgid "mail-send"
-msgstr "mail-send"
-
 #: desktop/geary-attach.contract.desktop.in:6
 msgid "Send files using Geary"
 msgstr "Dateien mit Geary versenden"
 
 #. Translators: The application name
-#: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:11
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: 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
 msgid "Geary"
 msgstr "Geary"
 
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
 msgid "Email"
 msgstr "E-Mail"
 
 #. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:15
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:23
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/application-client.vala:32
 msgid "Send and receive email"
 msgstr "Senden und empfangen"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
 msgstr "Email;E-Mail;Mail;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-autostart.desktop.in:9 desktop/org.gnome.Geary.desktop.in:9
-msgid "org.gnome.Geary"
-msgstr "org.gnome.Geary"
-
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:13
+#: desktop/org.gnome.Geary.appdata.xml.in.in:14
 msgid "Geary Development Team"
 msgstr "Geary-Entwicklerteam"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:17
+#: desktop/org.gnome.Geary.appdata.xml.in.in:18
 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, "
@@ -89,7 +81,7 @@ msgstr ""
 "ermöglicht das einfache Lesen, Finden und Schreiben von E-Mails in einer "
 "übersichtlichen und modernen Benutzeroberfläche."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:22
+#: desktop/org.gnome.Geary.appdata.xml.in.in:23
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -97,54 +89,58 @@ msgstr ""
 "Konversationen ermöglichen das Lesen eines gesamten Diskussionsstrangs, ohne "
 "Nachrichten einzeln suchen zu müssen."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:26
+#: desktop/org.gnome.Geary.appdata.xml.in.in:27
 msgid "Geary’s features include:"
 msgstr "Funktionen von Geary umfassen:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:28
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Quick email account setup"
 msgstr "Schnelle Konto-Einrichtung"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Shows related messages together in conversations"
 msgstr "Verwandte Nachrichten gebündelt in Konversationen anzeigen"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Fast, full text and keyword search"
 msgstr "Schnelle Volltext- und Schlüsselwortsuche"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Voll ausgestatteter HTML- und Klartext-Nachrichteneditor"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Desktop notification of new mail"
 msgstr "Benachrichtigung bei neuer E-Mail"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:34
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Kompatibel mit GMail, Yahoo! Mail, Outlook.com und weiteren IMAP-Servern"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:47
+#: desktop/org.gnome.Geary.appdata.xml.in.in:48
 msgid "Geary displaying a conversation"
 msgstr "Geary zeigt eine Konversationsvorschau an"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:52
+#: desktop/org.gnome.Geary.appdata.xml.in.in:59
 msgid "Geary showing the rich text composer"
 msgstr "Geary zeigt den Editor für formatierten Text"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/org.gnome.Geary.desktop.in:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
-msgstr "Mail;E-Mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
+msgstr "Mail;E-Mail;IMAP;GMail;Yahoo;Hotmail;Outlook;Post;Email;Brief;"
 
-#: desktop/org.gnome.Geary.desktop.in:21
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "Neues Fenster"
+
 #: desktop/org.gnome.Geary.gschema.xml:8
 msgid "Maximize window"
 msgstr "Fenster maximieren"
@@ -205,47 +201,73 @@ msgid "True if the folder list Paned is in the horizontal orientation."
 msgstr "Horizontale Ausrichtung des Ordnerliste-Teilfensters."
 
 #: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Show/hide formatting toolbar"
+msgstr "Formatierung-Werkzeugleiste ein-/ausblenden"
+
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "True if the formatting toolbar in the composer is shown."
+msgstr ""
+"Legt fest, ob die Werkzeugleiste für Formatierungen im Verfassen-Fenster "
+"angezeigt werden soll."
+
+#: desktop/org.gnome.Geary.gschema.xml:56
 msgid "Position of message list pane"
 msgstr "Position der Nachrichtenliste"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:57
 msgid "Position of the message list Paned grabber."
 msgstr "Position des Teilfensters mit der Nachrichtenliste."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
+#: desktop/org.gnome.Geary.gschema.xml:62
 msgid "Autoselect next message"
 msgstr "Automatisch die nächste Nachricht wählen"
 
-#: desktop/org.gnome.Geary.gschema.xml:57
+#: desktop/org.gnome.Geary.gschema.xml:63
 msgid "True if we should autoselect the next available conversation."
 msgstr ""
 "Legt fest, ob die nächste verfügbare Konversation automatisch ausgewählt "
 "werden soll."
 
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:68
 msgid "Display message previews"
 msgstr "Nachrichtenvorschauen anzeigen"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:69
 msgid "True if we should display a short preview of each message."
 msgstr ""
 "Legt fest, ob eine kurze Vorschau jeder Nachricht angezeigt werden soll."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Use single key shortcuts"
+msgstr "Einfache Tastenkürzel verwenden"
+
+#: desktop/org.gnome.Geary.gschema.xml:75
+msgid ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
+msgstr ""
+"Tastenkürzel für E-Mail-Aktionen verwenden, die keinen Tastendruck von "
+"<Strg> benötigen, um die Funktion in Gmail zu emulieren."
+
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Languages that shall be used in the spell checker"
 msgstr "Sprachen, die in der Rechtschreibprüfung verwendet werden sollen"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
-msgid "List of the languages to use in the spell checker."
+#: desktop/org.gnome.Geary.gschema.xml:83
+msgid ""
+"A list of POSIX locales, with the empty list disabling spell checking and "
+"the null list using desktop languages by default."
 msgstr ""
-"Liste der Sprachen, die in der Rechtschreibprüfung verwendet werden sollen."
+"Eine Liste von POSIX-Standorteinstellungen. Eine leere Liste deaktiviert die "
+"Rechtschreibprüfung. Die »null«-Liste verwendet die globalen "
+"Spracheinstellungen."
 
-#: desktop/org.gnome.Geary.gschema.xml:74
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Languages that are displayed in the spell checker popover"
 msgstr ""
 "Sprachen, die im Einblendmenü der Rechtschreibprüfung angezeigt werden sollen"
 
-#: desktop/org.gnome.Geary.gschema.xml:75
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
@@ -253,81 +275,85 @@ msgstr ""
 "Liste der Sprachen, die immer im Einblendmenü der Rechtschreibprüfung "
 "angezeigt werden sollen."
 
-#: desktop/org.gnome.Geary.gschema.xml:80
-msgid "Enable notification sounds"
-msgstr "Benachrichtigungstöne aktivieren"
-
-#: desktop/org.gnome.Geary.gschema.xml:81
-msgid "True to play sounds for notifications and sending."
-msgstr ""
-"Legt fest, ob Klänge für Benachrichtigungen und beim Senden abgespielt "
-"werden sollen."
-
-#: desktop/org.gnome.Geary.gschema.xml:86
-msgid "Show notifications for new mail"
-msgstr "Benachrichtigung bei neuen Nachrichten anzeigen"
-
-#: desktop/org.gnome.Geary.gschema.xml:87
-msgid "True to show notification bubbles."
-msgstr "Legt fest, ob Benachrichtigungen angezeigt werden sollen."
-
-#: desktop/org.gnome.Geary.gschema.xml:92
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Notify of new mail at startup"
 msgstr "Beim Start über neue Nachrichten benachrichtigen"
 
-#: desktop/org.gnome.Geary.gschema.xml:93
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "True to notify of new mail at startup."
 msgstr ""
 "Legt fest, ob beim Start Benachrichtigungen bei neuen Nachrichten angezeigt "
 "werden sollen."
 
-#: desktop/org.gnome.Geary.gschema.xml:98
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
 msgstr "Fragen, wenn ein Anhang geöffnet wird"
 
-#: desktop/org.gnome.Geary.gschema.xml:99
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid "True to ask when opening an attachment."
 msgstr "Legt fest, ob nachgefragt werden soll, wenn ein Anhang geöffnet wird."
 
-#: desktop/org.gnome.Geary.gschema.xml:104
+#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
 msgstr "Nachrichten in HTML verfassen"
 
-#: desktop/org.gnome.Geary.gschema.xml:105
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr "Legt fest, ob Nachrichten in HTML verfasst werden sollen."
 
-#: desktop/org.gnome.Geary.gschema.xml:110
+#: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
 msgstr "Strategie für Volltextsuche"
 
-#: desktop/org.gnome.Geary.gschema.xml:111
+#: desktop/org.gnome.Geary.gschema.xml:115
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 "Zulässige Werte sind »exact«, »conservative«, »aggressive« und »horizon«."
 
-#: desktop/org.gnome.Geary.gschema.xml:116
+#: desktop/org.gnome.Geary.gschema.xml:120
 msgid "Zoom of conversation viewer"
 msgstr "Vergrößerungsstufe der Konversationsansicht"
 
-#: desktop/org.gnome.Geary.gschema.xml:117
+#: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
 msgstr "Der auf die Konversationsansicht anzuwendende Vergrößerungsstufe."
 
-#: desktop/org.gnome.Geary.gschema.xml:122
+#: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
 msgstr "Größe des abgekoppelten Verfassen-Fensters"
 
-#: desktop/org.gnome.Geary.gschema.xml:123
+#: desktop/org.gnome.Geary.gschema.xml:127
 msgid "The last recorded size of the detached composer window."
 msgstr "Die zuletzt gespeicherte Größe des abgekoppelten Verfassen-Fensters."
 
-#: desktop/org.gnome.Geary.gschema.xml:128
+#: desktop/org.gnome.Geary.gschema.xml:132
+msgid "Undo sending email delay"
+msgstr "Verzögerung bis zum E-Mail-Versand"
+
+#: desktop/org.gnome.Geary.gschema.xml:133
+msgid ""
+"The number of seconds to wait before sending an email. Set to zero or less "
+"to disable."
+msgstr ""
+"Die Anzahl an Sekunden, die gewartet wird, bis eine E-Mail versandt wird. "
+"Deaktiviert bei Werten kleiner oder gleich 0."
+
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr "Anzeigedauer von Kurzbenachrichtigungen"
+
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr "Die Dauer in Sekunden, in der Kurzbenachrichtigungen angezeigt werden."
+
+#: desktop/org.gnome.Geary.gschema.xml:146
 msgid "Whether we migrated the old settings"
 msgstr "Alte Einstellungen migrieren"
 
-#: desktop/org.gnome.Geary.gschema.xml:129
+#: desktop/org.gnome.Geary.gschema.xml:147
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -337,24 +363,24 @@ msgstr ""
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:203
+#: src/client/accounts/accounts-editor.vala:210
 msgid "Failed to store certificate"
 msgstr "Zertifikat konnte nicht gespeichert werden"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:109
+#: src/client/accounts/accounts-editor-add-pane.vala:108
 msgid "All others"
 msgstr "Alle übrigen"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:196
+#: src/client/accounts/accounts-editor-add-pane.vala:195
 #: src/client/accounts/accounts-editor-servers-pane.vala:316
 msgid "Check your receiving login and password"
 msgstr "Prüfen Sie Ihren Benutzernamen und Passwort zum Empfangen"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:211
+#: src/client/accounts/accounts-editor-add-pane.vala:210
 #: src/client/accounts/accounts-editor-servers-pane.vala:329
 msgid "Check your receiving server details"
 msgstr "Prüfen Sie die Serverdetails zum Empfangen"
@@ -364,51 +390,51 @@ msgstr "Prüfen Sie die Serverdetails zum Empfangen"
 #. succeeded, so the user probably needs to
 #. specify custom creds here
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:233
+#: src/client/accounts/accounts-editor-add-pane.vala:232
 #: src/client/accounts/accounts-editor-servers-pane.vala:350
 msgid "Check your sending login and password"
 msgstr "Prüfen Sie Ihren Benutzernamen und Passwort zum Senden"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:247
+#: src/client/accounts/accounts-editor-add-pane.vala:246
 #: src/client/accounts/accounts-editor-servers-pane.vala:363
 msgid "Check your sending server details"
 msgstr "Prüfen Sie die Serverdetails zum Senden"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:262
+#: src/client/accounts/accounts-editor-add-pane.vala:261
 msgid "Check your email address and password"
 msgstr "Prüfen Sie Ihre E-Mail-Adresse und Ihr Passwort"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:273
+#: src/client/accounts/accounts-editor-add-pane.vala:272
 msgid "Could not connect, check your network"
 msgstr "Verbindung konnte nicht hergestellt werden, prüfen Sie Ihr Netzwerk"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:286
+#: src/client/accounts/accounts-editor-add-pane.vala:285
 msgid "An unexpected problem occurred"
 msgstr "Ein unerwartetes Problem ist aufgetreten"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:304
+#: src/client/accounts/accounts-editor-add-pane.vala:303
 #, c-format
 msgid "Account not created: %s"
 msgstr "Konto wurde nicht erstellt: %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:551
+#: src/client/accounts/accounts-editor-add-pane.vala:558
 msgid "Your name"
 msgstr "Ihr Name"
 
 #. Translators: Label used for the address part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:568
-#: src/client/accounts/accounts-editor-edit-pane.vala:501
+#: src/client/accounts/accounts-editor-add-pane.vala:575
+#: src/client/accounts/accounts-editor-edit-pane.vala:513
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
@@ -417,8 +443,8 @@ msgstr "E-Mail-Adresse"
 #. Translators: This is used as a placeholder for the
 #. address part of an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:571
-#: src/client/accounts/accounts-editor-edit-pane.vala:469
+#: src/client/accounts/accounts-editor-add-pane.vala:579
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
 msgid "person example com"
 msgstr "name beispiel de"
 
@@ -426,15 +452,15 @@ msgstr "name beispiel de"
 #. when adding an account
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:585
-#: src/client/accounts/accounts-editor-servers-pane.vala:880
+#: src/client/accounts/accounts-editor-add-pane.vala:593
+#: src/client/accounts/accounts-editor-servers-pane.vala:884
 msgid "Login name"
 msgstr "Benutzername"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:599
-#: src/client/accounts/accounts-editor-servers-pane.vala:999
+#: src/client/accounts/accounts-editor-add-pane.vala:607
+#: src/client/accounts/accounts-editor-servers-pane.vala:1006
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Passwort"
@@ -443,14 +469,14 @@ msgstr "Passwort"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:621
-#: src/client/accounts/accounts-editor-servers-pane.vala:727
+#: src/client/accounts/accounts-editor-add-pane.vala:629
+#: src/client/accounts/accounts-editor-servers-pane.vala:728
 msgid "IMAP server"
 msgstr "IMAP-Server"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:624
+#: src/client/accounts/accounts-editor-add-pane.vala:632
 msgid "imap.example.com"
 msgstr "imap.example.com"
 
@@ -458,20 +484,20 @@ msgstr "imap.example.com"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:630
-#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#: src/client/accounts/accounts-editor-add-pane.vala:638
+#: src/client/accounts/accounts-editor-servers-pane.vala:734
 msgid "SMTP server"
 msgstr "SMTP-Server"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:633
+#: src/client/accounts/accounts-editor-add-pane.vala:641
 msgid "smtp.example.com"
 msgstr "smtp.example.com"
 
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:278
+#: src/client/accounts/accounts-editor-edit-pane.vala:277
 #: ui/accounts_editor_remove_pane.ui:123
 msgid "Account name"
 msgstr "Kontoname"
@@ -480,46 +506,46 @@ msgstr "Kontoname"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:312
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "Ändern Sie den Kontonamen zurück zu »%s«"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:336
+#: src/client/accounts/accounts-editor-edit-pane.vala:342
 msgid "Add a new sender email address"
 msgstr "Eine neue E-Mail-Adresse zum Senden hinzufügen"
 
 #. Translators: Label used to indicate the user has
 #. provided no display name for one of their sender
 #. email addresses in their account settings.
-#: src/client/accounts/accounts-editor-edit-pane.vala:417
+#: src/client/accounts/accounts-editor-edit-pane.vala:423
 msgid "Name not set"
 msgstr "Name ist nicht gesetzt"
 
 #. Translators: This is used as a placeholder for the
 #. display name for an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:456
+#: src/client/accounts/accounts-editor-edit-pane.vala:464
 msgid "Sender Name"
 msgstr "Absendername"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
 msgid "Remove"
 msgstr "Entfernen"
 
 #. Translators: Label used for the display name part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:494
+#: src/client/accounts/accounts-editor-edit-pane.vala:506
 msgid "Sender name"
 msgstr "Absendername"
 
 #. Translators: Label used as the undo tooltip after adding an
 #. new sender email address to an account. The string
 #. substitution is the email address added.
-#: src/client/accounts/accounts-editor-edit-pane.vala:561
+#: src/client/accounts/accounts-editor-edit-pane.vala:573
 #, c-format
 msgid "Remove “%s”"
 msgstr "»%s« entfernen"
@@ -527,7 +553,7 @@ msgstr "»%s« entfernen"
 #. Translators: Label used as the undo tooltip after editing a
 #. sender address for an account. The string substitution is
 #. the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:601
+#: src/client/accounts/accounts-editor-edit-pane.vala:613
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "Änderungen rückgängig machen zu »%s«"
@@ -535,7 +561,7 @@ msgstr "Änderungen rückgängig machen zu »%s«"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:688
+#: src/client/accounts/accounts-editor-edit-pane.vala:700
 #, c-format
 msgid "Add “%s” back"
 msgstr "»%s« wieder hinzufügen"
@@ -543,14 +569,14 @@ msgstr "»%s« wieder hinzufügen"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:730
+#: src/client/accounts/accounts-editor-edit-pane.vala:742
 msgid "Undo signature changes"
 msgstr "Änderungen an der Signatur rückgängig machen"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:778
+#: src/client/accounts/accounts-editor-edit-pane.vala:790
 msgid "Download mail"
 msgstr "E-Mail herunterladen"
 
@@ -559,99 +585,101 @@ msgstr "E-Mail herunterladen"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:810
+#: src/client/accounts/accounts-editor-edit-pane.vala:822
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Download-Länge zurücksetzen auf: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:831
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
 msgid "Everything"
 msgstr "Alles"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:835
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "2 weeks back"
 msgstr "2 Wochen zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:839
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 month back"
 msgstr "1 Monat zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "3 months back"
 msgstr "3 Monate zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "6 months back"
 msgstr "6 Monate zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
 msgid "1 year back"
 msgstr "1 Jahr zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
 msgid "2 years back"
 msgstr "2 Jahre zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
 msgid "4 years back"
 msgstr "4 Jahre zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:865
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
 msgstr[0] "%d Tag zurück"
 msgstr[1] "%d Tage zurück"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:243
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2053
 msgid "Undo"
 msgstr "Rückgängig machen"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:251
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2036
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:345
-#: src/client/accounts/accounts-editor-list-pane.vala:433
-#: src/client/accounts/accounts-editor-row.vala:278
+#: src/client/accounts/accounts-editor-list-pane.vala:358
+#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:349
-#: src/client/accounts/accounts-editor-list-pane.vala:437
-#: src/client/accounts/accounts-editor-row.vala:282
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:353
-#: src/client/accounts/accounts-editor-list-pane.vala:441
-#: src/client/accounts/accounts-editor-row.vala:286
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: 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:371
+#: src/client/accounts/accounts-editor-list-pane.vala:384
 msgid "This account has been disabled"
 msgstr "Dieses Konto wurde deaktiviert"
 
 #. 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:380
+#: src/client/accounts/accounts-editor-list-pane.vala:393
 msgid "This account has encountered a problem and is unavailable"
 msgstr ""
 "Bei diesem Konto ist ein Fehler aufgetreten und es ist daher nicht verfügbar"
 
 #. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:430
+#: src/client/accounts/accounts-editor-list-pane.vala:443
 msgid "Other email providers"
 msgstr "Andere E-Mail-Anbieter"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:547
+#: src/client/accounts/accounts-editor-list-pane.vala:560
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Konto »%s« wurde entfernt"
@@ -659,44 +687,44 @@ msgstr "Konto »%s« wurde entfernt"
 #. 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:554
+#: src/client/accounts/accounts-editor-list-pane.vala:567
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Konto »%s« wurde wiederhergestellt"
 
 #. Translators: Tooltip for dragging list items
-#: src/client/accounts/accounts-editor-row.vala:49
+#: src/client/accounts/accounts-editor-row.vala:50
 msgid "Drag to move this item"
 msgstr "Klicken Sie auf das Objekt und ziehen Sie es, um es zu bewegen"
 
 #. 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:294
+#: src/client/accounts/accounts-editor-row.vala:295
 msgid "Service provider"
 msgstr "Anbieter"
 
 #. 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:467
+#: src/client/accounts/accounts-editor-row.vala:468
 msgid "Connection security"
 msgstr "Sicherheit der Verbindung"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:478
-#: src/client/accounts/accounts-editor-servers-pane.vala:752
-#: src/client/accounts/accounts-editor-servers-pane.vala:964
+#: 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
 msgid "None"
 msgstr "Nichts"
 
-#: src/client/accounts/accounts-editor-row.vala:485
+#: src/client/accounts/accounts-editor-row.vala:486
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:492
+#: src/client/accounts/accounts-editor-row.vala:493
 msgid "TLS"
 msgstr "TLS"
 
@@ -704,28 +732,29 @@ msgstr "TLS"
 #. 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:533 ui/main-window.ui:455
+#: src/client/accounts/accounts-editor-row.vala:534
+#: ui/application-main-window.ui:346
 msgid "Login"
 msgstr "Anmelden"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:540
+#: src/client/accounts/accounts-editor-row.vala:541
 msgid "No login needed"
 msgstr "Keine Anmeldung erforderlich"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:548
+#: src/client/accounts/accounts-editor-row.vala:549
 msgid "Use same login as receiving"
 msgstr "Dieselben Anmeldedaten zum Empfangen verwenden"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:556
+#: src/client/accounts/accounts-editor-row.vala:557
 msgid "Use a different login"
 msgstr "Andere Anmeldedaten verwenden"
 
@@ -750,8 +779,8 @@ msgstr "GNOME Online-Konten"
 #. Translators: This label describes an account
 #. preference.
 #: src/client/accounts/accounts-editor-servers-pane.vala:611
-msgid "Save drafts on server"
-msgstr "Entwürfe auf dem Server speichern"
+msgid "Save draft email on server"
+msgstr "E-Mail-Entwürfe auf dem Server speichern"
 
 #. Translators: This label describes an account
 #. preference.
@@ -764,145 +793,328 @@ msgstr "Gesendete E-Mails auf dem Server speichern"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:950
+#: src/client/accounts/accounts-editor-servers-pane.vala:956
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s mittels OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:960
+#: src/client/accounts/accounts-editor-servers-pane.vala:966
 msgid "Use receiving server login"
 msgstr "Server-Anmeldedaten zum Empfangen verwenden"
 
-#: src/client/application/geary-application.vala:24
+#. Translators: File name used in save chooser when saving
+#. attachments that do not otherwise have a name.
+#: src/client/application/application-attachment-manager.vala:21
+msgid "Untitled"
+msgstr "Unbenannt"
+
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Die Datei »%s« existiert schon. Möchten Sie diese ersetzen?"
+
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
+#, c-format
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr ""
+"Die Datei existiert bereits in »%s«. Beim Ersetzen wird die Datei "
+"überschrieben."
+
+#: src/client/application/application-attachment-manager.vala:236
+msgid "_Replace"
+msgstr "_Ersetzen"
+
+#: src/client/application/application-client.vala:33
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:25
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016-2019 Geary Development Team."
 msgstr "Copyright 2016-2019 Geary-Entwicklerteam."
 
-#: src/client/application/geary-application.vala:27
+#: src/client/application/application-client.vala:36
 msgid "Visit the Geary web site"
 msgstr "Geary-Webseite besuchen"
 
-#: src/client/application/geary-application.vala:454
-#, c-format
-msgid "About %s"
-msgstr "Info zu %s"
-
-#. Translators: add your name and email address to receive
-#. credit in the About dialog For example: Yamada Taro
-#. <yamada taro example com>
-#: src/client/application/geary-application.vala:458
-msgid "translator-credits"
-msgstr ""
-"Benjamin Steinwender <b stbe at>\n"
-"Wolfgang Stöggl <c72578 yahoo de>\n"
-"Mario Blättermann <mario blaettermann gmail com>\n"
-"Tim Sabsch <tim sabsch com>"
+#. / Command line option
+#: src/client/application/application-client.vala:94
+msgid "Print debug logging"
+msgstr "Fehlerbehebungsprotokolle anzeigen"
 
-#: src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Geary mit verborgenem Hauptfenster starten"
+#. / Command line option
+#: src/client/application/application-client.vala:97
+msgid "Start with the main window hidden (deprecated)"
+msgstr "Geary mit verborgenem Hauptfenster starten (veraltet)"
 
-#: src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Debuginformationen ausgeben"
+#. / Command line option
+#: src/client/application/application-client.vala:100
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr "WebKitGTK-Inspector in Webanzeigen aktivieren"
 
-#: src/client/application/geary-args.vala:12
+#. / Command line option
+#: src/client/application/application-client.vala:103
 msgid "Log conversation monitoring"
 msgstr "Gesprächsmonitoring protokollieren"
 
-#: src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Netzwerkdeserialisierung protokollieren"
+#. / Command line option
+#: src/client/application/application-client.vala:106
+msgid "Log IMAP network deserialization"
+msgstr "IMAP-Netzwerkdeserialisierung protokollieren"
+
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/application-client.vala:110
+msgid "Log folder normalization"
+msgstr "Ordnerabgleich protokollieren"
 
-#: src/client/application/geary-args.vala:14
+#. / Command line option
+#: src/client/application/application-client.vala:113
 msgid "Log network activity"
 msgstr "Netzwerkaktivitäten protokollieren"
 
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: src/client/application/geary-args.vala:17
+#. / Command line option
+#: src/client/application/application-client.vala:116
+msgid "Log periodic activity"
+msgstr "Regelmäßige Aktivitäten protokollieren"
+
+#. / Command line option. The IMAP replay queue is how changes
+#. / on the server are replicated on the client.  It could
+#. / also be called the IMAP events queue.
+#: src/client/application/application-client.vala:121
 msgid "Log IMAP replay queue"
 msgstr "IMAP-Ereigniswarteschlange protokollieren"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
+#. / Command line option. Serialization is how commands and
+#. / responses are converted into a stream of bytes for
 #. / network transmission
-#: src/client/application/geary-args.vala:20
-msgid "Log network serialization"
-msgstr "Netzwerkserialisierung protokollieren"
+#: src/client/application/application-client.vala:126
+msgid "Log IMAP network serialization"
+msgstr "IMAP-Netzwerkserialisierung protokollieren"
 
-#: src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Regelmäßige Aktivitäten protokollieren"
-
-#: src/client/application/geary-args.vala:22
+#. / Command line option
+#: src/client/application/application-client.vala:129
 msgid "Log database queries (generates lots of messages)"
 msgstr ""
 "Datenbankabfragen protokollieren (dabei werden sehr viele Einträge erzeugt)"
 
-#. / "Normalization" can also be called "synchronization"
-#: src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Ordnerabgleich protokollieren"
-
-#: src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Untersuchung der Webansicht erlauben"
-
-#: src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Alle Server-Zertifikate mit TLS-Warnungen widerrufen"
-
-#: src/client/application/geary-args.vala:27
+#. / Command line option
+#: src/client/application/application-client.vala:132
 msgid "Perform a graceful quit"
 msgstr "Ordnungsgemäß beenden"
 
-#: src/client/application/geary-args.vala:28
+#: src/client/application/application-client.vala:134
+msgid "Open a new window"
+msgstr "Ein neues Fenster öffnen"
+
+#. / Command line option
+#: src/client/application/application-client.vala:137
+msgid "Revoke all pinned TLS server certificates"
+msgstr "Alle beschränkten TLS-Server-Zertifikate widerrufen"
+
+#. / Command line option
+#: src/client/application/application-client.vala:140
 msgid "Display program version"
 msgstr "Programmversion anzeigen"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: src/client/application/geary-args.vala:53
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Benutzen Sie %s, um ein neues »Verfassen«-Fenster zu öffnen"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:264
+msgid "Geary version"
+msgstr "Geary-Version"
+
+# Bezieht sich auf Git-Revision
+#. / Application runtime information label
+#: src/client/application/application-client.vala:266
+msgid "Geary revision"
+msgstr "Geary-Revision"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:268
+msgid "GTK version"
+msgstr "GTK-Version"
+
+#. / Applciation runtime information label
+#: src/client/application/application-client.vala:275
+msgid "GLib version"
+msgstr "GLib-Version"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:282
+msgid "WebKitGTK version"
+msgstr "WebKitGTK-Version"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:289
+msgid "Desktop environment"
+msgstr "Desktopumgebung"
 
-#: src/client/application/geary-args.vala:56
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Bitte melden Sie Kommentare, Vorschläge und Fehler an:"
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/application/application-client.vala:291
+#: src/client/components/components-attachment-pane.vala:91
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#. i18n: Command line arguments are invalid
-#: src/client/application/geary-args.vala:63
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Die Befehlszeilenargumente konnten nicht interpretiert werden: %s\n"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:321
+msgid "Distribution name"
+msgstr "Distributionsname"
 
-#: src/client/application/geary-args.vala:74
-#, c-format
-msgid "Unrecognized command line option “%s”\n"
-msgstr "Unbekanntes Befehlszeilenargument »%s«\n"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:326
+msgid "Distribution release"
+msgstr "Distributionsveröffentlichung"
 
-#. Translators: File name used in save chooser when saving
-#. attachments that do not otherwise have a name.
-#: src/client/application/geary-controller.vala:58
-msgid "Untitled"
-msgstr "Unbenannt"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:334
+msgid "Installation prefix"
+msgstr "Installationspräfix"
 
-#: src/client/application/geary-controller.vala:954
-msgid "Labels"
-msgstr "Beschriftungen"
+#: src/client/application/application-client.vala:587
+#, c-format
+msgid "About %s"
+msgstr "Info zu %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
+msgid "translator-credits"
+msgstr ""
+"Benjamin Steinwender <b stbe at>\n"
+"Wolfgang Stöggl <c72578 yahoo de>\n"
+"Mario Blättermann <mario blaettermann gmail com>\n"
+"Tim Sabsch <tim sabsch com>"
 
-#. give the user two options: reset the Account local store, or exit Geary.  A third
-#. could be done to leave the Account in an unopened state, but we don't currently
-#. have provisions for that.
-#: src/client/application/geary-controller.vala:967
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/application-client.vala:937
+msgid "The `--hidden` option is deprecated and will be removed in the future."
+msgstr ""
+"Die Option »--hidden« ist veraltet und wird in einer künftigen Version "
+"entfernt."
+
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/application-client.vala:970
+#, c-format
+msgid "Unrecognised program argument: “%s”"
+msgstr "Unbekanntes Befehlszeilenargument »%s«"
+
+#. / Notification title.
+#: src/client/application/application-controller.vala:458
+#, c-format
+msgid "A problem occurred sending email for %s"
+msgstr "Ein Problem ist beim Senden von E-Mails für %s aufgetreten"
+
+#. / Notification body
+#: src/client/application/application-controller.vala:462
+msgid "Email will not be sent until re-connected"
+msgstr "E-Mail wird nicht gesendet, bis wieder eine Verbindung besteht."
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:568
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Konversation markiert"
+msgstr[1] "Konversationen markiert"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:574
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Markierung der Konversation aufgehoben"
+msgstr[1] "Markierung der Konversationen aufgehoben"
+
+#. / 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
+#, c-format
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "Konversation verschoben nach %s"
+msgstr[1] "Konversationen verschoben nach %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the source folder.
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:608
+#: src/client/application/application-controller.vala:630
+#, c-format
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "Konversation wiederhergestellt nach %s"
+msgstr[1] "Konversationen wiederhergestellt nach %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:651
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "Konversation archiviert"
+msgstr[1] "Konversationen archiviert"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:707
+#, c-format
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "Nachricht wiederhergestellt nach %s"
+msgstr[1] "Nachrichten wiederhergestellt nach %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:728
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "Nachricht archiviert"
+msgstr[1] "Nachrichten archiviert"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:763
+#, c-format
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "Nachricht verschoben nach %s"
+msgstr[1] "Nachrichten verschoben nach %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:791
+#, c-format
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "Konversation beschriftet als %s"
+msgstr[1] "Konversationen beschriftet als %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:799
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] "Beschriftung der Konversation als %s aufgehoben"
+msgstr[1] "Beschriftung der Konversationen als %s aufgehoben"
+
+#: src/client/application/application-controller.vala:1222
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Die Datenbank für %s konnte nicht geöffnet werden"
 
-#: src/client/application/geary-controller.vala:968
+#: src/client/application/application-controller.vala:1223
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -927,20 +1139,20 @@ msgstr ""
 "dazugehörigen Anhänge verloren. <b>E-Mails auf Ihrem Server werden nicht "
 "betroffen sein.</b>"
 
-#: src/client/application/geary-controller.vala:970
+#: src/client/application/application-controller.vala:1225
 msgid "_Rebuild"
 msgstr "_Wiederherstellen"
 
-#: src/client/application/geary-controller.vala:970
+#: src/client/application/application-controller.vala:1225
 msgid "E_xit"
 msgstr "B_eenden"
 
-#: src/client/application/geary-controller.vala:979
+#: src/client/application/application-controller.vala:1235
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Die Datenbank für »%s« konnte nicht wiederhergestellt werden"
 
-#: src/client/application/geary-controller.vala:980
+#: src/client/application/application-controller.vala:1236
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -951,404 +1163,352 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/geary-controller.vala:1835
-msgid "Undo move (Ctrl+Z)"
-msgstr "Verschieben rückgängig machen (Strg+Z)"
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:1559
+#, c-format
+msgid "Email sent to %s"
+msgstr "E-Mail gesendet an %s"
 
-#: src/client/application/geary-controller.vala:1845
-msgid "Are you sure you want to open these attachments?"
-msgstr "Möchten Sie wirklich diese Anhänge öffnen?"
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2642
+#, c-format
+msgid "Email to %s queued for delivery"
+msgstr "E-Mail an %s zum Versand vorgemerkt"
 
-#: src/client/application/geary-controller.vala:1846
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Anhänge können Ihr System beschädigen, wenn diese geöffnet werden. Öffnen "
-"Sie nur Dateien aus vertrauenswürdigen Quellen."
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2706
+#, c-format
+msgid "Email to %s saved"
+msgstr "E-Mail an %s gespeichert"
 
-#: src/client/application/geary-controller.vala:1847
-msgid "Don’t _ask me again"
-msgstr "Nicht _noch einmal fragen"
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2721
+#: src/client/application/application-controller.vala:2779
+msgid "Composer could not be restored"
+msgstr "Verfassen-Fenster konnte nicht wiederhergestellt werden"
 
-#. Translators: Dialog primary label when prompting to
-#. overwrite a file. The string substitution is the file'sx
-#. name.
-#: src/client/application/geary-controller.vala:1976
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2764
 #, c-format
-msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr "Die Datei »%s« existiert schon. Möchten Sie diese ersetzen?"
+msgid "Email to %s discarded"
+msgstr "E-Mail an %s verworfen"
 
-#. Translators: Dialog secondary label when prompting to
-#. overwrite a file. The string substitution is the parent
-#. folder's name.
-#: src/client/application/geary-controller.vala:1983
+#. / 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
 #, c-format
-msgid ""
-"The file already exists in “%s”.  Replacing it will overwrite its contents."
-msgstr ""
-"Die Datei existiert bereits in »%s«. Beim Ersetzen wird die Datei "
-"überschrieben."
+msgid "%s — %s"
+msgstr "%s — %s"
 
-#: src/client/application/geary-controller.vala:1987
-msgid "_Replace"
-msgstr "_Ersetzen"
+#: src/client/application/application-main-window.vala:967
+msgid "Labels"
+msgstr "Beschriftungen"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1306
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "Möchten Sie diese Konversation dauerhaft löschen?"
+msgstr[1] "Möchten Sie diese Konversationen dauerhaft löschen?"
+
+#: src/client/application/application-main-window.vala:1311
+#: src/client/application/application-main-window.vala:1326
+msgid "Delete"
+msgstr "Löschen"
 
-#: src/client/application/geary-controller.vala:2263
-msgid "Close the draft message?"
-msgid_plural "Close all draft messages?"
-msgstr[0] "Nachrichtenentwurf schließen?"
-msgstr[1] "Alle Nachrichtenentwürfe schließen?"
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1321
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Möchten Sie diese Nachricht dauerhaft löschen?"
+msgstr[1] "Möchten Sie diese Nachrichten dauerhaft löschen?"
 
-#: src/client/application/geary-controller.vala:2389
+#: src/client/application/application-main-window.vala:1334
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Alle E-Mails aus dem Ordner %s löschen?"
 
-#: src/client/application/geary-controller.vala:2390
+#: src/client/application/application-main-window.vala:1337
 msgid "This removes the email from Geary and your email server."
 msgstr "Dies wird die E-Mail aus Geary und von Ihrem E-Mail-Server löschen."
 
-#: src/client/application/geary-controller.vala:2391
+#: src/client/application/application-main-window.vala:1338
 msgid "This cannot be undone."
 msgstr "Dies kann nicht rückgängig gemacht werden."
 
-#: src/client/application/geary-controller.vala:2392
+#: src/client/application/application-main-window.vala:1339
 #, c-format
 msgid "Empty %s"
 msgstr "%s leeren"
 
-#: src/client/application/geary-controller.vala:2409
+#: src/client/application/application-main-window.vala:1669
 #, c-format
-msgid "Error emptying %s"
-msgstr "Fehler beim Leeren von %s"
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: src/client/application/geary-controller.vala:2441
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Möchten Sie diese Nachricht dauerhaft löschen?"
-msgstr[1] "Möchten Sie diese Nachrichten dauerhaft löschen?"
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: src/client/components/components-attachment-pane.vala:107
+#: src/client/composer/composer-widget.vala:1834
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: src/client/application/geary-controller.vala:2443
-msgid "Delete"
-msgstr "Löschen"
+#: src/client/components/components-attachment-pane.vala:379
+msgid "Are you sure you want to open these attachments?"
+msgstr "Möchten Sie wirklich diese Anhänge öffnen?"
 
-#: src/client/application/geary-controller.vala:2457
-msgid "Undo trash (Ctrl+Z)"
-msgstr "Papierkorb rückgängig (Strg+Z)"
+#: src/client/components/components-attachment-pane.vala:380
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Anhänge können Ihr System beschädigen, wenn diese geöffnet werden. Öffnen "
+"Sie nur Dateien aus vertrauenswürdigen Quellen."
 
-#: src/client/application/geary-controller.vala:2507
-msgid "Undo archive (Ctrl+Z)"
-msgstr "Archivieren rückgängig (Strg+Z)"
+#: src/client/components/components-attachment-pane.vala:381
+msgid "Don’t _ask me again"
+msgstr "Nicht _noch einmal fragen"
 
-#: src/client/application/geary-controller.vala:2552
-msgid "Undo (Ctrl+Z)"
-msgstr "Rückgängig (Strg+Z)"
+# Gemeint is vmtl der WebKitGTK-Inspector
+#: src/client/components/components-inspector.vala:72
+msgid "Inspector"
+msgstr "Inspector"
+
+#. / 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
+msgid "Logs"
+msgstr "Protokolle"
+
+#. / 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
+msgid "System"
+msgstr "System"
+
+#. 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
+msgid "Save As"
+msgstr "Speichern als"
+
+#: src/client/components/components-inspector.vala:212
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
+#: ui/accounts_editor_servers_pane.ui:17
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#. Translators: The label for an in-app notification. The
-#. string substitution is a list of recipients of the email.
-#: src/client/application/geary-controller.vala:2633
-#, c-format
-msgid "Successfully sent mail to %s."
-msgstr "Nachricht an %s wurde erfolgreich gesendet."
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:43
+msgid "_Automatically select next message"
+msgstr "Automatisch die nächste Nachricht _wählen"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:53
+msgid "_Display conversation preview"
+msgstr "Konversations_vorschau anzeigen"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:63
+msgid "Use _three pane view"
+msgstr "_Dreispaltige Ansicht verwenden"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:73
+msgid "Use _single key email shortcuts"
+msgstr "_Einfache E-Mail-Tastenkürzel verwenden"
+
+#: src/client/components/components-preferences-window.vala:75
+msgid ""
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
+msgstr ""
+"Tastenkürzel für E-Mail-Aktionen verwenden, die keinen Tastendruck von "
+"<Strg> erfordern"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:86
+msgid "_Watch for new mail when closed"
+msgstr "_Ständig nach neuen E-Mails prüfen"
+
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:90
+msgid "Geary will keep running after all windows are closed"
+msgstr "Geary wird weiter ausgeführt, nachdem alle Fenster geschlossen wurden"
+
+#. / 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
+msgid "Search"
+msgstr "Suchen"
+
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+msgid "Search all mail in account for keywords"
+msgstr "Alle E-Mails dieses Kontos nach Stichworten durchsuchen"
 
-#: src/client/application/geary-controller.vala:2715
-msgid "Failed to open default text editor."
-msgstr "Der Standard-Texteditor konnte nicht geöffnet werden."
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
+#, c-format
+msgid "Search %s account"
+msgstr "%s-Konto durchsuchen"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:378
+#: src/client/components/components-validator.vala:390
 msgid "An email address is required"
 msgstr "Es wird eine E-Mail-Adresse benötigt"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:382
+#: src/client/components/components-validator.vala:394
 msgid "Not a valid email address"
 msgstr "Ungültige E-Mail-Adresse"
 
 #. Translators: Tooltip used when an entry requires a valid,
 #. resolvable server name to be entered, but one is not
 #. provided.
-#: src/client/components/components-validator.vala:428
+#: src/client/components/components-validator.vala:440
 msgid "A server name is required"
 msgstr "Es wird ein Servername benötigt"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. server name to be entered, but it was unable to be
 #. looked-up in the DNS.
-#: src/client/components/components-validator.vala:433
+#: src/client/components/components-validator.vala:445
 msgid "Could not look up server name"
 msgstr "Servername konnte nicht abgefragt werden"
 
-#: src/client/components/main-toolbar.vala:151
+#: src/client/components/main-toolbar.vala:116
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "Konversation markieren"
 msgstr[1] "Konversationen markieren"
 
-#: src/client/components/main-toolbar.vala:156
+#: src/client/components/main-toolbar.vala:121
 msgid "Add label to conversation"
 msgid_plural "Add label to conversations"
 msgstr[0] "Konversation eine Beschriftung zuweisen"
 msgstr[1] "Konversationen eine Beschriftung zuweisen"
 
-#: src/client/components/main-toolbar.vala:161
+#: src/client/components/main-toolbar.vala:126
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "Konversation verschieben"
 msgstr[1] "Konversationen verschieben"
 
-#: src/client/components/main-toolbar.vala:166
-msgid "Archive conversation (A)"
-msgid_plural "Archive conversations (A)"
-msgstr[0] "Konversation archivieren (A)"
-msgstr[1] "Konversationen archivieren (A)"
+#: src/client/components/main-toolbar.vala:131
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Konversation archivieren"
+msgstr[1] "Konversationen archivieren"
 
-#: src/client/components/main-toolbar.vala:175
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgid_plural "Move conversations to Trash (Delete, Backspace)"
-msgstr[0] "Konversation in den Papierkorb verschieben (Entf, Rücktaste)"
-msgstr[1] "Konversationen in den Papierkorb verschieben (Entf, Rücktaste)"
+#: src/client/components/main-toolbar.vala:142
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Konversation in den Papierkorb verschieben"
+msgstr[1] "Konversationen in den Papierkorb verschieben"
 
-#: src/client/components/main-toolbar.vala:183
-msgid "Delete conversation (Shift+Delete)"
-msgid_plural "Delete conversations (Shift+Delete)"
-msgstr[0] "Konversation löschen (Umschalt+Entf)"
-msgstr[1] "Konversationen löschen (Umschalt+Entf)"
+#: src/client/components/main-toolbar.vala:152
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Konversation löschen"
+msgstr[1] "Konversationen löschen"
 
-#: src/client/components/main-window.vala:503
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/main-window-info-bar.vala:44
+msgid "Account problem"
+msgstr "Kontoproblem"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:47
+#. 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 "Problem connecting to incoming server for %s"
-msgstr "Fehler bei der Verbindung mit dem Eingangsserver für %s"
+msgid "Geary has encountered a problem with %s."
+msgstr "Geary ist auf ein Problem mit %s gestoßen."
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:49
-#: src/client/components/main-window-info-bar.vala:58
+#. 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 ""
-"Could not connect to %s, check your Internet access and the server name and "
-"try again"
+msgid "Geary encountered a problem checking mail for %s."
 msgstr ""
-"Verbindung zu %s war nicht möglich, überprüfen Sie Ihre Internetverbindung "
-"und den Servernamen und versuchen Sie es erneut"
+"Geary ist bei der Überprüfung auf neue Nachrichten von %s auf ein Problem "
+"gestoßen."
 
 #. Translators: Tooltip label for Retry button
-#. Button tooltip for retrying an account problem
-#: src/client/components/main-window-info-bar.vala:51
-#: src/client/components/main-window-info-bar.vala:60
-#: src/client/components/main-window-info-bar.vala:69
-#: src/client/components/main-window-info-bar.vala:78
-#: src/client/components/main-window-info-bar.vala:87
-#: src/client/components/main-window-info-bar.vala:96
-#: src/client/components/main-window-info-bar.vala:136 ui/main-window.ui:265
+#: src/client/components/main-window-info-bar.vala:65
 msgid "Try reconnecting"
 msgstr "Erneuter Verbindungsversuch"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:56
-#, c-format
-msgid "Problem connecting to outgoing server for %s"
-msgstr "Fehler bei der Verbindung mit dem Ausgangsserver für %s"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:65
-#: src/client/components/main-window-info-bar.vala:83
-#, c-format
-msgid "Problem communicating with incoming server for %s"
-msgstr "Problem bei der Kommunikation mit dem Eingangsserver für %s"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:67
-#: src/client/components/main-window-info-bar.vala:76
+#. 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 "Network error talking to %s, check your Internet access and try again"
-msgstr ""
-"Netzwerkfehler bei der Kommunikation mit %s, bitte überprüfen Sie Ihre "
-"Internetverbindung und versuchen Sie es erneut"
+msgid "Geary encountered a problem sending email for %s."
+msgstr "Geary ist bei der Senden einer E-Mail von %s auf ein Problem gestoßen."
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:74
-#: src/client/components/main-window-info-bar.vala:91
-msgid "Problem communicating with outgoing mail server"
-msgstr "Problem bei der Kommunikation mit dem Ausgangsserver"
+#. Translators: Tooltip label for Retry button
+#: src/client/components/main-window-info-bar.vala:77
+msgid "Retry sending queued messages"
+msgstr "Versuchen, Nachrichten in der Warteschlange erneut zu senden"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:85
-#, c-format
-msgid ""
-"Geary did not understand a message from %s or vice versa, please file a bug "
-"report"
-msgstr ""
-"Geary verstand eine Meldung von %s nicht oder umgekehrt, bitte erstellen Sie "
-"einen Fehlerbericht"
+#. 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 "Geary ist auf ein Problem gestoßen"
 
-#. Translators: First string substitution is the server
-#. name, second is the account name
-#: src/client/components/main-window-info-bar.vala:94
-#, c-format
-msgid ""
-"Could not communicate with %s for %s, check the server name and try again in "
-"a moment"
+#. 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 ""
-"Kommunikation mit %s für %s war nicht möglich, überprüfen Sie den "
-"Servernamen und versuchen Sie es in Kürze erneut"
+"Bitte melden Sie die Fehlerdetails, falls das Problem weiterhin besteht."
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:101
-#, c-format
-msgid "Incoming mail server password required for %s"
-msgstr "Serverpasswort für %s ist für eingehende Nachrichten erforderlich"
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/main-window-info-bar.vala:99
+msgid "_Details"
+msgstr "_Details"
 
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
 #: src/client/components/main-window-info-bar.vala:102
-msgid "Messages cannot be received without the correct password."
-msgstr "Nachrichten können nicht ohne das korrekte Passwort abgerufen werden."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:104
-msgid "Retry receiving email, you will be prompted for a password"
-msgstr ""
-"Erneut versuchen, Nachrichten abzurufen, Sie werden nach einem Passwort "
-"gefragt"
+msgid "View technical details about the error"
+msgstr "Technische Details zum Fehler anzeigen"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:109
-#, c-format
-msgid "Outgoing mail server password required for %s"
-msgstr "Serverpasswort für %s ist für ausgehende Nachrichten erforderlich"
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/main-window-info-bar.vala:108
+msgid "_Retry"
+msgstr "_Wiederholen"
 
-#: src/client/components/main-window-info-bar.vala:110
-msgid "Messages cannot be sent without the correct password."
-msgstr "Nachrichten können nicht ohne das korrekte Passwort versendet werden."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:112
-msgid "Retry sending queued messages, you will be prompted for a password"
-msgstr ""
-"Erneut versuchen, in der Warteschlange befindliche Nachrichten zu versenden, "
-"Sie werden nach einem Passwort gefragt"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:117
-#, c-format
-msgid "Incoming mail server security is not trusted for %s"
-msgstr ""
-"Den Sicherheitseinstellungen des Servers für eingehende E-Mails von %s wird "
-"nicht vertraut"
-
-#: src/client/components/main-window-info-bar.vala:118
-msgid "Messages will not be received until checked."
-msgstr "Nachrichten werden nicht abgerufen, bis sie geprüft wurden."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:120
-#: src/client/components/main-window-info-bar.vala:128
-msgid "Check security details"
-msgstr "Sicherheitsdetails prüfen"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:125
-#, c-format
-msgid "Outgoing mail server security is not trusted for %s"
-msgstr ""
-"Den Sicherheitseinstellungen des Servers für ausgehende E-Mails von %s wird "
-"nicht vertraut"
-
-#: src/client/components/main-window-info-bar.vala:126
-msgid "Messages cannot be sent until checked."
-msgstr "Nachrichten können nicht versendet werden, bevor sie geprüft wurden."
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:133
-#, c-format
-msgid "A problem occurred checking mail for %s"
-msgstr "Ein Problem ist beim Prüfen auf neue Nachrichten für %s aufgetreten"
-
-#: src/client/components/main-window-info-bar.vala:134
-#: src/client/components/main-window-info-bar.vala:142
-msgid "Something went wrong, please file a bug report if the problem persists"
-msgstr ""
-"Etwas ging schief, bitte senden Sie einen Fehlerbericht, wenn das Problem "
-"weiterhin besteht"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:141
-#, c-format
-msgid "A problem occurred sending mail for %s"
-msgstr "Ein Problem ist beim Senden von Nachrichten für %s aufgetreten"
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:144
-msgid "Retry sending queued messages"
-msgstr "Versuchen, Nachrichten in der Warteschlange erneut zu senden"
-
-#: src/client/components/main-window-info-bar.vala:155
-msgid "A database problem has occurred"
-msgstr "Ein Datenbankproblem ist aufgetreten"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:157
-#, c-format
-msgid "Messages for %s must be downloaded again."
-msgstr "Nachrichten für %s müssen erneut heruntergeladen werden."
-
-#: src/client/components/main-window-info-bar.vala:170
-msgid "Geary has encountered a problem"
-msgstr "Geary ist auf ein Problem gestoßen"
-
-#: src/client/components/main-window-info-bar.vala:171
-msgid ""
-"Please check the technical details and report the problem if it persists."
-msgstr ""
-"Bitte überprüfen Sie die technischen Details und melden Sie den Fehler, "
-"falls das Problem weiterhin besteht."
-
-#: src/client/components/main-window-info-bar.vala:179
-msgid "_Details"
-msgstr "_Details"
-
-#. Button tooltip for displaying technical details about an account problem
-#: src/client/components/main-window-info-bar.vala:180 ui/main-window.ui:250
-msgid "View technical details about the error"
-msgstr "Technische Details zum Fehler anzeigen"
-
-#: src/client/components/main-window-info-bar.vala:184
-msgid "_Retry"
-msgstr "_Wiederholen"
-
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:38
-#: src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Suchen"
-
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Alle E-Mails dieses Kontos nach Stichworten durchsuchen (Strg+S)"
-
-#: src/client/components/search-bar.vala:101
-#, c-format
-msgid "Indexing %s account"
-msgstr "%s-Konto wird indiziert"
-
-#: src/client/components/search-bar.vala:112
-#: src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "%s-Konto durchsuchen"
-
-#. / 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…"
-msgstr "Wird gesendet …"
+#. / 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…"
+msgstr "Wird gesendet …"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
 #: src/client/components/status-bar.vala:29
@@ -1385,15 +1545,15 @@ msgstr "_Schließen"
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Öffnen"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
@@ -1410,7 +1570,8 @@ msgstr "_Beenden"
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -1418,41 +1579,47 @@ msgstr "_Speichern"
 msgid "_Keep"
 msgstr "_Behalten"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr ""
 "Die Adresse des Verweises ist nicht korrekt formatiert, z.B. http://example.";
 "com"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Ungültige Verweisadresse"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Ungültige E-Mail-Adresse"
 
-#: src/client/composer/composer-widget.vala:158
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:30
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: src/client/composer/composer-widget.vala:217
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:218
 msgid "Saving"
 msgstr "Wird gespeichert"
 
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:219
 msgid "Error saving"
 msgstr "Fehler beim Speichern"
 
-#: src/client/composer/composer-widget.vala:161
+#: src/client/composer/composer-widget.vala:220
 msgid "Press Backspace to delete quote"
 msgstr "Rücktaste drücken, um die Einrückung zu entfernen"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. characters, that suggest an attachment; since this is full-word
-#. checking, include all variants of each word.  No spaces are
-#. allowed.
-#: src/client/composer/composer-widget.vala:170
+#. 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
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1463,100 +1630,90 @@ 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:1130
+#: src/client/composer/composer-widget.vala:843
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Möchten Sie diesen Nachrichtenentwurf behalten oder verwerfen?"
 
 #. 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:1158
+#: src/client/composer/composer-widget.vala:869
 msgid "Do you want to discard this draft message?"
 msgstr "Möchten Sie diesen Nachrichtenentwurf verwerfen?"
 
-#: src/client/composer/composer-widget.vala:1275
+#: src/client/composer/composer-widget.vala:1503
 msgid "Send message with an empty subject and body?"
 msgstr "Nachricht ohne Betreff und Inhalt senden?"
 
-#: src/client/composer/composer-widget.vala:1277
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "Nachricht ohne Betreff senden?"
 
-#: src/client/composer/composer-widget.vala:1279
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "Nachricht ohne Inhalt senden?"
 
-#: src/client/composer/composer-widget.vala:1283
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "Nachricht ohne Anhang senden?"
 
-#: src/client/composer/composer-widget.vala:1588
+#: src/client/composer/composer-widget.vala:1820
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "»%s« ist bereits als Anhang ausgewählt worden."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. description of the document type, the second will
-#. be a human-friendly size string. For example:
-#. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1596
-#: src/client/conversation-viewer/conversation-email.vala:173
+#: src/client/composer/composer-widget.vala:1856
+#: src/client/composer/composer-widget.vala:1906
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” is an empty file."
+msgstr "»%s« ist eine leere Datei."
 
-#: src/client/composer/composer-widget.vala:1633
+#: src/client/composer/composer-widget.vala:1894
 #, c-format
 msgid "“%s” could not be found."
 msgstr "»%s« konnte nicht gefunden werden."
 
-#: src/client/composer/composer-widget.vala:1639
+#: src/client/composer/composer-widget.vala:1900
 #, c-format
 msgid "“%s” is a folder."
 msgstr "»%s« ist ein Ordner."
 
-#: src/client/composer/composer-widget.vala:1645
-#, c-format
-msgid "“%s” is an empty file."
-msgstr "»%s« ist eine leere Datei."
-
-#: src/client/composer/composer-widget.vala:1658
+#: src/client/composer/composer-widget.vala:1919
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "»%s« konnte nicht zum Lesen geöffnet werden."
 
-#: src/client/composer/composer-widget.vala:1666
+#: src/client/composer/composer-widget.vala:1927
 msgid "Cannot add attachment"
 msgstr "Anhang kann nicht hinzugefügt werden"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1716
-#: src/client/conversation-viewer/conversation-email.vala:981
-#: src/engine/rfc822/rfc822-utils.vala:298 ui/conversation-message.ui:312
+#: 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
 msgid "To:"
 msgstr "An:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1722
-#: src/client/conversation-viewer/conversation-email.vala:986
-#: src/engine/rfc822/rfc822-utils.vala:303 ui/conversation-message.ui:357
+#: 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
 msgid "Cc:"
 msgstr "Kopie:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1728
-#: src/client/conversation-viewer/conversation-email.vala:991
+#: src/client/composer/composer-widget.vala:1996
+#: src/client/conversation-viewer/conversation-email.vala:569
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Blindkopie:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1734
+#: src/client/composer/composer-widget.vala:2002
 msgid "Reply-To: "
 msgstr "Antwort an: "
 
-#: src/client/composer/composer-widget.vala:1874
+#: src/client/composer/composer-widget.vala:2254
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
@@ -1565,153 +1722,154 @@ msgstr "Farbe auswählen"
 #. 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:2064
+#: src/client/composer/composer-widget.vala:2440
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s über %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:2125
+#: src/client/composer/composer-widget.vala:2496
 msgid "_From:"
 msgstr "_Von:"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2357
+#: src/client/composer/composer-widget.vala:2801
 msgid "Images"
 msgstr "Bilder"
 
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "Neue Nachricht"
-
-#: src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Diese Sprache aus der Liste der bevorzugten Sprachen entfernen"
 
-#: src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Diese Sprache zur Liste der bevorzugten Sprachen hinzufügen"
 
-#: src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Nach weiteren Sprachen suchen"
 
-#: src/client/conversation-list/conversation-list-view.vala:283
-msgid "Delete conversation"
-msgstr "Konversation löschen"
-
-#: src/client/conversation-list/conversation-list-view.vala:286
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:335
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "Konversation in den _Papierkorb verschieben"
+msgstr[1] "Konversationen in den _Papierkorb verschieben"
+
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:347
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "Konversation _löschen"
+msgstr[1] "Konversationen _löschen"
+
+#: src/client/conversation-list/conversation-list-view.vala:360
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Als _gelesen markieren"
 
-#: src/client/conversation-list/conversation-list-view.vala:289
+#: src/client/conversation-list/conversation-list-view.vala:368
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: src/client/conversation-list/conversation-list-view.vala:292
+#: src/client/conversation-list/conversation-list-view.vala:376
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Stern entfernen"
 
-#: src/client/conversation-list/conversation-list-view.vala:294
+#: src/client/conversation-list/conversation-list-view.vala:383
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Stern"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:297
+#: src/client/conversation-list/conversation-list-view.vala:392
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:398
 msgid "R_eply All"
 msgstr "Allen _antworten"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:299
+#: src/client/conversation-list/conversation-list-view.vala:404
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: src/client/conversation-list/formatted-conversation-data.vala:11
+#: src/client/conversation-list/formatted-conversation-data.vala:18
 msgid "Me"
 msgstr "Ich"
 
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: src/client/conversation-viewer/conversation-email.vala:159
-msgid "Unknown"
-msgstr "Unbekannt"
-
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:976
-#: src/engine/rfc822/rfc822-utils.vala:289
+#: src/client/conversation-viewer/conversation-email.vala:554
+#: src/client/util/util-email.vala:226
 msgid "From:"
 msgstr "Von:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:996
-#: src/engine/rfc822/rfc822-utils.vala:294
+#: src/client/conversation-viewer/conversation-email.vala:574
+#: src/client/util/util-email.vala:231
 msgid "Date:"
 msgstr "Datum:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:1001
-#: src/engine/rfc822/rfc822-utils.vala:292
+#: src/client/conversation-viewer/conversation-email.vala:584
+#: src/client/util/util-email.vala:229
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/client/conversation-viewer/conversation-message.vala:65
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr "Diese E-Mail-Adresse könnte gefälscht sein"
 
-#. Compact headers
+#. 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:394
+#: src/client/conversation-viewer/conversation-message.vala:439
 msgid "No sender"
 msgstr "Kein Absender"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:766
+#: src/client/conversation-viewer/conversation-message.vala:831
 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:869
+#: src/client/conversation-viewer/conversation-message.vala:951
 msgid "Image"
 msgstr "Bild"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:81
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
 msgstr "Keine Konversationen ausgewählt"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:85
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 msgid "Selecting a conversation from the list will display it here"
 msgstr ""
 "Wenn Sie eine Konversation aus der Liste auswählen, wird diese hier angezeigt"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:94
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
 msgstr "Mehrere Konversationen ausgewählt"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:98
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "Eine Aktion wird auf alle ausgewählten Nachrichten angewandt"
 
@@ -1719,20 +1877,20 @@ msgstr "Eine Aktion wird auf alle ausgewählten Nachrichten angewandt"
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:107
-#: src/client/conversation-viewer/conversation-viewer.vala:120
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 msgid "No conversations found"
 msgstr "Keine Konversationen gefunden"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:111
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 msgid "This folder does not contain any conversations"
 msgstr "Dieser Ordner enthält keine Konversationen"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:124
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr ""
 "Ihre Suche hat keine Treffer ergeben, versuchen Sie es mit anderen "
@@ -1828,6 +1986,14 @@ msgid "An error has occurred processing the server’s certificate"
 msgstr ""
 "Ein Fehler ist während der Bearbeitung des Server-Zertifikats aufgetreten"
 
+#. / 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
+msgid "Details"
+msgstr "Details"
+
 #. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
 #. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
@@ -1863,33 +2029,33 @@ msgstr "%s, %s"
 msgid "Inboxes"
 msgstr "Posteingänge"
 
-#: src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d Ergebnis"
 msgstr[1] "%d Ergebnisse"
 
-#: src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s — New Messages"
-msgstr "%s – Neue Nachrichten"
-
-#: src/client/notification/libnotify.vala:75
+#. / Notification body text for new email when no other
+#. / new messages are already awaiting.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:68
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
-#: src/client/notification/libnotify.vala:78
+#. / Notification body text for new email when
+#. / other new messages have already been notified
+#. / about
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:83
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, insgesamt %d neue Nachricht"
 msgstr[1] "%s, insgesamt %d neue Nachrichten"
 
-#: src/client/notification/libnotify.vala:112
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
 #, c-format
 msgid ""
 "%s\n"
@@ -1904,113 +2070,147 @@ msgstr[1] ""
 "%s\n"
 "(%d andere neue Nachrichten für %s)"
 
-#: src/client/notification/libnotify.vala:155
-msgid "Open"
-msgstr "Öffnen"
+#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#, c-format
+msgid "%s — New Messages"
+msgstr "%s – Neue Nachrichten"
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:68
+#: src/client/util/util-date.vala:69
 msgid "%l:%M %P"
 msgstr "%l:%M %P"
 
 #. / Datetime format for 24-hour time, i.e. 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:71
+#: src/client/util/util-date.vala:72
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
-
 #. / Date format for dates within the current year, i.e. Nov 8
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:78
+#: src/client/util/util-date.vala:79
 msgid "%b %-e"
 msgstr "%-e. %b"
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
-
 #. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:88
+#: src/client/util/util-date.vala:84
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e. %B, %Y um %-l:%M %P"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:91
+#: src/client/util/util-date.vala:87
 msgid "%B %-e, %Y %-H:%M"
 msgstr "%-e. %B, %Y %-H:%M"
 
 #. / Verbose datetime format for the locale default (full month, day and time)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:94
+#: src/client/util/util-date.vala:90
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e. %B, %Y %-l:%M %P"
 
-#: src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:159
 msgid "Now"
 msgstr "Jetzt"
 
-#: src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:162
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "vor %dm"
 msgstr[1] "vor %dm"
 
-#: src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "vor %dh"
 msgstr[1] "vor %dh"
 
-#: src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:173
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. / Date format that shows the weekday (Monday, Tuesday, ...)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:183
+#: src/client/util/util-date.vala:178
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:862
+#. / 12 hours format for datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:216
+msgid "%a, %b %-e, %Y at %l:%M %P"
+msgstr "%a, %-e. %b, %Y um %-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 %H:%M"
+msgstr "%a, %-e. %b, %Y um %-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:224
+msgid "%a, %b %-e, %Y at %X"
+msgstr "%a, %-e. %b, %Y um %-l:%M %p"
+
+#: src/client/util/util-email.vala:38
+#: src/engine/rfc822/rfc822-message.vala:1000
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
-#. Translators: This is shown for displaying a list of
-#. email recipients that happens to be empty,
-#. i.e. contains no email addresses.
-#: src/client/util/util-email.vala:116
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:134
 msgid "(No recipients)"
 msgstr "(Keine Empfänger)"
 
-#. Translators: This is used for displaying a short list of
-#. email recipients lists with two or more addresses. The
-#. first (string) substitution is address of the first, the
-#. second substitution is the number of n - 1 remaining
-#. recipients.
-#: src/client/util/util-email.vala:130
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / addresses. The first (string) substitution is
+#. / address of the first, the second substitution is
+#. / the number of n - 1 remaining recipients.
+#: src/client/util/util-email.vala:146
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
 msgstr[0] "%s und %d weiterer"
 msgstr[1] "%s und %d weitere"
 
+#. / 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
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "Am %1$s schrieb %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
+#, c-format
+msgid "%s wrote:"
+msgstr "%s schrieb:"
+
+#. / 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
+#, c-format
+msgid "On %s:"
+msgstr "Am %s:"
+
+#: src/client/util/util-email.vala:221
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Weitergeleitete Nachricht ----------"
+
 #: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "Bytes"
@@ -2073,7 +2273,7 @@ msgstr "Postausgang"
 
 #: src/engine/api/geary-special-folder-type.vala:54
 msgid "Archive"
-msgstr "Archivieren"
+msgstr "Archiv"
 
 #. Map of possibly translated search operator names and values
 #. to English/internal names and values. We include the
@@ -2088,7 +2288,7 @@ msgstr "Archivieren"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:125
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "Anhang"
@@ -2101,7 +2301,7 @@ msgstr "Anhang"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:134
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "Blindkopie"
@@ -2113,7 +2313,7 @@ msgstr "Blindkopie"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:142
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "Nachricht"
@@ -2126,7 +2326,7 @@ msgstr "Nachricht"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:151
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "Kopie"
@@ -2139,7 +2339,7 @@ msgstr "Kopie"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:160
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr "von"
@@ -2151,7 +2351,7 @@ msgstr "von"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:168
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr "ist"
@@ -2163,7 +2363,7 @@ msgstr "ist"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: src/engine/imap-db/imap-db-account.vala:176
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "Betreff"
@@ -2176,7 +2376,7 @@ msgstr "Betreff"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:185
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr "an"
@@ -2190,7 +2390,7 @@ msgstr "an"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:206
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "mich"
@@ -2203,7 +2403,7 @@ msgstr "mich"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:218
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "mir"
@@ -2215,7 +2415,7 @@ msgstr "mir"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:230
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "gelesen"
@@ -2228,7 +2428,7 @@ msgstr "gelesen"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:241
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "markiert"
@@ -2240,7 +2440,7 @@ msgstr "markiert"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:251
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "ungelesen"
@@ -2249,7 +2449,7 @@ msgstr "ungelesen"
 #. 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:935
+#: src/engine/imap-engine/imap-engine-generic-account.vala:882
 msgid "Drafts | Draft"
 msgstr "Entwürfe | Entwurf"
 
@@ -2257,7 +2457,7 @@ msgstr "Entwürfe | Entwurf"
 #. 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:944
+#: src/engine/imap-engine/imap-engine-generic-account.vala:891
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Gesendet | Gesendete E-Mail | Gesendete E-Mails | Sent | Sent Mail | Sent "
@@ -2265,7 +2465,7 @@ 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:949
+#: src/engine/imap-engine/imap-engine-generic-account.vala:896
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Gesendete Objekte"
@@ -2274,7 +2474,7 @@ msgstr "Gesendete Objekte"
 #. 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:959
+#: src/engine/imap-engine/imap-engine-generic-account.vala:906
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2286,13 +2486,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:969
+#: src/engine/imap-engine/imap-engine-generic-account.vala:916
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Papierkorb | Müll | Trash | Rubbish | Rubbish Bin"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:974
+#: src/engine/imap-engine/imap-engine-generic-account.vala:921
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Gelöschte Objekte"
@@ -2301,43 +2501,22 @@ msgstr "Gelöschte Objekte"
 #. 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:984
+#: src/engine/imap-engine/imap-engine-generic-account.vala:931
 msgid "Archive | Archives"
 msgstr "Archiv | Archive | Archive | Archives"
 
-#. / 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/engine/rfc822/rfc822-utils.vala:236
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e. %b, %Y um %-l:%M %p"
-
-#. / 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/engine/rfc822/rfc822-utils.vala:242
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Am %1$s schrieb %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/engine/rfc822/rfc822-utils.vala:249
+#: src/engine/rfc822/rfc822-message.vala:458
 #, c-format
-msgid "%s wrote:"
-msgstr "%s schrieb:"
+msgid "Could not determine mime type for “%s”."
+msgstr "MIME-Type für »%s« konnte nicht ermittelt werden."
 
-#. / 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/engine/rfc822/rfc822-utils.vala:255
+#: src/engine/rfc822/rfc822-message.vala:469
 #, c-format
-msgid "On %s:"
-msgstr "Am %s:"
-
-#: src/engine/rfc822/rfc822-utils.vala:284
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Weitergeleitete Nachricht ----------"
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr ""
+"Content-Type für MIME-Type »%s« auf »%s« konnte nicht ermittelt werden."
 
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Ein Konto hinzufügen"
 
@@ -2391,11 +2570,11 @@ msgstr "Konto aus Geary entfernen"
 msgid "Accounts"
 msgstr "Konten"
 
-#: ui/accounts_editor_list_pane.ui:63
+#: ui/accounts_editor_list_pane.ui:62
 msgid "To get started, select an email provider below."
 msgstr "Wählen Sie unten einen E-Mail-Anbieter aus, um zu beginnen."
 
-#: ui/accounts_editor_list_pane.ui:76
+#: ui/accounts_editor_list_pane.ui:75
 msgid "Welcome to Geary"
 msgstr "Willkommen bei Geary"
 
@@ -2418,14 +2597,86 @@ msgstr ""
 msgid "Remove account"
 msgstr "Konto entfernen"
 
-#: ui/accounts_editor_servers_pane.ui:17
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: ui/accounts_editor_servers_pane.ui:47
 msgid "Apply"
 msgstr "Anwenden"
 
+#. Infobar title when one or more accounts are offline
+#: ui/application-main-window.ui:185
+msgid "Working offline"
+msgstr "Abgemeldet arbeiten"
+
+#. 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 ""
+"Ihr Rechner scheint nicht mit dem Internet verbunden zu sein.\n"
+"Sie können keine E-Mails senden oder empfangen, bis er wieder verbunden ist."
+
+#. 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 ""
+"Sie können keine E-Mails senden oder empfangen, bis wieder eine Verbindung "
+"besteht."
+
+#. Button label for retrying TLS cert validation
+#: ui/application-main-window.ui:249
+msgid "Check"
+msgstr "Prüfen"
+
+#. Button tooltip for retrying TLS cert validation
+#: ui/application-main-window.ui:253
+msgid "Check the security details for the connection"
+msgstr "Sicherheitsdetails für die Verbindung prüfen"
+
+#. Infobar title when one or more accounts have a TLS cert validation error
+#: ui/application-main-window.ui:282
+msgid "Security problem"
+msgstr "Sicherheitsproblem"
+
+#. 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 ""
+"Ein Konto hat einen nicht vertrauenswürdigen Server gemeldet.\n"
+"Bitte prüfen Sie die Servereinstellungen und versuchen Sie es erneut."
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/application-main-window.ui:299
+msgid "An account has reported an untrusted server."
+msgstr "Ein Konto hat einen nicht-vertrauten Server gemeldet."
+
+#. 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 "Anmeldung erneut versuchen, Sie werden nach einem Passwort gefragt"
+
+#. Infobar title when one or more accounts have a login error
+#: ui/application-main-window.ui:379
+msgid "Login problem"
+msgstr "Anmeldeproblem"
+
+# Das ist im Original schon irreführend: Es reicht nicht, den  Benutzernamen
+# zu prüfen, auch das Passwort könnte falsch sein.
+#. 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 ""
+"Ein Konto hat einen falschen Benutzernamen oder Passwort gemeldet.\n"
+"Bitte prüfen Sie Ihre Anmeldedaten und versuchen Sie es erneut."
+
+#. Label and tooltip for authentication problem infobar
+#: ui/application-main-window.ui:396
+msgid "An account has reported an incorrect login or password."
+msgstr "Ein Konto hat einen falschen Benutzernamen oder Passwort gemeldet."
+
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "Nicht vertrauenswürdige Verbindung"
@@ -2442,216 +2693,347 @@ msgstr "Diesem Server _vertrauen"
 msgid "_Don’t Trust This Server"
 msgstr "Diesem Server _nicht vertrauen"
 
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "Loslösen (Strg+D)"
-
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "Datei anhängen (Strg+T)"
-
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "Ursprüngliche Anhänge übernehmen"
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "»Verfassen«-Fenster abkoppeln"
 
-#: ui/composer-headerbar.ui:202
+#: ui/composer-headerbar.ui:135
 msgid "_Send"
 msgstr "_Senden"
 
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "Senden (Strg+Eingabetaste)"
-
-#: ui/composer-headerbar.ui:230
+#: ui/composer-headerbar.ui:162
 msgid "Discard and Close"
 msgstr "Verwerfen und schließen"
 
-#: ui/composer-headerbar.ui:254
+#: ui/composer-headerbar.ui:186
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
 #. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:41
+#: ui/composer-link-popover.ui:42
 msgid "Insert the new link with this URL"
 msgstr "Den neuen Verweis mit dieser Adresse einfügen"
 
-#: ui/composer-link-popover.ui:52
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ui/composer-link-popover.ui:47
 msgid "Link URL"
 msgstr "Verweisadresse"
 
 #. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
+#: ui/composer-link-popover.ui:61
 msgid "Update this link’s URL"
 msgstr "Die Adresse dieses Verweises aktualisieren"
 
-#: ui/composer-link-popover.ui:86
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: ui/composer-link-popover.ui:75
 msgid "Delete this link"
 msgstr "Diesen Verweis löschen"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Diesen Verweis öffnen"
-
-#: ui/composer-menus.ui:7
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ui/composer-menus.ui:12
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ui/composer-menus.ui:17
-msgid "_Fixed Width"
-msgstr "_Feste Breite"
-
-#: ui/composer-menus.ui:24
-msgid "_Small"
-msgstr "_Klein"
-
-#: ui/composer-menus.ui:29
-msgid "_Medium"
-msgstr "_Normal"
-
-#: ui/composer-menus.ui:34
-msgid "Lar_ge"
-msgstr "Gr_oß"
-
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "F_arbe"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
-msgid "_Rich Text"
-msgstr "_Formatierter Text"
-
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Erweiterte Felder anzeigen"
-
-#: ui/composer-menus.ui:78
+#: ui/composer-menus.ui:8
 msgid "_Undo"
 msgstr "_Rückgängig machen"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-menus.ui:12
 msgid "_Redo"
 msgstr "_Wiederholen"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
 msgid "Cu_t"
 msgstr "Aus_schneiden"
 
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: ui/composer-menus.ui:100
+#: ui/composer-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "_Ohne Formatierung einfügen"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-menus.ui:50
 msgid "Select _All"
 msgstr "Alles _auswählen"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
+#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "_Untersuchen …"
 
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:60
+msgid "From"
+msgstr "Von"
+
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:56
+#: ui/composer-widget.ui:130
 msgid "_To"
 msgstr "_An"
 
-#: ui/composer-widget.ui:75
+#: ui/composer-widget.ui:158
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Felder »Kopie«, »Blindkopie« und »Antwort an« einblenden"
+
+#: ui/composer-widget.ui:219
 msgid "_Cc"
 msgstr "_Kopie"
 
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "_Betreff"
-
-#: ui/composer-widget.ui:149
+#: ui/composer-widget.ui:267
 msgid "_Bcc"
 msgstr "_Blindkopie"
 
-#: ui/composer-widget.ui:179
+#: ui/composer-widget.ui:315
 msgid "_Reply-To"
 msgstr "_Antwort an"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
-msgid "From"
-msgstr "Von"
+#: ui/composer-widget.ui:372
+msgid "_Subject"
+msgstr "_Betreff"
 
-#: ui/composer-widget.ui:293
+#: ui/composer-widget.ui:445
 msgid "Drop files here"
 msgstr "Dateien hier ablegen"
 
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:461
 msgid "To add them as attachments"
 msgstr "Als Anhang einfügen"
 
-#: ui/composer-widget.ui:353
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Letzte Bearbeitung rückgängig (Strg+Z)"
+#: ui/composer-widget.ui:602
+msgid "Bold text"
+msgstr "Fetter Text"
 
-#: ui/composer-widget.ui:377
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "Letzte Bearbeitung wiederholen (Umschalt+Strg+Z)"
+#: ui/composer-widget.ui:626
+msgid "Italic text"
+msgstr "Kursiver Text"
 
-#: ui/composer-widget.ui:415
-msgid "Bold (Ctrl+B)"
-msgstr "Fett (Strg+B)"
+#: ui/composer-widget.ui:650
+msgid "Underline text"
+msgstr "Unterstrichener Text"
+
+#: ui/composer-widget.ui:674
+msgid "Strikethrough text"
+msgstr "Durchgestrichener Text"
 
-#: ui/composer-widget.ui:439
-msgid "Italic (Ctrl+I)"
-msgstr "Kursiv (Strg+I)"
+#: ui/composer-widget.ui:707
+msgid "Insert bulleted list"
+msgstr "Ungeordnete Liste einfügen"
 
-#: ui/composer-widget.ui:463
-msgid "Underline (Ctrl+U)"
-msgstr "Unterstrichen (Strg+U)"
+#: ui/composer-widget.ui:731
+msgid "Insert numbered list"
+msgstr "Nummerierte Liste einfügen"
 
-#: ui/composer-widget.ui:487
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Durchgestrichen (Strg+K)"
+#: ui/composer-widget.ui:764
+msgid "Indent or quote text"
+msgstr "Text einrücken oder zitieren"
 
-#: ui/composer-widget.ui:525
-msgid "Insert unordered list"
-msgstr "Ungeordnete Liste einfügen"
+#: ui/composer-widget.ui:788
+msgid "Un-indent or unquote text"
+msgstr "Zitierung oder Einrückung aufheben"
 
-#: ui/composer-widget.ui:549
-msgid "Insert ordered list"
-msgstr "Geordnete Liste einfügen"
+#: ui/composer-widget.ui:817
+msgid "Remove text formatting"
+msgstr "Formatierung löschen"
 
-#: ui/composer-widget.ui:587
-msgid "Quote text  (Ctrl+])"
-msgstr "Text einrücken (Strg+])"
+#: ui/composer-widget.ui:836
+msgid "Change font type"
+msgstr "Schriftart ändern"
 
-#: ui/composer-widget.ui:611
-msgid "Unquote text  (Ctrl+[)"
-msgstr "Einrückung aufheben (Strg+[)"
+#: ui/composer-widget.ui:851
+msgid "Sans Serif"
+msgstr "Sans Serif"
 
-#: ui/composer-widget.ui:649
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Verweis in Auswahl einfügen oder aktualisieren (Strg+L)"
+#: ui/composer-widget.ui:862
+msgid "Serif"
+msgstr "Serif"
 
-#: ui/composer-widget.ui:673
-msgid "Insert an image (Ctrl+G)"
-msgstr "Bild einfügen (Strg+G)"
+#: ui/composer-widget.ui:873
+msgid "Fixed Width"
+msgstr "Feste Breite"
 
-#: ui/composer-widget.ui:707
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Formatierung der Auswahl löschen (Strg+Leertaste)"
+#: ui/composer-widget.ui:899
+msgid "Change font color"
+msgstr "Schriftfarbe ändern"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-widget.ui:914
+msgid "Change font size"
+msgstr "Schriftgröße ändern"
+
+#: ui/composer-widget.ui:949
+msgid "Insert or update text link"
+msgstr "Verweis in Auswahl einfügen oder aktualisieren"
+
+#: ui/composer-widget.ui:973
+msgid "Insert an image"
+msgstr "Bild einfügen"
+
+#: ui/composer-widget.ui:1015
+msgid "Undo last edit"
+msgstr "Letzte Bearbeitung rückgängig machen"
+
+#: ui/composer-widget.ui:1039
+msgid "Redo last edit"
+msgstr "Letzte Bearbeitung wiederholen"
+
+#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+msgid "Attach a file"
+msgstr "Datei anhängen"
+
+#: ui/composer-widget.ui:1117
+msgid "Add original attachments"
+msgstr "Ursprüngliche Anhänge hinzufügen"
+
+#: ui/composer-widget.ui:1162
+msgid "More options"
+msgstr "Weitere Einstellungen"
+
+#: ui/composer-widget.ui:1182
+msgid "Show formatting toolbar"
+msgstr "Formatierung-Werkzeugleiste einblenden"
+
+#: ui/composer-widget.ui:1200
 msgid "Select spell checking languages"
 msgstr "Sprachen für Rechtschreibprüfung auswählen"
 
+#: ui/composer-widget.ui:1263
+msgid "S_ans Serif"
+msgstr "S_ans Serif"
+
+#: ui/composer-widget.ui:1268
+msgid "S_erif"
+msgstr "S_erif"
+
+#: ui/composer-widget.ui:1273
+msgid "_Fixed Width"
+msgstr "_Feste Breite"
+
+#: ui/composer-widget.ui:1283
+msgid "_Small"
+msgstr "_Klein"
+
+#: ui/composer-widget.ui:1288
+msgid "_Medium"
+msgstr "_Normal"
+
+#: ui/composer-widget.ui:1293
+msgid "Lar_ge"
+msgstr "Gr_oß"
+
+#: ui/composer-widget.ui:1303
+msgid "_Rich Text"
+msgstr "_Formatierter Text"
+
+#: ui/composer-widget.ui:1308
+msgid "_Plain Text"
+msgstr "_Einfacher Text"
+
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "Alle Anhänge auswählen"
+
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Ausgewählte Anhänge speichern"
+
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Ausgewählte Anhänge öffnen"
+
+#: ui/components-attachment-pane-menus.ui:17
+msgid "Save _All"
+msgstr "A_lle speichern"
+
+#: ui/components-inspector-error-view.ui:33
+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>."
+msgstr ""
+"Falls das Problem schwerwiegend ist oder weiterhin besteht, kopieren Sie "
+"diese Details und senden Sie sie an die <a href=\"https://wiki.gnome.org/";
+"Apps/Geary/Contact\">Mailingliste</a> oder erstellen Sie einen <a href="
+"\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>neuen Fehlerbericht</a>."
+
+#: ui/components-inspector-error-view.ui:49
+msgid "Details:"
+msgstr "Details:"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:20
+msgid "Toggle appending new log entries"
+msgstr "Neue Protokolleinträge anfügen/nicht anfügen"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
+msgid "Search for matching log entries"
+msgstr "Nach übereinstimmenden Protokolleinträgen suchen"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+msgid "Save logs entries and details"
+msgstr "Protokolleinträge und -details speichern"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+msgid "Copy to clipboard"
+msgstr "In die Zwischenablage kopieren"
+
+#: ui/conversation-contact-popover.ui:146
+msgid "New Conversation…"
+msgstr "Neue Konversation …"
+
+#: ui/conversation-contact-popover.ui:159
+msgid "Copy Email Address"
+msgstr "E-Mail-Adresse kopieren"
+
+#: ui/conversation-contact-popover.ui:182
+msgid "Save in Contacts…"
+msgstr "In Kontakte speichern …"
+
+#: ui/conversation-contact-popover.ui:195
+msgid "Show Conversations"
+msgstr "Konversationen anzeigen"
+
+#: ui/conversation-contact-popover.ui:208
+msgid "Open in Contacts"
+msgstr "In Kontakte öffnen"
+
+#: ui/conversation-contact-popover.ui:221
+msgid "Always Load Remote Images"
+msgstr "Entfernte Bilder immer anzeigen"
+
+#. Title label on contact popover
+#: ui/conversation-contact-popover.ui:264
+msgid "Deceptive email address"
+msgstr "Trügerische E-Mail-Adresse"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:294
+msgid "This email address is:"
+msgstr "Diese E-Mail-Adresse lautet:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:319
+msgid "But was forged as:"
+msgstr "Aber wurde gefälscht als:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:344
+msgid "The sender may not be trustworthy"
+msgstr "Der Absender ist eventuell nicht vertrauenswürdig"
+
 #: ui/conversation-email.ui:27
 msgid "Save all attachments"
 msgstr "Alle Anhänge speichern"
@@ -2666,39 +3048,23 @@ msgstr "Diese Nachricht mit einem Stern markieren"
 msgid "Mark this message as not starred"
 msgstr "Sternmarkierung von dieser Nachricht entfernen"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Das Nachrichtenmenü anzeigen"
-
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Ausgewählte Anhänge öffnen"
-
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Ausgewählte Anhänge speichern"
-
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "Alle Anhänge auswählen"
-
-#: ui/conversation-email.ui:240
+#: ui/conversation-email.ui:124
 msgid "Edit Draft"
 msgstr "Entwurf bearbeiten"
 
-#: ui/conversation-email.ui:267
+#: ui/conversation-email.ui:151
 msgid "Draft message"
 msgstr "Nachrichtenentwurf"
 
-#: ui/conversation-email.ui:283
+#: ui/conversation-email.ui:167
 msgid "This message has not yet been sent."
 msgstr "Diese Nachricht wurde noch nicht versendet."
 
-#: ui/conversation-email.ui:329
+#: ui/conversation-email.ui:213
 msgid "Message not saved"
 msgstr "Nachricht nicht gespeichert"
 
-#: ui/conversation-email.ui:345
+#: ui/conversation-email.ui:229
 msgid "This message was sent, but has not been saved to your account."
 msgstr ""
 "Diese Nachricht wurde gesendet, wurde aber nicht in Ihrem Konto gespeichert."
@@ -2725,24 +3091,42 @@ msgid "Mark Unread From _Here"
 msgstr "Von _hier ab als ungelesen markieren"
 
 #. Translators: Menu item to move a single, specific message
-#. to the trash
+#. to the trash folder
 #: ui/conversation-email-menus.ui:50
-msgid "_Trash"
-msgstr "In den _Papierkorb"
+msgid "Move message to _Trash"
+msgstr "In den _Papierkorb verschieben"
 
 #. Translators: Menu item to delete a single, specific message
 #: ui/conversation-email-menus.ui:57
-msgid "_Delete…"
-msgstr "_Löschen …"
+msgid "_Delete message…"
+msgstr "Nachricht _löschen …"
 
 #. Translators: Menu item to view the source for a message
 #: ui/conversation-email-menus.ui:69
 msgid "_View Source"
 msgstr "_Quelltext anzeigen"
 
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "A_lle speichern"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "Aber führt tatsächlich zu:"
+
+#: ui/conversation-message-link-popover.ui:84
+msgid "The link appears to go to:"
+msgstr "Dieser Verweis scheint zu folgender Seite zu führen:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "Trügerischer Verweis gefunden"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr "Der Absender der E-Mail könnte Sie zur falschen Webseite leiten."
+
+#: ui/conversation-message-link-popover.ui:124
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
+"Falls Sie unsicher sind, kontaktieren Sie den Absender und fragen Sie, bevor "
+"Sie fortfahren."
 
 #: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
@@ -2753,8 +3137,8 @@ msgid "Copy Link _Address"
 msgstr "Verweis_adresse kopieren"
 
 #: ui/conversation-message-menus.ui:17
-msgid "Send New _Message…"
-msgstr "Neue _Nachricht senden …"
+msgid "_New Conversation…"
+msgstr "_Neue Konversation …"
 
 #: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
@@ -2768,10 +3152,6 @@ msgstr "_Bild speichern unter …"
 msgid "_Select All"
 msgstr "Alles _auswählen"
 
-#: ui/conversation-message-menus.ui:43
-msgid "Search for messages from"
-msgstr "Nach Nachrichten suchen von"
-
 #: ui/conversation-message.ui:63
 msgid "From <email>"
 msgstr "Von <email>"
@@ -2813,37 +3193,15 @@ msgstr "Externe Bilder werden nicht angezeigt"
 msgid "Only show remote images from senders you trust."
 msgstr "Externe Bilder nur von Absendern anzeigen, denen Sie vertrauen."
 
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "Aber führt tatsächlich zu:"
-
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "Dieser Verweis scheint zu folgender Seite zu führen:"
-
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "Trügerischer Verweis gefunden"
-
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr "Der Absender der E-Mail könnte Sie zur falschen Webseite leiten."
-
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr ""
-"Falls Sie unsicher sind, kontaktieren Sie den Absender und fragen Sie, bevor "
-"Sie fortfahren."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "In Konversation suchen"
 
-#: ui/conversation-viewer.ui:74
+#: ui/conversation-viewer.ui:75
 msgid "Find the previous occurrence of the search string."
 msgstr "Vorhergehende Übereinstimmungen mit dem Suchtext finden."
 
-#: ui/conversation-viewer.ui:95
+#: ui/conversation-viewer.ui:96
 msgid "Find the next occurrence of the search string."
 msgstr "Nächste Übereinstimmung mit dem Suchtext finden."
 
@@ -2871,488 +3229,697 @@ msgstr "Beschriftung"
 msgid "Conversation Shortcuts"
 msgstr "Tastenkombinationen für Konversationen"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
 msgctxt "shortcut window"
-msgid "General"
-msgstr "Allgemein"
+msgid "Actions"
+msgstr "Aktionen"
 
 #: ui/gtk/help-overlay.ui:17
 msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "Fokus auf die nächste/vorherige Leiste verlegen"
+msgid "New conversation"
+msgstr "Neue Konversation"
 
 #: ui/gtk/help-overlay.ui:24
 msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "Fokus auf die Konversationsliste verschieben"
-
-#: ui/gtk/help-overlay.ui:31
-msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "»Verfassen«-Fenster abkoppeln"
-
-#: ui/gtk/help-overlay.ui:38
-msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "»Verfassen«-Fenster schließen"
+msgid "Reply to sender"
+msgstr "Absender antworten"
 
-#: ui/gtk/help-overlay.ui:45
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
 msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Tastenkombinationen anzeigen"
-
-#: ui/gtk/help-overlay.ui:52
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Hilfe anzeigen"
+msgid "Reply to all"
+msgstr "Allen antworten"
 
-#: ui/gtk/help-overlay.ui:59
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
 msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Die Anwendung beenden"
+msgid "Forward"
+msgstr "Weiterleiten"
 
-#: ui/gtk/help-overlay.ui:68
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
 msgctxt "shortcut window"
-msgid "Search"
-msgstr "Suchen"
+msgid "Un-mark/mark read"
+msgstr "Als ungelesen/gelesen markieren"
 
-#: ui/gtk/help-overlay.ui:72
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
 msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "Zum Suchfeld springen"
+msgid "Mark/un-mark starred"
+msgstr "Markieren/Markierung entfernen"
 
-#: ui/gtk/help-overlay.ui:79
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
 msgctxt "shortcut window"
-msgid "Find in current conversation"
-msgstr "In aktueller Konversation suchen"
+msgid "Archive conversations"
+msgstr "Konversationen archivieren"
 
-#: ui/gtk/help-overlay.ui:86
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
 msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "Das nächste/vorherige Vorkommen in dieser Konversation finden"
+msgid "Move conversations"
+msgstr "Konversationen verschieben"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
 msgctxt "shortcut window"
-msgid "Actions"
-msgstr "Aktionen"
+msgid "Label conversations"
+msgstr "Konversationen eine Beschriftung zuweisen"
 
-#: ui/gtk/help-overlay.ui:99
+#: ui/gtk/help-overlay.ui:80
 msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "Eine neue Nachricht verfassen"
+msgid "Trash conversations"
+msgstr "Konversationen in den Papierkorb verschieben"
 
-#: ui/gtk/help-overlay.ui:106
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Absender antworten "
+msgid "Junk conversations"
+msgstr "Konversationen in den Spam-Ordner verschieben"
 
-#: ui/gtk/help-overlay.ui:113
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
 msgctxt "shortcut window"
-msgid "Reply to all"
-msgstr "Allen antworten"
+msgid "Delete conversations"
+msgstr "Konversationen löschen"
 
-#: ui/gtk/help-overlay.ui:120
+#: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
-msgid "Forward"
-msgstr "Weiterleiten"
+msgid "Search"
+msgstr "Suchen"
 
-#: ui/gtk/help-overlay.ui:127
+#: ui/gtk/help-overlay.ui:108
 msgctxt "shortcut window"
-msgid "Archive"
-msgstr "Archivieren"
+msgid "Search for conversations"
+msgstr "Nach Konversationen suchen"
 
-#: ui/gtk/help-overlay.ui:134
+#: ui/gtk/help-overlay.ui:115
 msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "In den Papierkorb verschieben"
+msgid "Find in current conversation"
+msgstr "In aktueller Konversation suchen"
 
 #: ui/gtk/help-overlay.ui:141
 msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "Unerwünscht-Markierung umschalten"
-
-#: ui/gtk/help-overlay.ui:148
-msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "Konversation verschieben"
-
-#: ui/gtk/help-overlay.ui:155
-msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "Konversation eine Beschriftung zuweisen"
+msgid "Undo"
+msgstr "Rückgängig machen"
 
-#: ui/gtk/help-overlay.ui:163
+#: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "Als gelesen markieren"
+msgid "Undo the last action"
+msgstr "Letzte Aktion rückgängig machen"
 
-#: ui/gtk/help-overlay.ui:170
+#: ui/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "Als ungelesen markieren"
+msgid "Redo the last action"
+msgstr "Letzte Aktion wiederholen"
 
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
 msgid "View"
 msgstr "Betrachten"
 
-#: ui/gtk/help-overlay.ui:183
+#: ui/gtk/help-overlay.ui:165
 msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "Ansicht vergrößern"
 
-#: ui/gtk/help-overlay.ui:190
+#: ui/gtk/help-overlay.ui:172
 msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "Ansicht verkleinern"
 
-#: ui/gtk/help-overlay.ui:197
+#: ui/gtk/help-overlay.ui:179
 msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Vergrößerung zurücksetzen"
 
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Allgemein"
+
+#: ui/gtk/help-overlay.ui:192
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Hilfe anzeigen"
+
+#: ui/gtk/help-overlay.ui:199
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "Tastenkombinationen anzeigen"
+
 #: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "Weitere Tastenkombinationen"
+msgid "Open a new window"
+msgstr "Neues Fenster öffnen"
 
-#: ui/gtk/help-overlay.ui:210
+#: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
-msgid "Star"
-msgstr "Stern"
+msgid "Close the current window"
+msgstr "Aktuelles Fenster schließen"
 
-#: ui/gtk/help-overlay.ui:217
+#: ui/gtk/help-overlay.ui:220
 msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "Stern entfernen"
+msgid "Quit the application"
+msgstr "Die Anwendung beenden"
 
-#: ui/gtk/help-overlay.ui:224
+#: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
-msgid "Delete"
-msgstr "Löschen"
+msgid "Keyboard navigation"
+msgstr "Tastatur-Navigation"
 
-#: ui/gtk/help-overlay.ui:231
+#: ui/gtk/help-overlay.ui:233
 msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "Zur nächsten (älteren) Konversation springen"
+msgid "Go to next/previous pane"
+msgstr "Nächste/Vorherige Leiste anzeigen"
 
-#: ui/gtk/help-overlay.ui:238
+#: ui/gtk/help-overlay.ui:241
 msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "Zur letzten (neueren) Konversation springen"
+msgid "Select next/previous conversation"
+msgstr "Nächste/Vorherige Konversation auswählen"
 
-#: ui/gtk/help-overlay.ui:250
-msgid "Composer Shortcuts"
-msgstr "Tastenkombinationen beim Verfassen"
+#: ui/gtk/help-overlay.ui:248
+msgctxt "shortcut window"
+msgid "Focus next/previous message"
+msgstr "Nächste/Vorherige Nachricht fokussieren"
 
 #: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
-msgid "Quote text"
-msgstr "Text einrücken"
+msgid "Single-key shortcuts"
+msgstr "Einfache Tastenkürzel"
 
-#: ui/gtk/help-overlay.ui:265
+#: ui/gtk/help-overlay.ui:262
 msgctxt "shortcut window"
-msgid "Unquote text"
-msgstr "Einrückung aufheben"
+msgid "Reply to sender "
+msgstr "Absender antworten "
+
+#: ui/gtk/help-overlay.ui:332
+msgctxt "shortcut window"
+msgid "Find in current conversations"
+msgstr "In aktuellen Konversationen suchen"
+
+#: ui/gtk/help-overlay.ui:339
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "Nächste/Vorherige Konversationen auswählen"
+
+#: ui/gtk/help-overlay.ui:351
+msgid "Composer Shortcuts"
+msgstr "Tastenkombinationen beim Verfassen"
 
-#: ui/gtk/help-overlay.ui:278
+#: ui/gtk/help-overlay.ui:359
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Senden"
 
-#: ui/gtk/help-overlay.ui:285
+#: ui/gtk/help-overlay.ui:366
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Anhang hinzufügen"
 
-#: ui/gtk/help-overlay.ui:294
+#: ui/gtk/help-overlay.ui:379
+msgctxt "shortcut window"
+msgid "Close composer window"
+msgstr "»Verfassen«-Fenster schließen"
+
+#: ui/gtk/help-overlay.ui:386
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "»Verfassen«-Fenster abkoppeln"
+
+#: ui/gtk/help-overlay.ui:393
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Bearbeitung"
+
+#: ui/gtk/help-overlay.ui:398
 msgctxt "shortcut window"
-msgid "Rich text mode"
+msgid "Move selection to the clipboard"
+msgstr "Auswahl in die Zwischenablage legen"
+
+#: ui/gtk/help-overlay.ui:405
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "Auswahl kopieren"
+
+#: ui/gtk/help-overlay.ui:412
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr "Zwischenablage einfügen"
+
+#: ui/gtk/help-overlay.ui:419
+msgctxt "shortcut window"
+msgid "Quote text"
+msgstr "Text einrücken"
+
+#: ui/gtk/help-overlay.ui:426
+msgctxt "shortcut window"
+msgid "Unquote text"
+msgstr "Einrückung aufheben"
+
+#: ui/gtk/help-overlay.ui:435
+msgctxt "shortcut window"
+msgid "Rich text editing"
 msgstr "Formatierter Text"
 
-#: ui/gtk/help-overlay.ui:298
+#: ui/gtk/help-overlay.ui:439
+msgctxt "shortcut window"
+msgid "Paste without formatting"
+msgstr "Ohne Formatierung einfügen"
+
+#: ui/gtk/help-overlay.ui:446
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Fetter Text"
 
-#: ui/gtk/help-overlay.ui:305
+#: ui/gtk/help-overlay.ui:453
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Kursiver Text"
 
-#: ui/gtk/help-overlay.ui:312
+#: ui/gtk/help-overlay.ui:460
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Unterstrichener Text"
 
-#: ui/gtk/help-overlay.ui:319
+#: ui/gtk/help-overlay.ui:467
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Durchgestrichener Text"
 
-#: ui/gtk/help-overlay.ui:326
-msgctxt "shortcut window"
-msgid "Insert a link"
-msgstr "Einen Verweis einfügen"
-
-#: ui/gtk/help-overlay.ui:333
+#: ui/gtk/help-overlay.ui:474
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Formatierung löschen"
 
-#: ui/main-toolbar.ui:23
+#: ui/gtk/help-overlay.ui:481
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "Bild einfügen"
+
+#: ui/gtk/help-overlay.ui:488
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "Einen Verweis einfügen"
+
+#: ui/main-toolbar.ui:24
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ui/main-toolbar.ui:52
+#: ui/main-toolbar.ui:62
 msgid "Toggle search bar"
 msgstr "Suchleiste anzeigen/verbergen"
 
-#: ui/main-toolbar.ui:112
+#: ui/main-toolbar.ui:114
 msgid "Reply"
 msgstr "Antworten"
 
-#: ui/main-toolbar.ui:135
+#: ui/main-toolbar.ui:137
 msgid "Reply All"
 msgstr "Allen antworten"
 
-#: ui/main-toolbar.ui:158
+#: ui/main-toolbar.ui:160
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ui/main-toolbar.ui:264
+#: ui/main-toolbar.ui:265
 msgid "Toggle find bar"
 msgstr "Suchleiste anzeigen/verbergen"
 
-#: ui/main-toolbar.ui:306
+#: ui/main-toolbar.ui:286
 msgid "_Archive"
 msgstr "_Archivieren"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Mark as S_pam"
-msgstr "Als S_pam markieren"
+msgid "Toggle as S_pam"
+msgstr "S_pam-Markierung umschalten"
 
-#: ui/main-toolbar-menus.ui:25
-msgid "Mark as not S_pam"
-msgstr "S_pam-Markierung entfernen"
-
-#: ui/main-toolbar-menus.ui:32
+#: ui/main-toolbar-menus.ui:28
 msgid "Empty _Spam…"
 msgstr "_Spam leeren …"
 
-#: ui/main-toolbar-menus.ui:36
+#: ui/main-toolbar-menus.ui:32
 msgid "Empty _Trash…"
 msgstr "_Papierkorb leeren …"
 
-#: ui/main-toolbar-menus.ui:42
+#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "_Konten"
 
-#: ui/main-toolbar-menus.ui:50
+#: ui/main-toolbar-menus.ui:46
 msgid "_Keyboard Shortcuts"
 msgstr "_Tastenkombinationen"
 
-#: ui/main-toolbar-menus.ui:61
+#: ui/main-toolbar-menus.ui:57
 msgid "_About Geary"
 msgstr "_Info zu Geary"
 
-#. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:183
-msgid "Working offline"
-msgstr "Abgemeldet arbeiten"
+#: ui/password-dialog.glade:74
+msgid "SMTP Credentials"
+msgstr "SMTP-Einstellungen"
 
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:197
-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 ""
-"Ihr Rechner scheint nicht mit dem Internet verbunden zu sein.\n"
-"Sie können keine E-Mails senden oder empfangen, bis er wieder verbunden ist."
+#: ui/password-dialog.glade:91
+msgid "Username"
+msgstr "Benutzername"
 
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:200
-msgid "You will not be able to send or receive email until re-connected."
-msgstr ""
-"Sie können keine E-Mails senden oder empfangen, bis wieder eine Verbindung "
-"besteht."
+#: ui/password-dialog.glade:152
+msgid "_Remember password"
+msgstr "_Passwort speichern"
 
-#. Button label for displaying technical details about an account problem
-#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: ui/main-window.ui:247 ui/problem-details-dialog.ui:13
-msgid "Details"
-msgstr "Details"
+#: ui/password-dialog.glade:210
+msgid "_Authenticate"
+msgstr "_Legitimieren"
 
-#. Button label for retrying an account problem
-#: ui/main-window.ui:261
-msgid "Retry"
-msgstr "Wiederholen"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Aktualisierung von Geary wird durchgeführt …"
 
-#. Infobar title when one or more accounts have encounted an error
-#: ui/main-window.ui:294
-msgid "Account problem"
-msgstr "Kontoproblem"
+#~ msgid "Open this link"
+#~ msgstr "Diesen Verweis öffnen"
 
-#. Label and tooltip for account service problem infobar
-#: ui/main-window.ui:308
-msgid ""
-"Geary encountered a problem connecting to an account.\n"
-"Please check your Internet connection, the server configuration and try "
-"again."
-msgstr ""
-"Geary ist beim Verbinden zu einem Konto auf ein Problem gestoßen.\n"
-"Bitte überprüfen Sie Ihre Internetverbindung und die Servereinstellungen, "
-"und versuchen Sie es erneut."
+#~ msgid "Enable or disable rich text mode"
+#~ msgstr "Formatierten Text ein-/ausschalten"
 
-#. Label and tooltip for account service problem infobar
-#: ui/main-window.ui:311
-msgid "Geary encountered a problem connecting to an account."
-msgstr "Geary ist beim Verbinden zu einem Konto auf ein Problem gestoßen."
+#~ msgid "mail-send"
+#~ msgstr "mail-send"
 
-#. Button label for retrying TLS cert validation
-#: ui/main-window.ui:358
-msgid "Check"
-msgstr "Prüfen"
+#~ msgid "org.gnome.Geary"
+#~ msgstr "org.gnome.Geary"
 
-#. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:362
-msgid "Check the security details for the connection"
-msgstr "Sicherheitsdetails für die Verbindung prüfen"
+#~ msgid "List of the languages to use in the spell checker."
+#~ msgstr ""
+#~ "Liste der Sprachen, die in der Rechtschreibprüfung verwendet werden "
+#~ "sollen."
 
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/main-window.ui:391
-msgid "Security problem"
-msgstr "Sicherheitsproblem"
+#~ msgid "Enable notification sounds"
+#~ msgstr "Benachrichtigungstöne aktivieren"
 
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:405
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-"Ein Konto hat einen nicht vertrauenswürdigen Server gemeldet.\n"
-"Bitte prüfen Sie die Servereinstellungen und versuchen Sie es erneut."
+#~ msgid "True to play sounds for notifications and sending."
+#~ msgstr ""
+#~ "Legt fest, ob Klänge für Benachrichtigungen und beim Senden abgespielt "
+#~ "werden sollen."
 
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:408
-msgid "An account has reported an untrusted server."
-msgstr "Ein Konto hat einen nicht-vertrauten Server gemeldet."
+#~ msgid "Show notifications for new mail"
+#~ msgstr "Benachrichtigung bei neuen Nachrichten anzeigen"
 
-#. Button tooltip for retrying when a login error has occurred
-#: ui/main-window.ui:459
-msgid "Retry login, you will be prompted for your password"
-msgstr "Anmeldung erneut versuchen, Sie werden nach einem Passwort gefragt"
+#~ msgid "True to show notification bubbles."
+#~ msgstr "Legt fest, ob Benachrichtigungen angezeigt werden sollen."
 
-#. Infobar title when one or more accounts have a login error
-#: ui/main-window.ui:488
-msgid "Login problem"
-msgstr "Anmeldeproblem"
+#~ msgid "Save drafts on server"
+#~ msgstr "Entwürfe auf dem Server speichern"
 
-# Das ist im Original schon irreführend: Es reicht nicht, den  Benutzernamen
-# zu prüfen, auch das Passwort könnte falsch sein.
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:502
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-"Ein Konto hat einen falschen Benutzernamen oder Passwort gemeldet.\n"
-"Bitte prüfen Sie Ihre Anmeldedaten und versuchen Sie es erneut."
+#~ msgid "Output debugging information"
+#~ msgstr "Debuginformationen ausgeben"
 
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:505
-msgid "An account has reported an incorrect login or password."
-msgstr "Ein Konto hat einen falschen Benutzernamen oder Passwort gemeldet."
+#~ msgid "Allow inspection of WebView"
+#~ msgstr "Untersuchung der Webansicht erlauben"
 
-#: ui/password-dialog.glade:74
-msgid "SMTP Credentials"
-msgstr "SMTP-Einstellungen"
+#~ msgid "Please report comments, suggestions and bugs to:"
+#~ msgstr "Bitte melden Sie Kommentare, Vorschläge und Fehler an:"
 
-#: ui/password-dialog.glade:91
-msgid "Username"
-msgstr "Benutzername"
+#~ msgid "Failed to parse command line options: %s\n"
+#~ msgstr "Die Befehlszeilenargumente konnten nicht interpretiert werden: %s\n"
 
-#: ui/password-dialog.glade:152
-msgid "_Remember password"
-msgstr "_Passwort speichern"
+#~ msgid "Undo move (Ctrl+Z)"
+#~ msgstr "Verschieben rückgängig machen (Strg+Z)"
 
-#: ui/password-dialog.glade:210
-msgid "_Authenticate"
-msgstr "_Legitimieren"
+#~ msgid "Close the draft message?"
+#~ msgid_plural "Close all draft messages?"
+#~ msgstr[0] "Nachrichtenentwurf schließen?"
+#~ msgstr[1] "Alle Nachrichtenentwürfe schließen?"
 
-#: ui/preferences-dialog.ui:38
-msgid "Reading"
-msgstr "Lesen"
+#~ msgid "Error emptying %s"
+#~ msgstr "Fehler beim Leeren von %s"
 
-#: ui/preferences-dialog.ui:51
-msgid "_Automatically select next message"
-msgstr "Automatisch die nächste Nachricht _wählen"
+#~ msgid "Undo trash (Ctrl+Z)"
+#~ msgstr "Papierkorb rückgängig (Strg+Z)"
 
-#: ui/preferences-dialog.ui:70
-msgid "_Display conversation preview"
-msgstr "Konversations_vorschau anzeigen"
+#~ msgid "Undo archive (Ctrl+Z)"
+#~ msgstr "Archivieren rückgängig (Strg+Z)"
 
-#: ui/preferences-dialog.ui:89
-msgid "Use _three pane view"
-msgstr "_Dreispaltige Ansicht verwenden"
+#~ msgid "Undo (Ctrl+Z)"
+#~ msgstr "Rückgängig (Strg+Z)"
 
-#: ui/preferences-dialog.ui:113
-msgid "Notifications"
-msgstr "Benachrichtigungen"
+#~ msgid "Successfully sent mail to %s."
+#~ msgstr "Nachricht an %s wurde erfolgreich gesendet."
 
-#: ui/preferences-dialog.ui:126
-msgid "_Play notification sounds"
-msgstr "_Benachrichtigungstöne abspielen"
+#~ msgid "Failed to open default text editor."
+#~ msgstr "Der Standard-Texteditor konnte nicht geöffnet werden."
 
-#: ui/preferences-dialog.ui:145
-msgid "Show _notifications for new mail"
-msgstr "Benachrichtigung bei _neuen E-Mails anzeigen"
+#~ msgid "Move conversation to Trash (Delete, Backspace)"
+#~ msgid_plural "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr[0] "Konversation in den Papierkorb verschieben (Entf, Rücktaste)"
+#~ msgstr[1] "Konversationen in den Papierkorb verschieben (Entf, Rücktaste)"
 
-#: ui/preferences-dialog.ui:164
-msgid "_Watch for new mail when closed"
-msgstr "_Ständig nach neuen E-Mails prüfen"
+#~ msgid "Delete conversation (Shift+Delete)"
+#~ msgid_plural "Delete conversations (Shift+Delete)"
+#~ msgstr[0] "Konversation löschen (Umschalt+Entf)"
+#~ msgstr[1] "Konversationen löschen (Umschalt+Entf)"
 
-#: ui/preferences-dialog.ui:168
-msgid "Geary will keep running after all windows are closed"
-msgstr "Geary wird weiter ausgeführt, nachdem alle Fenster geschlossen wurden"
+#~ msgid "Problem connecting to incoming server for %s"
+#~ msgstr "Fehler bei der Verbindung mit dem Eingangsserver für %s"
 
-#: ui/preferences-dialog.ui:195
-msgid "Preferences"
-msgstr "Einstellungen"
+#~ msgid ""
+#~ "Could not connect to %s, check your Internet access and the server name "
+#~ "and try again"
+#~ msgstr ""
+#~ "Verbindung zu %s war nicht möglich, überprüfen Sie Ihre "
+#~ "Internetverbindung und den Servernamen und versuchen Sie es erneut"
 
-#. Button label for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:17
-msgid "Copy to Clipboard"
-msgstr "In die Zwischenablage kopieren"
+#~ msgid "Problem connecting to outgoing server for %s"
+#~ msgstr "Fehler bei der Verbindung mit dem Ausgangsserver für %s"
 
-#. Button tooltip for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:21
-msgid ""
-"Copy technical details to clipboard for pasting into an email or bug report"
-msgstr ""
-"Technische Details zum Einfügen in eine E-Mail oder einen Fehlerbericht in "
-"die Zwischenablage einfügen"
+#~ msgid "Problem communicating with incoming server for %s"
+#~ msgstr "Problem bei der Kommunikation mit dem Eingangsserver für %s"
 
-#: ui/problem-details-dialog.ui:73
-msgid ""
-"If the problem is serious or persists, please copy and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
-"bug report</a>."
-msgstr ""
-"Falls das Problem schwerwiegend ist oder weiterhin besteht, kopieren Sie "
-"diese Details und senden Sie sie an die <a href=\"https://wiki.gnome.org/";
-"Apps/Geary/Contact\">Mailingliste</a> oder erstellen Sie einen <a href="
-"\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>neuen Fehlerbericht</a>."
+#~ msgid ""
+#~ "Network error talking to %s, check your Internet access and try again"
+#~ msgstr ""
+#~ "Netzwerkfehler bei der Kommunikation mit %s, bitte überprüfen Sie Ihre "
+#~ "Internetverbindung und versuchen Sie es erneut"
 
-#: ui/problem-details-dialog.ui:89
-msgid "Details:"
-msgstr "Details:"
+#~ msgid "Problem communicating with outgoing mail server"
+#~ msgstr "Problem bei der Kommunikation mit dem Ausgangsserver"
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Aktualisierung von Geary wird durchgeführt …"
+#~ msgid ""
+#~ "Geary did not understand a message from %s or vice versa, please file a "
+#~ "bug report"
+#~ msgstr ""
+#~ "Geary verstand eine Meldung von %s nicht oder umgekehrt, bitte erstellen "
+#~ "Sie einen Fehlerbericht"
+
+#~ msgid ""
+#~ "Could not communicate with %s for %s, check the server name and try again "
+#~ "in a moment"
+#~ msgstr ""
+#~ "Kommunikation mit %s für %s war nicht möglich, überprüfen Sie den "
+#~ "Servernamen und versuchen Sie es in Kürze erneut"
+
+#~ msgid "Incoming mail server password required for %s"
+#~ msgstr "Serverpasswort für %s ist für eingehende Nachrichten erforderlich"
+
+#~ msgid "Messages cannot be received without the correct password."
+#~ msgstr ""
+#~ "Nachrichten können nicht ohne das korrekte Passwort abgerufen werden."
+
+#~ msgid "Retry receiving email, you will be prompted for a password"
+#~ msgstr ""
+#~ "Erneut versuchen, Nachrichten abzurufen, Sie werden nach einem Passwort "
+#~ "gefragt"
+
+#~ msgid "Outgoing mail server password required for %s"
+#~ msgstr "Serverpasswort für %s ist für ausgehende Nachrichten erforderlich"
+
+#~ msgid "Messages cannot be sent without the correct password."
+#~ msgstr ""
+#~ "Nachrichten können nicht ohne das korrekte Passwort versendet werden."
+
+#~ msgid "Retry sending queued messages, you will be prompted for a password"
+#~ msgstr ""
+#~ "Erneut versuchen, in der Warteschlange befindliche Nachrichten zu "
+#~ "versenden, Sie werden nach einem Passwort gefragt"
+
+#~ msgid "Incoming mail server security is not trusted for %s"
+#~ msgstr ""
+#~ "Den Sicherheitseinstellungen des Servers für eingehende E-Mails von %s "
+#~ "wird nicht vertraut"
+
+#~ msgid "Messages will not be received until checked."
+#~ msgstr "Nachrichten werden nicht abgerufen, bis sie geprüft wurden."
+
+#~ msgid "Check security details"
+#~ msgstr "Sicherheitsdetails prüfen"
+
+#~ msgid "Outgoing mail server security is not trusted for %s"
+#~ msgstr ""
+#~ "Den Sicherheitseinstellungen des Servers für ausgehende E-Mails von %s "
+#~ "wird nicht vertraut"
+
+#~ msgid "Messages cannot be sent until checked."
+#~ msgstr ""
+#~ "Nachrichten können nicht versendet werden, bevor sie geprüft wurden."
+
+#~ msgid "A problem occurred checking mail for %s"
+#~ msgstr "Ein Problem ist beim Prüfen auf neue Nachrichten für %s aufgetreten"
+
+#~ msgid ""
+#~ "Something went wrong, please file a bug report if the problem persists"
+#~ msgstr ""
+#~ "Etwas ging schief, bitte senden Sie einen Fehlerbericht, wenn das Problem "
+#~ "weiterhin besteht"
+
+#~ msgid "A database problem has occurred"
+#~ msgstr "Ein Datenbankproblem ist aufgetreten"
+
+#~ msgid "Messages for %s must be downloaded again."
+#~ msgstr "Nachrichten für %s müssen erneut heruntergeladen werden."
+
+#~ msgid "Indexing %s account"
+#~ msgstr "%s-Konto wird indiziert"
+
+#~ msgid "Open"
+#~ msgstr "Öffnen"
+
+#~ msgctxt "Default clock format"
+#~ msgid "%l:%M %P"
+#~ msgstr "%l:%M %P"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Loslösen (Strg+D)"
+
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "Datei anhängen (Strg+T)"
+
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Senden (Strg+Eingabetaste)"
+
+#~ msgid "C_olor"
+#~ msgstr "F_arbe"
+
+#~ msgid "Show Extended Fields"
+#~ msgstr "Erweiterte Felder anzeigen"
+
+#~ msgid "Redo last edit  (Ctrl+Shift+Z)"
+#~ msgstr "Letzte Bearbeitung wiederholen (Umschalt+Strg+Z)"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Fett (Strg+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kursiv (Strg+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Unterstrichen (Strg+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Durchgestrichen (Strg+K)"
+
+#~ msgid "Insert ordered list"
+#~ msgstr "Geordnete Liste einfügen"
+
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Text einrücken (Strg+])"
+
+#~ msgid "Unquote text  (Ctrl+[)"
+#~ msgstr "Einrückung aufheben (Strg+[)"
+
+#~ msgid "Remove selection formatting (Ctrl+Space)"
+#~ msgstr "Formatierung der Auswahl löschen (Strg+Leertaste)"
+
+#~ msgid "Display the message menu"
+#~ msgstr "Das Nachrichtenmenü anzeigen"
+
+#~ msgid "_Trash"
+#~ msgstr "In den _Papierkorb"
+
+#~ msgid "Send New _Message…"
+#~ msgstr "Neue _Nachricht senden …"
+
+#~ msgid "Search for messages from"
+#~ msgstr "Nach Nachrichten suchen von"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move focus to conversation list"
+#~ msgstr "Fokus auf die Konversationsliste verschieben"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to search box"
+#~ msgstr "Zum Suchfeld springen"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Compose a new message"
+#~ msgstr "Eine neue Nachricht verfassen"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive"
+#~ msgstr "Archivieren"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move the conversation"
+#~ msgstr "Konversation verschieben"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Mark unread"
+#~ msgstr "Als ungelesen markieren"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Additional Shortcuts"
+#~ msgstr "Weitere Tastenkombinationen"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Star"
+#~ msgstr "Stern"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Unstar"
+#~ msgstr "Stern entfernen"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete"
+#~ msgstr "Löschen"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to next (older) conversation"
+#~ msgstr "Zur nächsten (älteren) Konversation springen"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to previous (newer) conversation"
+#~ msgstr "Zur letzten (neueren) Konversation springen"
+
+#~ msgid "Mark as S_pam"
+#~ msgstr "Als S_pam markieren"
+
+#~ msgid "Mark as not S_pam"
+#~ msgstr "S_pam-Markierung entfernen"
+
+#~ msgid "Retry"
+#~ msgstr "Wiederholen"
+
+#~ msgid ""
+#~ "Geary encountered a problem connecting to an account.\n"
+#~ "Please check your Internet connection, the server configuration and try "
+#~ "again."
+#~ msgstr ""
+#~ "Geary ist beim Verbinden zu einem Konto auf ein Problem gestoßen.\n"
+#~ "Bitte überprüfen Sie Ihre Internetverbindung und die Servereinstellungen, "
+#~ "und versuchen Sie es erneut."
+
+#~ msgid "Reading"
+#~ msgstr "Lesen"
+
+#~ msgid "Notifications"
+#~ msgstr "Benachrichtigungen"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Benachrichtigungstöne abspielen"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Benachrichtigung bei _neuen E-Mails anzeigen"
+
+#~ msgid "Preferences"
+#~ msgstr "Einstellungen"
+
+#~ msgid ""
+#~ "Copy technical details to clipboard for pasting into an email or bug "
+#~ "report"
+#~ msgstr ""
+#~ "Technische Details zum Einfügen in eine E-Mail oder einen Fehlerbericht "
+#~ "in die Zwischenablage einfügen"
 
 #~ msgid "Base URL to look up contact avatars"
 #~ msgstr "Basis-Adresse zum Abruf von Kontakt-Benutzerbildern"
@@ -3370,18 +3937,9 @@ msgstr "Aktualisierung von Geary wird durchgeführt …"
 #~ msgid "Move conversations to Trash (Delete, Backspace)"
 #~ msgstr "Konversationen in den Papierkorb verschieben (Entf, Rücktaste)"
 
-#~ msgid "Archive conversations (A)"
-#~ msgstr "Konversationen archivieren (A)"
-
-#~ msgid "Mark conversations"
-#~ msgstr "Konversationen markieren"
-
 #~ msgid "Add label to conversations"
 #~ msgstr "Konversationen eine Beschriftung zuweisen"
 
-#~ msgid "Move conversations"
-#~ msgstr "Konversationen verschieben"
-
 #~ msgid "A_ccounts"
 #~ msgstr "_Konten"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]