diff --git a/i18n/languages/woocommerce-germanized-de_DE.mo b/i18n/languages/woocommerce-germanized-de_DE.mo
index 479f1a7fc..7c4f78067 100644
Binary files a/i18n/languages/woocommerce-germanized-de_DE.mo and b/i18n/languages/woocommerce-germanized-de_DE.mo differ
diff --git a/i18n/languages/woocommerce-germanized-de_DE.po b/i18n/languages/woocommerce-germanized-de_DE.po
index 21fa0fbe4..25d52cf92 100644
--- a/i18n/languages/woocommerce-germanized-de_DE.po
+++ b/i18n/languages/woocommerce-germanized-de_DE.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WooCommerce Germanized v1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-29 20:20+0200\n"
-"PO-Revision-Date: 2017-03-29 20:20+0200\n"
+"POT-Creation-Date: 2017-03-31 13:44+0200\n"
+"PO-Revision-Date: 2017-03-31 13:44+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -182,7 +182,7 @@ msgstr "Zahlungarten"
 # @ woocommerce-germanized
 #: includes/admin/class-wc-gzd-admin-status.php:43
 #: includes/admin/settings/class-wc-gzd-settings-germanized.php:263
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1138
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1147
 msgid "Shipping Methods"
 msgstr "Versandarten"
 
@@ -276,8 +276,8 @@ msgstr "Angebotspreis Hinweis"
 # @ woocommerce-germanized
 #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:114
 #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:74
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:755
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:804
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:764
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:813
 msgid "Product Units"
 msgstr "Produkteinheiten"
 
@@ -473,7 +473,7 @@ msgstr "Keine"
 
 # @ woocommerce-germanized
 #: includes/admin/settings/class-wc-gzd-settings-germanized.php:145
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:670
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:679
 msgid "General"
 msgstr "Allgemein"
 
@@ -1245,13 +1245,33 @@ msgstr ""
 "Verwende Drag & Drop um die Reihenfolge der Texte in den E-Mails zu "
 "beeinflussen und speichere anschließend deine Änderungen."
 
-# @ woocommerce-germanized
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:632
+msgid "Hide Username"
+msgstr "Nutzernamen verstecken"
+
 #: includes/admin/settings/class-wc-gzd-settings-germanized.php:633
+msgid ""
+"Hide username from email content if password or password reset link is "
+"embedded."
+msgstr "Nutzernamen nicht zusammen mit einem Passwort versenden."
+
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:634
+msgid ""
+"Trusted Shops advises to not show the username together with an account "
+"password or password reset link. This option hides (or masks) the username "
+"in those specific cases."
+msgstr ""
+"Trusted Shops rät dazu den Nutzernamen nicht zusammen mit dem Passwort oder "
+"einem Link zum Passwort zurücksetzen per E-Mail zu versenden. Falls du "
+"Trusted Shops Mitglied bist, solltest du diese Option aktivieren."
+
+# @ woocommerce-germanized
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:642
 msgid "Email Attachment Options"
 msgstr "PDF Anhang"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:633
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:642
 #, php-format
 msgid ""
 "Want to attach automatically generated PDF files to emails instead of plain "
@@ -1261,27 +1281,27 @@ msgstr ""
 "%sUpgrade zur %spro%s Version%s"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:656
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:665
 msgid "Downloadable Product"
 msgstr "Herunterladbares Produkt"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:657
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:666
 msgid "Virtual Product"
 msgstr "Virtuelles Produkt"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:673
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:682
 msgid "Add to Cart"
 msgstr "Zum Warenkorb Button"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:674
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:683
 msgid "Show add to cart button on listings?"
 msgstr "Den zum Warenkorb Button in Produktlisten darstellen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:678
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:687
 msgid ""
 "unset this option if you don't want to show the add to cart button within "
 "the product listings"
@@ -1290,18 +1310,18 @@ msgstr ""
 "von Produktauflistungen darstellen möchten"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:682
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:691
 msgid "Link to Details"
 msgstr "Verlinkung zu Produktdetails"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:683
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:692
 msgid ""
 "Want to link to product details page instead of add to cart within listings?"
 msgstr "Zum Warenkorb Button mit Button zur Produktdetail-Seite ersetzen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:687
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:696
 msgid ""
 "Decide whether you like to link to your product's details page instead of "
 "displaying an add to cart button within product listings."
@@ -1311,17 +1331,17 @@ msgstr ""
 "diese Option."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:691
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:700
 msgid "Product Details Text"
 msgstr "Produktdetails Text"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:693
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:702
 msgid "Details"
 msgstr "Details"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:695
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:704
 msgid ""
 "If you have chosen to link to product details page instead of add to cart "
 "URL you may want to change the button text."
@@ -1331,11 +1351,11 @@ msgstr ""
 "einen Button-Text vergeben."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:700
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:709
 msgid "Digital Delivery Time Text"
 msgstr "Lieferzeit Digital"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:704
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:713
 msgid ""
 "Enter a text which will be shown as digital delivery time text (replacement "
 "for default digital time on digital products)."
@@ -1345,79 +1365,79 @@ msgstr ""
 "lassen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:709
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:718
 msgid "Notice Footer"
 msgstr "Hinweise im Footer"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:710
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:719
 msgid "Show a global VAT notice within footer"
 msgstr "Einen seitenübergreifenden Hinweis bzgl. der MwSt. im Footer einfügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:718
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:727
 msgid "Show a global sale price notice within footer"
 msgstr ""
 "Einen seitenübergreifenden Hinweis bzgl. reduzierter Preise im Footer "
 "einfügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:727
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:736
 msgid "Products"
 msgstr "Produkt"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:730
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:739
 msgid "Show within Product Listings"
 msgstr "In Produktlisten"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:731
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:780
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:740
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:789
 msgid "Shipping Costs notice"
 msgstr "Versandkosten-Hinweis"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:739
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:788
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:748
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:797
 msgid "Tax Info"
 msgstr "MwSt. Hinweis"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:747
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:796
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:860
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:756
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:805
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:869
 msgid "Base Price"
 msgstr "Grundpreis"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:763
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:812
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:772
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:821
 msgid "Delivery Time Notice"
 msgstr "Lieferzeiten-Hinweis"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:771
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:820
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:780
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:829
 #: includes/class-wc-gzd-post-types.php:93
 #: includes/class-wc-gzd-post-types.php:95
 msgid "Price Labels"
 msgstr "Preishinweise"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:779
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:788
 msgid "Show on Product Detail Page"
 msgstr "Auf der Produktseite"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:828
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:837
 msgid "Hide Tax Rate"
 msgstr "Steuersatz verstecken"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:829
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:838
 msgid "Hide specific tax rate within shop pages."
 msgstr "Entferne die Anzeige des konkreten Steuersatzes im Shop."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:833
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:842
 msgid ""
 "This option will make sure that within shop pages no specific tax rates are "
 "shown. Instead only incl. tax or excl. tax notice is shown."
@@ -1427,12 +1447,12 @@ msgstr ""
 "bzw. exkl. MwSt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:837
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:846
 msgid "Hide Shipping Costs Notice"
 msgstr "Versandkosten ausblenden"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:838
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:847
 msgid ""
 "Select product types for which you might want to disable the shipping costs "
 "notice."
@@ -1441,11 +1461,11 @@ msgstr ""
 "möchtest."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:848
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:857
 msgid "Hide Delivery Time Notice"
 msgstr "Lieferzeiten ausblenden"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:849
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:858
 msgid ""
 "Select product types for which you might want to disable the delivery time "
 "notice."
@@ -1454,12 +1474,12 @@ msgstr ""
 "möchtest."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:863
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:872
 msgid "Base Price Text"
 msgstr "Grundpreis Text"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:864
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:873
 msgid ""
 "This text will be used to display the base price. Use {price} to insert the "
 "price. If you want to specifically format base price output use {base}, "
@@ -1471,26 +1491,26 @@ msgstr ""
 "{base_price} für die einzelnen Elemente."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:869
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:878
 msgid "{price}"
 msgstr "{price}"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:873
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:882
 msgid "Variable Base Price"
 msgstr "Variabler Grundpreis"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:874
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:883
 msgid "Enable price range base prices for variable products."
 msgstr "Aktiviere von-bis-Grundpreise für variable Produkte."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:881
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:890
 msgid "Product Units Text"
 msgstr "Produkteinheiten Text"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:882
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:891
 msgid ""
 "This text will be used to display the product units. Use {product_units} to "
 "insert the amount of product units. Use {unit} to insert the unit. "
@@ -1502,26 +1522,26 @@ msgstr ""
 "Grundpreis."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:887
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:896
 msgid "Product contains: {product_units} {unit}"
 msgstr "Produkt enthält: {product_units} {unit}"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:892
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:901
 msgid "Checkout & Cart"
 msgstr "Checkout & Warenkorb"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:895
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:904
 msgid "DHL Parcel Shops"
 msgstr "DHL Packstationen"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:896
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:905
 msgid ""
 "Allow customers to choose a DHL parcel shop or packing station as delivery "
 "address."
 msgstr "Versand an DHL Packstation bzw. Paketshops aktivieren."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:900
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:909
 msgid ""
 "This option adds a checkbox to your checkout shipping fields which allows "
 "the customer to optionally choose a DHL packing station or parcel shop for "
@@ -1531,27 +1551,27 @@ msgstr ""
 "der Kunde optional die Lieferung an eine Packstation aktivieren. Fall das "
 "der Fall ist, muss eine PostNummer angegeben werden."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:904
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:913
 msgid "Supported Countries"
 msgstr "Unterstützte Länder"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:908
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:917
 msgid "Choose countries which support Parcel Shop delivery."
 msgstr ""
 "Wähle hier die Länder an, in denen du die Lieferung an DHL Packstationen "
 "bzw. Paketshops aktivieren möchtest."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:912
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:921
 #: includes/class-wc-gzd-dhl-parcel-shops.php:302
 msgid "Parcel Shop Finder"
 msgstr "Paketshop finden"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:913
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:922
 msgid ""
 "Enable DHL Parcel Shop Finder to let customers choose a parcel shop nearby."
 msgstr "Standortsuche nach der nächstgelegenen Packstation aktivieren."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:917
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:926
 #, php-format
 msgid ""
 "You may enable this option to add a <a href=\"%s\" target=\"_blank\">Parcel "
@@ -1566,13 +1586,13 @@ msgstr ""
 "Nähe auswählen und die Daten automatisch übernehmen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:921
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:930
 #: includes/admin/views/html-page-status-germanized.php:55
 msgid "Fallback Mode"
 msgstr "Fallback Modus"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:922
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:931
 msgid ""
 "Enable to make sure default checkout template is not being overriden by "
 "theme."
@@ -1580,7 +1600,7 @@ msgstr ""
 "Überschreiben relevanter Templates im Checkout durch dein Theme verhindern."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:926
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:935
 msgid ""
 "If you are facing problems within your checkout e.g. legally relevant data "
 "is not showing (terms, delivery time, unit price etc.) your theme seems to "
@@ -1594,17 +1614,17 @@ msgstr ""
 "Checkout (review-order.php und form-checkout.php) zu überschreiben. "
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:930
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:939
 msgid "Force free shipping"
 msgstr "Versandmethode erzwingen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:931
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:940
 msgid "Force free shipping method if available?"
 msgstr "Kostenlosen Versand erzwingen wenn die Methode zur Verfügung steht?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:935
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:944
 msgid ""
 "By default WooCommerce will let customers choose other shipping methods than "
 "free shipping (if available). This option will force free shipping if "
@@ -1615,18 +1635,18 @@ msgstr ""
 "Versand, sobald dieser verfügbar ist."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:939
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:948
 msgid "Hide taxes estimated"
 msgstr "Hinweis \"Steuern geschätzt\""
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:940
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:949
 msgid ""
 "Do you want to hide the \"taxes and shipping estimated\" text from your cart?"
 msgstr "Den Hinweis \"Versandkosten und Steuern werden geschätzt\" entfernen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:944
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:953
 msgid ""
 "By default WooCommerce adds a \"taxes and shipping estimated\" text to your "
 "cart. This might puzzle your customers and may not meet german law."
@@ -1636,17 +1656,17 @@ msgstr ""
 "Markt geeignet."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:948
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:957
 msgid "Show Thumbnails"
 msgstr "Thumbnails anzeigen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:949
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:958
 msgid "Show product thumbnails on checkout page?"
 msgstr "Produktbilder im Checkout darstellen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:953
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:962
 msgid ""
 "Uncheck if you don't want to show your product thumbnails within checkout "
 "table."
@@ -1655,17 +1675,17 @@ msgstr ""
 "bekommen möchtest."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:957
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:966
 msgid "Hide Shipping Select"
 msgstr "Versandarten Auswahl"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:958
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:967
 msgid "Hide shipping rate selection from checkout?"
 msgstr "Die Auswahl von Versandarten im Checkout deaktivieren?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:962
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:971
 msgid ""
 "This option will hide shipping rate selection from checkout. By then "
 "customers will only be able to change their shipping rate on cart page."
@@ -1675,18 +1695,18 @@ msgstr ""
 "Versandmethode ändern."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:966
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:975
 msgid "Show back to cart button"
 msgstr "Bestellung bearbeiten"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:967
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:976
 msgid "Show back to cart button within your checkout table?"
 msgstr ""
 "Einen \"Bestellung bearbeiten\" Button in der Bestellübersicht anzeigen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:971
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:980
 msgid ""
 "This button may let your customer edit their order before submitting. Some "
 "people state that this button should be hidden to avoid legal problems."
@@ -1698,28 +1718,28 @@ msgstr ""
 "keine weitere Informationen abgedruckt werden sollten."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:975
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:984
 msgid "Show edit data notice"
 msgstr "Bestellung prüfen Hinweis"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:976
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:985
 msgid "Show a \"check-your-entries\" notice to the user?"
 msgstr "Einen \"Bestellung prüfen\" Hinweis anzeigen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:980
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:989
 msgid "This notice will be added right before the order comments field."
 msgstr ""
 "Dieser Hinweis wird direkt oberhalb des Bestellhinweise-Feldes eingefügt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:984
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:993
 msgid "Checkout Table Color"
 msgstr "Hintergrundfarbe der Tabelle"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:986
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:995
 msgid ""
 "Choose the color of your checkout product table. This table should be "
 "highlighted within your checkout page."
@@ -1728,17 +1748,17 @@ msgstr ""
 "Tabelle sollte sich farblich vom Rest des Inhalts abheben."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:992
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1001
 msgid "Checkout Legal Display"
 msgstr "Checkbox oder Text"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:993
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1002
 msgid "Use Text without Checkbox"
 msgstr "Rechtshinweis ohne Checkbox."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:995
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1004
 msgid ""
 "This version will remove checkboxes from Checkout and display a text "
 "instead. This seems to be legally compliant (Zalando & Co are using this "
@@ -1749,12 +1769,12 @@ msgstr ""
 "diese Form)"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1001
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1010
 msgid "Legal Text"
 msgstr "Rechtlicher Hinweistext"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1002
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1011
 msgid ""
 "Choose a Plain Text which will be shown right above checkout submit button. "
 "Use {term_link}{/term_link}, {data_security_link}{/data_security_link}, "
@@ -1767,7 +1787,7 @@ msgstr ""
 "revocation_link} um die jeweiligen Links zu den Seiten einzufügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1004
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1013
 msgid ""
 "With your order, you agree to have read and understood our {term_link}Terms "
 "and Conditions{/term_link} and your {revocation_link}Right of Recission{/"
@@ -1778,12 +1798,12 @@ msgstr ""
 "revocation_link} einverstanden."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1011
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1020
 msgid "Legal Text Error"
 msgstr "Fehlermeldung der Checkbox"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1012
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1021
 msgid ""
 "If you have chosen to use checkbox validation please choose a error message "
 "which will be shown if the user doesn't check checkbox. Use {term_link}{/"
@@ -1798,7 +1818,7 @@ msgstr ""
 "revocation_link}"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1014
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1023
 msgid ""
 "To finish the order you have to accept to our {term_link}Terms and "
 "Conditions{/term_link} and {revocation_link}Right of Recission{/"
@@ -1808,17 +1828,17 @@ msgstr ""
 "term_link} und {revocation_link}Widerrufsbestimmungen{/revocation_link}."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1021
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1030
 msgid "Show digital notice"
 msgstr "Checkbox digitale Produkte"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1022
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1031
 msgid "Show checkbox for digital products."
 msgstr "Checkbox bei digitalen Produkten anzeigen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1023
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1032
 msgid ""
 "Disable this option if you want your customers to obtain their right of "
 "recission even if digital products are being bought."
@@ -1828,12 +1848,12 @@ msgstr ""
 "werden, dass im Falle von digitalen Produkten das Widerrufsrecht erlischt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1030
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1039
 msgid "Digital Product types"
 msgstr "Digitale Produkttypen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1031
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1040
 msgid ""
 "Select product types for which the loss of recission notice is shown. "
 "Product types like \"simple product\" may be redudant because they include "
@@ -1845,12 +1865,12 @@ msgstr ""
 "einschließen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1041
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1050
 msgid "Legal Digital Text"
 msgstr "Hinweis Digital"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1042
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1051
 msgid ""
 "Choose a Plain Text which will be shown right above checkout submit button "
 "if a user has picked a digital product. See legal text option for possible "
@@ -1861,7 +1881,7 @@ msgstr ""
 "Platzhalter verwenden wie beim Rechtlichen Hinweistext"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1044
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1053
 msgid ""
 "For digital products: I strongly agree that the execution of the agreement "
 "starts before the revocation period has expired. I am aware that my right of "
@@ -1872,13 +1892,13 @@ msgstr ""
 "bekannt, dass mit Beginn der Ausführung mein Widerrufsrecht erlischt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1051
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1060
 msgid "Legal Digital Error"
 msgstr "Fehlermeldung Digital"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1052
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1091
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1061
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1100
 msgid ""
 "This text will be shown as error message if customer has not checked the "
 "corresponding checkbox. See legal text option for possible placeholders."
@@ -1888,7 +1908,7 @@ msgstr ""
 "Hinweistext für eine Liste der Platzhalter."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1054
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1063
 #: includes/wc-gzd-cart-functions.php:317
 msgid ""
 "To retrieve direct access to digital content you have to agree to the loss "
@@ -1898,12 +1918,12 @@ msgstr ""
 "Widerrufsrecht verzichten."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1061
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1070
 msgid "Digital Confirmation Notice"
 msgstr "Digitale Bestätigung"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1062
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1071
 msgid ""
 "This text will be appended to your order processing email if the order "
 "contains digital products. Use placeholders {link}{/link} to insert link to "
@@ -1914,7 +1934,7 @@ msgstr ""
 "Platzhalter {link}{/link} um einen Link zur Widerrufsbelehrung einzufügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1065
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1074
 msgid ""
 "Furthermore you have expressly agreed to start the performance of the "
 "contract for digital items (e.g. downloads) before expiry of the withdrawal "
@@ -1928,17 +1948,17 @@ msgstr ""
 "verlieren."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1071
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1080
 msgid "Show service notice"
 msgstr "Checkbox Dienstleistungen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1072
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1081
 msgid "Show checkbox for service products."
 msgstr "Checkbox bei Dienstleistungen anzeigen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1073
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1082
 msgid ""
 "Disable this option if you want your customers to obtain their right of "
 "recission even if service products are being bought."
@@ -1949,12 +1969,12 @@ msgstr ""
 "Widerrufsfrist mit der Dienstleistung begonnen wird."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1080
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1089
 msgid "Legal Service Text"
 msgstr "Hinweis Dienstleistungen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1081
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1090
 msgid ""
 "Choose a Plain Text which will be shown right above checkout submit button "
 "if a user has picked a service product. See legal text option for possible "
@@ -1965,7 +1985,7 @@ msgstr ""
 "Platzhalter verwenden wie beim Rechtlichen Hinweistext."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1083
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1092
 #: includes/wc-gzd-cart-functions.php:339
 msgid ""
 "For services: I demand and acknowledge the immediate performance of the "
@@ -1978,12 +1998,12 @@ msgstr ""
 "vollständiger Erfüllung des Vertrages erlischt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1090
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1099
 msgid "Legal Service Error"
 msgstr "Fehlermeldung"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1093
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1102
 #: includes/wc-gzd-cart-functions.php:348
 msgid ""
 "To allow the immediate performance of the services you have to agree to the "
@@ -1992,12 +2012,12 @@ msgstr ""
 "Bitte stimme dem Beginn der Dienstleistung vor Ablauf der Widerrufsfrist zu."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1100
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1109
 msgid "Service Confirmation Notice"
 msgstr "Dienstleistung Bestätigung"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1101
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1110
 msgid ""
 "This text will be appended to your order processing email if the order "
 "contains service products. Use placeholders {link}{/link} to insert link to "
@@ -2008,7 +2028,7 @@ msgstr ""
 "Platzhalter {link}{/link} um einen Link zur Widerrufsbelehrung einzufügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1104
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1113
 msgid ""
 "Furthermore you have expressly agreed to start the performance of the "
 "contract for services before expiry of the withdrawal period. I have noted "
@@ -2022,18 +2042,18 @@ msgstr ""
 "erlischt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1110
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1119
 msgid "Parcel Delivery Checkbox"
 msgstr "Paketdienstleister Checkbox"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1111
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1120
 msgid ""
 "Show checkbox for data transmission to third party parcel service providers."
 msgstr ""
 "Checkbox zur Erlaubnis der Datenweitergabe an den Paketdienstleister "
 "einfügen."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1112
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1121
 msgid ""
 "You may optionally choose to show a checkbox which lets the customer accept "
 "data transmission to a third party parcel service provider to receive parcel "
@@ -2047,15 +2067,15 @@ msgstr ""
 "weitergeleitet werden. "
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1119
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1128
 msgid "Checkbox required"
 msgstr "Checkbox verpflichtend"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1120
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1129
 msgid "Make the parcel delivery checkbox a required field."
 msgstr "Paketdienstleister Checkbox zum Pflichtfeld machen?"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1121
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1130
 msgid ""
 "For some reason you may want to force your customers to Opt-In to the data "
 "transmission to a third party parcel service provider."
@@ -2065,11 +2085,11 @@ msgstr ""
 "diese Option aus."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1128
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1137
 msgid "Parcel Delivery Text"
 msgstr "Paketdienstleister Text"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1129
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1138
 msgid ""
 "Choose a Plain Text which will be shown right next to the corresponding "
 "checkbox to inform the customer about the data being transfered to the third "
@@ -2081,7 +2101,7 @@ msgstr ""
 "den Paketdienstleister. Verwende den Platzhalter {shipping_method_title} um "
 "den Titel der Versandmethoden einzubetten."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1131
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1140
 #: includes/wc-gzd-cart-functions.php:396
 msgid ""
 "Yes, I would like to be reminded via E-mail about parcel delivery "
@@ -2093,26 +2113,26 @@ msgstr ""
 "wird nur für diesen einmaligen Zweck an unseren Paketdienstleister "
 "weitergegeben."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1139
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1148
 msgid "Select shipping methods which are applicable for the Opt-In Checkbox."
 msgstr ""
 "Wähle Versandmethoden aus für die die Paketdienstleister Checkbox angezeigt "
 "werden soll."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1149
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1158
 msgid "Pay now Button"
 msgstr "Jetzt bezahlen Button"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1150
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1159
 msgid "Add a pay now button to emails and order success page."
 msgstr ""
 "Füge einen jetzt bezahlen - Button zur E-Mail und der Bestätigungs-Seite "
 "hinzu."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1151
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1160
 msgid ""
 "Add a pay now button to order confirmation email and order success page if "
 "the order awaits payment (PayPal etc)."
@@ -2122,30 +2142,30 @@ msgstr ""
 "benötigt (z.B. per PayPal)."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1158
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1167
 msgid "Order Success Text"
 msgstr "Bestellung eingegangen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1159
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1168
 msgid "Choose a custom text to display on order success page."
 msgstr ""
 "Hier kannst du einen individuellen kurzen Text eingeben, der nach der "
 "Bestellung ausgegeben wird."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1167
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1176
 msgid "Order Success Data"
 msgstr "Bestellbestätigungs-Daten"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1168
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1177
 msgid "Hide product table and customer data on order success page"
 msgstr ""
 "Produktdetails (Tabelle, Kundeninfos) von der Bestätigungsseite entfernen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1276
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1285
 msgid ""
 "Sorry, but the new Virtual VAT rules cannot be applied to small business."
 msgstr ""
@@ -3188,8 +3208,18 @@ msgctxt "ekomi"
 msgid "eKomi Options"
 msgstr "eKomi"
 
+#: includes/class-wc-gzd-emails.php:75
+msgid "Someone requested a password reset for your account."
+msgstr ""
+"Jemand hat das Zurücksetzen des Passworts für deinen Account beantragt."
+
+#: includes/class-wc-gzd-emails.php:88
+#, php-format
+msgid "Thanks for creating an account on %s."
+msgstr "Danke, dass du ein Konto bei %s erstellt hast."
+
 # @ woocommerce-germanized
-#: includes/class-wc-gzd-emails.php:407
+#: includes/class-wc-gzd-emails.php:451
 msgctxt "revocation-form"
 msgid "Forward your Revocation online"
 msgstr "Deinen Widerruf online erklären"
@@ -4873,14 +4903,13 @@ msgstr "Einkauf jetzt bewerten"
 
 # @ woocommerce-germanized
 #: templates/emails/customer-new-account-activation.php:18
-#: templates/emails/plain/customer-new-account-activation.php:16
 #, php-format
 msgid ""
-"Thanks for creating an account on %s. Your username is %s. Please follow the "
-"activation link to activate your account:"
+"Thanks for creating an account on %s. Please follow the activation link to "
+"activate your account:"
 msgstr ""
-"Es wurde für dich ein Benutzerkonto bei %s angelegt. Dein Benutzername "
-"lautet %s. Bitte folge dem Link, um dein Benutzerkonto zu bestätigen:"
+"Es wurde für dich ein Benutzerkonto bei %s angelegt. Bitte folge dem Link, "
+"um dein Benutzerkonto zu bestätigen:"
 
 # @ woocommerce-germanized
 #: templates/emails/customer-new-account-activation.php:20
@@ -4977,6 +5006,16 @@ msgstr "Bestellung jetzt bewerten"
 msgid "SEPA Data"
 msgstr "SEPA Daten"
 
+# @ woocommerce-germanized
+#: templates/emails/plain/customer-new-account-activation.php:16
+#, php-format
+msgid ""
+"Thanks for creating an account on %s. Your username is %s. Please follow the "
+"activation link to activate your account:"
+msgstr ""
+"Es wurde für dich ein Benutzerkonto bei %s angelegt. Dein Benutzername "
+"lautet %s. Bitte folge dem Link, um dein Benutzerkonto zu bestätigen:"
+
 # @ woocommerce-germanized
 #: templates/footer/sale-info.php:13
 msgid "All striked out prices refer to prices used to be charged at this shop."
@@ -5036,6 +5075,9 @@ msgctxt "trusted-shops"
 msgid "%s custom reviews"
 msgstr "%s Kundenbewertungen"
 
+#~ msgid "[Removed for security reasons]"
+#~ msgstr "[Aus Sicherheitsgründen entfernt]"
+
 #~ msgid ""
 #~ "You may enable this option to add a <a href=\"%s\">Parcel Shop Finder</a> "
 #~ "to your checkout. Adds an link next to the checkbox. The finder (DHL API) "
diff --git a/i18n/languages/woocommerce-germanized-de_DE_formal.mo b/i18n/languages/woocommerce-germanized-de_DE_formal.mo
index 63856eed6..b4a930b10 100644
Binary files a/i18n/languages/woocommerce-germanized-de_DE_formal.mo and b/i18n/languages/woocommerce-germanized-de_DE_formal.mo differ
diff --git a/i18n/languages/woocommerce-germanized-de_DE_formal.po b/i18n/languages/woocommerce-germanized-de_DE_formal.po
index a474001b9..4410e562a 100644
--- a/i18n/languages/woocommerce-germanized-de_DE_formal.po
+++ b/i18n/languages/woocommerce-germanized-de_DE_formal.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WooCommerce Germanized v1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-29 20:20+0200\n"
-"PO-Revision-Date: 2017-03-29 20:20+0200\n"
+"POT-Creation-Date: 2017-03-31 13:42+0200\n"
+"PO-Revision-Date: 2017-03-31 13:44+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -182,7 +182,7 @@ msgstr "Zahlungarten"
 # @ woocommerce-germanized
 #: includes/admin/class-wc-gzd-admin-status.php:43
 #: includes/admin/settings/class-wc-gzd-settings-germanized.php:263
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1138
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1147
 msgid "Shipping Methods"
 msgstr "Versandarten"
 
@@ -276,8 +276,8 @@ msgstr "Neuer Preis Hinweis"
 # @ woocommerce-germanized
 #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:114
 #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:74
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:755
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:804
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:764
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:813
 msgid "Product Units"
 msgstr "Produkteinheiten"
 
@@ -473,7 +473,7 @@ msgstr "Keine"
 
 # @ woocommerce-germanized
 #: includes/admin/settings/class-wc-gzd-settings-germanized.php:145
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:670
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:679
 msgid "General"
 msgstr "Allgemein"
 
@@ -1245,13 +1245,33 @@ msgstr ""
 "Verwende Drag & Drop um die Reihenfolge der Texte in den E-Mails zu "
 "beeinflussen und speichere anschließend deine Änderungen."
 
-# @ woocommerce-germanized
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:632
+msgid "Hide Username"
+msgstr "Nutzernamen verstecken"
+
 #: includes/admin/settings/class-wc-gzd-settings-germanized.php:633
+msgid ""
+"Hide username from email content if password or password reset link is "
+"embedded."
+msgstr "Nutzernamen nicht zusammen mit einem Passwort versenden."
+
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:634
+msgid ""
+"Trusted Shops advises to not show the username together with an account "
+"password or password reset link. This option hides (or masks) the username "
+"in those specific cases."
+msgstr ""
+"Trusted Shops rät dazu den Nutzernamen nicht zusammen mit dem Passwort oder "
+"einem Link zum Passwort zurücksetzen per E-Mail zu versenden. Falls du "
+"Trusted Shops Mitglied bist, solltest du diese Option aktivieren."
+
+# @ woocommerce-germanized
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:642
 msgid "Email Attachment Options"
 msgstr "PDF Anhang"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:633
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:642
 #, php-format
 msgid ""
 "Want to attach automatically generated PDF files to emails instead of plain "
@@ -1261,27 +1281,27 @@ msgstr ""
 "%sUpgrade zur %spro%s Version%s"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:656
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:665
 msgid "Downloadable Product"
 msgstr "Herunterladbares Produkt"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:657
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:666
 msgid "Virtual Product"
 msgstr "Virtuelles Produkt"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:673
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:682
 msgid "Add to Cart"
 msgstr "Zum Warenkorb Button"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:674
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:683
 msgid "Show add to cart button on listings?"
 msgstr "Den zum Warenkorb Button in Produktlisten darstellen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:678
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:687
 msgid ""
 "unset this option if you don't want to show the add to cart button within "
 "the product listings"
@@ -1290,18 +1310,18 @@ msgstr ""
 "von Produktauflistungen darstellen möchten"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:682
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:691
 msgid "Link to Details"
 msgstr "Verlinkung zu Produktdetails"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:683
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:692
 msgid ""
 "Want to link to product details page instead of add to cart within listings?"
 msgstr "Zum Warenkorb Button mit Button zur Produktdetail-Seite ersetzen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:687
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:696
 msgid ""
 "Decide whether you like to link to your product's details page instead of "
 "displaying an add to cart button within product listings."
@@ -1311,17 +1331,17 @@ msgstr ""
 "diese Option."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:691
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:700
 msgid "Product Details Text"
 msgstr "Produktdetails Text"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:693
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:702
 msgid "Details"
 msgstr "Details"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:695
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:704
 msgid ""
 "If you have chosen to link to product details page instead of add to cart "
 "URL you may want to change the button text."
@@ -1331,11 +1351,11 @@ msgstr ""
 "einen Button-Text vergeben."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:700
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:709
 msgid "Digital Delivery Time Text"
 msgstr "Lieferzeit Digital"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:704
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:713
 msgid ""
 "Enter a text which will be shown as digital delivery time text (replacement "
 "for default digital time on digital products)."
@@ -1345,79 +1365,79 @@ msgstr ""
 "lassen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:709
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:718
 msgid "Notice Footer"
 msgstr "Hinweise im Footer"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:710
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:719
 msgid "Show a global VAT notice within footer"
 msgstr "Einen seitenübergreifenden Hinweis bzgl. der MwSt. im Footer einfügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:718
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:727
 msgid "Show a global sale price notice within footer"
 msgstr ""
 "Einen seitenübergreifenden Hinweis bzgl. reduzierter Preise im Footer "
 "einfügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:727
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:736
 msgid "Products"
 msgstr "Produkt"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:730
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:739
 msgid "Show within Product Listings"
 msgstr "In Produktlisten"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:731
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:780
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:740
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:789
 msgid "Shipping Costs notice"
 msgstr "Versandkosten-Hinweis"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:739
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:788
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:748
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:797
 msgid "Tax Info"
 msgstr "MwSt. Hinweis"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:747
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:796
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:860
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:756
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:805
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:869
 msgid "Base Price"
 msgstr "Grundpreis"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:763
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:812
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:772
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:821
 msgid "Delivery Time Notice"
 msgstr "Lieferzeiten-Hinweis"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:771
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:820
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:780
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:829
 #: includes/class-wc-gzd-post-types.php:93
 #: includes/class-wc-gzd-post-types.php:95
 msgid "Price Labels"
 msgstr "Preishinweise"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:779
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:788
 msgid "Show on Product Detail Page"
 msgstr "Auf der Produktseite"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:828
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:837
 msgid "Hide Tax Rate"
 msgstr "Steuersatz verstecken"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:829
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:838
 msgid "Hide specific tax rate within shop pages."
 msgstr "Entferne die Anzeige des konkreten Steuersatzes für Produkte im Shop."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:833
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:842
 msgid ""
 "This option will make sure that within shop pages no specific tax rates are "
 "shown. Instead only incl. tax or excl. tax notice is shown."
@@ -1427,12 +1447,12 @@ msgstr ""
 "bzw. exkl. MwSt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:837
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:846
 msgid "Hide Shipping Costs Notice"
 msgstr "Versandkosten ausblenden"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:838
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:847
 msgid ""
 "Select product types for which you might want to disable the shipping costs "
 "notice."
@@ -1441,11 +1461,11 @@ msgstr ""
 "möchtest."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:848
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:857
 msgid "Hide Delivery Time Notice"
 msgstr "Lieferzeiten ausblenden"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:849
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:858
 msgid ""
 "Select product types for which you might want to disable the delivery time "
 "notice."
@@ -1454,12 +1474,12 @@ msgstr ""
 "möchtest."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:863
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:872
 msgid "Base Price Text"
 msgstr "Grundpreis Text"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:864
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:873
 msgid ""
 "This text will be used to display the base price. Use {price} to insert the "
 "price. If you want to specifically format base price output use {base}, "
@@ -1471,26 +1491,26 @@ msgstr ""
 "{base_price} für die einzelnen Elemente."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:869
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:878
 msgid "{price}"
 msgstr "{price}"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:873
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:882
 msgid "Variable Base Price"
 msgstr "Variabler Grundpreis"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:874
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:883
 msgid "Enable price range base prices for variable products."
 msgstr "Aktiviere von-bis-Grundpreise für variable Produkte."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:881
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:890
 msgid "Product Units Text"
 msgstr "Produkteinheiten Text"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:882
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:891
 msgid ""
 "This text will be used to display the product units. Use {product_units} to "
 "insert the amount of product units. Use {unit} to insert the unit. "
@@ -1502,26 +1522,26 @@ msgstr ""
 "Grundpreis."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:887
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:896
 msgid "Product contains: {product_units} {unit}"
 msgstr "Produkt enthält: {product_units} {unit}"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:892
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:901
 msgid "Checkout & Cart"
 msgstr "Checkout & Warenkorb"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:895
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:904
 msgid "DHL Parcel Shops"
 msgstr "DHL Packstationen"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:896
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:905
 msgid ""
 "Allow customers to choose a DHL parcel shop or packing station as delivery "
 "address."
 msgstr "Versand an DHL Packstation bzw. Paketshops aktivieren."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:900
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:909
 msgid ""
 "This option adds a checkbox to your checkout shipping fields which allows "
 "the customer to optionally choose a DHL packing station or parcel shop for "
@@ -1531,27 +1551,27 @@ msgstr ""
 "der Kunde optional die Lieferung an eine Packstation aktivieren. Fall das "
 "der Fall ist, muss eine PostNummer angegeben werden."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:904
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:913
 msgid "Supported Countries"
 msgstr "Unterstützte Länder"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:908
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:917
 msgid "Choose countries which support Parcel Shop delivery."
 msgstr ""
 "Wähle hier die Länder an, in denen du die Lieferung an DHL Packstationen "
 "bzw. Paketshops aktivieren möchtest."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:912
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:921
 #: includes/class-wc-gzd-dhl-parcel-shops.php:302
 msgid "Parcel Shop Finder"
 msgstr "Paketshop finden"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:913
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:922
 msgid ""
 "Enable DHL Parcel Shop Finder to let customers choose a parcel shop nearby."
 msgstr "Standortsuche nach der nächstgelegenen Packstation aktivieren."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:917
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:926
 #, php-format
 msgid ""
 "You may enable this option to add a <a href=\"%s\" target=\"_blank\">Parcel "
@@ -1566,13 +1586,13 @@ msgstr ""
 "Nähe auswählen und die Daten automatisch übernehmen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:921
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:930
 #: includes/admin/views/html-page-status-germanized.php:55
 msgid "Fallback Mode"
 msgstr "Fallback Modus"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:922
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:931
 msgid ""
 "Enable to make sure default checkout template is not being overriden by "
 "theme."
@@ -1580,7 +1600,7 @@ msgstr ""
 "Überschreiben relevanter Templates im Checkout durch dein Theme verhindern."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:926
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:935
 msgid ""
 "If you are facing problems within your checkout e.g. legally relevant data "
 "is not showing (terms, delivery time, unit price etc.) your theme seems to "
@@ -1594,17 +1614,17 @@ msgstr ""
 "Checkout (review-order.php und form-checkout.php) zu überschreiben. "
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:930
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:939
 msgid "Force free shipping"
 msgstr "Versandmethode erzwingen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:931
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:940
 msgid "Force free shipping method if available?"
 msgstr "Kostenlosen Versand erzwingen wenn die Methode zur Verfügung steht?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:935
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:944
 msgid ""
 "By default WooCommerce will let customers choose other shipping methods than "
 "free shipping (if available). This option will force free shipping if "
@@ -1615,18 +1635,18 @@ msgstr ""
 "Versand, sobald dieser verfügbar ist."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:939
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:948
 msgid "Hide taxes estimated"
 msgstr "Hinweis \"Steuern geschätzt\""
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:940
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:949
 msgid ""
 "Do you want to hide the \"taxes and shipping estimated\" text from your cart?"
 msgstr "Den Hinweis \"Versandkosten und Steuern werden geschätzt\" entfernen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:944
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:953
 msgid ""
 "By default WooCommerce adds a \"taxes and shipping estimated\" text to your "
 "cart. This might puzzle your customers and may not meet german law."
@@ -1636,17 +1656,17 @@ msgstr ""
 "Markt geeignet."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:948
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:957
 msgid "Show Thumbnails"
 msgstr "Thumbnails anzeigen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:949
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:958
 msgid "Show product thumbnails on checkout page?"
 msgstr "Produktbilder im Checkout darstellen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:953
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:962
 msgid ""
 "Uncheck if you don't want to show your product thumbnails within checkout "
 "table."
@@ -1655,17 +1675,17 @@ msgstr ""
 "bekommen möchtest."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:957
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:966
 msgid "Hide Shipping Select"
 msgstr "Versandarten Auswahl"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:958
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:967
 msgid "Hide shipping rate selection from checkout?"
 msgstr "Die Auswahl von Versandarten im Checkout deaktivieren?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:962
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:971
 msgid ""
 "This option will hide shipping rate selection from checkout. By then "
 "customers will only be able to change their shipping rate on cart page."
@@ -1675,18 +1695,18 @@ msgstr ""
 "Versandmethode ändern."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:966
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:975
 msgid "Show back to cart button"
 msgstr "Bestellung bearbeiten"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:967
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:976
 msgid "Show back to cart button within your checkout table?"
 msgstr ""
 "Einen \"Bestellung bearbeiten\" Button in der Bestellübersicht anzeigen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:971
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:980
 msgid ""
 "This button may let your customer edit their order before submitting. Some "
 "people state that this button should be hidden to avoid legal problems."
@@ -1698,28 +1718,28 @@ msgstr ""
 "keine weitere Informationen abgedruckt werden sollten."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:975
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:984
 msgid "Show edit data notice"
 msgstr "Bestellung prüfen Hinweis"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:976
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:985
 msgid "Show a \"check-your-entries\" notice to the user?"
 msgstr "Einen \"Bestellung prüfen\" Hinweis anzeigen?"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:980
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:989
 msgid "This notice will be added right before the order comments field."
 msgstr ""
 "Dieser Hinweis wird direkt oberhalb des Bestellhinweise-Feldes eingefügt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:984
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:993
 msgid "Checkout Table Color"
 msgstr "Hintergrundfarbe der Tabelle"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:986
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:995
 msgid ""
 "Choose the color of your checkout product table. This table should be "
 "highlighted within your checkout page."
@@ -1728,17 +1748,17 @@ msgstr ""
 "Tabelle sollte sich farblich vom Rest des Inhalts abheben."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:992
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1001
 msgid "Checkout Legal Display"
 msgstr "Checkbox oder Text"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:993
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1002
 msgid "Use Text without Checkbox"
 msgstr "Rechtshinweis ohne Checkbox."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:995
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1004
 msgid ""
 "This version will remove checkboxes from Checkout and display a text "
 "instead. This seems to be legally compliant (Zalando & Co are using this "
@@ -1749,12 +1769,12 @@ msgstr ""
 "diese Form)"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1001
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1010
 msgid "Legal Text"
 msgstr "Rechtlicher Hinweistext"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1002
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1011
 msgid ""
 "Choose a Plain Text which will be shown right above checkout submit button. "
 "Use {term_link}{/term_link}, {data_security_link}{/data_security_link}, "
@@ -1767,7 +1787,7 @@ msgstr ""
 "revocation_link} um die jeweiligen Links zu den Seiten einzufügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1004
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1013
 msgid ""
 "With your order, you agree to have read and understood our {term_link}Terms "
 "and Conditions{/term_link} and your {revocation_link}Right of Recission{/"
@@ -1778,12 +1798,12 @@ msgstr ""
 "revocation_link} einverstanden."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1011
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1020
 msgid "Legal Text Error"
 msgstr "Fehlermeldung der Checkbox"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1012
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1021
 msgid ""
 "If you have chosen to use checkbox validation please choose a error message "
 "which will be shown if the user doesn't check checkbox. Use {term_link}{/"
@@ -1798,7 +1818,7 @@ msgstr ""
 "revocation_link}"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1014
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1023
 msgid ""
 "To finish the order you have to accept to our {term_link}Terms and "
 "Conditions{/term_link} and {revocation_link}Right of Recission{/"
@@ -1808,17 +1828,17 @@ msgstr ""
 "term_link} und {revocation_link}Widerrufsbestimmungen{/revocation_link}."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1021
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1030
 msgid "Show digital notice"
 msgstr "Checkbox digitale Produkte"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1022
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1031
 msgid "Show checkbox for digital products."
 msgstr "Checkbox bei digitalen Produkten anzeigen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1023
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1032
 msgid ""
 "Disable this option if you want your customers to obtain their right of "
 "recission even if digital products are being bought."
@@ -1828,12 +1848,12 @@ msgstr ""
 "werden, dass im Falle von digitalen Produkten das Widerrufsrecht erlischt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1030
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1039
 msgid "Digital Product types"
 msgstr "Digitale Produkttypen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1031
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1040
 msgid ""
 "Select product types for which the loss of recission notice is shown. "
 "Product types like \"simple product\" may be redudant because they include "
@@ -1845,12 +1865,12 @@ msgstr ""
 "einschließen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1041
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1050
 msgid "Legal Digital Text"
 msgstr "Hinweis Digital"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1042
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1051
 msgid ""
 "Choose a Plain Text which will be shown right above checkout submit button "
 "if a user has picked a digital product. See legal text option for possible "
@@ -1861,7 +1881,7 @@ msgstr ""
 "Platzhalter verwenden wie beim Rechtlichen Hinweistext"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1044
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1053
 msgid ""
 "For digital products: I strongly agree that the execution of the agreement "
 "starts before the revocation period has expired. I am aware that my right of "
@@ -1872,13 +1892,13 @@ msgstr ""
 "bekannt, dass mit Beginn der Ausführung mein Widerrufsrecht erlischt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1051
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1060
 msgid "Legal Digital Error"
 msgstr "Fehlermeldung Digital"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1052
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1091
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1061
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1100
 msgid ""
 "This text will be shown as error message if customer has not checked the "
 "corresponding checkbox. See legal text option for possible placeholders."
@@ -1888,7 +1908,7 @@ msgstr ""
 "Hinweistext für eine Liste der Platzhalter."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1054
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1063
 #: includes/wc-gzd-cart-functions.php:317
 msgid ""
 "To retrieve direct access to digital content you have to agree to the loss "
@@ -1898,12 +1918,12 @@ msgstr ""
 "Widerrufsrecht verzichten."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1061
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1070
 msgid "Digital Confirmation Notice"
 msgstr "Digitale Bestätigung"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1062
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1071
 msgid ""
 "This text will be appended to your order processing email if the order "
 "contains digital products. Use placeholders {link}{/link} to insert link to "
@@ -1914,7 +1934,7 @@ msgstr ""
 "Platzhalter {link}{/link} um einen Link zur Widerrufsbelehrung einzufügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1065
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1074
 msgid ""
 "Furthermore you have expressly agreed to start the performance of the "
 "contract for digital items (e.g. downloads) before expiry of the withdrawal "
@@ -1928,17 +1948,17 @@ msgstr ""
 "verlieren."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1071
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1080
 msgid "Show service notice"
 msgstr "Checkbox Dienstleistungen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1072
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1081
 msgid "Show checkbox for service products."
 msgstr "Checkbox bei Dienstleistungen anzeigen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1073
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1082
 msgid ""
 "Disable this option if you want your customers to obtain their right of "
 "recission even if service products are being bought."
@@ -1949,12 +1969,12 @@ msgstr ""
 "Widerrufsfrist mit der Dienstleistung begonnen wird."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1080
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1089
 msgid "Legal Service Text"
 msgstr "Hinweis Dienstleistungen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1081
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1090
 msgid ""
 "Choose a Plain Text which will be shown right above checkout submit button "
 "if a user has picked a service product. See legal text option for possible "
@@ -1965,7 +1985,7 @@ msgstr ""
 "Platzhalter verwenden wie beim Rechtlichen Hinweistext."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1083
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1092
 #: includes/wc-gzd-cart-functions.php:339
 msgid ""
 "For services: I demand and acknowledge the immediate performance of the "
@@ -1978,12 +1998,12 @@ msgstr ""
 "vollständiger Erfüllung des Vertrages erlischt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1090
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1099
 msgid "Legal Service Error"
 msgstr "Fehlermeldung"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1093
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1102
 #: includes/wc-gzd-cart-functions.php:348
 msgid ""
 "To allow the immediate performance of the services you have to agree to the "
@@ -1993,12 +2013,12 @@ msgstr ""
 "Widerrufsfrist zu."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1100
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1109
 msgid "Service Confirmation Notice"
 msgstr "Dienstleistung Bestätigung"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1101
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1110
 msgid ""
 "This text will be appended to your order processing email if the order "
 "contains service products. Use placeholders {link}{/link} to insert link to "
@@ -2009,7 +2029,7 @@ msgstr ""
 "Platzhalter {link}{/link} um einen Link zur Widerrufsbelehrung einzufügen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1104
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1113
 msgid ""
 "Furthermore you have expressly agreed to start the performance of the "
 "contract for services before expiry of the withdrawal period. I have noted "
@@ -2023,18 +2043,18 @@ msgstr ""
 "erlischt."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1110
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1119
 msgid "Parcel Delivery Checkbox"
 msgstr "Paketdienstleister Checkbox"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1111
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1120
 msgid ""
 "Show checkbox for data transmission to third party parcel service providers."
 msgstr ""
 "Checkbox zur Erlaubnis der Datenweitergabe an den Paketdienstleister "
 "einfügen."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1112
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1121
 msgid ""
 "You may optionally choose to show a checkbox which lets the customer accept "
 "data transmission to a third party parcel service provider to receive parcel "
@@ -2048,15 +2068,15 @@ msgstr ""
 "weitergeleitet werden. "
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1119
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1128
 msgid "Checkbox required"
 msgstr "Checkbox verpflichtend"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1120
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1129
 msgid "Make the parcel delivery checkbox a required field."
 msgstr "Paketdienstleister Checkbox zum Pflichtfeld machen?"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1121
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1130
 msgid ""
 "For some reason you may want to force your customers to Opt-In to the data "
 "transmission to a third party parcel service provider."
@@ -2066,11 +2086,11 @@ msgstr ""
 "Fall diese Option aus."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1128
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1137
 msgid "Parcel Delivery Text"
 msgstr "Paketdienstleister Text"
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1129
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1138
 msgid ""
 "Choose a Plain Text which will be shown right next to the corresponding "
 "checkbox to inform the customer about the data being transfered to the third "
@@ -2082,7 +2102,7 @@ msgstr ""
 "den Paketdienstleister. Verwende den Platzhalter {shipping_method_title} um "
 "den Titel der Versandmethoden einzubetten."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1131
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1140
 #: includes/wc-gzd-cart-functions.php:396
 msgid ""
 "Yes, I would like to be reminded via E-mail about parcel delivery "
@@ -2094,26 +2114,26 @@ msgstr ""
 "wird nur für diesen einmaligen Zweck an unseren Paketdienstleister "
 "weitergegeben."
 
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1139
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1148
 msgid "Select shipping methods which are applicable for the Opt-In Checkbox."
 msgstr ""
 "Wähle Versandmethoden aus für die die Paketdienstleister Checkbox angezeigt "
 "werden soll."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1149
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1158
 msgid "Pay now Button"
 msgstr "Jetzt bezahlen Button"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1150
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1159
 msgid "Add a pay now button to emails and order success page."
 msgstr ""
 "Füge einen jetzt bezahlen - Button zur E-Mail und der Bestätigungs-Seite "
 "hinzu."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1151
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1160
 msgid ""
 "Add a pay now button to order confirmation email and order success page if "
 "the order awaits payment (PayPal etc)."
@@ -2123,30 +2143,30 @@ msgstr ""
 "benötigt (z.B. per PayPal)."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1158
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1167
 msgid "Order Success Text"
 msgstr "Bestellung eingegangen"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1159
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1168
 msgid "Choose a custom text to display on order success page."
 msgstr ""
 "Hier kannst du einen individuellen kurzen Text eingeben, der nach der "
 "Bestellung ausgegeben wird."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1167
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1176
 msgid "Order Success Data"
 msgstr "Bestellbestätigungs-Daten"
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1168
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1177
 msgid "Hide product table and customer data on order success page"
 msgstr ""
 "Produktdetails (Tabelle, Kundeninfos) von der Bestätigungsseite entfernen."
 
 # @ woocommerce-germanized
-#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1276
+#: includes/admin/settings/class-wc-gzd-settings-germanized.php:1285
 msgid ""
 "Sorry, but the new Virtual VAT rules cannot be applied to small business."
 msgstr ""
@@ -3191,8 +3211,17 @@ msgctxt "ekomi"
 msgid "eKomi Options"
 msgstr "eKomi"
 
+#: includes/class-wc-gzd-emails.php:75
+msgid "Someone requested a password reset for your account."
+msgstr "Jemand hat das Zurücksetzen des Passworts für Ihren Account beantragt."
+
+#: includes/class-wc-gzd-emails.php:88
+#, php-format
+msgid "Thanks for creating an account on %s."
+msgstr "Danke, dass Sie ein Konto bei %s erstellt haben."
+
 # @ woocommerce-germanized
-#: includes/class-wc-gzd-emails.php:407
+#: includes/class-wc-gzd-emails.php:451
 msgctxt "revocation-form"
 msgid "Forward your Revocation online"
 msgstr "Widerruf online erklären"
@@ -4877,14 +4906,13 @@ msgstr "Einkauf jetzt bewerten"
 
 # @ woocommerce-germanized
 #: templates/emails/customer-new-account-activation.php:18
-#: templates/emails/plain/customer-new-account-activation.php:16
 #, php-format
 msgid ""
-"Thanks for creating an account on %s. Your username is %s. Please follow the "
-"activation link to activate your account:"
+"Thanks for creating an account on %s. Please follow the activation link to "
+"activate your account:"
 msgstr ""
-"Es wurde für Sie ein Benutzerkonto bei %s angelegt. Ihr Benutzername lautet "
-"%s. Bitte folgen Sie dem Link, um Ihr Benutzerkonto zu bestätigen:"
+"Es wurde für Sie ein Benutzerkonto bei %s angelegt. Bitte folgen Sie dem "
+"Link, um Ihr Benutzerkonto zu bestätigen:"
 
 # @ woocommerce-germanized
 #: templates/emails/customer-new-account-activation.php:20
@@ -4981,6 +5009,16 @@ msgstr "Bestellung jetzt bewerten"
 msgid "SEPA Data"
 msgstr "SEPA Daten"
 
+# @ woocommerce-germanized
+#: templates/emails/plain/customer-new-account-activation.php:16
+#, php-format
+msgid ""
+"Thanks for creating an account on %s. Your username is %s. Please follow the "
+"activation link to activate your account:"
+msgstr ""
+"Es wurde für Sie ein Benutzerkonto bei %s angelegt. Ihr Benutzername lautet "
+"%s. Bitte folgen Sie dem Link, um Ihr Benutzerkonto zu bestätigen:"
+
 # @ woocommerce-germanized
 #: templates/footer/sale-info.php:13
 msgid "All striked out prices refer to prices used to be charged at this shop."
@@ -5040,6 +5078,9 @@ msgctxt "trusted-shops"
 msgid "%s custom reviews"
 msgstr "%s Kundenbewertungen"
 
+#~ msgid "[Removed for security reasons]"
+#~ msgstr "[Aus Sicherheitsgründen entfernt]"
+
 # @ woocommerce-germanized
 #~ msgid "Not found within your imprint"
 #~ msgstr "Nicht in deinem Impressum gefunden"
diff --git a/includes/admin/settings/class-wc-gzd-settings-germanized.php b/includes/admin/settings/class-wc-gzd-settings-germanized.php
index 00ad28f58..4164a0007 100644
--- a/includes/admin/settings/class-wc-gzd-settings-germanized.php
+++ b/includes/admin/settings/class-wc-gzd-settings-germanized.php
@@ -628,6 +628,15 @@ public function get_email_settings() {
 
 		$settings = array_merge( $settings, array(
 
+			array(
+				'title' 	=> __( 'Hide Username', 'woocommerce-germanized' ),
+				'desc' 		=> __( 'Hide username from email content if password or password reset link is embedded.', 'woocommerce-germanized' ),
+				'desc_tip'  => __( 'Trusted Shops advises to not show the username together with an account password or password reset link. This option hides (or masks) the username in those specific cases.', 'woocommerce-germanized' ),
+				'id' 		=> 'woocommerce_gzd_hide_username_with_password',
+				'default'	=> 'yes',
+				'type' 		=> 'checkbox',
+			),
+
 			array( 'type' => 'sectionend', 'id' => 'email_options' ),
 
 			array(	'title' => __( 'Email Attachment Options', 'woocommerce-germanized' ), 'type' => 'title', 'id' => 'email_attachment_options', 'desc' => '<div class="notice inline notice-warning"><p>' . sprintf( __( 'Want to attach automatically generated PDF files to emails instead of plain text? %sUpgrade to %spro%s%s', 'woocommerce-germanized' ), '<a style="margin-left: 1em" href="https://vendidero.de/woocommerce-germanized" class="button">', '<span class="wc-gzd-pro">', '</span>', '</a>' ) . '</p></div>' ),
diff --git a/includes/class-wc-gzd-emails.php b/includes/class-wc-gzd-emails.php
index cd7c219f7..7d6642743 100644
--- a/includes/class-wc-gzd-emails.php
+++ b/includes/class-wc-gzd-emails.php
@@ -38,14 +38,57 @@ public function __construct() {
 
         // Change email template path if is germanized email template
 		add_filter( 'woocommerce_template_directory', array( $this, 'set_woocommerce_template_dir' ), 10, 2 );
-
 		// Map partially refunded order mail template to correct email instance
         add_filter( 'woocommerce_gzd_email_template_id_comparison', array( $this, 'check_for_partial_refund_mail' ), 10, 3 );
+        // Hide username if an email contains a password or password reset link (TS advises to do so)
+        if ( 'yes' === get_option( 'woocommerce_gzd_hide_username_with_password' ) )
+            add_filter( 'woocommerce_before_template_part', array( $this, 'maybe_set_gettext_username_filter' ), 10, 4 );
 
         if ( is_admin() )
 		    $this->admin_hooks();
 	}
 
+	public function maybe_set_gettext_username_filter( $template_name, $template_path, $located, $args ) {
+
+		$templates = array(
+			'emails/customer-reset-password.php' => 'maybe_hide_username_password_reset',
+			'emails/plain/customer-reset-password.php' => 'maybe_hide_username_password_reset',
+		);
+
+		// If the password is generated automatically and sent by email, hide the username
+		if ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) ) {
+			$templates = array_merge( $templates, array(
+				'emails/customer-new-account.php' => 'maybe_hide_username_new_account',
+				'emails/plain/customer-new-account.php' => 'maybe_hide_username_new_account'
+			) );
+		}
+
+		if ( isset( $templates[ $template_name ] ) ) {
+			add_filter( 'gettext', array( $this, $templates[ $template_name ] ), 10, 3 );
+		}
+	}
+
+	public function maybe_hide_username_password_reset( $translated, $original, $domain ) {
+		if ( 'woocommerce' === $domain ) {
+			if ( 'Someone requested that the password be reset for the following account:' === $original ) {
+				return __( 'Someone requested a password reset for your account.', 'woocommerce-germanized' );
+			} else if ( 'Username: %s' === $original ) {
+				remove_filter( 'gettext', array( $this, 'maybe_hide_username_password_reset' ), 10, 3 );
+				return '';
+			}
+		}
+
+		return $translated;
+	}
+
+	public function maybe_hide_username_new_account( $translated, $original, $domain ) {
+		if ( 'woocommerce' === $domain && 'Thanks for creating an account on %s. Your username is <strong>%s</strong>' === $original ) {
+			remove_filter( 'gettext', array( $this, 'maybe_hide_username_new_account' ), 10, 3 );
+			return __( 'Thanks for creating an account on %s.', 'woocommerce-germanized' );
+		}
+		return $translated;
+	}
+
 	public function check_for_partial_refund_mail( $result, $mail_id, $tpl ) {
 
 		if ( $mail_id === 'customer_partially_refunded_order' && $tpl === 'customer_refunded_order' )
diff --git a/readme.txt b/readme.txt
index c0f2f3011..11141cc50 100644
--- a/readme.txt
+++ b/readme.txt
@@ -171,6 +171,7 @@ Bug reports may be filed via our [GitHub repository](https://github.com/vendider
 * Fix - Small Business VAT total tax removal (as Trusted Shops advised)
 * Fix - FontAwesome Update to latest version
 * Fix - Use frontend options filter for admin billing_title field
+* Fix - By default remove username from password reset, new account mail if password or reset link is included (Trusted Shops advised)
 
 = 1.8.6 =
 * Fix - plugin_locale filter in WC_GZD_Install
diff --git a/templates/emails/customer-new-account-activation.php b/templates/emails/customer-new-account-activation.php
index 78df9cba4..7a701b5ce 100644
--- a/templates/emails/customer-new-account-activation.php
+++ b/templates/emails/customer-new-account-activation.php
@@ -15,7 +15,7 @@
 
 <?php do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
-<p><?php printf( __( "Thanks for creating an account on %s. Your username is %s. Please follow the activation link to activate your account:", 'woocommerce-germanized' ), esc_html( $blogname ), '<strong>' . esc_html( $user_login ) . '</strong>' ); ?></p>
+<p><?php printf( __( "Thanks for creating an account on %s. Please follow the activation link to activate your account:", 'woocommerce-germanized' ), esc_html( $blogname ) ); ?></p>
 
 <p><a class="wc-button button" href="<?php echo esc_attr( $user_activation_url );?>"><?php _e( 'Activate your account', 'woocommerce-germanized' );?></a></p>
 
diff --git a/templates/emails/plain/customer-new-account-activation.php b/templates/emails/plain/customer-new-account-activation.php
index 10002e85a..f5d3aa62b 100644
--- a/templates/emails/plain/customer-new-account-activation.php
+++ b/templates/emails/plain/customer-new-account-activation.php
@@ -13,7 +13,7 @@
 
 echo "= " . $email_heading . " =\n\n";
 
-echo sprintf( __( "Thanks for creating an account on %s. Your username is %s. Please follow the activation link to activate your account:", 'woocommerce-germanized' ), esc_html( $blogname ), esc_html( $user_login ) ) . "\n\n";
+echo sprintf( __( "Thanks for creating an account on %s. Please follow the activation link to activate your account:", 'woocommerce-germanized' ), esc_html( $blogname ) ) . "\n\n";
 
 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";