Index: /mods/wpsg_mod_addressvalidation.class.php
===================================================================
--- /mods/wpsg_mod_addressvalidation.class.php	(revision 6369)
+++ /mods/wpsg_mod_addressvalidation.class.php	(revision 6371)
@@ -86,5 +86,7 @@
 				)
 			{
-				 
+				
+				$pflicht = $GLOBALS['wpsg_sc']->loadPflichtFeldDaten();
+				
 				// $arCheckout['strasse']  (plz, ort, land, nr)
 				$strasse = $arCheckout['strasse'];
@@ -114,5 +116,5 @@
 				}
 					
-				if ((array_key_exists('Adressstring1', $_SESSION['wpsg'])) && ($astr != $_SESSION['wpsg']['Adressstring1']))
+				if ($astr != wpsg_getStr($_SESSION['wpsg']['Adressstring1']))
 				{
 					$_SESSION['wpsg']['Adressstring1'] = $astr;
@@ -147,10 +149,9 @@
 						{
 							
-							$_SESSION['wpsg']['errorFields'][] = 'strasse';
-							$_SESSION['wpsg']['errorFields'][] = 'nr';
-							$_SESSION['wpsg']['errorFields'][] = 'ort';
-							$_SESSION['wpsg']['errorFields'][] = 'plz';
-							$_SESSION['wpsg']['errorFields'][] = 'land';
-							$_SESSION['wpsg']['errorFields'][] = 'ort';
+							if ($pflicht['strasse'] != '1') $_SESSION['wpsg']['errorFields'][] = 'strasse';
+							if ($pflicht['nr'] != '1') $_SESSION['wpsg']['errorFields'][] = 'nr';
+							if ($pflicht['ort'] != '1') $_SESSION['wpsg']['errorFields'][] = 'ort';
+							if ($pflicht['plz'] != '1') $_SESSION['wpsg']['errorFields'][] = 'plz';
+							if ($pflicht['land'] != '1') $_SESSION['wpsg']['errorFields'][] = 'land';
 							$this->shop->addFrontendError(__('Bitte die Kundenadresse (Straße, Hausnummer, PLZ, Ort und Land kontrollieren (Adressvalidation)', 'wpsg'));
 							$error = true;
@@ -167,5 +168,5 @@
 					}
 				
-				}			
+				}
 				
 				if (array_key_exists('diff_shippingadress', $arCheckout))
@@ -197,5 +198,5 @@
 					}
 						
-					if ((array_key_exists('Adressstring2', $_SESSION['wpsg'])) && ($astr != $_SESSION['wpsg']['Adressstring2']))
+					if ($astr != wpsg_getStr($_SESSION['wpsg']['Adressstring2']))
 					{
 						$_SESSION['wpsg']['Adressstring2'] = $astr;
@@ -230,10 +231,9 @@
 							{
 						
-								$_SESSION['wpsg']['errorFields'][] = 'shipping_strasse';
-								$_SESSION['wpsg']['errorFields'][] = 'shipping_nr';
-								$_SESSION['wpsg']['errorFields'][] = 'shipping_ort';
-								$_SESSION['wpsg']['errorFields'][] = 'shipping_plz';
-								$_SESSION['wpsg']['errorFields'][] = 'shipping_land';
-								$_SESSION['wpsg']['errorFields'][] = 'shipping_ort';
+								if ($pflicht['strasse'] != '1') $_SESSION['wpsg']['errorFields'][] = 'shipping_strasse';
+								//$_SESSION['wpsg']['errorFields'][] = 'shipping_nr';
+								if ($pflicht['ort'] != '1') $_SESSION['wpsg']['errorFields'][] = 'shipping_ort';
+								if ($pflicht['plz'] != '1') $_SESSION['wpsg']['errorFields'][] = 'shipping_plz';
+								if ($pflicht['land'] != '1') $_SESSION['wpsg']['errorFields'][] = 'shipping_land';
 								$this->shop->addFrontendError(__('Bitte die Lieferadresse (Straße, Hausnummer, PLZ, Ort und Land kontrollieren (Adressvalidation)', 'wpsg'));
 								$error = true;
Index: /mods/wpsg_mod_shippingadress.class.php
===================================================================
--- /mods/wpsg_mod_shippingadress.class.php	(revision 6369)
+++ /mods/wpsg_mod_shippingadress.class.php	(revision 6371)
@@ -141,12 +141,21 @@
 				{
 	
+					$pflicht = $GLOBALS['wpsg_sc']->loadPflichtFeldDaten();
+					
 					$arCheckout['diff_shippingadress'] = 1;
-					($arCheckout['shipping_title'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_title':'';
-					($arCheckout['shipping_plz'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_plz':'';
-					($arCheckout['shipping_vname'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_vname':'';
-					($arCheckout['shipping_name'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_name':'';
-					($arCheckout['shipping_strasse'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_strasse':'';
-					($arCheckout['shipping_ort'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_ort':'';
-					(!wpsg_isSizedInt($arCheckout['shipping_land']))?$_SESSION['wpsg']['errorFields'][] = 'shipping_land':'';
+					if ($pflicht['anrede'] != '1' && $this->arCheckout['title'] == '-1')
+						($arCheckout['shipping_title'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_title':'';
+					if ($pflicht['plz'] != '1')
+						($arCheckout['shipping_plz'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_plz':'';
+					if ($pflicht['vname'] != '1')
+						($arCheckout['shipping_vname'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_vname':'';
+					if ($pflicht['name'] != '1')
+						($arCheckout['shipping_name'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_name':'';
+					if ($pflicht['strasse'] != '1')
+						($arCheckout['shipping_strasse'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_strasse':'';
+					if ($pflicht['ort'] != '1')
+						($arCheckout['shipping_ort'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_ort':'';
+					if ($pflicht['land'] != '1')
+						(!wpsg_isSizedInt($arCheckout['shipping_land']))?$_SESSION['wpsg']['errorFields'][] = 'shipping_land':'';
 					
 					if (count($_SESSION['wpsg']['errorFields']) > 0)
Index: /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
===================================================================
--- /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 6369)
+++ /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 6371)
@@ -19,13 +19,16 @@
 		
 			<div class="wpsg_checkoutblock">
-				<label for="firma" class="wpsg_checkout"><?php echo __("Firma:", "wpsg"); ?></label>
-				<input class="wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_firma]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_firma'])); ?>" />
+				<label for="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("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_firma]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_firma'])); ?>" />
 			</div>
 		
 			<div class="wpsg_checkoutblock">
 				<label for="title" class="wpsg_checkout"><?php echo __("Anrede:", "wpsg"); ?>
-					<span class="wpsg_required">*</span>
+					<?php if ($this->view['pflicht']['anrede'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
-				<select class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("title", (array)$this->view['error']))?'wpsg_error':''); ?>" type="select" name="wpsg[checkout][shipping_title]" id="shipping_title" >
+				<select class="<?php echo (($this->view['pflicht']['anrede'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("title", (array)$this->view['error']))?'wpsg_error':''); ?>" type="select" id="shipping_title" name="wpsg[checkout][shipping_title]">
+				<option value="-1"><?php echo __('Bitte auswÀhlen', 'wpsg'); ?></option>
 				<?php $i=0; foreach (explode("|", $this->view['pflicht']['anrede_auswahl']) as $t) { ?>
 				<option value="<?php echo $i; /*wpsg_hspc($t);*/ $i++; ?>" <?php echo ((wpsg_isSizedString($this->view['basket']['checkout']['shipping_title'], $t))?'selected="selected"':''); ?>><?php echo $t; ?></option>
@@ -36,42 +39,42 @@
 			<div class="wpsg_checkoutblock">
 				<label for="vname" class="wpsg_checkout"><?php echo __("Vorname:", "wpsg"); ?>
-					<span class="wpsg_required">*</span>
+					<?php if ($this->view['pflicht']['vname'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
-				<input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_vname" name="wpsg[checkout][shipping_vname]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_vname'])); ?>" />
+				<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_vname" name="wpsg[checkout][shipping_vname]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_vname'])); ?>" />
 			</div>
 				
 			<div class="wpsg_checkoutblock">
 				<label for="name" class="wpsg_checkout"><?php echo __("Name:", "wpsg"); ?>
-					<span class="wpsg_required">*</span>
+					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 				</label>
-				<input class="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'])); ?>" />
+				<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>
 				
 			<div class="wpsg_checkoutblock">
 				<label for="strasse" class="wpsg_checkout"><?php echo __("Straße, Nr.:", "wpsg"); ?>
-					<span class="wpsg_required">*</span>
+					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
-				<input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />		
+				<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />		
 			</div>
 			
 			<div class="wpsg_checkoutblock">
 				<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl:", "wpsg"); ?> 
-					<span class="wpsg_required">*</span>
+					<?php if ($this->view['pflicht']['plz'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
-				<input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_plz" name="wpsg[checkout][shipping_plz]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_plz'])); ?>" />
+				<input class="<?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_plz" name="wpsg[checkout][shipping_plz]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_plz'])); ?>" />
 			</div>
 				
 			<div class="wpsg_checkoutblock">
 				<label for="ort" class="wpshopgermany_checkout"><?php echo __("Ort:", "wpsg"); ?> 
-					<span class="wpsg_required">*</span>
+					<?php if ($this->view['pflicht']['ort'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
-				<input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_ort" name="wpsg[checkout][shipping_ort]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_ort'])); ?>" />
+				<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_ort" name="wpsg[checkout][shipping_ort]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_ort'])); ?>" />
 			</div>
 				
 			<div class="wpsg_checkoutblock">
 				<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?>
-					<span class="wpsg_required">*</span>
+					<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>					
-				<select name="wpsg[checkout][shipping_land]" class="wpsg_checkout <?php echo ((in_array("shipping_land", (array)$this->view['error']))?'wpsg_error':''); ?>" id="shipping_land">
+				<select name="wpsg[checkout][shipping_land]" class="<?php echo (($this->view['pflicht']['land'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_land", (array)$this->view['error']))?'wpsg_error':''); ?>" id="shipping_land">
 					<option value="-1"><?php echo __('Bitte auswÀhlen', 'wpsg'); ?></option>
 					<?php foreach ($this->view['laender'] as $l) { ?>
Index: /views/warenkorb/checkout.phtml
===================================================================
--- /views/warenkorb/checkout.phtml	(revision 6369)
+++ /views/warenkorb/checkout.phtml	(revision 6371)
@@ -88,6 +88,6 @@
 		
 				<div class="wpsg_checkoutblock" id="wpsg_firma">
-					<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>
-					<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					<label for="wpsg_firma"><?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[checkout][firma]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['firma'])); ?>" />
@@ -95,6 +95,6 @@
 			
 				<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"><?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[checkout][title]">
 						<option value="-1"><?php echo __('Bitte auswÀhlen', 'wpsg'); ?></option>
@@ -106,6 +106,6 @@
 			
 				<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[checkout][vname]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['vname'])); ?>" />		
@@ -113,6 +113,6 @@
 				
 				<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[checkout][name]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['name'])); ?>" />
@@ -120,6 +120,6 @@
 				
 				<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="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[checkout][email]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['email'])); ?>" />
@@ -128,6 +128,6 @@
 				<?php if (isset($this->view['pflicht']['emailconfirm']) && $this->view['pflicht']['emailconfirm'] == '1') { ?>
 				<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="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email2" name="wpsg[checkout][email2]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['email2'])); ?>" />
@@ -136,6 +136,6 @@
 				
 				<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="wpsg_input_text <?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[checkout][geb]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['geb'])); ?>" />
@@ -143,6 +143,6 @@
 						
 				<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="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[checkout][fax]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['fax'])); ?>" />
@@ -150,6 +150,6 @@
 				
 				<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="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[checkout][tel]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['tel'])); ?>" />
@@ -157,6 +157,6 @@
 			
 				<div class="wpsg_checkoutblock" id="wpsg_strasse">
-					<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[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['strasse'])); ?>" />		
@@ -164,6 +164,6 @@
 			
 				<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="wpsg_input_text <?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[checkout][plz]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['plz'])); ?>" />
@@ -171,6 +171,6 @@
 				
 				<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[checkout][ort]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['ort'])); ?>" />
@@ -178,6 +178,6 @@
 				
 				<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[checkout][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">
@@ -190,6 +190,6 @@
 				
 				<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="wpshopgermany_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[checkout][ustidnr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['ustidnr'])); ?>" />