[Commits] [SCM] claws branch, master, updated. 3.14.1-5-ga4c1e42

claws at claws-mail.org claws at claws-mail.org
Thu Nov 10 11:51:22 CET 2016


The branch, master has been updated
       via  a4c1e429bee127ab09fca2e3276449614360d907 (commit)
      from  36d5d93bf59337c6a48bd37069a733311fc1c53a (commit)

Summary of changes:
 po/de.po | 3627 ++++++++++++++++++++++----------------------------------------
 1 file changed, 1299 insertions(+), 2328 deletions(-)


- Log -----------------------------------------------------------------
commit a4c1e429bee127ab09fca2e3276449614360d907
Author: Paul <paul at claws-mail.org>
Date:   Thu Nov 10 10:51:18 2016 +0000

    updated de.po
    
    submitted by Simon Legner <Simon.Legner at gmail.com>

diff --git a/po/de.po b/po/de.po
index 13b1fcb..91944aa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,6 @@
 # Copyright © 2002-2014 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
-#
 # Stephan Sachse <white at dev-zero.com>, 2005-2010
 # Marc Arens <marens at marens.eu>, 2009
 # Thomas Gilgin <thg1 at karate-muellheim.de>, 2004, 2005
@@ -10,22 +9,22 @@
 # Jens Oberender <j.obi at troja.net>, 2003, 2004
 # Kilian Krause <kk at verfaction.de>, 2002
 # Thomas Bellmann <ThomasBellmann at gmx.net>, 2012-2015, 2015.
-#
+# Simon Legner <Simon.Legner at gmail.com>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-28 19:13+0200\n"
-"PO-Revision-Date: 2016-07-13 06:45+0200\n"
-"Last-Translator: Thomas Bellmann <ThomasBellmann at gmx.net>\n"
-"Language-Team: Deutsch <>\n"
+"POT-Creation-Date: 2016-11-10 10:48+0000\n"
+"PO-Revision-Date: 2016-11-10 08:30+0200\n"
+"Last-Translator: Simon Legner <Simon.Legner at gmail.com>\n"
+"Language-Team: -\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: Virtaal 0.7.1\n"
 "X-Poedit-Bookmarks: 2990,1708,-1,2647,2658,2696,2793,-1,-1,-1\n"
-"X-Generator: Poedit 1.8.8\n"
 
 # in General: maybe should unify "receive, retrieve" when translating into german.
 # (maybe) todo: replace "Protokoll-Datei" by "Log-Datei"; "Stylesheet" by "..?"; "free/busy" by "..?"
@@ -95,14 +94,14 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Abrufen' holt Nachrichten von den gewählten Konten ab"
 
 #: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7205 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
 #: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1803
+#: src/plugins/pdf_viewer/poppler_viewer.c:1800
 #: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -640,8 +639,8 @@ msgid "LDAP search terminated on request"
 msgstr "LDAP-Suche auf Wunsch abgebrochen"
 
 #: src/addressbook.c:542
-msgid "Error starting TLS connection"
-msgstr "Fehler beim Einleiten der TLS-Verbindung"
+msgid "Error starting STARTTLS connection"
+msgstr "Fehler beim Einleiten der STARTTLS-Verbindung"
 
 #: src/addressbook.c:543
 msgid "Distinguished Name (dn) is missing"
@@ -668,7 +667,7 @@ msgstr "Quellen"
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:1112 src/editldap.c:780
+#: src/addressbook.c:1112 src/editldap.c:781
 msgid "Search"
 msgstr "Suchen"
 
@@ -714,7 +713,6 @@ msgstr ""
 
 #: src/addressbook.c:2928 src/imap_gtk.c:360 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Delete folder"
 msgstr "Ordner löschen"
 
@@ -825,8 +823,8 @@ msgstr "Adressbuch"
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
-#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:348
+#: src/folderview.c:436 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Ordner"
 
@@ -958,27 +956,27 @@ msgstr "Allgemeine Adresse"
 msgid "Personal address"
 msgstr "Persönliche Adresse"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1829
 msgid "Address(es) update"
 msgstr "Adresse(n) aktualisieren"
 
-#: src/addrindex.c:1831
+#: src/addrindex.c:1830
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Fehler bei Aktualisierung. Änderungen nicht ins Verzeichnis geschrieben."
 
-#: src/alertpanel.c:146 src/compose.c:9479
+#: src/alertpanel.c:146 src/compose.c:9454
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
-#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11905 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4802
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Fehler"
@@ -1099,9 +1097,9 @@ msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin."
 
-#: src/common/session.c:183 src/imap.c:1213
-msgid "SSL handshake failed\n"
-msgstr "SSL-Verbindung schlug fehl\n"
+#: src/common/session.c:183 src/imap.c:1210
+msgid "SSL/TLS handshake failed\n"
+msgstr "SSL/TLS-Verbindung schlug fehl\n"
 
 #: src/common/smtp.c:179
 msgid "No SMTP AUTH method available\n"
@@ -1129,8 +1127,8 @@ msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Nachricht ist zu groß (Maximalgröße ist %s)\n"
 
 #: src/common/smtp.c:617 src/pop.c:898
-msgid "couldn't start TLS session\n"
-msgstr "TLS-Sitzung kann nicht gestartet werden\n"
+msgid "couldn't start STARTTLS session\n"
+msgstr "STARTTLS-Sitzung kann nicht gestartet werden\n"
 
 #: src/common/socket.c:569
 msgid "Socket IO timeout.\n"
@@ -1265,212 +1263,212 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4764
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4765
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Montag"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4766
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4767
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4768
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4769
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Freitag"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4770
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4772
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Januar"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4773
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Februar"
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4774
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "März"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4775
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "April"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4776
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4777
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juni"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4778
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juli"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4779
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4780
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4781
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Oktober"
 
-#: src/common/utils.c:4841
+#: src/common/utils.c:4782
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4783
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezember"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4785
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "So"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4786
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Mo"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4787
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Di"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4788
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mi"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4789
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Do"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4790
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Fr"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4791
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sa"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4793
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4794
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4854
+#: src/common/utils.c:4795
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mrz"
 
-#: src/common/utils.c:4855
+#: src/common/utils.c:4796
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4856
+#: src/common/utils.c:4797
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4857
+#: src/common/utils.c:4798
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4858
+#: src/common/utils.c:4799
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4859
+#: src/common/utils.c:4800
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4860
+#: src/common/utils.c:4801
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4861
+#: src/common/utils.c:4802
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:4862
+#: src/common/utils.c:4803
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4863
+#: src/common/utils.c:4804
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dez"
 
-#: src/common/utils.c:4874
+#: src/common/utils.c:4815
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4875
+#: src/common/utils.c:4816
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4876
+#: src/common/utils.c:4817
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4877
+#: src/common/utils.c:4818
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
@@ -1484,7 +1482,7 @@ msgstr "_Hinzufügen..."
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: src/compose.c:578 src/folderview.c:246
+#: src/compose.c:578 src/folderview.c:247
 msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
@@ -1810,7 +1808,7 @@ msgstr "Neue Nachricht hat Formatierungsfehler in 'Von'."
 msgid "New message subject format error."
 msgstr "Neue Nachricht hat Formatierungsfehler im Betreff."
 
-#: src/compose.c:1194 src/quote_fmt.c:569
+#: src/compose.c:1194 src/quote_fmt.c:570
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Der Text der Vorlage \"neue Nachricht\" hat einen Fehler in Zeile %d."
@@ -1820,7 +1818,7 @@ msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 "Keine Antwort möglich. Die ursprüngliche E-Mail gibt es vermutlich nicht."
 
-#: src/compose.c:1638 src/quote_fmt.c:586
+#: src/compose.c:1638 src/quote_fmt.c:587
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1828,12 +1826,12 @@ msgstr ""
 "Das \"Von\"-Feld der \"Antworten\"-Vorlage enthält eine ungültige E-"
 "Mailadresse."
 
-#: src/compose.c:1686 src/quote_fmt.c:589
+#: src/compose.c:1686 src/quote_fmt.c:590
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Der Körper der \"Antworten\"-Vorlage hat eine Fehler in Zeile %d."
 
-#: src/compose.c:1822 src/compose.c:2014 src/quote_fmt.c:606
+#: src/compose.c:1822 src/compose.c:2014 src/quote_fmt.c:607
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1841,7 +1839,7 @@ msgstr ""
 "Das \"Von\" Feld der \"Weiterleiten\"-Vorlage enthält eine ungültige E-"
 "Mailadresse."
 
-#: src/compose.c:1882 src/quote_fmt.c:609
+#: src/compose.c:1882 src/quote_fmt.c:610
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Der Körper der \"Weiterleiten\"-Vorlage hat eine Fehler in Zeile %d."
@@ -1867,7 +1865,7 @@ msgstr "Bcc:"
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
-#: src/compose.c:2615 src/compose.c:4946 src/compose.c:4948
+#: src/compose.c:2615 src/compose.c:4948 src/compose.c:4950
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgruppen:"
@@ -1880,7 +1878,7 @@ msgstr "Followup an:"
 msgid "In-Reply-To:"
 msgstr "In-Reply-To:"
 
-#: src/compose.c:2625 src/compose.c:4943 src/compose.c:4951
+#: src/compose.c:2625 src/compose.c:4945 src/compose.c:4953
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "An:"
@@ -1905,16 +1903,16 @@ msgstr[1] ""
 "Die folgenden Dateien wurden angehängt: \n"
 "%s"
 
-#: src/compose.c:3113
+#: src/compose.c:3115
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Das \"Zitatzeichen\" der Vorlage ist ungültig."
 
-#: src/compose.c:3613
+#: src/compose.c:3615
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Die Größe der Datei '%s' ist nicht ermittelbar."
 
-#: src/compose.c:3624
+#: src/compose.c:3626
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1923,57 +1921,57 @@ msgstr ""
 "Sie sind dabei eine %s große Datei in den Nachrichtenkörper einzufügen. "
 "Möchten Sie das wirklich tun?"
 
-#: src/compose.c:3627
+#: src/compose.c:3629
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
+#: src/compose.c:3630 src/compose.c:10510 src/compose.c:11386
 msgid "_Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:3752
+#: src/compose.c:3754
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:3753
+#: src/compose.c:3755
 msgid "Empty file"
 msgstr "Leere Datei"
 
-#: src/compose.c:3754
+#: src/compose.c:3756
 msgid "_Attach anyway"
 msgstr "Trotzdem _anhängen"
 
-#: src/compose.c:3763
+#: src/compose.c:3765
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:3790
+#: src/compose.c:3792
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:4783 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4785 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 
-#: src/compose.c:4790 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4792 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Nachricht verfassen%s"
 
-#: src/compose.c:4793 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4795 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[kein Betreff] - Nachricht verfassen%s"
 
-#: src/compose.c:4795 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4797 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Nachricht verfassen"
 
-#: src/compose.c:4822 src/messageview.c:889
+#: src/compose.c:4824 src/messageview.c:889
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1981,51 +1979,51 @@ msgstr ""
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Konto vor dem Senden."
 
-#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5118
 #: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:5043
+#: src/compose.c:5045
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard-Cc-Adresse. Trotzdem senden?"
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
-#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5046 src/compose.c:5078 src/compose.c:5111 src/compose.c:5631
+#: src/folderview.c:2462 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Senden"
 
-#: src/compose.c:5075
+#: src/compose.c:5077
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard-Bcc-Adresse. Trotzdem senden?"
 
-#: src/compose.c:5092
+#: src/compose.c:5094
 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben."
 
-#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Postausgang"
 
-#: src/compose.c:5112
+#: src/compose.c:5114
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Betreff ist leer. %s"
 
-#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5115 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Trotzdem senden?"
 
-#: src/compose.c:5114 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5116 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Trotzdem vorspeichern?"
 
-#: src/compose.c:5116 src/toolbar.c:425
+#: src/compose.c:5118 src/toolbar.c:425
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:5169 src/compose.c:9999
+#: src/compose.c:5171 src/compose.c:9974
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2035,7 +2033,7 @@ msgstr ""
 "\n"
 "Zeichensatz-Konvertierung schlug fehl."
 
-#: src/compose.c:5172 src/compose.c:10002
+#: src/compose.c:5174 src/compose.c:9977
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2045,7 +2043,7 @@ msgstr ""
 "\n"
 "Schlüssel des Empfängers nicht erhältlich."
 
-#: src/compose.c:5178 src/compose.c:9996
+#: src/compose.c:5180 src/compose.c:9971
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2056,7 +2054,7 @@ msgstr ""
 "\n"
 "Fehler bei digitaler Signatur: %s"
 
-#: src/compose.c:5181
+#: src/compose.c:5183
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2067,11 +2065,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5183
+#: src/compose.c:5185
 msgid "Could not queue message for sending."
 msgstr "Nachricht konnte nicht zum Senden vorgespeichert werden."
 
-#: src/compose.c:5198 src/compose.c:5258
+#: src/compose.c:5200 src/compose.c:5260
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2080,7 +2078,7 @@ msgstr ""
 "gesendet. Benutzen Sie 'Ausgehende Nachrichten senden'\n"
 "aus dem Hauptmenü zum Wiederholen."
 
-#: src/compose.c:5254
+#: src/compose.c:5256
 #, c-format
 msgid ""
 "%s\n"
@@ -2090,7 +2088,7 @@ msgstr ""
 "Benutzen Sie \"Vorgespeicherte Nachrichten senden\" vom Hauptfenster zum "
 "Wiederholen."
 
-#: src/compose.c:5632
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2101,7 +2099,7 @@ msgstr ""
 "spezifizierten Zeichensatz %s konvertiert werden.\n"
 "Als %s senden?"
 
-#: src/compose.c:5690
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2114,73 +2112,73 @@ msgstr ""
 "\n"
 "Trotzdem senden?"
 
-#: src/compose.c:5801
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "E-Mail konnte nicht verschlüsselt werden: %s"
 
-#: src/compose.c:5922
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Verschlüsselungshinweis"
 
-#: src/compose.c:5923
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "F_ortfahren"
 
-#: src/compose.c:5972
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 
-#: src/compose.c:5981
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Gewähltes Konto ist nicht NNTP: Absenden schlug fehl."
 
-#: src/compose.c:6216
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Der Anhang %s existiert nicht mehr. Ignorieren?"
 
-#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Senden abbrechen"
 
-#: src/compose.c:6217
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Anhang ignorieren"
 
 # Maybe not completely correct translated but I could not get the context...
-#: src/compose.c:6257
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Originaler %s-Teil"
 
-#: src/compose.c:6838
+#: src/compose.c:6813
 msgid "Add to address _book"
 msgstr "Zum Adress_buch hinzufügen"
 
-#: src/compose.c:6999
+#: src/compose.c:6974
 msgid "Delete entry contents"
 msgstr "Inhalt des Eintrags löschen"
 
-#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6978 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Mit <tab> automatisch aus dem Adressbuch vervollständigen"
 
-#: src/compose.c:7218
+#: src/compose.c:7193
 msgid "Mime type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7199 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:7287
+#: src/compose.c:7262
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
-#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7299 src/editjpilot.c:276 src/editldap.c:519
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2191,23 +2189,23 @@ msgstr "Nachricht speichern unter "
 msgid "_Browse"
 msgstr "_Durchsuchen"
 
-#: src/compose.c:7797
+#: src/compose.c:7772
 msgid "Hea_der"
 msgstr "_Kopfzeile"
 
-#: src/compose.c:7802
+#: src/compose.c:7777
 msgid "_Attachments"
 msgstr "_Anhänge"
 
-#: src/compose.c:7816
+#: src/compose.c:7791
 msgid "Othe_rs"
 msgstr "_Weiteres"
 
-#: src/compose.c:7831
+#: src/compose.c:7806
 msgid "S_ubject:"
 msgstr "B_etreff:"
 
-#: src/compose.c:8055
+#: src/compose.c:8030
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2216,19 +2214,19 @@ msgstr ""
 "Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 
-#: src/compose.c:8194
+#: src/compose.c:8169
 msgid "_From:"
 msgstr "V_on:"
 
-#: src/compose.c:8211
+#: src/compose.c:8186
 msgid "Account to use for this email"
 msgstr "Für diese E-Mail zu verwendendes Konto"
 
-#: src/compose.c:8213
+#: src/compose.c:8188
 msgid "Sender address to be used"
 msgstr "Zu benutzende Absenderadresse"
 
-#: src/compose.c:8379
+#: src/compose.c:8354
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2237,68 +2235,68 @@ msgstr ""
 "Das Datenschutzsystem '%s' kann nicht geladen werden. Es wird nicht möglich "
 "sein, diese Nachricht zu signieren oder zu verschlüsseln."
 
-#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8455 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Keines"
 
-#: src/compose.c:8581 src/prefs_template.c:760
+#: src/compose.c:8556 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Der Text der Vorlage hat einen Fehler in Zeile %d."
 
-#: src/compose.c:8697
+#: src/compose.c:8672
 msgid "Template From format error."
 msgstr "Formatierungsfehler in Von-Vorlage."
 
-#: src/compose.c:8715
+#: src/compose.c:8690
 msgid "Template To format error."
 msgstr "Formatierungsfehler in An-Vorlage."
 
-#: src/compose.c:8733
+#: src/compose.c:8708
 msgid "Template Cc format error."
 msgstr "Formatierungsfehler in Cc-Vorlage."
 
-#: src/compose.c:8751
+#: src/compose.c:8726
 msgid "Template Bcc format error."
 msgstr "Formatierungsfehler in Bcc-Vorlage."
 
-#: src/compose.c:8769
+#: src/compose.c:8744
 msgid "Template Reply-To format error."
 msgstr "Formatierungsfehler in Reply-to-Vorlage."
 
-#: src/compose.c:8788
+#: src/compose.c:8763
 msgid "Template subject format error."
 msgstr "Formatierungsfehler in Betreff-Vorlage."
 
-#: src/compose.c:9057
+#: src/compose.c:9032
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ."
 
-#: src/compose.c:9072
+#: src/compose.c:9047
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:9146
+#: src/compose.c:9121
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:9163
+#: src/compose.c:9138
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:9204
+#: src/compose.c:9179
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:9224
+#: src/compose.c:9199
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:9225
+#: src/compose.c:9200
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:9476
+#: src/compose.c:9451
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2309,15 +2307,15 @@ msgstr ""
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 
-#: src/compose.c:9965 src/messageview.c:1096
+#: src/compose.c:9940 src/messageview.c:1083
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail benötigt Zugang zum Netz, um diese E-Mail zu senden."
 
-#: src/compose.c:9991
+#: src/compose.c:9966
 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht vorgespeichert werden."
 
-#: src/compose.c:9993
+#: src/compose.c:9968
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2327,15 +2325,15 @@ msgstr ""
 "Nachricht konnte nicht vorgespeichert werden\n"
 "%s."
 
-#: src/compose.c:10171
+#: src/compose.c:10146
 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 
-#: src/compose.c:10175
+#: src/compose.c:10150
 msgid "Could not save draft"
 msgstr "Entwurf konnte nicht gespeichert werden"
 
-#: src/compose.c:10176
+#: src/compose.c:10151
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2343,24 +2341,24 @@ msgstr ""
 "Entwurf konnte nicht gespeichert werden.\n"
 "Möchten Sie das Beenden zurücknehmen oder die Nachricht verwerfen?"
 
-#: src/compose.c:10178
+#: src/compose.c:10153
 msgid "_Cancel exit"
 msgstr "Beenden _zurücknehmen"
 
-#: src/compose.c:10178
+#: src/compose.c:10153
 msgid "_Discard email"
 msgstr "_Nachricht verwerfen"
 
-#: src/compose.c:10338 src/compose.c:10352
+#: src/compose.c:10313 src/compose.c:10327
 msgid "Select file"
 msgstr "Datei auswählen"
 
-#: src/compose.c:10366
+#: src/compose.c:10341
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
-#: src/compose.c:10368
+#: src/compose.c:10343
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2369,71 +2367,78 @@ msgstr ""
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 
-#: src/compose.c:10455
+#: src/compose.c:10430
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:10456
+#: src/compose.c:10431
 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
-#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10432 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: src/compose.c:10457 src/compose.c:10461
+#: src/compose.c:10432 src/compose.c:10436
 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 
-#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10434 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: src/compose.c:10460
+#: src/compose.c:10435
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Diese Nachricht wurde geändert. Die letzten Änderungen speichern?"
 
-#: src/compose.c:10461
+#: src/compose.c:10436
 msgid "_Don't save"
 msgstr "_Nicht Speichern"
 
-#: src/compose.c:10532
+#: src/compose.c:10507
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Möchten Sie die Vorlage '%s' anwenden?"
 
-#: src/compose.c:10534
+#: src/compose.c:10509
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
-#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10510 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Ersetzen"
 
-#: src/compose.c:11399
-msgid "Insert or attach?"
-msgstr "Einfügen oder Anhängen?"
-
-#: src/compose.c:11400
+#: src/compose.c:11379
+#, c-format
 msgid ""
-"Do you want to insert the contents of the file(s) into the message body, or "
+"Do you want to insert the contents of the file into the message body, or "
 "attach it to the email?"
-msgstr ""
+msgid_plural ""
+"Do you want to insert the contents of the %d files into the message body, or "
+"attach them to the email?"
+msgstr[0] ""
 "Wollen Sie den Inhalt der Datei in den Nachrichtenkörper einfügen oder an "
 "die Nachricht anhängen?"
+msgstr[1] ""
+"Wollen Sie den Inhalt von %d Dateien in den Nachrichtenkörper einfügen oder "
+"an die Nachricht anhängen?"
 
-#: src/compose.c:11402
+#: src/compose.c:11385
+msgid "Insert or attach?"
+msgstr "Einfügen oder Anhängen?"
+
+#: src/compose.c:11386
 msgid "_Attach"
 msgstr "_Anhang"
 
-#: src/compose.c:11619
+#: src/compose.c:11604
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Zitat-Formatierungsfehler in Zeile %d."
 
-#: src/compose.c:11914
+#: src/compose.c:11899
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2546,7 +2551,7 @@ msgstr "Es muss eine E-Mail-Adresse angegeben werden."
 msgid "A Name and Value must be supplied."
 msgstr "Es müssen ein Name und ein Feldwert angegeben sein."
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1675
+#: src/editaddress.c:675 src/prefs_folder_item.c:1679
 msgid "Discard"
 msgstr "Verwerfen"
 
@@ -2654,7 +2659,7 @@ msgstr " Datei überprüfen "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
 #: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
-#: src/wizard.c:1197 src/wizard.c:1617
+#: src/wizard.c:1196 src/wizard.c:1616
 msgid "File"
 msgstr "Datei"
 
@@ -2702,12 +2707,12 @@ msgstr "Ordner bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen des Ordners ein:"
 
-#: src/editgroup.c:556 src/foldersel.c:582 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:586 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "New folder"
 msgstr "Neuer Ordner"
 
-#: src/editgroup.c:557 src/foldersel.c:583 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:587 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen des neuen Ordners ein:"
@@ -2745,7 +2750,7 @@ msgstr "Hostname"
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap_basedn.c:176 src/editldap.c:502
+#: src/editldap_basedn.c:176 src/editldap.c:503
 msgid "Search Base"
 msgstr "Suchbasis"
 
@@ -2778,7 +2783,7 @@ msgstr "Mindestens ein LDAP-Suchattribut sollte angegeben werden."
 msgid "Connected successfully to server"
 msgstr "Verbindung zum Server erfolgreich"
 
-#: src/editldap.c:336 src/editldap.c:970
+#: src/editldap.c:336 src/editldap.c:971
 msgid "Edit LDAP Server"
 msgstr "LDAP-Server bearbeiten"
 
@@ -2788,58 +2793,60 @@ msgstr "Geben Sie dem Server einen Namen."
 
 #: src/editldap.c:450
 msgid ""
-"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
-"be appropriate for the \"mydomain.com\" organization. An IP address may also "
-"be used. You may specify \"localhost\" if running an LDAP server on the same "
+"This is the hostname of the server. For example, \"ldap.example.org\" may be "
+"appropriate for the \"example.org\" organization. An IP address may also be "
+"used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
-"Dies ist der Hostname des Servers. \"ldap.mydomain.com\" wäre z.B. für die "
-"Organisation \"mydomain.com\" geeignet. Eine IP-Adresse kann auch verwendet "
+"Dies ist der Hostname des Servers. \"ldap.example.org\" wäre z.B. für die "
+"Organisation \"example.org\" geeignet. Eine IP-Adresse kann auch verwendet "
 "werden. Wenn der LDAP-Server und Claws Mail auf dem selben Computer laufen, "
 "können Sie \"localhost\" angeben."
 
 #: src/editldap.c:470
-msgid "TLS"
-msgstr "TLS"
+msgid "STARTTLS"
+msgstr "STARTTLS"
 
 #: src/editldap.c:471 src/prefs_account.c:3396
-msgid "SSL"
-msgstr "SSL"
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
 
 #: src/editldap.c:475
 msgid ""
-"Enable secure connection to the LDAP server via TLS. If connection fails, be "
-"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"Enable secure connection to the LDAP server via STARTTLS. Connection starts "
+"unencrypted and is secured by STARTTLS command. If connection fails, be sure "
+"to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
 msgstr ""
-"Sichere Verbindung zum LDAP Server via TLS aktivieren. Wenn keine Verbindung "
-"erfolgt, überprüfen Sie die Konfiguration in der ldap.conf (die Felder "
-"TLS_CACERTDIR und TLS_REQCERT)."
+"Sichere Verbindung zum LDAP Server via STARTTLS aktivieren. Verbindung "
+"beginnt unverschlüsselt und wird per STARTTLS gesichert. Wenn keine "
+"Verbindung erfolgt, überprüfen Sie die Konfiguration in der ldap.conf (die "
+"Felder TLS_CACERTDIR und TLS_REQCERT)."
 
-#: src/editldap.c:479
+#: src/editldap.c:480
 msgid ""
-"Enable secure connection to the LDAP server via SSL. If connection fails, be "
-"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
-"TLS_REQCERT fields)."
+"Enable secure connection to the LDAP server via SSL/TLS. If connection "
+"fails, be sure to check the correct configuration in ldap.conf "
+"(TLS_CACERTDIR and TLS_REQCERT fields)."
 msgstr ""
-"Sichere Verbindung zum LDAP Server via SSL aktivieren. Wenn keine Verbindung "
-"erfolgt, überprüfen Sie die Konfiguration in der ldap.conf (die Felder "
-"TLS_CACERTDIR und TLS_REQCERT)."
+"Sichere Verbindung zum LDAP Server via SSL/TLS aktivieren. Wenn keine "
+"Verbindung erfolgt, überprüfen Sie die Konfiguration in der ldap.conf (die "
+"Felder TLS_CACERTDIR und TLS_REQCERT)."
 
-#: src/editldap.c:491
+#: src/editldap.c:492
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "Die Portnummer, die der Server verwendet. Port 389 ist Standard."
 
-#: src/editldap.c:494
+#: src/editldap.c:495
 msgid " Check Server "
 msgstr " Server überprüfen "
 
-#: src/editldap.c:498
+#: src/editldap.c:499
 msgid "Press this button to test the connection to the server."
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um die Verbindung zum Server zu testen."
 
-#: src/editldap.c:511
+#: src/editldap.c:512
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2853,7 +2860,7 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/editldap.c:522
+#: src/editldap.c:523
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
@@ -2861,11 +2868,11 @@ msgstr ""
 "Klicken Sie auf diese Schaltfläche, um auf dem Server verfügbare "
 "Verzeichnisnamen nachzuschlagen."
 
-#: src/editldap.c:578
+#: src/editldap.c:579
 msgid "Search Attributes"
 msgstr "Suchattribute"
 
-#: src/editldap.c:587
+#: src/editldap.c:588
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2873,11 +2880,11 @@ msgstr ""
 "Eine Liste von LDAP-Attributnamen, die bei der Suche nach Name oder Adresse "
 "durchsucht werden sollen."
 
-#: src/editldap.c:590
+#: src/editldap.c:591
 msgid " Defaults "
 msgstr " Standardwerte "
 
-#: src/editldap.c:594
+#: src/editldap.c:595
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
@@ -2885,11 +2892,11 @@ msgstr ""
 "Dies setzt die Attributnamen auf einen Standardwert zurück, der die meisten "
 "Namen und Adressen bei einer Suche finden sollte."
 
-#: src/editldap.c:600
+#: src/editldap.c:601
 msgid "Max Query Age (secs)"
 msgstr "Max. Abfragealter (Sek.)"
 
-#: src/editldap.c:615
+#: src/editldap.c:616
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2914,11 +2921,11 @@ msgstr ""
 "langsamer Antwortzeit, benötigt aber mehr Speicher zum Zwischenspeichern der "
 "Ergebnissen."
 
-#: src/editldap.c:632
+#: src/editldap.c:633
 msgid "Include server in dynamic search"
 msgstr "Server in dynamische Suche einbeziehen"
 
-#: src/editldap.c:637
+#: src/editldap.c:638
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2926,11 +2933,11 @@ msgstr ""
 "Diese Option wählen, um den Server bei der dynamischen Suche zur Adress-"
 "Vervollständigung zu verwenden."
 
-#: src/editldap.c:643
+#: src/editldap.c:644
 msgid "Match names 'containing' search term"
 msgstr "Treffernamen 'enthalten' Suchbegriff"
 
-#: src/editldap.c:648
+#: src/editldap.c:649
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2944,11 +2951,11 @@ msgstr ""
 "Geschwindigkeitsgründen wird deshalb für die Adressvervollständigung eine "
 "'beginnt mit'-Suche für alle anderen Adressinterfaces verwendet."
 
-#: src/editldap.c:701
+#: src/editldap.c:702
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:710
+#: src/editldap.c:711
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2960,42 +2967,42 @@ msgstr ""
 "typischerweise folgendermaßen formatiert: \"cn=user,dc=claws-mail,dc=com\". "
 "Gewöhnlich wird das Feld bei einer Suche leer gelassen."
 
-#: src/editldap.c:717
+#: src/editldap.c:718
 msgid "Bind Password"
 msgstr "Bind Kennwort"
 
-#: src/editldap.c:727
+#: src/editldap.c:728
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Das Kennwort zum Verbinden als der 'Bind DN' Benutzer."
 
-#: src/editldap.c:732
+#: src/editldap.c:733
 msgid "Timeout (secs)"
 msgstr "Timeout (Sek.)"
 
-#: src/editldap.c:746
+#: src/editldap.c:747
 msgid "The timeout period in seconds."
 msgstr "Die Timeout-Dauer in Sekunden."
 
-#: src/editldap.c:750
+#: src/editldap.c:751
 msgid "Maximum Entries"
 msgstr "Maximale Anzahl von Einträgen"
 
-#: src/editldap.c:764
+#: src/editldap.c:765
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "Die maximale Zahl von Einträgen, die im Suchresultat ausgegeben werden "
 "sollen."
 
-#: src/editldap.c:779 src/prefs_account.c:3287
+#: src/editldap.c:780 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Allgemein"
 
-#: src/editldap.c:781 src/gtk/quicksearch.c:680
+#: src/editldap.c:782 src/gtk/quicksearch.c:680
 msgid "Extended"
 msgstr "Erweitert"
 
-#: src/editldap.c:975
+#: src/editldap.c:976
 msgid "Add New LDAP Server"
 msgstr "Neuen LDAP-Server hinzufügen"
 
@@ -3122,15 +3129,15 @@ msgstr "Du_rchsuchen"
 msgid "Stylesheet"
 msgstr "Stylesheet"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
 #: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5992
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5928
 msgid "None"
 msgstr "ohne"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:520 src/prefs_other.c:126
 #: src/prefs_other.c:418
 msgid "Default"
 msgstr "Standard"
@@ -3366,7 +3373,7 @@ msgstr "Adressbuch in LDIF-Datei exportieren"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8139
+#: src/export.c:113 src/summaryview.c:8075
 msgid "Export to mbox file"
 msgstr "Export in Mbox-Datei"
 
@@ -3622,151 +3629,151 @@ msgstr ""
 "Filtere Nachricht (%s%s%s)\n"
 "%sNachrichtendatei: %s\n"
 
-#: src/folder.c:1565 src/foldersel.c:400 src/prefs_folder_item.c:300
+#: src/folder.c:1570 src/foldersel.c:404 src/prefs_folder_item.c:315
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/folder.c:1569 src/foldersel.c:404
+#: src/folder.c:1574 src/foldersel.c:408
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/folder.c:1573 src/foldersel.c:408 src/prefs_folder_item.c:303
+#: src/folder.c:1578 src/foldersel.c:412 src/prefs_folder_item.c:318
 msgid "Queue"
 msgstr "Postausgang"
 
-#: src/folder.c:1577 src/foldersel.c:412 src/prefs_folder_item.c:304
+#: src/folder.c:1582 src/foldersel.c:416 src/prefs_folder_item.c:319
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/folder.c:1581 src/foldersel.c:416 src/prefs_folder_item.c:302
+#: src/folder.c:1586 src/foldersel.c:420 src/prefs_folder_item.c:317
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/folder.c:2012
+#: src/folder.c:2017
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeitung läuft (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3262
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopiere %s nach %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3262
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Verschiebe %s nach %s...\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3568
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "aktualisiere Pufferspeicher für %s..."
 
-#: src/folder.c:4424
+#: src/folder.c:4430
 msgid "Processing messages..."
 msgstr "Bearbeitung läuft..."
 
-#: src/folder.c:4559
+#: src/folder.c:4565
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronisiere %s für Offline-Nutzung...\n"
 
-#: src/folder.c:4816
+#: src/folder.c:4822
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Ein Ordnername darf nicht mit einem Punkt beginnen oder enden."
 
-#: src/folder.c:4820
+#: src/folder.c:4826
 msgid "A folder name can not end with a space."
 msgstr "Ein Ordnername darf nicht mit einem Leerzeichen enden."
 
-#: src/foldersel.c:247
+#: src/foldersel.c:248
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: src/foldersel.c:584 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/foldersel.c:588 src/imap_gtk.c:197 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "NewFolder"
 msgstr "NeuerOrdner"
 
-#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:596 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
 #: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: src/plugins/vcalendar/vcal_folder.c:2052
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 
-#: src/foldersel.c:607 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:611 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:434 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2063
+#: src/plugins/vcalendar/vcal_folder.c:2059
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Der Ordner '%s' existiert bereits."
 
-#: src/foldersel.c:614 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:618 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:124
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Ordner '%s' konnte nicht erstellt werden."
 
-#: src/folderview.c:241
+#: src/folderview.c:242
 msgid "Mark all re_ad"
 msgstr "Alle _gelesen markieren"
 
-#: src/folderview.c:242
+#: src/folderview.c:243
 msgid "Mark all read recursi_vely"
 msgstr "Rekursiv alle als gelesen marki_eren"
 
-#: src/folderview.c:244
+#: src/folderview.c:245
 msgid "R_un processing rules"
 msgstr "Verarbeit_ungsregel anwenden"
 
-#: src/folderview.c:245 src/mainwindow.c:551
+#: src/folderview.c:246 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Ordner durchsuchen..."
 
-#: src/folderview.c:247
+#: src/folderview.c:248
 msgid "Process_ing..."
 msgstr "_Verarbeitungsregeln..."
 
-#: src/folderview.c:248
+#: src/folderview.c:249
 msgid "Empty _trash..."
 msgstr "_Papierkorb leeren"
 
-#: src/folderview.c:249
+#: src/folderview.c:250
 msgid "Send _queue..."
 msgstr "_Postausgang senden..."
 
-#: src/folderview.c:389 src/folderview.c:436
+#: src/folderview.c:390 src/folderview.c:437
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6202
 msgid "New"
 msgstr "Neu"
 
-#: src/folderview.c:390 src/folderview.c:437
+#: src/folderview.c:391 src/folderview.c:438
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6204
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:392 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Gesamt"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:439 src/summaryview.c:445
+#: src/folderview.c:440 src/summaryview.c:445
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:773
+#: src/folderview.c:775
 msgid "Setting folder info..."
 msgstr "Ordnerdaten werden erstellt..."
 
-#: src/folderview.c:845
+#: src/folderview.c:847
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3774,100 +3781,100 @@ msgstr ""
 "Möchten Sie wirklich alle Mails in diesem Ordner und seinen Unterordnern als "
 "gelesen markieren?"
 
-#: src/folderview.c:847 src/summaryview.c:4115
+#: src/folderview.c:849 src/summaryview.c:4055
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Möchten Sie wirklich alle Mails in diesem Ordner als gelesen markieren?"
 
-#: src/folderview.c:851 src/summaryview.c:4114
+#: src/folderview.c:853 src/summaryview.c:4054
 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 
-#: src/folderview.c:1027 src/imap.c:4639
+#: src/folderview.c:1032 src/imap.c:4636
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Ordner %s%s wird durchsucht..."
 
-#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1035 src/imap.c:4640 src/mainwindow.c:5197 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Ordner %s wird durchsucht..."
 
-#: src/folderview.c:1061
+#: src/folderview.c:1066
 msgid "Rebuild folder tree"
 msgstr "Ordnerbaum erneuern"
 
-#: src/folderview.c:1062
+#: src/folderview.c:1067
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Erneuern des Ordnerbaumes löscht den lokalen Pufferspeicher. Möchten Sie "
 "fortfahren?"
 
-#: src/folderview.c:1072
+#: src/folderview.c:1077
 msgid "Rebuilding folder tree..."
 msgstr "Ordnerbaum wird erneuert..."
 
-#: src/folderview.c:1074
+#: src/folderview.c:1079
 msgid "Scanning folder tree..."
 msgstr "Ordnerbaum wird durchsucht..."
 
-#: src/folderview.c:1165
+#: src/folderview.c:1170
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Ordner %s konnte nicht durchsucht werden\n"
 
-#: src/folderview.c:1219
+#: src/folderview.c:1224
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten geprüft..."
 
-#: src/folderview.c:2144
+#: src/folderview.c:2148
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Schließe Ordner %s..."
 
-#: src/folderview.c:2239
+#: src/folderview.c:2243
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öffne Ordner %s..."
 
-#: src/folderview.c:2257
+#: src/folderview.c:2261
 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 
-#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2403 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 
-#: src/folderview.c:2400
+#: src/folderview.c:2404
 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb löschen?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2405
 msgid "_Empty trash"
 msgstr "Papierkorb _leeren"
 
-#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2448 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Offline-Warnung"
 
-#: src/folderview.c:2445 src/toolbar.c:2608
+#: src/folderview.c:2449 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 
-#: src/folderview.c:2456 src/toolbar.c:2627
+#: src/folderview.c:2460 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Vorgespeicherte Nachrichten senden"
 
-#: src/folderview.c:2457 src/toolbar.c:2628
+#: src/folderview.c:2461 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Alle vorgespeicherten Nachrichten senden?"
 
-#: src/folderview.c:2466 src/toolbar.c:2647
+#: src/folderview.c:2470 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden vorgespeicherter Nachrichten."
 
-#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2473 src/main.c:2744 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3876,66 +3883,66 @@ msgstr ""
 "Fehler beim Senden vorgespeicherter Nachrichten:\n"
 "%s"
 
-#: src/folderview.c:2544
+#: src/folderview.c:2548
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Soll der Ordner '%s' in '%s' kopiert werden?"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2549
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Soll der Ordner '%s' wirklich ein Unterordner von '%s' werden?"
 
-#: src/folderview.c:2547
+#: src/folderview.c:2551
 msgid "Copy folder"
 msgstr "Kopiere Ordner"
 
-#: src/folderview.c:2547
+#: src/folderview.c:2551
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: src/folderview.c:2558
+#: src/folderview.c:2562
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiere %s nach %s..."
 
-#: src/folderview.c:2558
+#: src/folderview.c:2562
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 
-#: src/folderview.c:2592
+#: src/folderview.c:2596
 msgid "Source and destination are the same."
 msgstr "Quelle und Ziel sind identisch."
 
-#: src/folderview.c:2595
+#: src/folderview.c:2599
 msgid "Can't copy a folder to one of its children."
 msgstr "Ein Ordner ist nicht in untergeordnete Ordner kopierbar."
 
-#: src/folderview.c:2596
+#: src/folderview.c:2600
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
 "werden."
 
-#: src/folderview.c:2599
+#: src/folderview.c:2603
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Ordner können nicht zwischen verschiedenen Mailboxen verschoben werden"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2606
 msgid "Copy failed!"
 msgstr "Kopieren schlug fehl!"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2606
 msgid "Move failed!"
 msgstr "Verschieben schlug fehl!"
 
-#: src/folderview.c:2652
+#: src/folderview.c:2656
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration Verarbeitung für Ordner %s"
 
-#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3096 src/summaryview.c:4493 src/summaryview.c:4594
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Der Zielordner kann nur Unterordner aufnehmen."
 
@@ -3985,7 +3992,7 @@ msgstr "unbekannt"
 msgid "Can't retrieve newsgroup list."
 msgstr "Newsgruppenliste ist nicht abrufbar."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1565
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1562
 msgid "Done."
 msgstr "Fertig."
 
@@ -4197,46 +4204,46 @@ msgstr ""
 "Sie sollten eine Kopie der GNU General Public License mit diesem Programm "
 "erhalten haben. Wenn nicht, finden Sie diese unter "
 
-#: src/gtk/about.c:698 src/main.c:2567
+#: src/gtk/about.c:698 src/main.c:2568
 msgid "Session statistics\n"
 msgstr "Sitzungsstatistik\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2577 src/main.c:2580
+#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2578 src/main.c:2581
 #, c-format
 msgid "Started: %s\n"
 msgstr "Beginn: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2586
+#: src/gtk/about.c:718 src/main.c:2587
 msgid "Incoming traffic\n"
 msgstr "Eingang\n"
 
-#: src/gtk/about.c:721 src/main.c:2589
+#: src/gtk/about.c:721 src/main.c:2590
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Empfangene Nachrichten: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2595
+#: src/gtk/about.c:728 src/main.c:2596
 msgid "Outgoing traffic\n"
 msgstr "Ausgang\n"
 
 # msgid "/_Tools/---"
 # msgstr "/E_xtras/---"
-#: src/gtk/about.c:731 src/main.c:2598
+#: src/gtk/about.c:731 src/main.c:2599
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Neue/weitergeleitete Nachrichten: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2602
+#: src/gtk/about.c:736 src/main.c:2603
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Beantwortete Nachrichten: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2606
+#: src/gtk/about.c:741 src/main.c:2607
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Weitergeleitete Nachrichten: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2610
+#: src/gtk/about.c:746 src/main.c:2611
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Alle verschickten Nachrichten: %d\n"
@@ -4279,63 +4286,63 @@ msgstr "_Versionsbeschreibung"
 msgid "_Statistics"
 msgstr "_Statistik"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:367
 msgid "Orange"
 msgstr "Orange"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:371
 msgid "Red"
 msgstr "Rot"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:375
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:379
 msgid "Sky blue"
 msgstr "Himmelblau"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:383
 msgid "Blue"
 msgstr "Blau"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:387
 msgid "Green"
 msgstr "Grün"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:391
 msgid "Brown"
 msgstr "Braun"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:395
 msgid "Grey"
 msgstr "Grau"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:399
 msgid "Light brown"
 msgstr "Hellbraun"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:403
 msgid "Dark red"
 msgstr "Dunkelrot"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:407
 msgid "Dark pink"
 msgstr "Dunkelrosa"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:411
 msgid "Steel blue"
 msgstr "Stahlblau"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:415
 msgid "Gold"
 msgstr "Gold"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:419
 msgid "Bright green"
 msgstr "Hellgrün"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:423
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -4464,20 +4471,20 @@ msgstr ""
 "%s"
 
 # Dieser und die zwei anderen "Failed"-Meldungen werden angezeigt, wenn die automatische Konfiguration von Email-Verbindungsdaten fehlschlägt.
-#: src/gtk/gtkutils.c:1921
+#: src/gtk/gtkutils.c:1927
 msgid "Failed: no service record found."
 msgstr "Fehlgeschlagen: Keine Daten für diesen Anbieter gefunden."
 
-#: src/gtk/gtkutils.c:1924
+#: src/gtk/gtkutils.c:1930
 msgid "Failed: network error."
 msgstr "Fehlgeschlagen: Netzwerkfehler"
 
-#: src/gtk/gtkutils.c:1927
+#: src/gtk/gtkutils.c:1933
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Fehlgeschlagen: unbekannter Fehler (%d)."
 
-#: src/gtk/gtkutils.c:1997
+#: src/gtk/gtkutils.c:2003
 msgid "Configuring..."
 msgstr "Konfiguriere…"
 
@@ -4558,7 +4565,7 @@ msgstr "Referenzen:"
 msgid "Subject"
 msgstr "Betreff"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:700
 #: src/summary_search.c:440
 msgid "Subject:"
 msgstr "Betreff:"
@@ -4575,7 +4582,7 @@ msgstr "Comments:"
 msgid "Keywords"
 msgstr "Keywords"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:702
 msgid "Keywords:"
 msgstr "Schlagworte:"
 
@@ -4678,7 +4685,7 @@ msgstr "Seen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
 #: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:79 src/summaryview.c:2786
+#: src/prefs_summary_column.c:79 src/summaryview.c:2763
 msgid "Status"
 msgstr "Status"
 
@@ -4878,95 +4885,103 @@ msgstr "Von, An oder Betreff"
 msgid "From, To or Subject:"
 msgstr "Von, An oder Betreff:"
 
-#: src/gtk/icon_legend.c:64
+#: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Neue Nachricht"
 
-#: src/gtk/icon_legend.c:65
+#: src/gtk/icon_legend.c:68
 msgid "Unread message"
 msgstr "Ungelesene Nachricht"
 
-#: src/gtk/icon_legend.c:66
+#: src/gtk/icon_legend.c:69
 msgid "Message has been replied to"
 msgstr "Nachricht wurde beantwortet"
 
-#: src/gtk/icon_legend.c:67
+#: src/gtk/icon_legend.c:70
 msgid "Message has been forwarded"
 msgstr "Nachricht wurde weitergeleitet"
 
-#: src/gtk/icon_legend.c:68
+#: src/gtk/icon_legend.c:71
 msgid "Message has been forwarded and replied to"
 msgstr "Nachricht wurde weitergeleitet und beantwortet"
 
-#: src/gtk/icon_legend.c:69
+#: src/gtk/icon_legend.c:72
 msgid "Message is in an ignored thread"
 msgstr "Nachricht ist in ignoriertem Diskurs"
 
-#: src/gtk/icon_legend.c:70
+#: src/gtk/icon_legend.c:73
 msgid "Message is in a watched thread"
 msgstr "Nachricht ist in beobachtetem Diskurs"
 
-#: src/gtk/icon_legend.c:71
+#: src/gtk/icon_legend.c:74
 msgid "Message is spam"
 msgstr "Nachricht ist Spam"
 
-#: src/gtk/icon_legend.c:73
+#: src/gtk/icon_legend.c:76
 msgid "Message has attachment(s)"
 msgstr "Nachricht hat Anhänge"
 
-#: src/gtk/icon_legend.c:74
+#: src/gtk/icon_legend.c:77
 msgid "Digitally signed message"
 msgstr "Nachricht ist digital signiert"
 
-#: src/gtk/icon_legend.c:75
+#: src/gtk/icon_legend.c:78
 msgid "Encrypted message"
 msgstr "Nachricht ist verschlüsselt"
 
-#: src/gtk/icon_legend.c:76
+#: src/gtk/icon_legend.c:79
 msgid "Message is signed and has attachment(s)"
 msgstr "Nachricht ist signiert und hat Anhänge"
 
-#: src/gtk/icon_legend.c:77
+#: src/gtk/icon_legend.c:80
 msgid "Message is encrypted and has attachment(s)"
 msgstr "Nachricht ist verschlüsselt und hat Anhänge"
 
-#: src/gtk/icon_legend.c:79
+#: src/gtk/icon_legend.c:82
 msgid "Marked message"
 msgstr "Nachricht ist markiert"
 
-#: src/gtk/icon_legend.c:80
+#: src/gtk/icon_legend.c:83
 msgid "Message is marked for deletion"
 msgstr "Nachricht ist zum Löschen markiert"
 
-#: src/gtk/icon_legend.c:81
+#: src/gtk/icon_legend.c:84
 msgid "Message is marked for moving"
 msgstr "Nachricht ist zum Verschieben markiert"
 
-#: src/gtk/icon_legend.c:82
+#: src/gtk/icon_legend.c:85
 msgid "Message is marked for copying"
 msgstr "Nachricht ist zum Kopieren markiert"
 
-#: src/gtk/icon_legend.c:84
+#: src/gtk/icon_legend.c:87
 msgid "Locked message"
 msgstr "Nachricht ist gesperrt"
 
-#: src/gtk/icon_legend.c:86
+#: src/gtk/icon_legend.c:89
 msgid "Folder (normal, opened)"
 msgstr "Ordner (normal, geöffnet)"
 
-#: src/gtk/icon_legend.c:87
+#: src/gtk/icon_legend.c:90
 msgid "Folder with read messages hidden"
 msgstr "Ordner, gelesene Nachrichten ausgeblendet"
 
-#: src/gtk/icon_legend.c:88
+#: src/gtk/icon_legend.c:91
 msgid "Folder contains marked messages"
 msgstr "Ordner enthält markierte Nachrichten"
 
-#: src/gtk/icon_legend.c:122
+#: src/gtk/icon_legend.c:92
+msgid "IMAP folder which contains sub-folders only"
+msgstr "IMAP-Ordner mit nur Unterordnern"
+
+#: src/gtk/icon_legend.c:93
+msgid "IMAP mailbox showing only subscribed folders"
+msgstr "IMAP-Mailbox zeigt nur abonierte Ordner an"
+
+#: src/gtk/icon_legend.c:127
 msgid "Icon Legend"
 msgstr "Erklärung der Symbole"
 
-#: src/gtk/icon_legend.c:140
+#: src/gtk/icon_legend.c:145
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr ""
@@ -5059,24 +5074,24 @@ msgstr ""
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:498
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:552
+#: src/plugins/clamd/clamav_plugin_gtk.c:548
 #: src/plugins/fancy/fancy_prefs.c:114
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
 #: src/plugins/managesieve/sieve_prefs.c:424
-#: src/plugins/notification/notification_prefs.c:399
-#: src/plugins/notification/notification_prefs.c:414
-#: src/plugins/notification/notification_prefs.c:433
-#: src/plugins/notification/notification_prefs.c:451
-#: src/plugins/notification/notification_prefs.c:469
-#: src/plugins/notification/notification_prefs.c:487
-#: src/plugins/notification/notification_prefs.c:505
-#: src/plugins/notification/notification_prefs.c:523
+#: src/plugins/notification/notification_prefs.c:398
+#: src/plugins/notification/notification_prefs.c:413
+#: src/plugins/notification/notification_prefs.c:432
+#: src/plugins/notification/notification_prefs.c:450
+#: src/plugins/notification/notification_prefs.c:468
+#: src/plugins/notification/notification_prefs.c:486
+#: src/plugins/notification/notification_prefs.c:504
+#: src/plugins/notification/notification_prefs.c:522
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5427,8 +5442,8 @@ msgstr "Verfällt am: "
 
 #: src/gtk/sslcertwindow.c:302
 #, c-format
-msgid "SSL certificate for %s"
-msgstr "SSL-Zertifikat für %s"
+msgid "SSL/TLS certificate for %s"
+msgstr "SSL/TLS-Zertifikat für %s"
 
 #: src/gtk/sslcertwindow.c:318
 #, c-format
@@ -5462,12 +5477,12 @@ msgid "_View certificate"
 msgstr "Zertifikat anzeigen"
 
 #: src/gtk/sslcertwindow.c:364
-msgid "SSL certificate is invalid"
-msgstr "SSL-Zertifikat ist ungültig"
+msgid "SSL/TLS certificate is invalid"
+msgstr "SSL/TLS-Zertifikat ist ungültig"
 
 #: src/gtk/sslcertwindow.c:366
-msgid "SSL certificate is unknown"
-msgstr "SSL-Zertifikat ist unbekannt"
+msgid "SSL/TLS certificate is unknown"
+msgstr "SSL/TLS-Zertifikat ist unbekannt"
 
 #: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
 #: src/gtk/sslcertwindow.c:481
@@ -5488,12 +5503,12 @@ msgstr ""
 "%sMöchten Sie fortfahren?"
 
 #: src/gtk/sslcertwindow.c:414
-msgid "SSL certificate is invalid and expired"
-msgstr "SSL-Zertifikat ist ungültig und abgelaufen."
+msgid "SSL/TLS certificate is invalid and expired"
+msgstr "SSL/TLS-Zertifikat ist ungültig und abgelaufen"
 
 #: src/gtk/sslcertwindow.c:416
-msgid "SSL certificate is expired"
-msgstr "SSL-Zertifikat ist verfallen."
+msgid "SSL/TLS certificate is expired"
+msgstr "SSL/TLS-Zertifikat ist abgelaufen"
 
 #: src/gtk/sslcertwindow.c:419
 msgid "_Accept"
@@ -5521,28 +5536,28 @@ msgid "_View certificates"
 msgstr "Zertifikate anzeigen"
 
 #: src/gtk/sslcertwindow.c:477
-msgid "SSL certificate changed and is invalid"
-msgstr "SSL-Zertifikat hat sich geändert und ist ungültig"
+msgid "SSL/TLS certificate changed and is invalid"
+msgstr "SSL/TLS-Zertifikat hat sich geändert und ist ungültig"
 
 #: src/gtk/sslcertwindow.c:479
-msgid "SSL certificate changed"
-msgstr "SSL-Zertifikat hat sich geändert"
+msgid "SSL/TLS certificate changed"
+msgstr "SSL/TLS-Zertifikat hat sich geändert"
 
 #: src/headerview.c:94
 msgid "Tags:"
 msgstr "Marken:"
 
-#: src/headerview.c:192 src/plugins/notification/notification_popup.c:316
-#: src/plugins/notification/notification_popup.c:623
-#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3344
-#: src/summaryview.c:3362 src/summaryview.c:3383
+#: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
+#: src/plugins/notification/notification_popup.c:620
+#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3334
+#: src/summaryview.c:3352 src/summaryview.c:3373
 msgid "(No From)"
 msgstr "(Kein Von)"
 
-#: src/headerview.c:207 src/plugins/notification/notification_popup.c:318
-#: src/plugins/notification/notification_popup.c:627
-#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3395
-#: src/summaryview.c:3398
+#: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
+#: src/plugins/notification/notification_popup.c:624
+#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3385
+#: src/summaryview.c:3388
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -5552,7 +5567,7 @@ msgstr "Fehler:"
 
 #: src/image_viewer.c:299 src/mimeview.c:2558
 #: src/plugins/att_remover/att_remover.c:301
-#: src/plugins/pdf_viewer/poppler_viewer.c:699
+#: src/plugins/pdf_viewer/poppler_viewer.c:696
 msgid "Filename:"
 msgstr "Dateiname:"
 
@@ -5564,193 +5579,193 @@ msgstr "Dateigröße:"
 msgid "Load Image"
 msgstr "Bild laden"
 
-#: src/imap.c:582
-msgid "IMAP4 connection broken\n"
-msgstr "IMAP4-Verbindung unterbrochen\n"
+#: src/imap.c:579
+msgid "IMAP connection broken\n"
+msgstr "IMAP-Verbindung unterbrochen\n"
 
-#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
-#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
-#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
-#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
-#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
-#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
-#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
-#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
-#: src/imap.c:744 src/imap.c:748
+#: src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630
+#: src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:647
+#: src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662
+#: src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677
+#: src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692
+#: src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707
+#: src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722
+#: src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737
+#: src/imap.c:741 src/imap.c:745
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP Fehler auf %s:"
 
-#: src/imap.c:621
+#: src/imap.c:618
 msgid "authenticated"
 msgstr " authentifiziert"
 
-#: src/imap.c:624
+#: src/imap.c:621
 msgid "not authenticated"
 msgstr " nicht authentifiziert"
 
-#: src/imap.c:627
+#: src/imap.c:624
 msgid "bad state"
 msgstr "schlechter Zustand"
 
-#: src/imap.c:630
+#: src/imap.c:627
 msgid "stream error"
 msgstr "stream-Fehler"
 
-#: src/imap.c:633
+#: src/imap.c:630
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "Parsingfehler (sehr wahrscheinlich ein nicht RFC-konformer Server)"
 
-#: src/imap.c:637
+#: src/imap.c:634
 msgid "connection refused"
 msgstr "Verbindung verweigert"
 
-#: src/imap.c:640
+#: src/imap.c:637
 msgid "memory error"
 msgstr "Speicherfehler"
 
-#: src/imap.c:643
+#: src/imap.c:640
 msgid "fatal error"
 msgstr "Fataler Fehler"
 
-#: src/imap.c:646
+#: src/imap.c:643
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "Protokollfehler (sehr wahrscheinlich ein nicht RFC-konformer Server)"
 
-#: src/imap.c:650
+#: src/imap.c:647
 msgid "connection not accepted"
 msgstr "Verbindung nicht akzeptiert"
 
-#: src/imap.c:653
+#: src/imap.c:650
 msgid "APPEND error"
 msgstr "APPEND-Fehler"
 
-#: src/imap.c:656
+#: src/imap.c:653
 msgid "NOOP error"
 msgstr "NOOP-Fehler"
 
-#: src/imap.c:659
+#: src/imap.c:656
 msgid "LOGOUT error"
 msgstr "LOGOUT-Fehler"
 
-#: src/imap.c:662
+#: src/imap.c:659
 msgid "CAPABILITY error"
 msgstr "CAPABILITY-Fehler"
 
-#: src/imap.c:665
+#: src/imap.c:662
 msgid "CHECK error"
 msgstr "CHECK-Fehler"
 
-#: src/imap.c:668
+#: src/imap.c:665
 msgid "CLOSE error"
 msgstr "CLOSE-Fehler"
 
-#: src/imap.c:671
+#: src/imap.c:668
 msgid "EXPUNGE error"
 msgstr "EXPUNGE-Fehler"
 
-#: src/imap.c:674
+#: src/imap.c:671
 msgid "COPY error"
 msgstr "COPY-Fehler"
 
-#: src/imap.c:677
+#: src/imap.c:674
 msgid "UID COPY error"
 msgstr "UID COPY-Fehler"
 
-#: src/imap.c:680
+#: src/imap.c:677
 msgid "CREATE error"
 msgstr "CREATE-Fehler"
 
-#: src/imap.c:683
+#: src/imap.c:680
 msgid "DELETE error"
 msgstr "DELETE-Fehler"
 
-#: src/imap.c:686
+#: src/imap.c:683
 msgid "EXAMINE error"
 msgstr "EXAMINE-Fehler"
 
-#: src/imap.c:689
+#: src/imap.c:686
 msgid "FETCH error"
 msgstr "FETCH-Fehler"
 
-#: src/imap.c:692
+#: src/imap.c:689
 msgid "UID FETCH error"
 msgstr "UID FETCH-Fehler"
 
-#: src/imap.c:695
+#: src/imap.c:692
 msgid "LIST error"
 msgstr "LIST-Fehler"
 
-#: src/imap.c:698
+#: src/imap.c:695
 msgid "LOGIN error"
 msgstr "LOGIN-Fehler"
 
-#: src/imap.c:701
+#: src/imap.c:698
 msgid "LSUB error"
 msgstr "LSUB-Fehler"
 
-#: src/imap.c:704
+#: src/imap.c:701
 msgid "RENAME error"
 msgstr "RENAME-Fehler"
 
-#: src/imap.c:707
+#: src/imap.c:704
 msgid "SEARCH error"
 msgstr "SEARCH-Fehler"
 
-#: src/imap.c:710
+#: src/imap.c:707
 msgid "UID SEARCH error"
 msgstr "UID SEARCH-Fehler"
 
-#: src/imap.c:713
+#: src/imap.c:710
 msgid "SELECT error"
 msgstr "SELECT-Fehler"
 
-#: src/imap.c:716
+#: src/imap.c:713
 msgid "STATUS error"
 msgstr "STATUS-Fehler"
 
-#: src/imap.c:719
+#: src/imap.c:716
 msgid "STORE error"
 msgstr "STORE-Fehler"
 
-#: src/imap.c:722
+#: src/imap.c:719
 msgid "UID STORE error"
 msgstr " UID STORE-Fehler"
 
-#: src/imap.c:725
+#: src/imap.c:722
 msgid "SUBSCRIBE error"
 msgstr " SUBSCRIBE-Fehler"
 
-#: src/imap.c:728
+#: src/imap.c:725
 msgid "UNSUBSCRIBE error"
 msgstr " UNSUBSCRIBE-Fehler"
 
-#: src/imap.c:731
+#: src/imap.c:728
 msgid "STARTTLS error"
 msgstr " STARTTLS-Fehler"
 
-#: src/imap.c:734
+#: src/imap.c:731
 msgid "INVAL error"
 msgstr " INVAL-Fehler"
 
-#: src/imap.c:737
+#: src/imap.c:734
 msgid "EXTENSION error"
 msgstr " EXTENSION-Fehler"
 
-#: src/imap.c:740
+#: src/imap.c:737
 msgid "SASL error"
 msgstr " SASL-Fehler"
 
-#: src/imap.c:744
-msgid "SSL error"
-msgstr " SSL-Fehler"
+#: src/imap.c:741
+msgid "SSL/TLS error"
+msgstr "SSL/TLS-Fehler"
 
-#: src/imap.c:748
+#: src/imap.c:745
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Unbekannter Fehler [%d]"
 
-#: src/imap.c:952
+#: src/imap.c:949
 msgid ""
 "\n"
 "\n"
@@ -5762,7 +5777,7 @@ msgstr ""
 "CRAM-MD5-Logins nur möglich, wenn libetpan mit SASL-Unterstützung kompiliert "
 "wurde und das CRAM-MD5 SASL-Plugin installiert ist."
 
-#: src/imap.c:958
+#: src/imap.c:955
 msgid ""
 "\n"
 "\n"
@@ -5774,7 +5789,7 @@ msgstr ""
 "DIGEST-MD5-Logins sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "kompiliert wurde und das DIGEST-MD5 SASL-Plugin installiert ist."
 
-#: src/imap.c:964
+#: src/imap.c:961
 msgid ""
 "\n"
 "\n"
@@ -5786,7 +5801,7 @@ msgstr ""
 "SCRAM-SHA-1 -Logins sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "kompiliert wurde und das SCRAM-SHA-1 -Plugin installiert ist."
 
-#: src/imap.c:970
+#: src/imap.c:967
 msgid ""
 "\n"
 "\n"
@@ -5798,7 +5813,7 @@ msgstr ""
 "PLAIN-Logins nur möglich, wenn libetpan mit SASL-Unterstützung kompiliert "
 "wurde und das PLAIN SASL-Plugin installiert ist."
 
-#: src/imap.c:976
+#: src/imap.c:973
 msgid ""
 "\n"
 "\n"
@@ -5810,171 +5825,171 @@ msgstr ""
 "LOGIN-Logins sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "kompiliert wurde und das LOGIN SASL-Plugin installiert ist."
 
-#: src/imap.c:983
+#: src/imap.c:980
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbindung zu %s schlug fehl: Login abgelehnt.%s"
 
-#: src/imap.c:987
+#: src/imap.c:984
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbindung zu %s schlug fehl: Login abgelehnt.%s\n"
 
-#: src/imap.c:1005
+#: src/imap.c:1002
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbindung zu %s schlug fehl"
 
-#: src/imap.c:1012 src/imap.c:1015
+#: src/imap.c:1009 src/imap.c:1012
 #, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
+msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
-#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1042 src/imap.c:3686 src/imap.c:4345 src/imap.c:4439
+#: src/imap.c:4617 src/imap.c:5428
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail benötigt eine Netzwerkverbindung, um auf den IMAP-Server "
 "zuzugreifen."
 
-#: src/imap.c:1154 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1151 src/inc.c:811 src/news.c:388 src/send_message.c:282
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: src/imap.c:1155 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1152 src/inc.c:812 src/news.c:389 src/send_message.c:283
 msgid ""
-"This connection is configured to be secured using SSL, but SSL is not "
-"available in this build of Claws Mail. \n"
+"This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
+"not available in this build of Claws Mail. \n"
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
-"Für diese Verbindung ist SSL-Schutz vorgesehen, doch SSL ist in dieser "
-"Variante von Claws Mail nicht verfügbar. \n"
+"Für diese Verbindung ist SSL/TLS-Schutz vorgesehen, doch SSL/TLS ist in "
+"dieser Variante von Claws Mail nicht verfügbar. \n"
 "\n"
 "Soll die Verbindung zu diesem Server fortgesetzt werden? Die Kommunikation "
 "wäre nicht geschützt."
 
-#: src/imap.c:1161 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1158 src/inc.c:818 src/news.c:395 src/send_message.c:289
 msgid "Con_tinue connecting"
 msgstr "Das Verbinden _fortsetzen"
 
-#: src/imap.c:1171
+#: src/imap.c:1168
 #, c-format
-msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
-msgstr "Konto '%s': Verbinde mit IMAP4-Server: %s:%d..."
+msgid "Account '%s': Connecting to IMAP server: %s:%d..."
+msgstr "Konto '%s': Verbinde mit IMAP-Server: %s:%d..."
 
-#: src/imap.c:1219
+#: src/imap.c:1216
 #, c-format
-msgid "Can't connect to IMAP4 server: %s:%d"
-msgstr "Keine Verbindung zum IMAP4-Server: %s:%d"
+msgid "Can't connect to IMAP server: %s:%d"
+msgstr "Keine Verbindung zum IMAP-Server: %s:%d"
 
-#: src/imap.c:1222
+#: src/imap.c:1219
 #, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Keine Verbindung zum IMAP4-Server: %s:%d\n"
+msgid "Can't connect to IMAP server: %s:%d\n"
+msgstr "Keine Verbindung zum IMAP-Server: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4110
-msgid "Can't start TLS session.\n"
-msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
+#: src/imap.c:1252 src/imap.c:4107
+msgid "Can't start STARTTLS session.\n"
+msgstr "STARTTLS-Sitzung konnte nicht gestartet werden.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1319
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Einloggen am IMAP-Server %s schlug fehl.\n"
 
-#: src/imap.c:1325
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Einloggen am IMAP-Server %s schlug fehl."
 
-#: src/imap.c:1752
+#: src/imap.c:1749
 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1954 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 
-#: src/imap.c:2550
+#: src/imap.c:2547
 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Merker nicht setzbar\n"
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2554 src/imap.c:5058
 msgid "can't expunge\n"
 msgstr "Löschen schlug fehl\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2905
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Suche nach nicht abonnierten Ordnern in %s..."
 
-#: src/imap.c:2911
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Suche nach Unterordnern von %s..."
 
-#: src/imap.c:3229
+#: src/imap.c:3226
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox kann nicht erstellt werden: LIST schlug fehl\n"
 
-#: src/imap.c:3244
+#: src/imap.c:3241
 msgid "can't create mailbox\n"
 msgstr "Mailbox kann nicht erstellt werden\n"
 
-#: src/imap.c:3375
+#: src/imap.c:3372
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s kann nicht in %s umbenannt werden\n"
 
-#: src/imap.c:3488
+#: src/imap.c:3485
 msgid "can't delete mailbox\n"
 msgstr "Mailbox kann nicht gelöscht werden\n"
 
-#: src/imap.c:3767
+#: src/imap.c:3764
 msgid "LIST failed\n"
 msgstr "LIST schlug fehl\n"
 
-#: src/imap.c:3852
+#: src/imap.c:3849
 msgid "Flagging messages..."
 msgstr "Nachrichten-Merker setzen..."
 
-#: src/imap.c:3955
+#: src/imap.c:3952
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s kann nicht ausgewählt werden\n"
 
-#: src/imap.c:4107
-msgid "Server requires TLS to log in.\n"
-msgstr "Server erfordert TLS zum Einloggen.\n"
+#: src/imap.c:4104
+msgid "Server requires STARTTLS to log in.\n"
+msgstr "Server erfordert STARTTLS zum Einloggen.\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4114
 msgid "Can't refresh capabilities.\n"
 msgstr "Ressourcen können nicht aktualisiert werden.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4119
 #, c-format
 msgid ""
-"Connection to %s failed: server requires TLS, but Claws Mail has been "
-"compiled without TLS support.\n"
+"Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
+"compiled without STARTTLS support.\n"
 msgstr ""
-"Verbindung zu %s schlug fehl: Server erfordert TLS, aber Claws Mail wurde "
-"ohne TLS-Unterstützung kompiliert.\n"
+"Verbindung zu %s schlug fehl: Server erfordert STARTTLS, aber Claws Mail "
+"wurde ohne STARTTLS-Unterstützung kompiliert.\n"
 
-#: src/imap.c:4130
+#: src/imap.c:4127
 msgid "Server logins are disabled.\n"
 msgstr "Serverlogins sind deaktiviert.\n"
 
-#: src/imap.c:4353
+#: src/imap.c:4350
 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 
-#: src/imap.c:5054
+#: src/imap.c:5051
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Merker nicht setzbar: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6086
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6063,20 +6078,20 @@ msgstr "Eigenschaften des Überordners übernehmen"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
 #: src/plugins/mailmbox/plugin_gtk.c:411 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/vcalendar/vcal_folder.c:2044
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Neuer Name für '%s':"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:412
 #: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/plugins/vcalendar/vcal_folder.c:2045
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
 #: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2069
+#: src/plugins/vcalendar/vcal_folder.c:2065
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6099,7 +6114,7 @@ msgstr ""
 
 #: src/imap_gtk.c:376 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
 #: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:1998
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ordner '%s' kann nicht entfernt werden."
@@ -6161,8 +6176,8 @@ msgstr "abonnieren"
 msgid "unsubscribe"
 msgstr "abmelden"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:560 src/prefs_folder_item.c:1432 src/prefs_folder_item.c:1460
+#: src/prefs_folder_item.c:1488
 msgid "Apply to subfolders"
 msgstr "Auf Unterordner anwenden"
 
@@ -6401,7 +6416,7 @@ msgid "Auth failed"
 msgstr "Authentifizierung schlug fehl"
 
 #: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2782 src/summaryview.c:6292
+#: src/prefs_summary_column.c:88 src/summaryview.c:2759 src/summaryview.c:6228
 msgid "Locked"
 msgstr "Gesperrt"
 
@@ -6654,15 +6669,15 @@ msgstr "Umstellung schlug fehl!"
 msgid "Migrating configuration..."
 msgstr "Konfiguration wird umgestellt ..."
 
-#: src/main.c:1119
+#: src/main.c:1120
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird von glib nicht unterstützt.\n"
 
-#: src/main.c:1139 src/main.c:1143 src/main.c:1147
+#: src/main.c:1140 src/main.c:1144 src/main.c:1148
 msgid "(or older)"
 msgstr "(oder älter)"
 
-#: src/main.c:1448
+#: src/main.c:1449
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6681,7 +6696,7 @@ msgstr[1] ""
 "Einstellungen des Plugins für mehr Informationen:\n"
 "%s"
 
-#: src/main.c:1499
+#: src/main.c:1500
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6692,7 +6707,7 @@ msgstr ""
 "erneuern\" im Kontextmenü vom Hauptverzeichnis der Mailbox könnte das "
 "Problem lösen."
 
-#: src/main.c:1505
+#: src/main.c:1506
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6702,36 +6717,36 @@ msgstr ""
 "laden. Diese Mailbox wird vermutlich von einem alten Plugin zur Verfügung "
 "gestellt. Bitte installieren Sie das Plugin neu und versuchen es noch einmal."
 
-#: src/main.c:1750
+#: src/main.c:1751
 msgid "Missing filename\n"
 msgstr "Fehlender Dateiname\n"
 
-#: src/main.c:1757
+#: src/main.c:1758
 msgid "Cannot open filename for reading\n"
 msgstr "Die Datei kann nicht geöffnet werden\n"
 
-#: src/main.c:1768
+#: src/main.c:1769
 msgid "Malformed header\n"
 msgstr "Fehlerhafte Kopfzeilen\n"
 
-#: src/main.c:1775
+#: src/main.c:1776
 msgid "Duplicated 'To:' header\n"
 msgstr "Doppelte 'An:'-Kopfzeile\n"
 
-#: src/main.c:1786
+#: src/main.c:1787
 msgid "Missing required 'To:' header\n"
 msgstr "Erforderliche 'An:'-Kopfzeile fehlt\n"
 
-#: src/main.c:1929
+#: src/main.c:1930
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/main.c:1931
+#: src/main.c:1932
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]  öffnet das Editor-Fenster"
 
-#: src/main.c:1932
+#: src/main.c:1933
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6750,11 +6765,11 @@ msgstr ""
 "                       Leerzeile, dann der Nachrichtenkörper bis zum Ende "
 "der Datei."
 
-#: src/main.c:1937
+#: src/main.c:1938
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]    abonniert die angegebene URI, wenn möglich"
 
-#: src/main.c:1938
+#: src/main.c:1939
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6764,23 +6779,23 @@ msgstr ""
 "                       öffnet das Editor-Fenster mit den angegebenen\n"
 "                       Dateien als Anhang"
 
-#: src/main.c:1941
+#: src/main.c:1942
 msgid "  --receive              receive new messages"
 msgstr "  --receive            empfängt neue Nachrichten"
 
-#: src/main.c:1942
+#: src/main.c:1943
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all        empfängt neue Nachrichten von allen Konten"
 
-#: src/main.c:1943
+#: src/main.c:1944
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving   Empfang von Nachrichten abbrechen"
 
-#: src/main.c:1944
+#: src/main.c:1945
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending     Versand von Nachrichten abbrechen"
 
-#: src/main.c:1945
+#: src/main.c:1946
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6800,15 +6815,15 @@ msgstr ""
 "                       rekursiv: nicht mit einem der folgenden Argumente: 0, "
 "n, N, f or F"
 
-#: src/main.c:1952
+#: src/main.c:1953
 msgid "  --send                 send all queued messages"
 msgstr "  --send               sendet alle vorgespeicherten Nachrichten"
 
-#: src/main.c:1953
+#: src/main.c:1954
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ordner]... zeigt die Anzahl neuer Nachrichten"
 
-#: src/main.c:1954
+#: src/main.c:1955
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6816,15 +6831,15 @@ msgstr ""
 "  --status-full [Ordner]...\n"
 "                       zeigt den Status jeden Ordners"
 
-#: src/main.c:1956
+#: src/main.c:1957
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics         Zeigt Sitzungsstatistiken"
 
-#: src/main.c:1957
+#: src/main.c:1958
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics   Sitzungsstatistiken zurücksetzen"
 
-#: src/main.c:1958
+#: src/main.c:1959
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6833,35 +6848,35 @@ msgstr ""
 "                       springt zu dem angegebenen Ordner/Nachricht\n"
 "                       Ordner ist eine Ordner-ID wie 'Ordner/Unterordner'"
 
-#: src/main.c:1960
+#: src/main.c:1961
 msgid "  --online               switch to online mode"
 msgstr "  --online             schaltet in den Onlinemodus"
 
-#: src/main.c:1961
+#: src/main.c:1962
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline            schaltet in den Offlinemodus"
 
-#: src/main.c:1962
+#: src/main.c:1963
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q     beendet Claws Mail"
 
-#: src/main.c:1963
+#: src/main.c:1964
 msgid "  --debug                debug mode"
 msgstr "  --debug              Debugmodus"
 
-#: src/main.c:1964
+#: src/main.c:1965
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug       Debug-Modus umschalten"
 
-#: src/main.c:1965
+#: src/main.c:1966
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h            zeigt diese Hilfe"
 
-#: src/main.c:1966
+#: src/main.c:1967
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v         gibt Versionsinformationen aus"
 
-#: src/main.c:1967
+#: src/main.c:1968
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6869,11 +6884,11 @@ msgstr ""
 "  --version-full -V    gibt Versionsinformationen und enthaltene Funktionen "
 "aus"
 
-#: src/main.c:1968
+#: src/main.c:1969
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir         gibt das Konfigurationsverzeichnis aus"
 
-#: src/main.c:1969
+#: src/main.c:1970
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6881,7 +6896,7 @@ msgstr ""
 "  --alternate-config-dir  [Verzeichnis]\n"
 "                       benutzt das angegebene Konfigurationsverzeichnis"
 
-#: src/main.c:1971
+#: src/main.c:1972
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6889,32 +6904,32 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         Geometrie für Haupfenster angeben"
 
-#: src/main.c:2024
+#: src/main.c:2025
 msgid "Unknown option\n"
 msgstr "Unbekannte Option\n"
 
-#: src/main.c:2042
+#: src/main.c:2043
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Bearbeitung erfolgt (%s)..."
 
-#: src/main.c:2045
+#: src/main.c:2046
 msgid "top level folder"
 msgstr "Oberster Ordner"
 
-#: src/main.c:2128
+#: src/main.c:2129
 msgid "Queued messages"
 msgstr "Vorgespeicherte Nachrichten"
 
-#: src/main.c:2129
+#: src/main.c:2130
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Es sind ungesendete Nachrichten vorgespeichert. Jetzt beenden?"
 
-#: src/main.c:2871
+#: src/main.c:2872
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: Netzwerk ist online.\n"
 
-#: src/main.c:2877
+#: src/main.c:2878
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: Netzwerk ist offline.\n"
 
@@ -7430,8 +7445,8 @@ msgid "Exp_unge"
 msgstr "_Löschen"
 
 #: src/mainwindow.c:774
-msgid "SSL cer_tificates"
-msgstr "SSL-_Zertifikate"
+msgid "SSL/TLS cer_tificates"
+msgstr "SSL-TLS_Zertifikate"
 
 #: src/mainwindow.c:778
 msgid "Filtering Lo_g"
@@ -7669,7 +7684,7 @@ msgstr "Absteigend"
 msgid "_Auto detect"
 msgstr "_Automatisch erkennen"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6218
+#: src/mainwindow.c:1312 src/summaryview.c:6154
 msgid "Apply tags..."
 msgstr "Marken anwenden..."
 
@@ -7708,7 +7723,7 @@ msgstr "Filterprotokoll deaktiviert.\n"
 #: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
 #: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1062
 msgid "Untitled"
 msgstr "Unbenannt"
 
@@ -7745,7 +7760,7 @@ msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox '%s' existiert bereits."
 
 #: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Mailbox"
 
@@ -7759,84 +7774,84 @@ msgstr ""
 "Möglicherweise existieren einige Dateien bereits oder Sie haben keine "
 "Schreibrechte"
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3417
 msgid "No posting allowed"
 msgstr "keine Nachrichten erlaubt"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:4000
 msgid "Mbox import has failed."
 msgstr "Mbox-Import schlug fehl."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:4009 src/mainwindow.c:4018
 msgid "Export to mbox has failed."
 msgstr "Export in Mbox schlug fehl."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail beenden?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4250
 msgid "Folder synchronisation"
 msgstr "Ordner-Synchronisation"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4251
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sollen die Ordner jetzt synchronisiert werden?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4252
 msgid "_Synchronise"
 msgstr "_Synchronisieren"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Lösche doppelte Nachrichten..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4730
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d doppelte Nachricht in Ordner %d gelöscht.\n"
 msgstr[1] "%d doppelte Nachrichten in Ordner %d gelöscht.\n"
 
-#: src/mainwindow.c:4982 src/summaryview.c:5709
+#: src/mainwindow.c:4986 src/summaryview.c:5645
 msgid "Processing rules to apply before folder rules"
 msgstr "Ordnerregeln vorausgehende Verarbeitungsregeln"
 
-#: src/mainwindow.c:4990
+#: src/mainwindow.c:4994
 msgid "Processing rules to apply after folder rules"
 msgstr "Ordnerregeln nachfolgende Verarbeitungsregeln"
 
-#: src/mainwindow.c:4998 src/summaryview.c:5720
+#: src/mainwindow.c:5002 src/summaryview.c:5656
 msgid "Filtering configuration"
 msgstr "Filter-Konfiguration"
 
-#: src/mainwindow.c:5113
+#: src/mainwindow.c:5117
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Registrierung als Standardanwendung schlug fehl: Pfad zur ausführbaren Datei "
 "wurde nicht gefunden."
 
-#: src/mainwindow.c:5172
+#: src/mainwindow.c:5176
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail wurde als Standardanwendung eingetragen."
 
-#: src/mainwindow.c:5174
+#: src/mainwindow.c:5178
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Eintragung als Standardanwendung schlug fehl: es konnte nicht in die "
 "Registry geschrieben werden."
 
-#: src/mainwindow.c:5188 src/setup.c:91
+#: src/mainwindow.c:5192 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Ordner %s%c%s wird durchsucht..."
 
-#: src/mainwindow.c:5332
+#: src/mainwindow.c:5336
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7908,20 +7923,20 @@ msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "Importiere von Mbox... (%d E-Mail importiert)"
 msgstr[1] "Importiere von Mbox... (%d E-Mails importiert)"
 
-#: src/mbox.c:553
+#: src/mbox.c:549
 msgid "Overwrite mbox file"
 msgstr "Mbox-Datei überschreiben "
 
-#: src/mbox.c:554
+#: src/mbox.c:550
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie überschrieben werden?"
 
-#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
-#: src/prefs_themes.c:533 src/textview.c:3075
+#: src/mbox.c:551 src/messageview.c:1842 src/mimeview.c:1842
+#: src/prefs_themes.c:533 src/textview.c:3076
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: src/mbox.c:564
+#: src/mbox.c:560
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -7930,7 +7945,7 @@ msgstr ""
 "Mbox-Datei nicht erstellbar:\n"
 "%s\n"
 
-#: src/mbox.c:572
+#: src/mbox.c:568
 msgid "Exporting to mbox..."
 msgstr "Export in Mbox-Datei..."
 
@@ -7966,7 +7981,7 @@ msgstr "Suche beendet"
 msgid "Compose _new message"
 msgstr "_Neue Nachricht verfassen"
 
-#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
+#: src/messageview.c:713 src/messageview.c:1433 src/messageview.c:1584
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Nachrichtenansicht"
 
@@ -7981,13 +7996,13 @@ msgid ""
 "to be sent does not correspond to the return path:\n"
 "Notification address: %s\n"
 "Return path: %s\n"
-"It is advised to not to send the return receipt."
+"It is advised to not send the return receipt."
 msgstr ""
 "Die Benachrichtigungsadresse, an die die Empfangsbestätigung \n"
 "gesendet werden soll, stimmt nicht mit dem Antwortpfad überein:\n"
 "Benachrichtigungsadresse: %s\n"
 "Antwortpfad: %s\n"
-"Es wird geraten, die Empfangsbestätigung nicht zu senden."
+"Es wird empfohlen, keine Empfangsbestätigung zu senden."
 
 #: src/messageview.c:855 src/messageview.c:872
 msgid "_Don't Send"
@@ -7998,55 +8013,55 @@ msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 "officially addressed to you.\n"
-"It is advised to not to send the return receipt."
+"It is advised to not send the return receipt."
 msgstr ""
 "Diese Nachricht bittet um eine Empfangsbestätigung,\n"
 "aber nach ihren 'An:'- und 'Cc:'-Angaben ist sie nicht\n"
 "offiziell an Sie adressiert.\n"
-"Es wird empfohlen, keine  Empfangsbestätigung zu senden."
+"Es wird empfohlen, keine Empfangsbestätigung zu senden."
 
-#: src/messageview.c:1376
+#: src/messageview.c:1363
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Nachricht (%s) wird abgeholt..."
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1399 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsseln schlug fehl: %s"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1480 src/messageview.c:1488
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Nachricht entspricht nicht dem MIME-Standard und könnte falsch dargestellt "
 "werden."
 
-#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
-#: src/summaryview.c:4814 src/textview.c:3063
+#: src/messageview.c:1834 src/messageview.c:1837 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4747
+#: src/summaryview.c:4750 src/textview.c:3064
 msgid "Save as"
 msgstr "Speichern als"
 
-#: src/messageview.c:1856
+#: src/messageview.c:1843
 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
-#: src/summaryview.c:4849
+#: src/messageview.c:1851 src/summaryview.c:4767 src/summaryview.c:4770
+#: src/summaryview.c:4785
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 
-#: src/messageview.c:1917
+#: src/messageview.c:1904
 #, c-format
 msgid "Show all %s."
 msgstr "Alle %s anzeigen."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1906
 msgid "Only the first megabyte of text is shown."
 msgstr "Nur das erste Megabyte an Text wird angezeigt."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1937
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8054,19 +8069,19 @@ msgstr ""
 "Sie haben eine Empfangsbestätigung für diese Nachricht: Der Empfänger hat "
 "sie geöffnet."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1940
 msgid "You asked for a return receipt in this message."
 msgstr "Sie haben eine Empfangsbestätigung für diese Nachricht erbeten."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1946
 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht erwartet eine Empfangsbestätigung."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1947
 msgid "Send receipt"
 msgstr "Bestätigung senden"
 
-#: src/messageview.c:2003
+#: src/messageview.c:1990
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8074,7 +8089,7 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen\n"
 "und auf dem Server gelöscht."
 
-#: src/messageview.c:2009
+#: src/messageview.c:1996
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8083,15 +8098,15 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß."
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2000 src/messageview.c:2022
 msgid "Mark for download"
 msgstr "Zum Herunterladen markieren"
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2001 src/messageview.c:2013
 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2006
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8100,12 +8115,12 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß und wird heruntergeladen."
 
-#: src/messageview.c:2024 src/messageview.c:2037
+#: src/messageview.c:2011 src/messageview.c:2024
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Demarkieren"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2017
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8114,11 +8129,11 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s und wird gelöscht werden."
 
-#: src/messageview.c:2103
+#: src/messageview.c:2090
 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 
-#: src/messageview.c:2104
+#: src/messageview.c:2091
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8130,19 +8145,19 @@ msgstr ""
 "Bitte wählen Sie, welches Konto Sie zum Senden der Empfangsbestätigung "
 "verwenden möchten:"
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2095 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/messageview.c:2108
+#: src/messageview.c:2095
 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 
-#: src/messageview.c:2197
+#: src/messageview.c:2184
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken schlug fehl: Die Nachricht enthält keinen Text."
 
-#: src/messageview.c:2959
+#: src/messageview.c:2944
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8150,7 +8165,7 @@ msgstr ""
 "\n"
 "  Keine Nachrichten in diesem Ordner"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8158,7 +8173,7 @@ msgstr ""
 "\n"
 "  Nachricht wurde gelöscht"
 
-#: src/messageview.c:2968
+#: src/messageview.c:2953
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8166,8 +8181,8 @@ msgstr ""
 "\n"
 "  Nachricht wurde in den Papierkorb oder einen anderen Ordner verschoben"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
-#: src/summaryview.c:6987
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4128
+#: src/summaryview.c:6923
 msgid "An error happened while learning.\n"
 msgstr "Beim Lernen ist ein Fehler aufgetreten.\n"
 
@@ -8282,7 +8297,7 @@ msgstr "Zurück zur E-Mail"
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden: %s"
 
-#: src/mimeview.c:1839 src/textview.c:3073
+#: src/mimeview.c:1839 src/textview.c:3074
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Existierende Datei '%s' überschreiben?"
@@ -8296,11 +8311,11 @@ msgstr "Zielordner auswählen"
 msgid "'%s' is not a directory."
 msgstr "'%s' ist kein Ordner."
 
-#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2990
+#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2991
 msgid "Open with"
 msgstr "Öffnen mit"
 
-#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2991
+#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2992
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8345,13 +8360,13 @@ msgid "Type:"
 msgstr "Typ:"
 
 #: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2676
+#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2653
 msgid "Size:"
 msgstr "Größe:"
 
-#: src/mimeview.c:2558 src/plugins/vcalendar/vcalendar.c:1274
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1722
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1732
+#: src/mimeview.c:2558 src/plugins/vcalendar/vcalendar.c:1265
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -8464,26 +8479,22 @@ msgid "Rename newsgroup folder"
 msgstr "Newsgruppen-Ordner umbenennen"
 
 #: src/password.c:128 src/password.c:129
-#, fuzzy
 msgid "Input master passphrase"
-msgstr "Haupt-Passphrase ändern"
+msgstr "Haupt-Passphrase eingeben"
 
 #: src/password.c:141
-#, fuzzy
 msgid "Incorrect master passphrase."
-msgstr "Haupt-Passphrase vergessen"
+msgstr "Ungültige Haupt-Passphrase."
 
 #: src/password_gtk.c:67
-#, fuzzy
 msgid "New passphrases do not match, try again."
-msgstr "Passphrasen stimmen nicht überein.\n"
+msgstr "Passphrasen stimmen nicht überein; versuchen Sie es erneut."
 
 #: src/password_gtk.c:80
 msgid "Incorrect old master passphrase entered, try again."
-msgstr ""
+msgstr "Ungültige Haupt-Passphrase eingegeben; versuchen Sie es erneut."
 
 #: src/password_gtk.c:144
-#, fuzzy
 msgid "Changing master passphrase"
 msgstr "Haupt-Passphrase ändern"
 
@@ -8492,21 +8503,20 @@ msgid ""
 "If a master passphrase is currently active, it\n"
 "needs to be entered."
 msgstr ""
+"Haupt-Passphrase muss eingegeben werden,\n"
+"wenn in Verwendung."
 
 #: src/password_gtk.c:175
-#, fuzzy
 msgid "Old passphrase:"
-msgstr "Falsche Passphrase.\n"
+msgstr "Alte Passphrase:"
 
 #: src/password_gtk.c:191
-#, fuzzy
 msgid "New passphrase:"
-msgstr "Haupt-Passphrase"
+msgstr "Neue Passphrase:"
 
 #: src/password_gtk.c:202
-#, fuzzy
 msgid "Confirm passphrase:"
-msgstr "Haupt-Passphrase"
+msgstr "Passphrase bestätigen:"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
@@ -8858,14 +8868,14 @@ msgstr "Kompressionsstärke"
 #: src/plugins/archive/archiver_gtk.c:799
 #: src/plugins/archive/archiver_gtk.c:807
 #: src/plugins/archive/archiver_gtk.c:815
-#: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:507
+#: src/plugins/pdf_viewer/poppler_viewer.c:716 src/prefs_folder_item.c:522
 msgid "Yes"
 msgstr "ja"
 
 #: src/plugins/archive/archiver_gtk.c:799
 #: src/plugins/archive/archiver_gtk.c:807
 #: src/plugins/archive/archiver_gtk.c:815
-#: src/plugins/pdf_viewer/poppler_viewer.c:722 src/prefs_folder_item.c:506
+#: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:521
 #: src/prefs_summaries.c:372
 msgid "No"
 msgstr "Nein"
@@ -9137,7 +9147,7 @@ msgid "Remove"
 msgstr "Entfernen"
 
 #: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2770
+#: src/prefs_summary_column.c:80 src/summaryview.c:2747
 msgid "Attachment"
 msgstr "Anhang"
 
@@ -9596,7 +9606,7 @@ msgid "Path to bsfilter executable"
 msgstr "Pfad zur Bsfilter-Programmdatei"
 
 #: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:553
+#: src/plugins/clamd/clamav_plugin_gtk.c:549
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
@@ -9642,11 +9652,11 @@ msgstr "Datei: %s. Größe (%d) überschreitet das Limit (%d)\n"
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: überprüfe Nachricht..."
 
-#: src/plugins/clamd/clamav_plugin.c:275
+#: src/plugins/clamd/clamav_plugin.c:280
 msgid "Failed to register mail filtering hook"
 msgstr "Registrieren des \"mail filtering hook\" schlug fehl."
 
-#: src/plugins/clamd/clamav_plugin.c:293
+#: src/plugins/clamd/clamav_plugin.c:298
 msgid ""
 "Init\n"
 "No socket information.\n"
@@ -9656,7 +9666,7 @@ msgstr ""
 "Keine Socket-Information.\n"
 "Antivirus deaktiviert"
 
-#: src/plugins/clamd/clamav_plugin.c:297
+#: src/plugins/clamd/clamav_plugin.c:302
 msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
@@ -9666,7 +9676,7 @@ msgstr ""
 "Clamd antwortet nicht auf ping.\n"
 "Ist clamd aktiv?"
 
-#: src/plugins/clamd/clamav_plugin.c:328
+#: src/plugins/clamd/clamav_plugin.c:333
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
@@ -9705,7 +9715,7 @@ msgstr ""
 "Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Clam "
 "AntiVirus"
 
-#: src/plugins/clamd/clamav_plugin.c:367
+#: src/plugins/clamd/clamav_plugin.c:372
 msgid "Virus detection"
 msgstr "Virenerkennung"
 
@@ -9792,11 +9802,11 @@ msgstr "Remote Host"
 msgid "Hostname or IP for remote host running clamav daemon"
 msgstr "Hostname oder IP für den Remote Host, auf dem der clamav-Daemon läuft"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:399
+#: src/plugins/clamd/clamav_plugin_gtk.c:397
 msgid "Port number where clamav daemon is listening"
 msgstr "Der vom clamav-Daemon verwendete Port"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:528
+#: src/plugins/clamd/clamav_plugin_gtk.c:524
 msgid ""
 "New config\n"
 "No socket information.\n"
@@ -9806,7 +9816,7 @@ msgstr ""
 "Keine Socket-Information.\n"
 "Antivirus deaktiviert."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:532
+#: src/plugins/clamd/clamav_plugin_gtk.c:528
 msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
@@ -9969,7 +9979,7 @@ msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "Das CSS in dieser Datei wird auf alle HTML-Elemente angewendet"
 
 #: src/plugins/fancy/fancy_prefs.c:308
-#: src/plugins/notification/notification_prefs.c:1347
+#: src/plugins/notification/notification_prefs.c:1346
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
 #: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
@@ -10164,11 +10174,11 @@ msgstr ""
 "Fügt diese Kopfzeile hinzu: X-FETCH-TIME mit Datum und Uhrzeit des "
 "Nachrichtenempfangs im RFC822-Format"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:130
 msgid "GData plugin: Authorization required"
 msgstr "GData-Plugin: Autorisierung erforderlich"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:132
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10181,31 +10191,31 @@ msgstr ""
 "Sie müssen Claws Mail autorisieren, mit dem GData-Plugin auf Ihre Google-"
 "Kontakte zugreifen zu können."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:147
 msgid "Step 1:"
 msgstr "Schritt 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 "Klicken Sie hier, um die Seite für die Google-Autorisierung in einem Browser "
 "zu öffnen"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:157
 msgid "Step 2:"
 msgstr "Schritt 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:163
 msgid "Enter code:"
 msgstr "Geben Sie den Code ein:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:329
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "GData-Plugin: Fehler beim Abfragen der Kontakte: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:345
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10213,48 +10223,48 @@ msgstr[0] "%d von"
 msgstr[1] "%d von"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:347
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 Kontakt dem Zwischenspeicher hinzugefügt"
 msgstr[1] "%d Kontakte dem Zwischenspeicher hinzugefügt"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:357
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "GData-Plugin: Beginne asynchrone Abfrage von Kontakten\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:378
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "GData-Plugin: Fehler bei der Abfrage von Gruppen: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:415
 msgid "GData plugin: Groups received\n"
 msgstr "GData-Plugin: Gruppen empfangen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:422
 msgid "GData plugin: Starting async groups query\n"
 msgstr "GData-Plugin: Beginne asynchrone Abfrage von Gruppen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:447
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData-Plugin: Fehler beim Autorisieren: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:454
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData-Plugin: Autorisierung erfolgreich\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:464
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData-Plugin: Beginne interaktive Autorisierung\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:474
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "GData-Plugin: Autorisierungs-Code erhalten, fordere Autorisierung an\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:481
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10262,16 +10272,24 @@ msgstr ""
 "GData-Plugin: Keinen Autorisierungs-Code erhalten, breche "
 "Autorisierungsanfrage ab\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:498
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData-Plugin: Fehler beim Erneuern der Autorisierung: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:507
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData-Plugin: Erneuern der Autorisierung erfolgreich: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:560
+#: src/plugins/gdata/cm_gdata_contacts.c:568
+#, c-format
+msgid ""
+"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
+msgstr ""
+"GData-Plugin: Verstrichene Zeit seit letzter Aktualisierung: %d Minuten, "
+"aktualisiere jetzt\n"
+
+#: src/plugins/gdata/cm_gdata_contacts.c:577
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-Plugin: Versuche, Autorisierung zu erneuern\n"
 
@@ -10281,7 +10299,7 @@ msgid "Authentication"
 msgstr "Authentifizierung"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1560
 msgid "Username:"
 msgstr "Benutzername:"
 
@@ -10329,30 +10347,30 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData-Integration"
 
-#: src/plugins/libravatar/libravatar.c:374
-#: src/plugins/libravatar/libravatar.c:439
-#: src/plugins/libravatar/libravatar.c:499
+#: src/plugins/libravatar/libravatar.c:338
+#: src/plugins/libravatar/libravatar.c:403
+#: src/plugins/libravatar/libravatar.c:463
 #: src/plugins/libravatar/libravatar_prefs.c:546
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:381
+#: src/plugins/libravatar/libravatar.c:345
 msgid "Failed to register avatar header update hook"
 msgstr "Registrieren des \"avatar header update hook\" schlug fehl."
 
-#: src/plugins/libravatar/libravatar.c:390
+#: src/plugins/libravatar/libravatar.c:354
 msgid "Failed to register avatar image render hook"
 msgstr "Registrieren des \"avatar image render hook\" schlug fehl."
 
-#: src/plugins/libravatar/libravatar.c:396
+#: src/plugins/libravatar/libravatar.c:360
 msgid "Failed to create avatar image cache directory"
 msgstr "Erstellen des Verzeichnisses für den Avatar-Bilder-Cache schlug fehl."
 
-#: src/plugins/libravatar/libravatar.c:406
+#: src/plugins/libravatar/libravatar.c:370
 msgid "Failed to load missing items cache"
 msgstr "Der Cache für fehlende Icons konnte nicht geladen werden."
 
-#: src/plugins/libravatar/libravatar.c:449
+#: src/plugins/libravatar/libravatar.c:413
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10463,7 +10481,8 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Zeitintervall zum Aktualisieren des Caches"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
+#: src/plugins/libravatar/libravatar_prefs.c:229
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1490
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "Stunden"
@@ -10634,8 +10653,8 @@ msgid "unhandled message on Sieve session: %s\n"
 msgstr "Unbearbeitete Nachricht in der Sieve-Sitzung: %s\n"
 
 #: src/plugins/managesieve/managesieve.c:731
-msgid "TLS failed"
-msgstr "TLS schlug fehl"
+msgid "STARTTLS failed"
+msgstr "STARTTLS schlug fehl"
 
 #: src/plugins/managesieve/managesieve.c:796
 #: src/plugins/managesieve/managesieve.c:812
@@ -10663,7 +10682,7 @@ msgstr "Sieve: Wiederhole Authentifizierungs-Versuch\n"
 msgid "Auth method not available"
 msgstr "Authentifizierungs-Verfahren nicht verfügbar"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5607
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5543
 msgid "_Filter"
 msgstr "_Filtern"
 
@@ -10722,7 +10741,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve-Filter%s"
 
 #: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1275
+#: src/plugins/pdf_viewer/poppler_viewer.c:1272
 msgid "Loading..."
 msgstr "Lade..."
 
@@ -10824,16 +10843,16 @@ msgid "Encryption"
 msgstr "Verschlüsselung"
 
 #: src/plugins/managesieve/sieve_prefs.c:194
-msgid "No TLS"
-msgstr "Kein TLS"
+msgid "No encryption"
+msgstr "Keine Verschlüsselung"
 
 #: src/plugins/managesieve/sieve_prefs.c:196
-msgid "Use TLS when available"
-msgstr "TLS nutzen, wenn verfügbar"
+msgid "Use STARTTLS when available"
+msgstr "STARTTLS nutzen, wenn verfügbar"
 
 #: src/plugins/managesieve/sieve_prefs.c:198
-msgid "Require TLS"
-msgstr "TLS erforderlich"
+msgid "Require STARTTLS"
+msgstr "STARTTLS erforderlich"
 
 #: src/plugins/managesieve/sieve_prefs.c:206
 #: src/plugins/rssyl/rssyl_feed_props.c:264
@@ -10849,18 +10868,18 @@ msgid "Specify authentication"
 msgstr "Authentifizierung spezifizieren"
 
 #: src/plugins/managesieve/sieve_prefs.c:240
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
+#: src/plugins/vcalendar/vcal_prefs.c:391
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1275
 #: src/prefs_account.c:1798
 msgid "User ID"
 msgstr "Benutzer-ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:250
 #: src/plugins/rssyl/rssyl_feed_props.c:395
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
+#: src/plugins/vcalendar/vcal_prefs.c:399
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1281
 #: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
-#: src/wizard.c:1215 src/wizard.c:1635
+#: src/wizard.c:1214 src/wizard.c:1634
 msgid "Password"
 msgstr "Kennwort"
 
@@ -10924,11 +10943,11 @@ msgstr "Protokoll-Datei"
 msgid "Folder:"
 msgstr "Ordner:"
 
-#: src/plugins/notification/notification_foldercheck.c:478
+#: src/plugins/notification/notification_foldercheck.c:479
 msgid "Select folder(s)"
 msgstr "Ordner wählen"
 
-#: src/plugins/notification/notification_foldercheck.c:579
+#: src/plugins/notification/notification_foldercheck.c:583
 msgid "select recursively"
 msgstr "rekursiv auswählen"
 
@@ -10937,15 +10956,15 @@ msgid "No new messages"
 msgstr "Keine neuen Nachrichten"
 
 #: src/plugins/notification/notification_plugin.c:216
-#: src/plugins/notification/notification_plugin.c:417
-#: src/plugins/notification/notification_prefs.c:400
-#: src/plugins/notification/notification_prefs.c:415
-#: src/plugins/notification/notification_prefs.c:434
-#: src/plugins/notification/notification_prefs.c:452
-#: src/plugins/notification/notification_prefs.c:470
-#: src/plugins/notification/notification_prefs.c:488
-#: src/plugins/notification/notification_prefs.c:506
-#: src/plugins/notification/notification_prefs.c:524
+#: src/plugins/notification/notification_plugin.c:420
+#: src/plugins/notification/notification_prefs.c:399
+#: src/plugins/notification/notification_prefs.c:414
+#: src/plugins/notification/notification_prefs.c:433
+#: src/plugins/notification/notification_prefs.c:451
+#: src/plugins/notification/notification_prefs.c:469
+#: src/plugins/notification/notification_prefs.c:487
+#: src/plugins/notification/notification_prefs.c:505
+#: src/plugins/notification/notification_prefs.c:523
 msgid "Notification"
 msgstr "Benachrichtigung"
 
@@ -11001,7 +11020,7 @@ msgstr ""
 "Registrieren des \"theme change hook\" im Benachrichtigungs-Plugin schlug "
 "fehl."
 
-#: src/plugins/notification/notification_plugin.c:422
+#: src/plugins/notification/notification_plugin.c:425
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -11017,74 +11036,74 @@ msgstr ""
 "\n"
 "Rückmeldungen an <berndth at gmx.de> sind gern gesehen."
 
-#: src/plugins/notification/notification_plugin.c:447
+#: src/plugins/notification/notification_plugin.c:450
 msgid "Various tools"
 msgstr "Verschiedene Werkzeuge"
 
-#: src/plugins/notification/notification_popup.c:314
+#: src/plugins/notification/notification_popup.c:311
 msgid "New Mail message"
 msgstr "neue E-Mail"
 
-#: src/plugins/notification/notification_popup.c:335
+#: src/plugins/notification/notification_popup.c:332
 msgid "New News post"
 msgstr "Neue News-Nachricht"
 
-#: src/plugins/notification/notification_popup.c:336
+#: src/plugins/notification/notification_popup.c:333
 msgid "A new message arrived"
 msgstr "Neue Nachricht erhalten"
 
-#: src/plugins/notification/notification_popup.c:339
+#: src/plugins/notification/notification_popup.c:336
 msgid "New Calendar message"
 msgstr "Neue Kalendernachricht"
 
-#: src/plugins/notification/notification_popup.c:340
+#: src/plugins/notification/notification_popup.c:337
 #: src/plugins/notification/notification_trayicon.c:905
 msgid "A new calendar message arrived"
 msgstr "Neue Kalendernachricht erhalten"
 
-#: src/plugins/notification/notification_popup.c:343
+#: src/plugins/notification/notification_popup.c:340
 msgid "New RSS feed article"
 msgstr "Neuer Artikel im RSS-Feed"
 
-#: src/plugins/notification/notification_popup.c:344
+#: src/plugins/notification/notification_popup.c:341
 #: src/plugins/notification/notification_trayicon.c:908
 msgid "A new article in a RSS feed arrived"
 msgstr "Einen neuen Artikel eines RSS-Feeds erhalten"
 
-#: src/plugins/notification/notification_popup.c:347
+#: src/plugins/notification/notification_popup.c:344
 msgid "New unknown message"
 msgstr "neue unbekannte Nachricht"
 
-#: src/plugins/notification/notification_popup.c:348
+#: src/plugins/notification/notification_popup.c:345
 msgid "Unknown message type arrived"
 msgstr "Eine Nachricht unbekannten Typs erhalten"
 
-#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_popup.c:378
 #: src/plugins/notification/notification_trayicon.c:677
 msgid "Present main window"
 msgstr "Aktuelles Hauptfenster"
 
-#: src/plugins/notification/notification_popup.c:491
+#: src/plugins/notification/notification_popup.c:488
 msgid "Mail message"
 msgstr "E-Mail"
 
-#: src/plugins/notification/notification_popup.c:492
-#: src/plugins/notification/notification_popup.c:498
+#: src/plugins/notification/notification_popup.c:489
+#: src/plugins/notification/notification_popup.c:495
 #, c-format
 msgid "%d new message arrived"
 msgid_plural "%d new messages arrived"
 msgstr[0] "%d neue Nachricht erhalten"
 msgstr[1] "%d neue Nachrichten erhalten"
 
-#: src/plugins/notification/notification_popup.c:497
+#: src/plugins/notification/notification_popup.c:494
 msgid "News message"
 msgstr "News-Post"
 
-#: src/plugins/notification/notification_popup.c:503
+#: src/plugins/notification/notification_popup.c:500
 msgid "Calendar message"
 msgstr "Kalendernachricht"
 
-#: src/plugins/notification/notification_popup.c:504
+#: src/plugins/notification/notification_popup.c:501
 #: src/plugins/notification/notification_trayicon.c:942
 #, c-format
 msgid "%d new calendar message arrived"
@@ -11092,272 +11111,272 @@ msgid_plural "%d new calendar messages arrived"
 msgstr[0] "%d neue Kalender-Nachricht erhalten"
 msgstr[1] "%d neue Kalender-Nachrichten erhalten"
 
-#: src/plugins/notification/notification_popup.c:509
+#: src/plugins/notification/notification_popup.c:506
 msgid "RSS news feed"
 msgstr "RSS-Feed"
 
-#: src/plugins/notification/notification_popup.c:510
+#: src/plugins/notification/notification_popup.c:507
 #, c-format
 msgid "%d new article in a RSS feed arrived"
 msgid_plural "%d new articles in a RSS feed arrived"
 msgstr[0] "%d neuen Artikel eines RSS-Feeds erhalten"
 msgstr[1] "%d neue Artikel eines RSS-Feeds erhalten"
 
-#: src/plugins/notification/notification_popup.c:574
+#: src/plugins/notification/notification_popup.c:571
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
-#: src/plugins/notification/notification_prefs.c:416
+#: src/plugins/notification/notification_prefs.c:415
 msgid "Hotkeys"
 msgstr "Tastenkürzel"
 
-#: src/plugins/notification/notification_prefs.c:435
+#: src/plugins/notification/notification_prefs.c:434
 msgid "Banner"
 msgstr "Banner"
 
-#: src/plugins/notification/notification_prefs.c:453
+#: src/plugins/notification/notification_prefs.c:452
 msgid "Popup"
 msgstr "Popup"
 
-#: src/plugins/notification/notification_prefs.c:471 src/prefs_actions.c:263
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:263
 #: src/prefs_receive.c:152
 msgid "Command"
 msgstr "Befehl"
 
-#: src/plugins/notification/notification_prefs.c:489
+#: src/plugins/notification/notification_prefs.c:488
 msgid "LCD"
 msgstr "LCD"
 
-#: src/plugins/notification/notification_prefs.c:507
+#: src/plugins/notification/notification_prefs.c:506
 msgid "SysTrayicon"
 msgstr "SysTrayicon"
 
-#: src/plugins/notification/notification_prefs.c:525
+#: src/plugins/notification/notification_prefs.c:524
 msgid "Indicator"
 msgstr "Indikator"
 
-#: src/plugins/notification/notification_prefs.c:608
+#: src/plugins/notification/notification_prefs.c:607
 msgid "Include folder types"
 msgstr "Diese Ordnertypen einbeziehen"
 
-#: src/plugins/notification/notification_prefs.c:617
+#: src/plugins/notification/notification_prefs.c:616
 msgid "Mail folders"
 msgstr "Mail-Ordner"
 
-#: src/plugins/notification/notification_prefs.c:625
+#: src/plugins/notification/notification_prefs.c:624
 msgid "News folders"
 msgstr "News-Ordner"
 
-#: src/plugins/notification/notification_prefs.c:633
+#: src/plugins/notification/notification_prefs.c:632
 msgid "RSSyl folders"
 msgstr "RSSyl-Ordner"
 
-#: src/plugins/notification/notification_prefs.c:641
+#: src/plugins/notification/notification_prefs.c:640
 msgid "vCalendar folders"
 msgstr "vCalender-Ordner"
 
-#: src/plugins/notification/notification_prefs.c:649
+#: src/plugins/notification/notification_prefs.c:648
 msgid "These settings override folder-specific selections."
 msgstr "Diese Einstellungen überschreiben ordnerspezifische Auswahlen."
 
-#: src/plugins/notification/notification_prefs.c:660
+#: src/plugins/notification/notification_prefs.c:659
 msgid "Global notification settings"
 msgstr "Globale Einstellungen für Benachrichtigungen"
 
-#: src/plugins/notification/notification_prefs.c:669
+#: src/plugins/notification/notification_prefs.c:668
 msgid "Set window manager urgency hint when new messages exist"
 msgstr ""
 "Setze Wichtig-Signal im Fenstermanager, wenn neue Nachrichten vorhanden sind"
 
-#: src/plugins/notification/notification_prefs.c:678
+#: src/plugins/notification/notification_prefs.c:677
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr ""
 "Setze Wichtig-Signal im Fenstermanager, wenn ungelesene Nachrichten "
 "vorhanden sind"
 
-#: src/plugins/notification/notification_prefs.c:688
+#: src/plugins/notification/notification_prefs.c:687
 msgid "Use sound theme"
 msgstr "Klangthema verwenden"
 
-#: src/plugins/notification/notification_prefs.c:762
+#: src/plugins/notification/notification_prefs.c:761
 msgid "Show banner"
 msgstr "Banner anzeigen"
 
-#: src/plugins/notification/notification_prefs.c:767
+#: src/plugins/notification/notification_prefs.c:766
 #: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
 #: src/prefs_receive.c:231 src/prefs_summaries.c:504
 msgid "Never"
 msgstr "Nie"
 
-#: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:229
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
 #: src/prefs_summaries.c:486 src/prefs_summaries.c:505
 msgid "Always"
 msgstr "Immer"
 
-#: src/plugins/notification/notification_prefs.c:771
+#: src/plugins/notification/notification_prefs.c:770
 msgid "Only when not empty"
 msgstr "Nur wenn nicht leer"
 
-#: src/plugins/notification/notification_prefs.c:790
+#: src/plugins/notification/notification_prefs.c:789
 msgid "Banner speed"
 msgstr "Banner-Geschwindigkeit"
 
-#: src/plugins/notification/notification_prefs.c:827
+#: src/plugins/notification/notification_prefs.c:826
 msgid "Maximum number of messages"
 msgstr "Höchstzahl von Nachrichten"
 
-#: src/plugins/notification/notification_prefs.c:833
+#: src/plugins/notification/notification_prefs.c:832
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr "Höchstzahl angezeigter Nachrichten (0 für unbegrenzt)"
 
-#: src/plugins/notification/notification_prefs.c:842
+#: src/plugins/notification/notification_prefs.c:841
 msgid "Banner width"
 msgstr "Bannerbreite"
 
-#: src/plugins/notification/notification_prefs.c:848
+#: src/plugins/notification/notification_prefs.c:847
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "Größe des Banners begrenzen; für Bildschirmbreite 0 verwenden"
 
-#: src/plugins/notification/notification_prefs.c:850
+#: src/plugins/notification/notification_prefs.c:849
 msgid "pixel(s)"
 msgstr "Pixel"
 
-#: src/plugins/notification/notification_prefs.c:859
+#: src/plugins/notification/notification_prefs.c:858
 msgid "Include unread mails in banner"
 msgstr "Ungelesene Mails im Banner berücksichtigen"
 
-#: src/plugins/notification/notification_prefs.c:867
+#: src/plugins/notification/notification_prefs.c:866
 msgid "Make banner sticky"
 msgstr "Banner anheften"
 
-#: src/plugins/notification/notification_prefs.c:877
-#: src/plugins/notification/notification_prefs.c:1082
-#: src/plugins/notification/notification_prefs.c:1377
-#: src/plugins/notification/notification_prefs.c:1612
+#: src/plugins/notification/notification_prefs.c:876
+#: src/plugins/notification/notification_prefs.c:1081
+#: src/plugins/notification/notification_prefs.c:1376
+#: src/plugins/notification/notification_prefs.c:1611
 msgid "Only include selected folders"
 msgstr "Nur ausgewählte Ordner verwenden"
 
-#: src/plugins/notification/notification_prefs.c:886
-#: src/plugins/notification/notification_prefs.c:1091
-#: src/plugins/notification/notification_prefs.c:1386
-#: src/plugins/notification/notification_prefs.c:1621
+#: src/plugins/notification/notification_prefs.c:885
+#: src/plugins/notification/notification_prefs.c:1090
+#: src/plugins/notification/notification_prefs.c:1385
+#: src/plugins/notification/notification_prefs.c:1620
 msgid "Select folders..."
 msgstr "Ordner wählen..."
 
-#: src/plugins/notification/notification_prefs.c:898
+#: src/plugins/notification/notification_prefs.c:897
 msgid "Banner colors"
 msgstr "Bannerfarben"
 
-#: src/plugins/notification/notification_prefs.c:902
-#: src/plugins/notification/notification_prefs.c:1123
+#: src/plugins/notification/notification_prefs.c:901
+#: src/plugins/notification/notification_prefs.c:1122
 msgid "Use custom colors"
 msgstr "Benutzerdefinierte Farben verwenden"
 
-#: src/plugins/notification/notification_prefs.c:917
-#: src/plugins/notification/notification_prefs.c:1136
+#: src/plugins/notification/notification_prefs.c:916
+#: src/plugins/notification/notification_prefs.c:1135
 msgid "Foreground"
 msgstr "Vordergrund"
 
-#: src/plugins/notification/notification_prefs.c:923
-#: src/plugins/notification/notification_prefs.c:1142
+#: src/plugins/notification/notification_prefs.c:922
+#: src/plugins/notification/notification_prefs.c:1141
 msgid "Foreground color"
 msgstr "Vordergrundfarbe"
 
-#: src/plugins/notification/notification_prefs.c:928
-#: src/plugins/notification/notification_prefs.c:1147
+#: src/plugins/notification/notification_prefs.c:927
+#: src/plugins/notification/notification_prefs.c:1146
 #: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
 #: src/prefs_msg_colors.c:323
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/plugins/notification/notification_prefs.c:934
-#: src/plugins/notification/notification_prefs.c:1153
+#: src/plugins/notification/notification_prefs.c:933
+#: src/plugins/notification/notification_prefs.c:1152
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
-#: src/plugins/notification/notification_prefs.c:1046
-#: src/plugins/notification/notification_prefs.c:1647
+#: src/plugins/notification/notification_prefs.c:1045
+#: src/plugins/notification/notification_prefs.c:1646
 msgid "Enable popup"
 msgstr "Popup aktivieren"
 
-#: src/plugins/notification/notification_prefs.c:1063
-#: src/plugins/notification/notification_prefs.c:1665
+#: src/plugins/notification/notification_prefs.c:1062
+#: src/plugins/notification/notification_prefs.c:1664
 msgid "Popup timeout"
 msgstr "Anzeigedauer des Popups"
 
-#: src/plugins/notification/notification_prefs.c:1073
-#: src/plugins/notification/notification_prefs.c:1368
-#: src/plugins/notification/notification_prefs.c:1674
+#: src/plugins/notification/notification_prefs.c:1072
+#: src/plugins/notification/notification_prefs.c:1367
+#: src/plugins/notification/notification_prefs.c:1673
 #: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
 #: src/prefs_receive.c:203 src/prefs_summaries.c:538
 msgid "seconds"
 msgstr "Sekunden"
 
-#: src/plugins/notification/notification_prefs.c:1102
+#: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
 msgstr "Popup anheften"
 
-#: src/plugins/notification/notification_prefs.c:1112
+#: src/plugins/notification/notification_prefs.c:1111
 msgid "Set popup window width and position"
 msgstr "Größe und Position des Popups festlegen"
 
-#: src/plugins/notification/notification_prefs.c:1117
+#: src/plugins/notification/notification_prefs.c:1116
 msgid "(the window manager is free to ignore this)"
 msgstr "(der Fenstermanager kann dies ignorieren)"
 
-#: src/plugins/notification/notification_prefs.c:1165
-#: src/plugins/notification/notification_prefs.c:1677
+#: src/plugins/notification/notification_prefs.c:1164
+#: src/plugins/notification/notification_prefs.c:1676
 msgid "Display folder name"
 msgstr "Ordnername anzeigen"
 
-#: src/plugins/notification/notification_prefs.c:1230
+#: src/plugins/notification/notification_prefs.c:1229
 msgid "Sample popup window"
 msgstr "Beispiel-Popup"
 
-#: src/plugins/notification/notification_prefs.c:1236
+#: src/plugins/notification/notification_prefs.c:1235
 msgid "Done"
 msgstr "Fertig"
 
-#: src/plugins/notification/notification_prefs.c:1294
+#: src/plugins/notification/notification_prefs.c:1293
 msgid "Select command"
 msgstr "Befehl auswählen"
 
-#: src/plugins/notification/notification_prefs.c:1323
+#: src/plugins/notification/notification_prefs.c:1322
 msgid "Enable command"
 msgstr "Befehl ausführen"
 
-#: src/plugins/notification/notification_prefs.c:1340
+#: src/plugins/notification/notification_prefs.c:1339
 msgid "Command to execute"
 msgstr "Auszuführender Befehl"
 
-#: src/plugins/notification/notification_prefs.c:1358
+#: src/plugins/notification/notification_prefs.c:1357
 msgid "Block command after execution for"
 msgstr "Befehl nach Ausführung blockieren für"
 
-#: src/plugins/notification/notification_prefs.c:1465
+#: src/plugins/notification/notification_prefs.c:1464
 msgid "Enable LCD"
 msgstr "LCD aktivieren"
 
-#: src/plugins/notification/notification_prefs.c:1484
+#: src/plugins/notification/notification_prefs.c:1483
 msgid "Hostname:Port of LCDd server"
 msgstr "Hostname:Port des LCDd-Servers"
 
-#: src/plugins/notification/notification_prefs.c:1569
+#: src/plugins/notification/notification_prefs.c:1568
 msgid "Enable Trayicon"
 msgstr "Trayicon aktivieren"
 
-#: src/plugins/notification/notification_prefs.c:1585
+#: src/plugins/notification/notification_prefs.c:1584
 msgid "Hide at start-up"
 msgstr "Beim Start minimieren"
 
-#: src/plugins/notification/notification_prefs.c:1593
+#: src/plugins/notification/notification_prefs.c:1592
 msgid "Close to tray"
 msgstr "Zum Tray minimieren"
 
-#: src/plugins/notification/notification_prefs.c:1601
+#: src/plugins/notification/notification_prefs.c:1600
 msgid "Hide when iconified"
 msgstr "Verstecken wenn minimiert"
 
@@ -11367,40 +11386,36 @@ msgstr "Verstecken wenn minimiert"
 #. for that, go for something along the lines of "passive popup"
 #. instead.See also
 #. http://en.wikipedia.org/wiki/Toast_(computing)
-#: src/plugins/notification/notification_prefs.c:1638
+#: src/plugins/notification/notification_prefs.c:1637
 msgid "Passive toaster popup"
 msgstr "Passives Popup"
 
-#: src/plugins/notification/notification_prefs.c:1865
+#: src/plugins/notification/notification_prefs.c:1801
 msgid "Add to Indicator Applet"
 msgstr "Zum Indikator-Applet hinzufügen"
 
-#: src/plugins/notification/notification_prefs.c:1879
+#: src/plugins/notification/notification_prefs.c:1815
 msgid "Hide mainwindow when minimized"
 msgstr "Hauptfenster verstecken wenn minimiert"
 
-#: src/plugins/notification/notification_prefs.c:1885
-msgid "Register Claws Mail"
-msgstr "Claws Mail für das Benachrichtigungsfenster registrieren"
-
-#: src/plugins/notification/notification_prefs.c:1946
+#: src/plugins/notification/notification_prefs.c:1868
 msgid "Enable global hotkeys"
 msgstr "Globale Tastenkürzel aktivieren"
 
-#: src/plugins/notification/notification_prefs.c:1960
+#: src/plugins/notification/notification_prefs.c:1882
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr "Beispiele für Tastenkürzel: <b>%s</b> und <b>%s</b>"
 
-#: src/plugins/notification/notification_prefs.c:1960
+#: src/plugins/notification/notification_prefs.c:1882
 msgid "<control><shift>F11"
 msgstr "<control><shift>F11"
 
-#: src/plugins/notification/notification_prefs.c:1960
+#: src/plugins/notification/notification_prefs.c:1882
 msgid "<alt>N"
 msgstr "<alt>N"
 
-#: src/plugins/notification/notification_prefs.c:1971
+#: src/plugins/notification/notification_prefs.c:1893
 msgid "Toggle minimize"
 msgstr "Minimierung umschalten"
 
@@ -11482,124 +11497,124 @@ msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "%d neue Artikel in RSS-Feeds erhalten"
 msgstr[1] "%d neue Artikel in RSS-Feeds erhalten"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Title:"
 msgstr "Titel:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:703
 msgid "Creator:"
 msgstr "Ersteller:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Producer:"
 msgstr "Produzent:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:710
+#: src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Created:"
 msgstr "Erstellt:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:714
+#: src/plugins/pdf_viewer/poppler_viewer.c:711
 msgid "Modified:"
 msgstr "Modifiziert:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:717
+#: src/plugins/pdf_viewer/poppler_viewer.c:714
 msgid "Format:"
 msgstr "Format:"
 
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 #: src/plugins/pdf_viewer/poppler_viewer.c:719
-#: src/plugins/pdf_viewer/poppler_viewer.c:722
 msgid "Optimized:"
 msgstr "Optimiert:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1180
+#: src/plugins/pdf_viewer/poppler_viewer.c:1177
 msgid "PDF properties"
 msgstr "PDF-Eigenschaften"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1326
+#: src/plugins/pdf_viewer/poppler_viewer.c:1323
 msgid "Enter password"
 msgstr "Enter password"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1327
+#: src/plugins/pdf_viewer/poppler_viewer.c:1324
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "Dieses Dokument ist gesperrt und benötigt zum Öffnen ein Kennwort."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1342
+#: src/plugins/pdf_viewer/poppler_viewer.c:1339
 #, c-format
 msgid "%s Document"
 msgstr "%s-Dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1348
+#: src/plugins/pdf_viewer/poppler_viewer.c:1345
 #, c-format
 msgid "of %d"
 msgstr "von %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1364
+#: src/plugins/pdf_viewer/poppler_viewer.c:1361
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Darstellung des PDFs schlug aus unbekanntem Grund fehl."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1728
-#: src/plugins/pdf_viewer/poppler_viewer.c:1945
+#: src/plugins/pdf_viewer/poppler_viewer.c:1725
+#: src/plugins/pdf_viewer/poppler_viewer.c:1942
 msgid "Document Index"
 msgstr "Inhaltsverzeichnis"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+#: src/plugins/pdf_viewer/poppler_viewer.c:1910
 msgid "First Page"
 msgstr "Erste Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1913
 msgid "Previous Page"
 msgstr "Vorige Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1916
 msgid "Next Page"
 msgstr "Nächste Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1919
 msgid "Last Page"
 msgstr "Letzte Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1925
+#: src/plugins/pdf_viewer/poppler_viewer.c:1922
 msgid "Zoom In"
 msgstr "Vergrößern"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1924
 msgid "Zoom Out"
 msgstr "Verkleinern"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
 msgid "Fit Page"
 msgstr "An Seite anpassen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+#: src/plugins/pdf_viewer/poppler_viewer.c:1930
 msgid "Fit Page Width"
 msgstr "An Seitenbreite anpassen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1933
 msgid "Rotate Left"
 msgstr "Nach links drehen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1936
 msgid "Rotate Right"
 msgstr "Nach rechts drehen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1942
+#: src/plugins/pdf_viewer/poppler_viewer.c:1939
 msgid "Document Info"
 msgstr "Dokument-Informationen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1944
 msgid "Page Number"
 msgstr "Seite Nummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1949
+#: src/plugins/pdf_viewer/poppler_viewer.c:1946
 msgid "Zoom Factor"
 msgstr "Zoomfaktor"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2054
+#: src/plugins/pdf_viewer/poppler_viewer.c:2051
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11612,13 +11627,13 @@ msgstr ""
 "\n"
 "Jegliche Rückmeldung ist willkommen: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2060
-#: src/plugins/pdf_viewer/poppler_viewer.c:2068
-#: src/plugins/pdf_viewer/poppler_viewer.c:2088
+#: src/plugins/pdf_viewer/poppler_viewer.c:2057
+#: src/plugins/pdf_viewer/poppler_viewer.c:2065
+#: src/plugins/pdf_viewer/poppler_viewer.c:2085
 msgid "PDF Viewer"
 msgstr "PDF-Betrachter"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#: src/plugins/pdf_viewer/poppler_viewer.c:2061
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12438,8 +12453,8 @@ msgid "Refresh"
 msgstr "Aktualisieren"
 
 #: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
-#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
-#: src/wizard.c:1625
+#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1204
+#: src/wizard.c:1624
 msgid "Browse"
 msgstr "Durchsuchen"
 
@@ -12750,9 +12765,9 @@ msgstr ""
 "Titel des Feeds ändert"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:372
-#: src/plugins/vcalendar/vcal_prefs.c:550
-msgid "Verify SSL certificate validity"
-msgstr "Überprüfe Gültigkeit des SSL-Zertifikats"
+#: src/plugins/vcalendar/vcal_prefs.c:593
+msgid "Verify SSL/TLS certificate validity"
+msgstr "Überprüfe Gültigkeit des SSL/TLS-Zertifikats"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:392
 msgid "User name"
@@ -12768,7 +12783,7 @@ msgstr "Kommentare holen von Nachrichten, die jünger sind als"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
 msgid "days"
 msgstr "Tag(en)"
 
@@ -12868,8 +12883,8 @@ msgid "Refresh all feeds on application start"
 msgstr "Alle Feeds beim Programmstart aktualisieren"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-msgid "Verify SSL certificates validity for new feeds"
-msgstr "Überprüfe Gültigkeit von SSL-Zertifikaten für neue Feeds."
+msgid "Verify SSL/TLS certificates validity for new feeds"
+msgstr "Überprüfe Gültigkeit von SSL/TLS-Zertifikaten für neue Feeds."
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
@@ -12907,7 +12922,7 @@ msgstr ""
 msgid "_Edit feed properties after subscribing"
 msgstr "Feed-Eigenschaften nach Abonnieren _bearbeiten"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:105
+#: src/plugins/rssyl/rssyl_update_comments.c:107
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Aktualisiere Kommentare für %s..."
@@ -13104,7 +13119,7 @@ msgstr "Aktiviert"
 msgid "Forward to:"
 msgstr "Weiterleiten an:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1572
 msgid "Password:"
 msgstr "Kennwort:"
 
@@ -13400,7 +13415,7 @@ msgid "Next month"
 msgstr "Nächster Monat"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:729
+#: src/plugins/vcalendar/vcal_prefs.c:775
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13416,7 +13431,7 @@ msgid ""
 "To create a meeting right-click on the vCalendar or Meetings folder and "
 "choose \"New meeting...\".\n"
 "\n"
-"You will also be able to subscribe to remote webCal feeds,export your "
+"You will also be able to subscribe to remote Webcal feeds, export your "
 "meetings and calendars, publish your free/busy information and retrieve that "
 "information from others."
 msgstr ""
@@ -13457,59 +13472,59 @@ msgstr "Treffen erstellen..."
 msgid "no subject"
 msgstr "kein Betreff"
 
-#: src/plugins/vcalendar/vcalendar.c:393
+#: src/plugins/vcalendar/vcalendar.c:384
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: src/plugins/vcalendar/vcalendar.c:394
+#: src/plugins/vcalendar/vcalendar.c:385
 msgid "Tentatively accept"
 msgstr "Vorläufig akzeptieren"
 
-#: src/plugins/vcalendar/vcalendar.c:395
+#: src/plugins/vcalendar/vcalendar.c:386
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: src/plugins/vcalendar/vcalendar.c:482
+#: src/plugins/vcalendar/vcalendar.c:473
 msgid "You have a Todo item."
 msgstr "Sie haben einen TODO-Eintrag."
 
-#: src/plugins/vcalendar/vcalendar.c:483 src/plugins/vcalendar/vcalendar.c:490
-#: src/plugins/vcalendar/vcalendar.c:495 src/plugins/vcalendar/vcalendar.c:503
-#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:753
+#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:744
 msgid "Details follow:"
 msgstr "Einzelheiten folgen:"
 
-#: src/plugins/vcalendar/vcalendar.c:489
+#: src/plugins/vcalendar/vcalendar.c:480
 msgid "You have created a meeting."
 msgstr "Sie haben ein Treffen erstellt."
 
-#: src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:485
 msgid "You have been invited to a meeting."
 msgstr "Sie wurden zu einem Treffen eingeladen."
 
-#: src/plugins/vcalendar/vcalendar.c:502
+#: src/plugins/vcalendar/vcalendar.c:493
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "Ein Treffen, zu dem Sie eingeladen waren, wurde abgesagt."
 
-#: src/plugins/vcalendar/vcalendar.c:511
+#: src/plugins/vcalendar/vcalendar.c:502
 msgid "You have been forwarded an appointment."
 msgstr "Sie haben ein Termin weitergeleitet."
 
-#: src/plugins/vcalendar/vcalendar.c:565
+#: src/plugins/vcalendar/vcalendar.c:556
 msgid "(this event recurs)"
 msgstr "(dieser Termin ist wiederkehrend)"
 
-#: src/plugins/vcalendar/vcalendar.c:572
+#: src/plugins/vcalendar/vcalendar.c:563
 msgid "(this event is part of a recurring event)"
 msgstr "(dieser Termin ist Teil eines sich wiederholenden Termins)"
 
-#: src/plugins/vcalendar/vcalendar.c:752
+#: src/plugins/vcalendar/vcalendar.c:743
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr ""
 "Sie haben eine Antwort auf einen unbekannten Vorschlag für ein Treffen "
 "erhalten."
 
-#: src/plugins/vcalendar/vcalendar.c:756
+#: src/plugins/vcalendar/vcalendar.c:747
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13518,35 +13533,35 @@ msgstr ""
 "Sie haben einen Antwort auf einen Vorschlag für ein Treffen erhalten.\n"
 "%s hat die Einladung, deren Einzelheiten folgen, %s:"
 
-#: src/plugins/vcalendar/vcalendar.c:835
+#: src/plugins/vcalendar/vcalendar.c:826
 msgid "Error - could not get the calendar MIME part."
 msgstr "Fehler - MIME-Teil des Kalenders nicht verfügbar"
 
-#: src/plugins/vcalendar/vcalendar.c:842
+#: src/plugins/vcalendar/vcalendar.c:833
 msgid "Error - no calendar part found."
 msgstr "Fehler - kein Kalenderteil gefunden"
 
-#: src/plugins/vcalendar/vcalendar.c:856
+#: src/plugins/vcalendar/vcalendar.c:847
 msgid "Error - Unknown calendar component type."
 msgstr "Fehler - Unbekannter Kalenderkomponententyp"
 
-#: src/plugins/vcalendar/vcalendar.c:985
+#: src/plugins/vcalendar/vcalendar.c:976
 msgid "Send a notification to the attendees"
 msgstr "Sende eine Nachricht an die Teilnehmer"
 
-#: src/plugins/vcalendar/vcalendar.c:994
+#: src/plugins/vcalendar/vcalendar.c:985
 msgid "Cancel meeting"
 msgstr "Treffen absagen"
 
-#: src/plugins/vcalendar/vcalendar.c:995
+#: src/plugins/vcalendar/vcalendar.c:986
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Sind Sie sicher, dass Sie dieses Treffen absagen wollen?"
 
-#: src/plugins/vcalendar/vcalendar.c:1090
+#: src/plugins/vcalendar/vcalendar.c:1081
 msgid "No account found"
 msgstr "Kein Konto gefunden"
 
-#: src/plugins/vcalendar/vcalendar.c:1091
+#: src/plugins/vcalendar/vcalendar.c:1082
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13554,68 +13569,68 @@ msgstr ""
 "Sie haben kein zu irgend einem Teilnehmer passendes Konto.\n"
 "Möchten Sie trotzdem antworten?"
 
-#: src/plugins/vcalendar/vcalendar.c:1093
+#: src/plugins/vcalendar/vcalendar.c:1084
 msgid "Reply anyway"
 msgstr "Trotzdem antworten"
 
-#: src/plugins/vcalendar/vcalendar.c:1222
+#: src/plugins/vcalendar/vcalendar.c:1213
 msgid "Answer"
 msgstr "Antworten"
 
-#: src/plugins/vcalendar/vcalendar.c:1223
+#: src/plugins/vcalendar/vcalendar.c:1214
 msgid "Edit meeting..."
 msgstr "Treffen bearbeiten..."
 
-#: src/plugins/vcalendar/vcalendar.c:1224
+#: src/plugins/vcalendar/vcalendar.c:1215
 msgid "Cancel meeting..."
 msgstr "Treffen absagen..."
 
-#: src/plugins/vcalendar/vcalendar.c:1225
+#: src/plugins/vcalendar/vcalendar.c:1216
 msgid "Launch website"
 msgstr "Webseite ansehen"
 
-#: src/plugins/vcalendar/vcalendar.c:1229
+#: src/plugins/vcalendar/vcalendar.c:1220
 msgid "You are already busy at this time."
 msgstr "Zu dieser Zeit sind Sie bereits beschäftigt."
 
-#: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcalendar.c:1259
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
 msgid "Event:"
 msgstr "Veranstaltung:"
 
-#: src/plugins/vcalendar/vcalendar.c:1269
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcalendar.c:1260
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: src/plugins/vcalendar/vcalendar.c:1270
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcalendar.c:1261
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
 msgid "Location:"
 msgstr "Ort:"
 
-#: src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/plugins/vcalendar/vcalendar.c:1262
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#: src/plugins/vcalendar/vcalendar.c:1272
+#: src/plugins/vcalendar/vcalendar.c:1263
 msgid "Starting:"
 msgstr "Beginn:"
 
-#: src/plugins/vcalendar/vcalendar.c:1273
+#: src/plugins/vcalendar/vcalendar.c:1264
 msgid "Ending:"
 msgstr "Ende:"
 
-#: src/plugins/vcalendar/vcalendar.c:1275
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1723
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1733
+#: src/plugins/vcalendar/vcalendar.c:1266
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1710
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
 msgid "Attendees:"
 msgstr "Teilnehmer:"
 
-#: src/plugins/vcalendar/vcalendar.c:1277
+#: src/plugins/vcalendar/vcalendar.c:1268
 msgid "Action:"
 msgstr "Verlauf:"
 
@@ -13628,8 +13643,8 @@ msgid "_Export calendar..."
 msgstr "Kalender _exportieren"
 
 #: src/plugins/vcalendar/vcal_folder.c:167
-msgid "_Subscribe to webCal..."
-msgstr "WebCal _abonnieren"
+msgid "_Subscribe to Webcal..."
+msgstr "WebCal _abonnieren..."
 
 #: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
@@ -13723,7 +13738,7 @@ msgstr ""
 #: src/plugins/vcalendar/vcal_folder.c:1835
 #, c-format
 msgid ""
-"This URL does not look like a WebCal URL:\n"
+"This URL does not look like a Webcal URL:\n"
 "%s\n"
 "%s"
 msgstr ""
@@ -13734,7 +13749,7 @@ msgstr ""
 #: src/plugins/vcalendar/vcal_folder.c:1838
 #, c-format
 msgid ""
-"This URL does not look like a WebCal URL:\n"
+"This URL does not look like a Webcal URL:\n"
 "%s\n"
 "%s\n"
 msgstr ""
@@ -13742,47 +13757,51 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1863
+#: src/plugins/vcalendar/vcal_folder.c:1866
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Ordner %s konnte nicht erstellt werden."
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1904
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail benötigt Zugang zum Netz, um den WebCal-Feed zu aktualisieren."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1915
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Hole Kalender für %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "new subscription"
 msgstr "Neues Abonnement"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1927
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Claws Mail benötigt Zugang zum Netz, um dieses Abonnement zu aktualisieren."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
-msgid "Subscribe to WebCal"
+#: src/plugins/vcalendar/vcal_folder.c:1939
+msgid "Subscribe to Webcal"
 msgstr "WebCal abonnieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1939
 msgid "Enter the WebCal URL:"
 msgstr "WebCal-URL eingeben:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Could not parse the URL."
 msgstr "Konnte URL nicht analysieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1979
 msgid "Do you really want to unsubscribe?"
 msgstr "Wollen Sie wirklich abbestellen?"
 
+#: src/plugins/vcalendar/vcal_folder.c:1980
+msgid "Delete subscription"
+msgstr "Abonnement löschen"
+
 #: src/plugins/vcalendar/vcal_manager.c:109
 msgid "accepted"
 msgstr "akzeptiert"
@@ -14034,7 +14053,7 @@ msgstr ""
 "Alle sind scheinen verfügbar, aber einige free/busy-Informationen konnten "
 "nicht abgerufen werden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1353
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1340
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14042,61 +14061,61 @@ msgstr ""
 "Die Einladungen zum Treffen konnten nicht verschickt werden.\n"
 "Prüfen Sie die Empfänger."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1474
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1461
 msgid "Save & Send"
 msgstr "Speichern & Senden"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1475
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1462
 msgid "Check availability"
 msgstr "Verfügbarkeit prüfen"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1585
 msgid "Starts at:"
 msgstr "Beginnt um:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1628
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
 msgid "on:"
 msgstr "am:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
 msgid "Ends at:"
 msgstr "Endet um:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1650
 msgid "New meeting"
 msgstr "neues Treffen"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1665
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1652
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Treffen bearbeiten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1744
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
 msgid "Time:"
 msgstr "Zeit:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1877
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1864
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1880
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1891
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "anstehender Termin: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1879
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14113,127 +14132,127 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1909
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Erinnerung in %d Minute"
 msgstr[1] "Erinnerung in %d Minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2035
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2022
 msgid "Empty calendar"
 msgstr "Leerer Kalender"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2023
 msgid "There is nothing to export."
 msgstr "Es gibt nichts zu exportieren"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2076
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2063
 msgid "Could not export the calendar."
 msgstr "Der Kalender konnte nicht exportiert werden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2093
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2080
 msgid "Export calendar to ICS"
 msgstr "Exportiere Kalender zu ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2103
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Der Kalender konnte nicht nach '%s' exportiert werden.\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2219
 msgid "Could not export the freebusy info."
 msgstr "Die free/busy-Informationen konnten nicht exportiert werden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2264
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr ""
 "Die free/busy-Informationen konnten nicht nach '%s' exportiert werden.\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:300
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:309
 msgid "Alert me"
 msgstr "Benachrichtige mich"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:338
 msgid "minutes before an event"
 msgstr "Minuten vor einem Termin"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:361
 msgid "Calendar export"
 msgstr "Kalender-Export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:372
 msgid "Automatically export calendar to"
 msgstr "Exportiere Kalender automatisch nach "
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:381
+#: src/plugins/vcalendar/vcal_prefs.c:500
 msgid "You can export to a local file or URL"
 msgstr "Sie können in eine lokale Datei oder zu einer URL exportieren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:383
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 "Angabe einer lokalen Datei oder einer URL (http://user:pass@server/path/file."
 "ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
-msgid "Include webcal subscriptions in export"
+#: src/plugins/vcalendar/vcal_prefs.c:413
+msgid "Include Webcal subscriptions in export"
 msgstr "Webcal-Abonnements in Export einbeziehen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid "Command to run after calendar export"
 msgstr "Nach dem Export des Kalenders auszuführender Befehl"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:452
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Claws-Kalender in XFCEs Orage-Kalender registrieren."
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "Erlaubt Orage (Version 4.4 oder höher), den Claws Mail-Kalender zu sehen."
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:467
 msgid "Export as GNOME shell calendar server"
 msgstr "Als GNOME Shell Kalender-Server exportieren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:469
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Das \"D-Bus calendar server interface\" registrieren, um Claws Mails' "
 "Kalender zu exportieren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:479
 msgid "Free/Busy information"
 msgstr "Frei/beschäftigt-Informationen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:491
 msgid "Automatically export free/busy status to"
 msgstr "Exportiere frei/beschäftigt-Status automatisch nach "
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:502
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 "Angabe einer lokalen Datei oder einer URL (http://user:pass@server/path/file."
 "ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:532
 msgid "Command to run after free/busy status export"
 msgstr ""
 "Nach dem Export der frei/beschäftigt-Informationen auszuführender Befehl"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:559
 msgid "Get free/busy status of others from"
 msgstr "Frei/Beschäftigt-Status anderer Personen holen von"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:567
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14243,9 +14262,9 @@ msgstr ""
 "ifb). Benutzen Sie %u für den linken Teil der E-Mailadresse und %d für die "
 "Domain."
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
-msgid "SSL options"
-msgstr "SSL-Einstellungen"
+#: src/plugins/vcalendar/vcal_prefs.c:581
+msgid "SSL/TLS options"
+msgstr "SSL/TLS-Einstellungen"
 
 #: src/pop.c:152
 msgid "Required APOP timestamp not found in greeting\n"
@@ -14260,8 +14279,8 @@ msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Zeitstempel-Syntaxfehler in Begrüßung (kein ASCII)\n"
 
 #: src/pop.c:190 src/pop.c:217
-msgid "POP3 protocol error\n"
-msgstr "POP3-Protokollfehler\n"
+msgid "POP protocol error\n"
+msgstr "POP-Protokollfehler\n"
 
 #: src/pop.c:263
 #, c-format
@@ -14270,13 +14289,13 @@ msgstr "Ungültige UIDL-Antwort: %s\n"
 
 #: src/pop.c:841
 #, c-format
-msgid "POP3: Deleting expired message %d [%s]\n"
-msgstr "POP3: Verfallene Nachricht %d [%s] wird gelöscht\n"
+msgid "POP: Deleting expired message %d [%s]\n"
+msgstr "POP: Verfallene Nachricht %d [%s] wird gelöscht\n"
 
 #: src/pop.c:857
 #, c-format
-msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
-msgstr "POP3: Nachricht %d [%s] wird übersprungen (%d bytes)\n"
+msgid "POP: Skipping message %d [%s] (%d bytes)\n"
+msgstr "POP: Nachricht %d [%s] wird übersprungen (%d bytes)\n"
 
 #: src/pop.c:889
 msgid "mailbox is locked\n"
@@ -14291,27 +14310,27 @@ msgid "command not supported\n"
 msgstr "Befehl nicht unterstützt\n"
 
 #: src/pop.c:916
-msgid "error occurred on POP3 session\n"
-msgstr "Fehler bei der POP3-Sitzung\n"
+msgid "error occurred on POP session\n"
+msgstr "Fehler bei der POP-Sitzung\n"
 
 #: src/pop.c:1111
 msgid "TOP command unsupported\n"
 msgstr "TOP-Befehl nicht unterstützt\n"
 
 #: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
-#: src/wizard.c:1499
-msgid "POP3"
-msgstr "POP3"
+msgid "POP"
+msgstr "POP"
 
 #: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
-msgid "IMAP4"
-msgstr "IMAP4"
+#: src/wizard.c:1499
+msgid "IMAP"
+msgstr "IMAP"
 
 #: src/prefs_account.c:336
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1501
+#: src/prefs_account.c:337 src/wizard.c:1500
 msgid "Local mbox file"
 msgstr "Lokale Mbox-Datei"
 
@@ -14339,11 +14358,11 @@ msgstr "Vollständiger Name"
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
-#: src/prefs_account.c:1123 src/wizard.c:1524
+#: src/prefs_account.c:1123 src/wizard.c:1523
 msgid "Auto-configure"
 msgstr "Automatisch konfigurieren"
 
-#: src/prefs_account.c:1125 src/wizard.c:1525
+#: src/prefs_account.c:1125 src/wizard.c:1524
 msgid "Cancel"
 msgstr "_Abbrechen"
 
@@ -14517,8 +14536,8 @@ msgstr ""
 "Kennwort wie beim Empfang verwendet."
 
 #: src/prefs_account.c:1851
-msgid "Authenticate with POP3 before sending"
-msgstr "Vor dem Senden mit POP3 authentifizieren"
+msgid "Authenticate with POP before sending"
+msgstr "Vor dem Senden mit POP authentifizieren"
 
 #: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
@@ -14548,30 +14567,30 @@ msgstr "Automatisch folgende Adressen eintragen"
 msgid "Spell check dictionaries"
 msgstr "Wörterbücher für Rechtschreibung"
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1089
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standard-Wörterbuch"
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1123
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Alternatives Standard-Wörterbuch"
 
 #: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
-#: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1434
+#: src/prefs_folder_item.c:1824 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1462 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Antwort"
 
 #: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
+#: src/prefs_folder_item.c:1490 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Weiterleiten"
 
@@ -14607,36 +14626,25 @@ msgid "Save sent encrypted messages as clear text"
 msgstr "Verschlüsselt versandte Nachrichten im Klartext speichern"
 
 #: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
-msgid "Don't use SSL"
-msgstr "Kein SSL verwenden"
+msgid "Don't use SSL/TLS"
+msgstr "Kein SSL/TLS verwenden"
 
-#: src/prefs_account.c:2459
-msgid "Use SSL for POP3 connection"
-msgstr "SSL für POP3-Verbindung verwenden"
+#: src/prefs_account.c:2459 src/prefs_account.c:2474 src/prefs_account.c:2494
+#: src/prefs_account.c:2505
+msgid "Use SSL/TLS"
+msgstr "SSL/TLS verwenden"
 
 #: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Mittels STARTTLS-Befehl eine SSL-Sitzung einleiten"
-
-#: src/prefs_account.c:2474
-msgid "Use SSL for IMAP4 connection"
-msgstr "SSL für IMAP-Verbindung verwenden"
-
-#: src/prefs_account.c:2494
-msgid "Use SSL for NNTP connection"
-msgstr "SSL für NNTP-Verbindung verwenden"
+msgid "Use STARTTLS command to start encrypted session"
+msgstr "Mittels STARTTLS-Befehl eine verschlüsselte Sitzung einleiten"
 
 #: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
 #: src/prefs_account.c:2502
-msgid "Don't use SSL (but, if necessary, use STARTTLS)"
-msgstr "Kein SSL verwenden (aber nötigenfalls STARTTLS)"
-
-#: src/prefs_account.c:2505
-msgid "Use SSL for SMTP connection"
-msgstr "SSL für SMTP-Verbindung verwenden"
+msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
+msgstr "Kein SSL/TLS verwenden (aber nötigenfalls STARTTLS)"
 
 #: src/prefs_account.c:2513
 msgid "Client certificates"
@@ -14656,27 +14664,27 @@ msgid "Certificate for sending"
 msgstr "Zertifikat zum Senden"
 
 #: src/prefs_account.c:2576
-msgid "Automatically accept valid SSL certificates"
-msgstr "Gültige SSL-Zertifikate automatisch akzeptieren"
+msgid "Automatically accept valid SSL/TLS certificates"
+msgstr "Gültige SSL/TLS-Zertifikate automatisch akzeptieren"
 
 #: src/prefs_account.c:2579
-msgid "Use non-blocking SSL"
-msgstr "Nicht-blockierendes SSL verwenden"
+msgid "Use non-blocking SSL/TLS"
+msgstr "Nicht-blockierendes SSL/TLS verwenden"
 
 #: src/prefs_account.c:2591
-msgid "Turn this off if you have SSL connection problems"
-msgstr "Diese Option bei SSL-Verbindungsproblemen deaktivieren."
+msgid "Turn this off if you have SSL/TLS connection problems"
+msgstr "Diese Option bei SSL/TLS-Verbindungsproblemen deaktivieren."
 
 #: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP-Port"
 
 #: src/prefs_account.c:2733
-msgid "POP3 port"
-msgstr "POP3-Port"
+msgid "POP port"
+msgstr "POP-Port"
 
 #: src/prefs_account.c:2740
-msgid "IMAP4 port"
+msgid "IMAP port"
 msgstr "IMAP-Port"
 
 #: src/prefs_account.c:2747
@@ -14736,16 +14744,16 @@ msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID eingetragen."
 
 #: src/prefs_account.c:2921
-msgid "POP3 server is not entered."
-msgstr "Kein POP3-Server eingetragen."
+msgid "POP server is not entered."
+msgstr "Kein POP-Server eingetragen."
 
 #: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Der Standard-Eingangsordner existiert nicht."
 
 #: src/prefs_account.c:2947
-msgid "IMAP4 server is not entered."
-msgstr "Kein IMAP4-Server angegeben."
+msgid "IMAP server is not entered."
+msgstr "Kein IMAP-Server angegeben."
 
 #: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
@@ -14763,7 +14771,7 @@ msgstr "Kein Mail-Befehl eingetragen."
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1840 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Vorlagen"
 
@@ -14784,7 +14792,7 @@ msgstr "Einstellungen für neues Konto"
 msgid "%s - Account preferences"
 msgstr "%s - Kontoeinstellungen"
 
-#: src/prefs_account.c:3929 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1388
 msgid "Failed (wrong address)"
 msgstr "Fehlgeschlagen (falsche Adresse)"
 
@@ -14792,7 +14800,7 @@ msgstr "Fehlgeschlagen (falsche Adresse)"
 msgid "Select signature file"
 msgstr "Signatur-Datei auswählen"
 
-#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1065
 msgid "Select certificate file"
 msgstr "Zertifikat auswählen"
 
@@ -14836,8 +14844,8 @@ msgstr "In der Liste markierte Aktion durch Obige ersetzen"
 #: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
 #: src/prefs_filtering.c:486 src/prefs_matcher.c:779 src/prefs_template.c:320
 #: src/prefs_toolbar.c:1056
-msgid "Re_move"
-msgstr "Entfernen"
+msgid "D_elete"
+msgstr "Lösch_en"
 
 #: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
@@ -15060,15 +15068,15 @@ msgstr "Aktuelle Aktionen"
 msgid "Action string is not valid."
 msgstr "Zeichenfolge der Aktion ist ungültig."
 
-#: src/prefs_common.c:223 src/prefs_quote.c:69
+#: src/prefs_common.c:225 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hallo,\\n"
 
-#: src/prefs_common.c:301
+#: src/prefs_common.c:303
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Am %d\\nschrieb %f:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:307 src/prefs_quote.c:85
+#: src/prefs_common.c:309 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15077,7 +15085,7 @@ msgstr ""
 "\\n}?t{An: %t\\n}?c{Cc: %c\\n}?n{Newsgruppen: %n\\n}?s{Betreff: %s\\n}\\n\\n"
 "%M"
 
-#: src/prefs_common.c:451
+#: src/prefs_common.c:453
 msgid "%x(%a) %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 
@@ -15330,7 +15338,7 @@ msgid "Message flags"
 msgstr "Nachrichten-Merker"
 
 #: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2776
+#: src/prefs_summary_column.c:78 src/summaryview.c:2753
 msgid "Mark"
 msgstr "Markieren"
 
@@ -15525,8 +15533,8 @@ msgid "Condition"
 msgstr "Bedingung"
 
 #: src/prefs_filtering.c:424
-msgid " D_efine... "
-msgstr "Definieren..."
+msgid " Def_ine... "
+msgstr " Defin_ieren..."
 
 #: src/prefs_filtering.c:446
 msgid " De_fine... "
@@ -15651,18 +15659,18 @@ msgstr "Angezeigte Spalten"
 msgid " Use default "
 msgstr " Standard verwenden "
 
-#: src/prefs_folder_item.c:262 src/prefs_folder_item.c:864
-#: src/prefs_folder_item.c:1390
+#: src/prefs_folder_item.c:210
 msgid ""
-"These preferences will not be saved as this folder is a top-level folder. "
+"These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
 "subfolders\"."
 msgstr ""
 "Diese Einstellungen werden nicht gespeichert, da dies ein Ordner oberster "
-"Ebene ist. Sie können aber mit der Schaltfläche \"Auf Unterordner anwenden\" "
-"auf die ganze Mailbox-Ordnerstruktur übertragen werden."
+"Ebene ist.\n"
+"Sie können aber mit der Schaltfläche \"Auf Unterordner anwenden\" auf die "
+"ganze Mailbox-Ordnerstruktur übertragen werden."
 
-#: src/prefs_folder_item.c:274 src/prefs_folder_item.c:876
+#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:885
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15670,55 +15678,55 @@ msgstr ""
 "Auf Unterordner\n"
 "anwenden"
 
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:314
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:301
+#: src/prefs_folder_item.c:316
 msgid "Outbox"
 msgstr "Gesendet"
 
-#: src/prefs_folder_item.c:317
+#: src/prefs_folder_item.c:332
 msgid "Folder type"
 msgstr "Ordnertyp"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:344
 msgid "Simplify Subject RegExp"
 msgstr "Betreffverkürzung (via RegExp)"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:370
 msgid "Test string:"
 msgstr "Test-String:"
 
-#: src/prefs_folder_item.c:372
+#: src/prefs_folder_item.c:387
 msgid "Result:"
 msgstr "Ergebnis:"
 
-#: src/prefs_folder_item.c:387
+#: src/prefs_folder_item.c:402
 msgid "Folder chmod"
 msgstr "Ordner-Zugriffsrechte (via chmod)"
 
-#: src/prefs_folder_item.c:413
+#: src/prefs_folder_item.c:428
 msgid "Folder color"
 msgstr "Ordnerfarbe"
 
-#: src/prefs_folder_item.c:426 src/prefs_folder_item.c:1659
+#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1663
 msgid "Pick color for folder"
 msgstr "Farbe für den Ordner wählen"
 
-#: src/prefs_folder_item.c:444
+#: src/prefs_folder_item.c:459
 msgid "Run Processing rules at start-up"
 msgstr "Verarbeitungsregeln beim Starten anwenden"
 
-#: src/prefs_folder_item.c:459
+#: src/prefs_folder_item.c:474
 msgid "Run Processing rules when opening"
 msgstr "Verarbeitungsregeln beim Öffnen anwenden"
 
-#: src/prefs_folder_item.c:473
+#: src/prefs_folder_item.c:488
 msgid "Scan for new mail"
 msgstr "Auf neue Nachrichten überprüfen"
 
-#: src/prefs_folder_item.c:475
+#: src/prefs_folder_item.c:490
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -15726,11 +15734,11 @@ msgstr ""
 "Aktiviere diese Option, wenn Mails durch serverseitiges Filtern oder externe "
 "Anwendungen direkt in den Ordner zugestellt werden."
 
-#: src/prefs_folder_item.c:495
+#: src/prefs_folder_item.c:510
 msgid "Select the HTML part of multipart messages"
 msgstr "Den HTML-Teil wählen, wenn Nachrichten 'multipart/alternative' sind"
 
-#: src/prefs_folder_item.c:512
+#: src/prefs_folder_item.c:527
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -15738,65 +15746,65 @@ msgstr ""
 "\"Standard\" übernimmt die globalen Einstellungen (aus Konfiguration/"
 "Nachrichtenansicht/Text-Einstellungen)"
 
-#: src/prefs_folder_item.c:522
+#: src/prefs_folder_item.c:537
 msgid "Synchronise for offline use"
 msgstr "Für Offline-Nutzung synchronisieren"
 
-#: src/prefs_folder_item.c:543
+#: src/prefs_folder_item.c:558
 msgid "Fetch message bodies from the last"
 msgstr "Hole Nachrichtenkörper der letzten"
 
-#: src/prefs_folder_item.c:550
+#: src/prefs_folder_item.c:565
 msgid "0: all bodies"
 msgstr "0: alle Nachrichtenkörper"
 
-#: src/prefs_folder_item.c:558
+#: src/prefs_folder_item.c:573
 msgid "Remove older messages bodies"
 msgstr "entferne alte Nachrichtenkörper"
 
-#: src/prefs_folder_item.c:575
+#: src/prefs_folder_item.c:590
 msgid "Discard folder cache"
 msgstr "Pufferspeicher für Ordner verwerfen"
 
-#: src/prefs_folder_item.c:885
+#: src/prefs_folder_item.c:894
 msgid "Request Return Receipt"
 msgstr "Empfangsbestätigung anfordern"
 
-#: src/prefs_folder_item.c:900
+#: src/prefs_folder_item.c:909
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Kopie ausgehender Nachrichten in diesem Ordner speichern anstatt in "
 "'Gesendet'"
 
-#: src/prefs_folder_item.c:913 src/prefs_folder_item.c:936
-#: src/prefs_folder_item.c:960 src/prefs_folder_item.c:983
-#: src/prefs_folder_item.c:1006
+#: src/prefs_folder_item.c:922 src/prefs_folder_item.c:945
+#: src/prefs_folder_item.c:969 src/prefs_folder_item.c:992
+#: src/prefs_folder_item.c:1015
 msgid "Default "
 msgstr "Standard"
 
-#: src/prefs_folder_item.c:937
+#: src/prefs_folder_item.c:946
 msgid " for replies"
 msgstr " für Antworten"
 
-#: src/prefs_folder_item.c:1029
+#: src/prefs_folder_item.c:1038
 msgid "Default account"
 msgstr "Standardkonto"
 
-#: src/prefs_folder_item.c:1672
+#: src/prefs_folder_item.c:1676
 msgid "Discard cache"
 msgstr "Zwischenspeicher verwerfen"
 
-#: src/prefs_folder_item.c:1673
+#: src/prefs_folder_item.c:1677
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
 "Möchten Sie lokal zwischengespeicherte Daten für diesen Ordner wirklich "
 "verwerfen?"
 
-#: src/prefs_folder_item.c:1803
+#: src/prefs_folder_item.c:1807
 msgid "General"
 msgstr "Allgemein"
 
-#: src/prefs_folder_item.c:1882
+#: src/prefs_folder_item.c:1886
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Einstellungen für Ordner %s"
@@ -16067,11 +16075,11 @@ msgstr "Textbereich"
 msgid "whole message"
 msgstr "Ganze Nachricht"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6282
+#: src/prefs_matcher.c:394 src/summaryview.c:6218
 msgid "Marked"
 msgstr "Markiert"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6280
+#: src/prefs_matcher.c:395 src/summaryview.c:6216
 msgid "Deleted"
 msgstr "Gelöscht"
 
@@ -16079,11 +16087,11 @@ msgstr "Gelöscht"
 msgid "Replied"
 msgstr "Beantwortet"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6274
+#: src/prefs_matcher.c:397 src/summaryview.c:6210
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6264 src/toolbar.c:416
+#: src/prefs_matcher.c:399 src/summaryview.c:6200 src/toolbar.c:416
 #: src/toolbar.c:934 src/toolbar.c:1978
 msgid "Spam"
 msgstr "Spam"
@@ -16092,7 +16100,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Mit Anhang"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6300
+#: src/prefs_matcher.c:401 src/summaryview.c:6236
 msgid "Signed"
 msgstr "Signiert"
 
@@ -16451,11 +16459,18 @@ msgid ""
 "\n"
 "Do you want to exit now?"
 msgstr ""
+"Ihre Claws-Mail-Konfiguration ist von einer neueren Version als Sie gerade "
+"verwenden.\n"
+"\n"
+"Dies wird nicht empfohlen.\n"
+"\n"
+"Weitere Informationen finden Sie auf der %sClaws-Mail-Webseite%s.\n"
+"\n"
+"Wollen Sie Claws Mail jetzt beenden?"
 
 #: src/prefs_migration.c:104
-#, fuzzy
 msgid "Configuration warning"
-msgstr "Konfiguration beendet"
+msgstr "Konfigurations-Warnung"
 
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
@@ -18017,11 +18032,22 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> wird als Pfad der anzuhängenden "
 "Datei interpretiert"
 
-#: src/quote_fmt.c:97
+#: src/quote_fmt.c:96
+msgid ""
+"attach file:\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
+"get\n"
+"the filename from"
+msgstr ""
+"Datei anhängen:\n"
+"<span style=\"oblique\">sub_expr</span> wird als Befehl interpretiert,\n"
+"mit dem der Dateiname ermittelt wird"
+
+#: src/quote_fmt.c:98
 msgid "<span weight=\"bold\">definition of terms:</span>"
 msgstr "<span weight=\"bold\">Definition der Bedingungen:</span>"
 
-#: src/quote_fmt.c:98
+#: src/quote_fmt.c:99
 msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
@@ -18029,7 +18055,7 @@ msgstr ""
 "Text, der beliebige der obigen Symbole\n"
 "oder Anweisungen enthalten darf"
 
-#: src/quote_fmt.c:99
+#: src/quote_fmt.c:100
 msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
@@ -18037,7 +18063,7 @@ msgstr ""
 "Text, der beliebige der obigen Symbole\n"
 "(keine Anweisungen) enthalten darf"
 
-#: src/quote_fmt.c:100
+#: src/quote_fmt.c:101
 msgid ""
 "completion from address book only works with the first\n"
 "address of the header, it outputs the full name\n"
@@ -18049,19 +18075,19 @@ msgstr ""
 "Name des Kontakts ausgegeben, wenn die Adresse auf genau\n"
 "einen Kontakt im Adressbuch passt."
 
-#: src/quote_fmt.c:109
+#: src/quote_fmt.c:110
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
-#: src/quote_fmt.c:110
+#: src/quote_fmt.c:111
 msgid "The following symbols and commands can be used:"
 msgstr "Die folgenden Symbole und Anweisungen können verwendet werden:"
 
-#: src/quote_fmt.c:173
+#: src/quote_fmt.c:174
 msgid "Use template when composing new messages"
 msgstr "Vorlage zum Verfassen neuer Nachrichten verwenden"
 
-#: src/quote_fmt.c:197
+#: src/quote_fmt.c:198
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
@@ -18069,35 +18095,35 @@ msgstr ""
 "Kopfzeile 'Von' überschreiben. Ändert nicht das Konto, von dem die neue "
 "Nachricht geschrieben wird."
 
-#: src/quote_fmt.c:299
+#: src/quote_fmt.c:300
 msgid "Use template when replying to messages"
 msgstr "Vorlage zum Antworten auf Nachrichten verwenden"
 
-#: src/quote_fmt.c:323
+#: src/quote_fmt.c:324
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr ""
 "Kopfzeile 'Von' überschreiben. Ändert nicht das Konto, von dem aus "
 "geantwortet wird."
 
-#: src/quote_fmt.c:334 src/quote_fmt.c:464
+#: src/quote_fmt.c:335 src/quote_fmt.c:465
 msgid "Quotation mark"
 msgstr "Zitat-Zeichen"
 
-#: src/quote_fmt.c:429
+#: src/quote_fmt.c:430
 msgid "Use template when forwarding messages"
 msgstr "Vorlage zum Weiterleiten von Nachrichten verwenden"
 
-#: src/quote_fmt.c:453
+#: src/quote_fmt.c:454
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr ""
 "Kopfzeile 'Von' überschreiben. Ändert nicht das Konto, von dem aus "
 "weitergeleitet wird."
 
-#: src/quote_fmt.c:545
+#: src/quote_fmt.c:546
 msgid "Defaults"
 msgstr "Voreinstellungen"
 
-#: src/quote_fmt.c:563
+#: src/quote_fmt.c:564
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
@@ -18105,15 +18131,15 @@ msgstr ""
 "Das Feld \"Von\" der Vorlage für \"Neue Nachricht\" enthält eine ungültige E-"
 "Mailadresse."
 
-#: src/quote_fmt.c:566
+#: src/quote_fmt.c:567
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr "Das Feld \"Betreff\" der Vorlage für \"Neue Nachricht\" ist ungültig."
 
-#: src/quote_fmt.c:583
+#: src/quote_fmt.c:584
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr "Das Feld \"Zitat-Zeichen\" der Vorlage für \"Antworten\" ist ungültig."
 
-#: src/quote_fmt.c:603
+#: src/quote_fmt.c:604
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr ""
 "Das Feld \"Anführungszeichen\" der Vorlage für \"Weiterleiten\" ist ungültig."
@@ -18242,8 +18268,8 @@ msgid "%s - Source"
 msgstr "%s - Quelltext"
 
 #: src/ssl_manager.c:156
-msgid "Saved SSL certificates"
-msgstr "Gespeicherte SSL-Zertifikate"
+msgid "Saved SSL/TLS certificates"
+msgstr "Gespeicherte SSL/TLS-Zertifikate"
 
 #: src/ssl_manager.c:436
 msgid "Delete certificate"
@@ -18277,7 +18303,7 @@ msgstr "Bedingung:"
 msgid "Find _all"
 msgstr "_Alle finden"
 
-#: src/summary_search.c:690 src/summaryview.c:1086 src/summaryview.c:1347
+#: src/summary_search.c:690 src/summaryview.c:1086 src/summaryview.c:1348
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Suche in %s... \n"
@@ -18302,264 +18328,264 @@ msgstr "Schnellsuchmenü ein/aus"
 msgid "Toggle multiple selection"
 msgstr "Mehrfachauswahl ein/aus"
 
-#: src/summaryview.c:1275
+#: src/summaryview.c:1276
 msgid "Process mark"
 msgstr "Markierung verarbeiten"
 
-#: src/summaryview.c:1276
+#: src/summaryview.c:1277
 msgid "Some marks are left. Process them?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1327
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Ordner %s wird durchsucht ..."
 
-#: src/summaryview.c:1823 src/summaryview.c:1875
+#: src/summaryview.c:1834 src/summaryview.c:1877
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1824
+#: src/summaryview.c:1835
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1836 src/summaryview.c:1888 src/summaryview.c:1931
-#: src/summaryview.c:1983 src/summaryview.c:2062
+#: src/summaryview.c:1847 src/summaryview.c:1890 src/summaryview.c:1926
+#: src/summaryview.c:1969 src/summaryview.c:2038
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interner Fehler: Unerwarteter Wert für 'prefs_common."
 "next_unread_msg_dialog'\n"
 
-#: src/summaryview.c:1844
+#: src/summaryview.c:1855
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:1876
+#: src/summaryview.c:1878
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Weiter in nächstem Ordner?"
 
-#: src/summaryview.c:1918 src/summaryview.c:1970
+#: src/summaryview.c:1913 src/summaryview.c:1956
 msgid "No more new messages"
 msgstr "Keine weiteren neuen Nachrichten"
 
-#: src/summaryview.c:1919
+#: src/summaryview.c:1914
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1934
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1957
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Weiter in nächstem Ordner?"
 
-#: src/summaryview.c:2008 src/summaryview.c:2049
+#: src/summaryview.c:1994 src/summaryview.c:2025
 msgid "No more marked messages"
 msgstr "Keine weiteren markierten Nachrichten"
 
-#: src/summaryview.c:2009
+#: src/summaryview.c:1995
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:2018
+#: src/summaryview.c:2004
 msgid "No marked messages."
 msgstr "Keine markierten Nachrichten."
 
-#: src/summaryview.c:2050
+#: src/summaryview.c:2026
 msgid "No marked message found. Go to next folder?"
 msgstr "Keine markierte Nachricht gefunden. Weiter in nächstem Ordner?"
 
-#: src/summaryview.c:2087 src/summaryview.c:2112
+#: src/summaryview.c:2063 src/summaryview.c:2088
 msgid "No more labeled messages"
 msgstr "Keine weiteren farbmarkierten Nachrichten"
 
-#: src/summaryview.c:2088
+#: src/summaryview.c:2064
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine farbmarkierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:2097 src/summaryview.c:2122
+#: src/summaryview.c:2073 src/summaryview.c:2098
 msgid "No labeled messages."
 msgstr "Keine farbmarkierte Nachrichten."
 
-#: src/summaryview.c:2113
+#: src/summaryview.c:2089
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine farbmarkierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:2427
+#: src/summaryview.c:2404
 msgid "Attracting messages by subject..."
 msgstr "Nachrichten werden nach Betreff angezogen..."
 
-#: src/summaryview.c:2612
+#: src/summaryview.c:2589
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:2616
+#: src/summaryview.c:2593
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:2617 src/summaryview.c:2624
+#: src/summaryview.c:2594 src/summaryview.c:2601
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2622
+#: src/summaryview.c:2599
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:2636
+#: src/summaryview.c:2613
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " Eintrag gewählt"
 msgstr[1] " Einträge gewählt"
 
-#: src/summaryview.c:2654 src/summaryview.c:2697
+#: src/summaryview.c:2631 src/summaryview.c:2674
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d neue, %d ungelesene, %d gesamt (%s)"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2649
 msgid "Message summary"
 msgstr "Nachrichtenübersicht"
 
-#: src/summaryview.c:2673
+#: src/summaryview.c:2650
 msgid "New:"
 msgstr "Neu:"
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2651
 msgid "Unread:"
 msgstr "Ungelesen:"
 
-#: src/summaryview.c:2675
+#: src/summaryview.c:2652
 msgid "Total:"
 msgstr "Gesamt:"
 
-#: src/summaryview.c:2677
+#: src/summaryview.c:2654
 msgid "Marked:"
 msgstr "Markiert:"
 
-#: src/summaryview.c:2678
+#: src/summaryview.c:2655
 msgid "Replied:"
 msgstr "Beantwortet:"
 
-#: src/summaryview.c:2679
+#: src/summaryview.c:2656
 msgid "Forwarded:"
 msgstr "Weitergeleitet:"
 
-#: src/summaryview.c:2680
+#: src/summaryview.c:2657
 msgid "Locked:"
 msgstr "Gesperrt:"
 
-#: src/summaryview.c:2681
+#: src/summaryview.c:2658
 msgid "Ignored:"
 msgstr "Ignoriert:"
 
-#: src/summaryview.c:2682
+#: src/summaryview.c:2659
 msgid "Watched:"
 msgstr "Beobachtet:"
 
-#: src/summaryview.c:2692
+#: src/summaryview.c:2669
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d ausgewählt (%s/%s), %d ungelesen"
 
-#: src/summaryview.c:2972
+#: src/summaryview.c:2962
 msgid "Sorting summary..."
 msgstr "Ordneransicht wird sortiert..."
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3101
 msgid "Setting summary from message data..."
 msgstr "Ordneransicht wird aus Nachrichtendaten gesetzt..."
 
-#: src/summaryview.c:3316
+#: src/summaryview.c:3306
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
-#: src/summaryview.c:3368
+#: src/summaryview.c:3358
 msgid "(No Recipient)"
 msgstr "(Kein Empfänger)"
 
-#: src/summaryview.c:3403
+#: src/summaryview.c:3393
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Von: %s, am %s"
 
-#: src/summaryview.c:3412
+#: src/summaryview.c:3402
 #, c-format
 msgid "To: %s, on %s"
 msgstr "An: %s, am %s"
 
-#: src/summaryview.c:4291
+#: src/summaryview.c:4231
 msgid "You're not the author of the article.\n"
 msgstr "Sie sind nicht der Autor dieses Artikels.\n"
 
-#: src/summaryview.c:4381
+#: src/summaryview.c:4321
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Soll die ausgewählte Nachricht wirklich gelöscht werden?"
 msgstr[1] "Sollen die %d ausgewählten Nachrichten wirklich gelöscht werden?"
 
-#: src/summaryview.c:4384
+#: src/summaryview.c:4324
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Nachricht löschen"
 msgstr[1] "Nachrichten löschen"
 
-#: src/summaryview.c:4548
+#: src/summaryview.c:4488
 msgid "Destination is same as current folder."
 msgstr "Ziel ist der aktuelle Ordner."
 
-#: src/summaryview.c:4653
+#: src/summaryview.c:4589
 msgid "Destination to copy is same as current folder."
 msgstr "Ziel der Kopie ist der aktuelle Ordner."
 
-#: src/summaryview.c:4818
+#: src/summaryview.c:4754
 msgid "Append or Overwrite"
 msgstr "Anhängen oder Überschreiben"
 
-#: src/summaryview.c:4819
+#: src/summaryview.c:4755
 msgid "Append or overwrite existing file?"
 msgstr "Vorhandene Datei anhängen oder überschreiben?"
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4756
 msgid "_Append"
 msgstr "_Anhängen"
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4756
 msgid "_Overwrite"
 msgstr "_Überschreiben"
 
-#: src/summaryview.c:4861
+#: src/summaryview.c:4797
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Sie sind dabei, %d Nachrichten zu drucken. Möchten Sie fortfahren?"
 
-#: src/summaryview.c:5321
+#: src/summaryview.c:5257
 msgid "Building threads..."
 msgstr "Diskurse werden erstellt..."
 
-#: src/summaryview.c:5569
+#: src/summaryview.c:5505
 msgid "Skip these rules"
 msgstr "Diese Regeln überspringen"
 
-#: src/summaryview.c:5572
+#: src/summaryview.c:5508
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Diese Regeln anwenden, auch wenn sie nicht zum Konto gehören"
 
-#: src/summaryview.c:5575
+#: src/summaryview.c:5511
 msgid "Apply these rules if they apply to the current account"
 msgstr "Diese Regeln anwenden, wenn sie zum aktuellen Konto gehören"
 
-#: src/summaryview.c:5604
+#: src/summaryview.c:5540
 msgid "Filtering"
 msgstr "Filter"
 
-#: src/summaryview.c:5605
+#: src/summaryview.c:5541
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18567,56 +18593,56 @@ msgstr ""
 "Einige Filterregeln gehören zu einem bestimmtem Konto.\n"
 "Bitte wählen was mit diesen geschehen soll:"
 
-#: src/summaryview.c:5635
+#: src/summaryview.c:5571
 msgid "Filtering..."
 msgstr "Filtern läuft..."
 
-#: src/summaryview.c:5714
+#: src/summaryview.c:5650
 msgid "Processing configuration"
 msgstr "Verarbeitungsregeln"
 
-#: src/summaryview.c:6260
+#: src/summaryview.c:6196
 msgid "Ignored thread"
 msgstr "Ignorierter Diskurs"
 
-#: src/summaryview.c:6262
+#: src/summaryview.c:6198
 msgid "Watched thread"
 msgstr "Beobachteter Diskurs"
 
-#: src/summaryview.c:6270
+#: src/summaryview.c:6206
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 "Beantwortet, aber auch weitergeleitet - klicken, um die Antwort zu sehen"
 
-#: src/summaryview.c:6272
+#: src/summaryview.c:6208
 msgid "Replied - click to see reply"
 msgstr "Beantwortet - klicken, um die Antwort zu sehen"
 
-#: src/summaryview.c:6284
+#: src/summaryview.c:6220
 msgid "To be moved"
 msgstr "Zu verschieben"
 
-#: src/summaryview.c:6286
+#: src/summaryview.c:6222
 msgid "To be copied"
 msgstr "Zu kopieren"
 
-#: src/summaryview.c:6298
+#: src/summaryview.c:6234
 msgid "Signed, has attachment(s)"
 msgstr "Signiert, hat Anhänge"
 
-#: src/summaryview.c:6302
+#: src/summaryview.c:6238
 msgid "Encrypted, has attachment(s)"
 msgstr "Verschlüsselt, hat Anhänge"
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6240
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6242
 msgid "Has attachment(s)"
 msgstr "Hat Anhänge"
 
-#: src/summaryview.c:7953
+#: src/summaryview.c:7889
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18625,11 +18651,11 @@ msgstr ""
 "Fehler in Regulärem Ausdruck (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8056
+#: src/summaryview.c:7992
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Zurück zur Ordnerliste (Es gibt ungelesene Nachrichten)"
 
-#: src/summaryview.c:8061
+#: src/summaryview.c:7997
 msgid "Go back to the folder list"
 msgstr "Zurück zur Ordnerliste"
 
@@ -18671,7 +18697,7 @@ msgstr "[%s  %s (%d Bytes)]"
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d Bytes)]"
 
-#: src/textview.c:914
+#: src/textview.c:915
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18685,68 +18711,68 @@ msgstr ""
 "\n"
 "  Benutze "
 
-#: src/textview.c:919
+#: src/textview.c:920
 msgid "'Network Log'"
 msgstr "'Netzwerkprotokoll'"
 
-#: src/textview.c:920
+#: src/textview.c:921
 msgid " in the Tools menu for more information."
 msgstr " im Menü 'Extras' für mehr Informationen."
 
-#: src/textview.c:983
+#: src/textview.c:984
 msgid "  The following can be performed on this part\n"
 msgstr "  Nach einem Rechtsklick auf das Symbol oder Listenelement kann\n"
 
-#: src/textview.c:985
+#: src/textview.c:986
 msgid "  by right-clicking the icon or list item:"
 msgstr "  dieser Teil folgendermaßen gehandhabt werden:"
 
-#: src/textview.c:989
+#: src/textview.c:990
 msgid "     - To save, select "
 msgstr "     - Zum Speichern "
 
-#: src/textview.c:990
+#: src/textview.c:991
 msgid "'Save as...'"
 msgstr "'Speichern als...'"
 
-#: src/textview.c:992 src/textview.c:1004 src/textview.c:1016
-#: src/textview.c:1026
+#: src/textview.c:993 src/textview.c:1005 src/textview.c:1017
+#: src/textview.c:1027
 msgid " (Shortcut key: '"
 msgstr " (Tastenkürzel: ')"
 
-#: src/textview.c:1000
+#: src/textview.c:1001
 msgid "     - To display as text, select "
 msgstr "     - Zum Darstellen als Text "
 
-#: src/textview.c:1001
+#: src/textview.c:1002
 msgid "'Display as text'"
 msgstr "'Als Text darstellen'"
 
-#: src/textview.c:1012
+#: src/textview.c:1013
 msgid "     - To open with an external program, select "
 msgstr "     - Zum Öffnen in einem externen Programm "
 
-#: src/textview.c:1013
+#: src/textview.c:1014
 msgid "'Open'"
 msgstr "'Öffnen'"
 
-#: src/textview.c:1021
+#: src/textview.c:1022
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativ doppelklicken oder mit der mittleren "
 
-#: src/textview.c:1022
+#: src/textview.c:1023
 msgid "mouse button)\n"
 msgstr "Maustaste klicken)\n"
 
-#: src/textview.c:1024
+#: src/textview.c:1025
 msgid "     - Or use "
 msgstr "     - Oder benutze "
 
-#: src/textview.c:1025
+#: src/textview.c:1026
 msgid "'Open with...'"
 msgstr "'Öffnen mit...'"
 
-#: src/textview.c:1139
+#: src/textview.c:1140
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18757,11 +18783,11 @@ msgstr ""
 "....%s\n"
 "Rückgabewert %d\n"
 
-#: src/textview.c:2188
+#: src/textview.c:2189
 msgid "Tags: "
 msgstr "Marken: "
 
-#: src/textview.c:2894
+#: src/textview.c:2895
 msgid "The real URL is different from the displayed URL."
 msgstr ""
 "Die angezeigte URL unterscheidet sich von der tatsächlichen URL.\n"
@@ -18772,23 +18798,23 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
-#: src/textview.c:2895
+#: src/textview.c:2896
 msgid "Displayed URL:"
 msgstr "Angezeigte URL:"
 
-#: src/textview.c:2896
+#: src/textview.c:2897
 msgid "Real URL:"
 msgstr "Tatsächliche URL:"
 
-#: src/textview.c:2897
+#: src/textview.c:2898
 msgid "Open it anyway?"
 msgstr "Trotzdem öffnen?"
 
-#: src/textview.c:2898
+#: src/textview.c:2899
 msgid "Phishing attempt warning"
 msgstr "Warnung vor Phishing-Versuch"
 
-#: src/textview.c:2899
+#: src/textview.c:2900
 msgid "_Open URL"
 msgstr "_URL Öffnen"
 
@@ -19131,7 +19157,7 @@ msgid ""
 "-----------\n"
 "Homepage:      <%s>\n"
 "Manual:        <%s>\n"
-"FAQ:\t       <%s>\n"
+"FAQ:           <%s>\n"
 "Themes:        <%s>\n"
 "Mailing Lists: <%s>\n"
 "\n"
@@ -19139,9 +19165,8 @@ msgid ""
 "-------\n"
 "Claws Mail is free software, released under the terms\n"
 "of the GNU General Public License, version 3 or later, as\n"
-"published by the Free Software Foundation, 51 Franklin Street,\n"
-"Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
-"found at <%s>.\n"
+"published by the Free Software Foundation. The license can\n"
+"be found at <%s>.\n"
 "\n"
 "DONATIONS\n"
 "---------\n"
@@ -19184,9 +19209,8 @@ msgstr ""
 "------\n"
 "Claws Mail ist freie Software, freigegeben im Sinne der\n"
 "GNU General Public License, Version 3 oder später, wie sie von der\n"
-"Free Software Foundation, 51 Franklin Street Fifth Floor Boston\n"
-"MA 02110-1301 USA, veröffentlicht wird.\n"
-"Die Lizenz finden Sie unter  <%s>.\n"
+"Free Software Foundation veröffentlicht wird.\n"
+"Die Lizenz finden Sie unter <%s>.\n"
 "\n"
 "SPENDEN\n"
 "-------\n"
@@ -19194,47 +19218,47 @@ msgstr ""
 "das unter <%s> tun.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Bitte den Namen der Mailbox eingeben."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Bitten geben Sie Ihren Namen und Ihre E-Mail-Adresse ein."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Bitte geben Sie Posteingangsserver und Benutzernamen an."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Bitte geben Sie Ihren Benutzernamen ein."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Bitte geben Sie Ihren Postausgangsserver (SMTP) ein."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Bitte geben Sie Ihren SMTP-Benutzernamen ein."
 
-#: src/wizard.c:975
+#: src/wizard.c:974
 msgid "Your name:"
 msgstr "Ihr name:"
 
-#: src/wizard.c:986
+#: src/wizard.c:985
 msgid "Your email address:"
 msgstr "Ihre E-Mail-Adresse:"
 
-#: src/wizard.c:997
+#: src/wizard.c:996
 msgid "Your organization:"
 msgstr "Ihre Organisation: "
 
-#: src/wizard.c:1031
+#: src/wizard.c:1030
 msgid "Mailbox name:"
 msgstr "Mailboxname"
 
-#: src/wizard.c:1039
+#: src/wizard.c:1038
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19242,7 +19266,7 @@ msgstr ""
 "Sie können auch einen absoluten Pfad angeben, z.B.: \"/home/white/Documents/"
 "Mail\""
 
-#: src/wizard.c:1110
+#: src/wizard.c:1109
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19250,55 +19274,55 @@ msgstr ""
 "Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
 "B.: \"mail.example.com:25\""
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "SMTP server address:"
 msgstr "SMTP-Serveradresse"
 
-#: src/wizard.c:1119
+#: src/wizard.c:1118
 msgid "Use authentication"
 msgstr "Benutze Authentifizierung"
 
-#: src/wizard.c:1128
+#: src/wizard.c:1127
 msgid "(empty to use the same as receive)"
 msgstr "(leer lassen, um den selben wie beim Empfang zu verwenden)"
 
-#: src/wizard.c:1142
+#: src/wizard.c:1141
 msgid "SMTP username:"
 msgstr "SMTP-Benutzername:"
 
-#: src/wizard.c:1153
+#: src/wizard.c:1152
 msgid "SMTP password:"
 msgstr "SMTP-Kennwort:"
 
-#: src/wizard.c:1166
-msgid "Use SSL to connect to SMTP server"
-msgstr "SSL für Verbindung zum SMTP-Server verwenden"
+#: src/wizard.c:1165
+msgid "Use SSL/TLS to connect to SMTP server"
+msgstr "SSL/TLS für Verbindung zum SMTP-Server verwenden"
 
-#: src/wizard.c:1177 src/wizard.c:1597
-msgid "Use SSL via STARTTLS"
-msgstr "SSL über STARTTLS benutzen"
+#: src/wizard.c:1176 src/wizard.c:1596
+msgid "Use STARTTLS command to start encryption"
+msgstr "Mittels STARTTLS-Befehl eine Verschlüsselung einleiten"
 
-#: src/wizard.c:1189 src/wizard.c:1609
-msgid "Client SSL certificate (optional)"
-msgstr "SSL-Benutzerzertifikat (optional)"
+#: src/wizard.c:1188 src/wizard.c:1608
+msgid "Client SSL/TLS certificate (optional)"
+msgstr "SSL/TLS-Benutzerzertifikat (optional)"
 
-#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
+#: src/wizard.c:1256 src/wizard.c:1288 src/wizard.c:1543
 msgid "Server address:"
 msgstr "Serveradresse:"
 
-#: src/wizard.c:1321
+#: src/wizard.c:1320
 msgid "Local mailbox:"
 msgstr "Lokale Mailbox:"
 
-#: src/wizard.c:1490
+#: src/wizard.c:1489
 msgid "Server type:"
 msgstr "Servertyp:"
 
-#: src/wizard.c:1500
-msgid "IMAP"
-msgstr "IMAP"
+#: src/wizard.c:1498
+msgid "POP3"
+msgstr "POP3"
 
-#: src/wizard.c:1555
+#: src/wizard.c:1554
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19306,19 +19330,19 @@ msgstr ""
 "Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
 "B.: \"mail.example.com:110\""
 
-#: src/wizard.c:1586
-msgid "Use SSL to connect to receiving server"
-msgstr "SSL für Verbindung zum empfangenden Server verwenden"
+#: src/wizard.c:1585
+msgid "Use SSL/TLS to connect to receiving server"
+msgstr "SSL/TLS für Verbindung zum empfangenden Server verwenden"
 
-#: src/wizard.c:1651
+#: src/wizard.c:1650
 msgid "IMAP server directory:"
 msgstr "IMAP-Serververzeichnis:"
 
-#: src/wizard.c:1662
+#: src/wizard.c:1661
 msgid "Show only subscribed folders"
 msgstr "Nur abonnierte Ordner anzeigen"
 
-#: src/wizard.c:1670
+#: src/wizard.c:1669
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19326,15 +19350,15 @@ msgstr ""
 "Achtung: diese Version von Claws Mail\n"
 "wurde ohne IMAP Support kompiliert."
 
-#: src/wizard.c:1788
+#: src/wizard.c:1787
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail Setup-Assistent"
 
-#: src/wizard.c:1822
+#: src/wizard.c:1821
 msgid "Welcome to Claws Mail"
 msgstr "Willkommen zu Claws Mail"
 
-#: src/wizard.c:1829
+#: src/wizard.c:1828
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19350,1087 +19374,34 @@ msgstr ""
 "Sie Claws Mail in weniger als fünf Minuten\n"
 "benutzen können."
 
-#: src/wizard.c:1842
+#: src/wizard.c:1841
 msgid "About You"
 msgstr "Über Sie"
 
-#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
+#: src/wizard.c:1849 src/wizard.c:1864 src/wizard.c:1879 src/wizard.c:1895
 msgid "Bold fields must be completed"
 msgstr "Felder in Fettschrift müssen ausgefüllt werden."
 
-#: src/wizard.c:1857
+#: src/wizard.c:1856
 msgid "Receiving mail"
 msgstr "E-Mail empfangen"
 
-#: src/wizard.c:1872
+#: src/wizard.c:1871
 msgid "Sending mail"
 msgstr "E-Mail versenden"
 
-#: src/wizard.c:1888
+#: src/wizard.c:1887
 msgid "Saving mail on disk"
 msgstr "Abspeichern der Mail"
 
-#: src/wizard.c:1904
+#: src/wizard.c:1903
 msgid "Configuration finished"
 msgstr "Konfiguration beendet"
 
-#: src/wizard.c:1911
+#: src/wizard.c:1910
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail ist jetzt bereit.\n"
 "Zum Starten 'Speichern' klicken."
-
-#~ msgid "_Other folder..."
-#~ msgstr "anderem _Ordner..."
-
-#~ msgid "minute(s)"
-#~ msgstr "Minute(n)"
-
-#~ msgid "day(s)"
-#~ msgstr "Tag(e)"
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Automatisch (empfohlen)"
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   Schlüsselimport funktioniert nicht unter Windows.\n"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Die Signatur kann nicht geprüft werden - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "Schlüssel-Export funktioniert nicht unter Windows."
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "Gelöschte Mails in den Papierkorb schieben und sofort löschen."
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "Verschiebt gelöschte Mails in den Papierkorb, statt die \\Gelöscht-Merker "
-#~ "zu setzen, ohne zu löschen."
-
-#~ msgid "Delete message(s)"
-#~ msgstr "Nachricht(en) löschen"
-
-#~ msgid "+_Insert"
-#~ msgstr "+Einfügen"
-
-#~ msgid "+_Send"
-#~ msgstr "+_Senden"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+Als Entwurf _speichern"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">.\n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">\"%s\" ersetzen durch: </span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "IMAP Fehler auf %s: authentifiziert\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "IMAP Fehler auf %s: nicht authentifiziert\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "IMAP Fehler auf %s: stream error\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "IMAP Fehler auf %s: Verbindung abgelehnt\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "IMAP Fehler auf %s: schwerer Fehler\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "IMAP Fehler auf %s: NOOP Fehler\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "IMAP Fehler auf %s: COPY Fehler\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "IMAP Fehler auf %s: LIST Fehler\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "IMAP Fehler auf %s: LSUB Fehler\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "IMAP Fehler auf %s: SASL Fehler\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "IMAP Fehler auf %s: SSL Fehler\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "IMAP Fehler auf %s: unbekannter Fehler [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+A_bmelden"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (oder älter)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (oder älter)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (oder älter)"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Typ:</b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Größe:</b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Dateiname: </b>"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr "<span color=\"red\">Fehler beim Lesen der Cache-Statistiken</span>"
-
-#~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Verwende %s in %d Dateien, %d Ordnern, %d Anderen und "
-#~ "%d Fehler</span>"
-
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr "<span color=\"red\">Fehler beim Leeren des Icon-Caches.</span>"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)..."
-
-#~ msgid "+_Save"
-#~ msgstr "+_Speichern"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%sbitte geben Sie die Passphrase "
-#~ "ein für:</span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                uid \"%s\" (Gültigkeit: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>Kommentare holen von Nachrichten, die jünger sind als:</b>\n"
-#~ "<small>(in Tagen; auf -1 setzen, um alle Kommentare zu holen)</small>"
-
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>Eintrag nicht als ungelesen markieren, wenn er sich ändert:</b>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(dieses Ereignis wiederholt sich)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b>am:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+Verwerfen"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>Nachrichtenzusammenfassung</b>\n"
-#~ "<b>Neu:</b> %d\n"
-#~ "<b>Ungelesen:</b> %d\n"
-#~ "<b>Gesamt:</b> %d\n"
-#~ "<b>Größe:</b> %s\n"
-#~ "\n"
-#~ "<b>Markiert:</b> %d\n"
-#~ "<b>Beantwortet:</b> %d\n"
-#~ "<b>Weitergeleitet:</b> %d\n"
-#~ "<b>Gesperrt:</b> %d\n"
-#~ "<b>Ignoriert:</b> %d\n"
-#~ "<b>Beobachtet:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Von: %s, am %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>An: %s, am %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">Ihr Name:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">Ihre E-Mail-Adresse:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">Mailbox-Name:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\">Adresse des Postausgangsservers (SMTP):</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Server-Adresse:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Lokale Mailbox:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Servertyp:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Benutzername:</span>"
-
-#~ msgid "Failed to register avatars internal rendering hook"
-#~ msgstr "Registrieren des \"avatars internal rendering hook\" schlug fehl."
-
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr "%s: Zeitüberschreitung beim Auflösen des Hosts.\n"
-
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s: unbekannter Host.\n"
-
-#~ msgid "Failed."
-#~ msgstr "Fehlgeschlagen."
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr "Neuer Ordnername nur ohne den Pfadtrenner des Namensbereichs"
-
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr "'folder item update hook' konnte nicht registriert werden"
-
-#~ msgid "Failed to register folder update hook"
-#~ msgstr "'folder update hook' konnte nicht registriert werden"
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "Nachricht %s kann nicht nach %s kopiert werden\n"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "Schreiben der Fetchinfo-Einstellungen in Datei schlug fehl\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "GData-Plugin: Schreiben der Plugin-Einstellungen in Datei schlug fehl\n"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "Standort gefunden: (%.2f,%.2f)"
-
-#~ msgid "Alleged country of origin: "
-#~ msgstr "Vermutliches Herkunftsland:"
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "Konnte den Standort der IP-Adresse nicht auflösen"
-
-#~ msgid "Try to locate sender"
-#~ msgstr "Versuche, den Absender zu lokalisieren"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Vereinigte Arabische Emirate"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afghanistan"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua und Barbuda"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
-
-#~ msgid "Albania"
-#~ msgstr "Albanien"
-
-#~ msgid "Armenia"
-#~ msgstr "Armenien"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Niederländische Antillen"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antarktis"
-
-#~ msgid "Argentina"
-#~ msgstr "Argentinien"
-
-#~ msgid "American Samoa"
-#~ msgstr "Amerikanisch-Samoa"
-
-#~ msgid "Austria"
-#~ msgstr "Österreich"
-
-#~ msgid "Australia"
-#~ msgstr "Australien"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Aserbaidschan"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "Bosnien und Herzegowina"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesch"
-
-#~ msgid "Belgium"
-#~ msgstr "Belgien"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulgarien"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahrain"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "Benin"
-#~ msgstr "Benin"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bolivien"
-
-#~ msgid "Brazil"
-#~ msgstr "Brasilien"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamas"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvetinsel"
-
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
-
-#~ msgid "Belarus"
-#~ msgstr "Weißrussland"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokosinseln"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Zentralafrikanische Republik"
-
-#~ msgid "Congo"
-#~ msgstr "Republik Kongo"
-
-#~ msgid "Switzerland"
-#~ msgstr "Schweiz"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Elfenbeinküste"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Cookinseln"
-
-#~ msgid "Chile"
-#~ msgstr "Chile"
-
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
-
-#~ msgid "China"
-#~ msgstr "China"
-
-#~ msgid "Colombia"
-#~ msgstr "Kolumbien"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Costa Rica"
-
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Kap Verde"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Weihnachtsinseln"
-
-#~ msgid "Cyprus"
-#~ msgstr "Cypern"
-
-#~ msgid "Czech Republic"
-#~ msgstr "Tschechische Republik\t"
-
-#~ msgid "Germany"
-#~ msgstr "Deutschland"
-
-#~ msgid "Djibouti"
-#~ msgstr "Dschibuti"
-
-#~ msgid "Denmark"
-#~ msgstr "Dänemark"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominica"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Domonikanische Republik"
-
-#~ msgid "Algeria"
-#~ msgstr "Algerien"
-
-#~ msgid "Ecuador"
-#~ msgstr "Äquador"
-
-#~ msgid "Estonia"
-#~ msgstr "Estland"
-
-#~ msgid "Egypt"
-#~ msgstr "Ägypten"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Westsahara"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
-
-#~ msgid "Spain"
-#~ msgstr "Spanien"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Äthiopien"
-
-#~ msgid "Finland"
-#~ msgstr "Finnland"
-
-#~ msgid "Fiji"
-#~ msgstr "Fidschi"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falklandinseln"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Mikronesien"
-
-#~ msgid "Faroe Islands"
-#~ msgstr " Färöer-Inseln"
-
-#~ msgid "France"
-#~ msgstr "Frankreich"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "France métropolitaine"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabun"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Vereinigtes Königreich"
-
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
-
-#~ msgid "Georgia"
-#~ msgstr "Georgien"
-
-#~ msgid "French Guiana"
-#~ msgstr "Französisch Guiana"
-
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltar"
-
-#~ msgid "Greenland"
-#~ msgstr "Grönland"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
-
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Äquatorialguinea"
-
-#~ msgid "Greece"
-#~ msgstr "Griechenland"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "Südgeorgien und die Sandwichinseln"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
-
-#~ msgid "Guam"
-#~ msgstr "Guam"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
-
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hingkong"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Heard und die McDonaldinseln"
-
-#~ msgid "Honduras"
-#~ msgstr "Honduras"
-
-#~ msgid "Croatia"
-#~ msgstr "Kroatien"
-
-#~ msgid "Haiti"
-#~ msgstr "Haïti"
-
-#~ msgid "Hungary"
-#~ msgstr "Ungarn"
-
-#~ msgid "Indonesia"
-#~ msgstr "Indonesien"
-
-#~ msgid "Ireland"
-#~ msgstr "Irland"
-
-#~ msgid "Israel"
-#~ msgstr "Israel"
-
-#~ msgid "India"
-#~ msgstr "Indien"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britisches Territorium im Indischen Ozean"
-
-#~ msgid "Iraq"
-#~ msgstr "Irak"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "Iran"
-
-#~ msgid "Iceland"
-#~ msgstr "Island"
-
-#~ msgid "Italy"
-#~ msgstr "Italien"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamaika"
-
-#~ msgid "Jordan"
-#~ msgstr "Jordanien"
-
-#~ msgid "Japan"
-#~ msgstr "Japan"
-
-#~ msgid "Kenya"
-#~ msgstr "Kenia"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgisistan"
-
-#~ msgid "Cambodia"
-#~ msgstr "Kambodscha"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Comoros"
-#~ msgstr "Komoren"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "St. Kitts und Nevis"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "Nordkorea"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "Südkorea"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuwait"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Cayman Islands"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kasachstan"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "Laos"
-
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "St. Lucia"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Liechtenstein"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
-
-#~ msgid "Liberia"
-#~ msgstr "Liberia"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litauen"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Luxemburg"
-
-#~ msgid "Latvia"
-#~ msgstr "Lettland"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Libyen"
-
-#~ msgid "Morocco"
-#~ msgstr "Marokko"
-
-#~ msgid "Monaco"
-#~ msgstr "Monaco"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Moldawien"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallinseln"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "Mazedonien"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mongolei"
-
-#~ msgid "Macao"
-#~ msgstr "Macao"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Nördliche Marianen"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinique"
-
-#~ msgid "Mauritania"
-#~ msgstr "Mauretanien"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Mauritius"
-#~ msgstr "Mauritius"
-
-#~ msgid "Maldives"
-#~ msgstr "Malediven"
-
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
-
-#~ msgid "Mexico"
-#~ msgstr "Mexiko"
-
-#~ msgid "Malaysia"
-#~ msgstr "Malaysia"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mosambik"
-
-#~ msgid "Namibia"
-#~ msgstr "Namibia"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Neukaledonien"
-
-#~ msgid "Niger"
-#~ msgstr "Niger"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolkinseln"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nigeria"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nicaragua"
-
-#~ msgid "Netherlands"
-#~ msgstr "Niederlande"
-
-#~ msgid "Norway"
-#~ msgstr "Norwegen"
-
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "New Zealand"
-#~ msgstr "Neuseeland"
-
-#~ msgid "Oman"
-#~ msgstr "Oman"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Peru"
-#~ msgstr "Peru"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Französisch-Polynesien"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua-Neuguinea"
-
-#~ msgid "Philippines"
-#~ msgstr "Philippinen"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
-
-#~ msgid "Poland"
-#~ msgstr "Polen"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Saint-Pierre und Miquelon"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Puerto Rico"
-
-#~ msgid "Portugal"
-#~ msgstr "Portugal"
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguay"
-
-#~ msgid "Qatar"
-#~ msgstr "Katar"
-
-#~ msgid "Reunion"
-#~ msgstr "Reunion"
-
-#~ msgid "Romania"
-#~ msgstr "Rumänien"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Russland"
-
-#~ msgid "Rwanda"
-#~ msgstr "Ruanda"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Saudi-Arabien"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Salomonen"
-
-#~ msgid "Seychelles"
-#~ msgstr "Seychellen"
-
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
-
-#~ msgid "Sweden"
-#~ msgstr "Schweden"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapur"
-
-#~ msgid "Saint Helena"
-#~ msgstr "St. Helena"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slowenien"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "Svalbard und Jan Mayen"
-
-#~ msgid "Slovakia"
-#~ msgstr "Slowakei"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Somalia"
-#~ msgstr "Somalia"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "São Tomé und Príncipe"
-
-#~ msgid "El Salvador"
-#~ msgstr "El Salvador"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Syrien"
-
-#~ msgid "Swaziland"
-#~ msgstr "Swasiland"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Turks- und Caicosinseln"
-
-#~ msgid "Chad"
-#~ msgstr "Tschad"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Französische Süd- und Antarktisgebiete"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Thailand"
-#~ msgstr "Thailand"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tadschikistan"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunesien"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
-
-#~ msgid "East Timor"
-#~ msgstr "Osttimor"
-
-#~ msgid "Turkey"
-#~ msgstr "Türkei"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad und Tobago"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Taiwan, Province Of China"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tansania"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ukraine"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "United States Minor Outlying Islands"
-
-#~ msgid "United States"
-#~ msgstr "USA"
-
-#~ msgid "Uruguay"
-#~ msgstr "Uruguay"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Usbekistan"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Vatikanstadt"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "St. Vincent und die Grenadinen"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venezuela"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Britische Jungferninseln"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Amerikanische Jungferninseln"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Wallis und Futuna"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "Yemen"
-#~ msgstr "Jemen"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-
-# Existiert nicht mehr, nur übersetzt, bis Korrektur durch Entwickler erfolgt
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "Serbien und Montenegro"
-
-#~ msgid "South Africa"
-#~ msgstr "Südafrika"
-
-#~ msgid "Zambia"
-#~ msgstr "Sambia"
-
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "Demokratische Republik Kongo"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Simbabwe"
-
-#~ msgid "GeoLocation"
-#~ msgstr "GeoLocation"
-
-# Clutter ist ein von dem GEoLocation-Plugin benötigtes Programm
-#~ msgid "Could not initialize clutter"
-#~ msgstr "Clutter konnte nicht initialisiert werden."
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "Anlegen des Regulären Ausdrucks schlug fehl: %s\n"
-
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr ""
-#~ "Registrieren des \"messageview_show hook \" im Geolocation-Plugin schlug "
-#~ "fehl."
-
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location "
-#~ "of senders from their E-Mails with any amount of certainty. The results "
-#~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails "
-#~ "from mailing lists may be assigned to the location of the mailing list "
-#~ "server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
-#~ "this information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
-#~ "marital quarrels)."
-#~ msgstr ""
-#~ "Dieses Plugin stellt ein Geolocation-Funktion für Claws Mail bereit.\n"
-#~ "\n"
-#~ "Achtung: Es ist technisch unmöglich, den genauen geografischen Standort "
-#~ "von Absendern aus deren Mails abzuleiten. Die Resultate dieses Plugins "
-#~ "sind nur grobe Näherungen. Vor allem Mailing-Listen-Software entfernt oft "
-#~ "Informationen des Absenders, so dass Mails von Mailinglisten der Standort "
-#~ "des Mailing-Listen-Servers statt der des Absenders zugeordnet wird.\n"
-#~ "Im Zweifelsfall sollten Sie dem Resultat dieses Plugins misstrauen und "
-#~ "sich nicht aufgrund dieser Information von Ihrem Partner trennen.\n"
-#~ "\n"
-#~ "Rückmeldungen an <berndth at gmx.de> sind willkommen (aber nur, wenn es "
-#~ "nicht um Eheprobleme geht)."
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "GeoLocation-Integration"
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Benachrichtigungs-Plugin: Speichern der Plugin-Einstellungen in Datei "
-#~ "schlug fehl\n"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "Gesendete Nachrichten in 'Gesendet' speichern"

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list