[balsa] Update German translation

From: Translations User D-L <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [balsa] Update German translation
Date: Sun, 17 Mar 2019 10:53:47 +0000 (UTC)
commit 417e4e9547b1b5af07c175f0f630a49d7feee853
Author: Mario BlÃ¤ttermann <mario blaettermann gmail com>
Date:   Sun Mar 17 10:53:33 2019 +0000

    Update German translation

 po/de.po | 2933 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1528 insertions(+), 1405 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 25be33e09..1ca1edbf2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,5 +1,8 @@
 # German Balsa translation.
 # Copyright (C) 2000 Free Software Foundation, Inc.
+#
+# Bitte nach der Evolution-Ãœbersetzung richten.
+#
 # Matthias Warkus <mawarkus gnome org>, 1999-2001.
 # Michael Duelli <m duelli web de>, 2000.
 # Kai Lahmann <kl linuxfaqs de>, 2000.
@@ -9,24 +12,22 @@
 # Hendrik Brandt <heb gnome-de org>, 2004-2005.
 # Hendrik Richter <hendrikr gnome org>, 2005.
 # Jens Seidel <jseidel cvs gnome org>, 2005.
-# Mario BlÃ¤ttermann <mario blaettermann gmail com>, 2008-2010, 2016-2018.
-#
-# Bitte nach der Evolution-Ãœbersetzung richten.
+# Mario BlÃ¤ttermann <mario blaettermann gmail com>, 2008-2010, 2016-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/balsa/issues\n";
-"POT-Creation-Date: 2018-08-11 22:15+0000\n"
-"PO-Revision-Date: 2018-08-12 12:13+0200\n"
+"POT-Creation-Date: 2019-03-05 17:01+0000\n"
+"PO-Revision-Date: 2019-03-17 11:46+0100\n"
 "Last-Translator: Mario BlÃ¤ttermann <mario blaettermann gmail com>\n"
-"Language-Team: German <gnome-de gnome org>\n"
+"Language-Team: German <debian-l10n-german lists debian org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "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.1\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #: ../balsa.appdata.xml.in.h:1
 msgid ""
@@ -88,36 +89,36 @@ msgstr "E-Mail-Client"
 msgid "Balsa Mail Client"
 msgstr "Balsa E-Mail-Client"
 
-#: ../libbalsa/address-book.c:312 ../libbalsa/filter-error.c:45
+#: ../libbalsa/address-book.c:311 ../libbalsa/filter-error.c:45
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: ../libbalsa/address-book.c:313
+#: ../libbalsa/address-book.c:312
 msgid "Cannot read from address book"
 msgstr "Aus Adressbuch konnte nicht gelesen werden"
 
-#: ../libbalsa/address-book.c:314
+#: ../libbalsa/address-book.c:313
 msgid "Cannot write to address book"
 msgstr "In Adressbuch konnte nicht geschrieben werden"
 
-#: ../libbalsa/address-book.c:315
+#: ../libbalsa/address-book.c:314
 msgid "Cannot connect to the server"
 msgstr "Verbindung mit Server konnte nicht aufgebaut werden"
 
-#: ../libbalsa/address-book.c:316
+#: ../libbalsa/address-book.c:315
 msgid "Cannot search in the address book"
 msgstr "Im Adressbuch konnte nicht gesucht werden"
 
-#: ../libbalsa/address-book.c:318
+#: ../libbalsa/address-book.c:317
 msgid "Cannot add duplicate entry"
 msgstr "Mehrfacher Eintrag konnte nicht hinzugefÃ¼gt werden"
 
-#: ../libbalsa/address-book.c:320
+#: ../libbalsa/address-book.c:319
 msgid "Cannot find address in address book"
 msgstr "Die Adresse konnte nicht im Adressbuch gefunden werden"
 
-#: ../libbalsa/address-book.c:321 ../src/main-window.c:2959
-#: ../src/main-window.c:4059 ../src/sendmsg-window.c:3825
+#: ../libbalsa/address-book.c:320 ../src/main-window.c:2900
+#: ../src/main-window.c:4001 ../src/sendmsg-window.c:3811
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -127,10 +128,10 @@ msgid "No-Id"
 msgstr "Keine Kennung"
 
 #: ../libbalsa/address-book-extern.c:214 ../libbalsa/address-book-extern.c:372
-#: ../libbalsa/address-book-ldap.c:497 ../libbalsa/address-book-ldif.c:212
+#: ../libbalsa/address-book-ldap.c:498 ../libbalsa/address-book-ldif.c:212
 #: ../libbalsa/address-book-ldif.c:236 ../libbalsa/address-book-ldif.c:255
 #: ../libbalsa/address-book-ldif.c:259 ../libbalsa/address-book-vcard.c:158
-#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:404
+#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:405
 #: ../libbalsa/rfc6350.c:112
 msgid "No-Name"
 msgstr "Kein Name"
@@ -152,48 +153,48 @@ msgstr "Ort des Benutzer-Adressbuchs wurde nicht angegeben"
 msgid "Reading Osmo contacts failed: %s"
 msgstr "Lesen der Osmo-Kontakte ist fehlgeschlagen: %s"
 
-#: ../libbalsa/address.c:952
+#: ../libbalsa/address.c:957
 msgid "D_isplayed Name:"
 msgstr "Ange_zeigter Name:"
 
-#: ../libbalsa/address.c:953
+#: ../libbalsa/address.c:958
 msgid "_First Name:"
 msgstr "_Vorname:"
 
-#: ../libbalsa/address.c:954
+#: ../libbalsa/address.c:959
 msgid "_Last Name:"
 msgstr "_Nachname:"
 
-#: ../libbalsa/address.c:955
+#: ../libbalsa/address.c:960
 msgid "_Nickname:"
 msgstr "_Spitzname:"
 
-#: ../libbalsa/address.c:956
+#: ../libbalsa/address.c:961
 msgid "O_rganization:"
 msgstr "_Organisation:"
 
-#: ../libbalsa/address.c:957
+#: ../libbalsa/address.c:962
 msgid "_Email Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: ../libbalsa/address.c:976 ../src/filter-edit-callbacks.c:1077
+#: ../libbalsa/address.c:981 ../src/filter-edit-callbacks.c:1077
 msgid "A_dd"
 msgstr "_HinzufÃ¼gen"
 
 #: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:748
-#: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:715
-#: ../src/sendmsg-window.c:3532
+#: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:721
+#: ../src/sendmsg-window.c:3518
 msgid "To:"
 msgstr "An:"
 
 #: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:750
-#: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:715
-#: ../src/sendmsg-window.c:3540
+#: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:721
+#: ../src/sendmsg-window.c:3526
 msgid "CC:"
 msgstr "Kopie an:"
 
 #: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:752
-#: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:715
+#: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:721
 msgid "BCC:"
 msgstr "Blindkopie an:"
 
@@ -201,8 +202,78 @@ msgstr "Blindkopie an:"
 msgid "Reply To:"
 msgstr "Antwort an:"
 
-#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1829
-#: ../libbalsa/message.c:848 ../libbalsa/message.h:188
+#: ../libbalsa/autocrypt.c:179
+#, c-format
+msgid "cannot initialise Autocrypt database â€œ%sâ€: %s"
+msgstr "Autocrypt-Datenbank Â»%sÂ« konnte nicht initialisiert werden: %s"
+
+#: ../libbalsa/autocrypt.c:298
+#, c-format
+msgid ""
+"No usable private key for â€œ%sâ€ found! Please create a key or disable "
+"Autocrypt."
+msgstr ""
+"FÃ¼r Â»%sÂ« wurde kein nutzbarer geheimer SchlÃ¼ssel gefunden! Bitte erzeugen Sie "
+"einen SchlÃ¼ssel oder deaktivieren Sie Autocrypt."
+
+#: ../libbalsa/autocrypt.c:366 ../libbalsa/autocrypt.c:374
+#: ../libbalsa/autocrypt.c:838 ../libbalsa/autocrypt.c:844
+#, c-format
+msgid "error reading Autocrypt data for â€œ%sâ€: %s"
+msgstr "Fehler beim Lesen der Autocrypt-Daten fÃ¼r Â»%sÂ«: %s"
+
+#: ../libbalsa/autocrypt.c:427
+msgid "Autocrypt database"
+msgstr "Autocrypt-Datenbank"
+
+#: ../libbalsa/autocrypt.c:428 ../libbalsa/html.c:421
+#: ../libbalsa/identity.c:1798 ../src/ab-window.c:149 ../src/mailbox-node.c:1101
+#: ../src/main-window.c:3686 ../src/toolbar-prefs.c:141
+#: ../ui/main-window.ui.h:65 ../ui/message-window.ui.h:4
+#: ../ui/sendmsg-window.ui.h:12 ../ui/source-viewer.ui.h:2
+msgid "_Close"
+msgstr "S_chlieÃŸen"
+
+#: ../libbalsa/autocrypt.c:434 ../libbalsa/libbalsa-gpgme-cb.c:238
+msgid "Double-click key to show details"
+msgstr "Klicken Sie doppelt auf einen SchlÃ¼ssel, um Details anzuzeigen"
+
+#: ../libbalsa/autocrypt.c:487 ../src/balsa-mblist.c:350
+msgid "Mailbox"
+msgstr "Postfach"
+
+#: ../libbalsa/autocrypt.c:492
+msgid "Last seen"
+msgstr "Zuletzt gesehen"
+
+#: ../libbalsa/autocrypt.c:497
+msgid "Last Autocrypt message"
+msgstr "Letzte Autocrypt-Nachricht"
+
+#: ../libbalsa/autocrypt.c:502
+msgid "Prefer encryption"
+msgstr "VerschlÃ¼sselung bevorzugen"
+
+#: ../libbalsa/autocrypt.c:869
+#, c-format
+msgid "%s user â€œ%sâ€ failed: %s"
+msgstr "%s Benutzer Â»%sÂ« fehlgeschlagen: %s"
+
+#: ../libbalsa/autocrypt.c:869
+msgid "update"
+msgstr "aktualisieren"
+
+#: ../libbalsa/autocrypt.c:869
+msgid "insert"
+msgstr "einfÃ¼gen"
+
+#: ../libbalsa/autocrypt.c:884
+#, c-format
+msgid "update user â€œ%sâ€ failed: %s"
+msgstr "Aktualisieren des Benutzers Â»%sÂ« ist fehlgeschlagen: %s"
+
+#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1824
+#: ../libbalsa/message.c:850 ../libbalsa/message.h:188
 msgid "(No subject)"
 msgstr "(Kein Betreff)"
 
@@ -216,7 +287,7 @@ msgstr "Ausgabestrom konnte nicht erzeugt werden"
 msgid "Could not read embedded message"
 msgstr "Lesen der eingebetteten Nachricht ist fehlgeschlagen"
 
-#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:865
+#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:858
 msgid "Unable to load message body to match filter"
 msgstr "Nachrichtenrumpf konnte nicht zum Filtern geladen werden"
 
@@ -276,7 +347,7 @@ msgid "From"
 msgstr "Von"
 
 #: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:365
-#: ../src/pref-manager.c:219
+#: ../src/pref-manager.c:218
 msgid "Subject"
 msgstr "Betreff"
 
@@ -347,13 +418,13 @@ msgid "(unknown protocol) "
 msgstr "(Unbekanntes Protokoll) "
 
 #: ../libbalsa/gmime-gpgme-signature.c:154
-#: ../libbalsa/libbalsa-gpgme-widgets.c:325
-#: ../libbalsa/libbalsa-gpgme-widgets.c:645 ../libbalsa/rfc3156.c:693
-#: ../src/address-book-config.c:197
+#: ../libbalsa/libbalsa-gpgme-widgets.c:339
+#: ../libbalsa/libbalsa-gpgme-widgets.c:659 ../libbalsa/rfc3156.c:693
+#: ../src/address-book-config.c:198
 msgid "never"
 msgstr "niemals"
 
-#: ../libbalsa/gmime-gpgme-signature.c:169
+#: ../libbalsa/gmime-gpgme-signature.c:171
 #, c-format
 msgid ""
 "\n"
@@ -362,7 +433,7 @@ msgstr ""
 "\n"
 "GÃ¼ltigkeit der Unterschrift: %s"
 
-#: ../libbalsa/gmime-gpgme-signature.c:170
+#: ../libbalsa/gmime-gpgme-signature.c:173
 #, c-format
 msgid ""
 "\n"
@@ -371,7 +442,7 @@ msgstr ""
 "\n"
 "Unterschrieben am: %s"
 
-#: ../libbalsa/gmime-gpgme-signature.c:172
+#: ../libbalsa/gmime-gpgme-signature.c:176
 #, c-format
 msgid ""
 "\n"
@@ -383,8 +454,7 @@ msgstr ""
 #: ../libbalsa/gmime-multipart-crypt.c:228
 msgid "Cannot verify multipart/signed part due to missing subparts."
 msgstr ""
-"VerschlÃ¼sselter/Multipart-Teil kann nicht Ã¼berprÃ¼ft werden, weil Teile "
-"fehlen."
+"VerschlÃ¼sselter/Multipart-Teil kann nicht Ã¼berprÃ¼ft werden, weil Teile fehlen."
 
 #: ../libbalsa/gmime-multipart-crypt.c:252
 #, c-format
@@ -403,8 +473,7 @@ msgstr ""
 #: ../libbalsa/gmime-multipart-crypt.c:461
 #, c-format
 msgid ""
-"Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
-"â€œ%sâ€."
+"Cannot decrypt multipart/encrypted part: unsupported encryption protocol â€œ%sâ€."
 msgstr ""
 "VerschlÃ¼sselter/Multipart-Teil kann nicht entschlÃ¼sselt werden: Nicht "
 "unterstÃ¼tztes VerschlÃ¼sselungsprotokoll Â»%sÂ«."
@@ -415,8 +484,7 @@ msgstr "(kein)"
 
 #: ../libbalsa/gmime-multipart-crypt.c:475
 msgid ""
-"Cannot decrypt multipart/encrypted part: content-type does not match "
-"protocol."
+"Cannot decrypt multipart/encrypted part: content-type does not match protocol."
 msgstr ""
 "VerschlÃ¼sselter/Multipart-Teil kann nicht entschlÃ¼sselt werden: Inhaltstyp "
 "entspricht nicht dem Protokoll."
@@ -434,7 +502,7 @@ msgstr ""
 "VerschlÃ¼sselter/Multipart-Teil kann nicht entschlÃ¼sselt werden: Auswertung "
 "des verschlÃ¼sselten Teils ist nicht mÃ¶glich"
 
-#: ../libbalsa/html.c:71
+#: ../libbalsa/html.c:73
 #, c-format
 msgid "Could not get an HTML part: %s"
 msgstr "Ein HTML-Teil konnte nicht geholt werden: %s"
@@ -454,7 +522,7 @@ msgstr ""
 "Um Ihre PrivatsphÃ¤re zu schÃ¼tzen, hat Balsa diese nicht heruntergeladen.\n"
 "Sie kÃ¶nnen Sie dennoch herunterladen, falls Sie dem Server vertrauen."
 
-#: ../libbalsa/html.c:410 ../libbalsa/html.c:1081
+#: ../libbalsa/html.c:410
 msgid ""
 "This message part contains images from a remote server. To protect your "
 "privacy, Balsa has not downloaded them. You may choose to download them if "
@@ -464,192 +532,184 @@ msgstr ""
 "PrivatsphÃ¤re zu schÃ¼tzen, hat Balsa diese nicht heruntergeladen. Sie kÃ¶nnen "
 "Sie dennoch herunterladen, falls Sie dem Server vertrauen."
 
-#: ../libbalsa/html.c:419 ../libbalsa/html.c:1092
+#: ../libbalsa/html.c:419
 msgid "_Download images"
 msgstr "_Bilder herunterladen"
 
-#: ../libbalsa/html.c:421 ../libbalsa/html.c:1094 ../libbalsa/identity.c:1776
-#: ../src/ab-window.c:149 ../src/mailbox-node.c:1116 ../src/main-window.c:3744
-#: ../src/toolbar-prefs.c:140 ../ui/main-window.ui.h:71
-#: ../ui/message-window.ui.h:4 ../ui/sendmsg-window.ui.h:12
-#: ../ui/source-viewer.ui.h:2
-msgid "_Close"
-msgstr "S_chlieÃŸen"
-
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1952
-#: ../libbalsa/mailbox_local.c:1954 ../src/sendmsg-window.c:3773
-#: ../src/sendmsg-window.c:3775
+#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1947
+#: ../libbalsa/mailbox_local.c:1949 ../src/sendmsg-window.c:3759
+#: ../src/sendmsg-window.c:3761
 msgid "Re:"
 msgstr "AW:"
 
-#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:3713
-#: ../src/sendmsg-window.c:3714 ../src/sendmsg-window.c:3715
+#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:3699
+#: ../src/sendmsg-window.c:3700 ../src/sendmsg-window.c:3701
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: ../libbalsa/identity.c:166
+#: ../libbalsa/identity.c:169
 msgid "New Identity"
 msgstr "Neue IdentitÃ¤t"
 
-#: ../libbalsa/identity.c:343
+#: ../libbalsa/identity.c:346
 #, c-format
 msgid "Error executing signature generator â€œ%sâ€: %s"
 msgstr "Fehler beim AusfÃ¼hren des Unterschriftengenerators Â»%sÂ«: %s"
 
-#: ../libbalsa/identity.c:352
+#: ../libbalsa/identity.c:355
 #, c-format
 msgid "Cannot read signature file â€œ%sâ€: %s"
 msgstr "Unterschriftendatei Â»%sÂ« konnte nicht gelesen werden: %s"
 
-#: ../libbalsa/identity.c:363
+#: ../libbalsa/identity.c:366
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "Die Unterschrift in %s ist kein UTF-8-Unicode-Text."
 
-#: ../libbalsa/identity.c:474 ../libbalsa/libbalsa-gpgme-cb.c:197
-#: ../libbalsa/libbalsa-gpgme-cb.c:356 ../libbalsa/smtp-server.c:468
-#: ../src/ab-main.c:854 ../src/ab-window.c:142 ../src/address-book-config.c:237
-#: ../src/address-book-config.c:342 ../src/address-book-config.c:388
-#: ../src/balsa-app.c:86 ../src/balsa-index.c:2671 ../src/balsa-mblist.c:1890
-#: ../src/balsa-message.c:1774 ../src/balsa-mime-widget-callbacks.c:85
-#: ../src/filter-edit-callbacks.c:1247 ../src/filter-edit-dialog.c:404
-#: ../src/filter-edit-dialog.c:573 ../src/filter-export-dialog.c:79
-#: ../src/filter-run-dialog.c:316 ../src/folder-conf.c:334
-#: ../src/folder-conf.c:607 ../src/folder-conf.c:835 ../src/folder-conf.c:1080
-#: ../src/mailbox-conf.c:382 ../src/mailbox-conf.c:403
-#: ../src/mailbox-conf.c:419 ../src/mailbox-conf.c:1146
-#: ../src/mailbox-conf.c:1183 ../src/pref-manager.c:3284
-#: ../src/sendmsg-window.c:530 ../src/sendmsg-window.c:1553
-#: ../src/sendmsg-window.c:2005 ../src/sendmsg-window.c:3339
-#: ../src/sendmsg-window.c:4689 ../src/sendmsg-window.c:4988
-#: ../src/sendmsg-window.c:5145 ../src/spell-check.c:382
-#: ../src/store-address.c:208
+#: ../libbalsa/identity.c:478 ../libbalsa/libbalsa-gpgme-cb.c:197
+#: ../libbalsa/libbalsa-gpgme-cb.c:355 ../libbalsa/smtp-server.c:376
+#: ../src/ab-main.c:854 ../src/ab-window.c:142 ../src/address-book-config.c:238
+#: ../src/address-book-config.c:343 ../src/address-book-config.c:389
+#: ../src/balsa-app.c:86 ../src/balsa-app.c:151 ../src/balsa-index.c:2683
+#: ../src/balsa-mblist.c:1890 ../src/balsa-message.c:1798
+#: ../src/balsa-mime-widget-callbacks.c:85 ../src/filter-edit-callbacks.c:1247
+#: ../src/filter-edit-dialog.c:404 ../src/filter-edit-dialog.c:574
+#: ../src/filter-export-dialog.c:80 ../src/filter-run-dialog.c:316
+#: ../src/folder-conf.c:252 ../src/folder-conf.c:442 ../src/folder-conf.c:673
+#: ../src/folder-conf.c:918 ../src/mailbox-conf.c:210 ../src/mailbox-conf.c:231
+#: ../src/mailbox-conf.c:247 ../src/mailbox-conf.c:726 ../src/mailbox-conf.c:785
+#: ../src/pref-manager.c:3291 ../src/sendmsg-window.c:536
+#: ../src/sendmsg-window.c:1539 ../src/sendmsg-window.c:1991
+#: ../src/sendmsg-window.c:3325 ../src/sendmsg-window.c:4676
+#: ../src/sendmsg-window.c:4975 ../src/sendmsg-window.c:5066
+#: ../src/spell-check.c:382 ../src/store-address.c:209
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../libbalsa/identity.c:475 ../libbalsa/libbalsa-gpgme-cb.c:196
-#: ../libbalsa/libbalsa-gpgme-cb.c:355 ../libbalsa/smtp-server.c:467
-#: ../src/ab-window.c:141 ../src/balsa-app.c:85 ../src/balsa-message.c:1775
-#: ../src/balsa-mime-widget-callbacks.c:86 ../src/filter-edit-callbacks.c:1246
-#: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:78
-#: ../src/filter-run-dialog.c:315 ../src/main-window.c:3839
-#: ../src/pref-manager.c:3282 ../src/sendmsg-window.c:1552
-#: ../src/sendmsg-window.c:2006 ../src/sendmsg-window.c:3338
-#: ../src/sendmsg-window.c:4690 ../src/store-address.c:209
+#: ../libbalsa/identity.c:479 ../libbalsa/libbalsa-gpgme-cb.c:196
+#: ../libbalsa/libbalsa-gpgme-cb.c:354 ../libbalsa/smtp-server.c:375
+#: ../src/ab-window.c:141 ../src/balsa-app.c:87 ../src/balsa-app.c:150
+#: ../src/balsa-message.c:1799 ../src/balsa-mime-widget-callbacks.c:86
+#: ../src/filter-edit-callbacks.c:1246 ../src/filter-edit-dialog.c:573
+#: ../src/filter-export-dialog.c:79 ../src/filter-run-dialog.c:315
+#: ../src/main-window.c:3781 ../src/pref-manager.c:3289
+#: ../src/sendmsg-window.c:1538 ../src/sendmsg-window.c:1992
+#: ../src/sendmsg-window.c:3324 ../src/sendmsg-window.c:4677
+#: ../src/store-address.c:210
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libbalsa/identity.c:487
+#: ../libbalsa/identity.c:491
 msgid "Current"
 msgstr "Verwendet"
 
-#: ../libbalsa/identity.c:740 ../libbalsa/smtp-server.c:178
+#: ../libbalsa/identity.c:753 ../libbalsa/smtp-server.c:179
 msgid "Default"
 msgstr "Vorgabe"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:942
+#: ../libbalsa/identity.c:955
 msgid "_Face Path"
 msgstr "_Face-Pfad"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:948
+#: ../libbalsa/identity.c:961
 msgid "_X-Face Path"
 msgstr "_X-Face-Pfad"
 
 #. create the "General" tab
-#: ../libbalsa/identity.c:971
+#: ../libbalsa/identity.c:984
 msgid "General"
 msgstr "Allgemein"
 
-#: ../libbalsa/identity.c:973
+#: ../libbalsa/identity.c:986
 msgid "_Identity name:"
 msgstr "Name der _IdentitÃ¤t:"
 
-#: ../libbalsa/identity.c:975
+#: ../libbalsa/identity.c:988
 msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: ../libbalsa/identity.c:977
+#: ../libbalsa/identity.c:990
 msgid "_Mailing address:"
 msgstr "E-_Mail-Adresse:"
 
-#: ../libbalsa/identity.c:979
+#: ../libbalsa/identity.c:992
 msgid "Reply _to:"
 msgstr "An_twort an:"
 
-#: ../libbalsa/identity.c:981
+#: ../libbalsa/identity.c:994
 msgid "_Domain:"
 msgstr "_DomÃ¤ne:"
 
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:985
+#: ../libbalsa/identity.c:998
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../libbalsa/identity.c:987
+#: ../libbalsa/identity.c:1000
 msgid "_BCC:"
 msgstr "B_lindkopie an:"
 
-#: ../libbalsa/identity.c:989
+#: ../libbalsa/identity.c:1002
 msgid "Reply _string:"
 msgstr "Antwort_zeichenkette:"
 
-#: ../libbalsa/identity.c:991
+#: ../libbalsa/identity.c:1004
 msgid "F_orward string:"
 msgstr "_Weiterleitungs-Zeichenkette:"
 
-#: ../libbalsa/identity.c:994
+#: ../libbalsa/identity.c:1007
 msgid "send messages in both plain text and _HTML format"
 msgstr "Nachrichten als einfachen Text und _HTML senden"
 
-#: ../libbalsa/identity.c:997
+#: ../libbalsa/identity.c:1010
 msgid "request positive (successful) _Delivery Status Notification by default"
 msgstr "Immer um positive (erfolgreiche) E_mpfangsbestÃ¤tigung bitten"
 
-#: ../libbalsa/identity.c:1001
+#: ../libbalsa/identity.c:1014
 msgid "request _Message Disposition Notification by default"
 msgstr "Immer um E_mpfangsbestÃ¤tigung bitten"
 
-#: ../libbalsa/identity.c:1010
+#: ../libbalsa/identity.c:1023
 msgid "SMT_P server:"
 msgstr "SMT_P-Server:"
 
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:1014
+#: ../libbalsa/identity.c:1027
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: ../libbalsa/identity.c:1017
+#: ../libbalsa/identity.c:1030
 msgid "Signature _path"
 msgstr "_Pfad zur Unterschrift"
 
-#: ../libbalsa/identity.c:1020
+#: ../libbalsa/identity.c:1033
 msgid "_Execute signature"
 msgstr "Unterschrift _ausfÃ¼hren"
 
-#: ../libbalsa/identity.c:1023
+#: ../libbalsa/identity.c:1036
 msgid "Incl_ude signature"
 msgstr "Unterschrift _einfÃ¼gen"
 
-#: ../libbalsa/identity.c:1026
+#: ../libbalsa/identity.c:1039
 msgid "Include signature when for_warding"
 msgstr "Unterschrift beim Wei_terleiten einfÃ¼gen"
 
-#: ../libbalsa/identity.c:1029
+#: ../libbalsa/identity.c:1042
 msgid "Include signature when rep_lying"
 msgstr "Unterschrift beim Ant_worten einfÃ¼gen"
 
-#: ../libbalsa/identity.c:1032
+#: ../libbalsa/identity.c:1045
 msgid "_Add signature separator"
 msgstr "Unterschrift-_Trennstrich einfÃ¼gen"
 
-#: ../libbalsa/identity.c:1035
+#: ../libbalsa/identity.c:1048
 msgid "Prepend si_gnature"
 msgstr "Un_terschrift voranstellen"
 
-#: ../libbalsa/identity.c:1041
+#: ../libbalsa/identity.c:1054
 msgid ""
 "Signing and encrypting messages are possible only if Balsa is built with "
 "cryptographic support."
@@ -657,31 +717,31 @@ msgstr ""
 "Das Unterschreiben und VerschlÃ¼sseln von Nachrichten ist nur mÃ¶glich, wenn "
 "Balsa mit Kryptographie-UnterstÃ¼tzung erstellt wurde."
 
-#: ../libbalsa/identity.c:1046
+#: ../libbalsa/identity.c:1059
 msgid "Security"
 msgstr "Sicherheit"
 
-#: ../libbalsa/identity.c:1049
+#: ../libbalsa/identity.c:1062
 msgid "sign messages by default"
 msgstr "Nachrichten per Vorgabe unterschreiben"
 
-#: ../libbalsa/identity.c:1052
+#: ../libbalsa/identity.c:1065
 msgid "encrypt messages by default"
 msgstr "Nachrichten per Vorgabe verschlÃ¼sseln"
 
-#: ../libbalsa/identity.c:1055
+#: ../libbalsa/identity.c:1068
 msgid "default protocol"
 msgstr "Vorgabeprotokoll"
 
-#: ../libbalsa/identity.c:1058
+#: ../libbalsa/identity.c:1071
 msgid "always trust GnuPG keys to encrypt messages"
 msgstr "GnuPG-SchlÃ¼sseln zum VerschlÃ¼sseln von Nachrichten immer vertrauen"
 
-#: ../libbalsa/identity.c:1061
+#: ../libbalsa/identity.c:1074
 msgid "remind me if messages can be encrypted"
 msgstr "Erinnern, wenn Nachrichten verschlÃ¼sselt werden kÃ¶nnen"
 
-#: ../libbalsa/identity.c:1064
+#: ../libbalsa/identity.c:1077
 msgid ""
 "use secret key with this id for signing GnuPG messages\n"
 "(leave empty for automatic selection)"
@@ -690,7 +750,7 @@ msgstr ""
 "Nachrichten verwenden\n"
 "(leer lassen fÃ¼r automatische Auswahl)"
 
-#: ../libbalsa/identity.c:1068
+#: ../libbalsa/identity.c:1081
 msgid ""
 "use certificate with this id for signing S/MIME messages\n"
 "(leave empty for automatic selection)"
@@ -699,95 +759,170 @@ msgstr ""
 "Nachrichten verwenden\n"
 "(leer lassen fÃ¼r automatische Auswahl)"
 
-#: ../libbalsa/identity.c:1190
+#: ../libbalsa/identity.c:1086
+msgid "Autocrypt mode"
+msgstr "Autocrypt-Modus"
+
+#: ../libbalsa/identity.c:1208
 #, c-format
 msgid "Error selecting key: %s"
 msgstr "Fehler beim AuswÃ¤hlen des SchlÃ¼ssels: %s"
 
-#: ../libbalsa/identity.c:1213
+#: ../libbalsa/identity.c:1231
 msgid "Chooseâ€¦"
 msgstr "WÃ¤hlen â€¦"
 
-#: ../libbalsa/identity.c:1260
+#: ../libbalsa/identity.c:1278
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Fehler beim Lesen der Datei %s: %s"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1270
+#: ../libbalsa/identity.c:1288
 #, c-format
 msgid "Face header file %s is too long (%lu bytes)."
 msgstr "Face-Kopfzeilendatei %s ist zu lang (%lu Byte)."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1280
+#: ../libbalsa/identity.c:1298
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "Face-Kopfzeilendatei %s enthÃ¤lt BinÃ¤rdaten."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1300 ../src/balsa-message.c:1599
+#: ../libbalsa/identity.c:1318 ../src/balsa-message.c:1623
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Face konnte nicht geladen werden: %s"
 
-#: ../libbalsa/identity.c:1479
+#: ../libbalsa/identity.c:1497
 msgid "Error: The identity does not have a name"
 msgstr "Fehler: Die IdentitÃ¤t hat keinen Namen"
 
-#: ../libbalsa/identity.c:1489
+#: ../libbalsa/identity.c:1507
 msgid "Error: An identity with that name already exists"
 msgstr "Fehler: Eine IdentitÃ¤t mit diesem Namen existiert bereits"
 
-#: ../libbalsa/identity.c:1684
+#: ../libbalsa/identity.c:1705
 msgid "Do you really want to delete the selected identity?"
 msgstr "Wollen Sie die ausgewÃ¤hlte IdentitÃ¤t wirklich lÃ¶schen?"
 
-#: ../libbalsa/identity.c:1729
+#: ../libbalsa/identity.c:1750
 #, c-format
 msgid "Error displaying help for identities: %s\n"
 msgstr "Fehler beim Anzeigen der Hilfe zu den IdentitÃ¤ten: %s\n"
 
-#: ../libbalsa/identity.c:1768
+#: ../libbalsa/identity.c:1790
 msgid "Manage Identities"
 msgstr "IdentitÃ¤ten verwalten"
 
-#: ../libbalsa/identity.c:1772 ../libbalsa/smtp-server.c:469
-#: ../src/address-book-config.c:238 ../src/address-book-config.c:340
-#: ../src/address-book-config.c:386 ../src/filter-edit-callbacks.c:1248
-#: ../src/filter-edit-dialog.c:574 ../src/filter-export-dialog.c:80
-#: ../src/filter-run-dialog.c:317 ../src/folder-conf.c:335
-#: ../src/folder-conf.c:608 ../src/folder-conf.c:836 ../src/main-window.c:3743
-#: ../src/pref-manager.c:3285 ../src/toolbar-prefs.c:141 ../ui/ab-main.ui.h:16
-#: ../ui/main-window.ui.h:14
+#: ../libbalsa/identity.c:1794 ../libbalsa/smtp-server.c:377
+#: ../src/address-book-config.c:239 ../src/address-book-config.c:341
+#: ../src/address-book-config.c:387 ../src/filter-edit-callbacks.c:1248
+#: ../src/filter-edit-dialog.c:575 ../src/filter-export-dialog.c:81
+#: ../src/filter-run-dialog.c:317 ../src/folder-conf.c:253
+#: ../src/folder-conf.c:443 ../src/folder-conf.c:674 ../src/main-window.c:3685
+#: ../src/pref-manager.c:3292 ../src/toolbar-prefs.c:142 ../ui/ab-main.ui.h:16
+#: ../ui/main-window.ui.h:88
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. Translators: button "New" identity
-#: ../libbalsa/identity.c:1774
+#: ../libbalsa/identity.c:1796
 msgctxt "identity"
 msgid "_New"
 msgstr "_Neu"
 
-#: ../libbalsa/identity.c:1775 ../src/ab-main.c:849
+#: ../libbalsa/identity.c:1797 ../src/ab-main.c:849
 #: ../src/filter-edit-callbacks.c:1081 ../src/filter-edit-dialog.c:320
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../libbalsa/identity.c:2160
+#: ../libbalsa/identity.c:2205 ../libbalsa/libbalsa-gpgme-widgets.c:460
+msgid "disabled"
+msgstr "Deaktiviert"
+
+#: ../libbalsa/identity.c:2207
+msgid "enabled, no preference"
+msgstr "aktiviert, keine Voreinstellung"
+
+#: ../libbalsa/identity.c:2209
+msgid "enabled, prefer encryption"
+msgstr "aktiviert, VerschlÃ¼sselung bevorzugen"
+
+#: ../libbalsa/identity.c:2239
 msgid "GnuPG MIME mode"
 msgstr "GnuPG MIME-Modus"
 
-#: ../libbalsa/identity.c:2162
+#: ../libbalsa/identity.c:2241
 msgid "GnuPG OpenPGP mode"
 msgstr "GnuPG OpenPGP-Modus"
 
-#: ../libbalsa/identity.c:2164
+#: ../libbalsa/identity.c:2243
 msgid "GpgSM S/MIME mode"
 msgstr "GpgSM S/MIME-Modus"
 
+#: ../libbalsa/imap/auth-cram.c:47 ../libbalsa/imap/imap-auth.c:90
+#: ../libbalsa/imap/imap-auth.c:141
+msgid "Authentication cancelled"
+msgstr "Legitimierung abgebrochen"
+
+#: ../libbalsa/imap/auth-gssapi.c:130
+msgid "User name required, authentication cancelled"
+msgstr "Benutzername erforderlich, Legitimierung wurde abgebrochen"
+
+#: ../libbalsa/imap/auth-gssapi.c:163
+#, c-format
+msgid "GSSAPI authentication failed: %s"
+msgstr "GSSAPI-Legitimierung fehlgeschlagen: %s"
+
+#: ../libbalsa/imap/imap-auth.c:71
+msgid "No way to authenticate is known"
+msgstr "Keine LegitimierungsmÃ¶glichkeit bekannt"
+
+#: ../libbalsa/imap/imap-auth.c:97
+msgid "Cannot LOGIN with UTF-8 username or password"
+msgstr "Anmeldung mit UTF-8-Benutzername oder Passwort nicht mÃ¶glich"
+
+#: ../libbalsa/imap/imap-commands.c:1217
+msgid "Unordered data received from server"
+msgstr "Ungeordnete Daten vom Server empfangen"
+
+#: ../libbalsa/imap/imap-commands.c:1752
+msgid "Bug in implementation of SORT command on IMAP server exposed."
+msgstr ""
+"Fehler in der Implementation des SORT-Befehls auf dem IMAP-Server "
+"festgestellt."
+
+#: ../libbalsa/imap/imap-handle.c:58 ../libbalsa/rfc2445.c:88
+#: ../libbalsa/rfc2445.c:711 ../libbalsa/rfc2445.c:730 ../libbalsa/rfc3156.c:689
+#: ../src/sendmsg-window.c:5209
+msgid "unknown"
+msgstr "unbekannt"
+
+#: ../libbalsa/imap/imap-handle.c:725
+#, c-format
+msgid "Connecting %s failed: %s"
+msgstr "Verbindung zu %s ist fehlgeschlagen: %s"
+
+#: ../libbalsa/imap/imap-handle.c:738 ../libbalsa/imap/imap-handle.c:758
+#, c-format
+msgid "TLS negotiation failed: %s"
+msgstr "TLS-Aushandlung fehlgeschlagen: %s"
+
+#: ../libbalsa/imap/imap-handle.c:764
+msgid "TLS required but not available"
+msgstr "TLS ist erforderlich, aber nicht verfÃ¼gbar"
+
+#. it is not we, so it must be the server
+#: ../libbalsa/imap/imap-handle.c:2353 ../libbalsa/imap/imap-handle.c:2371
+#: ../libbalsa/imap/imap-handle.c:2387 ../libbalsa/imap/imap-handle.c:2414
+#, c-format
+msgid "IMAP response: %s"
+msgstr "IMAP-Antwort: %s"
+
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:236
+#: ../libbalsa/imap-server.c:241
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -797,66 +932,45 @@ msgstr ""
 "%s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:240
+#: ../libbalsa/imap-server.c:245
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr ""
 "Fehler auf IMAP-Server %s:\n"
 "%s"
 
-#: ../libbalsa/imap-server.c:469 ../libbalsa/server.c:377
-#, c-format
-msgid "Error looking up password for %s@%s: %s\n"
-msgstr "Fehler beim Nachschlagen des Passworts fÃ¼r %s@%s: %s\n"
-
-#: ../libbalsa/imap-server.c:471 ../libbalsa/server.c:379
-#, c-format
-msgid "Falling back\n"
-msgstr "Ausweichen\n"
-
-#: ../libbalsa/imap-server.c:481 ../libbalsa/server.c:388
-#: ../libbalsa/server.c:451
-msgid "Balsa passwords"
-msgstr "Balsa-PasswÃ¶rter"
-
-#: ../libbalsa/imap-server.c:490 ../libbalsa/server.c:397
-#: ../libbalsa/server.c:458
-#, c-format
-msgid "Error storing password for %s@%s: %s\n"
-msgstr "Fehler beim Speichern des Passworts fÃ¼r %s@%s: %s\n"
-
-#: ../libbalsa/imap-server.c:537
+#: ../libbalsa/imap-server.c:498
 #, c-format
 msgid "Cannot connect to %s"
 msgstr "Verbindung mit %s konnte nicht aufgebaut werden"
 
-#: ../libbalsa/imap-server.c:542 ../libbalsa/imap-server.c:547
+#: ../libbalsa/imap-server.c:503 ../libbalsa/imap-server.c:508
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "Verbindung mit Server konnte nicht aufgebaut werden: %s"
 
-#: ../libbalsa/imap-server.c:695
+#: ../libbalsa/imap-server.c:656
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Die maximale Anzahl an Verbindungen wurden fÃ¼r den Server %s erreicht"
 
-#: ../libbalsa/libbalsa.c:449 ../libbalsa/libbalsa.c:617
+#: ../libbalsa/libbalsa.c:423 ../libbalsa/libbalsa.c:591
 msgid "SSL/TLS certificate"
 msgstr "SSL/TLS-Zertifikat"
 
-#: ../libbalsa/libbalsa.c:453 ../libbalsa/libbalsa.c:621
+#: ../libbalsa/libbalsa.c:427 ../libbalsa/libbalsa.c:595
 msgid "_Accept Once"
 msgstr "Einmal _annehmen"
 
-#: ../libbalsa/libbalsa.c:454 ../libbalsa/libbalsa.c:622
+#: ../libbalsa/libbalsa.c:428 ../libbalsa/libbalsa.c:596
 msgid "Accept & _Save"
 msgstr "Annehmen und _speichern"
 
-#: ../libbalsa/libbalsa.c:455 ../libbalsa/libbalsa.c:623
+#: ../libbalsa/libbalsa.c:429 ../libbalsa/libbalsa.c:597
 msgid "_Reject"
 msgstr "A_blehnen"
 
-#: ../libbalsa/libbalsa.c:465
+#: ../libbalsa/libbalsa.c:439
 #, c-format
 msgid ""
 "<big><b>Authenticity of this certificate could not be verified.</b></big>\n"
@@ -866,7 +980,7 @@ msgstr ""
 "big>\n"
 "Ursache: %s"
 
-#: ../libbalsa/libbalsa.c:579
+#: ../libbalsa/libbalsa.c:553
 #, c-format
 msgid ""
 "Authenticity of this certificate could not be verified.\n"
@@ -877,7 +991,7 @@ msgstr ""
 "<b>Ursache:</b> %s\n"
 "<b>Dieses Zertifikat gehÃ¶rt zu:</b>\n"
 
-#: ../libbalsa/libbalsa.c:589
+#: ../libbalsa/libbalsa.c:563
 msgid ""
 "\n"
 "<b>This certificate was issued by:</b>\n"
@@ -885,7 +999,7 @@ msgstr ""
 "\n"
 "<b>Dieses Zertifikat wurde ausgegeben von:</b>\n"
 
-#: ../libbalsa/libbalsa.c:597
+#: ../libbalsa/libbalsa.c:571
 #, c-format
 msgid ""
 "<b>This certificate is valid</b>\n"
@@ -898,11 +1012,11 @@ msgstr ""
 "bis %s\n"
 "<b>Fingerabdruck:</b> %s"
 
-#: ../libbalsa/libbalsa.c:658
+#: ../libbalsa/libbalsa.c:632
 msgid "the signing certificate authority is not known"
 msgstr "Die signierende Zertifizierungsstelle ist unbekannt"
 
-#: ../libbalsa/libbalsa.c:660
+#: ../libbalsa/libbalsa.c:634
 msgid ""
 "the certificate does not match the expected identity of the site that it was "
 "retrieved from"
@@ -910,114 +1024,113 @@ msgstr ""
 "Das Zertifikat entspricht nicht der erwarteten IdentitÃ¤t der Seite, von der "
 "es bezogen wurde"
 
-#: ../libbalsa/libbalsa.c:662
+#: ../libbalsa/libbalsa.c:636
 msgid "the certificateâ€™s activation time is still in the future"
 msgstr "Die Aktivierungszeit des Zertifikats liegt noch in der Zukunft"
 
-#: ../libbalsa/libbalsa.c:664
+#: ../libbalsa/libbalsa.c:638
 msgid "the certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen"
 
-#: ../libbalsa/libbalsa.c:666
+#: ../libbalsa/libbalsa.c:640
 msgid "the certificate has been revoked "
 msgstr "Das Zertifikat wurde widerrufen"
 
-#: ../libbalsa/libbalsa.c:668
+#: ../libbalsa/libbalsa.c:642
 msgid "the certificateâ€™s algorithm is considered insecure"
 msgstr "Der Algorithmus des Zertifikats wird als unsicher angenommen"
 
-#: ../libbalsa/libbalsa.c:670
+#: ../libbalsa/libbalsa.c:644
 msgid "an error occurred validating the certificate"
 msgstr "Fehler beim ÃœberprÃ¼fen des Zertifikats"
 
-#: ../libbalsa/libbalsa.c:802
+#: ../libbalsa/libbalsa.c:776
 #, c-format
 msgid "No image data"
 msgstr "Keine Bilddaten"
 
-#: ../libbalsa/libbalsa.c:836
+#: ../libbalsa/libbalsa.c:810
 #, c-format
 msgid "Invalid input format"
 msgstr "UngÃ¼ltiges Eingabeformat"
 
-#: ../libbalsa/libbalsa.c:840
+#: ../libbalsa/libbalsa.c:814
 #, c-format
 msgid "Internal buffer overrun"
 msgstr "Interner PufferÃ¼berlauf"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:857
+#: ../libbalsa/libbalsa.c:831
 #, c-format
 msgid "Bad X-Face data"
 msgstr "UngÃ¼ltige X-Face-Daten"
 
-#: ../libbalsa/libbalsa-conf.c:143
+#: ../libbalsa/libbalsa-conf.c:146
 msgid "Your Balsa configuration is now stored in â€œ~/.balsa/configâ€."
 msgstr "Ihre Konfiguration von Balsa wurde in Â»~/.balsa/configÂ« gesichert."
 
-#: ../libbalsa/libbalsa-gpgme.c:209
+#: ../libbalsa/libbalsa-gpgme.c:234
 msgid "could not create context"
 msgstr "Kontext konnte nicht erzeugt werden"
 
-#: ../libbalsa/libbalsa-gpgme.c:213
+#: ../libbalsa/libbalsa-gpgme.c:238
 #, c-format
 msgid "could not set protocol â€œ%sâ€"
 msgstr "Protokoll Â»%sÂ« konnte nicht gesetzt werden"
 
-#: ../libbalsa/libbalsa-gpgme.c:267
+#: ../libbalsa/libbalsa-gpgme.c:292
 #, c-format
 msgid "could not set folder â€œ%sâ€ for engine â€œ%sâ€"
 msgstr "Ordner Â»%sÂ« fÃ¼r Engine Â»%sÂ« konnte nicht gesetzt werden"
 
-#: ../libbalsa/libbalsa-gpgme.c:324 ../libbalsa/libbalsa-gpgme.c:335
-#: ../libbalsa/libbalsa-gpgme.c:436 ../libbalsa/libbalsa-gpgme.c:559
-#: ../libbalsa/libbalsa-gpgme.c:652
+#: ../libbalsa/libbalsa-gpgme.c:349 ../libbalsa/libbalsa-gpgme.c:360
+#: ../libbalsa/libbalsa-gpgme.c:461 ../libbalsa/libbalsa-gpgme.c:584
+#: ../libbalsa/libbalsa-gpgme.c:677
 msgid "could not get data from stream"
 msgstr "Daten konnten nicht aus dem Datenstrom empfangen werden"
 
-#: ../libbalsa/libbalsa-gpgme.c:348 ../libbalsa/rfc3156.c:369
-#: ../libbalsa/rfc3156.c:374 ../libbalsa/rfc3156.c:540
-#: ../libbalsa/rfc3156.c:546
+#: ../libbalsa/libbalsa-gpgme.c:373 ../libbalsa/rfc3156.c:369
+#: ../libbalsa/rfc3156.c:374 ../libbalsa/rfc3156.c:540 ../libbalsa/rfc3156.c:546
 msgid "signature verification failed"
 msgstr "Unterschrift konnte nicht Ã¼berprÃ¼ft werden"
 
-#: ../libbalsa/libbalsa-gpgme.c:444 ../libbalsa/libbalsa-gpgme.c:568
-#: ../libbalsa/libbalsa-gpgme.c:660
+#: ../libbalsa/libbalsa-gpgme.c:469 ../libbalsa/libbalsa-gpgme.c:593
+#: ../libbalsa/libbalsa-gpgme.c:685
 msgid "could not create new data object"
 msgstr "Neues Datenobjekt konnte nicht erzeugt werden"
 
-#: ../libbalsa/libbalsa-gpgme.c:453
+#: ../libbalsa/libbalsa-gpgme.c:478
 msgid "signing failed"
 msgstr "Unterschreiben fehlgeschlagen"
 
-#: ../libbalsa/libbalsa-gpgme.c:527
+#: ../libbalsa/libbalsa-gpgme.c:552
 #, c-format
 msgid "combined signing and encryption is defined only for RFC 2440"
 msgstr ""
 "Die Kombination von Unterschrift und VerschlÃ¼sselung ist nur fÃ¼r RFC 2440 "
 "definiert"
 
-#: ../libbalsa/libbalsa-gpgme.c:595
+#: ../libbalsa/libbalsa-gpgme.c:620
 msgid "signing and encryption failed"
 msgstr "Unterschreiben und VerschlÃ¼sseln fehlgeschlagen"
 
-#: ../libbalsa/libbalsa-gpgme.c:597
+#: ../libbalsa/libbalsa-gpgme.c:622
 msgid "encryption failed"
 msgstr "VerschlÃ¼sseln fehlgeschlagen"
 
-#: ../libbalsa/libbalsa-gpgme.c:670 ../libbalsa/rfc3156.c:440
+#: ../libbalsa/libbalsa-gpgme.c:695 ../libbalsa/rfc3156.c:440
 #: ../libbalsa/rfc3156.c:445
 msgid "decryption failed"
 msgstr "EntschlÃ¼sselung fehlgeschlagen"
 
-#: ../libbalsa/libbalsa-gpgme.c:775
+#: ../libbalsa/libbalsa-gpgme.c:802
 #, c-format
 msgid "No private key for protocol %s is available for the signer â€œ%sâ€"
 msgstr ""
 "FÃ¼r das Protokoll %s ist fÃ¼r den Unterzeichnenden Â»%sÂ« kein geheimer "
 "SchlÃ¼ssel verfÃ¼gbar"
 
-#: ../libbalsa/libbalsa-gpgme.c:925
+#: ../libbalsa/libbalsa-gpgme.c:952
 #, c-format
 msgid ""
 "A key for â€œ%sâ€ is present, but it is expired, disabled, revoked or invalid"
@@ -1025,17 +1138,17 @@ msgstr ""
 "Ein SchlÃ¼ssel fÃ¼r Â»%sÂ« ist verfÃ¼gbar, aber entweder abgelaufen, deaktiviert, "
 "widerrufen oder ungÃ¼ltig"
 
-#: ../libbalsa/libbalsa-gpgme.c:928
+#: ../libbalsa/libbalsa-gpgme.c:955
 #, c-format
 msgid "Could not find a key for â€œ%sâ€"
 msgstr "SchlÃ¼ssel fÃ¼r Â»%sÂ« konnte nicht gefunden werden"
 
-#: ../libbalsa/libbalsa-gpgme.c:943
+#: ../libbalsa/libbalsa-gpgme.c:970
 #, c-format
 msgid "Multiple keys for â€œ%sâ€"
 msgstr "Mehrere SchlÃ¼ssel fÃ¼r Â»%sÂ«"
 
-#: ../libbalsa/libbalsa-gpgme.c:965
+#: ../libbalsa/libbalsa-gpgme.c:992
 #, c-format
 msgid "Insufficient key validity"
 msgstr "Unzureichende GÃ¼ltigkeit des SchlÃ¼ssels"
@@ -1045,17 +1158,17 @@ msgstr "Unzureichende GÃ¼ltigkeit des SchlÃ¼ssels"
 msgid "Select key"
 msgstr "WÃ¤hlen Sie einen SchlÃ¼ssel"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:213
+#: ../libbalsa/libbalsa-gpgme-cb.c:214
 #, c-format
 msgid "Select the private key for the signer â€œ%sâ€"
 msgstr "WÃ¤hlen Sie den privaten SchlÃ¼ssel fÃ¼r den Urheber Â»%sÂ«"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:218
+#: ../libbalsa/libbalsa-gpgme-cb.c:219
 #, c-format
 msgid "Select the public key for the recipient â€œ%sâ€"
 msgstr "WÃ¤hlen Sie den Ã¶ffentlichen SchlÃ¼ssel fÃ¼r den EmpfÃ¤nger Â»%sÂ«"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:223
+#: ../libbalsa/libbalsa-gpgme-cb.c:224
 #, c-format
 msgid ""
 "There seems to be no public key for recipient â€œ%sâ€ in your key ring.\n"
@@ -1067,16 +1180,12 @@ msgstr ""
 "Wenn Sie sicher sind, dass der EmpfÃ¤nger einen anderen SchlÃ¼ssel hat, wÃ¤hlen "
 "Sie ihn aus der Liste aus."
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:236
-msgid "Double-click key to show details"
-msgstr "Klicken Sie doppelt auf einen SchlÃ¼ssel, um Details anzuzeigen"
-
-#: ../libbalsa/libbalsa-gpgme-cb.c:284
+#: ../libbalsa/libbalsa-gpgme-cb.c:286
 msgid "User ID"
 msgstr "Benutzerkennung"
 
 #. create the dialog
-#: ../libbalsa/libbalsa-gpgme-cb.c:320
+#: ../libbalsa/libbalsa-gpgme-cb.c:319
 #, c-format
 msgid ""
 "The owner trust for this key is â€œ%sâ€ only.\n"
@@ -1085,16 +1194,16 @@ msgstr ""
 "Das EigentÃ¼mervertrauen fÃ¼r diesen SchlÃ¼ssel ist nur Â»%sÂ«.\n"
 "Wollen Sie diesen SchlÃ¼ssel dennoch verwenden?"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:322
+#: ../libbalsa/libbalsa-gpgme-cb.c:321
 msgid "Insufficient key owner trust"
 msgstr "UngenÃ¼gendes Vertrauen fÃ¼r den SchlÃ¼sseleigentÃ¼mer"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:352
+#: ../libbalsa/libbalsa-gpgme-cb.c:351
 msgid "Enter Passphrase"
 msgstr "Kennwort eingeben"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:380
+#: ../libbalsa/libbalsa-gpgme-cb.c:379
 #, c-format
 msgid ""
 "%s\n"
@@ -1103,12 +1212,12 @@ msgid ""
 "Key: %s"
 msgstr ""
 "%s\n"
-"Das Kennwort fÃ¼r diesen SchlÃ¼ssel war fehlerhaft, bitte versuchen Sie es "
-"noch einmal!\n"
+"Das Kennwort fÃ¼r diesen SchlÃ¼ssel war fehlerhaft, bitte versuchen Sie es noch "
+"einmal!\n"
 "\n"
 "SchlÃ¼ssel: %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:385
+#: ../libbalsa/libbalsa-gpgme-cb.c:384
 #, c-format
 msgid ""
 "%s\n"
@@ -1117,84 +1226,83 @@ msgid ""
 "Key: %s"
 msgstr ""
 "%s\n"
-"Bitte geben Sie das Passwort fÃ¼r den GeheimschlÃ¼ssel ein!\n"
+"Bitte geben Sie das Kennwort fÃ¼r den GeheimschlÃ¼ssel ein!\n"
 "\n"
 "SchlÃ¼ssel: %s"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:88 ../libbalsa/libbalsa-gpgme-keys.c:156
+#: ../libbalsa/libbalsa-gpgme-keys.c:94 ../libbalsa/libbalsa-gpgme-keys.c:162
 msgid "error setting key list mode"
 msgstr "Fehler beim Setzen des SchlÃ¼ssellistenmodus"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:95 ../libbalsa/libbalsa-gpgme-keys.c:120
-#: ../libbalsa/libbalsa-gpgme-keys.c:162 ../libbalsa/libbalsa-gpgme-keys.c:166
+#: ../libbalsa/libbalsa-gpgme-keys.c:101 ../libbalsa/libbalsa-gpgme-keys.c:126
+#: ../libbalsa/libbalsa-gpgme-keys.c:168 ../libbalsa/libbalsa-gpgme-keys.c:172
 #, c-format
 msgid "could not list keys for â€œ%sâ€"
 msgstr "SchlÃ¼sselliste fÃ¼r Â»%sÂ« konnte nicht erstellt werden"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:173
+#: ../libbalsa/libbalsa-gpgme-keys.c:179
 #, c-format
 msgid "ambiguous keys for â€œ%sâ€"
 msgstr "Nicht eindeutige SchlÃ¼ssel fÃ¼r Â»%sÂ«"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:242 ../libbalsa/libbalsa-gpgme-keys.c:282
+#: ../libbalsa/libbalsa-gpgme-keys.c:248 ../libbalsa/libbalsa-gpgme-keys.c:291
+#: ../libbalsa/libbalsa-gpgme-keys.c:396
 msgid "cannot create data buffer"
 msgstr "Datenpuffer konnte nicht erstellt werden"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:250
+#: ../libbalsa/libbalsa-gpgme-keys.c:256
 #, c-format
 msgid "exporting key for â€œ%sâ€ failed"
 msgstr "Exportieren des SchlÃ¼ssels fÃ¼r Â»%sÂ« ist fehlgeschlagen"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:286
-msgid "importing ASCII-armored key data failed"
-msgstr "Importieren der ASCII-geschÃ¼tzten SchlÃ¼sseldaten ist fehlgeschlagen"
+#: ../libbalsa/libbalsa-gpgme-keys.c:316 ../libbalsa/libbalsa-gpgme-keys.c:324
+#, c-format
+msgid "cannot export minimal key for â€œ%sâ€"
+msgstr "Exportieren des minimalen SchlÃ¼ssels fÃ¼r Â»%sÂ« ist fehlgeschlagen"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:400
+msgid "importing key data failed"
+msgstr "Importieren der SchlÃ¼sseldaten ist fehlgeschlagen"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:363
+#: ../libbalsa/libbalsa-gpgme-keys.c:475
 #, c-format
 msgid "Cannot find a key with fingerprint %s on the key server."
 msgstr ""
 "Auf dem SchlÃ¼sselserver konnte kein SchlÃ¼sselserver mit dem Fingerabdruck %s "
 "gefunden werden."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:367
+#: ../libbalsa/libbalsa-gpgme-keys.c:480
 #, c-format
 msgid ""
-"Found %u key with fingerprint %s on the key server. Please check and import "
-"the proper key manually."
-msgid_plural ""
 "Found %u keys with fingerprint %s on the key server. Please check and import "
 "the proper key manually."
-msgstr[0] ""
+msgstr ""
 "Es wurde %u SchlÃ¼ssel mit dem Fingerabdruck %s auf dem SchlÃ¼sselserver "
 "gefunden. Bitte Ã¼berprÃ¼fen Sie diesen und importieren Sie den passenden "
 "SchlÃ¼ssel manuell."
-msgstr[1] ""
-"Es wurden %u SchlÃ¼ssel mit dem Fingerabdruck %s auf dem SchlÃ¼sselserver "
-"gefunden. Bitte Ã¼berprÃ¼fen Sie diese und importieren Sie den passenden "
-"SchlÃ¼ssel manuell."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:377
+#: ../libbalsa/libbalsa-gpgme-keys.c:488
 #, c-format
 msgid "Searching the key server failed: %s"
 msgstr "Durchsuchen des SchlÃ¼sselservers ist fehlgeschlagen: %s"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:456
+#: ../libbalsa/libbalsa-gpgme-keys.c:567
 msgid "error importing key"
 msgstr "Fehler beim Importieren des SchlÃ¼ssels"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:491
+#: ../libbalsa/libbalsa-gpgme-keys.c:602
 msgid "No key was imported or updated."
 msgstr "Es wurde kein SchlÃ¼ssel importiert oder aktualisiert."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:494
+#: ../libbalsa/libbalsa-gpgme-keys.c:605
 msgid "The key was imported into the local key ring."
 msgstr "Der SchlÃ¼ssel wurde in den lokalen SchlÃ¼sselbund importiert."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:498
+#: ../libbalsa/libbalsa-gpgme-keys.c:609
 msgid "The key was updated in the local key ring:"
 msgstr "Der SchlÃ¼ssel wurde im lokalen SchlÃ¼sselbund aktualisiert:"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:501
+#: ../libbalsa/libbalsa-gpgme-keys.c:612
 #, c-format
 msgid ""
 "\n"
@@ -1209,7 +1317,7 @@ msgstr[1] ""
 "\n"
 "â€¢ %d neue Benutzerkennungen"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:506
+#: ../libbalsa/libbalsa-gpgme-keys.c:617
 #, c-format
 msgid ""
 "\n"
@@ -1224,7 +1332,7 @@ msgstr[1] ""
 "\n"
 "â€¢ %d neue UnterschlÃ¼ssel"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:511
+#: ../libbalsa/libbalsa-gpgme-keys.c:622
 #, c-format
 msgid ""
 "\n"
@@ -1239,7 +1347,7 @@ msgstr[1] ""
 "\n"
 "â€¢ %d neue Unterschriften"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:517
+#: ../libbalsa/libbalsa-gpgme-keys.c:628
 #, c-format
 msgid ""
 "\n"
@@ -1254,171 +1362,167 @@ msgstr[1] ""
 "\n"
 "â€¢ %d neue Widerrufe"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:523
+#: ../libbalsa/libbalsa-gpgme-keys.c:634
 msgid "The existing key in the key ring was not changed."
 msgstr "Der vorhandene SchlÃ¼ssel im SchlÃ¼sselbund wurde nicht geÃ¤ndert."
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:90
-#: ../libbalsa/libbalsa-gpgme-widgets.c:227
+#: ../libbalsa/libbalsa-gpgme-widgets.c:92
+#: ../libbalsa/libbalsa-gpgme-widgets.c:235
 msgid "Key status:"
 msgstr "SchlÃ¼sselstatus:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:96
-#: ../libbalsa/libbalsa-gpgme-widgets.c:103
-#: ../libbalsa/libbalsa-gpgme-widgets.c:233
+#: ../libbalsa/libbalsa-gpgme-widgets.c:98
+#: ../libbalsa/libbalsa-gpgme-widgets.c:105
 #: ../libbalsa/libbalsa-gpgme-widgets.c:241
+#: ../libbalsa/libbalsa-gpgme-widgets.c:249
 msgid "User ID:"
 msgstr "Benutzerkennung:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:96
-#: ../libbalsa/libbalsa-gpgme-widgets.c:233
+#: ../libbalsa/libbalsa-gpgme-widgets.c:98
+#: ../libbalsa/libbalsa-gpgme-widgets.c:241
 msgid "None"
 msgstr "Kein"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:101
-#: ../libbalsa/libbalsa-gpgme-widgets.c:239
+#: ../libbalsa/libbalsa-gpgme-widgets.c:103
+#: ../libbalsa/libbalsa-gpgme-widgets.c:247
 msgid "Primary user ID:"
 msgstr "PrimÃ¤re Benutzerkennung:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:113
-#: ../libbalsa/libbalsa-gpgme-widgets.c:248
+#: ../libbalsa/libbalsa-gpgme-widgets.c:115
+#: ../libbalsa/libbalsa-gpgme-widgets.c:256
 msgid "Key owner trust:"
 msgstr "Vertrauen in SchlÃ¼sselbesitzer:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:123
-#: ../libbalsa/libbalsa-gpgme-widgets.c:255
+#: ../libbalsa/libbalsa-gpgme-widgets.c:125
+#: ../libbalsa/libbalsa-gpgme-widgets.c:263
 msgid "Additional User IDs"
 msgstr "ZusÃ¤tzliche Benutzerkennungen"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:141
-#: ../libbalsa/libbalsa-gpgme-widgets.c:267
+#: ../libbalsa/libbalsa-gpgme-widgets.c:143
+#: ../libbalsa/libbalsa-gpgme-widgets.c:275
 msgid "Issuer"
 msgstr "Ausgeber"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:152
-#: ../libbalsa/libbalsa-gpgme-widgets.c:273
+#: ../libbalsa/libbalsa-gpgme-widgets.c:154
+#: ../libbalsa/libbalsa-gpgme-widgets.c:281
 msgid "Name:"
 msgstr "Name:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:156
-#: ../libbalsa/libbalsa-gpgme-widgets.c:277
+#: ../libbalsa/libbalsa-gpgme-widgets.c:158
+#: ../libbalsa/libbalsa-gpgme-widgets.c:285
 msgid "Serial number:"
 msgstr "Seriennummer:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:159
-#: ../libbalsa/libbalsa-gpgme-widgets.c:280
+#: ../libbalsa/libbalsa-gpgme-widgets.c:161
+#: ../libbalsa/libbalsa-gpgme-widgets.c:288
 msgid "Chain ID:"
 msgstr "Chain-ID:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:170
-#: ../libbalsa/libbalsa-gpgme-widgets.c:288
+#: ../libbalsa/libbalsa-gpgme-widgets.c:173
+#: ../libbalsa/libbalsa-gpgme-widgets.c:297
 msgid "Subkey used"
 msgstr "Genutzter UnterschlÃ¼ssel"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:178
+#: ../libbalsa/libbalsa-gpgme-widgets.c:182
 #, c-format
 msgid "Subkeys (%s only)"
 msgstr "UnterschlÃ¼ssel (nur %s)"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:183
+#: ../libbalsa/libbalsa-gpgme-widgets.c:187
 msgid "Subkeys"
 msgstr "UnterschlÃ¼ssel"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:297
-#: ../libbalsa/libbalsa-gpgme-widgets.c:617
+#: ../libbalsa/libbalsa-gpgme-widgets.c:311
+#: ../libbalsa/libbalsa-gpgme-widgets.c:631
 msgid "Status:"
 msgstr "Status:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:301
-#: ../libbalsa/libbalsa-gpgme-widgets.c:621
+#: ../libbalsa/libbalsa-gpgme-widgets.c:315
+#: ../libbalsa/libbalsa-gpgme-widgets.c:635
 msgid "Fingerprint:"
 msgstr "Fingerabdruck:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:304
-#: ../libbalsa/libbalsa-gpgme-widgets.c:624
+#: ../libbalsa/libbalsa-gpgme-widgets.c:318
+#: ../libbalsa/libbalsa-gpgme-widgets.c:638
 #: ../src/balsa-print-object-default.c:152
 #: ../src/balsa-print-object-default.c:154
 #: ../src/balsa-print-object-default.c:157
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:310
-#: ../libbalsa/libbalsa-gpgme-widgets.c:630
+#: ../libbalsa/libbalsa-gpgme-widgets.c:324
+#: ../libbalsa/libbalsa-gpgme-widgets.c:644
 msgid "Capabilities:"
 msgstr "FÃ¤higkeiten:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:315
-#: ../libbalsa/libbalsa-gpgme-widgets.c:635
+#: ../libbalsa/libbalsa-gpgme-widgets.c:329
+#: ../libbalsa/libbalsa-gpgme-widgets.c:649
 msgid "invalid timestamp"
 msgstr "UngÃ¼ltiger Zeitstempel"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:317
-#: ../libbalsa/libbalsa-gpgme-widgets.c:637
+#: ../libbalsa/libbalsa-gpgme-widgets.c:331
+#: ../libbalsa/libbalsa-gpgme-widgets.c:651
 msgid "not available"
 msgstr "nicht verfÃ¼gbar"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:321
-#: ../libbalsa/libbalsa-gpgme-widgets.c:641
+#: ../libbalsa/libbalsa-gpgme-widgets.c:335
+#: ../libbalsa/libbalsa-gpgme-widgets.c:655
 msgid "Created:"
 msgstr "Erstellt:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:329
-#: ../libbalsa/libbalsa-gpgme-widgets.c:649
+#: ../libbalsa/libbalsa-gpgme-widgets.c:343
+#: ../libbalsa/libbalsa-gpgme-widgets.c:663
 msgid "Expires:"
 msgstr "LÃ¤uft ab am:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:361 ../src/toolbar-factory.c:163
+#: ../libbalsa/libbalsa-gpgme-widgets.c:375 ../src/toolbar-factory.c:163
 msgid "Close"
 msgstr "SchlieÃŸen"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:365
+#: ../libbalsa/libbalsa-gpgme-widgets.c:379
 msgid "No"
 msgstr "Nein"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:365
+#: ../libbalsa/libbalsa-gpgme-widgets.c:379
 msgid "Yes"
 msgstr "Ja"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:440
+#: ../libbalsa/libbalsa-gpgme-widgets.c:454
 msgid "revoked"
 msgstr "widerrufen"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:443
+#: ../libbalsa/libbalsa-gpgme-widgets.c:457
 msgid "expired"
 msgstr "verfallen"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:446
-msgid "disabled"
-msgstr "Deaktiviert"
-
-#: ../libbalsa/libbalsa-gpgme-widgets.c:449
+#: ../libbalsa/libbalsa-gpgme-widgets.c:463
 msgid "invalid"
 msgstr "UngÃ¼ltig"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:679
+#: ../libbalsa/libbalsa-gpgme-widgets.c:693
 msgid "sign"
 msgstr "unterschreiben"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:682
+#: ../libbalsa/libbalsa-gpgme-widgets.c:696
 msgid "encrypt"
 msgstr "VerschlÃ¼sseln"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:685
+#: ../libbalsa/libbalsa-gpgme-widgets.c:699
 msgid "certify"
 msgstr "zertifizieren"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:688
+#: ../libbalsa/libbalsa-gpgme-widgets.c:702
 msgid "authenticate"
 msgstr "Legitimieren"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:709
+#: ../libbalsa/libbalsa-gpgme-widgets.c:723
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
 msgstr[0] "%u Bit"
 msgstr[1] "%u Bits"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:715
+#: ../libbalsa/libbalsa-gpgme-widgets.c:729
 #, c-format
 msgid " curve â€œ%sâ€"
 msgstr " Kurve Â»%sÂ«"
@@ -1427,7 +1531,7 @@ msgstr " Kurve Â»%sÂ«"
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4484
+#: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4469
 #, c-format
 msgid "not a regular file"
 msgstr "Keine gÃ¼ltige Datei"
@@ -1447,64 +1551,64 @@ msgstr "Mit %s Ã¶ffnen"
 msgid "Open _part with %s"
 msgstr "_Teil mit %s Ã¶ffnen"
 
-#: ../libbalsa/mailbox.c:515
+#: ../libbalsa/mailbox.c:514
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Postfach %s konnte nicht geÃ¶ffnet werden"
 
-#: ../libbalsa/mailbox.c:522
+#: ../libbalsa/mailbox.c:521
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Postfach-Typ %s gibt es nicht"
 
-#: ../libbalsa/mailbox.c:539
+#: ../libbalsa/mailbox.c:538
 #, c-format
 msgid "Bad local mailbox path â€œ%sâ€"
 msgstr "Fehlerhafter Pfad Â»%sÂ« zu lokalem Postfach"
 
-#: ../libbalsa/mailbox.c:544
+#: ../libbalsa/mailbox.c:548
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Postfach des Typs %s konnte nicht angelegt werden"
 
-#: ../libbalsa/mailbox.c:871
+#: ../libbalsa/mailbox.c:862
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Filterregeln auf %s anwenden"
 
-#: ../libbalsa/mailbox.c:1037
+#: ../libbalsa/mailbox.c:1028
 #, c-format
 msgid "Copying from %s to %s"
 msgstr "Von Â»%sÂ« nach Â»%sÂ« kopieren"
 
-#: ../libbalsa/mailbox.c:1956
+#: ../libbalsa/mailbox.c:1946
 #, c-format
 msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
 msgstr "libbalsa_mailbox_get_message: Postfach %s ist geschlossen"
 
-#: ../libbalsa/mailbox.c:2161
+#: ../libbalsa/mailbox.c:2151
 #, c-format
 msgid "Removing messages from source mailbox failed"
 msgstr "LÃ¶schen von Nachrichten im Quell-Postfach ist fehlgeschlagen"
 
-#: ../libbalsa/mailbox.c:2985
+#: ../libbalsa/mailbox.c:3025
 msgid "from unknown"
 msgstr "von unbekannt"
 
-#: ../libbalsa/mailbox.c:2987
+#: ../libbalsa/mailbox.c:3027
 msgid "Loadingâ€¦"
 msgstr "Ladevorgang â€¦"
 
-#: ../libbalsa/mailbox.c:3951
+#: ../libbalsa/mailbox.c:4057
 #, c-format
 msgid "Searching %s for partial messages"
 msgstr "Durchsuchen von %s nach Teilnachrichten"
 
-#: ../libbalsa/mailbox.c:4040
+#: ../libbalsa/mailbox.c:4146
 msgid "Reconstructing message"
 msgstr "Nachricht wird wiederhergestellt"
 
-#: ../libbalsa/mailbox.c:4299
+#: ../libbalsa/mailbox.c:4405
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Finden von Nachrichtenduplikaten im Quell-Postfach ist fehlgeschlagen"
@@ -1517,38 +1621,38 @@ msgstr "*** FEHLER: Postfach-Datenstrom wurde geschlossen: %s ***\n"
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:613
+#: ../libbalsa/mailbox_imap.c:614
 msgid "IMAP connection has been severed. Reconnectingâ€¦"
 msgstr "Die IMAP-Verbindung wurde getrennt. Wiederherstellen â€¦"
 
-#: ../libbalsa/mailbox_imap.c:616
+#: ../libbalsa/mailbox_imap.c:617
 msgid "IMAP protocol error. Try enabling bug workarounds."
 msgstr "IMAP-Protokollfehler. Versuchen Sie, Bug-Workarounds zu aktivieren."
 
-#: ../libbalsa/mailbox_imap.c:619
+#: ../libbalsa/mailbox_imap.c:620
 #, c-format
 msgid "IMAP server has shut the connection: %s Reconnectingâ€¦"
 msgstr "Der IMAP-Server hat die Verbindung geschlossen: %s wiederherstellen â€¦"
 
-#: ../libbalsa/mailbox_imap.c:631
+#: ../libbalsa/mailbox_imap.c:632
 #, c-format
 msgid "Async IMAP cmd %s could not be executed. Reconnectingâ€¦"
 msgstr ""
 "Asynchroner IMAP-Befehl %s konnte nicht ausgefÃ¼hrt werden. Neuer "
 "Verbindungsaufbau â€¦"
 
-#: ../libbalsa/mailbox_imap.c:1120 ../libbalsa/mailbox_maildir.c:503
+#: ../libbalsa/mailbox_imap.c:1121 ../libbalsa/mailbox_maildir.c:503
 #: ../libbalsa/mailbox_mbox.c:754 ../libbalsa/mailbox_mh.c:539
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: %s wird geÃ¶ffnet; Ref.-ZÃ¤hler: %d\n"
 
-#: ../libbalsa/mailbox_imap.c:1207
+#: ../libbalsa/mailbox_imap.c:1208
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "%ld KB heruntergeladen"
 
-#: ../libbalsa/mailbox_imap.c:1609
+#: ../libbalsa/mailbox_imap.c:1610
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -1557,82 +1661,82 @@ msgstr ""
 "Der Befehl Â»IMAP SEARCHÂ« ist fÃ¼r das Postfach %s fehlgeschlagen\n"
 "Daher wird auf die voreingestellte Suchmethode zurÃ¼ckgegriffen."
 
-#: ../libbalsa/mailbox_imap.c:1673
+#: ../libbalsa/mailbox_imap.c:1675
 #, c-format
 msgid "No path found for mailbox â€œ%sâ€, using â€œ%sâ€"
 msgstr "FÃ¼r das Postfach Â»%sÂ« wurde kein Pfad gefunden, es wird Â»%sÂ« verwendet"
 
-#: ../libbalsa/mailbox_imap.c:1801 ../libbalsa/mailbox_imap.c:1842
+#: ../libbalsa/mailbox_imap.c:1803 ../libbalsa/mailbox_imap.c:1844
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "Das IMAP-Handle konnte nicht ermittelt werden"
 
-#: ../libbalsa/mailbox_imap.c:2447 ../libbalsa/mailbox_imap.c:2513
+#: ../libbalsa/mailbox_imap.c:2450 ../libbalsa/mailbox_imap.c:2513
 #, c-format
 msgid "Error fetching message from IMAP server: %s"
 msgstr "Fehler beim Holen der Nachricht vom IMAP-Server: %s"
 
-#: ../libbalsa/mailbox_imap.c:2481
+#: ../libbalsa/mailbox_imap.c:2485
 #, c-format
 msgid "Downloading %u kB"
 msgstr "Lade %u kB herunter"
 
-#: ../libbalsa/mailbox_imap.c:2525
+#: ../libbalsa/mailbox_imap.c:2526
 #, c-format
 msgid "Cannot create temporary file"
 msgstr "TemporÃ¤re Datei konnte nicht erstellt werden"
 
-#: ../libbalsa/mailbox_imap.c:2545
+#: ../libbalsa/mailbox_imap.c:2550
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "Es konnte nicht in die temporÃ¤re Datei %s geschrieben werden"
 
-#: ../libbalsa/mailbox_imap.c:2774 ../libbalsa/mailbox_imap.c:2893
+#: ../libbalsa/mailbox_imap.c:2779 ../libbalsa/mailbox_imap.c:2898
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "%ld KB hochgeladen"
 
-#: ../libbalsa/mailbox_imap.c:3195
+#: ../libbalsa/mailbox_imap.c:3200
 msgid "Server-side threading not supported."
 msgstr "Serverseitiges Threading wird nicht unterstÃ¼tzt."
 
-#: ../libbalsa/mailbox_local.c:571
+#: ../libbalsa/mailbox_local.c:568
 #, c-format
 msgid "Failed to save cache file â€œ%sâ€: %s."
 msgstr "Pufferdatei Â»%sÂ« konnte nicht gespeichert werden: %s."
 
-#: ../libbalsa/mailbox_local.c:605
+#: ../libbalsa/mailbox_local.c:602
 #, c-format
 msgid "Cache file for mailbox %s will be created"
 msgstr "Pufferdatei fÃ¼r Postfach %s wird erstellt"
 
-#: ../libbalsa/mailbox_local.c:614
+#: ../libbalsa/mailbox_local.c:611
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Pufferdatei  %s konnte nicht gelesen werden: %s"
 
-#: ../libbalsa/mailbox_local.c:632 ../libbalsa/mailbox_local.c:649
-#: ../libbalsa/mailbox_local.c:672
+#: ../libbalsa/mailbox_local.c:629 ../libbalsa/mailbox_local.c:646
+#: ../libbalsa/mailbox_local.c:669
 #, c-format
 msgid "Cache file for mailbox %s will be repaired"
 msgstr "Pufferdatei fÃ¼r Postfach %s wird repariert"
 
-#: ../libbalsa/mailbox_local.c:1236
+#: ../libbalsa/mailbox_local.c:1234
 #, c-format
 msgid "Filtering %s"
 msgstr "%s wird gefiltert"
 
-#: ../libbalsa/mailbox_local.c:1325
+#: ../libbalsa/mailbox_local.c:1319
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wird vorbereitet"
 
-#: ../libbalsa/mailbox_local.c:2121
+#: ../libbalsa/mailbox_local.c:2056
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Ã–ffnen von %s fehlgeschlagen. Fehlernummer = %d, "
 
-#: ../libbalsa/mailbox_local.c:2143
+#: ../libbalsa/mailbox_local.c:2077
 #, c-format
 msgid "Failed to sync mailbox â€œ%sâ€"
 msgstr "Postfach Â»%sÂ« konnte nicht abgeglichen werden"
@@ -1766,89 +1870,89 @@ msgstr "Nachricht konnte nicht erstellt werden"
 msgid "Message rename error"
 msgstr "Fehler beim Umbenennen der Nachricht"
 
-#: ../libbalsa/mailbox_pop3.c:260
+#: ../libbalsa/mailbox_pop3.c:262
 #, c-format
 msgid "Saving the POP3 message UID list failed: %s"
 msgstr "Speichern der UID-Liste der POP3-Nachricht ist fehlgeschlagen: %s"
 
-#: ../libbalsa/mailbox_pop3.c:298 ../libbalsa/mailbox_pop3.c:322
+#: ../libbalsa/mailbox_pop3.c:300 ../libbalsa/mailbox_pop3.c:324
 #, c-format
 msgid "Passing POP message to %s failed: %s"
 msgstr "Ãœbergabe der POP-Nachricht an %s ist fehlgeschlagen: %s"
 
-#: ../libbalsa/mailbox_pop3.c:327
+#: ../libbalsa/mailbox_pop3.c:329
 #, c-format
 msgid "Saving POP message failed"
 msgstr "Speichern der POP-Nachricht ist fehlgeschlagen"
 
-#: ../libbalsa/mailbox_pop3.c:346
+#: ../libbalsa/mailbox_pop3.c:348
 #, c-format
 msgid "Transferring POP message to %s failed: %s"
 msgstr "Ãœbertragung der POP-Nachricht nach %s ist fehlgeschlagen: %s"
 
-#: ../libbalsa/mailbox_pop3.c:382
+#: ../libbalsa/mailbox_pop3.c:384
 #, c-format
 msgid "Message %lu of %lu (%s of %s)"
 msgstr "Nachricht %lu von %lu (%s von %s)"
 
-#: ../libbalsa/mailbox_pop3.c:437
+#: ../libbalsa/mailbox_pop3.c:439
 #, c-format
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Fehler beim AnhÃ¤ngen der Nachricht %d aus %s an %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:495 ../libbalsa/send.c:793
+#: ../libbalsa/mailbox_pop3.c:497 ../libbalsa/send.c:797
 #, c-format
 msgid "Cannot load certificate file %s: %s"
 msgstr "Zertifikatdatei %s konnte nicht geladen werden: %s"
 
 #. connect server
-#: ../libbalsa/mailbox_pop3.c:508 ../libbalsa/send.c:1005
+#: ../libbalsa/mailbox_pop3.c:514 ../libbalsa/send.c:1009
 #, c-format
 msgid "Connecting %sâ€¦"
 msgstr "Verbindung mit %s wird aufgebaut â€¦"
 
-#: ../libbalsa/mailbox_pop3.c:510
+#: ../libbalsa/mailbox_pop3.c:516
 #, c-format
 msgid "POP3 mailbox %s: cannot connect %s: %s"
 msgstr "POP3-Postfach %s: %s kann nicht verbunden werden: %s"
 
 #. load message list
-#: ../libbalsa/mailbox_pop3.c:519
+#: ../libbalsa/mailbox_pop3.c:529
 msgid "List messagesâ€¦"
 msgstr "Nachrichten auflisten â€¦"
 
-#: ../libbalsa/mailbox_pop3.c:521
+#: ../libbalsa/mailbox_pop3.c:531
 #, c-format
 msgid "POP3 mailbox %s error: %s"
 msgstr "Fehler im POP3-Postfach %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:566
+#: ../libbalsa/mailbox_pop3.c:576
 #, c-format
 msgid "POP3 message %d oversized: %s â€” skipped."
 msgstr "POP3-Nachricht %d ist zu groÃŸ: %s â€“ Ã¼bersprungen."
 
-#: ../libbalsa/mailbox_pop3.c:640 ../libbalsa/send.c:1015
+#: ../libbalsa/mailbox_pop3.c:650 ../libbalsa/send.c:1019
 #, c-format
 msgid "Connected to %s"
 msgstr "Verbunden mit %s"
 
-#: ../libbalsa/mailbox_pop3.c:655
+#: ../libbalsa/mailbox_pop3.c:665
 #, c-format
 msgid "%lu new message (%s)"
 msgid_plural "%lu new messages (%s)"
 msgstr[0] "%lu neue Nachricht (%s)"
 msgstr[1] "%lu neue Nachrichten (%s)"
 
-#: ../libbalsa/mailbox_pop3.c:666
+#: ../libbalsa/mailbox_pop3.c:676
 msgid "Deleting messages on serverâ€¦"
 msgstr "Nachrichten werden auf dem Server gelÃ¶scht â€¦"
 
-#: ../libbalsa/mailbox_pop3.c:689
+#: ../libbalsa/mailbox_pop3.c:699
 #, c-format
 msgid "POP3 error: %s"
 msgstr "POP3-Fehler: %s"
 
-#: ../libbalsa/mailbox_pop3.c:699 ../libbalsa/send.c:1084
+#: ../libbalsa/mailbox_pop3.c:709 ../libbalsa/send.c:1092
 msgid "Finished"
 msgstr "Abgeschlossen"
 
@@ -1964,11 +2068,6 @@ msgstr "Warten auf flock-Versuch â€¦ %d"
 msgid "LDAP Directory for %s"
 msgstr "LDAP-Verzeichnis fÃ¼r %s"
 
-#: ../libbalsa/rfc2445.c:88 ../libbalsa/rfc2445.c:711 ../libbalsa/rfc2445.c:730
-#: ../libbalsa/rfc3156.c:689
-msgid "unknown"
-msgstr "unbekannt"
-
 #: ../libbalsa/rfc2445.c:89
 msgid "needs action"
 msgstr "Aktion erforderlich"
@@ -2170,22 +2269,22 @@ msgstr ""
 "SMTP-Server %s kann nicht erreicht werden (%s), alle Nachrichten in der "
 "Warteschlange verbleiben in %s."
 
-#: ../libbalsa/send.c:846
+#: ../libbalsa/send.c:850
 msgid "Sending Mail"
 msgstr "Nachrichten werden verschickt"
 
-#: ../libbalsa/send.c:951
+#: ../libbalsa/send.c:955
 #, c-format
 msgid "Save message in %sâ€¦"
 msgstr "Nachricht speichern in %s â€¦"
 
-#: ../libbalsa/send.c:958
+#: ../libbalsa/send.c:962
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Speichern der gesendeten Nachricht in %s ist fehlgeschlagen: %s"
 
 # CHECK
-#: ../libbalsa/send.c:989
+#: ../libbalsa/send.c:993
 #, c-format
 msgid ""
 "Sending message failed: %s\n"
@@ -2194,29 +2293,29 @@ msgstr ""
 "Senden der Nachricht ist fehlgeschlagen: %s\n"
 "Die Nachricht verbleibt daher in Ihrem Postausgang."
 
-#: ../libbalsa/send.c:1068
+#: ../libbalsa/send.c:1076
 #, c-format
 msgid "Connecting SMTP server %s (%s) failed: %s"
 msgstr "Verbinden mit dem SMTP-Server %s (%s) ist fehlgeschlagen: %s"
 
-#: ../libbalsa/send.c:1087
+#: ../libbalsa/send.c:1095
 #, c-format
 msgid "Transmitted %u message to %s"
 msgid_plural "Transmitted %u messages to %s"
 msgstr[0] "%u Nachricht wurde zu %s Ã¼bertragen"
 msgstr[1] "%u Nachrichten wurden zu %s Ã¼bertragen"
 
-#: ../libbalsa/send.c:1267 ../libbalsa/send.c:1333
+#: ../libbalsa/send.c:1275 ../libbalsa/send.c:1342
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "Â»%sÂ« ist nicht lesbar: %s"
 
-#: ../libbalsa/send.c:1270 ../libbalsa/send.c:1336
+#: ../libbalsa/send.c:1278 ../libbalsa/send.c:1345
 #, c-format
 msgid "Cannot read %s"
 msgstr "Â»%sÂ« ist nicht lesbar"
 
-#: ../libbalsa/send.c:1300
+#: ../libbalsa/send.c:1309
 #, c-format
 msgid ""
 "Cannot determine character set for text file â€œ%sâ€; sending as MIME type â€œ%sâ€"
@@ -2224,7 +2323,7 @@ msgstr ""
 "Der Zeichensatz fÃ¼r die Textdatei Â»%sÂ« konnte nicht ermittelt werden, sie "
 "wird als MIME-Typ Â»%sÂ« gesendet"
 
-#: ../libbalsa/send.c:1804
+#: ../libbalsa/send.c:1829 ../libbalsa/send.c:1924
 msgid "This message will not be encrypted for the BCC: recipient."
 msgid_plural "This message will not be encrypted for the BCC: recipients."
 msgstr[0] ""
@@ -2232,123 +2331,137 @@ msgstr[0] ""
 msgstr[1] ""
 "Diese Nachricht wird fÃ¼r die EmpfÃ¤nger einer Blindkopie nicht verschlÃ¼sselt."
 
-#: ../libbalsa/send.c:1899
-msgid "This message will not be encrypted for the BCC: recipient(s)."
-msgstr ""
-"Diese Nachricht wird fÃ¼r die EmpfÃ¤nger einer Blindkopie nicht verschlÃ¼sselt."
+#: ../libbalsa/server.c:347
+msgid "Balsa passwords"
+msgstr "Balsa-PasswÃ¶rter"
 
-#: ../libbalsa/smtp-server.c:294
-msgid "SMTP over SSL (SMTPS)"
-msgstr "SMTP Ã¼ber SSL (SMTPS)"
+#: ../libbalsa/server.c:353
+#, c-format
+msgid "Error storing password for %s@%s:%s: %s"
+msgstr "Fehler beim Speichern des Passworts fÃ¼r %s@%s:%s: %s"
 
-#: ../libbalsa/smtp-server.c:295 ../libinit_balsa/assistant_page_user.c:69
-#: ../src/folder-conf.c:418 ../src/mailbox-conf.c:1205
-msgid "TLS required"
-msgstr "TLS erforderlich"
+#: ../libbalsa/server.c:374
+#, c-format
+msgid "Error looking up password for %s@%s:%s: %s"
+msgstr "Fehler beim Nachschlagen des Passworts fÃ¼r %s@%s:%s: %s"
 
-#: ../libbalsa/smtp-server.c:296 ../libinit_balsa/assistant_page_user.c:70
-#: ../src/folder-conf.c:419 ../src/mailbox-conf.c:1206
-msgid "TLS if possible (not recommended)"
-msgstr "TLS, wenn mÃ¶glich (nicht empfohlen)"
+#: ../libbalsa/server.c:380
+msgid "loaded fallback password from private config file"
+msgstr "Ausweichpasswort wurde aus privater Konfigurationsdatei geladen"
 
-#: ../libbalsa/smtp-server.c:297 ../libinit_balsa/assistant_page_user.c:71
-#: ../src/folder-conf.c:420 ../src/mailbox-conf.c:1207
-msgid "None (not recommended)"
-msgstr "Keine (nicht empfohlen)"
+#: ../libbalsa/server-config.c:75
+msgid "_Remember user password in Secret Service"
+msgstr "Passwo_rt im Secret Service speichern"
 
-#: ../libbalsa/smtp-server.c:328
-#, c-format
-msgid "Error displaying server help: %s\n"
-msgstr "Fehler beim Anzeigen der Hilfe: %s\n"
+#: ../libbalsa/server-config.c:76
+msgid "_Remember certificate pass phrase in Secret Service"
+msgstr "Kennwo_rt des Zertifikats im Secret Service speichern"
 
-#: ../libbalsa/smtp-server.c:463
-msgid "SMTP Server"
-msgstr "SMTP-Server"
+#: ../libbalsa/server-config.c:80
+msgid "_Remember user password"
+msgstr "An Passwort _erinnern"
 
-#: ../libbalsa/smtp-server.c:493 ../src/folder-conf.c:359
-#: ../src/mailbox-conf.c:1225 ../src/mailbox-conf.c:1325
+#: ../libbalsa/server-config.c:81
+msgid "_Remember certificate pass phrase"
+msgstr "An Kennwo_rt des Zertifikats erinnern"
+
+#: ../libbalsa/server-config.c:103
 msgid "_Basic"
 msgstr "_Einfach"
 
-#: ../libbalsa/smtp-server.c:498
+#. server descriptive name
+#: ../libbalsa/server-config.c:106
 msgid "_Descriptive Name:"
 msgstr "_Beschreibender Name:"
 
-#. pop server
-#. imap server
-#: ../libbalsa/smtp-server.c:506 ../src/folder-conf.c:407
-#: ../src/mailbox-conf.c:1232 ../src/mailbox-conf.c:1334
+#. host and port
+#: ../libbalsa/server-config.c:110
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libbalsa/smtp-server.c:514 ../src/folder-conf.c:414
-#: ../src/mailbox-conf.c:1197
+#: ../libbalsa/server-config.c:115
 msgid "Se_curity:"
 msgstr "Si_cherheit:"
 
-#. authentication or anonymous access
-#: ../libbalsa/smtp-server.c:518
-msgid "Server requires authentication"
-msgstr "Server erfordert Legitimierung"
-
-#: ../libbalsa/smtp-server.c:519
-msgid "_Authentication:"
-msgstr "_Legitimierung:"
+#: ../libbalsa/server-config.c:120
+msgid "Server requires _authentication"
+msgstr "Server erfordert _Legitimierung"
 
-#: ../libbalsa/smtp-server.c:525
+#. user name and password
+#: ../libbalsa/server-config.c:125
 msgid "_User Name:"
 msgstr "_Benutzername:"
 
-#: ../libbalsa/smtp-server.c:532
+#: ../libbalsa/server-config.c:128
 msgid "_Pass Phrase:"
 msgstr "_Kennwort:"
 
-#: ../libbalsa/smtp-server.c:545 ../src/folder-conf.c:397
-#: ../src/mailbox-conf.c:1266 ../src/mailbox-conf.c:1391
+#: ../libbalsa/server-config.c:140
 msgid "_Advanced"
 msgstr "_Fortgeschritten"
 
 #. client certificate and passphrase
-#. client certificate configuration
-#: ../libbalsa/smtp-server.c:548 ../src/mailbox-conf.c:197
-msgid "Server requires client certificate"
-msgstr "Server benÃ¶tigt ein Client-Zertifikat"
+#: ../libbalsa/server-config.c:143
+msgid "Server _requires client certificate"
+msgstr "Se_rver benÃ¶tigt ein Client-Zertifikat"
 
-#: ../libbalsa/smtp-server.c:549
-msgid "_Client Certificate:"
-msgstr "_Client-Zertifikat:"
-
-#: ../libbalsa/smtp-server.c:553 ../src/mailbox-conf.c:200
+#: ../libbalsa/server-config.c:146
 msgid "Choose Client Certificate"
 msgstr "Client-Zertifikat wÃ¤hlen"
 
-#: ../libbalsa/smtp-server.c:555 ../src/mailbox-conf.c:199
+#: ../libbalsa/server-config.c:147
 msgid "Certificate _File:"
 msgstr "Zertifikat_datei:"
 
-#: ../libbalsa/smtp-server.c:562 ../src/mailbox-conf.c:205
+#: ../libbalsa/server-config.c:153
 msgid "Certificate _Pass Phrase:"
 msgstr "Kennwort des Z_ertifikats:"
 
+#: ../libbalsa/server-config.c:369
+#, c-format
+msgid "%s over SSL (%sS)"
+msgstr "%s Ã¼ber SSL (%sS)"
+
+#: ../libbalsa/server-config.c:373 ../libinit_balsa/assistant_page_user.c:69
+msgid "TLS required"
+msgstr "TLS erforderlich"
+
+#: ../libbalsa/server-config.c:374 ../libinit_balsa/assistant_page_user.c:70
+msgid "TLS if possible (not recommended)"
+msgstr "TLS, wenn mÃ¶glich (nicht empfohlen)"
+
+#: ../libbalsa/server-config.c:375 ../libinit_balsa/assistant_page_user.c:71
+msgid "None (not recommended)"
+msgstr "Keine (nicht empfohlen)"
+
+#: ../libbalsa/smtp-server.c:295
+#, c-format
+msgid "Error displaying server help: %s\n"
+msgstr "Fehler beim Anzeigen der Hilfe: %s\n"
+
+#: ../libbalsa/smtp-server.c:371
+msgid "SMTP Server"
+msgstr "SMTP-Server"
+
 #. split large messages
-#: ../libbalsa/smtp-server.c:571
+#: ../libbalsa/smtp-server.c:397
 msgid "Sp_lit message larger than"
 msgstr "Nachrichten a_ufteilen die grÃ¶ÃŸer sind als"
 
-#: ../libbalsa/smtp-server.c:576 ../src/pref-manager.c:2186
+#: ../libbalsa/smtp-server.c:401 ../src/pref-manager.c:2197
 msgid "MB"
 msgstr "MB"
 
-#: ../libbalsa/source-viewer.c:128
+#: ../libbalsa/source-viewer.c:127
 msgid "Mailbox closed"
 msgstr "Postfach geschlossen"
 
-#: ../libbalsa/source-viewer.c:238
+#: ../libbalsa/source-viewer.c:216
 msgid "Message Source"
 msgstr "Quelltext der Nachricht"
 
-#: ../libbalsa/source-viewer.c:248 ../src/main-window.c:2071
-#: ../src/message-window.c:842
+#: ../libbalsa/source-viewer.c:226 ../src/main-window.c:2017
+#: ../src/message-window.c:824
 #, c-format
 msgid "Error adding from %s: %s\n"
 msgstr "Fehler beim HinzufÃ¼gen von %s: %s\n"
@@ -2363,8 +2476,7 @@ msgstr ""
 #: ../libinit_balsa/assistant_helper.c:189
 #, c-format
 msgid ""
-"Couldnâ€™t create a directory: mkdir() failed on pathname â€œ%sâ€, with error "
-"â€œ%sâ€."
+"Couldnâ€™t create a directory: mkdir() failed on pathname â€œ%sâ€, with error â€œ%sâ€."
 msgstr ""
 "Ordner konnte nicht angelegt werden: mkdir() ist mit dem Pfadnamen Â»%sÂ« "
 "fehlgeschlagen, Fehlermeldung war Â»%sÂ«."
@@ -2470,8 +2582,8 @@ msgstr "Orte Ã¼ber_prÃ¼fen"
 
 #: ../libinit_balsa/assistant_page_directory.c:258
 msgid ""
-"Please verify the locations of your default mail files. These will be "
-"created if necessary."
+"Please verify the locations of your default mail files. These will be created "
+"if necessary."
 msgstr ""
 "Bitte Ã¼berprÃ¼fen Sie die Orte Ihrer Standard-Maildateien. Diese werden "
 "angelegt, falls nÃ¶tig."
@@ -2495,18 +2607,17 @@ msgstr "Fertig!"
 #: ../libinit_balsa/assistant_page_user.c:55
 msgid ""
 "The following settings are also needed (and you can find them later, if need "
-"be, in the Email application in the â€œPreferencesâ€ and â€œIdentitiesâ€ menu "
-"items)"
+"be, in the Email application in the â€œPreferencesâ€ and â€œIdentitiesâ€ menu items)"
 msgstr ""
 "Die folgenden Einstellungen sind ebenfalls erforderlich. Sie finden diese "
-"falls notwendig spÃ¤ter in Balsa im MenÃ¼ Â»WerkzeugeÂ« unter Â»EinstellungenÂ« "
-"und Â»IdentitÃ¤tenÂ«."
+"falls notwendig spÃ¤ter in Balsa im MenÃ¼ Â»WerkzeugeÂ« unter Â»EinstellungenÂ« und "
+"Â»IdentitÃ¤tenÂ«."
 
 #: ../libinit_balsa/assistant_page_user.c:61
 msgid ""
-" Whoever provides your email account should be able to give you the "
-"following information (if you have a Network Administrator, they may already "
-"have set this up for you):"
+" Whoever provides your email account should be able to give you the following "
+"information (if you have a Network Administrator, they may already have set "
+"this up for you):"
 msgstr ""
 "Die folgenden Informationen erhalten Sie von Ihrem E-Mail-Dienstleister. "
 "Falls Sie Zugang zu einem Netzwerkadministrator haben, sollte auch dieser "
@@ -2648,100 +2759,105 @@ msgstr "Fehler beim Laden des Zertifikats: %s"
 msgid "error initializing key: %s"
 msgstr "Fehler beim Initialisieren des SchlÃ¼ssels: %s"
 
-#: ../libnetclient/net-client.c:448
+#: ../libnetclient/net-client.c:453
 #, c-format
 msgid "error loading key: %s"
 msgstr "Fehler beim Laden des SchlÃ¼ssels: %s"
 
-#: ../libnetclient/net-client.c:488 ../libnetclient/net-client.c:525
+#: ../libnetclient/net-client.c:493 ../libnetclient/net-client.c:530
 #, c-format
 msgid "not connected"
 msgstr "Nicht verbunden"
 
-#: ../libnetclient/net-client.c:490
+#: ../libnetclient/net-client.c:495
 #, c-format
 msgid "connection is already encrypted"
 msgstr "Verbindung ist bereits verschlÃ¼sselt"
 
-#: ../libnetclient/net-client.c:527
+#: ../libnetclient/net-client.c:532
 #, c-format
 msgid "connection is already compressed"
 msgstr "Verbindung ist bereits komprimiert"
 
 #. unexpected server reply
-#: ../libnetclient/net-client-pop.c:212 ../libnetclient/net-client-pop.c:428
-#: ../libnetclient/net-client-smtp.c:581 ../libnetclient/net-client-smtp.c:652
-#: ../libnetclient/net-client-smtp.c:694
+#: ../libnetclient/net-client-pop.c:226 ../libnetclient/net-client-pop.c:442
+#: ../libnetclient/net-client-smtp.c:597 ../libnetclient/net-client-smtp.c:668
+#: ../libnetclient/net-client-smtp.c:715
 #, c-format
 msgid "bad server reply: %s"
 msgstr "UngÃ¼ltige Antwort vom Server: %s"
 
-#: ../libnetclient/net-client-pop.c:251
+#: ../libnetclient/net-client-pop.c:265
 #, c-format
 msgid "bad server reply"
 msgstr "UngÃ¼ltige Antwort vom Server"
 
-#: ../libnetclient/net-client-pop.c:420 ../libnetclient/net-client-pop.c:693
+#: ../libnetclient/net-client-pop.c:434 ../libnetclient/net-client-pop.c:715
 #, c-format
 msgid "error: %s"
 msgstr "Fehler: %s"
 
-#: ../libnetclient/net-client-pop.c:423
+#: ../libnetclient/net-client-pop.c:437
 #, c-format
 msgid "error"
 msgstr "Fehler"
 
-#: ../libnetclient/net-client-pop.c:486 ../libnetclient/net-client-smtp.c:395
-#, c-format
-msgid "password required"
-msgstr "Passwort erforderlich"
-
-#: ../libnetclient/net-client-pop.c:505 ../libnetclient/net-client-smtp.c:410
+#: ../libnetclient/net-client-pop.c:501 ../libnetclient/net-client-smtp.c:410
 #, c-format
 msgid "no suitable authentication mechanism"
 msgstr "Kein nutzbarer Legitimierungsmechanismus"
 
+#: ../libnetclient/net-client-pop.c:503 ../libnetclient/net-client-smtp.c:412
+#, c-format
+msgid "password required"
+msgstr "Passwort erforderlich"
+
 #: ../libnetclient/net-client-smtp.c:142
 #, c-format
 msgid "remote server does not support STARTTLS"
 msgstr "Der entfernte Server unterstÃ¼tzt STARTTLS nicht"
 
-#: ../libnetclient/net-client-smtp.c:684
+#: ../libnetclient/net-client-smtp.c:700
 #, c-format
 msgid "transient error %d: %s"
 msgstr "TemporÃ¤rer Fehler %d: %s"
 
-#: ../libnetclient/net-client-smtp.c:689
+#: ../libnetclient/net-client-smtp.c:706
+#, c-format
+msgid "authentication failure %d: %s"
+msgstr "Legitimierungsfehler %d: %s"
+
+#: ../libnetclient/net-client-smtp.c:709
 #, c-format
 msgid "permanent error %d: %s"
 msgstr "Dauerhafter Fehler %d: %s"
 
-#: ../libnetclient/net-client-utils.c:154
+#: ../libnetclient/net-client-utils.c:155
 #, c-format
 msgid "importing GSS service name %s failed: %s"
 msgstr "Importieren des GSS-Dienstnamens %s fehlgeschlagen: %s"
 
-#: ../libnetclient/net-client-utils.c:197
+#: ../libnetclient/net-client-utils.c:199
 #, c-format
 msgid "cannot initialize GSS security context: %s"
 msgstr "SSL-Sicherheitskontext kann nicht initialisiert werden: %s"
 
-#: ../libnetclient/net-client-utils.c:236
+#: ../libnetclient/net-client-utils.c:239
 #, c-format
 msgid "malformed GSS security token: %s"
 msgstr "BeschÃ¤digter GSS-Sicherheitstoken: %s"
 
-#: ../libnetclient/net-client-utils.c:245
+#: ../libnetclient/net-client-utils.c:248
 #, c-format
 msgid "malformed GSS security token"
 msgstr "BeschÃ¤digter GSS-Sicherheitstoken"
 
-#: ../libnetclient/net-client-utils.c:261
+#: ../libnetclient/net-client-utils.c:265
 #, c-format
 msgid "cannot create GSS login request: %s"
 msgstr "GSS-Anmeldeanfrage konnte nicht erstellt werden: %s"
 
-#: ../libnetclient/net-client-utils.c:326
+#: ../libnetclient/net-client-utils.c:330
 #, c-format
 msgid "unknown error code %u:%u"
 msgstr "Unbekannter Fehlercode %u:%u"
@@ -2770,10 +2886,10 @@ msgstr "_Name"
 msgid "_Address"
 msgstr "_Adresse"
 
-#: ../src/ab-main.c:844 ../src/address-book-config.c:226
-#: ../src/address-book-config.c:331 ../src/address-book-config.c:375
-#: ../src/filter-edit-dialog.c:500 ../src/main-window.c:3803
-#: ../src/pref-manager.c:3283
+#: ../src/ab-main.c:844 ../src/address-book-config.c:227
+#: ../src/address-book-config.c:332 ../src/address-book-config.c:376
+#: ../src/filter-edit-dialog.c:500 ../src/main-window.c:3745
+#: ../src/pref-manager.c:3290
 msgid "_Apply"
 msgstr "_Anwenden"
 
@@ -2790,7 +2906,7 @@ msgid "Edit"
 msgstr "Bearbeiten"
 
 #: ../src/ab-window.c:185 ../src/filter-edit-dialog.c:207
-#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:229
+#: ../src/filter-export-dialog.c:91 ../src/filter-run-dialog.c:229
 #: ../src/filter-run-dialog.c:334
 msgid "Name"
 msgstr "Name"
@@ -2846,306 +2962,307 @@ msgstr ""
 "Fehler beim Ã–ffnen des Adressbuchs Â»%sÂ«:\n"
 "%s"
 
-#: ../src/address-book-config.c:177
+#: ../src/address-book-config.c:178
 msgid "Suggest complete addresses:"
 msgstr "AdressenvervollstÃ¤ndigung aktivieren:"
 
-#: ../src/address-book-config.c:182
+#: ../src/address-book-config.c:183
 msgid "as I type"
 msgstr "wÃ¤hrend der Eingabe"
 
-#: ../src/address-book-config.c:190
+#: ../src/address-book-config.c:191
 msgid "when I hit the Escape key"
 msgstr "beim DrÃ¼cken der Esc-Taste"
 
-#: ../src/address-book-config.c:225 ../src/address-book-config.c:330
+#: ../src/address-book-config.c:226 ../src/address-book-config.c:331
 #, c-format
 msgid "Modify %s Address Book"
 msgstr "Adressbuch %s bearbeiten"
 
-#: ../src/address-book-config.c:229 ../src/address-book-config.c:333
+#: ../src/address-book-config.c:230 ../src/address-book-config.c:334
 #, c-format
 msgid "Add %s Address Book"
 msgstr "Adressbuch %s hinzufÃ¼gen"
 
-#: ../src/address-book-config.c:230 ../src/address-book-config.c:334
-#: ../src/address-book-config.c:379 ../src/mailbox-conf.c:532
-#: ../src/pref-manager.c:2014 ../src/pref-manager.c:2097
-#: ../src/pref-manager.c:2782
+#: ../src/address-book-config.c:231 ../src/address-book-config.c:335
+#: ../src/address-book-config.c:380 ../src/mailbox-conf.c:366
+#: ../src/pref-manager.c:2025 ../src/pref-manager.c:2108
+#: ../src/pref-manager.c:2788
 msgid "_Add"
 msgstr "_HinzufÃ¼gen"
 
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:249 ../src/address-book-config.c:400
-#: ../src/address-book-config.c:426 ../src/address-book-config.c:492
-#: ../src/address-book-config.c:559
+#: ../src/address-book-config.c:250 ../src/address-book-config.c:401
+#: ../src/address-book-config.c:427 ../src/address-book-config.c:493
+#: ../src/address-book-config.c:560
 msgid "A_ddress Book Name:"
 msgstr "Name des A_dressbuchs:"
 
-#: ../src/address-book-config.c:374
+#: ../src/address-book-config.c:375
 #, c-format
 msgid "Modify Osmo Address Book"
 msgstr "Osmo-Adressbuch bearbeiten"
 
-#: ../src/address-book-config.c:378
+#: ../src/address-book-config.c:379
 #, c-format
 msgid "Add Osmo Address Book"
 msgstr "Osmo-Adressbuch hinzufÃ¼gen"
 
-#: ../src/address-book-config.c:431
+#: ../src/address-book-config.c:432
 msgid "Load program location:"
 msgstr "Ort des Programms laden:"
 
-#: ../src/address-book-config.c:436
+#: ../src/address-book-config.c:437
 msgid "Select load program for address book"
 msgstr "Programm zum Laden des Adressbuchs auswÃ¤hlen"
 
-#: ../src/address-book-config.c:444
+#: ../src/address-book-config.c:445
 msgid "Save program location:"
 msgstr "Ort des Programms speichern:"
 
-#: ../src/address-book-config.c:449
+#: ../src/address-book-config.c:450
 msgid "Select save program for address book"
 msgstr "Programm zum Speichern des Adressbuchs auswÃ¤hlen"
 
-#: ../src/address-book-config.c:497
+#: ../src/address-book-config.c:498
 msgid "_Host Name"
 msgstr "Rec_hnername"
 
-#: ../src/address-book-config.c:502
+#: ../src/address-book-config.c:503
 msgid "Base Domain _Name"
 msgstr "_Name der BasisdomÃ¤ne"
 
-#: ../src/address-book-config.c:507
+#: ../src/address-book-config.c:508
 msgid "_User Name (Bind DN)"
 msgstr "_Benutzername (Bind-DN)"
 
-#: ../src/address-book-config.c:512
+#: ../src/address-book-config.c:513
 msgid "_Password"
 msgstr "_Passwort"
 
-#: ../src/address-book-config.c:518
+#: ../src/address-book-config.c:519
 msgid "_User Address Book DN"
 msgstr "_Benutzerdressbuch-DN"
 
-#: ../src/address-book-config.c:524
+#: ../src/address-book-config.c:525
 msgid "Enable _TLS"
 msgstr "_TLS aktivieren"
 
-#: ../src/address-book-config.c:561 ../src/address-book-config.c:961
+#: ../src/address-book-config.c:562 ../src/address-book-config.c:962
 msgid "GPE Address Book"
 msgstr "GPE-Adressbuch"
 
-#: ../src/address-book-config.c:601 ../src/main-window.c:953
-#: ../src/main-window.c:3916
+#: ../src/address-book-config.c:602 ../src/main-window.c:928
+#: ../src/main-window.c:3858
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Fehler beim Anzeigen der Hilfe: %s\n"
 
-#: ../src/address-book-config.c:678
+#: ../src/address-book-config.c:679
 msgid "No path found. Do you want to give one?"
 msgstr "Es wurde kein Pfad gefunden. MÃ¶chten Sie einen angeben?"
 
-#: ../src/address-book-config.c:937
+#: ../src/address-book-config.c:938
 msgid "vCard Address Book (GnomeCard)"
 msgstr "vCard-Adressbuch (GnomeCard)"
 
-#: ../src/address-book-config.c:943
+#: ../src/address-book-config.c:944
 msgid "External query (a program)"
 msgstr "Externe Anfrage (ein Programm)"
 
-#: ../src/address-book-config.c:948
+#: ../src/address-book-config.c:949
 msgid "LDIF Address Book"
 msgstr "LDIF-Adressbuch"
 
-#: ../src/address-book-config.c:954
+#: ../src/address-book-config.c:955
 msgid "LDAP Address Book"
 msgstr "LDAP-Adressbuch"
 
-#: ../src/address-book-config.c:968
+#: ../src/address-book-config.c:969
 msgid "Rubrica2 Address Book"
 msgstr "Rubrica2-Adressbuch"
 
-#: ../src/address-book-config.c:975
+#: ../src/address-book-config.c:976
 msgid "Osmo Address Book"
 msgstr "Osmo-Adressbuch"
 
-#: ../src/balsa-app.c:64 ../src/folder-conf.c:307 ../src/mailbox-conf.c:1315
+#: ../src/balsa-app.c:60 ../src/balsa-app.c:130
 msgid "_Remember password in Secret Service"
 msgstr "Passwo_rt im SchlÃ¼sselbund speichern"
 
-#: ../src/balsa-app.c:67 ../src/folder-conf.c:310 ../src/mailbox-conf.c:1318
+#: ../src/balsa-app.c:63 ../src/balsa-app.c:133
 msgid "_Remember password"
 msgstr "An Passwort _erinnern"
 
-#: ../src/balsa-app.c:73
+#: ../src/balsa-app.c:73 ../src/balsa-app.c:138
 #, c-format
 msgid ""
-"Opening remote mailbox %s.\n"
-"The _password for %s@%s:"
+"Password to unlock the user certificate\n"
+"%s\n"
+"for %s@%s (%s)"
 msgstr ""
-"Entferntes Postfach %s wird geÃ¶ffnet.\n"
-"Das _Passwort fÃ¼r %s@%s:"
+"Password zum Entsperren des Benutzerzertifikats\n"
+"%s\n"
+"fÃ¼r %s@%s (%s)"
 
-#: ../src/balsa-app.c:78
+#: ../src/balsa-app.c:77 ../src/balsa-app.c:142
 #, c-format
-msgid "_Password for %s@%s (%s):"
-msgstr "_Passwort fÃ¼r %s@%s (%s):"
+msgid "Password for %s@%s (%s)"
+msgstr "Passwort fÃ¼r %s@%s (%s)"
 
-#: ../src/balsa-app.c:81
+#: ../src/balsa-app.c:82 ../src/balsa-app.c:84 ../src/balsa-app.c:146
 msgid "Password needed"
 msgstr "Passwort benÃ¶tigt"
 
-#: ../src/balsa-app.c:519
+#: ../src/balsa-app.c:166
+msgid "Password:"
+msgstr "Passwort:"
+
+#: ../src/balsa-app.c:532
 #, c-format
 msgid "Couldnâ€™t open mailbox â€œ%sâ€"
 msgstr "Postfach Â»%sÂ« konnte nicht geÃ¶ffnet werden"
 
-#: ../src/balsa-index.c:382 ../src/pref-manager.c:220
+#: ../src/balsa-index.c:382 ../src/pref-manager.c:219
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/balsa-index.c:397 ../src/pref-manager.c:221
-#: ../src/sendmsg-window.c:2695
+#: ../src/balsa-index.c:397 ../src/pref-manager.c:220
+#: ../src/sendmsg-window.c:2681
 msgid "Size"
 msgstr "GrÃ¶ÃŸe"
 
-#: ../src/balsa-index.c:1565
+#: ../src/balsa-index.c:1563
 #, c-format
 msgid "Reply to Group: %d message is not from a mailing list."
 msgid_plural "Reply to Group: %d messages are not from a mailing list."
-msgstr[0] ""
-"Antwort an Gruppe: %d Nachricht stammt nicht von einer Mailingliste."
+msgstr[0] "Antwort an Gruppe: %d Nachricht stammt nicht von einer Mailingliste."
 msgstr[1] ""
 "Antwort an Gruppe: %d Nachrichten stammen nicht von einer Mailingliste."
 
-#: ../src/balsa-index.c:1666
+#: ../src/balsa-index.c:1664
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Verschieben in den Papierkorb ist fehlgeschlagen: %s"
 
-#: ../src/balsa-index.c:1824 ../ui/main-window.ui.h:75
+#: ../src/balsa-index.c:1822 ../ui/main-window.ui.h:68
 #: ../ui/message-window.ui.h:21
 msgid "_Replyâ€¦"
 msgstr "Antwo_rten â€¦"
 
-#: ../src/balsa-index.c:1826
+#: ../src/balsa-index.c:1824
 msgid "Reply To _Allâ€¦"
 msgstr "Antwort an a_lle â€¦"
 
-#: ../src/balsa-index.c:1828
+#: ../src/balsa-index.c:1826
 msgid "Reply To _Groupâ€¦"
 msgstr "Antwort an _Gruppe â€¦"
 
-#: ../src/balsa-index.c:1830 ../ui/main-window.ui.h:78
+#: ../src/balsa-index.c:1828 ../ui/main-window.ui.h:71
 #: ../ui/message-window.ui.h:24
 msgid "_Forward Attachedâ€¦"
 msgstr "Als A_nlage weiterleiten â€¦"
 
-#: ../src/balsa-index.c:1832 ../ui/main-window.ui.h:79
+#: ../src/balsa-index.c:1830 ../ui/main-window.ui.h:72
 #: ../ui/message-window.ui.h:25
 msgid "Forward _Inlineâ€¦"
 msgstr "E_ingebettet weiterleiten â€¦"
 
-#: ../src/balsa-index.c:1834 ../ui/main-window.ui.h:80
+#: ../src/balsa-index.c:1832 ../ui/main-window.ui.h:73
 msgid "_Pipe throughâ€¦"
 msgstr "_Leiten durch â€¦"
 
-#: ../src/balsa-index.c:1836 ../ui/main-window.ui.h:89
+#: ../src/balsa-index.c:1834 ../ui/main-window.ui.h:82
 msgid "_Store Addressâ€¦"
 msgstr "Adresse _speichern â€¦"
 
-#: ../src/balsa-index.c:1850 ../src/mailbox-node.c:1108
-#: ../src/mailbox-node.c:1124 ../src/pref-manager.c:2019
-#: ../src/pref-manager.c:2104 ../src/pref-manager.c:2789 ../ui/ab-main.ui.h:11
-#: ../ui/main-window.ui.h:69
+#: ../src/balsa-index.c:1848 ../src/mailbox-node.c:1093
+#: ../src/mailbox-node.c:1109 ../src/pref-manager.c:2030
+#: ../src/pref-manager.c:2115 ../src/pref-manager.c:2795 ../ui/ab-main.ui.h:11
+#: ../ui/main-window.ui.h:61
 msgid "_Delete"
 msgstr "_LÃ¶schen"
 
-#: ../src/balsa-index.c:1854
+#: ../src/balsa-index.c:1852
 msgid "_Undelete"
 msgstr "_Wiederherstellen"
 
-#: ../src/balsa-index.c:1858
+#: ../src/balsa-index.c:1856
 msgid "Move To _Trash"
 msgstr "In den _Papierkorb verschieben"
 
-#: ../src/balsa-index.c:1862
+#: ../src/balsa-index.c:1860
 msgid "T_oggle"
 msgstr "_Markieren"
 
-#: ../src/balsa-index.c:1865 ../ui/main-window.ui.h:63
+#: ../src/balsa-index.c:1863 ../ui/main-window.ui.h:55
 msgid "_Flagged"
 msgstr "_Markiert"
 
-#: ../src/balsa-index.c:1868
+#: ../src/balsa-index.c:1866
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../src/balsa-index.c:1876
+#: ../src/balsa-index.c:1874
 msgid "_Move to"
 msgstr "_Verschieben nach"
 
-#: ../src/balsa-index.c:1883
+#: ../src/balsa-index.c:1881
 msgid "_View Source"
 msgstr "_Quelltext anzeigen"
 
-#: ../src/balsa-index.c:2129
+#: ../src/balsa-index.c:2140
 #, c-format
 msgid "Failed to copy %d message to mailbox â€œ%sâ€: %s"
 msgid_plural "Failed to copy %d messages to mailbox â€œ%sâ€: %s"
 msgstr[0] "Kopieren von %d Nachricht in Postfach Â»%sÂ« ist fehlgeschlagen: %s"
 msgstr[1] "Kopieren von %d Nachrichten in Postfach Â»%sÂ« ist fehlgeschlagen: %s"
 
-#: ../src/balsa-index.c:2141
+#: ../src/balsa-index.c:2152
 #, c-format
 msgid "Copied to â€œ%sâ€."
 msgstr "Kopiert nach Â»%sÂ«."
 
-#: ../src/balsa-index.c:2142
+#: ../src/balsa-index.c:2153
 #, c-format
 msgid "Moved to â€œ%sâ€."
 msgstr "Verschoben nach Â»%sÂ«."
 
-#: ../src/balsa-index.c:2244
+#: ../src/balsa-index.c:2255
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Abgleichen des Postfachs %s ist fehlgeschlagen."
 
-#: ../src/balsa-index.c:2353
+#: ../src/balsa-index.c:2364
 #, c-format
 msgid "Cannot process the message: %s"
 msgstr "Nachricht konnte nicht verarbeitet werden: %s"
 
-#: ../src/balsa-index.c:2469
+#: ../src/balsa-index.c:2480
 #, c-format
 msgid "Cannot access message %u to pass to %s"
 msgstr ""
 "Auf Nachricht %u zur Weiterleitung an %s konnte nicht zugegriffen werden"
 
-#: ../src/balsa-index.c:2496
+#: ../src/balsa-index.c:2507
 #, c-format
 msgid "Cannot read message %u to pass to %s"
 msgstr "Nachricht %u zur Weiterleitung an %s konnte nicht gelesen werden"
 
-#: ../src/balsa-index.c:2666
+#: ../src/balsa-index.c:2678
 msgid "Pipe message through a program"
 msgstr "Die Nachricht durch ein Programm leiten"
 
-#: ../src/balsa-index.c:2670
+#: ../src/balsa-index.c:2682
 msgid "_Run"
 msgstr "A_usfÃ¼hren"
 
-#: ../src/balsa-index.c:2682
+#: ../src/balsa-index.c:2694
 msgid "Specify the program to run:"
 msgstr "AuszufÃ¼hrendes Programm festlegen:"
 
-#: ../src/balsa-mblist.c:350
-msgid "Mailbox"
-msgstr "Postfach"
-
 #: ../src/balsa-mblist.c:1143 ../src/balsa-mblist.c:1193
 msgid "Failed to find mailbox"
 msgstr "Postfach konnte nicht gefunden werden"
@@ -3162,156 +3279,161 @@ msgstr "WÃ¤hlen Sie den Zielordner"
 msgid "Otherâ€¦"
 msgstr "Weitere â€¦"
 
-#: ../src/balsa-message.c:283
+#: ../src/balsa-message.c:287
 msgid "Check cryptographic signature"
 msgstr "VerschlÃ¼sselte Unterschrift Ã¼berprÃ¼fen"
 
-#: ../src/balsa-message.c:300
+#: ../src/balsa-message.c:304
 msgid "Select message part to display"
 msgstr "WÃ¤hlen Sie den Nachrichtenteil, der angezeigt werden soll"
 
-#: ../src/balsa-message.c:375
+#: ../src/balsa-message.c:379
 msgid "Wrapped"
 msgstr "Verdeckt"
 
-#: ../src/balsa-message.c:379
+#: ../src/balsa-message.c:383
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: ../src/balsa-message.c:609
+#: ../src/balsa-message.c:613
 msgid "Find:"
 msgstr "Suchen:"
 
-#: ../src/balsa-message.c:621 ../src/toolbar-factory.c:145
+#: ../src/balsa-message.c:625 ../src/toolbar-factory.c:145
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../src/balsa-message.c:628 ../src/toolbar-factory.c:146
+#: ../src/balsa-message.c:632 ../src/toolbar-factory.c:146
 msgid "Next"
 msgstr "NÃ¤chste"
 
-#: ../src/balsa-message.c:713
+#: ../src/balsa-message.c:717
 msgid "Content"
 msgstr "Inhalt"
 
-#: ../src/balsa-message.c:805
+#: ../src/balsa-message.c:809
 msgid "Message parts"
 msgstr "Nachrichtenteile"
 
 # Bezieht sich auf Nachrichtenteile
-#: ../src/balsa-message.c:997
+#: ../src/balsa-message.c:1006
 msgid "Save selected asâ€¦"
 msgstr "Auswahl speichern unter â€¦"
 
 # Bezieht sich auf Nachrichtenteile
-#: ../src/balsa-message.c:1004
+#: ../src/balsa-message.c:1013
 msgid "Save selected to folderâ€¦"
 msgstr "Auswahl in Ordner speichern â€¦"
 
-#: ../src/balsa-message.c:1114
+#: ../src/balsa-message.c:1123
 msgid "(No sender)"
 msgstr "(Kein Absender)"
 
-#: ../src/balsa-message.c:1167 ../src/balsa-message.c:1179
+#: ../src/balsa-message.c:1177 ../src/balsa-message.c:1189
 #, c-format
 msgid "Could not access message %u in mailbox â€œ%sâ€."
 msgstr "Auf Nachricht %u im Postfach Â»%sÂ« konnte nicht zugegriffen werden."
 
-#: ../src/balsa-message.c:1346
+#: ../src/balsa-message.c:1239 ../src/main.c:546
+#, c-format
+msgid "Autocrypt error: %s"
+msgstr "Autocrypt-Fehler: %s"
+
+#: ../src/balsa-message.c:1370
 msgid "mixed parts"
 msgstr "gemischte Teile"
 
-#: ../src/balsa-message.c:1348
+#: ../src/balsa-message.c:1372
 msgid "alternative parts"
 msgstr "alternative Teile"
 
-#: ../src/balsa-message.c:1350
+#: ../src/balsa-message.c:1374
 msgid "signed parts"
 msgstr "Unterschriebene Teile"
 
-#: ../src/balsa-message.c:1352
+#: ../src/balsa-message.c:1376
 msgid "encrypted parts"
 msgstr "verschlÃ¼sselte Teile"
 
-#: ../src/balsa-message.c:1354
+#: ../src/balsa-message.c:1378
 msgid "RFC822 message"
 msgstr "RFC822-Nachricht"
 
-#: ../src/balsa-message.c:1356
+#: ../src/balsa-message.c:1380
 #, c-format
 msgid "â€œ%sâ€ parts"
 msgstr "Â»%sÂ«-Teile"
 
-#: ../src/balsa-message.c:1404
+#: ../src/balsa-message.c:1428
 msgid "force inline for all parts"
 msgstr "Einbettung fÃ¼r alle Teile erzwingen"
 
-#: ../src/balsa-message.c:1447
+#: ../src/balsa-message.c:1471
 #, c-format
 msgid "RFC822 message (from %s, subject â€œ%sâ€)"
 msgstr "RFC822-Nachricht (von %s, Betreff Â»%sÂ«)"
 
-#: ../src/balsa-message.c:1459
+#: ../src/balsa-message.c:1483
 msgid "complete message"
 msgstr "VollstÃ¤ndige Nachricht"
 
-#: ../src/balsa-message.c:1476
+#: ../src/balsa-message.c:1500
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "Teil %s: %s (Datei %s)"
 
-#: ../src/balsa-message.c:1487
+#: ../src/balsa-message.c:1511
 #, c-format
 msgid "part %s: %s"
 msgstr "Teil %s: %s"
 
-#: ../src/balsa-message.c:1502
+#: ../src/balsa-message.c:1526
 msgid "encrypted: "
 msgstr "verschlÃ¼sselt: "
 
-#: ../src/balsa-message.c:1642
+#: ../src/balsa-message.c:1666
 #, c-format
 msgid "Reading embedded message failed: %s"
 msgstr "Lesen der eingebetteten Nachricht ist fehlgeschlagen: %s"
 
-#: ../src/balsa-message.c:1650
+#: ../src/balsa-message.c:1674
 #, c-format
 msgid "Appending message to %s failed: %s"
 msgstr "Beilegen der Nachricht zu %s ist fehlgeschlagen: %s"
 
-#: ../src/balsa-message.c:1679
+#: ../src/balsa-message.c:1703
 msgid "_Saveâ€¦"
 msgstr "_Speichern â€¦"
 
-#: ../src/balsa-message.c:1688 ../src/balsa-mime-widget-message.c:448
+#: ../src/balsa-message.c:1712 ../src/balsa-mime-widget-message.c:448
 msgid "_Copy to folderâ€¦"
 msgstr "In Ordner _kopieren â€¦"
 
-#: ../src/balsa-message.c:1771
+#: ../src/balsa-message.c:1795
 msgid "Select folder for saving selected parts"
 msgstr "Ordner zum Speichern der markierten Teile auswÃ¤hlen"
 
-#: ../src/balsa-message.c:1796
+#: ../src/balsa-message.c:1820
 #, c-format
 msgid "Could not create URI for %s"
 msgstr "Adresse fÃ¼r %s konnte nicht erstellt werden"
 
-#: ../src/balsa-message.c:1821
+#: ../src/balsa-message.c:1845
 #, c-format
 msgid "%s message part"
 msgstr "Nachrichtenteil %s"
 
-#: ../src/balsa-message.c:1854 ../src/balsa-mime-widget-callbacks.c:164
+#: ../src/balsa-message.c:1878 ../src/balsa-mime-widget-callbacks.c:164
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "%s konnte nicht gespeichert werden: %s"
 
-#: ../src/balsa-message.c:2495 ../src/balsa-message.c:2637
+#: ../src/balsa-message.c:2519 ../src/balsa-message.c:2661
 #, c-format
 msgid "Sending the disposition notification failed: %s"
 msgstr "Ãœbermittlung der EmpfangsbestÃ¤tigung gescheitert: %s"
 
-#: ../src/balsa-message.c:2592
+#: ../src/balsa-message.c:2616
 #, c-format
 msgid ""
 "The sender of this mail, %s, requested \n"
@@ -3322,11 +3444,11 @@ msgstr ""
 "EmpfangsbestÃ¤tigung angefordert, die an Â»%sÂ« zurÃ¼ckgeschickt werden soll.\n"
 "Soll diese BestÃ¤tigung abgeschickt werden?"
 
-#: ../src/balsa-message.c:2602
+#: ../src/balsa-message.c:2626
 msgid "Reply to MDN?"
 msgstr "Auf EmpfangsbestÃ¤tigung antworten?"
 
-#: ../src/balsa-message.c:2813
+#: ../src/balsa-message.c:2837
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
@@ -3337,18 +3459,18 @@ msgstr ""
 "Bitte schlieÃŸen Sie zunÃ¤chst alle anderen Ansichten dieser Nachricht und "
 "versuchen Sie es dann erneut."
 
-#: ../src/balsa-message.c:2834 ../src/balsa-message.c:2919
-#: ../src/balsa-message.c:3041
+#: ../src/balsa-message.c:2858 ../src/balsa-message.c:2943
+#: ../src/balsa-message.c:3065
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Das Analysieren eines Nachrichtenteils ist fehlgeschlagen: %s"
 
-#: ../src/balsa-message.c:2835 ../src/balsa-message.c:2920
-#: ../src/balsa-message.c:3042
+#: ../src/balsa-message.c:2859 ../src/balsa-message.c:2944
+#: ../src/balsa-message.c:3066
 msgid "Possible disk space problem."
 msgstr "Es gibt mÃ¶glicherweise ein Speicherplatzproblem."
 
-#: ../src/balsa-message.c:2849
+#: ../src/balsa-message.c:2873
 #, c-format
 msgid ""
 "The message sent by %s with subject â€œ%sâ€ contains an encrypted part, but its "
@@ -3357,7 +3479,7 @@ msgstr ""
 "Die von %s verschickte Nachricht mit Betreff Â»%sÂ« enthÃ¤lt einen "
 "verschlÃ¼sselten Teil, dessen Struktur jedoch ungÃ¼ltig ist."
 
-#: ../src/balsa-message.c:2857
+#: ../src/balsa-message.c:2881
 #, c-format
 msgid ""
 "The message sent by %s with subject â€œ%sâ€ contains a PGP encrypted part, but "
@@ -3367,7 +3489,7 @@ msgstr ""
 "verschlÃ¼sselten Teil, jedoch ist dieses VerschlÃ¼sselungsprotokoll nicht "
 "verfÃ¼gbar."
 
-#: ../src/balsa-message.c:2870
+#: ../src/balsa-message.c:2894
 #, c-format
 msgid ""
 "The message sent by %s with subject â€œ%sâ€ contains a S/MIME encrypted part, "
@@ -3377,7 +3499,7 @@ msgstr ""
 "verschlÃ¼sselten Teil, jedoch ist dieses VerschlÃ¼sselungsprotokoll nicht "
 "verfÃ¼gbar."
 
-#: ../src/balsa-message.c:2937
+#: ../src/balsa-message.c:2961
 #, c-format
 msgid ""
 "The message sent by %s with subject â€œ%sâ€ contains a signed part, but its "
@@ -3387,7 +3509,7 @@ msgstr ""
 "unterschriebenen Teil, dessen Struktur jedoch ungÃ¼ltig ist. Falls eine "
 "Unterschrift existiert, kann diese nicht Ã¼berprÃ¼ft werden."
 
-#: ../src/balsa-message.c:2950
+#: ../src/balsa-message.c:2974
 #, c-format
 msgid ""
 "The message sent by %s with subject â€œ%sâ€ contains a %s signed part, but this "
@@ -3397,50 +3519,49 @@ msgstr ""
 "unterschriebenen Teil, jedoch ist das VerschlÃ¼sselungsprotokoll nicht "
 "verfÃ¼gbar."
 
-#: ../src/balsa-message.c:2953
+#: ../src/balsa-message.c:2977
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/balsa-message.c:2953 ../src/print-gtk.c:199
+#: ../src/balsa-message.c:2977 ../src/print-gtk.c:258
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: ../src/balsa-message.c:2977
+#: ../src/balsa-message.c:3001
 msgid "Detected a good signature"
 msgstr "GÃ¼ltige Unterschrift erkannt"
 
-#: ../src/balsa-message.c:2983
+#: ../src/balsa-message.c:3007
 msgid "Detected a good signature with insufficient validity"
 msgstr ""
 "Es wurde eine fehlerfreie Unterschrift mit unzureichender GÃ¼ltigkeit erkannt"
 
-#: ../src/balsa-message.c:2988 ../src/balsa-message.c:3106
+#: ../src/balsa-message.c:3012 ../src/balsa-message.c:3130
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr ""
 "Es wurde eine fehlerfreie Unterschrift mit unzureichender GÃ¼ltigkeit oder "
 "unzureichendem Vertrauen erkannt"
 
-#: ../src/balsa-message.c:2995 ../src/balsa-message.c:3113
+#: ../src/balsa-message.c:3019 ../src/balsa-message.c:3137
 #, c-format
 msgid ""
-"Checking the signature of the message sent by %s with subject â€œ%sâ€ "
-"returned:\n"
+"Checking the signature of the message sent by %s with subject â€œ%sâ€ returned:\n"
 "%s"
 msgstr ""
 "Das ÃœberprÃ¼fen der von %s mit dem Betreff Â»%sÂ« verschickten Nachricht "
 "lieferte:\n"
 "%s"
 
-#: ../src/balsa-message.c:3007
+#: ../src/balsa-message.c:3031
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject â€œ%sâ€ failed "
 "with an error!"
 msgstr ""
-"Die ÃœberprÃ¼fung der von %s mit dem Betreff Â»%sÂ« verschickten Nachricht "
-"schlug fehl und lieferte einen Fehler!"
+"Die ÃœberprÃ¼fung der von %s mit dem Betreff Â»%sÂ« verschickten Nachricht schlug "
+"fehl und lieferte einen Fehler!"
 
-#: ../src/balsa-message.c:3066
+#: ../src/balsa-message.c:3090
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once."
@@ -3448,52 +3569,52 @@ msgstr ""
 "Die EntschlÃ¼sselung konnte nicht ausgefÃ¼hrt werden, das diese Nachricht mehr "
 "als einmal angezeigt wird."
 
-#: ../src/balsa-message.c:3068
+#: ../src/balsa-message.c:3092
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
 msgstr ""
 "Die UnterschriftenÃ¼berprÃ¼fung und das Entfernen des OpenPGP-Schutzes konnte "
-"nicht nicht durchgefÃ¼hrt werden, da diese Nachricht mehr als einmal "
-"angezeigt wird."
+"nicht nicht durchgefÃ¼hrt werden, da diese Nachricht mehr als einmal angezeigt "
+"wird."
 
-#: ../src/balsa-message.c:3071
+#: ../src/balsa-message.c:3095
 msgid "Please close the other instances of this message and try again."
 msgstr ""
-"Bitte schlieÃŸen Sie alle anderen Ansichten dieser Nachricht und versuchen "
-"Sie es dann erneut."
+"Bitte schlieÃŸen Sie alle anderen Ansichten dieser Nachricht und versuchen Sie "
+"es dann erneut."
 
-#: ../src/balsa-mime-widget.c:242 ../src/balsa-mime-widget-message.c:176
+#: ../src/balsa-mime-widget.c:222 ../src/balsa-mime-widget-message.c:176
 #: ../src/balsa-mime-widget-message.c:222
 #, c-format
 msgid "File name: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/balsa-mime-widget.c:258
+#: ../src/balsa-mime-widget.c:238
 #, c-format
 msgid "Error reading message part: %s"
 msgstr "Fehler beim Lesen des Nachrichtenteils: %s"
 
-#: ../src/balsa-mime-widget.c:290
+#: ../src/balsa-mime-widget.c:270
 #, c-format
 msgid "Type: %s (%s)"
 msgstr "Typ: %s (%s)"
 
-#: ../src/balsa-mime-widget.c:294
+#: ../src/balsa-mime-widget.c:274
 #, c-format
 msgid "Content Type: %s"
 msgstr "Inhaltstyp: %s"
 
-#: ../src/balsa-mime-widget.c:308
+#: ../src/balsa-mime-widget.c:288
 msgid "No open or view action defined for this content type"
 msgstr ""
 "Mit diesem Inhaltstyp ist keine Aktion zum Ã–ffnen oder Anzeigen verknÃ¼pft"
 
-#: ../src/balsa-mime-widget.c:313
+#: ../src/balsa-mime-widget.c:293
 msgid "S_ave part"
 msgstr "Teil s_peichern"
 
-#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1448
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1434
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "Anwendung konnte nicht gestartet werden: %s"
@@ -3527,15 +3648,19 @@ msgstr "Ein Textabschnitt konnte nicht gespeichert werden: %s"
 msgid "Could not process GnuPG keys: %s"
 msgstr "GnuPG-SchlÃ¼ssel konnten nicht verarbeitet werden: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:126
+#: ../src/balsa-mime-widget-crypto.c:136
+msgid "_Import Autocrypt key"
+msgstr "Autocrypt-SchlÃ¼ssel _importieren"
+
+#: ../src/balsa-mime-widget-crypto.c:142
 msgid "_Search key server for this key"
 msgstr "Auf _SchlÃ¼sselserver nach diesem SchlÃ¼ssel suchen"
 
-#: ../src/balsa-mime-widget-crypto.c:128
+#: ../src/balsa-mime-widget-crypto.c:144
 msgid "_Search key server for updates of this key"
 msgstr "Auf _SchlÃ¼sselserver nach Aktualisierungen dieses SchlÃ¼ssels suchen"
 
-#: ../src/balsa-mime-widget-crypto.c:262
+#: ../src/balsa-mime-widget-crypto.c:288
 #, c-format
 msgid ""
 "Import GnuPG key:\n"
@@ -3544,32 +3669,34 @@ msgstr ""
 "GnuPG-SchlÃ¼ssel importieren:\n"
 "%s"
 
-#: ../src/balsa-mime-widget-crypto.c:269
+#: ../src/balsa-mime-widget-crypto.c:295
 #, c-format
 msgid "Error importing key data: %s"
 msgstr "Fehler beim Importieren der SchlÃ¼sseldaten: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:306
+#: ../src/balsa-mime-widget-crypto.c:295 ../src/sendmsg-window.c:1712
+msgid "unknown error"
+msgstr "Unbekannter Fehler"
+
+#: ../src/balsa-mime-widget-crypto.c:332
 msgid "(imported)"
 msgstr "(importiert)"
 
-#: ../src/balsa-mime-widget-crypto.c:314
+#: ../src/balsa-mime-widget-crypto.c:340
 msgid "Import key into the local key ring"
 msgstr "SchlÃ¼ssel in den lokalen SchlÃ¼sselbund importieren"
 
-#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:248
+#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:249
 #, c-format
 msgid "Error loading attached image: %s\n"
 msgstr "Fehler beim Laden des beigelegten Bildes: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:144 ../src/balsa-print-object.c:113
+#: ../src/balsa-mime-widget-message.c:144 ../src/balsa-print-object.c:114
 msgid "message headers"
 msgstr "Nachrichtenkopfzeilen"
 
-#: ../src/balsa-mime-widget-message.c:174
-#: ../src/balsa-mime-widget-message.c:186
-#: ../src/balsa-mime-widget-message.c:214
-#: ../src/balsa-mime-widget-message.c:267
+#: ../src/balsa-mime-widget-message.c:174 ../src/balsa-mime-widget-message.c:186
+#: ../src/balsa-mime-widget-message.c:214 ../src/balsa-mime-widget-message.c:267
 msgid "Content Type: external-body\n"
 msgstr "Inhaltstyp: Externer Aufbau\n"
 
@@ -3622,7 +3749,7 @@ msgid "Se_nd message to obtain this part"
 msgstr "_Nachrichten verschicken, um diesen Teil zu erhalten"
 
 #: ../src/balsa-mime-widget-message.c:323 ../src/balsa-mime-widget-text.c:815
-#: ../src/sendmsg-window.c:1483
+#: ../src/sendmsg-window.c:1469
 #, c-format
 msgid "Error showing %s: %s\n"
 msgstr "Fehler beim Anzeigen %s: %s\n"
@@ -3651,21 +3778,21 @@ msgstr "Fehler:"
 msgid "IMAP server did not report message structure"
 msgstr "IMAP-Server lieferte keine Information zur Nachrichtenstruktur"
 
-#: ../src/balsa-mime-widget-message.c:726
-#: ../src/balsa-print-object-header.c:156 ../src/sendmsg-window.c:744
-#: ../src/sendmsg-window.c:746 ../src/sendmsg-window.c:837
-#: ../src/sendmsg-window.c:3517 ../src/sendmsg-window.c:5023
+#: ../src/balsa-mime-widget-message.c:726 ../src/balsa-print-object-header.c:156
+#: ../src/sendmsg-window.c:750 ../src/sendmsg-window.c:752
+#: ../src/sendmsg-window.c:843 ../src/sendmsg-window.c:3503
+#: ../src/sendmsg-window.c:5010
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../src/balsa-mime-widget-message.c:731
-#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3513
+#: ../src/balsa-mime-widget-message.c:731 ../src/balsa-print-object-header.c:164
+#: ../src/sendmsg-window.c:3499
 msgid "Date:"
 msgstr "Datum:"
 
 #. addresses
-#: ../src/balsa-mime-widget-message.c:737
-#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3524
+#: ../src/balsa-mime-widget-message.c:737 ../src/balsa-print-object-header.c:169
+#: ../src/sendmsg-window.c:3510
 msgid "From:"
 msgstr "Von:"
 
@@ -3673,13 +3800,11 @@ msgstr "Von:"
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
-#: ../src/balsa-mime-widget-message.c:757
-#: ../src/balsa-print-object-header.c:177
+#: ../src/balsa-mime-widget-message.c:757 ../src/balsa-print-object-header.c:177
 msgid "FCC:"
 msgstr "FCC:"
 
-#: ../src/balsa-mime-widget-message.c:765
-#: ../src/balsa-print-object-header.c:180
+#: ../src/balsa-mime-widget-message.c:765 ../src/balsa-print-object-header.c:180
 msgid "Disposition-Notification-To:"
 msgstr "EmpfangsbestÃ¤tigung an:"
 
@@ -3720,7 +3845,7 @@ msgstr "Verkleinern"
 msgid "Zoom 100%"
 msgstr "Auf 100% vergrÃ¶ÃŸern"
 
-#: ../src/balsa-mime-widget-text.c:1079 ../ui/main-window.ui.h:27
+#: ../src/balsa-mime-widget-text.c:1079 ../ui/main-window.ui.h:21
 #: ../ui/message-window.ui.h:7 ../ui/sendmsg-window.ui.h:19
 msgid "Select _All"
 msgstr "_Alles markieren"
@@ -3880,7 +4005,7 @@ msgstr "Teilnehmer"
 msgid "Attendee"
 msgstr "Teilnehmer"
 
-#: ../src/balsa-print-object-text.c:681 ../src/sendmsg-window.c:2707
+#: ../src/balsa-print-object-text.c:681 ../src/sendmsg-window.c:2693
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -3962,15 +4087,15 @@ msgstr "A_lle"
 msgid "C_lear"
 msgstr "_Nichts"
 
-#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3787
+#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3729
 msgid "_Body"
 msgstr "_Rumpf"
 
-#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3788
+#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3730
 msgid "_To:"
 msgstr "_An:"
 
-#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3789
+#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3731
 msgid "_From:"
 msgstr "_Von:"
 
@@ -3978,7 +4103,7 @@ msgstr "_Von:"
 msgid "_Subject"
 msgstr "Be_treff"
 
-#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3791
+#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3733
 msgid "_CC:"
 msgstr "_Kopie:"
 
@@ -4008,8 +4133,7 @@ msgstr "Eines _passt/Keins passt"
 
 #: ../src/filter-edit-callbacks.c:1096
 msgid "Filtering using regular expressions is not yet implemented."
-msgstr ""
-"Die Filterung mittels regulÃ¤rer AusdrÃ¼cke ist noch nicht implementiert."
+msgstr "Die Filterung mittels regulÃ¤rer AusdrÃ¼cke ist noch nicht implementiert."
 
 #: ../src/filter-edit-callbacks.c:1111
 msgid "Match when message date is in the interval:"
@@ -4032,7 +4156,7 @@ msgstr "Such_typ:"
 msgid "Edit condition for filter: "
 msgstr "Bedingung bearbeiten fÃ¼r den Filter: "
 
-#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1854
+#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1912
 msgid "Filter with no condition was omitted"
 msgstr "Filter ohne Bedingungen wurden ignoriert"
 
@@ -4071,7 +4195,7 @@ msgstr "Sie mÃ¼ssen einen abzuspielenden Klang angeben"
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Beispiel: 31. Dezember 2000 als %s schreiben)"
 
-#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:227
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:226
 msgid "Simple"
 msgstr "Einfach"
 
@@ -4136,7 +4260,7 @@ msgstr "_Filtername:"
 msgid "Operation between conditions:"
 msgstr "Operation zwischen Bedingungen:"
 
-#: ../src/filter-edit-dialog.c:310 ../ui/main-window.ui.h:25
+#: ../src/filter-edit-dialog.c:310 ../ui/main-window.ui.h:19
 #: ../ui/message-window.ui.h:5 ../ui/sendmsg-window.ui.h:13
 #: ../ui/source-viewer.ui.h:3
 msgid "_Edit"
@@ -4170,7 +4294,7 @@ msgstr "Klang abspielen:"
 msgid "Use Soundâ€¦"
 msgstr "Klang verwenden â€¦"
 
-#: ../src/filter-edit-dialog.c:405 ../src/mailbox-node.c:1114
+#: ../src/filter-edit-dialog.c:405 ../src/mailbox-node.c:1099
 msgid "_Open"
 msgstr "Ã–_ffnen"
 
@@ -4201,11 +4325,11 @@ msgstr ""
 "Ein Filter-AusfÃ¼hren-Dialog ist geÃ¶ffnet. SchlieÃŸen Sie ihn, um Filter zu "
 "Ã¤ndern."
 
-#: ../src/filter-edit-dialog.c:569
+#: ../src/filter-edit-dialog.c:570
 msgid "Filters"
 msgstr "Filter"
 
-#: ../src/filter-edit-dialog.c:637
+#: ../src/filter-edit-dialog.c:638
 #, c-format
 msgid "Filter â€œ%sâ€ has no condition."
 msgstr "Der Filter Â»%sÂ« hat keine Bedingungen."
@@ -4217,13 +4341,12 @@ msgstr "Filter %s konnte nicht exportiert werden: Es trat ein Fehler auf."
 
 #: ../src/filter-export-dialog.c:63
 msgid ""
-"There are opened filter run dialogs, close them before you can modify "
-"filters."
+"There are opened filter run dialogs, close them before you can modify filters."
 msgstr ""
 "Es gibt offene Filterstart-Dialoge, schlieÃŸen Sie diese bevor sie Filter "
 "Ã¤ndern kÃ¶nnen."
 
-#: ../src/filter-export-dialog.c:75
+#: ../src/filter-export-dialog.c:76
 msgid "Export Filters"
 msgstr "Filter exportieren"
 
@@ -4256,8 +4379,8 @@ msgstr ""
 msgid ""
 "The filter â€œ%sâ€ is not compatible with the mailbox type of â€œ%sâ€.\n"
 "This happens for example when you use regular expressions match with IMAP "
-"mailboxes, it is done by a very slow method; if possible, use substring "
-"match instead."
+"mailboxes, it is done by a very slow method; if possible, use substring match "
+"instead."
 msgstr ""
 "Der Filter Â»%sÂ« ist nicht mit dem Postfachtyp von Â»%sÂ« kompatibel.\n"
 "Dies ist beispielsweise der Fall, wenn Sie eine Abfrage mit regulÃ¤ren "
@@ -4311,82 +4434,61 @@ msgstr ""
 "Der Filter-Dialog ist geÃ¶ffnet. SchlieÃŸen Sie ihn, um Filter auf eine "
 "beliebige Mailbox anwenden zu kÃ¶nnen"
 
-#: ../src/folder-conf.c:116
+#: ../src/folder-conf.c:118
 #, c-format
 msgid "Error displaying config help: %s\n"
 msgstr "Fehler beim Anzeigen der Einstellungshilfe: %s\n"
 
-#: ../src/folder-conf.c:329
+#: ../src/folder-conf.c:247
 msgid "Remote IMAP folder"
 msgstr "IMAP-Ordner im Netz"
 
-#: ../src/folder-conf.c:333 ../src/folder-conf.c:834 ../src/mailbox-conf.c:528
+#: ../src/folder-conf.c:251 ../src/folder-conf.c:672 ../src/mailbox-conf.c:362
 msgid "_Update"
 msgstr "_Aktualisieren"
 
-#: ../src/folder-conf.c:333
+#: ../src/folder-conf.c:251
 msgid "C_reate"
 msgstr "A_nlegen"
 
-#: ../src/folder-conf.c:364
+#. additional basic settings
+#: ../src/folder-conf.c:276
+msgid "Subscribed _folders only"
+msgstr "Nur _abonnierte Ordner"
+
+#: ../src/folder-conf.c:278
+msgid "Always show _Inbox"
+msgstr "Eingang (INBOX) immer _anzeigen"
+
+#: ../src/folder-conf.c:280
+msgid "Pr_efix:"
+msgstr "Pr_efix:"
+
+#: ../src/folder-conf.c:287
 msgid "_Max number of connections:"
 msgstr "_Maximale Anzahl von Verbindungen:"
 
-#: ../src/folder-conf.c:370 ../src/mailbox-conf.c:1386
+#: ../src/folder-conf.c:288
 msgid "Enable _persistent cache"
 msgstr "_Dauerhaften Zwischenspeicher aktivieren"
 
-#: ../src/folder-conf.c:377
+#: ../src/folder-conf.c:290
 msgid "Use IDLE command"
 msgstr "IDLE-Befehl verwenden"
 
-#: ../src/folder-conf.c:384 ../src/mailbox-conf.c:1389
+#: ../src/folder-conf.c:292
 msgid "Enable _bug workarounds"
 msgstr "_Fehler-Hilfskonstruktionen aktivieren"
 
-#: ../src/folder-conf.c:391
+#: ../src/folder-conf.c:294
 msgid "Use STATUS for mailbox checking"
 msgstr "STATUS fÃ¼r die PostfachÃ¼berprÃ¼fung verwenden"
 
-#. INPUT FIELD CREATION
-#: ../src/folder-conf.c:400
-msgid "Descriptive _name:"
-msgstr "Beschreibender _Name:"
-
-#: ../src/folder-conf.c:417 ../src/mailbox-conf.c:1203
-msgid "IMAP over SSL (IMAPS)"
-msgstr "IMAP Ã¼ber SSL (IMAPS)"
-
-#. username
-#: ../src/folder-conf.c:426 ../src/mailbox-conf.c:1240
-msgid "Use_r name:"
-msgstr "_Benutzername:"
-
-#: ../src/folder-conf.c:432
-msgid "_Password:"
-msgstr "_Passwort:"
-
-#: ../src/folder-conf.c:439 ../src/mailbox-conf.c:1350
-msgid "_Anonymous access"
-msgstr "_Anonymer Zugriff"
-
-#: ../src/folder-conf.c:450
-msgid "Subscribed _folders only"
-msgstr "Nur _abonnierte Ordner"
-
-#: ../src/folder-conf.c:453
-msgid "Always show _Inbox"
-msgstr "Eingang (INBOX) immer _anzeigen"
-
-#: ../src/folder-conf.c:456
-msgid "Pr_efix:"
-msgstr "Pr_efix:"
-
-#: ../src/folder-conf.c:603
+#: ../src/folder-conf.c:438
 msgid "Select parent folder"
 msgstr "Elternordner auswÃ¤hlen"
 
-#: ../src/folder-conf.c:682
+#: ../src/folder-conf.c:519
 #, c-format
 msgid ""
 "Renaming Inbox is special!\n"
@@ -4401,29 +4503,29 @@ msgstr ""
 "Eingang und seine Unterordner bleiben dabei erhalten.\n"
 "Was wollen Sie tun?"
 
-#: ../src/folder-conf.c:689
+#: ../src/folder-conf.c:526
 msgid "Question"
 msgstr "Frage"
 
-#: ../src/folder-conf.c:693
+#: ../src/folder-conf.c:530
 msgid "Rename Inbox"
 msgstr "Eingang umbenennen"
 
-#: ../src/folder-conf.c:695
+#: ../src/folder-conf.c:532
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/folder-conf.c:720
+#: ../src/folder-conf.c:557
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Umbenennen des Ordners war nicht mÃ¶glich. Ursache: %s"
 
-#: ../src/folder-conf.c:772 ../src/folder-conf.c:1117
+#: ../src/folder-conf.c:609 ../src/folder-conf.c:955
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Anlegen des Ordners war nicht mÃ¶glich. Ursache: %s"
 
-#: ../src/folder-conf.c:819
+#: ../src/folder-conf.c:657
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -4431,60 +4533,60 @@ msgstr ""
 "Ein IMAP-Ordner, der kein Postfach ist\n"
 "hat keine Eigenschaften, die geÃ¤ndert werden kÃ¶nnen."
 
-#: ../src/folder-conf.c:830
+#: ../src/folder-conf.c:668
 msgid "Remote IMAP subfolder"
 msgstr "IMAP-Unterordner im Netz"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:866 ../src/folder-conf.c:1095
+#: ../src/folder-conf.c:704 ../src/folder-conf.c:933
 msgid "_Folder name:"
 msgstr "_Ordnername:"
 
-#: ../src/folder-conf.c:872
+#: ../src/folder-conf.c:710
 msgid "Host:"
 msgstr "Rechner:"
 
-#: ../src/folder-conf.c:881 ../src/folder-conf.c:1090
+#: ../src/folder-conf.c:719 ../src/folder-conf.c:928
 msgid "Subfolder of:"
 msgstr "Unterordner von:"
 
-#: ../src/folder-conf.c:886
+#: ../src/folder-conf.c:724
 msgid "_Browseâ€¦"
 msgstr "_AuswÃ¤hlen â€¦"
 
-#: ../src/folder-conf.c:898
+#: ../src/folder-conf.c:736
 msgid "read-only"
 msgstr "read-only"
 
-#: ../src/folder-conf.c:899
+#: ../src/folder-conf.c:737
 msgid "read-write"
 msgstr "read-write"
 
-#: ../src/folder-conf.c:900
+#: ../src/folder-conf.c:738
 msgid "admin"
 msgstr "admin"
 
-#: ../src/folder-conf.c:901
+#: ../src/folder-conf.c:739
 msgid "post"
 msgstr "Abschicken"
 
-#: ../src/folder-conf.c:902
+#: ../src/folder-conf.c:740
 msgid "append"
 msgstr "AnhÃ¤ngen"
 
-#: ../src/folder-conf.c:903
+#: ../src/folder-conf.c:741
 msgid "delete"
 msgstr "LÃ¶schen"
 
-#: ../src/folder-conf.c:904
+#: ../src/folder-conf.c:742
 msgid "special"
 msgstr "special"
 
-#: ../src/folder-conf.c:910
+#: ../src/folder-conf.c:748
 msgid "Permissions:"
 msgstr "Zugriffsrechte:"
 
-#: ../src/folder-conf.c:917
+#: ../src/folder-conf.c:755
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -4492,7 +4594,7 @@ msgstr ""
 "\n"
 "detaillierte Zugriffsrechte sind nur fÃ¼r geÃ¶ffnete Ordner verfÃ¼gbar"
 
-#: ../src/folder-conf.c:924
+#: ../src/folder-conf.c:762
 msgid ""
 "\n"
 "the server does not support ACLs"
@@ -4500,33 +4602,33 @@ msgstr ""
 "\n"
 "Der Server unterstÃ¼tzt keine ACLs"
 
-#: ../src/folder-conf.c:933
+#: ../src/folder-conf.c:771
 msgid "mine: "
 msgstr "Eigene:"
 
-#: ../src/folder-conf.c:971
+#: ../src/folder-conf.c:809
 msgid "Quota:"
 msgstr "Speicherverbrauch:"
 
-#: ../src/folder-conf.c:975
+#: ../src/folder-conf.c:813
 msgid "quota information available only for open folders"
 msgstr ""
 "Informationen zum Speicherverbrauch sind nur fÃ¼r geÃ¶ffnete Ordner verfÃ¼gbar"
 
-#: ../src/folder-conf.c:980
+#: ../src/folder-conf.c:818
 msgid "the server does not support quotas"
 msgstr "Der Server unterstÃ¼tzt die Zuordnung von Speicherverbrauch nicht"
 
-#: ../src/folder-conf.c:982
+#: ../src/folder-conf.c:820
 msgid "no limits"
 msgstr "unbegrenzt"
 
-#: ../src/folder-conf.c:987
+#: ../src/folder-conf.c:825
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s von %s (%.1f%%) genutzt"
 
-#: ../src/folder-conf.c:1024
+#: ../src/folder-conf.c:862
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
 "it from remote server."
@@ -4534,7 +4636,7 @@ msgstr ""
 "Der Ordner ist nicht in der Konfiguration gespeichert. Es ist daher noch "
 "nicht mÃ¶glich, ihn von dem entfernten Server zu lÃ¶schen."
 
-#: ../src/folder-conf.c:1033
+#: ../src/folder-conf.c:871
 #, c-format
 msgid ""
 "This will remove the folder â€œ%sâ€ from the list.\n"
@@ -4544,27 +4646,27 @@ msgstr ""
 "Sie kÃ¶nnen spÃ¤ter Â»Neuer IMAP-OrdnerÂ« verwenden, um den Ordner wieder "
 "hinzuzufÃ¼gen.\n"
 
-#: ../src/folder-conf.c:1041
+#: ../src/folder-conf.c:879
 msgid "Confirm"
 msgstr "BestÃ¤tigen"
 
-#: ../src/folder-conf.c:1076
+#: ../src/folder-conf.c:914
 msgid "Create IMAP subfolder"
 msgstr "IMAP-Unterordner anlegen"
 
-#: ../src/folder-conf.c:1079
+#: ../src/folder-conf.c:917
 msgid "_Create"
 msgstr "A_nlegen"
 
-#: ../src/folder-conf.c:1091
+#: ../src/folder-conf.c:929
 msgid "server (top level)"
 msgstr "Server (oberste Ebene)"
 
-#: ../src/folder-conf.c:1106
+#: ../src/folder-conf.c:944
 #, c-format
 msgid ""
-"The character â€œ%câ€ is used as hierarchy separator by the server and "
-"therefore not permitted in the folder name."
+"The character â€œ%câ€ is used as hierarchy separator by the server and therefore "
+"not permitted in the folder name."
 msgstr ""
 "Das Zeichen Â»%cÂ« wird vom Server als Hierarchie-Trennzeichen verwendet und "
 "ist daher im Ordnernamen nicht zulÃ¤ssig."
@@ -4573,7 +4675,7 @@ msgstr ""
 msgid "Information â€” Balsa"
 msgstr "Informationen â€“ Balsa"
 
-#: ../src/information-dialog.c:235 ../src/main-window.c:3808
+#: ../src/information-dialog.c:235 ../src/main-window.c:3750
 msgid "_Clear"
 msgstr "_Leeren"
 
@@ -4596,11 +4698,11 @@ msgstr "FEHLER: "
 msgid "FATAL: "
 msgstr "SCHWERWIEGEND: "
 
-#: ../src/mailbox-conf.c:328
+#: ../src/mailbox-conf.c:156
 msgid "No mailbox selected."
 msgstr "Kein Postfach ausgewÃ¤hlt."
 
-#: ../src/mailbox-conf.c:358
+#: ../src/mailbox-conf.c:186
 #, c-format
 msgid ""
 "Mailbox â€œ%sâ€ is used by Balsa and I cannot remove it.\n"
@@ -4612,7 +4714,7 @@ msgstr ""
 "erzwingen wollen, mÃ¼ssen Sie seine Aufgabe einem\n"
 "anderen Postfach zuweisen."
 
-#: ../src/mailbox-conf.c:368
+#: ../src/mailbox-conf.c:196
 #, c-format
 msgid ""
 "This will remove the mailbox â€œ%sâ€ from the list of mailboxes. You may also "
@@ -4628,20 +4730,19 @@ msgstr ""
 "Â»Postfach hinzufÃ¼genÂ«, um spÃ¤ter wieder darauf zuzugreifen.\n"
 "Was wollen Sie tun?"
 
-#: ../src/mailbox-conf.c:380
+#: ../src/mailbox-conf.c:208
 msgid "Remove from _list"
 msgstr "Aus _Liste entfernen"
 
-#: ../src/mailbox-conf.c:381
+#: ../src/mailbox-conf.c:209
 msgid "Remove from list and _disk"
 msgstr "Aus Liste und von _Platte entfernen"
 
-#: ../src/mailbox-conf.c:389
+#: ../src/mailbox-conf.c:217
 #, c-format
 msgid ""
-"This will remove the mailbox â€œ%sâ€ and all its messages from your IMAP "
-"server. If %s has subfolders, it will still appear as a node in the folder "
-"tree.\n"
+"This will remove the mailbox â€œ%sâ€ and all its messages from your IMAP server. "
+"If %s has subfolders, it will still appear as a node in the folder tree.\n"
 "You may use â€œNew IMAP subfolderâ€ later to add a mailbox with this name.\n"
 "What would you like to do?"
 msgstr ""
@@ -4651,11 +4752,11 @@ msgstr ""
 "diesem Namen hinzuzufÃ¼gen.\n"
 "Was wollen Sie tun?"
 
-#: ../src/mailbox-conf.c:402
+#: ../src/mailbox-conf.c:230
 msgid "_Remove from server"
 msgstr "Vom Server _entfernen"
 
-#: ../src/mailbox-conf.c:409
+#: ../src/mailbox-conf.c:237
 #, c-format
 msgid ""
 "This will remove the mailbox â€œ%sâ€ from the list of mailboxes.\n"
@@ -4667,21 +4768,16 @@ msgstr ""
 "zuzugreifen.\n"
 "Was wollen Sie tun?"
 
-#: ../src/mailbox-conf.c:418
+#: ../src/mailbox-conf.c:246
 msgid "_Remove from list"
 msgstr "Aus Liste _entfernen"
 
-#: ../src/mailbox-conf.c:462
+#: ../src/mailbox-conf.c:290
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 msgstr "LÃ¶schen des Ordners war nicht mÃ¶glich. Ursache: %s"
 
-#: ../src/mailbox-conf.c:804
-#, c-format
-msgid "%s on %s"
-msgstr "%s auf %s"
-
-#: ../src/mailbox-conf.c:941
+#: ../src/mailbox-conf.c:541
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -4690,116 +4786,102 @@ msgstr ""
 "Umbenennen von %s in %s fehlgeschlagen:\n"
 "%s"
 
-#: ../src/mailbox-conf.c:1126
-msgid "_Mailbox Name:"
-msgstr "Name des _Postfachs:"
-
-#: ../src/mailbox-conf.c:1135
+#: ../src/mailbox-conf.c:715
 #, c-format
 msgid "Local %s Mailbox Properties"
 msgstr "Eigenschaften des lokalen %s-Postfachs"
 
-#: ../src/mailbox-conf.c:1136
+#: ../src/mailbox-conf.c:716
 #, c-format
 msgid "New Local %s Mailbox"
 msgstr "Neues lokales %s-Postfach"
 
-#: ../src/mailbox-conf.c:1178
+#: ../src/mailbox-conf.c:753
+msgid "_Mailbox Name:"
+msgstr "Name des _Postfachs:"
+
+#: ../src/mailbox-conf.c:781
 msgid "Remote Mailbox Configurator"
 msgstr "Entfernte Postfacheinstellungen"
 
-#: ../src/mailbox-conf.c:1201
-msgid "POP3 over SSL (POP3S)"
-msgstr "POP3 Ã¼ber SSL (POP3S)"
-
-#. mailbox name
-#: ../src/mailbox-conf.c:1229 ../src/mailbox-conf.c:1328
-msgid "Mailbox _name:"
-msgstr "Postfach_name:"
-
-#. password field
-#: ../src/mailbox-conf.c:1245 ../src/mailbox-conf.c:1362
-msgid "Pass_word:"
-msgstr "Pass_wort:"
-
-#: ../src/mailbox-conf.c:1251
+#: ../src/mailbox-conf.c:797
 msgid "_Delete messages from server after download"
 msgstr "Nachrichten nach dem Herunterladen vom Server _lÃ¶schen"
 
-#: ../src/mailbox-conf.c:1255
+#. toggle for check
+#: ../src/mailbox-conf.c:800
 msgid "_Enable check for new mail"
 msgstr "Dieses Postfach auf neue Mail Ã¼ber_prÃ¼fen"
 
-#: ../src/mailbox-conf.c:1259
+#: ../src/mailbox-conf.c:805
 msgid "_Filter messages through procmail"
 msgstr "Nachrichten durch procmail _filtern"
 
-#: ../src/mailbox-conf.c:1261
+#: ../src/mailbox-conf.c:806
 msgid "Fi_lter Command:"
 msgstr "Fi_lterbefehl:"
 
-#. toggle for apop
-#: ../src/mailbox-conf.c:1271
+#. advanced - toggle for apop
+#: ../src/mailbox-conf.c:810
 msgid "Disable _APOP"
 msgstr "_APOP deaktivieren"
 
 #. toggle for enabling pipeling
-#: ../src/mailbox-conf.c:1273
+#: ../src/mailbox-conf.c:814
 msgid "Overlap commands"
 msgstr "Overlap-Befehle"
 
-#. username
-#: ../src/mailbox-conf.c:1343
-msgid "_Username:"
-msgstr "_Benutzername:"
-
-#: ../src/mailbox-conf.c:1367
-msgid "F_older path:"
-msgstr "_Ordnerpfad:"
-
-#: ../src/mailbox-conf.c:1450
+#: ../src/mailbox-conf.c:875
 msgid "_Identity:"
 msgstr "_IdentitÃ¤t:"
 
-#: ../src/mailbox-conf.c:1471 ../src/pref-manager.c:213
-#: ../src/pref-manager.c:1146
+#: ../src/mailbox-conf.c:896
+msgid ""
+"_Decrypt and check\n"
+"signatures automatically:"
+msgstr ""
+"Automatische _EntschlÃ¼sselung\n"
+"und UnterschriftsprÃ¼fung:"
+
+#: ../src/mailbox-conf.c:904 ../src/pref-manager.c:212
+#: ../src/pref-manager.c:1161
 msgid "Never"
 msgstr "Nie"
 
-#: ../src/mailbox-conf.c:1472
+#: ../src/mailbox-conf.c:905
 msgid "If Possible"
 msgstr "Wenn mÃ¶glich"
 
-#: ../src/mailbox-conf.c:1473 ../src/pref-manager.c:1148
+#: ../src/mailbox-conf.c:906 ../src/pref-manager.c:1163
 msgid "Always"
 msgstr "Immer"
 
-#: ../src/mailbox-conf.c:1477
-msgid ""
-"_Decrypt and check\n"
-"signatures automatically:"
-msgstr ""
-"Automatische _EntschlÃ¼sselung\n"
-"und UnterschriftsprÃ¼fung:"
-
-#: ../src/mailbox-conf.c:1504
+#: ../src/mailbox-conf.c:922
 msgid "Show _Recipient column instead of Sender"
 msgstr "Spalte Â»EmpfÃ¤nge_rÂ« anstelle von Â»AbsenderÂ« anzeigen"
 
-#: ../src/mailbox-conf.c:1518
+#: ../src/mailbox-conf.c:936
 msgid "_Subscribe for new mail check"
 msgstr "_Automatisch nach neuen E-Mails sehen"
 
-#: ../src/mailbox-node.c:317
+#: ../src/mailbox-conf.c:952
+msgid "_Thread messages"
+msgstr "Nachrich_tenkonversationen zusammenfassen"
+
+#: ../src/mailbox-conf.c:967
+msgid "_Merge threads with the same subject"
+msgstr "Konversationen _mit dem gleichen Betreff zusammenfassen"
+
+#: ../src/mailbox-node.c:318
 msgid "The folder edition to be written."
 msgstr "Die zu schreibende Ordnerausgabe."
 
-#: ../src/mailbox-node.c:497
+#: ../src/mailbox-node.c:494
 #, c-format
 msgid "Scanning %s. Please waitâ€¦"
 msgstr "Inhalt von %s wird eingelesen. Bitte warten â€¦"
 
-#: ../src/mailbox-node.c:513
+#: ../src/mailbox-node.c:510
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -4808,160 +4890,160 @@ msgstr ""
 "%s konnte nicht Ã¼berprÃ¼ft werden: %s\n"
 "Bitte Ã¼berprÃ¼fen Sie Ihre Netzwerkverbindung."
 
-#: ../src/mailbox-node.c:515
+#: ../src/mailbox-node.c:512
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Einlesen von %s ist fehlgeschlagen: %s"
 
-#: ../src/mailbox-node.c:1065
+#: ../src/mailbox-node.c:1050
 msgid "Local _mbox mailboxâ€¦"
 msgstr "Lokales _Mbox-Postfach â€¦"
 
-#: ../src/mailbox-node.c:1067
+#: ../src/mailbox-node.c:1052
 msgid "Local Mail_dir mailboxâ€¦"
 msgstr "Lokales Mail_dir-Postfach â€¦"
 
-#: ../src/mailbox-node.c:1069
+#: ../src/mailbox-node.c:1054
 msgid "Local M_H mailboxâ€¦"
 msgstr "Lokales M_H-Postfach â€¦"
 
-#: ../src/mailbox-node.c:1072
+#: ../src/mailbox-node.c:1057
 msgid "Remote IMAP _folderâ€¦"
 msgstr "IMAP-_Ordner im Netz â€¦"
 
-#: ../src/mailbox-node.c:1075
+#: ../src/mailbox-node.c:1060
 msgid "Remote IMAP _subfolderâ€¦"
 msgstr "IMAP-_Unterordner im Netz â€¦"
 
 #. Translators: popup menu item "New" mailbox or folder
-#: ../src/mailbox-node.c:1081
+#: ../src/mailbox-node.c:1066
 msgctxt "mailbox"
 msgid "_New"
 msgstr "_Neu"
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1088 ../src/mailbox-node.c:1104
+#: ../src/mailbox-node.c:1073 ../src/mailbox-node.c:1089
 msgid "_Rescan"
 msgstr "_Neu einlesen"
 
-#: ../src/mailbox-node.c:1098
+#: ../src/mailbox-node.c:1083
 msgid "_Propertiesâ€¦"
 msgstr "_Eigenschaften â€¦"
 
-#: ../src/mailbox-node.c:1128
+#: ../src/mailbox-node.c:1113
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/mailbox-node.c:1130
+#: ../src/mailbox-node.c:1115
 msgid "_Unsubscribe"
 msgstr "A_bbestellen"
 
-#: ../src/mailbox-node.c:1136
+#: ../src/mailbox-node.c:1121
 msgid "Mark as _Inbox"
 msgstr "Als _Eingang verwenden"
 
-#: ../src/mailbox-node.c:1138
+#: ../src/mailbox-node.c:1123
 msgid "_Mark as Sentbox"
 msgstr "Als _Verschickt verwenden"
 
-#: ../src/mailbox-node.c:1140
+#: ../src/mailbox-node.c:1125
 msgid "Mark as _Trash"
 msgstr "Als _Papierkorb verwenden"
 
-#: ../src/mailbox-node.c:1142
+#: ../src/mailbox-node.c:1127
 msgid "Mark as D_raftbox"
 msgstr "Als _EntwÃ¼rfe verwenden"
 
-#: ../src/mailbox-node.c:1145
+#: ../src/mailbox-node.c:1130
 msgid "_Empty trash"
 msgstr "Papierkorb _leeren"
 
-#: ../src/mailbox-node.c:1150
+#: ../src/mailbox-node.c:1135
 msgid "_Edit/Apply filters"
 msgstr "Filter _bearbeiten/anwenden"
 
-#: ../src/mailbox-node.c:1237
+#: ../src/mailbox-node.c:1222
 #, c-format
 msgid "The path â€œ%sâ€ does not lead to a mailbox."
 msgstr "Der Pfad Â»%sÂ« zeigt nicht auf ein Postfach."
 
-#: ../src/mailbox-node.c:1250
+#: ../src/mailbox-node.c:1235
 #, c-format
 msgid "Local mailbox %s loaded as: %s\n"
 msgstr "Lokales Postfach %s geladen als: %s\n"
 
-#: ../src/mailbox-node.c:1281
+#: ../src/mailbox-node.c:1266
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Lokaler Ordner %s\n"
 
-#: ../src/main.c:106 ../src/main.c:111 ../src/main.c:117 ../src/main.c:123
-#: ../src/main.c:129
+#: ../src/main.c:108 ../src/main.c:113 ../src/main.c:119 ../src/main.c:125
+#: ../src/main.c:131
 #, c-format
 msgid "Balsa cannot open your â€œ%sâ€ mailbox."
 msgstr "Das Postfach Â»%sÂ« kann nicht geÃ¶ffnet werden."
 
-#: ../src/main.c:106
+#: ../src/main.c:108
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../src/main.c:112
+#: ../src/main.c:114
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../src/main.c:118
+#: ../src/main.c:120
 msgid "Sentbox"
 msgstr "Verschickt"
 
-#: ../src/main.c:124
+#: ../src/main.c:126
 msgid "Draftbox"
 msgstr "EntwÃ¼rfe"
 
-#: ../src/main.c:129
+#: ../src/main.c:131
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: ../src/main.c:339
+#: ../src/main.c:340
 msgid "Compressing mail foldersâ€¦"
 msgstr "Nachrichtenordner werden komprimiert â€¦"
 
-#: ../src/main.c:634
+#: ../src/main.c:648
 msgid "Get new mail on start-up"
 msgstr "Beim Start neue Mails abholen"
 
-#: ../src/main.c:636
+#: ../src/main.c:650
 msgid "Compose a new email to EMAIL@ADDRESS"
 msgstr "Eine neue Mail an E-MAIL@ADRESSE verfassen"
 
-#: ../src/main.c:638
+#: ../src/main.c:652
 msgid "Attach file at URI"
 msgstr "Datei zur Adresse beilegen"
 
-#: ../src/main.c:641
+#: ../src/main.c:655
 msgid "Opens MAILBOXNAME"
 msgstr "Ã–ffnet POSTFACHNAME"
 
-#: ../src/main.c:641
+#: ../src/main.c:655
 msgid "MAILBOXNAME"
 msgstr "POSTFACHNAME"
 
-#: ../src/main.c:644
+#: ../src/main.c:658
 msgid "Opens first unread mailbox"
 msgstr "Erstes ungelesenes Postfach Ã¶ffnen"
 
-#: ../src/main.c:647
+#: ../src/main.c:661
 msgid "Opens default Inbox on start-up"
 msgstr "Ã–ffnet das voreingestellte Eingangs-Postfach beim Start"
 
-#: ../src/main.c:650
+#: ../src/main.c:664
 msgid "Prints number unread and unsent messages"
 msgstr "Druckt die Anzahl an ungelesenen und ungesendeten Nachrichten"
 
-#: ../src/main.c:651
+#: ../src/main.c:665
 msgid "Show help options"
 msgstr "Hilfeoptionen anzeigen"
 
-#: ../src/main.c:652
+#: ../src/main.c:666
 msgid "Show version"
 msgstr "Version anzeigen"
 
@@ -4997,47 +5079,47 @@ msgstr "Ã„lter als (Tage):"
 msgid "Old at most (days):"
 msgstr "Ã„lter als (Tage):"
 
-#: ../src/main-window.c:978
+#: ../src/main-window.c:953
 msgid "translator-credits"
 msgstr ""
 "Christian Neumair <chris gnome-de org>\n"
 "Hendrik Brandt <heb gnome-de org>\n"
 "Mario BlÃ¤ttermann <mario blaettermann gmail com>"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:964
 msgid "The Balsa email client is part of the GNOME desktop environment."
 msgstr "Das Mailprogramm Balsa ist Teil der GNOME-Arbeitsumgebung."
 
 #. license ?
-#: ../src/main-window.c:994
+#: ../src/main-window.c:969
 msgid "About Balsa"
 msgstr "Info zu Balsa"
 
-#: ../src/main-window.c:1016
+#: ../src/main-window.c:991
 msgid "Balsa closes files and connections. Please waitâ€¦"
 msgstr "Balsa schlieÃŸt alle Dateien und Verbindungen. Bitte warten â€¦"
 
-#: ../src/main-window.c:1407
+#: ../src/main-window.c:1382
 msgid "You can apply filters only on mailbox\n"
 msgstr "Sie kÃ¶nnen Filter nur auf PostfÃ¤cher anwenden\n"
 
-#: ../src/main-window.c:1427
+#: ../src/main-window.c:1402
 #, c-format
 msgid "Removing duplicates failed: %s"
 msgstr "Entfernen der Duplikate fehlgeschlagen: %s"
 
-#: ../src/main-window.c:1433
+#: ../src/main-window.c:1408
 #, c-format
 msgid "Removed %d duplicate"
 msgid_plural "Removed %d duplicates"
 msgstr[0] "%d Duplikat entfernt"
 msgstr[1] "%d Duplikate entfernt"
 
-#: ../src/main-window.c:1438
+#: ../src/main-window.c:1413
 msgid "No duplicates found"
 msgstr "Keine Duplikate gefunden"
 
-#: ../src/main-window.c:2958
+#: ../src/main-window.c:2899
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -5046,323 +5128,319 @@ msgstr ""
 "Postfach konnte nicht geÃ¶ffnet werden!\n"
 "%s."
 
-#: ../src/main-window.c:2994
+#: ../src/main-window.c:2935
 #, c-format
 msgid "Opening %s"
 msgstr "Â»%sÂ« wird geÃ¶ffnet"
 
-#: ../src/main-window.c:3236 ../src/main-window.c:3385
-#: ../src/main-window.c:3502 ../src/main-window.c:3513
+#: ../src/main-window.c:3177 ../src/main-window.c:3327 ../src/main-window.c:3444
+#: ../src/main-window.c:3455
 msgid "Checking Mailâ€¦"
 msgstr "ÃœberprÃ¼fung auf neue Nachrichten â€¦"
 
-#: ../src/main-window.c:3464 ../src/main-window.c:3469
-#: ../src/main-window.c:3502 ../src/main-window.c:3508
+#: ../src/main-window.c:3406 ../src/main-window.c:3411 ../src/main-window.c:3444
+#: ../src/main-window.c:3450
 msgid "Mailboxes"
 msgstr "PostfÃ¤cher"
 
-#: ../src/main-window.c:3465
+#: ../src/main-window.c:3407
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "IMAP-Postfach: %s"
 
-#: ../src/main-window.c:3470
+#: ../src/main-window.c:3412
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Lokales Postfach: %s"
 
-#: ../src/main-window.c:3542
+#: ../src/main-window.c:3484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Sie haben %d neue Nachricht erhalten."
 msgstr[1] "Sie haben %d neue Nachrichten erhalten."
 
-#: ../src/main-window.c:3545
+#: ../src/main-window.c:3487
 msgid "You have new mail."
 msgstr "Sie haben neue Nachrichten erhalten."
 
-#: ../src/main-window.c:3739
+#: ../src/main-window.c:3681
 msgid "Search mailbox"
 msgstr "Postfach suchen"
 
-#: ../src/main-window.c:3765
+#: ../src/main-window.c:3707
 msgid "_Search for:"
 msgstr "_Suchen nach:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3778
+#: ../src/main-window.c:3720
 msgid "In:"
 msgstr "In:"
 
-#: ../src/main-window.c:3790
+#: ../src/main-window.c:3732
 msgid "S_ubject"
 msgstr "Be_treff"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3795
+#: ../src/main-window.c:3737
 msgid "Show only matching messages"
 msgstr "Nur zutreffende Nachrichten anzeigen"
 
 #. Frame with OK button
-#: ../src/main-window.c:3816
+#: ../src/main-window.c:3758
 msgid "Open next matching message"
 msgstr "NÃ¤chste zutreffende Nachricht Ã¶ffnen"
 
-#: ../src/main-window.c:3828
+#: ../src/main-window.c:3770
 msgid "_Reverse search"
 msgstr "_RÃ¼ckwÃ¤rts suchen"
 
-#: ../src/main-window.c:3833
+#: ../src/main-window.c:3775
 msgid "_Wrap around"
 msgstr "_Umlauf"
 
-#: ../src/main-window.c:4057
+#: ../src/main-window.c:3999
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Papierkorb konnte nicht geÃ¶ffnet werden: %s"
 
-#: ../src/main-window.c:4192
+#: ../src/main-window.c:4126
 #, c-format
 msgid "Balsa: %s (read-only)"
 msgstr "Balsa: %s (schreibgeschÃ¼tzt)"
 
-#: ../src/main-window.c:4194
+#: ../src/main-window.c:4128
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
 
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:4687
+#: ../src/main-window.c:4659
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Angezeigtes Postfach: %s "
 
-#: ../src/main-window.c:4692
+#: ../src/main-window.c:4664
 #, c-format
 msgid "with %d message"
 msgid_plural "with %d messages"
 msgstr[0] "mit %d Nachricht"
 msgstr[1] "mit %d Nachrichten"
 
-#: ../src/main-window.c:4699
+#: ../src/main-window.c:4671
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
 msgstr[0] ", %d new"
 msgstr[1] ", %d neue"
 
-#: ../src/main-window.c:4706
+#: ../src/main-window.c:4678
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
 msgstr[0] ", %d versteckt"
 msgstr[1] ", %d versteckte"
 
-#: ../src/main-window.c:4751
+#: ../src/main-window.c:4723
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "Die nÃ¤chste ungelesene Nachricht befindet sich in %s"
 
-#: ../src/main-window.c:4758
+#: ../src/main-window.c:4730
 #, c-format
 msgid "Do you want to select %s?"
 msgstr "Wollen Sie %s auswÃ¤hlen?"
 
-#: ../src/message-window.c:299 ../ui/message-window.ui.h:19
+#: ../src/message-window.c:300 ../ui/message-window.ui.h:19
 msgid "M_ove"
 msgstr "_Verschieben"
 
-#: ../src/message-window.c:744
+#: ../src/message-window.c:725
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Nachricht von %s: %s"
 
-#: ../src/pref-manager.c:211
+#: ../src/pref-manager.c:210
 msgid "While retrieving messages"
 msgstr "Beim Abholen von Nachrichten"
 
-#: ../src/pref-manager.c:212
+#: ../src/pref-manager.c:211
 msgid "Until closed"
 msgstr "Bis zum SchlieÃŸen"
 
-#: ../src/pref-manager.c:218
+#: ../src/pref-manager.c:217
 msgid "Message number"
 msgstr "Nachrichtennummer"
 
-#: ../src/pref-manager.c:222
+#: ../src/pref-manager.c:221
 msgid "Sender"
 msgstr "Absender"
 
-#: ../src/pref-manager.c:226
+#: ../src/pref-manager.c:225
 msgid "Flat"
 msgstr "Flach"
 
-#: ../src/pref-manager.c:228
+#: ../src/pref-manager.c:227
 msgid "JWZ"
 msgstr "JWZ"
 
-#: ../src/pref-manager.c:928 ../src/pref-manager.c:3585
+#: ../src/pref-manager.c:943 ../src/pref-manager.c:3594
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/pref-manager.c:931
+#: ../src/pref-manager.c:946
 #, c-format
 msgid "%s (default)"
 msgstr "%s (Vorgabe)"
 
-#: ../src/pref-manager.c:1048
+#: ../src/pref-manager.c:1063
 msgid "Default layout"
 msgstr "Vorgegebene Anordnung"
 
-#: ../src/pref-manager.c:1049
+#: ../src/pref-manager.c:1064
 msgid "Wide message layout"
 msgstr "Breitbild-Nachrichtenansicht"
 
-#: ../src/pref-manager.c:1050
+#: ../src/pref-manager.c:1065
 msgid "Wide screen layout"
 msgstr "Breitbild-Anordnung"
 
-#: ../src/pref-manager.c:1058
+#: ../src/pref-manager.c:1073
 msgid "Show next unread message"
 msgstr "NÃ¤chste ungelesene Nachricht anzeigen"
 
-#: ../src/pref-manager.c:1059
+#: ../src/pref-manager.c:1074
 msgid "Show next message"
 msgstr "NÃ¤chste Nachricht anzeigen"
 
-#: ../src/pref-manager.c:1060
+#: ../src/pref-manager.c:1075
 msgid "Close message window"
 msgstr "Nachrichtenfenster schlieÃŸen"
 
-#: ../src/pref-manager.c:1114
+#: ../src/pref-manager.c:1129
 #, c-format
 msgid "Error displaying %s: %s\n"
 msgstr "Fehler beim Anzeigen von %s: %s\n"
 
-#: ../src/pref-manager.c:1127
+#: ../src/pref-manager.c:1142
 msgid "Show nothing"
 msgstr "Nichts anzeigen"
 
-#: ../src/pref-manager.c:1129
+#: ../src/pref-manager.c:1144
 msgid "Show dialog"
 msgstr "Dialog anzeigen"
 
-#: ../src/pref-manager.c:1131
+#: ../src/pref-manager.c:1146
 msgid "Show in list"
 msgstr "In Liste anzeigen"
 
-#: ../src/pref-manager.c:1133
+#: ../src/pref-manager.c:1148
 msgid "Show in status bar"
 msgstr "In der Statusleiste anzeigen"
 
-#: ../src/pref-manager.c:1135
+#: ../src/pref-manager.c:1150
 msgid "Print to console"
 msgstr "Im Terminal ausgeben"
 
-#: ../src/pref-manager.c:1147
+#: ../src/pref-manager.c:1162
 msgid "Ask me"
 msgstr "Nachfragen"
 
-#: ../src/pref-manager.c:1701
+#: ../src/pref-manager.c:1716
 msgid "Remote POP3 mailboxâ€¦"
 msgstr "POP3-Postfach im Netz â€¦"
 
-#: ../src/pref-manager.c:1705
-msgid "Remote IMAP mailboxâ€¦"
-msgstr "IMAP-Postfach im Netz â€¦"
-
-#: ../src/pref-manager.c:1709 ../ui/main-window.ui.h:7
+#: ../src/pref-manager.c:1720 ../ui/main-window.ui.h:7
 msgid "Remote IMAP folderâ€¦"
 msgstr "IMAP-Ordner im Netz â€¦"
 
-#: ../src/pref-manager.c:1970
+#: ../src/pref-manager.c:1981
 msgid "Remote mailbox servers"
 msgstr "Postfachserver im Netz"
 
-#: ../src/pref-manager.c:1987 ../src/pref-manager.c:2743
-#: ../src/sendmsg-window.c:2677
+#: ../src/pref-manager.c:1998 ../src/pref-manager.c:2749
+#: ../src/sendmsg-window.c:2663
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/pref-manager.c:1995
+#: ../src/pref-manager.c:2006
 msgid "Mailbox name"
 msgstr "Postfachname"
 
-#: ../src/pref-manager.c:2017 ../src/pref-manager.c:2100
-#: ../src/pref-manager.c:2786
+#: ../src/pref-manager.c:2028 ../src/pref-manager.c:2111
+#: ../src/pref-manager.c:2792
 msgid "_Modify"
 msgstr "_Bearbeiten"
 
-#: ../src/pref-manager.c:2039
+#: ../src/pref-manager.c:2050
 msgid "Local mail directory"
 msgstr "Lokaler E-Mail-Ordner"
 
-#: ../src/pref-manager.c:2042
+#: ../src/pref-manager.c:2053
 msgid "Select your local mail directory"
 msgstr "WÃ¤hlen Sie Ihren lokalen Mail-Ordner"
 
-#: ../src/pref-manager.c:2066
+#: ../src/pref-manager.c:2077
 msgid "Outgoing mail servers"
 msgstr "Server fÃ¼r ausgehende E-Mails"
 
-#: ../src/pref-manager.c:2084
+#: ../src/pref-manager.c:2095
 msgid "Server name"
 msgstr "Server-Name"
 
-#: ../src/pref-manager.c:2128
+#: ../src/pref-manager.c:2139
 msgid "Checking"
 msgstr "PrÃ¼fen"
 
-#: ../src/pref-manager.c:2131
+#: ../src/pref-manager.c:2142
 msgid "_Check mail automatically every"
 msgstr "_Automatisch nach neuen Nachrichten sehen alle"
 
-#: ../src/pref-manager.c:2139 ../src/pref-manager.c:2311
-#: ../src/pref-manager.c:2917 ../src/pref-manager.c:2966
+#: ../src/pref-manager.c:2150 ../src/pref-manager.c:2322
+#: ../src/pref-manager.c:2923 ../src/pref-manager.c:2972
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../src/pref-manager.c:2144
+#: ../src/pref-manager.c:2155
 msgid "Check _IMAP mailboxes"
 msgstr "_IMAP-PostfÃ¤cher Ã¼berprÃ¼fen"
 
-#: ../src/pref-manager.c:2148
+#: ../src/pref-manager.c:2159
 msgid "Check Inbox _only"
 msgstr "_Nur Eingang Ã¼berprÃ¼fen"
 
-#: ../src/pref-manager.c:2153
+#: ../src/pref-manager.c:2164
 msgid "When mail arrives:"
 msgstr "Bei eingehenden Nachrichten:"
 
-#: ../src/pref-manager.c:2158
+#: ../src/pref-manager.c:2169
 msgid "Display message"
 msgstr "Nachricht anzeigen"
 
-#: ../src/pref-manager.c:2163
+#: ../src/pref-manager.c:2174
 msgid "Play sound"
 msgstr "Klang abspielen"
 
-#: ../src/pref-manager.c:2168
+#: ../src/pref-manager.c:2179
 msgid "Show icon"
 msgstr "Zeige Benachrichtigungssymbol"
 
-#: ../src/pref-manager.c:2175
+#: ../src/pref-manager.c:2186
 msgid "Do background check quietly (no messages in status bar)"
 msgstr ""
 "ÃœberprÃ¼fung im Hintergrund ausfÃ¼hren (keine Meldungen in der Statusanzeige)"
 
-#: ../src/pref-manager.c:2178
+#: ../src/pref-manager.c:2189
 msgid "_POP message size limit:"
 msgstr "GrÃ¶ÃŸenbeschrÃ¤nkung bei _POP-Nachrichten:"
 
-#: ../src/pref-manager.c:2207
+#: ../src/pref-manager.c:2218
 msgid "Message disposition notification requests"
 msgstr "Bitte um EmpfangsbestÃ¤tigung"
 
-#: ../src/pref-manager.c:2212
+#: ../src/pref-manager.c:2223
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -5371,295 +5449,296 @@ msgstr ""
 "EmpfangsbestÃ¤tigung\n"
 "(MDN) gebeten hat, diese in folgenden FÃ¤llen verschicken:"
 
-#: ../src/pref-manager.c:2220
+#: ../src/pref-manager.c:2231
 msgid ""
-"The message header looks clean (the notify-to address is the return path, "
-"and I am in the â€œTo:â€ or â€œCC:â€ list)."
+"The message header looks clean (the notify-to address is the return path, and "
+"I am in the â€œTo:â€ or â€œCC:â€ list)."
 msgstr ""
 "Der Nachrichtenkopf sieht sauber aus (die BestÃ¤tigungsadresse ist gleich dem "
 "Antwortpfad, und Sie sind in der Â»An:Â«- oder Â»KopieÂ«-Liste)."
 
-#: ../src/pref-manager.c:2234
+#: ../src/pref-manager.c:2245
 msgid "The message header looks suspicious."
 msgstr "Der Nachrichtenkopf sieht verdÃ¤chtig aus."
 
-#: ../src/pref-manager.c:2258
+#: ../src/pref-manager.c:2269
 msgid "Word wrap"
 msgstr "Zeilenumbruch"
 
-#: ../src/pref-manager.c:2261
+#: ../src/pref-manager.c:2272
 msgid "Wrap outgoing text at"
 msgstr "Ausgehenden Text umbrechen bei"
 
-#: ../src/pref-manager.c:2270 ../src/pref-manager.c:2525
+#: ../src/pref-manager.c:2281 ../src/pref-manager.c:2531
 msgid "characters"
 msgstr "Zeichen"
 
-#: ../src/pref-manager.c:2289
+#: ../src/pref-manager.c:2300
 msgid "Other options"
 msgstr "Weitere Einstellungen"
 
-#: ../src/pref-manager.c:2291
+#: ../src/pref-manager.c:2302
 msgid "Reply prefix:"
 msgstr "AntwortprÃ¤fix:"
 
-#: ../src/pref-manager.c:2294
+#: ../src/pref-manager.c:2305
 msgid "Automatically quote original when replying"
 msgstr "Automatisch beim Antworten das Original zitieren"
 
-#: ../src/pref-manager.c:2297
+#: ../src/pref-manager.c:2308
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Mail als Anlage weiterleiten anstatt sie zu zitieren"
 
-#: ../src/pref-manager.c:2300
+#: ../src/pref-manager.c:2311
 msgid "Copy outgoing messages to sentbox"
 msgstr "Ausgehende Nachrichten in den Verschickt-Ordner kopieren"
 
-#: ../src/pref-manager.c:2302
+#: ../src/pref-manager.c:2313
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "Verschicken-Knopf stellt Mails immer in die Warteschlange"
 
-#: ../src/pref-manager.c:2306
+#: ../src/pref-manager.c:2317
 msgid "_Send queued mail automatically every"
 msgstr "Automatisch Ã¼ber Warte_schlange versenden alle"
 
-#: ../src/pref-manager.c:2316
+#: ../src/pref-manager.c:2327
 msgid "Edit headers in external editor"
 msgstr "Kopfzeilen im externen Editor bearbeiten"
 
-#: ../src/pref-manager.c:2318
+#: ../src/pref-manager.c:2329
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr "Beim Antworten oder Weiterleiten HTML-Teile als Text einfÃ¼gen"
 
-#: ../src/pref-manager.c:2336 ../src/toolbar-prefs.c:170
+#: ../src/pref-manager.c:2347 ../src/toolbar-prefs.c:171
 msgid "Main window"
 msgstr "Hauptfenster"
 
-#: ../src/pref-manager.c:2339
+#: ../src/pref-manager.c:2350
 msgid "Use preview pane"
 msgstr "VorschauflÃ¤che verwenden"
 
-#: ../src/pref-manager.c:2343
+#: ../src/pref-manager.c:2354
 msgid "Show message counts in mailbox list"
 msgstr "Nachrichtenanzahl in Postfachliste anzeigen"
 
-#: ../src/pref-manager.c:2349
+#: ../src/pref-manager.c:2360
 msgid "Automatically view message when mailbox opened"
 msgstr "Nachricht automatisch anzeigen, wenn Postfach geÃ¶ffnet wird"
 
-#: ../src/pref-manager.c:2352
+#: ../src/pref-manager.c:2363
 msgid "Ask me before selecting a different mailbox to show an unread message"
 msgstr ""
 "Nachfragen, bevor ein anderes Postfach zum Anzeigen einer ungelesenen "
 "Nachricht ausgewÃ¤hlt wird"
 
-#: ../src/pref-manager.c:2356
+#: ../src/pref-manager.c:2367
 msgid "Page Up/Page Down keys scroll text by"
 msgstr "BildAuf/BildAb-Tasten rollen Text um"
 
-#: ../src/pref-manager.c:2364
+#: ../src/pref-manager.c:2375
 msgid "percent"
 msgstr "Prozent"
 
-#: ../src/pref-manager.c:2381 ../src/toolbar-prefs.c:192
+#: ../src/pref-manager.c:2392 ../src/toolbar-prefs.c:193
 msgid "Message window"
 msgstr "Nachrichtenfenster"
 
-#: ../src/pref-manager.c:2383
+#: ../src/pref-manager.c:2394
 msgid "After moving a message:"
 msgstr "Nach dem Verschieben einer Nachricht:"
 
-#: ../src/pref-manager.c:2404
+#: ../src/pref-manager.c:2415
 msgid "Sorting and threading"
 msgstr "Sortierung und Themen"
 
-#: ../src/pref-manager.c:2406
+#: ../src/pref-manager.c:2417
 msgid "Default sort column:"
 msgstr "Nach dieser Spalte sortieren:"
 
-#: ../src/pref-manager.c:2413
-msgid "Default threading style:"
-msgstr "Vorgabestil fÃ¼r Themen:"
+#: ../src/pref-manager.c:2425
+msgid "Thread messages by default"
+msgstr "Nachrichtenkonversationen per Vorgabe zusammanfassen"
 
-#: ../src/pref-manager.c:2421
+#: ../src/pref-manager.c:2427
 msgid "Expand threads on open"
 msgstr "Nachrichtenthemen beim Ã–ffnen ausklappen"
 
-#: ../src/pref-manager.c:2446 ../src/print-gtk.c:506
+#. fonts
+#: ../src/pref-manager.c:2452 ../src/print-gtk.c:589
 msgid "Fonts"
 msgstr "Schriften"
 
-#: ../src/pref-manager.c:2449
+#: ../src/pref-manager.c:2455
 msgid "Use system fonts"
 msgstr "Systemschriften verwenden"
 
-#: ../src/pref-manager.c:2457
+#: ../src/pref-manager.c:2463
 msgid "Use default font size"
 msgstr "Vorgegebene SchriftgrÃ¶ÃŸe verwenden"
 
-#: ../src/pref-manager.c:2463
+#: ../src/pref-manager.c:2469
 msgid "Message font:"
 msgstr "Nachrichten-Schriftart:"
 
-#: ../src/pref-manager.c:2470
+#: ../src/pref-manager.c:2476
 msgid "Subject font:"
 msgstr "Betreffzeilen-Schriftart:"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:2510
+#: ../src/pref-manager.c:2516
 msgid "Quoted and flowed text"
 msgstr "Zitierter und geflossener Text"
 
-#: ../src/pref-manager.c:2513
+#: ../src/pref-manager.c:2519
 msgid "Mark quoted text"
 msgstr "Zitierten Text markieren"
 
-#: ../src/pref-manager.c:2516
+#: ../src/pref-manager.c:2522
 msgid "Quoted text regular expression:"
 msgstr "Zitierter Text im regulÃ¤ren Ausdruck:"
 
-#: ../src/pref-manager.c:2519
+#: ../src/pref-manager.c:2525
 msgid "Wrap text at"
 msgstr "Text umbrechen bei"
 
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:2542
+#: ../src/pref-manager.c:2548
 msgid "Display of multipart/alternative parts"
 msgstr "Anzeige von Nachrichten mit mehreren Teilen (Multipart)"
 
-#: ../src/pref-manager.c:2546
+#: ../src/pref-manager.c:2552 ../src/print-gtk.c:611
 msgid "Prefer text/plain over HTML"
 msgstr "Klartext (text/plain) gegenÃ¼ber HTML bevorzugen"
 
-#: ../src/pref-manager.c:2562
+#: ../src/pref-manager.c:2568
 msgid "Message colors"
 msgstr "Nachrichtenfarben"
 
-#: ../src/pref-manager.c:2567
+#: ../src/pref-manager.c:2573
 #, c-format
 msgid "Quote level %d color"
 msgstr "Farbe fÃ¼r Zitatebene %d"
 
-#: ../src/pref-manager.c:2585
+#: ../src/pref-manager.c:2591
 msgid "Link color"
 msgstr "Link-Farbe"
 
-#: ../src/pref-manager.c:2587
+#: ../src/pref-manager.c:2593
 msgid "Hyperlink color"
 msgstr "Hyperlink-Farbe"
 
-#: ../src/pref-manager.c:2602 ../src/pref-manager.c:3208
+#: ../src/pref-manager.c:2608 ../src/pref-manager.c:3214
 msgid "Format"
 msgstr "Format"
 
-#: ../src/pref-manager.c:2605
+#: ../src/pref-manager.c:2611
 msgid "Date encoding (for strftime):"
 msgstr "Datumsformat (fÃ¼r strftime):"
 
-#: ../src/pref-manager.c:2607
+#: ../src/pref-manager.c:2613
 msgid "Selected headers:"
 msgstr "AusgewÃ¤hlte Kopfzeilen:"
 
 #. treatment of messages with 8-bit chars, but without proper MIME encoding
-#: ../src/pref-manager.c:2625
+#: ../src/pref-manager.c:2631
 msgid "National (8-bit) characters in broken messages without codeset header"
 msgstr ""
 "Nationale (8-Bit-)Zeichen in defekten Nachrichten ohne Zeichensatz-Kopfzeilen"
 
-#: ../src/pref-manager.c:2630
+#: ../src/pref-manager.c:2636
 msgid "display as â€œ?â€"
 msgstr "als Â»?Â« anzeigen"
 
-#: ../src/pref-manager.c:2638
+#: ../src/pref-manager.c:2644
 msgid "display in codeset"
 msgstr "In Zeichenkodierung anzeigen"
 
-#: ../src/pref-manager.c:2663
+#: ../src/pref-manager.c:2669
 msgid "Information messages"
 msgstr "Informationsmeldungen"
 
-#: ../src/pref-manager.c:2667
+#: ../src/pref-manager.c:2673
 msgid "Information messages:"
 msgstr "Informationsmeldungen:"
 
-#: ../src/pref-manager.c:2671
+#: ../src/pref-manager.c:2677
 msgid "Warning messages:"
 msgstr "Warnmeldungen:"
 
-#: ../src/pref-manager.c:2675
+#: ../src/pref-manager.c:2681
 msgid "Error messages:"
 msgstr "Fehlermeldungen:"
 
-#: ../src/pref-manager.c:2679
+#: ../src/pref-manager.c:2685
 msgid "Fatal error messages:"
 msgstr "Fatale Warnmeldungen:"
 
-#: ../src/pref-manager.c:2683
+#: ../src/pref-manager.c:2689
 msgid "Debug messages:"
 msgstr "Debug-Meldungen:"
 
-#: ../src/pref-manager.c:2699
+#: ../src/pref-manager.c:2705
 msgid "Display progress dialog"
 msgstr "Fortschrittsdialog anzeigen"
 
-#: ../src/pref-manager.c:2700
+#: ../src/pref-manager.c:2706
 msgid "Display progress dialog when sending messages"
 msgstr "Fortschrittsdialog beim Holen von Senden von Nachrichten anzeigen"
 
-#: ../src/pref-manager.c:2701
+#: ../src/pref-manager.c:2707
 msgid "Display progress dialog when retrieving messages"
 msgstr "Fortschrittsdialog beim Holen von Abrufen von Nachrichten anzeigen"
 
-#: ../src/pref-manager.c:2723 ../src/pref-manager.c:3336
+#: ../src/pref-manager.c:2729 ../src/pref-manager.c:3343
 msgid "Address books"
 msgstr "AdressbÃ¼cher"
 
-#: ../src/pref-manager.c:2751
+#: ../src/pref-manager.c:2757
 msgid "Address book name"
 msgstr "Adressbuchname"
 
-#: ../src/pref-manager.c:2759
+#: ../src/pref-manager.c:2765
 msgid "Auto-complete"
 msgstr "Auto-VervollstÃ¤ndigung"
 
-#: ../src/pref-manager.c:2792
+#: ../src/pref-manager.c:2798
 msgid "_Set as default"
 msgstr "Zur _Vorgabe machen"
 
-#: ../src/pref-manager.c:2809
+#: ../src/pref-manager.c:2815
 msgid "Miscellaneous spelling settings"
 msgstr "Verschiedene Einstellungen der RechtschreibprÃ¼fung"
 
-#: ../src/pref-manager.c:2813
+#: ../src/pref-manager.c:2819
 msgid "Check signature"
 msgstr "Unterschrift Ã¼berprÃ¼fen"
 
-#: ../src/pref-manager.c:2815
+#: ../src/pref-manager.c:2821
 msgid "Check quoted"
 msgstr "Zitate Ã¼berprÃ¼fen"
 
-#: ../src/pref-manager.c:2831
+#: ../src/pref-manager.c:2837
 msgid "Start-up options"
 msgstr "Startoptionen"
 
-#: ../src/pref-manager.c:2834
+#: ../src/pref-manager.c:2840
 msgid "Open Inbox upon start-up"
 msgstr "Beim Start Eingang Ã¶ffnen"
 
-#: ../src/pref-manager.c:2836
+#: ../src/pref-manager.c:2842
 msgid "Check mail upon start-up"
 msgstr "Beim Start auf neue Mail prÃ¼fen"
 
-#: ../src/pref-manager.c:2838
+#: ../src/pref-manager.c:2844
 msgid "Remember open mailboxes between sessions"
 msgstr "GeÃ¶ffnete PostfÃ¤cher wÃ¤hrend den Sitzungen merken"
 
-#: ../src/pref-manager.c:2856
+#: ../src/pref-manager.c:2862
 msgid "Folder scanning"
 msgstr "Einlesen der Ordner"
 
-#: ../src/pref-manager.c:2859
+#: ../src/pref-manager.c:2865
 msgid ""
 "Choose depth 1 for fast start-up; this defers scanning some folders. To see "
 "more of the tree at start-up, choose a greater depth."
@@ -5668,38 +5747,38 @@ msgstr ""
 "Ordner. Um mehr OrdnerbÃ¤ume beim Start zu sehen, wÃ¤hlen Sie eine grÃ¶ÃŸere "
 "Tiefe."
 
-#: ../src/pref-manager.c:2866
+#: ../src/pref-manager.c:2872
 msgid "Scan local folders to depth"
 msgstr "Lokale Ordner tief abtasten"
 
-#: ../src/pref-manager.c:2875
+#: ../src/pref-manager.c:2881
 msgid "Scan IMAP folders to depth"
 msgstr "IMAP-Ordner tief abtasten"
 
-#: ../src/pref-manager.c:2897 ../src/pref-manager.c:3350
+#: ../src/pref-manager.c:2903 ../src/pref-manager.c:3357
 msgid "Miscellaneous"
 msgstr "Weitere Einstellungen"
 
-#: ../src/pref-manager.c:2900
+#: ../src/pref-manager.c:2906
 msgid "Debug"
 msgstr "Fehlerdiagnose"
 
-#: ../src/pref-manager.c:2902
+#: ../src/pref-manager.c:2908
 msgid "Empty trash on exit"
 msgstr "Papierkorb beim Beenden leeren"
 
-#: ../src/pref-manager.c:2906
+#: ../src/pref-manager.c:2912
 msgid "Close mailbox if unused more than"
 msgstr "Postfach schlieÃŸen, wenn lÃ¤nger ungenutzt als"
 
-#: ../src/pref-manager.c:2934
+#: ../src/pref-manager.c:2940
 msgid "Deleting messages"
 msgstr "Nachrichten lÃ¶schen"
 
 #. Translators: this used to be "using Mailbox -> Hide messages";
 #. * the UTF-8 string for the right-arrow symbol is broken out to
 #. * avoid msgconv problems.
-#: ../src/pref-manager.c:2939
+#: ../src/pref-manager.c:2945
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -5708,96 +5787,96 @@ msgstr ""
 "Die folgende Einstellung ist global, kann jedoch fÃ¼r ein ausgewÃ¤hltes "
 "Postfach durch Â»Postfach %s -> VersteckenÂ« Ã¼berschrieben werden:"
 
-#: ../src/pref-manager.c:2947
+#: ../src/pref-manager.c:2953
 msgid "Hide messages marked as deleted"
 msgstr "Als gelÃ¶scht markierte Nachrichten verbergen"
 
-#: ../src/pref-manager.c:2949
+#: ../src/pref-manager.c:2955
 msgid "The following settings are global:"
 msgstr "Die folgenden Einstellungen sind global:"
 
-#: ../src/pref-manager.c:2952
+#: ../src/pref-manager.c:2958
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr ""
 "Als gelÃ¶scht markierte Nachrichten endgÃ¼ltig entfernen, wenn Postfach "
 "geschlossen wird"
 
-#: ../src/pref-manager.c:2956
+#: ../src/pref-manager.c:2962
 msgid "â€¦and if unused more than"
 msgstr "â€¦ und falls das Postfach lÃ¤nger ungenutzt war als"
 
-#: ../src/pref-manager.c:3173
+#: ../src/pref-manager.c:3179
 msgid "Mail options"
 msgstr "E-Mail-Einstellungen"
 
-#: ../src/pref-manager.c:3177
+#: ../src/pref-manager.c:3183
 msgid "Incoming"
 msgstr "Eingehend"
 
-#: ../src/pref-manager.c:3181
+#: ../src/pref-manager.c:3187
 msgid "Outgoing"
 msgstr "Ausgehend"
 
-#: ../src/pref-manager.c:3192
+#: ../src/pref-manager.c:3198
 msgid "Display options"
 msgstr "Einstellungen fÃ¼r die Anzeige"
 
-#: ../src/pref-manager.c:3196
+#: ../src/pref-manager.c:3202
 msgid "Sort and thread"
 msgstr "Sortierung und Themen"
 
-#: ../src/pref-manager.c:3200 ../src/print-gtk.c:497
+#: ../src/pref-manager.c:3206 ../src/print-gtk.c:581
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../src/pref-manager.c:3204
+#: ../src/pref-manager.c:3210
 msgid "Colors"
 msgstr "Farben"
 
-#: ../src/pref-manager.c:3212
+#: ../src/pref-manager.c:3218
 msgid "Status messages"
 msgstr "Statusmeldungen"
 
 #. must NOT be modal
-#: ../src/pref-manager.c:3278
+#: ../src/pref-manager.c:3285
 msgid "Balsa Preferences"
 msgstr "Balsa Einstellungen"
 
-#: ../src/pref-manager.c:3341 ../src/toolbar-factory.c:162
+#: ../src/pref-manager.c:3348 ../src/toolbar-factory.c:162
 msgid "Spelling"
 msgstr "Rechtschreibung"
 
-#: ../src/pref-manager.c:3346
+#: ../src/pref-manager.c:3353
 msgid "Start-up"
 msgstr "Start"
 
-#: ../src/print-gtk.c:89 ../src/print-gtk.c:248
+#: ../src/print-gtk.c:93 ../src/print-gtk.c:307
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../src/print-gtk.c:143 ../src/print-gtk.c:169
+#: ../src/print-gtk.c:173 ../src/print-gtk.c:211
 msgid "Signed and encrypted matter"
 msgstr "Unterschreiben und VerschlÃ¼sseln"
 
-#: ../src/print-gtk.c:147 ../src/print-gtk.c:173
+#: ../src/print-gtk.c:175 ../src/print-gtk.c:215
 msgid "Signed matter"
 msgstr "Unterschreiben"
 
-#: ../src/print-gtk.c:154
+#: ../src/print-gtk.c:222
 msgid "Encrypted matter"
 msgstr "VerschlÃ¼sseln"
 
-#: ../src/print-gtk.c:197
+#: ../src/print-gtk.c:256
 #, c-format
 msgid "This is an inline %s signed %s message part:"
 msgstr "Dies ist ein integrierter %s unterschriebener %s Nachrichtenteil:"
 
-#: ../src/print-gtk.c:199
+#: ../src/print-gtk.c:258
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: ../src/print-gtk.c:352
+#: ../src/print-gtk.c:411
 #, c-format
 msgid "Cannot print page %d because the document has only %d page."
 msgid_plural "Cannot print page %d because the document has only %d pages."
@@ -5812,72 +5891,79 @@ msgstr[1] ""
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: ../src/print-gtk.c:390
+#: ../src/print-gtk.c:449
 msgid "default:mm"
 msgstr "default:mm"
 
-#: ../src/print-gtk.c:446
+#: ../src/print-gtk.c:505
 msgid "inch"
 msgstr "Zoll"
 
-#: ../src/print-gtk.c:453
+#: ../src/print-gtk.c:512
 msgid "mm"
 msgstr "mm"
 
-#: ../src/print-gtk.c:527
+#: ../src/print-gtk.c:591
 msgid "_Header Font:"
 msgstr "_Kopfzeilen-Schriftart:"
 
-#: ../src/print-gtk.c:530
+#: ../src/print-gtk.c:592
 msgid "B_ody Font:"
 msgstr "_Nachrichtenrumpf-Schriftart:"
 
-#: ../src/print-gtk.c:533
+#: ../src/print-gtk.c:593
 msgid "_Footer Font:"
 msgstr "_FuÃŸzeilen-Schriftart:"
 
-#: ../src/print-gtk.c:540
+#. syntax highlighting
+#. treatment of HTML messages and parts
+#: ../src/print-gtk.c:596 ../src/print-gtk.c:609
 msgid "Highlighting"
 msgstr "Hervorhebungen"
 
-#: ../src/print-gtk.c:555
+#: ../src/print-gtk.c:599
 msgid "Highlight _cited text"
 msgstr "_Zitierten Text hervorheben"
 
-#: ../src/print-gtk.c:564
+#: ../src/print-gtk.c:603
 msgid "Highlight _structured phrases"
 msgstr "_Strukturierte Phrasen hervorheben"
 
-#: ../src/print-gtk.c:575
+#: ../src/print-gtk.c:615
+msgid "Download images from remote servers (may be dangerous)"
+msgstr "Bilder von fernen Servern herunterladen (kann gefÃ¤hrlich sein)"
+
+#. margins
+#: ../src/print-gtk.c:626
 msgid "Margins"
 msgstr "RÃ¤nder"
 
-#: ../src/print-gtk.c:597
+#: ../src/print-gtk.c:630
 msgid "_Top"
 msgstr "_Oben"
 
-#: ../src/print-gtk.c:603
+#: ../src/print-gtk.c:636
 msgid "_Bottom"
 msgstr "_Unten"
 
-#: ../src/print-gtk.c:615
+#: ../src/print-gtk.c:648
 msgid "_Left"
 msgstr "_Links"
 
-#: ../src/print-gtk.c:621
+#: ../src/print-gtk.c:654
 msgid "_Right"
 msgstr "_Rechts"
 
-#: ../src/print-gtk.c:744
+#: ../src/print-gtk.c:786
 #, c-format
 msgid "Error printing message: %s"
 msgstr "Fehler beim Drucken der Nachricht: %s"
 
-#: ../src/save-restore.c:560
+#: ../src/save-restore.c:640
 msgid "Error during filters loading: "
 msgstr "Fehler beim Laden der Filter: "
 
-#: ../src/save-restore.c:562
+#: ../src/save-restore.c:642
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -5886,26 +5972,26 @@ msgstr ""
 "Fehler beim Laden der Filter: %s\n"
 "MÃ¶glicherweise sind einer oder mehrere Filter fehlerhaft."
 
-#: ../src/save-restore.c:683
+#: ../src/save-restore.c:759
 msgid "The option not to recognize â€œformat=flowedâ€ text has been removed."
 msgstr "Die MÃ¶glichkeit, Â»format=flowedÂ«-Text zu erkennen, wurde entfernt."
 
-#: ../src/save-restore.c:958
+#: ../src/save-restore.c:1028
 msgid ""
-"The option not to send â€œformat=flowedâ€ text is now on the Options menu of "
-"the compose window."
+"The option not to send â€œformat=flowedâ€ text is now on the Options menu of the "
+"compose window."
 msgstr ""
 "Die MÃ¶glichkeit, Nachrichten mit Â»format=flowedÂ« zu verschicken, befindet "
 "sich nun im EinstellungsmenÃ¼ des Editorfensters."
 
-#: ../src/save-restore.c:997
+#: ../src/save-restore.c:1067
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "Die MÃ¶glichkeit, eine EmpfangsbestÃ¤tigung zu erbitten, befindet sich nun im "
 "EinstellungsmenÃ¼ des Editorfensters."
 
-#: ../src/save-restore.c:1074
+#: ../src/save-restore.c:1144
 msgid ""
 "This version of Balsa uses a new user interface; if you have changed Balsaâ€™s "
 "keyboard accelerators, you will need to set them again."
@@ -5916,179 +6002,179 @@ msgstr ""
 #. Translators: please use the initial letter of each language as
 #. * its accelerator; this is a long list, and unique accelerators
 #. * cannot be found.
-#: ../src/sendmsg-window.c:182
+#: ../src/sendmsg-window.c:187
 msgid "_Brazilian Portuguese"
 msgstr "_Brasilianisches Portugiesisch"
 
-#: ../src/sendmsg-window.c:183
+#: ../src/sendmsg-window.c:188
 msgid "_Catalan"
 msgstr "_Katalanisch"
 
-#: ../src/sendmsg-window.c:184
+#: ../src/sendmsg-window.c:189
 msgid "_Chinese Simplified"
 msgstr "_Chinesisch, vereinfacht"
 
-#: ../src/sendmsg-window.c:185
+#: ../src/sendmsg-window.c:190
 msgid "_Chinese Traditional"
 msgstr "_Chinesisch, traditionell"
 
-#: ../src/sendmsg-window.c:186
+#: ../src/sendmsg-window.c:191
 msgid "_Czech"
 msgstr "_Tschechisch"
 
-#: ../src/sendmsg-window.c:187
+#: ../src/sendmsg-window.c:192
 msgid "_Danish"
 msgstr "_DÃ¤nisch"
 
-#: ../src/sendmsg-window.c:188
+#: ../src/sendmsg-window.c:193
 msgid "_Dutch"
 msgstr "_NiederlÃ¤ndisch"
 
-#: ../src/sendmsg-window.c:189
+#: ../src/sendmsg-window.c:194
 msgid "_English (American)"
 msgstr "_Englisch (Amerikanisch)"
 
-#: ../src/sendmsg-window.c:190
+#: ../src/sendmsg-window.c:195
 msgid "_English (British)"
 msgstr "_Englisch (Britisch)"
 
-#: ../src/sendmsg-window.c:191
+#: ../src/sendmsg-window.c:196
 msgid "_Esperanto"
 msgstr "_Esperanto"
 
-#: ../src/sendmsg-window.c:192
+#: ../src/sendmsg-window.c:197
 msgid "_Estonian"
 msgstr "_Estnisch"
 
-#: ../src/sendmsg-window.c:193
+#: ../src/sendmsg-window.c:198
 msgid "_Finnish"
 msgstr "_Finnisch"
 
-#: ../src/sendmsg-window.c:194
+#: ../src/sendmsg-window.c:199
 msgid "_French"
 msgstr "_FranzÃ¶sisch"
 
-#: ../src/sendmsg-window.c:195
+#: ../src/sendmsg-window.c:200
 msgid "_German"
 msgstr "_Deutsch"
 
-#: ../src/sendmsg-window.c:196
+#: ../src/sendmsg-window.c:201
 msgid "_German (Austrian)"
 msgstr "_Deutsch (Ã–sterreich)"
 
-#: ../src/sendmsg-window.c:197
+#: ../src/sendmsg-window.c:202
 msgid "_German (Swiss)"
 msgstr "_Deutsch (Schweiz)"
 
-#: ../src/sendmsg-window.c:198
+#: ../src/sendmsg-window.c:203
 msgid "_Greek"
 msgstr "_Griechisch"
 
-#: ../src/sendmsg-window.c:199
+#: ../src/sendmsg-window.c:204
 msgid "_Hebrew"
 msgstr "_HebrÃ¤isch"
 
-#: ../src/sendmsg-window.c:200
+#: ../src/sendmsg-window.c:205
 msgid "_Hungarian"
 msgstr "_Ungarisch"
 
-#: ../src/sendmsg-window.c:201
+#: ../src/sendmsg-window.c:206
 msgid "_Italian"
 msgstr "_Italienisch"
 
-#: ../src/sendmsg-window.c:202
+#: ../src/sendmsg-window.c:207
 msgid "_Japanese (JIS)"
 msgstr "_Japanisch (JIS)"
 
-#: ../src/sendmsg-window.c:203
+#: ../src/sendmsg-window.c:208
 msgid "_Kazakh"
 msgstr "_Kasachisch"
 
-#: ../src/sendmsg-window.c:204
+#: ../src/sendmsg-window.c:209
 msgid "_Korean"
 msgstr "_Koreanisch"
 
-#: ../src/sendmsg-window.c:205
+#: ../src/sendmsg-window.c:210
 msgid "_Latvian"
 msgstr "_Lettisch"
 
-#: ../src/sendmsg-window.c:206
+#: ../src/sendmsg-window.c:211
 msgid "_Lithuanian"
 msgstr "_Litauisch"
 
-#: ../src/sendmsg-window.c:207
+#: ../src/sendmsg-window.c:212
 msgid "_Norwegian"
 msgstr "_Norwegisch"
 
-#: ../src/sendmsg-window.c:208
+#: ../src/sendmsg-window.c:213
 msgid "_Polish"
 msgstr "_Polnisch"
 
-#: ../src/sendmsg-window.c:209
+#: ../src/sendmsg-window.c:214
 msgid "_Portuguese"
 msgstr "_Portugiesisch"
 
-#: ../src/sendmsg-window.c:210
+#: ../src/sendmsg-window.c:215
 msgid "_Romanian"
 msgstr "_RumÃ¤nisch"
 
-#: ../src/sendmsg-window.c:211
+#: ../src/sendmsg-window.c:216
 msgid "_Russian"
 msgstr "_Russisch"
 
-#: ../src/sendmsg-window.c:212
+#: ../src/sendmsg-window.c:217
 msgid "_Serbian"
 msgstr "_Serbisch"
 
-#: ../src/sendmsg-window.c:213
+#: ../src/sendmsg-window.c:218
 msgid "_Serbian (Latin)"
 msgstr "_Serbisch (lateinische Schrift)"
 
-#: ../src/sendmsg-window.c:214
+#: ../src/sendmsg-window.c:219
 msgid "_Slovak"
 msgstr "_Slowakisch"
 
-#: ../src/sendmsg-window.c:215
+#: ../src/sendmsg-window.c:220
 msgid "_Spanish"
 msgstr "_Spanisch"
 
-#: ../src/sendmsg-window.c:216
+#: ../src/sendmsg-window.c:221
 msgid "_Swedish"
 msgstr "_Schwedisch"
 
-#: ../src/sendmsg-window.c:217
+#: ../src/sendmsg-window.c:222
 msgid "_Tatar"
 msgstr "_Tatarisch"
 
-#: ../src/sendmsg-window.c:218
+#: ../src/sendmsg-window.c:223
 msgid "_Turkish"
 msgstr "_TÃ¼rkisch"
 
-#: ../src/sendmsg-window.c:219
+#: ../src/sendmsg-window.c:224
 msgid "_Ukrainian"
 msgstr "_Ukrainisch"
 
-#: ../src/sendmsg-window.c:220
+#: ../src/sendmsg-window.c:225
 msgid "_Generic UTF-8"
 msgstr "_Generisches UTF-8"
 
-#: ../src/sendmsg-window.c:267
+#: ../src/sendmsg-window.c:272
 msgid "Attachment"
 msgstr "Anlagen"
 
-#: ../src/sendmsg-window.c:267
+#: ../src/sendmsg-window.c:272
 msgid "Inline"
 msgstr "Inline"
 
-#: ../src/sendmsg-window.c:267
+#: ../src/sendmsg-window.c:272
 msgid "Reference"
 msgstr "Referenz"
 
-#: ../src/sendmsg-window.c:515
+#: ../src/sendmsg-window.c:521
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: ../src/sendmsg-window.c:521
+#: ../src/sendmsg-window.c:527
 #, c-format
 msgid ""
 "The message to â€œ%sâ€ is modified.\n"
@@ -6097,20 +6183,20 @@ msgstr ""
 "Die Nachricht an Â»%sÂ« wurde verÃ¤ndert.\n"
 "Soll sie in EntwÃ¼rfe gespeichert werden?"
 
-#: ../src/sendmsg-window.c:814
+#: ../src/sendmsg-window.c:820
 msgid "GNOME editor is not defined in your preferred applications."
 msgstr "Sie haben keinen GNOME-Editor als bevorzugte Anwendung festgelegt."
 
-#: ../src/sendmsg-window.c:887
+#: ../src/sendmsg-window.c:893
 msgid "Select Identity"
 msgstr "IdentitÃ¤t wÃ¤hlen"
 
-#: ../src/sendmsg-window.c:1402
+#: ../src/sendmsg-window.c:1388
 #, c-format
 msgid ""
 "Saying yes will not send the file â€œ%sâ€ itself, but just a MIME message/"
-"external-body reference. Note that the recipient must have proper "
-"permissions to see the â€œrealâ€ file.\n"
+"external-body reference. Note that the recipient must have proper permissions "
+"to see the â€œrealâ€ file.\n"
 "\n"
 "Do you really want to attach this file as reference?"
 msgstr ""
@@ -6121,15 +6207,15 @@ msgstr ""
 "\n"
 "Wollen Sie diese Datei wirklich als Referenz beilegen?"
 
-#: ../src/sendmsg-window.c:1415
+#: ../src/sendmsg-window.c:1401
 msgid "Attach as Reference?"
 msgstr "Als Referenz beilegen?"
 
-#: ../src/sendmsg-window.c:1548
+#: ../src/sendmsg-window.c:1534
 msgid "Choose character set"
 msgstr "WÃ¤hlen Sie einen Zeichensatz"
 
-#: ../src/sendmsg-window.c:1556
+#: ../src/sendmsg-window.c:1542
 #, c-format
 msgid ""
 "File\n"
@@ -6142,55 +6228,51 @@ msgstr ""
 "ist weder in US-ASCII noch in UTF-8 kodiert.\n"
 "Bitte wÃ¤hlen Sie den fÃ¼r das Kodieren der Datei zu verwendenden Zeichensatz."
 
-#: ../src/sendmsg-window.c:1576
+#: ../src/sendmsg-window.c:1562
 msgid "Attach as MIME type:"
 msgstr "Beigelegt als MIME-Typ:"
 
-#: ../src/sendmsg-window.c:1637
+#: ../src/sendmsg-window.c:1623
 #, c-format
 msgid "Character set for file %s changed from â€œ%sâ€ to â€œ%sâ€."
 msgstr "Zeichensatz fÃ¼r die Datei %s wurde von Â»%sÂ« nach Â»%sÂ« geÃ¤ndert."
 
-#: ../src/sendmsg-window.c:1680 ../src/sendmsg-window.c:5027
+#: ../src/sendmsg-window.c:1666 ../src/sendmsg-window.c:5014
 msgid "(no subject)"
 msgstr "(Kein Betreff)"
 
-#: ../src/sendmsg-window.c:1718
+#: ../src/sendmsg-window.c:1704
 #, c-format
 msgid "Cannot create file URI object for %s"
 msgstr "Adressobjekt fÃ¼r %s konnte nicht erstellt werden"
 
-#: ../src/sendmsg-window.c:1726
-msgid "unknown error"
-msgstr "Unbekannter Fehler"
-
-#: ../src/sendmsg-window.c:1766
+#: ../src/sendmsg-window.c:1752
 msgid "forwarded message"
 msgstr "weitergeleitete Nachricht"
 
-#: ../src/sendmsg-window.c:1771
+#: ../src/sendmsg-window.c:1757
 #, c-format
 msgid "Message from %s, subject: â€œ%sâ€"
 msgstr "Nachricht von %s, Betreff Â»%sÂ«"
 
-#: ../src/sendmsg-window.c:1849 ../src/sendmsg-window.c:1922
+#: ../src/sendmsg-window.c:1835 ../src/sendmsg-window.c:1908
 msgid "Remove"
 msgstr "LÃ¶schen"
 
-#: ../src/sendmsg-window.c:1934
+#: ../src/sendmsg-window.c:1920
 msgid "Openâ€¦"
 msgstr "Ã–ffnen â€¦"
 
-#: ../src/sendmsg-window.c:1946
+#: ../src/sendmsg-window.c:1932
 msgid "(URL)"
 msgstr "(URL)"
 
-#: ../src/sendmsg-window.c:2002
+#: ../src/sendmsg-window.c:1988
 msgid "Attach file"
 msgstr "Datei beilegen"
 
-#: ../src/sendmsg-window.c:2115 ../src/sendmsg-window.c:2218
-#: ../src/sendmsg-window.c:6884
+#: ../src/sendmsg-window.c:2101 ../src/sendmsg-window.c:2204
+#: ../src/sendmsg-window.c:7015
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -6198,147 +6280,142 @@ msgstr ""
 "Beilegen der Datei fehlgeschlagen.\n"
 "MÃ¶gliche Ursache: nicht genug temporÃ¤rer Speicherplatz"
 
-#: ../src/sendmsg-window.c:2437
+#: ../src/sendmsg-window.c:2423
 msgid "F_rom:"
 msgstr "_Von:"
 
 #. Subject:
-#: ../src/sendmsg-window.c:2587
+#: ../src/sendmsg-window.c:2573
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../src/sendmsg-window.c:2614
+#: ../src/sendmsg-window.c:2600
 msgid "F_CC:"
 msgstr "F_CC:"
 
 #. Attachment list
-#: ../src/sendmsg-window.c:2640
+#: ../src/sendmsg-window.c:2626
 msgid "_Attachments:"
 msgstr "A_nlagen:"
 
-#: ../src/sendmsg-window.c:2684
+#: ../src/sendmsg-window.c:2670
 msgid "Mode"
 msgstr "Modus"
 
-#: ../src/sendmsg-window.c:3039
+#: ../src/sendmsg-window.c:3025
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "Anhang konnte nicht gespeichert werden: %s"
 
-#: ../src/sendmsg-window.c:3063
+#: ../src/sendmsg-window.c:3049
 msgid "No subject"
 msgstr "Kein Betreff"
 
-#: ../src/sendmsg-window.c:3097
+#: ../src/sendmsg-window.c:3083
 #, c-format
 msgid "inlined file â€œ%sâ€ (%s)"
 msgstr "eingefÃ¼gte Datei Â»%sÂ« (%s)"
 
-#: ../src/sendmsg-window.c:3100
+#: ../src/sendmsg-window.c:3086
 #, c-format
 msgid "attached file â€œ%sâ€ (%s)"
 msgstr "beigelegte Datei Â»%sÂ« (%s)"
 
-#: ../src/sendmsg-window.c:3104
+#: ../src/sendmsg-window.c:3090
 #, c-format
 msgid "inlined %s part"
 msgstr "Eingebetteter Teil %s"
 
-#: ../src/sendmsg-window.c:3106
+#: ../src/sendmsg-window.c:3092
 #, c-format
 msgid "attached %s part"
 msgstr "beigelegter Teil %s"
 
-#: ../src/sendmsg-window.c:3173
+#: ../src/sendmsg-window.c:3159
 #, c-format
 msgid "message from %s, subject â€œ%sâ€"
 msgstr "Nachricht von %s, Betreff Â»%sÂ«"
 
-#: ../src/sendmsg-window.c:3300
+#: ../src/sendmsg-window.c:3286
 msgid "quoted"
 msgstr "Zitiert"
 
-#: ../src/sendmsg-window.c:3305 ../src/sendmsg-window.c:3308
+#: ../src/sendmsg-window.c:3291 ../src/sendmsg-window.c:3294
 msgid "quoted attachment"
 msgstr "Zitierte Anlage"
 
-#: ../src/sendmsg-window.c:3334
+#: ../src/sendmsg-window.c:3320
 msgid "Select parts for quotation"
 msgstr "Abschnitte fÃ¼r Zitate auswÃ¤hlen"
 
-#: ../src/sendmsg-window.c:3345
+#: ../src/sendmsg-window.c:3331
 msgid "Select the parts of the message which shall be quoted in the reply"
 msgstr "Teile der Nachricht auswÃ¤hlen, die in der Antwort zitiert werden"
 
-#: ../src/sendmsg-window.c:3498
+#: ../src/sendmsg-window.c:3484
 msgid "you"
 msgstr "Sie"
 
-#: ../src/sendmsg-window.c:3507
+#: ../src/sendmsg-window.c:3493
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------weitergeleitete Nachricht von %s------\n"
 
-#: ../src/sendmsg-window.c:3544
+#: ../src/sendmsg-window.c:3530
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "Nachrichtenkennung: %s\n"
 
-#: ../src/sendmsg-window.c:3550
+#: ../src/sendmsg-window.c:3536
 msgid "References:"
 msgstr "Referenzen:"
 
-#: ../src/sendmsg-window.c:3561
+#: ../src/sendmsg-window.c:3547
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Am %s schrieb(en) %s:\n"
 
-#: ../src/sendmsg-window.c:3563
+#: ../src/sendmsg-window.c:3549
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb(en):\n"
 
-#: ../src/sendmsg-window.c:3676
+#: ../src/sendmsg-window.c:3662
 msgid "No signature found!"
 msgstr "Es wurde keine Unterschrift gefunden!"
 
-#: ../src/sendmsg-window.c:3817
+#: ../src/sendmsg-window.c:3803
 msgid "Could not save message."
 msgstr "Speichern der Nachricht ist fehlgeschlagen."
 
-#: ../src/sendmsg-window.c:3824
+#: ../src/sendmsg-window.c:3810
 #, c-format
 msgid "Could not open draftbox: %s"
 msgstr "Entwurfsordner konnte nicht geÃ¶ffnet werden: %s"
 
-#: ../src/sendmsg-window.c:3849
+#: ../src/sendmsg-window.c:3835
 msgid "Message saved."
 msgstr "Nachricht gespeichert."
 
-#: ../src/sendmsg-window.c:4461 ../src/sendmsg-window.c:4469
-#: ../src/sendmsg-window.c:4476 ../src/sendmsg-window.c:4483
-#: ../src/sendmsg-window.c:4507
+#: ../src/sendmsg-window.c:4453 ../src/sendmsg-window.c:4461
+#: ../src/sendmsg-window.c:4468 ../src/sendmsg-window.c:4492
 #, c-format
 msgid "Could not attach the file %s: %s."
 msgstr "Datei Â»%sÂ« konnte nicht beigelegt werden: %s."
 
-#: ../src/sendmsg-window.c:4462
+#: ../src/sendmsg-window.c:4454
 msgid "not an absolute path"
 msgstr "Pfadangabe nicht absolut"
 
-#: ../src/sendmsg-window.c:4470
-msgid "not in your directory"
-msgstr "Nicht in Ihrem Ordner"
-
-#: ../src/sendmsg-window.c:4477
+#: ../src/sendmsg-window.c:4462
 msgid "does not exist"
 msgstr "existiert nicht"
 
-#: ../src/sendmsg-window.c:4508
+#: ../src/sendmsg-window.c:4493
 msgid "not in current directory"
 msgstr "Nicht im aktuellen Ordner"
 
-#: ../src/sendmsg-window.c:4558
+#: ../src/sendmsg-window.c:4545
 msgid ""
 "The link that you selected created\n"
 "a â€œBlind copyâ€ (BCC) address.\n"
@@ -6350,44 +6427,56 @@ msgstr ""
 "Bitte prÃ¼fen Sie die Eignung\n"
 "der Adresse."
 
-#: ../src/sendmsg-window.c:4667
+#: ../src/sendmsg-window.c:4654
 #, c-format
 msgid "Cannot not read the file â€œ%sâ€: %s"
 msgstr "Datei Â»%sÂ« konnte nicht gelesen werden: %s"
 
-#: ../src/sendmsg-window.c:4686
+#: ../src/sendmsg-window.c:4673
 msgid "Include file"
 msgstr "Datei einfÃ¼gen"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4871
+#: ../src/sendmsg-window.c:4858
 #, c-format
 msgid "Could not load Face header file %s: %s"
 msgstr "Face-Headerdatei %s konnte nicht geladen werden: %s"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4874
+#: ../src/sendmsg-window.c:4861
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "X-Face-Headerdatei %s konnte nicht geladen werden: %s"
 
-#: ../src/sendmsg-window.c:4984
+#: ../src/sendmsg-window.c:4971
 msgid "No Subject"
 msgstr "Kein Betreff"
 
-#: ../src/sendmsg-window.c:4989
+#: ../src/sendmsg-window.c:4976
 msgid "_Send"
 msgstr "_Senden"
 
-#: ../src/sendmsg-window.c:5010
+#: ../src/sendmsg-window.c:4997
 msgid "You did not specify a subject for this message"
 msgstr "Sie haben keinen Betreff fÃ¼r diese Nachricht angegeben"
 
-#: ../src/sendmsg-window.c:5011
+#: ../src/sendmsg-window.c:4998
 msgid "If you would like to provide one, enter it below."
 msgstr "Geben Sie nachfolgend einen Betreff ein, falls gewÃ¼nscht."
 
-#: ../src/sendmsg-window.c:5104
+#: ../src/sendmsg-window.c:5061
+msgid "Message could be encrypted"
+msgstr "Die Nachricht kÃ¶nnte verschlÃ¼sselt sein"
+
+#: ../src/sendmsg-window.c:5064
+msgid "Send _encrypted"
+msgstr "V_erschlÃ¼sselt senden"
+
+#: ../src/sendmsg-window.c:5065
+msgid "Send _unencrypted"
+msgstr "_UnverschlÃ¼sselt senden"
+
+#: ../src/sendmsg-window.c:5134 ../src/sendmsg-window.c:5221
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
@@ -6395,22 +6484,50 @@ msgid ""
 "could be %s encrypted."
 msgstr ""
 "Sie haben fÃ¼r diese Nachricht keine VerschlÃ¼sselung ausgewÃ¤hlt, obwohl %s "
-"Ã¶ffentliche SchlÃ¼ssel fÃ¼r alle empfÃ¤nger verfÃ¼gbar sind. Um Ihre "
-"PrivatsphÃ¤re zu schÃ¼tzen, kÃ¶nnte die Nachricht %s verschlÃ¼sselt werden."
+"Ã¶ffentliche SchlÃ¼ssel fÃ¼r alle empfÃ¤nger verfÃ¼gbar sind. Um Ihre PrivatsphÃ¤re "
+"zu schÃ¼tzen, kÃ¶nnte die Nachricht %s verschlÃ¼sselt werden."
 
-#: ../src/sendmsg-window.c:5126
-msgid "Send _encrypted"
-msgstr "V_erschlÃ¼sselt senden"
+#: ../src/sendmsg-window.c:5208
+#, c-format
+msgid "error checking Autocrypt keys: %s"
+msgstr "Fehler beim ÃœberprÃ¼fen der Autocrypt-SchlÃ¼ssel: %s"
 
-#: ../src/sendmsg-window.c:5141
-msgid "Send _unencrypted"
-msgstr "_UnverschlÃ¼sselt senden"
+#: ../src/sendmsg-window.c:5237
+msgid ""
+"\n"
+"However, encryption is discouraged as the Autocrypt status indicates that "
+"some recipients <i>might</i> no be able to read the message."
+msgstr ""
+"\n"
+"Dennoch wird von VerschlÃ¼sselung abgeraten, wenn der Autocrypt-Status "
+"anzeigt, dass einige EmpfÃ¤nger nicht in der Lage sein <i>kÃ¶nnten</i>, die "
+"Nachricht zu lesen."
 
-#: ../src/sendmsg-window.c:5201
+#: ../src/sendmsg-window.c:5250
+#, c-format
+msgid ""
+"<i>Note:</i> choosing encryption will import %u key from the Autocrypt "
+"database into the GnuPG key ring."
+msgid_plural ""
+"<i>Note:</i> choosing encryption will import %u keys from the Autocrypt "
+"database into the GnuPG key ring."
+msgstr[0] ""
+"<i>Hinweis:</i> Wenn Sie sich fÃ¼r VerschlÃ¼sselung entscheiden, wird %u "
+"SchlÃ¼ssel aus der Autocrypt-Datenbank in den GnuPG-SchlÃ¼sselbund importiert."
+msgstr[1] ""
+"<i>Hinweis:</i> Wenn Sie sich fÃ¼r VerschlÃ¼sselung entscheiden, werden %u "
+"SchlÃ¼ssel aus der Autocrypt-Datenbank in den GnuPG-SchlÃ¼sselbund importiert."
+
+#: ../src/sendmsg-window.c:5275
+#, c-format
+msgid "Cannot import Autocrypt keys: %s"
+msgstr "Autocrypt-SchlÃ¼ssel konnten nicht importiert werden: %s"
+
+#: ../src/sendmsg-window.c:5339
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Sie haben den OpenPGP-Modus fÃ¼r diese Nachricht gewÃ¤hlt.\n"
 
-#: ../src/sendmsg-window.c:5206
+#: ../src/sendmsg-window.c:5344
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
@@ -6418,14 +6535,13 @@ msgstr ""
 "Diese Nachricht wird sowohl als einfacher Text als auch im HTML-Format "
 "gesendet, aber nur der einfache Text kann unterschrieben werden.\n"
 
-#: ../src/sendmsg-window.c:5211
-msgid ""
-"The message contains attachments, which cannot be signed or encrypted.\n"
+#: ../src/sendmsg-window.c:5349
+msgid "The message contains attachments, which cannot be signed or encrypted.\n"
 msgstr ""
 "Diese Nachricht enthÃ¤lt AnhÃ¤nge, die nicht unterschrieben oder verschlÃ¼sselt "
 "werden kÃ¶nnen.\n"
 
-#: ../src/sendmsg-window.c:5215
+#: ../src/sendmsg-window.c:5353
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -6433,36 +6549,36 @@ msgstr ""
 "Sie sollten den MIME-Modus verwenden, falls die gesamte Nachricht geschÃ¼tzt "
 "werden soll. Wollen Sie wirklich fortfahren?"
 
-#: ../src/sendmsg-window.c:5240
+#: ../src/sendmsg-window.c:5378
 #, c-format
 msgid "sending message with GPG mode %d"
 msgstr "Verschicken der Nachricht mit GPG-Modus %d"
 
-#: ../src/sendmsg-window.c:5269
+#: ../src/sendmsg-window.c:5407
 msgid "Message could not be created"
 msgstr "Nachricht konnte nicht erstellt werden"
 
-#: ../src/sendmsg-window.c:5271
+#: ../src/sendmsg-window.c:5409
 msgid "Message could not be queued in outbox"
 msgstr "Die Nachricht konnte nicht zum Verschicken vorgemerkt werden"
 
-#: ../src/sendmsg-window.c:5273
+#: ../src/sendmsg-window.c:5411
 msgid "Message could not be saved in sentbox"
 msgstr "Nachricht konnte nicht im Postausgang gespeichert werden"
 
-#: ../src/sendmsg-window.c:5275
+#: ../src/sendmsg-window.c:5413
 msgid "Message could not be sent"
 msgstr "Die Nachricht konnte nicht verschickt werden"
 
-#: ../src/sendmsg-window.c:5278
+#: ../src/sendmsg-window.c:5416
 msgid "Message could not be signed"
 msgstr "Die Nachricht konnte nicht unterschrieben werden"
 
-#: ../src/sendmsg-window.c:5280
+#: ../src/sendmsg-window.c:5418
 msgid "Message could not be encrypted"
 msgstr "Die Nachricht konnte nicht verschlÃ¼sselt werden"
 
-#: ../src/sendmsg-window.c:5286
+#: ../src/sendmsg-window.c:5424
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -6471,45 +6587,45 @@ msgstr ""
 "Senden ist fehlgeschlagen: %s\n"
 "%s"
 
-#: ../src/sendmsg-window.c:5291
+#: ../src/sendmsg-window.c:5429
 #, c-format
 msgid "Send failed: %s"
 msgstr "Verschicken fehlgeschlagen: %s"
 
-#: ../src/sendmsg-window.c:5392
+#: ../src/sendmsg-window.c:5530
 #, c-format
 msgid "Could not postpone message: %s"
 msgstr "Zwischenspeichern der Nachricht ist fehlgeschlagen: %s"
 
-#: ../src/sendmsg-window.c:5413
+#: ../src/sendmsg-window.c:5551
 msgid "Message postponed."
 msgstr "Nachricht aufgeschoben."
 
-#: ../src/sendmsg-window.c:5418
+#: ../src/sendmsg-window.c:5556
 msgid "Could not postpone message."
 msgstr "Nachricht konnte nicht aufgeschoben werden."
 
-#: ../src/sendmsg-window.c:5630
+#: ../src/sendmsg-window.c:5768
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Fehler beim Starten der RechtschreibprÃ¼fung: %s"
 
-#: ../src/sendmsg-window.c:6392
+#: ../src/sendmsg-window.c:6533
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Antwort an %s: %s"
 
-#: ../src/sendmsg-window.c:6397
+#: ../src/sendmsg-window.c:6538
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Nachricht an %s weiterleiten: %s"
 
-#: ../src/sendmsg-window.c:6401
+#: ../src/sendmsg-window.c:6542
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Nachricht an %s verfassen: %s"
 
-#: ../src/sendmsg-window.c:6569 ../ui/sendmsg-window.ui.h:33
+#: ../src/sendmsg-window.c:6710 ../ui/sendmsg-window.ui.h:33
 msgid "_Language"
 msgstr "_Sprache"
 
@@ -6530,8 +6646,7 @@ msgid "Change _All"
 msgstr "_Alle ersetzen"
 
 #: ../src/spell-check.c:349
-msgid ""
-"Replace all occurrences of the current word with the selected suggestion"
+msgid "Replace all occurrences of the current word with the selected suggestion"
 msgstr "Dieses Wort im gesamten Text mit dem gewÃ¤hlten Vorschlag ersetzen"
 
 #: ../src/spell-check.c:355
@@ -6575,51 +6690,51 @@ msgstr "Alle Ã„nderungen zurÃ¼cknehmen and ÃœberprÃ¼fungen abschlieÃŸen"
 msgid "BalsaSpellCheck: Enchant Error: %s\n"
 msgstr "BalsaSpellCheck: Enchant-Fehler: %s\n"
 
-#: ../src/store-address.c:104
+#: ../src/store-address.c:105
 msgid "Store address: no addresses"
 msgstr "Adresse speichern: keine Adressen"
 
-#: ../src/store-address.c:204
+#: ../src/store-address.c:205
 msgid "Store Address"
 msgstr "Adresse speichern"
 
-#: ../src/store-address.c:246
+#: ../src/store-address.c:247
 msgid "No address book selectedâ€¦"
 msgstr "Kein Adressbuch ausgewÃ¤hlt â€¦"
 
-#: ../src/store-address.c:259
+#: ../src/store-address.c:260
 msgid "Address could not be written to this address book."
 msgstr "Die Adresse konnte nicht in dieses Adressbuch geschrieben werden."
 
-#: ../src/store-address.c:262
+#: ../src/store-address.c:263
 msgid "Address book could not be accessed."
 msgstr "Auf Adressbuch konnte nicht zugegriffen werden."
 
-#: ../src/store-address.c:264
+#: ../src/store-address.c:265
 msgid "This mail address is already in this address book."
 msgstr "Diese E-Mail-Adresse befindet sich bereits im Adressbuch."
 
-#: ../src/store-address.c:267
+#: ../src/store-address.c:268
 msgid "Unexpected address book error. Report it."
 msgstr "Unerwarteter Adressbuchfehler. Berichten Sie ihn."
 
-#: ../src/store-address.c:290
+#: ../src/store-address.c:291
 msgid "Address Book:"
 msgstr "Adressbuch:"
 
-#: ../src/store-address.c:336
+#: ../src/store-address.c:337
 msgid "From: "
 msgstr "Von: "
 
-#: ../src/store-address.c:337
+#: ../src/store-address.c:338
 msgid "To: "
 msgstr "An: "
 
-#: ../src/store-address.c:338
+#: ../src/store-address.c:339
 msgid "CC: "
 msgstr "Kopie: "
 
-#: ../src/store-address.c:339
+#: ../src/store-address.c:340
 msgid "BCC: "
 msgstr "Blindkopie: "
 
@@ -6733,7 +6848,7 @@ msgstr "Ãœber Warteschlange senden"
 msgid "Exchange"
 msgstr "Austauschen"
 
-#: ../src/toolbar-factory.c:158 ../src/toolbar-factory.c:190
+#: ../src/toolbar-factory.c:158 ../src/toolbar-factory.c:189
 #: ../ui/sendmsg-window.ui.h:7
 msgid "Queue"
 msgstr "Warteschlange"
@@ -6810,102 +6925,102 @@ msgstr ""
 "Papierkorb\n"
 "leeren"
 
-#: ../src/toolbar-factory.c:396
+#: ../src/toolbar-factory.c:395
 #, c-format
 msgid "Unknown toolbar icon â€œ%sâ€"
 msgstr "Unbekanntes Werkzeugleisten-Symbol Â»%sÂ«"
 
-#: ../src/toolbar-factory.c:473
+#: ../src/toolbar-factory.c:472
 msgid "Queue this message for sending"
 msgstr "Diese Nachricht zum Verschicken in die Warteschlange aufnehmen"
 
-#: ../src/toolbar-factory.c:485
+#: ../src/toolbar-factory.c:484
 msgid "Text Be_low Icons"
 msgstr "Text _unter Symbolen"
 
-#: ../src/toolbar-factory.c:486
+#: ../src/toolbar-factory.c:485
 msgid "Priority Text Be_side Icons"
 msgstr "Text vorzugsweise _neben Symbolen"
 
-#: ../src/toolbar-factory.c:488
+#: ../src/toolbar-factory.c:487
 msgid "_Icons Only"
 msgstr "Nur S_ymbole"
 
-#: ../src/toolbar-factory.c:489
+#: ../src/toolbar-factory.c:488
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../src/toolbar-factory.c:751
+#: ../src/toolbar-factory.c:750
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "_Desktopvorgabe verwenden (%s)"
 
-#: ../src/toolbar-factory.c:777
+#: ../src/toolbar-factory.c:776
 msgid "_Customize Toolbarsâ€¦"
 msgstr "Werkzeugleisten _anpassen â€¦"
 
-#: ../src/toolbar-prefs.c:136
+#: ../src/toolbar-prefs.c:137
 msgid "Customize Toolbars"
 msgstr "Werkzeugleisten anpassen"
 
-#: ../src/toolbar-prefs.c:181
+#: ../src/toolbar-prefs.c:182
 msgid "Compose window"
 msgstr "Editor-Fenster"
 
-#: ../src/toolbar-prefs.c:194
+#: ../src/toolbar-prefs.c:195
 msgid "Toolbar options"
 msgstr "Einstellungen der Werkzeugleiste"
 
-#: ../src/toolbar-prefs.c:203
+#: ../src/toolbar-prefs.c:204
 msgid "_Wrap button labels"
 msgstr "Knopfbeschriftungen _umbrechen"
 
-#: ../src/toolbar-prefs.c:386
+#: ../src/toolbar-prefs.c:387
 #, c-format
 msgid "Error displaying toolbar help: %s\n"
 msgstr "Fehler beim Anzeigen der Hilfe zur Werkzeugleiste: %s\n"
 
 #. Preview display
-#: ../src/toolbar-prefs.c:422
+#: ../src/toolbar-prefs.c:423
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../src/toolbar-prefs.c:452
+#: ../src/toolbar-prefs.c:453
 msgid "_Restore toolbar to standard buttons"
 msgstr "In der Werkzeugleiste angezeigte KnÃ¶pfe auf Vorgaben _zurÃ¼cksetzen"
 
 #. Style button
-#: ../src/toolbar-prefs.c:456
+#: ../src/toolbar-prefs.c:457
 msgid "Toolbar _styleâ€¦"
 msgstr "_Stil der Werkzeugleiste â€¦"
 
-#: ../src/toolbar-prefs.c:473
+#: ../src/toolbar-prefs.c:474
 msgid "Available buttons"
 msgstr "VerfÃ¼gbare KnÃ¶pfe"
 
-#: ../src/toolbar-prefs.c:489
+#: ../src/toolbar-prefs.c:490
 msgid "Current toolbar"
 msgstr "Momentan verwendete KnÃ¶pfe"
 
-#: ../src/toolbar-prefs.c:510
+#: ../src/toolbar-prefs.c:511
 msgid "Move selected item up"
 msgstr "AusgewÃ¤hltes Objekt nach oben schieben"
 
 # Bezieht sich auf Nachrichtenteile
-#: ../src/toolbar-prefs.c:520
+#: ../src/toolbar-prefs.c:521
 msgid "Remove selected item from toolbar"
 msgstr "AusgewÃ¤hltes Objekt aus der Werkzeugleiste entfernen"
 
-#: ../src/toolbar-prefs.c:528
+#: ../src/toolbar-prefs.c:529
 msgid "Add selected item to toolbar"
 msgstr "AusgewÃ¤hltes Objekt zur Werkzeugleiste hinzufÃ¼gen"
 
 # Bezieht sich auf Nachrichtenteile
-#: ../src/toolbar-prefs.c:535
+#: ../src/toolbar-prefs.c:536
 msgid "Move selected item down"
 msgstr "AusgewÃ¤hltes Objekt nach unten schieben"
 
-#: ../ui/ab-main.ui.h:1 ../ui/main-window.ui.h:17 ../ui/message-window.ui.h:1
+#: ../ui/ab-main.ui.h:1 ../ui/main-window.ui.h:1 ../ui/message-window.ui.h:1
 #: ../ui/sendmsg-window.ui.h:1 ../ui/source-viewer.ui.h:1
 msgid "_File"
 msgstr "_Datei"
@@ -6940,11 +7055,11 @@ msgstr "_GPE-Adressbuch"
 msgid "_Rubrica Address Book"
 msgstr "_Rubrica-Adressbuch"
 
-#: ../ui/ab-main.ui.h:10 ../ui/main-window.ui.h:68
+#: ../ui/ab-main.ui.h:10 ../ui/main-window.ui.h:60
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#: ../ui/ab-main.ui.h:12 ../ui/main-window.ui.h:16
+#: ../ui/ab-main.ui.h:12 ../ui/main-window.ui.h:18
 msgid "_Quit"
 msgstr "_Beenden"
 
@@ -6960,20 +7075,16 @@ msgstr "_Neuer Eintrag"
 msgid "_Delete Entry"
 msgstr "Eintrag _lÃ¶schen"
 
-#: ../ui/ab-main.ui.h:17 ../ui/main-window.ui.h:15
+#: ../ui/ab-main.ui.h:17
 msgid "_About"
 msgstr "I_nfo"
 
-#. Translators: app menu item - New message or mailbox
-#: ../ui/main-window.ui.h:2
-msgctxt "appmenu"
+#. Translators: window menu item - New message or mailbox
+#: ../ui/main-window.ui.h:3
+msgctxt "window menu"
 msgid "_New"
 msgstr "_Neu"
 
-#: ../ui/main-window.ui.h:3 ../ui/message-window.ui.h:20
-msgid "_Message"
-msgstr "_Nachricht"
-
 #: ../ui/main-window.ui.h:4
 msgid "Local mbox mailboxâ€¦"
 msgstr "Lokales Mbox-Postfach â€¦"
@@ -6991,271 +7102,283 @@ msgid "Remote IMAP subfolderâ€¦"
 msgstr "IMAP-Unterordner im Netz â€¦"
 
 #: ../ui/main-window.ui.h:9
-msgid "_Settings"
-msgstr "Ein_stellungen"
-
-#: ../ui/main-window.ui.h:10
-msgid "_Toolbarsâ€¦"
-msgstr "_Werkzeugleisten â€¦"
-
-#: ../ui/main-window.ui.h:11
-msgid "_Identitiesâ€¦"
-msgstr "_IdentitÃ¤ten â€¦"
-
-#: ../ui/main-window.ui.h:12
-msgid "_Address Book"
-msgstr "_Adressbuch"
-
-#: ../ui/main-window.ui.h:13
-msgid "_Preferences"
-msgstr "_Einstellungen"
-
-#: ../ui/main-window.ui.h:18
-msgid "New _Message"
-msgstr "Neue _Nachricht"
-
-#: ../ui/main-window.ui.h:19
 msgid "_Continue"
 msgstr "_Fortfahren"
 
-#: ../ui/main-window.ui.h:20
+#: ../ui/main-window.ui.h:10
 msgid "_Get New Mail"
 msgstr "Neue Nachrichten _abholen"
 
-#: ../ui/main-window.ui.h:21
+#: ../ui/main-window.ui.h:11
 msgid "_Send Queued Mail"
 msgstr "Nachrichten in Warteschlange _senden"
 
-#: ../ui/main-window.ui.h:22
+#: ../ui/main-window.ui.h:12
 msgid "Send and _Receive Mail"
 msgstr "Nach_richten senden und empfangen"
 
-#: ../ui/main-window.ui.h:23 ../ui/message-window.ui.h:2
+#: ../ui/main-window.ui.h:13 ../ui/message-window.ui.h:2
 msgid "Page _Setup"
 msgstr "Seite einric_hten"
 
-#: ../ui/main-window.ui.h:24 ../ui/message-window.ui.h:3
+#: ../ui/main-window.ui.h:14 ../ui/message-window.ui.h:3
 #: ../ui/sendmsg-window.ui.h:11
 msgid "_Printâ€¦"
 msgstr "_Drucken â€¦"
 
-#: ../ui/main-window.ui.h:26 ../ui/message-window.ui.h:6
+#: ../ui/main-window.ui.h:15
+msgid "_Address Book"
+msgstr "_Adressbuch"
+
+#: ../ui/main-window.ui.h:16
+msgid "A_utocrypt Database"
+msgstr "A_utocrypt-Datenbank"
+
+#: ../ui/main-window.ui.h:17
+msgid "Empty _Trash"
+msgstr "_Papierkorb leeren"
+
+#: ../ui/main-window.ui.h:20 ../ui/message-window.ui.h:6
 #: ../ui/sendmsg-window.ui.h:17 ../ui/source-viewer.ui.h:4
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../ui/main-window.ui.h:28
+#: ../ui/main-window.ui.h:22
 msgid "Select _Thread"
 msgstr "Nachrichten-_Konversation auswÃ¤hlen"
 
-#: ../ui/main-window.ui.h:29
+#: ../ui/main-window.ui.h:23
 msgid "_Find"
 msgstr "_Suchen"
 
-#: ../ui/main-window.ui.h:30
+#: ../ui/main-window.ui.h:24
 msgid "Find Ne_xt"
 msgstr "_Weitersuchen"
 
-#: ../ui/main-window.ui.h:31 ../ui/message-window.ui.h:8
+#: ../ui/main-window.ui.h:25 ../ui/message-window.ui.h:8
 msgid "Find in _Message"
 msgstr "In Nachricht _suchen"
 
-#: ../ui/main-window.ui.h:32
+#: ../ui/main-window.ui.h:26
 msgid "F_iltersâ€¦"
 msgstr "F_ilter â€¦"
 
-#: ../ui/main-window.ui.h:33
+#: ../ui/main-window.ui.h:27
 msgid "_Export Filtersâ€¦"
 msgstr "Filter _exportieren â€¦"
 
-#: ../ui/main-window.ui.h:34 ../ui/message-window.ui.h:9
+#: ../ui/main-window.ui.h:28
+msgid "_Preferences"
+msgstr "_Einstellungen"
+
+#: ../ui/main-window.ui.h:29
+msgid "_Settingsâ€¦"
+msgstr "Ein_stellungen â€¦"
+
+#: ../ui/main-window.ui.h:30
+msgid "_Toolbarsâ€¦"
+msgstr "_Werkzeugleisten â€¦"
+
+#: ../ui/main-window.ui.h:31
+msgid "_Identitiesâ€¦"
+msgstr "_IdentitÃ¤ten â€¦"
+
+#: ../ui/main-window.ui.h:32 ../ui/message-window.ui.h:9
 #: ../ui/source-viewer.ui.h:6
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../ui/main-window.ui.h:35
+#: ../ui/main-window.ui.h:33
 msgid "_Show Mailbox Tree"
 msgstr "Postfach-Baum an_zeigen"
 
-#: ../ui/main-window.ui.h:36
+#: ../ui/main-window.ui.h:34
 msgid "Show Mailbox _Tabs"
 msgstr "Pos_tfach-Reiter anzeigen"
 
-#: ../ui/main-window.ui.h:37 ../ui/message-window.ui.h:10
+#: ../ui/main-window.ui.h:35 ../ui/message-window.ui.h:10
 #: ../ui/sendmsg-window.ui.h:28
 msgid "Show Too_lbar"
 msgstr "Werkzeug_leiste anzeigen"
 
-#: ../ui/main-window.ui.h:38
+#: ../ui/main-window.ui.h:36
 msgid "Show St_atus Bar"
 msgstr "St_atusleiste anzeigen"
 
-#: ../ui/main-window.ui.h:39
+#: ../ui/main-window.ui.h:37
 msgid "Show _Index Filter"
 msgstr "_Index-Filter anzeigen"
 
-#: ../ui/main-window.ui.h:40 ../ui/message-window.ui.h:11
+#: ../ui/main-window.ui.h:38 ../ui/message-window.ui.h:11
 msgid "_Wrap"
 msgstr "_Umfalten"
 
-#: ../ui/main-window.ui.h:41 ../ui/message-window.ui.h:12
+#: ../ui/main-window.ui.h:39 ../ui/message-window.ui.h:12
 msgid "_No Headers"
 msgstr "Kei_ne Kopfzeilen"
 
-#: ../ui/main-window.ui.h:42 ../ui/message-window.ui.h:13
+#: ../ui/main-window.ui.h:40 ../ui/message-window.ui.h:13
 msgid "S_elected Headers"
 msgstr "Ausg_ewÃ¤hlte Kopfzeilen"
 
-#: ../ui/main-window.ui.h:43 ../ui/message-window.ui.h:14
+#: ../ui/main-window.ui.h:41 ../ui/message-window.ui.h:14
 msgid "All _Headers"
 msgstr "Alle _Kopfzeilen"
 
-#: ../ui/main-window.ui.h:44
-msgid "_Flat index"
-msgstr "_Flacher Index"
+#: ../ui/main-window.ui.h:42
+msgid "Th_read messages"
+msgstr "Nach_richtenkonversationen zusammenfassen"
 
-#: ../ui/main-window.ui.h:45
-msgid "Si_mple threading"
-msgstr "Einfache The_mensortierung"
-
-#: ../ui/main-window.ui.h:46
-msgid "_JWZ threading"
-msgstr "_JWZ-Threading"
-
-#: ../ui/main-window.ui.h:47
+#: ../ui/main-window.ui.h:43
 msgid "E_xpand All"
 msgstr "Alle _aufklappen"
 
-#: ../ui/main-window.ui.h:48
+#: ../ui/main-window.ui.h:44
 msgid "_Collapse All"
 msgstr "Alle _einklappen"
 
-#: ../ui/main-window.ui.h:49 ../ui/message-window.ui.h:15
+#: ../ui/main-window.ui.h:45 ../ui/message-window.ui.h:15
 msgid "Zoom _In"
 msgstr "Ver_grÃ¶ÃŸern"
 
-#: ../ui/main-window.ui.h:50 ../ui/message-window.ui.h:16
+#: ../ui/main-window.ui.h:46 ../ui/message-window.ui.h:16
 msgid "Zoom _Out"
 msgstr "Ver_kleinern"
 
-#: ../ui/main-window.ui.h:52 ../ui/message-window.ui.h:18
+#: ../ui/main-window.ui.h:48 ../ui/message-window.ui.h:18
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Auf _100% vergrÃ¶ÃŸern"
 
-#: ../ui/main-window.ui.h:53
+#: ../ui/main-window.ui.h:49
 msgid "Mail_box"
 msgstr "Post_fach"
 
-#: ../ui/main-window.ui.h:54 ../ui/message-window.ui.h:30
-msgid "Next Message"
-msgstr "NÃ¤chste Nachricht"
-
-#: ../ui/main-window.ui.h:55 ../ui/message-window.ui.h:31
-msgid "Previous Message"
-msgstr "Vorherige Nachricht"
-
-#: ../ui/main-window.ui.h:56 ../ui/message-window.ui.h:32
-msgid "Next Unread Message"
-msgstr "NÃ¤chste ungelesene Nachricht"
-
-#: ../ui/main-window.ui.h:57 ../ui/message-window.ui.h:33
-msgid "Next Flagged Message"
-msgstr "NÃ¤chste markierte Nachricht"
-
-#: ../ui/main-window.ui.h:58
+#: ../ui/main-window.ui.h:50
 msgid "_Hide Messages"
 msgstr "Nac_hrichten verbergen"
 
-#: ../ui/main-window.ui.h:59
+#: ../ui/main-window.ui.h:51
 msgid "_Deleted"
 msgstr "_GelÃ¶scht"
 
-#: ../ui/main-window.ui.h:60
+#: ../ui/main-window.ui.h:52
 msgid "Un_deleted"
 msgstr "Nicht ge_lÃ¶scht"
 
-#: ../ui/main-window.ui.h:61
+#: ../ui/main-window.ui.h:53
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../ui/main-window.ui.h:62
+#: ../ui/main-window.ui.h:54
 msgid "Un_read"
 msgstr "Un_gelesen"
 
-#: ../ui/main-window.ui.h:64
+#: ../ui/main-window.ui.h:56
 msgid "Un_flagged"
 msgstr "_Nicht markiert"
 
-#: ../ui/main-window.ui.h:65
+#: ../ui/main-window.ui.h:57
 msgid "_Answered"
 msgstr "Be_antwortet"
 
-#: ../ui/main-window.ui.h:66
+#: ../ui/main-window.ui.h:58
 msgid "Un_answered"
 msgstr "Nicht _beantwortet"
 
-#: ../ui/main-window.ui.h:67
+#: ../ui/main-window.ui.h:59
 msgid "_Reset Filter"
 msgstr "Filte_r zurÃ¼cksetzen"
 
-#: ../ui/main-window.ui.h:70
-msgid "E_xpunge Deleted Messages"
-msgstr "GelÃ¶schte Nachrichten _sÃ¤ubern"
-
-#: ../ui/main-window.ui.h:72
-msgid "Empty _Trash"
-msgstr "_Papierkorb leeren"
-
-#: ../ui/main-window.ui.h:73
+#: ../ui/main-window.ui.h:62
 msgid "Select _Filtersâ€¦"
 msgstr "_Filter auswÃ¤hlen â€¦"
 
-#: ../ui/main-window.ui.h:74
+#: ../ui/main-window.ui.h:63
 msgid "_Remove Duplicates"
 msgstr "Duplikate entfe_rnen"
 
-#: ../ui/main-window.ui.h:76 ../ui/message-window.ui.h:22
+#: ../ui/main-window.ui.h:64
+msgid "E_xpunge Deleted Messages"
+msgstr "GelÃ¶schte Nachrichten _sÃ¤ubern"
+
+#: ../ui/main-window.ui.h:66 ../ui/message-window.ui.h:20
+msgid "_Message"
+msgstr "_Nachricht"
+
+#: ../ui/main-window.ui.h:67
+msgid "_Newâ€¦"
+msgstr "_Neu â€¦"
+
+#: ../ui/main-window.ui.h:69 ../ui/message-window.ui.h:22
 msgid "Reply to _Allâ€¦"
 msgstr "Antwort an a_lle â€¦"
 
-#: ../ui/main-window.ui.h:77 ../ui/message-window.ui.h:23
+#: ../ui/main-window.ui.h:70 ../ui/message-window.ui.h:23
 msgid "Reply to _Groupâ€¦"
 msgstr "Antwort an _Gruppe â€¦"
 
-#: ../ui/main-window.ui.h:81 ../ui/message-window.ui.h:26
+#: ../ui/main-window.ui.h:74 ../ui/message-window.ui.h:26
 msgid "_Next Part"
 msgstr "_NÃ¤chster Teil"
 
-#: ../ui/main-window.ui.h:82 ../ui/message-window.ui.h:27
+#: ../ui/main-window.ui.h:75 ../ui/message-window.ui.h:27
 msgid "_Previous Part"
 msgstr "_Vorheriger Teil"
 
 # Bezieht sich auf Nachrichtenteile
-#: ../ui/main-window.ui.h:83 ../ui/message-window.ui.h:28
+#: ../ui/main-window.ui.h:76 ../ui/message-window.ui.h:28
 msgid "Save Current Partâ€¦"
 msgstr "Aktuellen Teil speichern â€¦"
 
-#: ../ui/main-window.ui.h:84 ../ui/message-window.ui.h:29
+#: ../ui/main-window.ui.h:77 ../ui/message-window.ui.h:29
 msgid "_View Sourceâ€¦"
 msgstr "_Quelltext anzeigen â€¦"
 
-#: ../ui/main-window.ui.h:85 ../ui/source-viewer.ui.h:5
+#: ../ui/main-window.ui.h:78 ../ui/source-viewer.ui.h:5
 msgid "_Select Text"
 msgstr "Text au_swÃ¤hlen"
 
-#: ../ui/main-window.ui.h:86 ../ui/message-window.ui.h:34
+#: ../ui/main-window.ui.h:79 ../ui/message-window.ui.h:34
 msgid "_Move to Trash"
 msgstr "In den _Papierkorb verschieben"
 
-#: ../ui/main-window.ui.h:87
+#: ../ui/main-window.ui.h:80
 msgid "_Toggle Flag"
 msgstr "Markierung _umschalten"
 
-#: ../ui/main-window.ui.h:88
+#: ../ui/main-window.ui.h:81
 msgid "_New"
 msgstr "_Neu"
 
+#: ../ui/main-window.ui.h:83
+msgid "_Go"
+msgstr "_Gehe zu"
+
+#: ../ui/main-window.ui.h:84 ../ui/message-window.ui.h:30
+msgid "Next Message"
+msgstr "NÃ¤chste Nachricht"
+
+#: ../ui/main-window.ui.h:85 ../ui/message-window.ui.h:31
+msgid "Previous Message"
+msgstr "Vorherige Nachricht"
+
+#: ../ui/main-window.ui.h:86 ../ui/message-window.ui.h:32
+msgid "Next Unread Message"
+msgstr "NÃ¤chste ungelesene Nachricht"
+
+#: ../ui/main-window.ui.h:87 ../ui/message-window.ui.h:33
+msgid "Next Flagged Message"
+msgstr "NÃ¤chste markierte Nachricht"
+
+#: ../ui/main-window.ui.h:89
+msgid "_Contents"
+msgstr "_Inhalt"
+
+#: ../ui/main-window.ui.h:90
+msgid "_About Balsa"
+msgstr "_Info zu Balsa"
+
 #: ../ui/sendmsg-window.ui.h:2
 msgid "_Include Fileâ€¦"
 msgstr "Date_i einfÃ¼gen â€¦"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]