// fixes in php mail templates

mails/en/src/account.php

@@ -16,7 +16,7 @@
 		</p>
 		<span>
 			<?php echo t('Here are your login details:'); ?><br /> 
-			<span><strong><?php echo t('E-mail address: <a href="mailto:{email}">{email}</a>'); ?></strong></span><br />
+			<span><strong><?php echo t('E-mail address:'); ?> <a href="mailto:{email}">{email}</a></strong></span><br />
 			<span><strong><?php echo t('Password:'); ?></strong></span> {passwd}
 		</span>
 	</td>
@@ -40,7 +40,7 @@
 </tr>
 <tr>
 	<td>
-		<span><?php echo t('You can now place orders on our shop: <a href="{shop_url}">{shop_name}</a>'); ?>.</span>
+		<span><?php echo t('You can now place orders on our shop:'); ?> <a href="{shop_url}">{shop_name}</a></span>
 	</td>
 </tr>
 

mails/en/src/backoffice_order.php

@@ -11,10 +11,10 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('A new command has been generated to you.'); ?>
+			<?php echo t('A new order has been generated on your behalf.'); ?>
 		</p>
 		<span>
-			<?php echo t('Go on <a href="{order_link}">{order_link}</a> to finalize the payment.'); ?>
+			<?php echo t('Please go on <a href="{order_link}">{order_link}</a> to finalize the payment.'); ?>
 		</span>
 	</td>
 </tr>

mails/en/src/bankwire.php

@@ -3,7 +3,7 @@
 <tr>
 	<td align="center">
 		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
-		<span class="subtitle"><?php echo t('Thank you for shopping at {shop_name}!'); ?></span>
+		<span class="subtitle"><?php echo t('Thank you for shopping with {shop_name}!'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -28,7 +28,7 @@
 			<?php echo t('You have selected to pay by wire transfer.'); ?>
 		</p>
 		<span>
-			<?php echo t('Here are the bank details for your wire or transfer:'); ?><br /> 
+			<?php echo t('Here are the bank details for your transfer:'); ?><br /> 
 			<span><strong><?php echo t('Amount:'); ?></strong></span> {total_paid}<br />
 			<span><strong><?php echo t('Account owner:'); ?></strong></span> {bankwire_owner}<br />
 			<span><strong><?php echo t('Account details:'); ?></strong></span> {bankwire_details}<br />

mails/en/src/cheque.php

@@ -3,7 +3,7 @@
 <tr>
 	<td align="center">
 		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
-		<span class="subtitle"><?php echo t('Thank you for shopping at {shop_name}!'); ?></span>
+		<span class="subtitle"><?php echo t('Thank you for shopping with {shop_name}!'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -25,10 +25,10 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('You have selected to pay by check. Please include on your check.'); ?>
+			<?php echo t('You have selected to pay by check.'); ?>
 		</p>
 		<span>
-			<?php echo t('Here are the bank details for your wire or transfer:'); ?><br /> 
+			<?php echo t('Here are the bank details for your check:'); ?><br /> 
 			<span><strong><?php echo t('Amount:'); ?></strong></span> {total_paid}<br />
 			<span><strong><?php echo t('Payable to the order of:'); ?></strong></span> {cheque_name}<br />
 			<span><strong><?php echo t('Please mail your check to:'); ?></strong></span> {cheque_address_html}

mails/en/src/credit_slip.php

@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Credit slip created'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Credit slip created'); ?>
 		</p>
 		<span>
 			<?php echo t('We have generated a credit slip in your name for order with the reference <span><strong>{order_name}</strong></span>.'); ?>

mails/en/src/download_product.php

@@ -3,7 +3,7 @@
 <tr>
 	<td align="center">
 		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
-		<span class="subtitle"><?php echo t('Thank you for your order from <strong>{shop_name}</strong>'); ?></span>
+		<span class="subtitle"><?php echo t('Thank you for your order with the reference {order_name} from <strong>{shop_name}</strong>'); ?></span>
 	</td>
 </tr>
 <tr>

mails/en/src/in_transit.php

@@ -15,7 +15,7 @@
 		</p>
 		<span>
 			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> is currently in transit.'); ?> <br /><br />
-			<?php echo t('You can track your package using the following link: <a href="{followup}">{followup}</a>'); ?>
+			<?php echo t('You can track your package using the following link:'); ?> <a href="{followup}"><?php echo t('{followup}'); ?></a>
 		</span>
 	</td>
 </tr>

mails/en/src/order_conf.php

@@ -3,7 +3,7 @@
 <tr>
 	<td align="center">
 		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
-		<span class="subtitle"><?php echo t('Thank you for shopping at {shop_name}!'); ?></span>
+		<span class="subtitle"><?php echo t('Thank you for shopping with {shop_name}!'); ?></span>
 	</td>
 </tr>
 <tr>

mails/en/src/order_merchant_comment.php

@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('New message from {shop_name}'); ?>
+			<?php echo t('Message from {shop_name}'); ?>
 		</p>
 		<span>
 			<?php echo t('You have received a new message from <span><strong>{shop_name}</strong></span> regarding order with the reference <span><strong>{order_name}</strong></span>.'); ?><br /><br />

mails/en/src/refund.php

@@ -14,7 +14,7 @@
 			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Refund processed'); ?>
 		</p>
 		<span>
-			<?php echo t('We have processed your <strong><span>{shop_name}</strong></span> refund for order with the reference <strong><span>{order_name}</strong></span>.'); ?>
+			<?php echo t('We have processed your <strong><span>{shop_name}</span><strong/> refund for order with the reference <strong><span>{order_name}</span></strong>.'); ?>
 		</span>
 	</td>
 </tr>

mails/en/src/shipped.php

@@ -23,7 +23,7 @@
 <tr>
 	<td>
 		<span>
-			<?php echo t('You can now place orders on our shop: <a href="{shop_url}">{shop_name}</a>'); ?>.
+			<?php echo t('You can now place orders on our shop:'); ?> <a href="{shop_url}">{shop_name}</a>
 		</span>
 	</td>
 </tr>

mails/en/src/voucher.php

@@ -15,7 +15,7 @@
 		</p>
 		<span>
 			<?php echo t('A voucher has been created in your name as a result of your order with the reference <span><strong>{order_name}</strong></span>.'); ?><br/><br/>
-			<?php echo t('<span><strong>Voucher code: {voucher_num}</strong></span> in the amount of <span><strong>{voucher_amount}</strong></span></strong>'); ?><br /><br />
+			<?php echo t('<span><strong>Voucher code: {voucher_num}</strong></span> in the amount of <span><strong>{voucher_amount}</strong></span>'); ?><br /><br />
 			<?php echo t('Simply copy/paste this code during the payment process for your next order.'); ?>
 		</span>
 	</td>