// update mail templates

mails/en/src/account.php

@@ -2,9 +2,8 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span><br/>
-			<span class="subtitle">Thank you for creating a customer account at {shop_name}.</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
+		<span class="subtitle"><?php echo t('Thank you for creating a customer account at {shop_name}.'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -17,8 +16,8 @@
 		</p>
 		<span>
 			<?php echo t('Here are your login details:'); ?><br /> 
-			<?php echo t('<span><strong>E-mail address: <a href="mailto:{email}">{email}</a></strong></span>'); ?><br />
-			<?php echo t('<span><strong>Password:</strong></span> {passwd}'); ?>
+			<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>
 </tr>
@@ -36,9 +35,12 @@
 		</ol>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>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

@@ -2,7 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); ?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>

mails/en/src/bankwire.php

@@ -2,9 +2,8 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span><br/>
-			<span class="subtitle">Thank you for shopping at {shop_name}!</span>'); 
-		?>
+		<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>
 	</td>
 </tr>
 <tr>
@@ -30,21 +29,28 @@
 		</p>
 		<span>
 			<?php echo t('Here are the bank details for your wire or transfer:'); ?><br /> 
-			<?php echo t('<span><strong>Amount:</strong></span> {total_paid}'); ?><br />
-			<?php echo t('<span><strong>Account owner:</strong></span> {bankwire_owner}'); ?><br />
-			<?php echo t('<span><strong>Account details:</strong></span> {bankwire_details}'); ?><br />
-			<?php echo t('<span><strong>Bank address:</strong></span> {bankwire_address}'); ?>
+			<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 />
+			<span><strong><?php echo t('Bank address:'); ?></strong></span> {bankwire_address}
+		</span>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
 		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
-	</td>
-</tr>
-<tr>
-	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/cheque.php

@@ -2,9 +2,8 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span><br/>
-			<span class="subtitle">Thank you for shopping at {shop_name}!</span>'); 
-		?>
+		<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>
 	</td>
 </tr>
 <tr>
@@ -30,21 +29,28 @@
 		</p>
 		<span>
 			<?php echo t('Here are the bank details for your wire or transfer:'); ?><br /> 
-			<?php echo t('<span><strong>Amount:</strong></span> {total_paid}'); ?><br />
-			<?php echo t('<span><strong>Payable to the order of:</strong></span> {cheque_name}'); ?><br />
-			<?php echo t('<span><strong>Please mail your check to:</strong></span> {cheque_address_html}'); ?>
+			<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}
 
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/contact.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -15,10 +14,10 @@
 			<?php echo t('Message from a {shop_name} customer'); ?>
 		</p>
 		<span>
-			<?php echo t('<span><strong>Customer e-mail address: <a href="mailto:{email}">{email}</a></strong></span>'); ?><br /><br />
-			<?php echo t('<span><strong>Customer message:</strong></span> {message}'); ?><br /><br />
-			<?php echo t('<span><strong>Order ID:</strong></span> {order_name}'); ?><br />
-			<?php echo t('<span><strong>Attached file:</strong></span> {attached_file}'); ?>
+			<span><strong><?php echo t('Customer e-mail address:'); ?> <a href="mailto:{email}">{email}</a></strong></span><br /><br />
+			<span><strong><?php echo t('Customer message:'); ?></strong></span> {message}<br /><br />
+			<span><strong><?php echo t('Order ID:'); ?></strong></span> {order_name}<br />
+			<span><strong><?php echo t('Attached file:'); ?></strong></span> {attached_file}
 		</span>
 	</td>
 </tr>

mails/en/src/contact_form.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -16,16 +15,21 @@
 		</p>
 		<span>
 			<?php echo t('Your message has been sent successfully.'); ?><br /><br />
-			<?php echo t('<span><strong>Message:</strong></span> {message}'); ?><br /><br />
-			<?php echo t('<span><strong>Order ID:</strong></span> {order_name}'); ?><br />
-			<?php echo t('<span><strong>Product:</strong></span> {product_name}'); ?><br />
-			<?php echo t('<span><strong>Attached file:</strong></span> {attached_file}'); ?>
+			<span><strong><?php echo t('Message:'); ?></strong></span> {message}<br /><br />
+			<span><strong><?php echo t('Order ID:'); ?></strong></span> {order_name}<br />
+			<span><strong><?php echo t('Product:'); ?></strong></span> {product_name}<br />
+			<span><strong><?php echo t('Attached file:'); ?></strong></span> {attached_file}
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>We will answer as soon as possible.</span>'); ?>
+		<span>
+			<?php echo t('We will answer as soon as possible.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/credit_slip.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -19,9 +18,14 @@
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review this credit slip and download your invoice from the <a href="{history_url}">"My credit slips"</a> section of your account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review this credit slip and download your invoice from the <a href="{history_url}">"My credit slips"</a> section of your account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/download_product.php

@@ -2,9 +2,8 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span><br/>
-			<span class="subtitle">Thank you for your order from <strong>{shop_name}</strong></span>'); 
-		?>
+		<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}'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -16,19 +15,26 @@
 			<?php echo t('Product(s) now available for download'); ?>
 		</p>
 		<span>
-			<?php echo t('You have <strong>{nbProducts}</strong> product(s) now available for download using the following link(s):'); ?><br/><br/>
-			<?php echo t('{virtualProducts}'); ?>
+			<?php echo t('You have <span><strong>{nbProducts}</strong></span> product(s) now available for download using the following link(s):'); ?><br/><br/>
+			{virtualProducts}
+		</span>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
 		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
-	</td>
-</tr>
-<tr>
-	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}?id_order={order_name}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}?id_order={order_name}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/employee_password.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -15,11 +14,11 @@
 			<?php echo t('Your {shop_name} login information'); ?>
 		</p>
 		<span>
-			<?php echo t('Here is your personal login information for <span><strong>{shop_name}</strong></span>:'); ?><br/>
-			<?php echo t('<span><strong>First name:</strong></span> {firstname}'); ?><br />
-			<?php echo t('<span><strong>Last name:</strong></span> {lastname}'); ?><br />
-			<?php echo t('<span><strong>Password:</strong></span> {passwd}'); ?><br />
-			<?php echo t('<span><strong>E-mail address:</strong></span> {email}'); ?>
+			<?php echo t('Here is your personal login information for <span><strong>{shop_name}</strong></span>:'); ?><br/><br/>
+			<span><strong><?php echo t('First name:'); ?></strong></span> {firstname}<br />
+			<span><strong><?php echo t('Last name:'); ?></strong></span> {lastname}<br />
+			<span><strong><?php echo t('Password:'); ?></strong></span> {passwd}<br />
+			<span><strong><?php echo t('E-mail address:'); ?></strong></span> {email}
 		</span>
 	</td>
 </tr>

mails/en/src/footer.php

@@ -3,7 +3,7 @@
 						</tr>
 						<tr>
 							<td class="footer">
-								<?php echo t('<a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a>'); ?>
+								<span><?php echo t('<a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a>'); ?></span>
 							</td>
 						</tr>
 					</table>

mails/en/src/forward_msg.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -15,9 +14,9 @@
 			<?php echo t('Customer service - Forwarded discussion'); ?>
 		</p>
 		<span>
-			<?php echo t('<span><strong>{employee}</strong></span> wanted to forward this discussion to you.'); ?> <br /><br />
-			<?php echo t('<span><strong>Discussion history:</strong></span> {messages}'); ?><br /><br />
-			<?php echo t('<span><strong>{employee}</strong></span> added <span><strong>"{comment}"</strong></span>'); ?>
+			<span><strong>{employee}</strong></span> <?php echo t('wanted to forward this discussion to you.'); ?> <br /><br />
+			<span><strong><?php echo t('Discussion history:'); ?></strong></span> {messages}<br /><br />
+			<span><strong>{employee}</strong></span> <?php echo t('added'); ?> <span><strong>"{comment}"</strong></span>
 		</span>
 	</td>
 </tr>

mails/en/src/guest_to_customer.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -16,19 +15,26 @@
 		</p>
 		<span>
 			<?php echo t('Your guest account for <span><strong>{shop_name}</strong></span> has been transformed into a customer account.'); ?> <br /><br />
-			<?php echo t('<span><strong>E-mail address:</strong></span> {email}'); ?><br /><br />
-			<?php echo t('<span><strong>Password:</strong></span> {passwd}'); ?>
+			<span><strong><?php echo t('E-mail address:'); ?></strong></span> {email}<br /><br />
+			<span><strong><?php echo t('Password:'); ?></strong></span> {passwd}
+		</span>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td>
+		<span>
+			<?php echo t('Please be careful when sharing these login details with others.'); ?>
 		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>Please be careful when sharing these login details with others.</span>'); ?>
-	</td>
-</tr>
-<tr>
-	<td>
-		<?php echo t('<span>You can access your customer account on our shop: {shop_url}</span>'); ?>
+		<span>
+			<?php echo t('You can access your customer account on our shop:'); ?> <strong>{shop_url}</strong>
+		</span>
 	</td>
 </tr>
 

mails/en/src/header.php

@@ -1,18 +1,8 @@
-<?php
-
-function t($str)
-{
-	return $str;
-}
-?>
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<title><?php echo t('Message from {shop_name}'); ?></title>
-		<link rel="stylesheet" type="text/css" href="../../../admin-dev/themes/default/css/admin-mail.css" />
-		<link rel="stylesheet" type="text/css" href="../../../admin-dev/themes/default/css/admin-theme/email.css" />
 	</head>
 	<body>
 		<table class="table table-mail">

mails/en/src/in_transit.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -20,14 +19,21 @@
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/log_alert.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>

mails/en/src/newsletter.php

@@ -2,13 +2,12 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Newsletter from {shop_name}</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('{message}'); ?>
+		{message}
 	</td>
 </tr>
 

mails/en/src/order_canceled.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -20,14 +19,21 @@
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/order_changed.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -20,14 +19,21 @@
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/order_conf.php

@@ -1,14 +1,13 @@
 <?php include ('header.php'); ?>
 
 <tr>
-	<td align="center" colspan="3">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span><br/>
-			<span class="subtitle">Thank you for shopping at {shop_name}!</span>'); 
-		?>
+	<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>
 	</td>
 </tr>
 <tr>
-	<td colspan="3">&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td class="box" colspan="3">
@@ -16,21 +15,21 @@
 			<?php echo t('Order details'); ?>
 		</p>
 		<span>
-			<?php echo t('<span><strong>Order:</strong></span> {order_name} placed on {date}'); ?><br /><br />
-			<?php echo t('<span><strong>Payment:</strong></span> {payment}'); ?>
+			<span><strong><?php echo t('Order:'); ?></strong></span> {order_name} <?php echo t('placed on'); ?> {date}<br /><br />
+			<span><strong><?php echo t('Payment:'); ?></strong></span> {payment}
 		</span>
 	</td>
 </tr>
 <tr>
-	<td colspan="3">
+	<td>
 		<table class="table table-recap" bgcolor="#ffffff"><!-- Title -->
 			<thead>
 				<tr>
-					<th>Reference</th>
-					<th width="30%">Product</th>
-					<th>Unit price</th>
-					<th>Quantity</th>
-					<th>Total price</th>
+					<th><?php echo t('Reference'); ?></th>
+					<th width="30%"><?php echo t('Product'); ?></th>
+					<th><?php echo t('Unit price'); ?></th>
+					<th><?php echo t('Quantity'); ?></th>
+					<th><?php echo t('Total price'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -45,27 +44,27 @@
 					</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong>Products</strong></td>
+					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong><?php echo t('Products'); ?></strong></td>
 					<td bgcolor="#fbfbfb" align="right">{total_products}</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong>Discounts</strong></td>
+					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong><?php echo t('Discounts'); ?></strong></td>
 					<td bgcolor="#fbfbfb" align="right">{total_discounts}</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong>Gift-wrapping</strong></td>
+					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong><?php echo t('Gift-wrapping'); ?></strong></td>
 					<td bgcolor="#fbfbfb" align="right">{total_wrapping}</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong>Shipping</strong></td>
+					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong><?php echo t('Shipping'); ?></strong></td>
 					<td bgcolor="#fbfbfb" align="right">{total_shipping}</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong>Total Tax paid</strong></td>
+					<td bgcolor="#fbfbfb" align="right" colspan="4"><strong><?php echo t('Total Tax paid'); ?></strong></td>
 					<td bgcolor="#fbfbfb" align="right">{total_tax_paid}</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#fbfbfb" align="right" colspan="4" class="total"><strong>Total paid</strong></td>
+					<td bgcolor="#fbfbfb" align="right" colspan="4" class="total"><strong><?php echo t('Total paid'); ?></strong></td>
 					<td bgcolor="#fbfbfb" align="right" class="total_amount">{total_paid}</td>
 				</tr>
 			</tbody>
@@ -78,42 +77,55 @@
 			<?php echo t('Shipping'); ?>
 		</p>
 		<span>
-			<?php echo t('<span><strong>Carrier:</strong></span> {carrier}'); ?><br /><br />
-			<?php echo t('<span><strong>Payment:</strong></span> {payment}'); ?>
+			<span><strong><?php echo t('Carrier:'); ?></strong></span> {carrier}<br /><br />
+			<span><strong><?php echo t('Payment:'); ?></strong></span> {payment}
 		</span>
 	</td>
 </tr>
 <tr>
-	<td colspan="3">&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
-	<td class="box" width="310">
-		<p>
-			<?php echo t('Delivery address'); ?>
-		</p>
+	<td>
+		<table class="table">
+			<tr>
+				<td class="box" width="310">
+					<p>
+						<?php echo t('Delivery address'); ?>
+					</p>
+					<span>
+						{delivery_block_html}
+					</span>
+				</td>
+				<td width="20">&nbsp;</td>
+				<td class="box" width="310">
+					<p>
+						<?php echo t('Billing address'); ?>
+					</p>
+					<span>
+						{invoice_block_html}
+					</span>
+				</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td>
 		<span>
-			<?php echo t('{delivery_block_html}'); ?>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
 		</span>
 	</td>
-	<td width="20">&nbsp;</td>
-	<td class="box" width="310">
-		<p>
-			<?php echo t('Billing address'); ?>
-		</p>
+</tr>
+<tr>
+	<td>
 		<span>
-			<?php echo t('{invoice_block_html}'); ?>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
 		</span>
 	</td>
 </tr>
-<tr>
-	<td colspan="3">
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
-	</td>
-</tr>
-<tr>
-	<td colspan="3">
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
-	</td>
-</tr>
 
 <?php include ('footer.php'); ?>

mails/en/src/order_customer_comment.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center" colspan="3">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -15,9 +14,9 @@
 			<?php echo t('Message from a customer'); ?>
 		</p>
 		<span>
-			<?php echo t('You have received a new message regarding order with the reference <span><strong>{order_name}</strong></span>.'); ?><br /><br />
-			<?php echo t('<span><strong>Customer:</strong></span> {firstname} {lastname} ({email})'); ?><br /><br />
-			<?php echo t('{message}'); ?>
+			<?php echo t('You have received a new message regarding order with the reference'); ?> <span><strong>{order_name}</strong></span>.<br /><br />
+			<span><strong><?php echo t('Customer:'); ?></strong></span> {firstname} {lastname} ({email})<br /><br />
+			{message}
 		</span>
 	</td>
 </tr>

mails/en/src/order_merchant_comment.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center" colspan="3">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -16,7 +15,7 @@
 		</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 />
-			<?php echo t('<span><strong>Message:</strong></span> {message}'); ?>
+			<span><strong><?php echo t('Message:'); ?></strong></span> {message}
 		</span>
 	</td>
 </tr>

mails/en/src/order_return_state.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center" colspan="3">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -15,14 +14,19 @@
 			<?php echo t('Return #{id_order_return} - update'); ?>
 		</p>
 		<span>
-			<?php echo t('We have updated the progress on your return #{id_order_return}, the new status is: <strong>"{state_order_return}"</strong>'); ?><br /><br />
-			<?php echo t('<span><strong>Message:</strong></span> {message}'); ?>
+			<?php echo t('We have updated the progress on your return #{id_order_return}, the new status is:'); ?> <span><strong>"{state_order_return}"</strong></span><br /><br />
+			<span><strong><?php echo t('Message:'); ?></strong></span> {message}
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/outofstock.php

@@ -2,9 +2,8 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span><br/>
-			<span class="subtitle">Thanks for your order with the reference {order_name} from {shop_name}.</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
+		<span class="subtitle"><?php echo t('Thanks for your order with the reference {order_name} from {shop_name}.'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -20,14 +19,21 @@
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/password.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -15,19 +14,26 @@
 			<?php echo t('Your new {shop_name} login details'); ?>
 		</p>
 		<span>
-			<?php echo t('<span><strong>E-mail address:</strong></span> {email}'); ?><br/>
-			<?php echo t('<span><strong>Password:</strong></span> {passwd}'); ?>
+			<span><strong><?php echo t('E-mail address:'); ?></strong></span> {email}<br/>
+			<span><strong><?php echo t('Password:'); ?></strong></span> {passwd}
+		</span>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
 		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>Please be careful when sharing these login details with others.</span>'); ?>
-	</td>
-</tr>
-<tr>
-	<td>
-		<?php echo t('<span>You can now order on our shop: {shop_url}</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/password_query.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>

mails/en/src/payment.php

@@ -2,9 +2,8 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span><br/>
-			<span class="subtitle">Thank you for shopping with {shop_name}!</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
+		<span class="subtitle"><?php echo t('Thank you for shopping with {shop_name}!'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -20,14 +19,21 @@
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/payment_error.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -16,18 +15,25 @@
 		</p>
 		<span>
 			<?php echo t('There is a problem with your payment for <strong><span>{shop_name}</span></strong> order with the reference <strong><span>{order_name}</span></strong>. Please contact us at your earliest convenience.'); ?><br/>
-			<?php echo t('<strong>We cannot ship your order until we receive your payment. </strong>'); ?>
+			<strong><span><?php echo t('We cannot ship your order until we receive your payment.'); ?></span></strong>
+		</span>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
 		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
-	</td>
-</tr>
-<tr>
-	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/preparation.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -19,14 +18,21 @@
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/refund.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -19,14 +18,21 @@
 		</span>
 	</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>
-		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/reply_msg.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -11,17 +10,24 @@
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>{reply}</span>'); ?>
+		<span>{reply}</span>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td>
+		<span>
+			<?php echo t('You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span><strong>Please do not reply to this message</strong>, we will not receive it.</span>'); ?>
-	</td>
-</tr>
-<tr>
-	<td>
-		<?php echo t('<span>In order to reply, please use the following link: <a href="{link}">{link}</a>.</span>'); ?>
+		<span>
+			<?php echo t('If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.'); ?>
+		</span>
 	</td>
 </tr>
 

mails/en/src/shipped.php

@@ -2,9 +2,8 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span><br/>
-			<span class="subtitle">Thank you for shopping with {shop_name}!</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
+		<span class="subtitle"><?php echo t('Thank you for shopping with {shop_name}!'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -23,7 +22,9 @@
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>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/test.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hello,</span>'); 
-		?>
+		<span class="title"><?php echo t('Hello'); ?></span>
 	</td>
 </tr>
 <tr>
@@ -11,7 +10,9 @@
 </tr>
 <tr>
 	<td>
-		<?php echo t('<span>This is a <strong>test e-mail</strong> from your shop.<br /><br /> If you can read this, the test was successful!</span>'); ?>.
+		<span>
+			<?php echo t('This is a <strong>test e-mail</strong> from your shop.<br /><br /> If you can read this, the test was successful!'); ?>.
+		</span>
 	</td>
 </tr>
 

mails/en/src/voucher.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>

mails/en/src/voucher_new.php

@@ -2,8 +2,7 @@
 
 <tr>
 	<td align="center">
-		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
-		?>
+		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
 	</td>
 </tr>
 <tr>