dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge -> revision 9352

Browse Source
This commit is contained in:
rMalie
2011-10-14 08:20:54 +00:00
parent 85937793ec
commit d79fcf00fb
332 changed files with 6104 additions and 2643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mails/es/account.html
-1
View File
@@ -48,6 +48,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/bankwire.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/cheque.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/contact.html
-1
View File
@@ -30,6 +30,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/contact_form.html
-1
View File
@@ -36,6 +36,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/credit_slip.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/download_product.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/employee_password.html
-1
View File
@@ -6,6 +6,5 @@
</head>
<body>
</body>
</html>
mails/es/forward_msg.html
-1
View File
@@ -12,6 +12,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/guest_to_customer.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/in_transit.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/lang.php
+7 -7
View File
@@ -10,7 +10,7 @@ $_LANGMAIL['Virtual product to download'] = '';
$_LANGMAIL['Fwd: Customer message'] = '';
$_LANGMAIL['Your guest account has been transformed to customer account'] = '';
$_LANGMAIL['Package in transit'] = '';
$_LANGMAIL['[Log'] = '';
$_LANGMAIL['Log: You have a new alert from your shop'] = '';
$_LANGMAIL['Order confirmation'] = 'Confirmacion de pedido';
$_LANGMAIL['Message from a customer'] = 'Mensaje de un cliente';
$_LANGMAIL['New message regarding your order'] = '';
@@ -23,17 +23,17 @@ $_LANGMAIL['Happy birthday!'] = '';
$_LANGMAIL['Newsletter confirmation'] = '';
$_LANGMAIL['Newsletter voucher'] = '';
$_LANGMAIL['Your wishlist\\\'s link'] = '';
$_LANGMAIL['Message from '] = '';
$_LANGMAIL['Message from \').$customer->lastname.\' '] = '';
$_LANGMAIL[' $subject'] = '';
$_LANGMAIL['Your cart and your discount'] = '';
$_LANGMAIL['Thanks for your order'] = '';
$_LANGMAIL['You are one of our best customers'] = '';
$_LANGMAIL['We miss you'] = '';
$_LANGMAIL['Your cart and your discount'] = 'Su cesta y su descuento';
$_LANGMAIL['Thanks for your order'] = 'Gracias por su pedido';
$_LANGMAIL['You are one of our best customers'] = 'Usted es uno de nuestros mejores clientes';
$_LANGMAIL['We miss you'] = 'Te extrañamos';
$_LANGMAIL['Product available'] = '';
$_LANGMAIL['Product out of stock'] = '';
$_LANGMAIL['Error reporting from your PayPal module'] = '';
$_LANGMAIL['Congratulations!'] = '';
$_LANGMAIL['Referral Program'] = '';
$_LANGMAIL['A friend sent you a link to'] = '';
$_LANGMAIL['A friend sent you a link to\').\' '] = '';
?>
mails/es/log_alert.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/newsletter.html
-1
View File
@@ -30,6 +30,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/order_canceled.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/order_conf.html
+7 -17
View File
@@ -32,14 +32,11 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">
<table style="width: 100%; font-size: 11px; color: #374953;">
<!-- Title -->
<td align="left">{products} {discounts}
<table style="width: 100%; font-size: 11px; color: #374953;"><!-- Title -->
<tbody>
<tr style="background-color: #b9babe; text-align: center;">
<th style="width: 15%; padding: 1em 0;">Referencia</th><th>Producto</th><th style="width: 15%;">Precio Unidad</th><th style="width: 15%;">Cantidad</th><th style="width: 20%;">Precio Total</th>
</tr>
<!-- Products -->{products} {discounts} <!-- Footer: prices -->
<tr style="background-color: #b9babe; text-align: center;"><th style="width: 15%; padding: 1em 0;">Referencia</th><th>Producto</th><th style="width: 15%;">Precio Unidad</th><th style="width: 15%;">Cantidad</th><th style="width: 20%;">Precio Total</th></tr>
<!-- Products --><!-- Footer: prices -->
<tr style="text-align: right;">
<td>&nbsp;</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="3">Productos</td>
@@ -83,16 +80,10 @@
<td>
<table style="width: 100%; font-size: 11px; color: #374953;">
<tbody>
<tr style="background-color: #b9babe; text-transform: uppercase;">
<th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de Entrega</th><th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de Facturaci&oacute;n</th>
</tr>
<tr style="background-color: #b9babe; text-transform: uppercase;"><th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de Entrega</th><th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de Facturaci&oacute;n</th></tr>
<tr>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
{delivery_block_html}
</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
{invoice_block_html}
</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_block_html}</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_block_html}</td>
</tr>
</tbody>
</table>
@@ -115,6 +106,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/order_customer_comment.html
-1
View File
@@ -36,6 +36,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/order_merchant_comment.html
+20 -18
View File
@@ -6,33 +6,35 @@
</head>
<body>
<table style="font-family:Verdana,sans-serif; font-size:11px; color:#374953; width: 550px;">
<tbody>
<tr>
<td align="left">
<a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_logo}" style="border:none;" ></a>
</td>
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">Hola <strong style="color:#DB3484;">{firstname} {lastname}</strong>,</td>
<td>&nbsp;</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Mensaje de {shop_name}</td>
<td align="left">Hola <strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Has recibido un nuevo mensaje sobre el pedido n&#176;{id_order} :</b>
<br><br>
{message}
</td>
<td>&nbsp;</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> desarrollado por <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Mensaje de {shop_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left"><strong>Has recibido un nuevo mensaje sobre el pedido n&deg;{id_order} :</strong> <br /><br /> {message}</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> desarrollado por <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
</tr>
</tbody>
</table>
</body>
</html>
</html>
mails/es/order_return_state.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/outofstock.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/password.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/password_query.html
+1 -2
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You asked to get back your {shop_name}&#039;identifiers,<br />Note that this action will change your actual password.</td>
<td align="left">You asked to get back your {shop_name}identifiers,<br />Note that this action will change your actual password.</td>
</tr>
<tr>
<td>&nbsp;</td>
@@ -36,6 +36,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/payment.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/payment_error.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/preparation.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/refund.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/reply_msg.html
-1
View File
@@ -12,6 +12,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/shipped.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/test.html
-1
View File
@@ -18,6 +18,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/voucher.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>