Merge branch 'worktree-agent-a485466ca7cbcab9d'

47 files changed, 113 insertions, 118 deletions

diff --git a/views/admin/access.phtml b/views/admin/access.phtml
index 9e41787..b1b40c2 100644
--- a/views/admin/access.phtml
+++ b/views/admin/access.phtml
@@ -34,7 +34,7 @@
 						<tr>

 							<th class="wpsg_col_capname"></th>

 							<?php foreach ($arRoles as $role_key => $r) { ?>

-							<th class="wpsg_col_cap"><?php echo $r['name']; ?></th>

+							<th class="wpsg_col_cap"><?php echo esc_html(translate_user_role($r['name'])); ?></th>

 							<?php } ?>

 							<th></th>

 						</tr>

diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml
index 5337038..6894fc3 100644
--- a/views/admin/emailconf.phtml
+++ b/views/admin/emailconf.phtml
@@ -27,7 +27,7 @@
 

 		<?php wp_nonce_field('wpsg-admin-emailconf'); ?>

 		

-		<?php echo wpsg_drawForm_AdminboxStart('Allgemeine Einstellungen', 'wpsg'); ?>

+		<?php echo wpsg_drawForm_AdminboxStart(__('Allgemeine Einstellungen', 'wpsg')); ?>

 		<?php $logoPath = wpsg_getUploadDir('wpsg_mailconf').'wpsg_email_logo.jpg'; ?>

 

 		<?php echo wpsg_drawForm_Checkbox(

diff --git a/views/admin/ueber.phtml b/views/admin/ueber.phtml
index 90650c2..fc22d69 100644
--- a/views/admin/ueber.phtml
+++ b/views/admin/ueber.phtml
@@ -72,7 +72,7 @@
 				<?php echo $plugin_data['Name']; ?> / <?php echo $plugin_data['Version']; ?><br />

 				<?php } ?>

 

-	<?php echo wpsg_drawForm_TextEnd(__('aktive Wordpress Plugins', 'wpsg')); ?>

+	<?php echo wpsg_drawForm_TextEnd(__('aktive WordPress-Plugins', 'wpsg')); ?>

 

 	<?php wpsg_drawForm_TextStart(); ?>

 				<?php if (wpsg_isSizedArray($this->get_option('wpsg_plugintest_active_plugins'))) { ?>

diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml
index b811ae4..68dba26 100644
--- a/views/mailtemplates/html/customer.phtml
+++ b/views/mailtemplates/html/customer.phtml
@@ -93,7 +93,7 @@
 	</tr>

 	<tr>

 		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Straße', 'wpsg'); ?>:</td>

-		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(($this->view['basket']['checkout']['nr']))); ?></td>

+		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??''))); ?></td>

 	</tr>

 	<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>

 	<tr>

diff --git a/views/mailtemplates/html/kundenmail.phtml b/views/mailtemplates/html/kundenmail.phtml
index f4e1eff..c6d152b 100644
--- a/views/mailtemplates/html/kundenmail.phtml
+++ b/views/mailtemplates/html/kundenmail.phtml
@@ -28,8 +28,8 @@
 <p><?php echo $this->view['basket']['checkout']['comment'] ?></p>

 <?php } ?>

 

-<p><?php echo __('Wir bedanken uns fuer Ihre Bestellung.', 'wpsg'); ?></p>

-<p><?php echo __('Bitte beachten Sie, dass es sich bei dieser E-Mail um eine Bestellbestaetigung und keine bindende Auftragsbestaetigung handelt. Preisirrtuemer sind leider nicht vollstaendig auszuschliessen.', 'wpsg'); ?></p>

+<p><?php echo __('Wir bedanken uns für Ihre Bestellung.', 'wpsg'); ?></p>

+<p><?php echo __('Bitte beachten Sie, dass es sich bei dieser E-Mail um eine Bestellbestätigung und keine bindende Auftragsbestätigung handelt. Preisirrtümer sind leider nicht vollständig auszuschließen.', 'wpsg'); ?></p>

 <p><?php echo wpsg_translate(__('Es gelten unsere <a href="#1#">Allgemeinen Geschaeftsbedingungen</a> (<a href="#1#">AGB</a>).', 'wpsg'), $this->getURL(wpsg_ShopController::URL_AGB)); ?></p>  

   

 <?php $this->CallMods('kundenmail_afteragb', array(&$this->view['basket']['checkout']['o_id'])); ?>

diff --git a/views/mailtemplates/kundenmail.phtml b/views/mailtemplates/kundenmail.phtml
index 634dddd..ce7acae 100644
--- a/views/mailtemplates/kundenmail.phtml
+++ b/views/mailtemplates/kundenmail.phtml
@@ -91,9 +91,9 @@
  

 <?php } ?>

 

-<?php echo __('Wir bedanken uns fuer Ihre Bestellung.', 'wpsg'); ?> 

+<?php echo __('Wir bedanken uns für Ihre Bestellung.', 'wpsg'); ?> 

  

-<?php echo __('Bitte beachten Sie, dass es sich bei dieser E-Mail um eine Bestellbestaetigung und keine bindende Auftragsbestaetigung handelt. Preisirrtuemer sind leider nicht vollstaendig auszuschliessen.', 'wpsg'); ?>

+<?php echo __('Bitte beachten Sie, dass es sich bei dieser E-Mail um eine Bestellbestätigung und keine bindende Auftragsbestätigung handelt. Preisirrtümer sind leider nicht vollständig auszuschließen.', 'wpsg'); ?>

  

 <?php echo __('Es gelten unsere Allgemeinen Geschaeftsbedingungen (AGB).', 'wpsg'); ?>  

  

diff --git a/views/mods/mod_amazon_v2/settings_edit.phtml b/views/mods/mod_amazon_v2/settings_edit.phtml
index 16a6dcd..7366201 100644
--- a/views/mods/mod_amazon_v2/settings_edit.phtml
+++ b/views/mods/mod_amazon_v2/settings_edit.phtml
@@ -8,7 +8,7 @@
 

 <?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_seller_id', __('Händler-ID', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_seller_id'), array('help' => 'wpsg_mod_amazon_v2_seller_id')); ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_store_id', __('Store ID', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_store_id'), []); ?>

-<?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_public_key_id', __('ID des öffentlichen Schlüsels / Public Key ID', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_public_key_id'), []); ?>

+<?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_public_key_id', __('ID des öffentlichen Schlüssels / Public Key ID', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_public_key_id'), []); ?>

 <?php echo wpsg_drawForm_Upload('wpsg_mod_amazon_v2_private_key', __('Privater Schlüssel (.pem Datei)', 'wpsg')); ?>

 

 <br />

diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
index 41f5d67..47dfc1a 100644
--- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
+++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
@@ -130,7 +130,7 @@
 

 <?php $this->callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?>

 

-<?php echo __('Wir bedanken uns fuer Ihre Bestellung.', 'wpsg'); ?> 

+<?php echo __('Wir bedanken uns für Ihre Bestellung.', 'wpsg'); ?> 

  

 <?php echo __('Es gelten unsere Allgemeinen Geschaeftsbedingungen (AGB).', 'wpsg'); ?>  

  

diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml
index c36f4a2..3628d45 100644
--- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml
+++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml
@@ -30,7 +30,7 @@
 

 <br />

 

-<p><?php echo __('Wir bedanken uns fuer Ihre Bestellung.', 'wpsg'); ?></p>

+<p><?php echo __('Wir bedanken uns für Ihre Bestellung.', 'wpsg'); ?></p>

 

 <p><?php echo wpsg_translate(__('Es gelten unsere <a href="#1#">Allgemeinen Geschaeftsbedingungen</a> (<a href="#1#">AGB</a>).', 'wpsg'), $this->getURL(wpsg_ShopController::URL_AGB)); ?></p>  

    

diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml
index 0ecffe7..0761c24 100644
--- a/views/mods/mod_deliverynote/settings_edit.phtml
+++ b/views/mods/mod_deliverynote/settings_edit.phtml
@@ -163,7 +163,7 @@
 

 			<div class="info">

 				<p>

-					<?php echo __('Hier können Sie Texte vordefinieren, die sie unter den Lieferschein setzen können.', 'wpsg'); ?>

+					<?php echo __('Hier können Sie Texte vordefinieren, die Sie unter den Lieferschein setzen können.', 'wpsg'); ?>

 				</p>

 			</div>

 

diff --git a/views/mods/mod_deliverytime/product_bottom.phtml b/views/mods/mod_deliverytime/product_bottom.phtml
index 3412e52..a1a7c91 100755
--- a/views/mods/mod_deliverytime/product_bottom.phtml
+++ b/views/mods/mod_deliverytime/product_bottom.phtml
@@ -20,15 +20,15 @@
 
 	<div class="wpsg_mod_deliverytime wpsg_mod_deliverytime_product_bottom">
 		<span class="fa fa-calendar-minus-o"></span>
-		<span class="label label_deliverytime_product">Verfügbarkeit: </span>
-		<span class="label_deliverytime"><?php echo __('sofort Verfügbar', 'wpsg') ;?></span>
+		<span class="label label_deliverytime_product"><?php echo __('Verfügbarkeit:', 'wpsg'); ?> </span>
+		<span class="label_deliverytime"><?php echo __('sofort verfügbar', 'wpsg') ;?></span>
 	</div>
 	
 <?php } else { ?>
 
 	<div class="wpsg_mod_deliverytime wpsg_mod_deliverytime_product_bottom">
 		<span class="fa fa-calendar-minus-o"></span>
-		<span class="label label_deliverytime_product">Verfügbarkeit: </span>
+		<span class="label label_deliverytime_product"><?php echo __('Verfügbarkeit:', 'wpsg'); ?> </span>
 		<span class="label_deliverytime"><?php echo wpsg_translate(__('Lieferbar in #1# Tagen', 'wpsg'), $days_between); ?></span>
 	</div>
 
diff --git a/views/mods/mod_downloadplus/settings_edit.phtml b/views/mods/mod_downloadplus/settings_edit.phtml
index 71b945a..70412b1 100644
--- a/views/mods/mod_downloadplus/settings_edit.phtml
+++ b/views/mods/mod_downloadplus/settings_edit.phtml
@@ -91,14 +91,14 @@
         <div role="tabpanel" class="tab-pane" id="tab4">

 

             <p>

-				<?php echo __('Das Downloadplus Modul ist eine erweiterung des Downloadprodukt Moduls und ermöglicht das Individualisieren von PDF Dokumenten.', 'wpsg'); ?>

+				<?php echo __('Das Downloadplus Modul ist eine Erweiterung des Downloadprodukt Moduls und ermöglicht das Individualisieren von PDF Dokumenten.', 'wpsg'); ?>

 			</p>

 			<p>

 				<?php echo __('Weitere Informationen erhalten Sie auf der <a href="http://wpshopgermany.de/?p=1426">Hilfe Seite</a> oder in unserem <a href="http://forum.maennchen1.de">Support Forum</a>.', 'wpsg'); ?>

 			</p>

 

 			<p>

-				<?php echo __('Eintrag in der Crontab:', 'wpsg'); ?>:<br /><br />

+				<?php echo __('Eintrag in der Crontab:', 'wpsg'); ?><br /><br />

 				<span style="font-weight:bold; font-family:monospace;">

 					*/5   *   *   *  *    wget -q --spider <?php echo site_url().'/?wpsg_cron=1'; ?>

 				</span>

diff --git a/views/mods/mod_export/profil.phtml b/views/mods/mod_export/profil.phtml
index 0d29381..0c987e9 100644
--- a/views/mods/mod_export/profil.phtml
+++ b/views/mods/mod_export/profil.phtml
@@ -21,32 +21,32 @@
             

             <?php echo wpsg_drawForm_Text(__('Profilname', 'wpsg'), $this->view['profil']['name'], 'name', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

             <?php echo wpsg_drawForm_Text(__('Dateiname', 'wpsg'), $this->view['profil']['filename'], 'filename', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

-            <?php echo wpsg_drawForm_Text(__('Encoding', 'wpsg'), $this->view['arFileEncoding'][$this->view['profil']['file_encoding']], 'file_encoding', array('inlineEdit' => true, 'inlineEdit_type' => 'select', 'inlineEdit_source' => $this->view['arFileEncoding'], 'inlineEdit_url' => $inlineEdit_url)); ?>

+            <?php echo wpsg_drawForm_Text(__('Zeichenkodierung', 'wpsg'), $this->view['arFileEncoding'][$this->view['profil']['file_encoding']], 'file_encoding', array('inlineEdit' => true, 'inlineEdit_type' => 'select', 'inlineEdit_source' => $this->view['arFileEncoding'], 'inlineEdit_url' => $inlineEdit_url)); ?>

             <?php echo wpsg_drawForm_Text(__('Dateiformat', 'wpsg'), $this->view['arExportFormats'][$this->view['profil']['format']], 'format', array('inlineEdit' => true, 'inlineEdit_type' => 'select', 'inlineEdit_source' => $this->view['arExportFormats'], 'inlineEdit_url' => $inlineEdit_url)); ?>

             

             <?php /* CSV */ ?>

             <div class="wpsg_mod_export_format wpsg_mod_export_format_<?php echo wpsg_mod_export::FORMAT_CSV; ?>" style="display:<?php echo (($this->view['profil']['format'] == wpsg_mod_export::FORMAT_CSV)?'block':'none'); ?>;">

                 

-                <?php echo wpsg_drawForm_Text('Feld-Trennzeichen', $this->view['profil']['field_delimiter'], 'field_delimiter', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

-                <?php echo wpsg_drawForm_Text('Feld-Begrenzung', $this->view['profil']['field_enclosure'], 'field_enclosure', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

-                <?php echo wpsg_drawForm_Text('Maskierungs-Zeichen', $this->view['profil']['field_escape'], 'field_escape', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

+                <?php echo wpsg_drawForm_Text(__('Feld-Trennzeichen', 'wpsg'), $this->view['profil']['field_delimiter'], 'field_delimiter', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

+                <?php echo wpsg_drawForm_Text(__('Feld-Begrenzung', 'wpsg'), $this->view['profil']['field_enclosure'], 'field_enclosure', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

+                <?php echo wpsg_drawForm_Text(__('Maskierungs-Zeichen', 'wpsg'), $this->view['profil']['field_escape'], 'field_escape', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

                 

             </div>

             

             <?php /* XML */ ?>

             <div class="wpsg_mod_export_format wpsg_mod_export_format_<?php echo wpsg_mod_export::FORMAT_XML; ?>" style="display:<?php echo (($this->view['profil']['format'] == wpsg_mod_export::FORMAT_XML)?'block':'none'); ?>;">

             

-                <?php echo wpsg_drawForm_Text('Root-Tagname', $this->view['profil']['xml_roottag'], 'xml_roottag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

+                <?php echo wpsg_drawForm_Text(__('Root-Tagname', 'wpsg'), $this->view['profil']['xml_roottag'], 'xml_roottag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

                 

                 <?php if ($this->view['profil']['export_type'] === wpsg_mod_export::TYPE_ORDER) { ?>

-                    <?php echo wpsg_drawForm_Text('Bestellung-Tagname', $this->view['profil']['xml_ordertag'], 'xml_ordertag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

-                    <?php echo wpsg_drawForm_Text('Produkt-Root-Tagname', $this->view['profil']['xml_productroottag'], 'xml_productroottag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

+                    <?php echo wpsg_drawForm_Text(__('Bestellung-Tagname', 'wpsg'), $this->view['profil']['xml_ordertag'], 'xml_ordertag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

+                    <?php echo wpsg_drawForm_Text(__('Produkt-Root-Tagname', 'wpsg'), $this->view['profil']['xml_productroottag'], 'xml_productroottag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

                 <?php } ?>

                 

                 <?php if ($this->view['profil']['export_type'] === wpsg_mod_export::TYPE_CUSTOMER) { ?>

-                    <?php echo wpsg_drawForm_Text('Kunden-Tagname', $this->view['profil']['xml_customertag'], 'xml_customertag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

+                    <?php echo wpsg_drawForm_Text(__('Kunden-Tagname', 'wpsg'), $this->view['profil']['xml_customertag'], 'xml_customertag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

                 <?php } else { ?>

-                    <?php echo wpsg_drawForm_Text('Produkt-Tagname', $this->view['profil']['xml_producttag'], 'xml_producttag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

+                    <?php echo wpsg_drawForm_Text(__('Produkt-Tagname', 'wpsg'), $this->view['profil']['xml_producttag'], 'xml_producttag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>

                 <?php } ?>

                 

             </div>

@@ -104,7 +104,7 @@
                     <?php echo wpsg_drawForm_Text(__('Cron URL', 'wpsg'), '<a href="'.site_url().'/?wpsg_cron=1">'.site_url().'/?wpsg_cron=1</a>', false, array('noP' => false)); ?>

                 </fieldset>

 

-                <?php echo wpsg_drawForm_Checkbox('wp_cron', __('Stündlich mit Wordpress Cron ausführen', 'wpsg'), ($this->view['profil']['wp_cron']??'0') === '1'); ?>

+                <?php echo wpsg_drawForm_Checkbox('wp_cron', __('Stündlich mit WordPress-Cron ausführen', 'wpsg'), ($this->view['profil']['wp_cron']??'0') === '1'); ?>

 

                 <script>

 

diff --git a/views/mods/mod_export/settings_edit.phtml b/views/mods/mod_export/settings_edit.phtml
index b01916d..e3f6b49 100644
--- a/views/mods/mod_export/settings_edit.phtml
+++ b/views/mods/mod_export/settings_edit.phtml
@@ -146,9 +146,9 @@
 	

 </script>

 

-<a title="<?php echo __('Neuens Exportprofil anlegen', 'wpsg'); ?>" href="#" class="" onclick="return wpsg_mod_export_addProfil(<?php echo wpsg_mod_export::TYPE_ORDER; ?>);"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Exportprofil für Bestellungen anlegen', 'wpsg'); ?></a><br />

-<a title="<?php echo __('Neuens Exportprofil anlegen', 'wpsg'); ?>" href="#" class="" onclick="return wpsg_mod_export_addProfil(<?php echo wpsg_mod_export::TYPE_PRODUCT; ?>);"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Exportprofil für Produkte anlegen', 'wpsg'); ?></a><br />

-<a title="<?php echo __('Neuens Exportprofil anlegen', 'wpsg'); ?>" href="#" class="" onclick="return wpsg_mod_export_addProfil(<?php echo wpsg_mod_export::TYPE_CUSTOMER; ?>);"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Exportprofil für Kunden anlegen', 'wpsg'); ?></a>

+<a title="<?php echo __('Neues Exportprofil anlegen', 'wpsg'); ?>" href="#" class="" onclick="return wpsg_mod_export_addProfil(<?php echo wpsg_mod_export::TYPE_ORDER; ?>);"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Exportprofil für Bestellungen anlegen', 'wpsg'); ?></a><br />

+<a title="<?php echo __('Neues Exportprofil anlegen', 'wpsg'); ?>" href="#" class="" onclick="return wpsg_mod_export_addProfil(<?php echo wpsg_mod_export::TYPE_PRODUCT; ?>);"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Exportprofil für Produkte anlegen', 'wpsg'); ?></a><br />

+<a title="<?php echo __('Neues Exportprofil anlegen', 'wpsg'); ?>" href="#" class="" onclick="return wpsg_mod_export_addProfil(<?php echo wpsg_mod_export::TYPE_CUSTOMER; ?>);"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Exportprofil für Kunden anlegen', 'wpsg'); ?></a>

 

 <br /><br />

 

diff --git a/views/mods/mod_klarna/settings_edit.phtml b/views/mods/mod_klarna/settings_edit.phtml
index f192f49..40ef6b4 100644
--- a/views/mods/mod_klarna/settings_edit.phtml
+++ b/views/mods/mod_klarna/settings_edit.phtml
@@ -29,7 +29,7 @@
 
 <br />
 
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_klarna_checkout', __('Zahlungen im Checkout vorauthorisieren', 'wpsg'), $this->get_option('wpsg_mod_klarna_checkout'), array('help' => 'wpsg_mod_klarna_checkout')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_klarna_checkout', __('Zahlungen im Checkout vorautorisieren', 'wpsg'), $this->get_option('wpsg_mod_klarna_checkout'), array('help' => 'wpsg_mod_klarna_checkout')); ?>
 
 <br />
 
diff --git a/views/mods/mod_kundenverwaltung/settings_edit.phtml b/views/mods/mod_kundenverwaltung/settings_edit.phtml
index fe39220..792f968 100644
--- a/views/mods/mod_kundenverwaltung/settings_edit.phtml
+++ b/views/mods/mod_kundenverwaltung/settings_edit.phtml
@@ -14,7 +14,7 @@
 <br />

 

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_showCheckoutRegister', __('Registrierung im Checkout', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegister'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegister')); ?>

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang', __('Registrierungzwang im Checkout', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang', __('Registrierungszwang im Checkout', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang')); ?>

 

 <br />

 

@@ -62,7 +62,7 @@
 

 <br />

 

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_wpuser', __('Wordpress User koppeln', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_wpuser'), array('help' => 'wpsg_mod_kundenverwaltung_wpuser_role')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_wpuser', __('WordPress-Benutzer koppeln', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_wpuser'), array('help' => 'wpsg_mod_kundenverwaltung_wpuser_role')); ?>

 <div id="wpsg_mod_kundenverwaltung_wpuser_layer" style="display:none;">

 	

 	<?php echo wpsg_drawForm_Select('wpsg_mod_kundenverwaltung_wpuser_role', __('Benutzerrolle', 'wpsg'), $this->view['arRoles'], $this->get_option('wpsg_mod_kundenverwaltung_wpuser_role')); ?>

@@ -70,12 +70,12 @@
     

 </div>

 

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_recaptcha_register', __('reCaptcha V2 für Registrierung', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_recaptcha_register'), array('help' => 'wpsg_mod_kundenverwaltung_recaptcha_register')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_recaptcha_register', __('reCAPTCHA v2 für Registrierung', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_recaptcha_register'), array('help' => 'wpsg_mod_kundenverwaltung_recaptcha_register')); ?>

 <div id="wpsg_mod_kundenverwaltung_register_recaptcha_layer" style="display:none;">

     

     <?php echo wpsg_drawForm_Input('wpsg_mod_kundenveraltung_recaptcha_key', __('Websiteschlüssel', 'wpsg'), $this->get_option('wpsg_mod_kundenveraltung_recaptcha_key')); ?>

     <?php echo wpsg_drawForm_Input('wpsg_mod_kundenveraltung_recaptcha_secretkey', __('Geheimer Schlüssel', 'wpsg'), $this->get_option('wpsg_mod_kundenveraltung_recaptcha_secretkey')); ?>

-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_recaptcha_dsgvo_layer', __('DSGVO Layer für das Recaptcha', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_recaptcha_dsgvo_layer')); ?>

+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_recaptcha_dsgvo_layer', __('DSGVO Layer für reCAPTCHA', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_recaptcha_dsgvo_layer')); ?>

     

 </div>

 

diff --git a/views/mods/mod_mollie/order_view_afterpayment.phtml b/views/mods/mod_mollie/order_view_afterpayment.phtml
index e6d4079..95ac4b1 100644
--- a/views/mods/mod_mollie/order_view_afterpayment.phtml
+++ b/views/mods/mod_mollie/order_view_afterpayment.phtml
@@ -24,6 +24,19 @@
 
 	$mod = $this->arModule['wpsg_mod_mollie'];
 
+	$arStatusLabel = [
+		'open' => __('Offen', 'wpsg'),
+		'pending' => __('In Bearbeitung', 'wpsg'),
+		'authorized' => __('Autorisiert', 'wpsg'),
+		'paid' => __('Bezahlt', 'wpsg'),
+		'canceled' => __('Abgebrochen', 'wpsg'),
+		'expired' => __('Abgelaufen', 'wpsg'),
+		'failed' => __('Fehlgeschlagen', 'wpsg')
+	];
+
+	$payment_method_label = $payment_method;
+	foreach ($mod->getMethodList() as $arMethod) { if ($arMethod['id'] === $payment_method) $payment_method_label = $arMethod['name']; }
+
 ?>
 <br />
 
@@ -32,11 +45,11 @@
 <?php } ?>
 
 <?php if (wpsg_isSizedString($payment_status)) { ?>
-<?php echo wpsg_drawForm_Input('', __('Mollie Status', 'wpsg'), $payment_status, ['readonly' => true]); ?>
+<?php echo wpsg_drawForm_Input('', __('Mollie Status', 'wpsg'), ($arStatusLabel[$payment_status] ?? $payment_status), ['readonly' => true]); ?>
 <?php } ?>
 
 <?php if (wpsg_isSizedString($payment_method)) { ?>
-<?php echo wpsg_drawForm_Input('', __('Bei Mollie genutzte Methode', 'wpsg'), $payment_method, ['readonly' => true]); ?>
+<?php echo wpsg_drawForm_Input('', __('Bei Mollie genutzte Methode', 'wpsg'), $payment_method_label, ['readonly' => true]); ?>
 <?php } ?>
 
 <?php if ($payment_sequence === 'first' || $payment_sequence === 'recurring') { ?>
diff --git a/views/mods/mod_nlsatolo/settings_edit.phtml b/views/mods/mod_nlsatolo/settings_edit.phtml
index 8ddb9ba..6edaee3 100644
--- a/views/mods/mod_nlsatolo/settings_edit.phtml
+++ b/views/mods/mod_nlsatolo/settings_edit.phtml
@@ -7,13 +7,13 @@
 ?>

 <?php if ($this->view['plugin_active'] !== true) { ?>

 

-    <div class="wpsg_error"><br /><?php echo __('Das Modul ist nur mit aktiviertem Satollo Newsletter Plugin funktionsfaehig.', 'wpsg'); ?><br /></div>

+    <div class="wpsg_error"><br /><?php echo __('Das Modul ist nur mit aktiviertem Satollo Newsletter Plugin funktionsfähig.', 'wpsg'); ?><br /></div>

 

 <?php } else { ?>

 

     <?php echo wpsg_drawForm_Select('wpsg_mod_nlsatolo_doubleoptin', __('Double Opt-In', 'wpsg'), array('0' => __('Nein', 'wpsg'), '1' => __('Ja', 'wpsg')), $this->get_option('wpsg_mod_nlsatolo_doubleoptin'), array('help' => 'wpsg_mod_nlsatolo_doubleoptin')); ?>

 

     <?php /* Listen werden im Satolo-Newsletter-Plugin unter Subscribers > Listen erstellen > Listen angelegt*/ ?>

-    <?php echo wpsg_drawForm_Select('wpsg_mod_nlsatolo_group', __('Gruppezuordnung nach Registrierung', 'wpsg'), $this->view['arLists'], $this->get_option('wpsg_mod_nlsatolo_group'), array('help' => 'wpsg_mod_nlsatolo_group')); ?>

+    <?php echo wpsg_drawForm_Select('wpsg_mod_nlsatolo_group', __('Gruppenzuordnung nach Registrierung', 'wpsg'), $this->view['arLists'], $this->get_option('wpsg_mod_nlsatolo_group'), array('help' => 'wpsg_mod_nlsatolo_group')); ?>

 

 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_ordervars/checkout_inner_prebutton.phtml b/views/mods/mod_ordervars/checkout_inner_prebutton.phtml
index cbcc59e..99b6c08 100644
--- a/views/mods/mod_ordervars/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_ordervars/checkout_inner_prebutton.phtml
@@ -21,8 +21,7 @@
 				</label>

 				<?php } else { ?>	

 				<label class="wpshopgermany_checkout" for="wpsg_mod_ordervars_<?php echo $ov['id']; ?>">

-					<?php echo $this->callMod('wpsg_mod_ordervars', 'getNameById', array($ov['id'])); ?>

-					<?php if ($ov['pflicht'] == '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+					<?php echo $this->callMod('wpsg_mod_ordervars', 'getNameById', array($ov['id'])); ?><?php if ($ov['pflicht'] == '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label> 

 				<div class="wpsg_mod_ordervars_field">

 					<?php if ($ov['typ'] == '1') { // Auswahlfeld ?>		

diff --git a/views/mods/mod_packagetracking/settings_edit_list.phtml b/views/mods/mod_packagetracking/settings_edit_list.phtml
index 46b1f1b..374c632 100644
--- a/views/mods/mod_packagetracking/settings_edit_list.phtml
+++ b/views/mods/mod_packagetracking/settings_edit_list.phtml
@@ -79,4 +79,4 @@
 <?php } ?>

 

 <br /><br />

-<a href="#" onclick="return wpsg_mod_packagetracking_add();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span>Neuen Anbieter anlegen</a>

+<a href="#" onclick="return wpsg_mod_packagetracking_add();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neuen Anbieter anlegen', 'wpsg'); ?></a>

diff --git a/views/mods/mod_paypalapi/settings_edit.phtml b/views/mods/mod_paypalapi/settings_edit.phtml
index 1a55494..dae43e3 100644
--- a/views/mods/mod_paypalapi/settings_edit.phtml
+++ b/views/mods/mod_paypalapi/settings_edit.phtml
@@ -27,7 +27,7 @@
 <br />
 
 <?php echo wpsg_drawForm_Input('', __('WebHook URL', 'wpsg'), $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypalapi', 'webHook', array(), true), array('readonly' => true, 'help' => 'wpsg_mod_paypal_webhook_url')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_create',  __('Beim speichern versuchen den WebHook anzumelden.', 'wpsg'), 0, array('labelright' => true, 'noDoubleDot' => true, 'help' => 'wpsg_mod_paypal_createwebhook')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_create',  __('Beim Speichern versuchen, den Webhook anzumelden.', 'wpsg'), 0, array('labelright' => true, 'noDoubleDot' => true, 'help' => 'wpsg_mod_paypal_createwebhook')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_webhook_log', __('WebHook Anfragen protokollieren', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_webhook_log'), array('labelright' => true)); ?>
 <div class="layer_wpsg_mod_paypalapi_webhook_log layer_wpsg_mod_paypalapi_webhook_log_1">
 	<?php echo wpsg_drawForm_Input('wpsg_mod_paypalapi_webhook_logfile', '', $this->get_option('wpsg_mod_paypalapi_webhook_logfile'), array('hint' => __('Absoluter Pfad zur Protokolldatei, Schreibrechte beachten.', 'wpsg'))); ?>
@@ -119,7 +119,7 @@
 
 	        if (jQuery(this).val() === 'v2' && wpsg_mod_paypalapi_version === 'v1') {
 
-	            alert('<?php echo __('Beim Wechseln von V1 auf V2 sollte eine neue App im PayPal Developer Intervace angelegt werden.', 'wpsg'); ?>');
+	            alert('<?php echo __('Beim Wechseln von V1 auf V2 sollte eine neue App im PayPal-Entwicklerportal angelegt werden.', 'wpsg'); ?>');
 
             }
 
diff --git a/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml
index 3a790b8..6cbb9bd 100644
--- a/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml
+++ b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml
@@ -17,8 +17,8 @@
 		<p><?php echo __('Bisher wurden keine Produktgruppen angelegt.', 'wpsg'); ?></p>

 		<?php } else { ?>

 		<?php echo wpsg_drawForm_Select('wpsg_productgroup', __('Produktgruppe', 'wpsg'), @$this->view['wpsg_mod_productgroups']['data'], @$this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?>

-		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_von', __('Sticky von', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_von']); ?>

-		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_bis', __('Sticky bis', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_bis']); ?>

+		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_von', __('Hervorheben von', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_von']); ?>

+		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_bis', __('Hervorheben bis', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_bis']); ?>

 		<?php } ?>

 		 

 		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;page=wpsg-Productgroups"><span class="wpsg-glyphicon glyphicon glyphicon-book"></span><?php echo __('Produktgruppenverwaltung', 'wpsg'); ?></a><br />

diff --git a/views/mods/mod_productgroups/settings_edit.phtml b/views/mods/mod_productgroups/settings_edit.phtml
index 2d00f6c..8d1d5e6 100644
--- a/views/mods/mod_productgroups/settings_edit.phtml
+++ b/views/mods/mod_productgroups/settings_edit.phtml
@@ -8,7 +8,7 @@
 <?php echo wpsg_drawForm_Select('wpsg_productgroups_page', __('Produktgruppenübersichtsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_productgroups_page'), array('help' => 'wpsg_mod_productgroups_page')); ?>

 <?php echo wpsg_drawForm_Select('wpsg_productgroups_page_layout', __('Layout der Übersichtsseite', 'wpsg'), [

     '0' => 'Layout 1 (show.phtml)',

-    '1' => 'Layout 2 (show_2.phml)'

+    '1' => 'Layout 2 (show_2.phtml)'

 ], $this->get_option('wpsg_productgroups_page_layout'), ['help' => 'wpsg_productgroups_page_layout']); ?>

 <?php echo wpsg_drawForm_Select('wpsg_productgroups_order', __('Sortierung innerhalb der Gruppe', 'wpsg'), array(

 	'id' => __('Nach ID', 'wpsg'),

diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml
index d85d397..c68ad4f 100644
--- a/views/mods/mod_productvariants/admin_edit.phtml
+++ b/views/mods/mod_productvariants/admin_edit.phtml
@@ -179,10 +179,10 @@
         		<?php } ?>

 

 				<?php if ($this->hasMod('wpsg_mod_weight')) { ?>

-    			<td class="col_stock"><span class="wpsg_editable" id="productvariation_weight_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['weight']); ?></span></td>

+    			<td class="col_stock"><span class="wpsg_editable" id="productvariation_weight_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc(wpsg_ff($vari['weight'])); ?></span></td>

         		<?php } ?>

 				<?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>

-    			<td class="col_stock"><span class="wpsg_editable" id="productvariation_fmenge_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['fmenge']); ?></span></td>

+    			<td class="col_stock"><span class="wpsg_editable" id="productvariation_fmenge_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc(wpsg_ff($vari['fmenge'])); ?></span></td>

         		<?php } ?>

 

     			<?php } ?>

diff --git a/views/mods/mod_productvariants/settings_edit.phtml b/views/mods/mod_productvariants/settings_edit.phtml
index 5495a19..2fc3585 100644
--- a/views/mods/mod_productvariants/settings_edit.phtml
+++ b/views/mods/mod_productvariants/settings_edit.phtml
@@ -31,7 +31,7 @@
 			]); ?>

 			

 			<?php echo wpsg_drawForm_Checkbox('wpsg_vp_product_stock_display', __('Produktbestand statt Variantenbestand anzeigen', 'wpsg'), $this->get_option('wpsg_vp_product_stock_display'), [

-				'hint' => __('Ist diese Option aktiv, so wird im nur der Produktbestand im Produkttemplate (Frontend) angezeigt..', 'wpsg'), 'help' => 'wpsg_vp_product_stock_display'

+				'hint' => __('Ist diese Option aktiv, so wird nur der Produktbestand im Produkttemplate (Frontend) angezeigt.', 'wpsg'), 'help' => 'wpsg_vp_product_stock_display'

 			]); ?>

 			

 		</div>

diff --git a/views/mods/mod_produktartikel/produkt_edit_allgemein.phtml b/views/mods/mod_produktartikel/produkt_edit_allgemein.phtml
index e4a96d6..19973a6 100644
--- a/views/mods/mod_produktartikel/produkt_edit_allgemein.phtml
+++ b/views/mods/mod_produktartikel/produkt_edit_allgemein.phtml
@@ -6,5 +6,5 @@
 	 */

 

 ?>

-<?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel[path]', __('URL Path Segment', 'wpsg'), wpsg_getStr($this->view['data']['post_name']), array('help' => 'wpsg_mod_produktartikel_url_path_seg')); ?>

+<?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel[path]', __('URL-Segment', 'wpsg'), wpsg_getStr($this->view['data']['post_name']), array('help' => 'wpsg_mod_produktartikel_url_path_seg')); ?>

 

diff --git a/views/mods/mod_produktartikel/settings_edit.phtml b/views/mods/mod_produktartikel/settings_edit.phtml
index 02b27dd..5d2eb3c 100644
--- a/views/mods/mod_produktartikel/settings_edit.phtml
+++ b/views/mods/mod_produktartikel/settings_edit.phtml
@@ -6,10 +6,10 @@
 

 ?>

 

-<?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel_pathkey', __('Path Key (Produkte)', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_pathkey'), array('maxlength' => 20, 'help' => 'wpsg_mod_produktartikel_pathkey')); ?>

-<?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel_pathkey_cat', __('Path Key (Kategorien)', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_pathkey_cat'), array('maxlength' => 20, 'help' => 'wpsg_mod_produktartikel_pathkey_cat')); ?>

+<?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel_pathkey', __('URL-Präfix (Produkte)', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_pathkey'), array('maxlength' => 20, 'help' => 'wpsg_mod_produktartikel_pathkey')); ?>

+<?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel_pathkey_cat', __('URL-Präfix (Kategorien)', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_pathkey_cat'), array('maxlength' => 20, 'help' => 'wpsg_mod_produktartikel_pathkey_cat')); ?>

 

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showui', __('Custom Post Type in Wordpress Menü sichtbar', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showui'), array('help' => 'wpsg_mod_produktartikel_showui'))?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showui', __('Beitragstyp im WordPress-Menü sichtbar', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showui'), array('help' => 'wpsg_mod_produktartikel_showui'))?>

 

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_postthumbnail', __('Produktbild als Beitragsbild übergeben', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_postthumbnail'), array('help' => 'wpsg_mod_produktartikel_postthumbnail')); ?>

 

@@ -17,7 +17,7 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showCategory', __('Direkt in den Kategorieansichten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showCategory'), array('help' => 'wpsg_mod_produktartikel_showCategory')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showSearch', __('Direkt in den Suchergebnissen anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showSearch'), array('help' => 'wpsg_mod_produktartikel_showSearch')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showFeed', __('Direkt in den Feeds anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showFeed'), array('help' => 'wpsg_mod_produktartikel_showFeed')); ?>

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_onlyMainQuery', __('Nur Main Query berücksichtigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_onlyMainQuery'), array('help' => 'wpsg_mod_produktartikel_onlyMainQuery')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_onlyMainQuery', __('Nur Hauptabfrage berücksichtigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_onlyMainQuery'), array('help' => 'wpsg_mod_produktartikel_onlyMainQuery')); ?>

 

 <br />

 

@@ -69,15 +69,15 @@
 <?php } ?>

 

 <?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>

-<?php echo wpsg_drawForm_Text(__('Produkttemplate für List Ansicht', 'wpsg'), __('Keine Templatedateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>

+<?php echo wpsg_drawForm_Text(__('Produkttemplate für Listenansicht', 'wpsg'), __('Keine Templatedateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>

 <?php } else { ?>

-<?php echo wpsg_drawForm_Select('wpsg_mod_produktartikel_listtemplate', __('Produkttemplate für List Ansicht', 'wpsg'), wpsg_array_merge(array('-1' => __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_listtemplate')), array('help' => 'mod_produktartikel_listtemplate', 'noKeys1' => true)); ?>

+<?php echo wpsg_drawForm_Select('wpsg_mod_produktartikel_listtemplate', __('Produkttemplate für Listenansicht', 'wpsg'), wpsg_array_merge(array('-1' => __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_listtemplate')), array('help' => 'mod_produktartikel_listtemplate', 'noKeys1' => true)); ?>

 <?php } ?>

 

 <?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>

-<?php echo wpsg_drawForm_Text(__('Produkttemplate für Such Ansicht', 'wpsg'), __('Keine Templatedateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>

+<?php echo wpsg_drawForm_Text(__('Produkttemplate für Suchansicht', 'wpsg'), __('Keine Templatedateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>

 <?php } else { ?>

-<?php echo wpsg_drawForm_Select('wpsg_mod_produktartikel_searchtemplate', __('Produkttemplate für Such Ansicht', 'wpsg'), wpsg_array_merge(array('-1' => __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_searchtemplate')), array('help' => 'mod_produktartikel_searchtemplate', 'noKeys1' => true)); ?>

+<?php echo wpsg_drawForm_Select('wpsg_mod_produktartikel_searchtemplate', __('Produkttemplate für Suchansicht', 'wpsg'), wpsg_array_merge(array('-1' => __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_searchtemplate')), array('help' => 'mod_produktartikel_searchtemplate', 'noKeys1' => true)); ?>

 <?php } ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel_rating', __('Anzahl Bewertungen im Frontend', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_rating'), array('help' => 'wpsg_mod_produktartikel_rating')); ?>

 

diff --git a/views/mods/mod_produktattribute/settings_edit.phtml b/views/mods/mod_produktattribute/settings_edit.phtml
index 1d0e672..761e16b 100644
--- a/views/mods/mod_produktattribute/settings_edit.phtml
+++ b/views/mods/mod_produktattribute/settings_edit.phtml
@@ -120,7 +120,7 @@
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktattribute_showProduct', __('Produktattribut(e) im Produkttemplate anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktattribute_showProduct'), array('help' => 'wpsg_mod_produktattribute_showProduct')); ?>

 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktattribute_showBasket', __('Produktattribut(e) im Warenkorbtemplate anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktattribute_showBasket'), array('help' => 'wpsg_mod_produktattribute_showBasket')); ?>

 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktattribute_showOverview', __('Produktattribut(e) im Bestellübersichtstemplate anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktattribute_showOverview'), array('help' => 'wpsg_mod_produktattribute_showOverview')); ?>

-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktattribute_showMail', __('Produktattribut(e) in Mailemplates anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktattribute_showMail'), array('help' => 'wpsg_mod_produktattribute_showMail')); ?>	

+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktattribute_showMail', __('Produktattribut(e) in Mailtemplates anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktattribute_showMail'), array('help' => 'wpsg_mod_produktattribute_showMail')); ?>	

 		

 		</div>

 	</div>

diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml
index ce9f95d..2d3d606 100644
--- a/views/mods/mod_rechnungen/accounting_pdf.phtml
+++ b/views/mods/mod_rechnungen/accounting_pdf.phtml
@@ -897,7 +897,7 @@
 				}

 				

 				$bvars_name = $this->callMod('wpsg_mod_ordervars', 'getNameById', array($bvars_id));

-				$strBVars .= "\r\n".$bvars_name.": ".$bvars_value;

+				$strBVars .= "\r\n".$bvars_name.((substr($bvars_name, -1) === '?')?' ':': ').$bvars_value;

 				

 			}

 		

diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml
index c5d649c..75a547a 100644
--- a/views/mods/mod_rechnungen/invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/invoice_pdf.phtml
@@ -922,7 +922,7 @@
 				}

 				

 				$bvars_name = $this->callMod('wpsg_mod_ordervars', 'getNameById', array($bvars_id));

-				$strBVars .= "\r\n".$bvars_name.": ".$bvars_value;

+				$strBVars .= "\r\n".$bvars_name.((substr($bvars_name, -1) === '?')?' ':': ').$bvars_value;

 				

 			}

 		

diff --git a/views/mods/mod_rechnungen/settings_edit.phtml b/views/mods/mod_rechnungen/settings_edit.phtml
index a4d12cb..dd3d46b 100644
--- a/views/mods/mod_rechnungen/settings_edit.phtml
+++ b/views/mods/mod_rechnungen/settings_edit.phtml
@@ -198,7 +198,7 @@
 			<br /><br />

 			<div class="info">

 				<p style="line-height:normal;">

-					<?php echo __('Hier können Sie Texte vordefinieren, die sie unter die Rechnung setzen können.', 'wpsg'); ?>

+					<?php echo __('Hier können Sie Texte vordefinieren, die Sie unter die Rechnung setzen können.', 'wpsg'); ?>

 				</p>

 			</div>

 

@@ -298,7 +298,7 @@
 			<?php echo wpsg_drawForm_TextEnd(__('Mögliche Platzhalter für Rechnungen und Rechnungskorrektur', 'wpsg'), array('noP' => true)); ?>

 

 			<?php echo wpsg_drawForm_TextStart(); ?>

-			<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=rebuildInvoice&noheader=1" class="button primary" onclick="return confirm('Sind Sie sich sicher? Dies ist eine Admin Funktion und sollte nur mit bedacht ausgeführt werden. Vorher Backup machen!')">Fehlende Rechnungen mit Rechnunsdaten nachbauen.</a>

+			<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=rebuildInvoice&noheader=1" class="button primary" onclick="return confirm('<?php echo esc_js(__('Sind Sie sich sicher? Dies ist eine Admin-Funktion und sollte nur mit Bedacht ausgeführt werden. Vorher Backup machen!', 'wpsg')); ?>')"><?php echo __('Fehlende Rechnungen mit Rechnungsdaten nachbauen', 'wpsg'); ?></a>

 			<?php echo wpsg_drawForm_TextEnd('Funktionen'); ?>

 			

 		</div>

diff --git a/views/mods/mod_relatedproducts/settings_edit.phtml b/views/mods/mod_relatedproducts/settings_edit.phtml
index 3c6a602..410f078 100644
--- a/views/mods/mod_relatedproducts/settings_edit.phtml
+++ b/views/mods/mod_relatedproducts/settings_edit.phtml
@@ -17,7 +17,7 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_relatedproducts_showAjaxDialog', __('Zubehörprodukte im Warenkorb-Lightbox anpreisen', 'wpsg'), $this->get_option('wpsg_mod_relatedproducts_showAjaxDialog'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialog')); ?>

 <div class="wpsg_mod_relatedproducts_showAjaxDialog_activ" style="display:none;">

 <?php echo wpsg_drawForm_Input('wpsg_mod_relatedproducts_showAjaxDialogLimit', __('Maximale Anzahl an angezeigten Produkten', 'wpsg'), $this->get_option('wpsg_mod_relatedproducts_showAjaxDialogLimit'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialogLimits')); ?>

-<?php echo wpsg_drawForm_Select('wpsg_mod_relatedproducts_showAjaxDialogTemplate', __('Tempalte für die Zubehörprodukte in der Lightbox', 'wpsg'), $this->view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showAjaxDialogTemplate'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialogTemplate')); ?>

+<?php echo wpsg_drawForm_Select('wpsg_mod_relatedproducts_showAjaxDialogTemplate', __('Template für die Zubehörprodukte in der Lightbox', 'wpsg'), $this->view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showAjaxDialogTemplate'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialogTemplate')); ?>

 </div>

 

 <script type="text/javascript">/* <![CDATA[ */

diff --git a/views/mods/mod_request/requestpage.phtml b/views/mods/mod_request/requestpage.phtml
index fa24449..bc6cd8d 100644
--- a/views/mods/mod_request/requestpage.phtml
+++ b/views/mods/mod_request/requestpage.phtml
@@ -187,8 +187,7 @@
 					<tr class="wpsg_row_product_pv">

 						<td class="wpsg_cell_label">

 							<label class="wpsg_checkout" for="wpsg_request_pv_<?php echo $pv['id']; ?>_<?php echo $request_product['product_index']; ?>">

-								<?php echo wpsg_hspc($pv['name']); ?>

-								<?php if (wpsg_isSizedInt($pv['pflicht'])) { ?><span class="wpsg_required">*</span><?php } ?>:

+								<?php echo wpsg_hspc($pv['name']); ?><?php if (wpsg_isSizedInt($pv['pflicht'])) { ?> <span class="wpsg_required">*</span><?php } ?>:

 							</label>

 						</td>

 						<td class="wpsg_cell_value" colspan="<?php echo (2 + $this->view['addColspan']); ?>">

@@ -280,15 +279,13 @@
 			<h2><?php echo __('Kontaktdaten', 'wpsg'); ?></h2>

 		 	

 			<div class="wpsg_checkoutblock" id="wpsg_firma">

-				<label for="wpsg_firma" class="wpsg_checkout"><?php echo __("Firma", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="wpsg_firma" class="wpsg_checkout"><?php echo __("Firma", "wpsg"); ?><?php if ($this->view['pflicht']['firma'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[request][customer][firma]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['firma'])); ?>" />

 			</div>

 		

 			<div class="wpsg_checkoutblock" id="wpsg_anrede">

-				<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>

-				<?php if ($this->view['pflicht']['anrede'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:</label>

+				<label for="wpsg_title" class="wpsg_checkout"><?php echo __('Anrede', 'wpsg'); ?><?php if ($this->view['pflicht']['anrede'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:</label>

 				<select class="<?php echo (($this->view['pflicht']['anrede'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("title", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_title" name="wpsg[request][customer][title]">

 					<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>

 					<?php $i=0; foreach (explode("|", $this->view['pflicht']['anrede_auswahl']) as $t) { ?>

@@ -298,52 +295,45 @@
 			</div>

 			

 			<div class="wpsg_checkoutblock" id="wpsg_vorname">

-				<label for="vname" class="wpsg_checkout"><?php echo __("Vorname", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['vname'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="vname" class="wpsg_checkout"><?php echo __("Vorname", "wpsg"); ?><?php if ($this->view['pflicht']['vname'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[request][customer][vname]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['vname'])); ?>" />		

 			</div>

 			

 			<div class="wpsg_checkoutblock" id="wpsg_name">

-				<label for="name" class="wpsg_checkout"><?php echo __("Name", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="name" class="wpsg_checkout"><?php echo __("Name", "wpsg"); ?><?php if ($this->view['pflicht']['name'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[request][customer][name]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['name'])); ?>" />

 			</div>

 			

 			<div class="wpsg_checkoutblock" id="wpsg_email">

-				<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse", "wpsg"); ?><?php if ($this->view['pflicht']['email'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="email" name="wpsg[request][customer][email]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['email'])); ?>" />

 			</div>

 			

 			<?php if (wpsg_isSizedInt($this->view['pflicht']['emailconfirm'])) { ?>

 			<div class="wpsg_checkoutblock" id="wpsg_email2">

-				<label for="email" class="wpsg_checkout"><?php echo __("E-Mail (Wiederholung)", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="email" class="wpsg_checkout"><?php echo __("E-Mail (Wiederholung)", "wpsg"); ?><?php if ($this->view['pflicht']['email'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="email2" name="wpsg[request][customer][email2]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['email2'])); ?>" />

 			</div>

 			<?php } ?>

 			

 			<div class="wpsg_checkoutblock" id="wpsg_geburtsdatum">

-				<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)',"wpsg"); ?>

-				<?php if ($this->view['pflicht']['geb'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)',"wpsg"); ?><?php if ($this->view['pflicht']['geb'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[request][customer][geb]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['geb'])); ?>" />

 			</div>

 			

 			<div class="wpsg_checkoutblock" id="wpsg_fax">

-				<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['fax'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?><?php if ($this->view['pflicht']['fax'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="fax" name="wpsg[request][customer][fax]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['fax'])); ?>" />

 			</div>

 			

 			<div class="wpsg_checkoutblock" id="wpsg_telefon">

-				<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['tel'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?><?php if ($this->view['pflicht']['tel'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="tel" name="wpsg[request][customer][tel]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['tel'])); ?>" />

 			</div>

@@ -354,12 +344,10 @@
 

 					<div class="wpsg_checkoutblock" id="wpsg_streetnr">

 

-						<label for="strasse" class="street wpsg_checkout"><?php echo __("Straße", "wpsg"); ?>

-							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:				

+						<label for="strasse" class="street wpsg_checkout"><?php echo __("Straße", "wpsg"); ?><?php if ($this->view['pflicht']['strasse'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:				

 							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />

 						</label>

-						<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr', 'wpsg'); ?>

-							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+						<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr', 'wpsg'); ?><?php if ($this->view['pflicht']['strasse'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="nr" name="wpsg[request][customer][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['requestlist']['customer']['nr'])); ?>" />

 						</label>

 						

@@ -367,8 +355,7 @@
 					

 				<?php } else { ?>

 				

-					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?>

-					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?><?php if ($this->view['pflicht']['strasse'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 					</label>

 					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />		

 				

@@ -377,22 +364,19 @@
 			</div>

 		

 			<div class="wpsg_checkoutblock" id="wpsg_postleitzahl">

-				<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['plz'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl", "wpsg"); ?><?php if ($this->view['pflicht']['plz'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[request][customer][plz]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['plz'])); ?>" />

 			</div>

 			

 			<div class="wpsg_checkoutblock" id="wpsg_ort">

-				<label for="ort" class="wpsg_checkout"><?php echo __("Ort", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['ort'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="ort" class="wpsg_checkout"><?php echo __("Ort", "wpsg"); ?><?php if ($this->view['pflicht']['ort'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[request][customer][ort]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['ort'])); ?>" />

 			</div>

 			

 			<div class="wpsg_checkoutblock" id="wpsg_land">

-				<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land", "wpsg"); ?><?php if ($this->view['pflicht']['land'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<select name="wpsg[request][customer][land]" class="<?php echo (($this->view['pflicht']['land'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("land", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_land">

 					<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>

@@ -403,8 +387,7 @@
 			</div>

 			

 			<div class="wpsg_checkoutblock" id="wpsg_ustidnr">

-				<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.", "wpsg"); ?>

-				<?php if ($this->view['pflicht']['ustidnr'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<label for="wpsg_ustidnr" class="wpsg_checkout"><?php echo __("UStIdNr.", "wpsg"); ?><?php if ($this->view['pflicht']['ustidnr'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[request][customer][ustidnr]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['ustidnr'])); ?>" />

 			</div>

diff --git a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
index 8f8a829..1e7563c 100644
--- a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
@@ -52,7 +52,7 @@
 			<?php if ($this->view['pflicht']['name'] != '2') { ?>

 			<div class="wpsg_checkoutblock">

 				<label for="shipping_name" class="wpsg_checkout"><?php echo __("Name:", "wpsg"); ?>

-					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>

 				</label>

 				<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_name]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_name'])); ?>" />

 			</div>

diff --git a/views/mods/mod_shs/settings_edit.phtml b/views/mods/mod_shs/settings_edit.phtml
index ce814b7..fc94581 100644
--- a/views/mods/mod_shs/settings_edit.phtml
+++ b/views/mods/mod_shs/settings_edit.phtml
@@ -38,7 +38,7 @@
 <br />

 

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_mobileversion', __('Mobile Version nutzen', 'wpsg'), $this->get_option('wpsg_mod_shs_mobileversion')); ?>

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_creditcard_cardholder', __('Kartenhinhaber ist Pflichtfeld (Nur Kreditkarte)', 'wpsg'), $this->get_option('wpsg_mod_shs_creditcard_cardholder')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_creditcard_cardholder', __('Karteninhaber ist Pflichtfeld (nur Kreditkarte)', 'wpsg'), $this->get_option('wpsg_mod_shs_creditcard_cardholder')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_creditcard_optionalcardholder', __('Karteninhaber ist Optional (Nur Kreditkarte)', 'wpsg'), $this->get_option('wpsg_mod_shs_creditcard_optionalcardholder')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_creditcard_sslifvisaenrolledu', __('Bei VISA ohne Autorisierung Zahlung erlauben (Nur Kreditkarte / VISA)', 'wpsg'), $this->get_option('wpsg_mod_shs_creditcard_sslifvisaenrolledu')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_directdebit_accountholder', __('Kontoinhaber ist Pflichtfeld (Nur Lastschrift)', 'wpsg'), $this->get_option('wpsg_mod_shs_directdebit_accountholder')); ?>

@@ -46,7 +46,7 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_directdebit_checklist', __('Sperrlistenabfrage (Nur Lastschrift, muss freigeschaltet sein)', 'wpsg'), $this->get_option('wpsg_mod_shs_directdebit_checklist')); ?>

 

 <br />

-<?php echo wpsg_drawForm_Select('wpsg_mod_shs_transactiontype', __('Autorisierung', 'wpsg'), array('preauthorization', 'authorization'), (($this->get_option('wpsg_mod_shs_transactiontype') === '1')?'1':'0'), array('help' => 'wpsg_mod_shs_transactiontype')); ?>

+<?php echo wpsg_drawForm_Select('wpsg_mod_shs_transactiontype', __('Autorisierung', 'wpsg'), array(__('Nur reservieren (Vorautorisierung)', 'wpsg'), __('Reservieren und buchen (Autorisierung)', 'wpsg')), (($this->get_option('wpsg_mod_shs_transactiontype') === '1')?'1':'0'), array('help' => 'wpsg_mod_shs_transactiontype')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_autostart', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_shs_autostart'), array('help' => 'wpsg_mod_shs_autostart')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_autoend', __('Nach Abschluss direkt auf Fehler- bzw. Erfolgsseite leiten', 'wpsg'), $this->get_option('wpsg_mod_shs_autoend'), array('help' => 'wpsg_mod_shs_autoend')); ?>

 <?php echo wpsg_drawForm_Select('wpsg_page_mod_shs_success', __('Erfolgsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_shs_success'), array('help' => 'wpsg_mod_shs_success')); ?>

diff --git a/views/mods/mod_statistics/settings_edit.phtml b/views/mods/mod_statistics/settings_edit.phtml
index 914b045..7585406 100644
--- a/views/mods/mod_statistics/settings_edit.phtml
+++ b/views/mods/mod_statistics/settings_edit.phtml
@@ -46,7 +46,7 @@
 			

 			<br/>

 			

-			<?php echo __('Ermöglicht die Integration des Trackintools "Matomo".', 'wpsg'); ?>

+			<?php echo __('Ermöglicht die Integration des Trackingtools "Matomo".', 'wpsg'); ?>

 			

 			<br/><br/>

 		

@@ -78,17 +78,17 @@
 				<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_checkout_target', __('Matomo ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout_target')); ?>

 			</div>

 			<br />

-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_checkout2', __('Checkout2 tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout2')); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_checkout2', __('Checkout Schritt 2 tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout2')); ?>

 			<div id="wpsg_mod_statistics_piwik_checkout2_layer" style="display: none;">

 				<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_checkout2_target', __('Matomo ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout2_target')); ?>

 			</div>

 			<br />

-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_overview', __('Overview tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_overview')); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_overview', __('Bestellübersicht tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_overview')); ?>

 			<div id="wpsg_mod_statistics_piwik_overview_layer" style="display: none;">

 				<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_overview_target', __('Matomo ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_overview_target')); ?>

 			</div>

 			<br />

-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_done', __('Done tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_done')); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_done', __('Bestellabschluss tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_done')); ?>

 			<div id="wpsg_mod_statistics_piwik_done_layer" style="display: none;">

 				<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_done_target', __('Matomo ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_done_target')); ?>

 			</div>

@@ -218,7 +218,7 @@
 

 		<div role="tabpanel" class="tab-pane" id="tab5">

 			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_line_chart_width', __('Liniendiagramm (Breite in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_line_chart_width'), array('help' => 'wpsg_mod_statistics_line_chart_width')); ?>

-			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_line_chart_height', __('Liniendiagramm (Hoehe in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_line_chart_height'), array('help' => 'wpsg_mod_statistics_line_chart_height')); ?>

+			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_line_chart_height', __('Liniendiagramm (Höhe in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_line_chart_height'), array('help' => 'wpsg_mod_statistics_line_chart_height')); ?>

 			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_pie_chart_width', __('Kuchendiagramm (Breite in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_pie_chart_width'), array('help' => 'wpsg_mod_statistics_pie_chart_width')); ?>

 			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_pie_chart_height', __('Kuchendiagramm (Höhe in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_pie_chart_height'), array('help' => 'wpsg_mod_statistics_pie_chart_height')); ?>

 			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_bar_chart_width', __('Balkendiagramm (Breite in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_bar_chart_width'), array('help' => 'wpsg_mod_statistics_bar_chart_width')); ?>

diff --git a/views/mods/mod_trustedshops/order_view_sidebar.phtml b/views/mods/mod_trustedshops/order_view_sidebar.phtml
index 517305a..223eb5a 100644
--- a/views/mods/mod_trustedshops/order_view_sidebar.phtml
+++ b/views/mods/mod_trustedshops/order_view_sidebar.phtml
@@ -6,7 +6,7 @@
 

 ?>

 

-<?php echo wpsg_drawForm_AdminboxStart(__('Trusted Shps', 'wpsg')); ?>

+<?php echo wpsg_drawForm_AdminboxStart(__('Trusted Shops', 'wpsg')); ?>

 

 	<?php echo wpsg_drawForm_Input('wpsg_mod_trustedshops_set', __('Einwilligung', 'wpsg'), (($this->view['data']['wpsg_mod_trustedshops_set'] == '1')?__('Ja', 'wpsg'):__('Nein', 'wpsg')), array('text' => true, 'help' => 'wpsg_mod_trustedshops_set')); ?>

 

diff --git a/views/mods/mod_trustedshops/settings_edit.phtml b/views/mods/mod_trustedshops/settings_edit.phtml
index 4509817..e6cc08b 100644
--- a/views/mods/mod_trustedshops/settings_edit.phtml
+++ b/views/mods/mod_trustedshops/settings_edit.phtml
@@ -84,7 +84,7 @@
 

 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_trustedshops_reminder', __('Erinnerung', 'wpsg'), $this->get_option('wpsg_mod_trustedshops_reminder'), array('help' => 'wpsg_mod_trustedshops_reminder')); ?>

 			<div id="wpsg_mod_trustedshops_reminder_layer" style="display:none;">

-				<?php echo wpsg_drawForm_Input('wpsg_mod_trustedshops_reminderDays', __('Zeitspanne zum versenden der Erinnerunsmail in Tagen', 'wpsg'), $this->get_option('wpsg_mod_trustedshops_reminderDays'), array('help' => 'wpsg_mod_trustedshops_reminderDays')); ?>

+				<?php echo wpsg_drawForm_Input('wpsg_mod_trustedshops_reminderDays', __('Zeitspanne zum Versenden der Erinnerungsmail in Tagen', 'wpsg'), $this->get_option('wpsg_mod_trustedshops_reminderDays'), array('help' => 'wpsg_mod_trustedshops_reminderDays')); ?>

 			</div>

 

 			<br />

diff --git a/views/mods/mod_userpayment/settings_edit.phtml b/views/mods/mod_userpayment/settings_edit.phtml
index d8e9e8e..c67ccf0 100644
--- a/views/mods/mod_userpayment/settings_edit.phtml
+++ b/views/mods/mod_userpayment/settings_edit.phtml
@@ -81,4 +81,4 @@
 <p class="wpsg_hinweis"><?php echo __('Um eine Zahlvariante zu bearbeiten klicken Sie einfach auf den Namen oder den Rabattwert.', 'wpsg'); ?></p>

 

 <br />

-<a href="#" onclick="return wpsg_addZV();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span>Neue Zahlvariante anlegen</a>

+<a href="#" onclick="return wpsg_addZV();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neue Zahlvariante anlegen', 'wpsg'); ?></a>

diff --git a/views/mods/mod_versandarten/settings_edit.phtml b/views/mods/mod_versandarten/settings_edit.phtml
index adae7d5..5a373e5 100644
--- a/views/mods/mod_versandarten/settings_edit.phtml
+++ b/views/mods/mod_versandarten/settings_edit.phtml
@@ -96,6 +96,6 @@
 		<?php echo $this->mod->va_list(); ?>

 	</div>

 

-	<a href="#" onclick="return wpsg_addVA();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span>Neue Versandart anlegen</a>

+	<a href="#" onclick="return wpsg_addVA();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neue Versandart anlegen', 'wpsg'); ?></a>

 			

 </div>

diff --git a/views/mods/mod_weight/settings_edit.phtml b/views/mods/mod_weight/settings_edit.phtml
index 324cbbd..e05ea1c 100644
--- a/views/mods/mod_weight/settings_edit.phtml
+++ b/views/mods/mod_weight/settings_edit.phtml
@@ -9,7 +9,7 @@
 <br />

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showProduct', __('Im Produkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showProduct'), array('help' => 'wpsg_mod_weight_showProduct')); ?>

 <br />

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showBasket', __('Gesamtgewicht im Warenkorbs anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showBasket'), array('help' => 'wpsg_mod_weight_showBasket')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showBasket', __('Gesamtgewicht im Warenkorb anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showBasket'), array('help' => 'wpsg_mod_weight_showBasket')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showAjaxDialog', __('In der Warenkorb-Lightbox anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showAjaxDialog'), array('help' => 'wpsg_mod_weight_showAjaxDialog')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showBasketProduct', __('Im Warenkorb im Produkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showBasketProduct'), array('help' => 'wpsg_mod_weight_showBasketProduct')); ?>

 <br />

diff --git a/views/mods/mod_willcollect/settings_edit.phtml b/views/mods/mod_willcollect/settings_edit.phtml
index 2b55965..47e3beb 100644
--- a/views/mods/mod_willcollect/settings_edit.phtml
+++ b/views/mods/mod_willcollect/settings_edit.phtml
@@ -16,7 +16,7 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_plzort', __('PLZ/Ort', 'wpsg'), $this->get_option('wpsg_mod_willcollect_plzort'), array('help' => 'wpsg_mod_willcollect_plzort')); ?>

 <br />

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_willcollect_payment', __('Zahlungsart "Barzahlung" aktivieren', 'wpsg'), $this->get_option('wpsg_mod_willcollect_payment'), array('help' => 'wpsg_mod_willcollect_payment')); ?>

-<?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_payment_bezeichnung', __('Bezeichung der Zahlungsart', 'wpsg'), $this->get_option('wpsg_mod_willcollect_payment_bezeichnung'), array('help' => 'wpsg_mod_willcollect_payment_bezeichnung')); ?>

+<?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_payment_bezeichnung', __('Bezeichnung der Zahlungsart', 'wpsg'), $this->get_option('wpsg_mod_willcollect_payment_bezeichnung'), array('help' => 'wpsg_mod_willcollect_payment_bezeichnung')); ?>

 <?php echo wpsg_drawForm_Textarea('wpsg_mod_willcollect_payment_hint', __('Hinweistext der Zahlungsart', 'wpsg'), $this->get_option('wpsg_mod_willcollect_payment_hint'), array('help' => 'wpsg_mod_willcollect_payment_hint')); ?>

 <br />

 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_gebuehr', __('Gebühr/Rabatt (Versandart)', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_willcollect_gebuehr'), true), array('help' => 'wpsg_mod_willcollect_gebuehr','unit' => $this->get_option('wpsg_currency').' / %')); ?>

diff --git a/views/order/view.phtml b/views/order/view.phtml
index ca08416..30681d1 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -112,7 +112,7 @@
 		<?php if ($this->view['oCalculation']->restored) { ?>

 

 			<div id="restored_notice">

-				<strong>Die Berechnung dieser Bestellung wurde rekonstruiert, da zum Bestellzeitpunkt nicht alle Shop Einstellungen erfasst wurden. Bitte überprüfen sie die Berechnung und vergleichen diese ggf. mit dem Bestellprotokoll. </strong>

+				<strong><?php echo __('Die Berechnung dieser Bestellung wurde rekonstruiert, da zum Bestellzeitpunkt nicht alle Shop-Einstellungen erfasst wurden. Bitte überprüfen Sie die Berechnung und vergleichen diese ggf. mit dem Bestellprotokoll.', 'wpsg'); ?></strong>

 			</div>

 			

 		<?php } ?>

diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml
index 974b508..2a101f4 100644
--- a/views/order/view_customerdata.phtml
+++ b/views/order/view_customerdata.phtml
@@ -37,7 +37,7 @@
                 <?php } ?>

                 <br />

                 <?php if ($this->view['pflicht']['geb'] != '2') { ?>

- 					<?php echo wpsg_drawForm_Input('dialog_geb', __('Geburtsdatum', 'wpsg'), $this->view['data']['geb']); ?>

+ 					<?php echo wpsg_drawForm_Input('dialog_geb', __('Geburtsdatum', 'wpsg'), wpsg_fromDate($this->view['data']['geb'])); ?>

                 <?php } ?>

                 <br />

                 <?php if ($this->view['pflicht']['tel'] != '2') { ?>

diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml
index 115d886..1cd072e 100644
--- a/views/produkt/addedit_general.phtml
+++ b/views/produkt/addedit_general.phtml
@@ -55,7 +55,7 @@
 				<?php } ?>

 			<?php } ?>

 			<?php if (!$this->hasMod('wpsg_mod_produktartikel')) { ?>

-				<?php echo wpsg_drawForm_Select('partikel', __('Zugeordneter Wordpress Artikel', 'wpsg'), $this->view['partikel_select'], wpsg_getStr($this->view['data']['partikel']), array('optgroup' => true)); ?>

+				<?php echo wpsg_drawForm_Select('partikel', __('Zugeordneter WordPress-Artikel', 'wpsg'), $this->view['partikel_select'], wpsg_getStr($this->view['data']['partikel']), array('optgroup' => true)); ?>

 			<?php } ?>

 			<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>

 				<?php echo wpsg_drawForm_Select('basket_multiple', __('Verhalten im Warenkorb', 'wpsg'), array(

diff --git a/views/produkt/addedit_productcodes.phtml b/views/produkt/addedit_productcodes.phtml
index b60ce58..93707bd 100644
--- a/views/produkt/addedit_productcodes.phtml
+++ b/views/produkt/addedit_productcodes.phtml
@@ -15,7 +15,7 @@
 
 <div class="general-panel-block">
 	<div class="general-panel-general">
-		<?php echo wpsg_drawForm_AdminboxStart(__('Productcodes', 'wpsg')); ?>
+		<?php echo wpsg_drawForm_AdminboxStart(__('Produktcodes', 'wpsg')); ?>
 	
 			<?php if (intval($this->view['data']['id']) > 0) {
 				
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index c465443..cb12146 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -127,7 +127,7 @@
 			<?php if ($this->get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>

 

 				<div class="wpsg_produkt_preishinweis">

-					<?php echo wpsg_translate(__('#2# zzgl. #1#', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>', '<a href="#kkhint" title="'.wpsg_hspc($this->get_option('wpsg_kleinunternehmer_text')).'">Endpreis</a>'); ?>

+					<?php echo wpsg_translate(__('#2# zzgl. #1#', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>', '<a href="#kkhint" title="'.wpsg_hspc($this->get_option('wpsg_kleinunternehmer_text')).'">'.__('Endpreis', 'wpsg').'</a>'); ?>

 				</div>

 

 			<?php } else { /* Kleinunternehmerregelung aktiviert ENDE */ ?>