From e1fa585f43560cc24fb57694c0cbc89d43f848b6 Mon Sep 17 00:00:00 2001
From: jObregon <jorge.obregon@prestashop.com>
Date: Sat, 19 May 2012 19:56:15 +0000
Subject: [PATCH] // Translation for "Envio" in mail confirmation, and fixed
 spacing in order-carrier

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15460 b9a71923-0436-4b27-9f14-aed3839534dd
---
 mails/es/order_conf.html         | 2 +-
 themes/default/order-carrier.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mails/es/order_conf.html b/mails/es/order_conf.html
index d7b5d1343..fe6eb8650 100644
--- a/mails/es/order_conf.html
+++ b/mails/es/order_conf.html
@@ -65,7 +65,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Shipping</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Env&iacute;o</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index 3f280514e..979f4fda3 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -111,7 +111,7 @@
 		{foreach $delivery_option_list as $id_address => $option_list}
 			<h3>
 				{if isset($address_collection[$id_address])}
-					{l s='Choose a shipping option for the address:'}{$address_collection[$id_address]->alias}
+					{l s='Choose a shipping option for the address:'} {$address_collection[$id_address]->alias}
 				{else}
 					{l s='Choose a shipping option'}
 				{/if}