From a88b23b16fb4e09c2a844931631d8250b7ce1e7f Mon Sep 17 00:00:00 2001 From: Jonathan Danse Date: Mon, 3 Dec 2012 16:11:43 +0100 Subject: [PATCH] [+] Project: add the possibility to change the default color (#db3484) Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes) --- .../template/helpers/options/options.tpl | 9 ++++++ classes/Mail.php | 1 + classes/helper/HelperOptions.php | 3 ++ controllers/admin/AdminThemesController.php | 8 +++++ install-dev/data/xml/configuration.xml | 3 ++ mails/de/account.html | 8 ++--- mails/de/backoffice_order.html | 26 +++++++-------- mails/de/bankwire.html | 10 +++--- mails/de/cheque.html | 10 +++--- mails/de/contact.html | 4 +-- mails/de/contact_form.html | 6 ++-- mails/de/credit_slip.html | 8 ++--- mails/de/download_product.html | 10 +++--- mails/de/employee_password.html | 6 ++-- mails/de/guest_to_customer.html | 6 ++-- mails/de/in_transit.html | 10 +++--- mails/de/log_alert.html | 4 +-- mails/de/newsletter.html | 4 +-- mails/de/order_canceled.html | 10 +++--- mails/de/order_changed.html | 10 +++--- mails/de/order_conf.html | 14 ++++---- mails/de/order_customer_comment.html | 4 +-- mails/de/order_merchant_comment.html | 6 ++-- mails/de/order_return_state.html | 8 ++--- mails/de/outofstock.html | 10 +++--- mails/de/password.html | 6 ++-- mails/de/password_query.html | 4 +-- mails/de/payment.html | 8 ++--- mails/de/payment_error.html | 10 +++--- mails/de/preparation.html | 10 +++--- mails/de/refund.html | 10 +++--- mails/de/shipped.html | 10 +++--- mails/de/voucher.html | 6 ++-- mails/de/voucher_new.html | 22 ++++++------- mails/en/account.html | 8 ++--- mails/en/backoffice_order.html | 8 ++--- mails/en/bankwire.html | 10 +++--- mails/en/cheque.html | 10 +++--- mails/en/contact.html | 4 +-- mails/en/contact_form.html | 4 +-- mails/en/credit_slip.html | 8 ++--- mails/en/download_product.html | 10 +++--- mails/en/employee_password.html | 6 ++-- mails/en/forward_msg.html | 4 +-- mails/en/guest_to_customer.html | 6 ++-- mails/en/in_transit.html | 10 +++--- mails/en/log_alert.html | 4 +-- mails/en/newsletter.html | 4 +-- mails/en/order_canceled.html | 10 +++--- mails/en/order_changed.html | 10 +++--- mails/en/order_conf.html | 14 ++++---- mails/en/order_customer_comment.html | 4 +-- mails/en/order_merchant_comment.html | 6 ++-- mails/en/order_return_state.html | 8 ++--- mails/en/outofstock.html | 10 +++--- mails/en/password.html | 6 ++-- mails/en/password_query.html | 6 ++-- mails/en/payment.html | 10 +++--- mails/en/payment_error.html | 10 +++--- mails/en/preparation.html | 10 +++--- mails/en/refund.html | 10 +++--- mails/en/shipped.html | 10 +++--- mails/en/test.html | 2 +- mails/en/voucher.html | 6 ++-- mails/en/voucher_new.html | 4 +-- mails/es/account.html | 26 +++++++-------- mails/es/backoffice_order.html | 26 +++++++-------- mails/es/bankwire.html | 10 +++--- mails/es/cheque.html | 10 +++--- mails/es/contact.html | 22 ++++++------- mails/es/contact_form.html | 24 +++++++------- mails/es/credit_slip.html | 8 ++--- mails/es/download_product.html | 10 +++--- mails/es/guest_to_customer.html | 24 +++++++------- mails/es/in_transit.html | 10 +++--- mails/es/log_alert.html | 22 ++++++------- mails/es/newsletter.html | 22 ++++++------- mails/es/order_canceled.html | 10 +++--- mails/es/order_changed.html | 10 +++--- mails/es/order_conf.html | 14 ++++---- mails/es/order_customer_comment.html | 4 +-- mails/es/order_merchant_comment.html | 24 +++++++------- mails/es/order_return_state.html | 8 ++--- mails/es/outofstock.html | 10 +++--- mails/es/password.html | 24 +++++++------- mails/es/password_query.html | 22 ++++++------- mails/es/payment.html | 10 +++--- mails/es/payment_error.html | 10 +++--- mails/es/preparation.html | 10 +++--- mails/es/refund.html | 10 +++--- mails/es/shipped.html | 10 +++--- mails/es/voucher.html | 24 +++++++------- mails/es/voucher_new.html | 22 ++++++------- mails/fr/account.html | 26 +++++++-------- mails/fr/backoffice_order.html | 26 +++++++-------- mails/fr/bankwire.html | 10 +++--- mails/fr/cheque.html | 10 +++--- mails/fr/contact.html | 22 ++++++------- mails/fr/contact_form.html | 6 ++-- mails/fr/credit_slip.html | 8 ++--- mails/fr/download_product.html | 10 +++--- mails/fr/employee_password.html | 24 +++++++------- mails/fr/guest_to_customer.html | 24 +++++++------- mails/fr/in_transit.html | 28 ++++++++-------- mails/fr/log_alert.html | 22 ++++++------- mails/fr/newsletter.html | 22 ++++++------- mails/fr/order_canceled.html | 28 ++++++++-------- mails/fr/order_changed.html | 28 ++++++++-------- mails/fr/order_conf.html | 32 +++++++++---------- mails/fr/order_customer_comment.html | 22 ++++++------- mails/fr/order_merchant_comment.html | 24 +++++++------- mails/fr/order_return_state.html | 20 ++++++------ mails/fr/outofstock.html | 28 ++++++++-------- mails/fr/password.html | 24 +++++++------- mails/fr/password_query.html | 22 ++++++------- mails/fr/payment.html | 28 ++++++++-------- mails/fr/payment_error.html | 28 ++++++++-------- mails/fr/preparation.html | 28 ++++++++-------- mails/fr/refund.html | 28 ++++++++-------- mails/fr/shipped.html | 28 ++++++++-------- mails/fr/voucher.html | 24 +++++++------- mails/fr/voucher_new.html | 22 ++++++------- mails/it/account.html | 26 +++++++-------- mails/it/backoffice_order.html | 26 +++++++-------- mails/it/bankwire.html | 10 +++--- mails/it/cheque.html | 10 +++--- mails/it/contact.html | 22 ++++++------- mails/it/contact_form.html | 24 +++++++------- mails/it/credit_slip.html | 8 ++--- mails/it/download_product.html | 10 +++--- mails/it/employee_password.html | 24 +++++++------- mails/it/guest_to_customer.html | 24 +++++++------- mails/it/in_transit.html | 10 +++--- mails/it/log_alert.html | 22 ++++++------- mails/it/newsletter.html | 22 ++++++------- mails/it/order_canceled.html | 10 +++--- mails/it/order_changed.html | 10 +++--- mails/it/order_conf.html | 14 ++++---- mails/it/order_customer_comment.html | 22 ++++++------- mails/it/order_merchant_comment.html | 24 +++++++------- mails/it/order_return_state.html | 8 ++--- mails/it/outofstock.html | 10 +++--- mails/it/password.html | 24 +++++++------- mails/it/password_query.html | 22 ++++++------- mails/it/payment.html | 8 ++--- mails/it/payment_error.html | 10 +++--- mails/it/preparation.html | 10 +++--- mails/it/refund.html | 10 +++--- mails/it/shipped.html | 10 +++--- mails/it/voucher.html | 24 +++++++------- mails/it/voucher_new.html | 22 ++++++------- 151 files changed, 1052 insertions(+), 1028 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl index dc270ac08..efbc3e0d4 100644 --- a/admin-dev/themes/default/template/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/helpers/options/options.tpl @@ -123,6 +123,15 @@ {$field['title']}
{/if} + {elseif $field['type'] == 'color'} + {elseif $field['type'] == 'price'} {$currency_left_sign}{$currency_right_sign} {l s='(tax excl.)'} {elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang' || $field['type'] == 'selectLang'} diff --git a/classes/Mail.php b/classes/Mail.php index 5296db846..6d3ec96e1 100644 --- a/classes/Mail.php +++ b/classes/Mail.php @@ -236,6 +236,7 @@ class MailCore $template_vars['{my_account_url}'] = Context::getContext()->link->getPageLink('my-account', true, Context::getContext()->language->id); $template_vars['{guest_tracking_url}'] = Context::getContext()->link->getPageLink('guest-tracking', true, Context::getContext()->language->id); $template_vars['{history_url}'] = Context::getContext()->link->getPageLink('history', true, Context::getContext()->language->id); + $template_vars['{color}'] = Tools::safeOutput(Configuration::get('PS_MAIL_COLOR')); $swift->attachPlugin(new Swift_Plugin_Decorator(array($to_plugin => $template_vars)), 'decorator'); if ($configuration['PS_MAIL_TYPE'] == Mail::TYPE_BOTH || $configuration['PS_MAIL_TYPE'] == Mail::TYPE_TEXT) $message->attach(new Swift_Message_Part($template_txt, 'text/plain', '8bit', 'utf-8')); diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php index a8900c36c..48bb8183b 100644 --- a/classes/helper/HelperOptions.php +++ b/classes/helper/HelperOptions.php @@ -90,6 +90,9 @@ class HelperOptionsCore extends Helper $field['required'] = isset($field['required']) ? $field['required'] : $this->required; + if ($field['type'] == 'color') + $this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/jquery.colorpicker.js'); + // Cast options values if specified if ($field['type'] == 'select' && isset($field['cast'])) foreach ($field['list'] as $option_key => $option) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 029f43503..5b6695913 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -176,6 +176,14 @@ class AdminThemesControllerCore extends AdminController 2 => $this->l('I want to enable it only on touchpads'), 3 => $this->l('I want to enable it on mobile and touchpad devices') ) + ), + 'PS_MAIL_COLOR' => array( + 'title' => $this->l('Mail color'), + 'desc' => $this->l('Mail will be highlighted in this color. HTML colors only (e.g.').' "lightblue", "#CC6600")', + 'type' => 'color', + 'name' => 'PS_MAIL_COLOR', + 'size' => 30, + 'value' => Configuration::get('PS_MAIL_COLOR') ) ), 'submit' => array('title' => $this->l('Save'), 'class' => 'button') diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml index eb37f9b3a..eed4af504 100644 --- a/install-dev/data/xml/configuration.xml +++ b/install-dev/data/xml/configuration.xml @@ -748,6 +748,9 @@ Country 25 + + #db3484 + nK4KJP7jOsnzWMpo diff --git a/mails/de/account.html b/mails/de/account.html index ad17dfe6e..b42581397 100644 --- a/mails/de/account.html +++ b/mails/de/account.html @@ -14,19 +14,19 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Konto-Login-Details +Ihre Konto-Login-Details   -E-Mail-Adresse: {email}
Kennwort: {passwd} +E-Mail-Adresse: {email}
Kennwort: {passwd}   @@ -44,7 +44,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/backoffice_order.html b/mails/de/backoffice_order.html index 71147f705..6d1de4f3c 100644 --- a/mails/de/backoffice_order.html +++ b/mails/de/backoffice_order.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,27 +14,27 @@ - + - + - + - + -
 
Hi {firstname} {lastname},Hi {firstname} {lastname},
 
A new command has been generated to you.A new command has been generated to you.
 
Go on {order_link} to finalize the payment.Go on {order_link} to finalize the payment.
 
{shop_name} powered by PrestaShop™{shop_name} powered by PrestaShop™
- + + \ No newline at end of file diff --git a/mails/de/bankwire.html b/mails/de/bankwire.html index 8ac1e9d08..0d584464b 100644 --- a/mails/de/bankwire.html +++ b/mails/de/bankwire.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{order_name} +Ihre Bestellung Nr.{order_name}   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/cheque.html b/mails/de/cheque.html index dcae38ab2..b05c140b7 100644 --- a/mails/de/cheque.html +++ b/mails/de/cheque.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihr Bestellverlauf {order_name} +Ihr Bestellverlauf {order_name}   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/contact.html b/mails/de/contact.html index 112b08e55..d8acb32ad 100644 --- a/mails/de/contact.html +++ b/mails/de/contact.html @@ -14,7 +14,7 @@   -Nachricht von Ihrem Shop {shop_name} +Nachricht von Ihrem Shop {shop_name}   @@ -26,7 +26,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/contact_form.html b/mails/de/contact_form.html index f241a214f..81769e4b7 100644 --- a/mails/de/contact_form.html +++ b/mails/de/contact_form.html @@ -14,7 +14,7 @@   -Ihre Nachricht wurde korrekt an unseren Kundendienst weitergeleitet. +Ihre Nachricht wurde korrekt an unseren Kundendienst weitergeleitet.   @@ -26,13 +26,13 @@   -Wir werden so schnell wie möglich antworten. +Wir werden so schnell wie möglich antworten.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/credit_slip.html b/mails/de/credit_slip.html index 8b4320ee7..8f5df22de 100644 --- a/mails/de/credit_slip.html +++ b/mails/de/credit_slip.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{id_order} +Ihre Bestellung Nr.{id_order}   @@ -32,13 +32,13 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverfolgung" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverfolgung" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/download_product.html b/mails/de/download_product.html index 8f2d3ecb7..ed2eb1a5b 100644 --- a/mails/de/download_product.html +++ b/mails/de/download_product.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, danke für Ihren Einkauf bei {shop_name}. +Hallo {firstname} {lastname}, danke für Ihren Einkauf bei {shop_name}.   -Produkt (e) zum Download +Produkt (e) zum Download   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/employee_password.html b/mails/de/employee_password.html index 32e042b3c..46a08a614 100644 --- a/mails/de/employee_password.html +++ b/mails/de/employee_password.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre persönlichen Login-Daten +Ihre persönlichen Login-Daten   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/guest_to_customer.html b/mails/de/guest_to_customer.html index ef792b505..8a0660a7e 100644 --- a/mails/de/guest_to_customer.html +++ b/mails/de/guest_to_customer.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihr Gast-Konto wurde in ein Kunden-Konto umgewandelt +Ihr Gast-Konto wurde in ein Kunden-Konto umgewandelt   @@ -38,7 +38,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/in_transit.html b/mails/de/in_transit.html index c54d878f1..597b9a405 100644 --- a/mails/de/in_transit.html +++ b/mails/de/in_transit.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{id_order} +Ihre Bestellung Nr.{id_order}   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/log_alert.html b/mails/de/log_alert.html index 0687ff878..83f3124e5 100755 --- a/mails/de/log_alert.html +++ b/mails/de/log_alert.html @@ -20,7 +20,7 @@   -Neue Log-Warnung +Neue Log-Warnung   @@ -38,7 +38,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/newsletter.html b/mails/de/newsletter.html index 009ec9c42..689920a2f 100644 --- a/mails/de/newsletter.html +++ b/mails/de/newsletter.html @@ -14,7 +14,7 @@   -Nachricht von {shop_name} +Nachricht von {shop_name}   @@ -26,7 +26,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_canceled.html b/mails/de/order_canceled.html index 5fca793f4..4c9662cbb 100644 --- a/mails/de/order_canceled.html +++ b/mails/de/order_canceled.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{id_order} +Ihre Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_changed.html b/mails/de/order_changed.html index 18d2fc3d1..dfd58d8e9 100644 --- a/mails/de/order_changed.html +++ b/mails/de/order_changed.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Order changed +Your order with the reference {order_name} - Order changed   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/de/order_conf.html b/mails/de/order_conf.html index 22d03fd64..9026ea9a9 100644 --- a/mails/de/order_conf.html +++ b/mails/de/order_conf.html @@ -14,19 +14,19 @@   -Hallo {firstname} {lastname}, danke für Ihren Einkauf bei {shop_name}. +Hallo {firstname} {lastname}, danke für Ihren Einkauf bei {shop_name}.   -Details zu Ihrer Bestellung +Details zu Ihrer Bestellung   -Bestellung: {order_name} vom {date}
Zahlung: {payment} +Bestellung: {order_name} vom {date}
Zahlung: {payment}   @@ -75,7 +75,7 @@   -Versand +Versand   @@ -103,16 +103,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_customer_comment.html b/mails/de/order_customer_comment.html index f6113b85a..3fd939dc6 100644 --- a/mails/de/order_customer_comment.html +++ b/mails/de/order_customer_comment.html @@ -20,7 +20,7 @@   -Nachricht von {firstname} {lastname} ({email}) +Nachricht von {firstname} {lastname} ({email})   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_merchant_comment.html b/mails/de/order_merchant_comment.html index 07e659ca9..ac8b6de13 100644 --- a/mails/de/order_merchant_comment.html +++ b/mails/de/order_merchant_comment.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Nachricht von {shop_name} +Nachricht von {shop_name}   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_return_state.html b/mails/de/order_return_state.html index a31814e16..f8e925b22 100644 --- a/mails/de/order_return_state.html +++ b/mails/de/order_return_state.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellrücksendung Nr. {id_order_return} +Der Verlauf Ihrer Bestellrücksendung Nr. {id_order_return}   @@ -32,13 +32,13 @@   -Sie können diese Bestellrücksendung im Abschnitt "Bestellverlauf" Ihres Kontos ansehen, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellrücksendung im Abschnitt "Bestellverlauf" Ihres Kontos ansehen, indem Sie auf unserer Webseite auf "Mein Konto" klicken.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/outofstock.html b/mails/de/outofstock.html index ec07e7f5c..0d1f92ae0 100644 --- a/mails/de/outofstock.html +++ b/mails/de/outofstock.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/password.html b/mails/de/password.html index 9533a6e30..83904f395 100644 --- a/mails/de/password.html +++ b/mails/de/password.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre neuen Login-Details +Ihre neuen Login-Details   @@ -38,7 +38,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/password_query.html b/mails/de/password_query.html index d58393fc4..f9c22f77c 100644 --- a/mails/de/password_query.html +++ b/mails/de/password_query.html @@ -14,7 +14,7 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/payment.html b/mails/de/payment.html index d261e7efc..f83376680 100644 --- a/mails/de/payment.html +++ b/mails/de/payment.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{id_order} Verlauf +Ihre Bestellung Nr.{id_order} Verlauf   @@ -32,13 +32,13 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/payment_error.html b/mails/de/payment_error.html index b54b87343..7747ac603 100644 --- a/mails/de/payment_error.html +++ b/mails/de/payment_error.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf"Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf"Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/preparation.html b/mails/de/preparation.html index 0bde6833c..4cc4f21f6 100644 --- a/mails/de/preparation.html +++ b/mails/de/preparation.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/refund.html b/mails/de/refund.html index 3fb4a61e4..0259c74cc 100644 --- a/mails/de/refund.html +++ b/mails/de/refund.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/shipped.html b/mails/de/shipped.html index bc2ea167d..91738bcfb 100644 --- a/mails/de/shipped.html +++ b/mails/de/shipped.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/voucher.html b/mails/de/voucher.html index 30bf19eb3..b4e914f72 100644 --- a/mails/de/voucher.html +++ b/mails/de/voucher.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Verlauf Ihrer Bestellung Nr.{id_order} +Verlauf Ihrer Bestellung Nr.{id_order}   @@ -38,7 +38,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/voucher_new.html b/mails/de/voucher_new.html index a248df3dd..24090efd2 100644 --- a/mails/de/voucher_new.html +++ b/mails/de/voucher_new.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
 
Hi {firstname} {lastname},Hi {firstname} {lastname},
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- + + \ No newline at end of file diff --git a/mails/en/account.html b/mails/en/account.html index 51894fff7..a7e86c404 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -14,19 +14,19 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your {shop_name} login details +Your {shop_name} login details   -Thank you for creating a customer account at {shop_name}.

Here are your login details:

E-mail address: {email}
Password: {passwd} +Thank you for creating a customer account at {shop_name}.

Here are your login details:

E-mail address: {email}
Password: {passwd}   @@ -46,7 +46,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/backoffice_order.html b/mails/en/backoffice_order.html index d12b75ae7..cd5bd4286 100644 --- a/mails/en/backoffice_order.html +++ b/mails/en/backoffice_order.html @@ -14,25 +14,25 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -A new command has been generated to you. +A new command has been generated to you.   -Go on {order_link} to finalize the payment. +Go on {order_link} to finalize the payment.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/bankwire.html b/mails/en/bankwire.html index 3ff23aeed..624ed99f3 100644 --- a/mails/en/bankwire.html +++ b/mails/en/bankwire.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Awaiting wire payment +Your order with the reference {order_name} - Awaiting wire payment   @@ -38,16 +38,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/cheque.html b/mails/en/cheque.html index e2a84caa8..80b88796a 100644 --- a/mails/en/cheque.html +++ b/mails/en/cheque.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Awaiting check payment +Your order with the reference {order_name} - Awaiting check payment   @@ -38,16 +38,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/contact.html b/mails/en/contact.html index 87bd641df..62ab2c9ab 100644 --- a/mails/en/contact.html +++ b/mails/en/contact.html @@ -14,7 +14,7 @@   -Message from a {shop_name} customer +Message from a {shop_name} customer   @@ -26,7 +26,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html index 524994467..67ee471ca 100644 --- a/mails/en/contact_form.html +++ b/mails/en/contact_form.html @@ -14,7 +14,7 @@   -Your message to {shop_name} Customer Service +Your message to {shop_name} Customer Service   @@ -32,7 +32,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index 4d4430eae..6e77a07ef 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Credit slip created +Your order with the reference {order_name} - Credit slip created   @@ -32,13 +32,13 @@   -You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop. +You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/download_product.html b/mails/en/download_product.html index 89ffc55ec..679f3826d 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -14,13 +14,13 @@   -Hello {firstname} {lastname} +Hello {firstname} {lastname}   -Product(s) now available for download +Product(s) now available for download   @@ -38,16 +38,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html index beffeffef..adcd4d689 100644 --- a/mails/en/employee_password.html +++ b/mails/en/employee_password.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your {shop_name} login information +Your {shop_name} login information   @@ -32,7 +32,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html index e2ffb7853..095308131 100644 --- a/mails/en/forward_msg.html +++ b/mails/en/forward_msg.html @@ -8,7 +8,7 @@ - + @@ -20,7 +20,7 @@ - +
Customer service - Forwarded discussionCustomer service - Forwarded discussion
  
{shop_name} powered by PrestaShop™{shop_name} powered by PrestaShop™
diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html index 5858f3800..1e04e69d2 100644 --- a/mails/en/guest_to_customer.html +++ b/mails/en/guest_to_customer.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your customer account creation +Your customer account creation   @@ -44,7 +44,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html index e464c66d0..5ea27e06b 100755 --- a/mails/en/in_transit.html +++ b/mails/en/in_transit.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - In transit +Your order with the reference {order_name} - In transit   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html index d434f6ece..e6ca7b45e 100755 --- a/mails/en/log_alert.html +++ b/mails/en/log_alert.html @@ -20,7 +20,7 @@   -You have received a new log alert +You have received a new log alert   @@ -38,7 +38,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/newsletter.html b/mails/en/newsletter.html index 7d6c70523..02c6d14ac 100644 --- a/mails/en/newsletter.html +++ b/mails/en/newsletter.html @@ -14,7 +14,7 @@   -Newsletter from {shop_name} +Newsletter from {shop_name}   @@ -26,7 +26,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html index e32c8030d..08d4d898f 100644 --- a/mails/en/order_canceled.html +++ b/mails/en/order_canceled.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Order cancelled +Your order with the reference {order_name} - Order cancelled   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html index 42c5c9d25..04ea9150c 100644 --- a/mails/en/order_changed.html +++ b/mails/en/order_changed.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Order changed +Your order with the reference {order_name} - Order changed   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index b633150ed..b3b54eeb8 100644 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -14,19 +14,19 @@   -Hi {firstname} {lastname},

Thank you for shopping with {shop_name}! +Hi {firstname} {lastname},

Thank you for shopping with {shop_name}!   -Order details +Order details   -Order: {order_name} placed on {date}
Payment: {payment} +Order: {order_name} placed on {date}
Payment: {payment}   @@ -83,7 +83,7 @@   -Shipping +Shipping   @@ -111,16 +111,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_customer_comment.html b/mails/en/order_customer_comment.html index e32f17fdf..671a97dfd 100644 --- a/mails/en/order_customer_comment.html +++ b/mails/en/order_customer_comment.html @@ -20,7 +20,7 @@   -Message from a customer +Message from a customer   @@ -32,7 +32,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_merchant_comment.html b/mails/en/order_merchant_comment.html index 19c97e84b..8b5c04615 100644 --- a/mails/en/order_merchant_comment.html +++ b/mails/en/order_merchant_comment.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -New message from {shop_name} +New message from {shop_name}   @@ -32,7 +32,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html index 1d340104a..4ba720b7c 100644 --- a/mails/en/order_return_state.html +++ b/mails/en/order_return_state.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Return #{id_order_return} - update +Return #{id_order_return} - update   @@ -32,13 +32,13 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

  -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/outofstock.html b/mails/en/outofstock.html index bd3c6e9b7..59e9d1b26 100644 --- a/mails/en/outofstock.html +++ b/mails/en/outofstock.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Item(s) out of stock +Your order with the reference {order_name} - Item(s) out of stock   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/password.html b/mails/en/password.html index 2cf30df6e..fdfa0486f 100644 --- a/mails/en/password.html +++ b/mails/en/password.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your new {shop_name} login details +Your new {shop_name} login details   @@ -38,7 +38,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/password_query.html b/mails/en/password_query.html index e91f7e29d..b85db5bb7 100644 --- a/mails/en/password_query.html +++ b/mails/en/password_query.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Password reset request for {shop_name} +Password reset request for {shop_name}   @@ -38,7 +38,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/payment.html b/mails/en/payment.html index 06149f20a..489b0063f 100644 --- a/mails/en/payment.html +++ b/mails/en/payment.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Payment processed +Your order with the reference {order_name} - Payment processed   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html index 53a179665..c6e117334 100644 --- a/mails/en/payment_error.html +++ b/mails/en/payment_error.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Payment processing error +Your order with the reference {order_name} - Payment processing error   @@ -38,16 +38,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/preparation.html b/mails/en/preparation.html index 83d013915..c6e4be688 100644 --- a/mails/en/preparation.html +++ b/mails/en/preparation.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order {order_name} - Processing +Your order {order_name} - Processing   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/refund.html b/mails/en/refund.html index 68a1bff78..1e7236671 100644 --- a/mails/en/refund.html +++ b/mails/en/refund.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Refund processed for order with the reference {order_name} +Refund processed for order with the reference {order_name}   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/shipped.html b/mails/en/shipped.html index bb8656601..9f17deb21 100644 --- a/mails/en/shipped.html +++ b/mails/en/shipped.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Shipped +Your order with the reference {order_name} - Shipped   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/test.html b/mails/en/test.html index 1a037ce34..8e2a9b412 100644 --- a/mails/en/test.html +++ b/mails/en/test.html @@ -14,7 +14,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/voucher.html b/mails/en/voucher.html index 582ca6106..c9c04acb0 100644 --- a/mails/en/voucher.html +++ b/mails/en/voucher.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Voucher created +Your order with the reference {order_name} - Voucher created   @@ -38,7 +38,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/voucher_new.html b/mails/en/voucher_new.html index 0f1da4ddb..3678364c5 100644 --- a/mails/en/voucher_new.html +++ b/mails/en/voucher_new.html @@ -14,7 +14,7 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/es/account.html b/mails/es/account.html index 844ff7727..3bb255478 100644 --- a/mails/es/account.html +++ b/mails/es/account.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,19 +14,19 @@ - + - + - + @@ -44,9 +44,9 @@ - + -
 
Hola {firstname} {lastname},Hola {firstname} {lastname},
 
Detalles de tu cuentaDetalles de tu cuenta
 
Email: {email}
Contraseña: {passwd}		Email: {email}
Contraseña: {passwd}
  
{shop_name} desarrollado por PrestaShop™{shop_name} desarrollado por PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/backoffice_order.html b/mails/es/backoffice_order.html index 1c451a44b..b5b27abcd 100644 --- a/mails/es/backoffice_order.html +++ b/mails/es/backoffice_order.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -14,27 +14,27 @@ - + - + - + - + -
 
Hola {firstname} {lastname},Hola {firstname} {lastname},
 
Una nueva orden se ha generado para ustedUna nueva orden se ha generado para usted
 
Vaya {order_link} para finalizar el pago.Vaya {order_link} para finalizar el pago.
 
{shop_name} powered by PrestaShop™{shop_name} powered by PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/bankwire.html b/mails/es/bankwire.html index 5da9b1bfc..b92d68ca1 100644 --- a/mails/es/bankwire.html +++ b/mails/es/bankwire.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Tu pedido es el número #{id_order} +Tu pedido es el número #{id_order}   @@ -38,16 +38,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/cheque.html b/mails/es/cheque.html index 8fd074420..b3eaf40f4 100644 --- a/mails/es/cheque.html +++ b/mails/es/cheque.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Tu pedido es el número #{id_order} +Tu pedido es el número #{id_order}   @@ -38,16 +38,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/contact.html b/mails/es/contact.html index d1375814c..ded1f8f6b 100644 --- a/mails/es/contact.html +++ b/mails/es/contact.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,9 +26,9 @@ - + -
 
Mensaje desde tu tienda {shop_name}Mensaje desde tu tienda {shop_name}
  
{shop_name} desarrollado por PrestaShop™{shop_name} desarrollado por PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/contact_form.html b/mails/es/contact_form.html index 11226bb4c..2e2b2e0e6 100644 --- a/mails/es/contact_form.html +++ b/mails/es/contact_form.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -40,15 +40,15 @@ - + - + -
 
SU mensaje se envio correctamente al centro de atención de cliente.SU mensaje se envio correctamente al centro de atención de cliente.
  
Responderemos a la brevedadResponderemos a la brevedad
 
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/credit_slip.html b/mails/es/credit_slip.html index 7c80135be..3d91e9e72 100644 --- a/mails/es/credit_slip.html +++ b/mails/es/credit_slip.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Histórico del Pedido #{id_order} +Histórico del Pedido #{id_order}   @@ -32,13 +32,13 @@   -Puedes revisar este pedido y descargar la factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web. +Puedes revisar este pedido y descargar la factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/download_product.html b/mails/es/download_product.html index 40eba5b90..47f04e092 100644 --- a/mails/es/download_product.html +++ b/mails/es/download_product.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, gracias por comprar en {shop_name}. +Hola {firstname} {lastname}, gracias por comprar en {shop_name}.   -Producto(s) para descargar +Producto(s) para descargar   @@ -38,16 +38,16 @@   -Puedes revisar este pedido y descargar su factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web. +Puedes revisar este pedido y descargar su factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/guest_to_customer.html b/mails/es/guest_to_customer.html index 1042afc2b..0aca03322 100644 --- a/mails/es/guest_to_customer.html +++ b/mails/es/guest_to_customer.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,9 +38,9 @@ - + -
 
Hola {firstname} {lastname},Hola {firstname} {lastname},
 
Su cuenta de invitado se ha transformado en cuenta de clienteSu cuenta de invitado se ha transformado en cuenta de cliente
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/in_transit.html b/mails/es/in_transit.html index 535db9932..726eb7906 100644 --- a/mails/es/in_transit.html +++ b/mails/es/in_transit.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Historial del Pedido #{id_order} +Historial del Pedido #{id_order}   @@ -38,16 +38,16 @@   -También puedes revisar tus pedidos y descargar tus facturas desde tu "Historial de Pedidos" dentro de tu cuenta en nuestra web. +También puedes revisar tus pedidos y descargar tus facturas desde tu "Historial de Pedidos" dentro de tu cuenta en nuestra web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/log_alert.html b/mails/es/log_alert.html index 5c53a631b..7311b9808 100755 --- a/mails/es/log_alert.html +++ b/mails/es/log_alert.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -38,9 +38,9 @@ - + -
 
Nueva alerta Nueva alerta 
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/newsletter.html b/mails/es/newsletter.html index 55ce176f8..b7971c14b 100644 --- a/mails/es/newsletter.html +++ b/mails/es/newsletter.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,9 +26,9 @@ - + -
 
Newsletter de {shop_name}Newsletter de {shop_name}
  
{shop_name} desarrollado por PrestaShop™{shop_name} desarrollado por PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/order_canceled.html b/mails/es/order_canceled.html index ab85c3f1c..afae99f4a 100644 --- a/mails/es/order_canceled.html +++ b/mails/es/order_canceled.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Respecto al pedido #{id_order} +Respecto al pedido #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar este pedido y descargar tu factura desde la sección "Seguimiento de Pedido" de su cuenta "Mi Cuenta" en nuestra web. +Puedes revisar este pedido y descargar tu factura desde la sección "Seguimiento de Pedido" de su cuenta "Mi Cuenta" en nuestra web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/order_changed.html b/mails/es/order_changed.html index 18d2fc3d1..dfd58d8e9 100644 --- a/mails/es/order_changed.html +++ b/mails/es/order_changed.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Order changed +Your order with the reference {order_name} - Order changed   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/es/order_conf.html b/mails/es/order_conf.html index 7fa6743d8..866d75ad0 100644 --- a/mails/es/order_conf.html +++ b/mails/es/order_conf.html @@ -14,19 +14,19 @@   -Hola {firstname} {lastname}, gracias por comprar en {shop_name}. +Hola {firstname} {lastname}, gracias por comprar en {shop_name}.   -Detalles del Pedido +Detalles del Pedido   -Pedido: {order_name} realizado el {date}
Forma de Pago: {payment} +Pedido: {order_name} realizado el {date}
Forma de Pago: {payment}   @@ -70,7 +70,7 @@   -Envío +Envío   @@ -98,16 +98,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/order_customer_comment.html b/mails/es/order_customer_comment.html index 02df0d4fb..5a78a924d 100644 --- a/mails/es/order_customer_comment.html +++ b/mails/es/order_customer_comment.html @@ -20,7 +20,7 @@   -Mensaje desde {shop_name} +Mensaje desde {shop_name}   @@ -32,7 +32,7 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. diff --git a/mails/es/order_merchant_comment.html b/mails/es/order_merchant_comment.html index 4874adabf..c84ababb9 100644 --- a/mails/es/order_merchant_comment.html +++ b/mails/es/order_merchant_comment.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,9 +32,9 @@ - + -
 
Hola {firstname} {lastname},Hola {firstname} {lastname},
 
Mensaje de {shop_name}Mensaje de {shop_name}
  
{shop_name} desarrollado por PrestaShop™{shop_name} desarrollado por PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/order_return_state.html b/mails/es/order_return_state.html index 3565f1c48..e05553bc3 100644 --- a/mails/es/order_return_state.html +++ b/mails/es/order_return_state.html @@ -14,13 +14,13 @@   -Buenos días {firstname} {lastname}, +Buenos días {firstname} {lastname},   -Historico de su devolución N°{id_order_return} +Historico de su devolución N°{id_order_return}   @@ -32,13 +32,13 @@   -Puede acceder al seguimiento de su devolución y descargar su factura en "Histórico de pedidos" en la sección "Mi cuenta" de nuestra Web. +Puede acceder al seguimiento de su devolución y descargar su factura en "Histórico de pedidos" en la sección "Mi cuenta" de nuestra Web.   -{shop_name} +{shop_name} diff --git a/mails/es/outofstock.html b/mails/es/outofstock.html index fbf513767..294b86488 100644 --- a/mails/es/outofstock.html +++ b/mails/es/outofstock.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Incidencia en tu pedido #{id_order} +Incidencia en tu pedido #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/password.html b/mails/es/password.html index ba39af2ea..f9aa05138 100644 --- a/mails/es/password.html +++ b/mails/es/password.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,9 +38,9 @@ - + -
 
Hola {firstname} {lastname},Hola {firstname} {lastname},
 
Detalles de tu nuevo LoginDetalles de tu nuevo Login
  
{shop_name} pdesarrollado por PrestaShop™{shop_name} pdesarrollado por PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/password_query.html b/mails/es/password_query.html index a14663e33..819a1caf5 100644 --- a/mails/es/password_query.html +++ b/mails/es/password_query.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
 
Hola {firstname} {lastname},Hola {firstname} {lastname},
  
{shop_name} desarrollado por PrestaShop™{shop_name} desarrollado por PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/payment.html b/mails/es/payment.html index c89a8a20d..899d4b9b2 100644 --- a/mails/es/payment.html +++ b/mails/es/payment.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -En referencia a tu pedido #{id_order}: +En referencia a tu pedido #{id_order}:   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/payment_error.html b/mails/es/payment_error.html index 2fd1a2d86..8b9444473 100644 --- a/mails/es/payment_error.html +++ b/mails/es/payment_error.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Incidencia en su pedido #{id_order} +Incidencia en su pedido #{id_order}   @@ -38,16 +38,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/preparation.html b/mails/es/preparation.html index c8bbe0aaf..66ced9016 100644 --- a/mails/es/preparation.html +++ b/mails/es/preparation.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Sobre tu pedido: #{id_order} +Sobre tu pedido: #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/refund.html b/mails/es/refund.html index 5e3e62ae0..11a5832ed 100644 --- a/mails/es/refund.html +++ b/mails/es/refund.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Sobre su pedido: #{id_order} +Sobre su pedido: #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/shipped.html b/mails/es/shipped.html index 73c008988..403e61a82 100644 --- a/mails/es/shipped.html +++ b/mails/es/shipped.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Historial de tu Pedido #{id_order} +Historial de tu Pedido #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -Si tiene una cuenta de invitado, puede seguirla desde la sección  "Seguimiento de invitado" en nuestro sitio. +Si tiene una cuenta de invitado, puede seguirla desde la sección  "Seguimiento de invitado" en nuestro sitio.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/es/voucher.html b/mails/es/voucher.html index 9e75bc5e8..b1b44c437 100644 --- a/mails/es/voucher.html +++ b/mails/es/voucher.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,9 +38,9 @@ - + -
 
Hola {firstname} {lastname},Hola {firstname} {lastname},
 
Historial de tu Pedido #{id_order}Historial de tu Pedido #{id_order}
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- + + \ No newline at end of file diff --git a/mails/es/voucher_new.html b/mails/es/voucher_new.html index 1eedcc0c2..623aff121 100644 --- a/mails/es/voucher_new.html +++ b/mails/es/voucher_new.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
 
Hola {firstname} {lastname},Hola {firstname} {lastname},
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/account.html b/mails/fr/account.html index c77d4047b..3ab9163b4 100644 --- a/mails/fr/account.html +++ b/mails/fr/account.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,19 +14,19 @@ - + - + - + @@ -38,9 +38,9 @@ - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Merci d'avoir créé un compte sur {shop_name}. Voici un rappel de vos codes d'accès.Merci d'avoir créé un compte sur {shop_name}. Voici un rappel de vos codes d'accès.
 
Adresse e-mail : {email}
Mot de passe : {passwd}		Adresse e-mail : {email}
Mot de passe : {passwd}
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/backoffice_order.html b/mails/fr/backoffice_order.html index 65b301bdd..b1887f179 100644 --- a/mails/fr/backoffice_order.html +++ b/mails/fr/backoffice_order.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,27 +14,27 @@ - + - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Une nouvelle commande vous a été générée.Une nouvelle commande vous a été générée.
 
Rendez vous sur {order_link} pour finaliser le paiement.Rendez vous sur {order_link} pour finaliser le paiement.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/bankwire.html b/mails/fr/bankwire.html index 77b9cd6cd..5776579fb 100644 --- a/mails/fr/bankwire.html +++ b/mails/fr/bankwire.html @@ -14,13 +14,13 @@   -Bonjour {firstname} {lastname}, +Bonjour {firstname} {lastname},   -Historique de votre commande ayant pour référence {order_name}. +Historique de votre commande ayant pour référence {order_name}.   @@ -38,16 +38,16 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/cheque.html b/mails/fr/cheque.html index a95040cf5..a704184e3 100644 --- a/mails/fr/cheque.html +++ b/mails/fr/cheque.html @@ -14,13 +14,13 @@   -Bonjour {firstname} {lastname}, +Bonjour {firstname} {lastname},   -Historique de votre commande ayant pour référence {order_name}. +Historique de votre commande ayant pour référence {order_name}.   @@ -38,16 +38,16 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/contact.html b/mails/fr/contact.html index 29bbcf39c..16c59bb95 100644 --- a/mails/fr/contact.html +++ b/mails/fr/contact.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,9 +26,9 @@ - + -
 
Vous avez reçu un message de la part d'un client depuis votre boutique {shop_name}.Vous avez reçu un message de la part d'un client depuis votre boutique {shop_name}.
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/contact_form.html b/mails/fr/contact_form.html index 3267f3027..176f242dd 100644 --- a/mails/fr/contact_form.html +++ b/mails/fr/contact_form.html @@ -14,7 +14,7 @@   -Votre message a bien été envoyé à notre service client. +Votre message a bien été envoyé à notre service client.   @@ -26,13 +26,13 @@   -Nous vous répondrons dès que possible. +Nous vous répondrons dès que possible.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/credit_slip.html b/mails/fr/credit_slip.html index 6d8098265..d97285429 100644 --- a/mails/fr/credit_slip.html +++ b/mails/fr/credit_slip.html @@ -14,13 +14,13 @@   -Bonjour {firstname} {lastname}, +Bonjour {firstname} {lastname},   -Historique de votre commande ayant pour référence {order_name}. +Historique de votre commande ayant pour référence {order_name}.   @@ -32,13 +32,13 @@   -Vous pouvez accéder à cet avoir et télécharger votre facture dans "Suivi des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder à cet avoir et télécharger votre facture dans "Suivi des commandes" de la rubrique "Mon compte" sur notre site.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/download_product.html b/mails/fr/download_product.html index ec6795634..d907ffd23 100644 --- a/mails/fr/download_product.html +++ b/mails/fr/download_product.html @@ -14,13 +14,13 @@   -Bonjour {firstname} {lastname}, +Bonjour {firstname} {lastname},   -Produits à télécharger +Produits à télécharger   @@ -38,16 +38,16 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/employee_password.html b/mails/fr/employee_password.html index 40b974615..ff169e281 100644 --- a/mails/fr/employee_password.html +++ b/mails/fr/employee_password.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,9 +32,9 @@ - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Voici vos informations personnellesVoici vos informations personnelles
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/guest_to_customer.html b/mails/fr/guest_to_customer.html index 7c0eca1d3..f615a5c01 100644 --- a/mails/fr/guest_to_customer.html +++ b/mails/fr/guest_to_customer.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -35,9 +35,9 @@ - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Votre compte invité a été transformé en compte clientVotre compte invité a été transformé en compte client
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/in_transit.html b/mails/fr/in_transit.html index 8e331dddb..e36fadccb 100755 --- a/mails/fr/in_transit.html +++ b/mails/fr/in_transit.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,18 +38,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/log_alert.html b/mails/fr/log_alert.html index a0b2f5bc2..0d36e1ed2 100755 --- a/mails/fr/log_alert.html +++ b/mails/fr/log_alert.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -38,9 +38,9 @@ - + -
 
Nouveau message d'alerte enregistréNouveau message d'alerte enregistré
  
{shop_name} propulsé par PrestaShop™{shop_name} propulsé par PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/newsletter.html b/mails/fr/newsletter.html index a07876ce6..6e4c6476a 100644 --- a/mails/fr/newsletter.html +++ b/mails/fr/newsletter.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,9 +26,9 @@ - + -
 
Newsletter de {shop_name}Newsletter de {shop_name}
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/order_canceled.html b/mails/fr/order_canceled.html index 3e7356b1c..71c05e021 100644 --- a/mails/fr/order_canceled.html +++ b/mails/fr/order_canceled.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/order_changed.html b/mails/fr/order_changed.html index b1034e616..1762c47ae 100644 --- a/mails/fr/order_changed.html +++ b/mails/fr/order_changed.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
Vous pouvez consulter votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez consulter votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez consulter votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez consulter votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/order_conf.html b/mails/fr/order_conf.html index 2ff041941..2b9fd1e73 100644 --- a/mails/fr/order_conf.html +++ b/mails/fr/order_conf.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,19 +14,19 @@ - + - + - + @@ -75,7 +75,7 @@ - + @@ -103,18 +103,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname}, merci d'avoir passé commande chez {shop_name} !Bonjour {firstname} {lastname}, merci d'avoir passé commande chez {shop_name} !
 
Détails de la commandeDétails de la commande
 
Commande : {order_name} passée le {date}
Mode de paiement : {payment}		Commande : {order_name} passée le {date}
Mode de paiement : {payment}
  
LivraisonLivraison
  
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/order_customer_comment.html b/mails/fr/order_customer_comment.html index 37d7f17a1..9c4077bee 100644 --- a/mails/fr/order_customer_comment.html +++ b/mails/fr/order_customer_comment.html @@ -1,10 +1,10 @@ - - - - - Message d'un client de {shop_name} - - + + + + + Message d'un client de {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -32,9 +32,9 @@ - + -
 
Message de {firstname} {lastname} ({email})Message de {firstname} {lastname} ({email})
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/order_merchant_comment.html b/mails/fr/order_merchant_comment.html index 0ac5f9245..c873fbc99 100644 --- a/mails/fr/order_merchant_comment.html +++ b/mails/fr/order_merchant_comment.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,9 +32,9 @@ - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Message de {shop_name}Message de {shop_name}
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/order_return_state.html b/mails/fr/order_return_state.html index 3614ebefa..682f9987b 100644 --- a/mails/fr/order_return_state.html +++ b/mails/fr/order_return_state.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -38,9 +38,9 @@ - + -
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/outofstock.html b/mails/fr/outofstock.html index a21de4993..8ef90c557 100644 --- a/mails/fr/outofstock.html +++ b/mails/fr/outofstock.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/password.html b/mails/fr/password.html index 3627a7b2a..aaceac08a 100644 --- a/mails/fr/password.html +++ b/mails/fr/password.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,9 +32,9 @@ - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Voici vos codes d'accèsVoici vos codes d'accès
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/password_query.html b/mails/fr/password_query.html index a01590c3c..0ef41ea51 100644 --- a/mails/fr/password_query.html +++ b/mails/fr/password_query.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/payment.html b/mails/fr/payment.html index 8ee42d412..20271b528 100644 --- a/mails/fr/payment.html +++ b/mails/fr/payment.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/payment_error.html b/mails/fr/payment_error.html index 2be2d0ea0..ea4b481e4 100644 --- a/mails/fr/payment_error.html +++ b/mails/fr/payment_error.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/preparation.html b/mails/fr/preparation.html index 2dd2ad381..ba559f087 100644 --- a/mails/fr/preparation.html +++ b/mails/fr/preparation.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/refund.html b/mails/fr/refund.html index cce98d242..b71a85600 100644 --- a/mails/fr/refund.html +++ b/mails/fr/refund.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/shipped.html b/mails/fr/shipped.html index 7d5b2b2b7..7afdbbb5d 100644 --- a/mails/fr/shipped.html +++ b/mails/fr/shipped.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/voucher.html b/mails/fr/voucher.html index ab900c5e3..115721db8 100644 --- a/mails/fr/voucher.html +++ b/mails/fr/voucher.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,9 +38,9 @@ - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
 
Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/voucher_new.html b/mails/fr/voucher_new.html index 8626f3990..40a882284 100644 --- a/mails/fr/voucher_new.html +++ b/mails/fr/voucher_new.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
 
Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
  
{shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/it/account.html b/mails/it/account.html index 232284bf7..045423f83 100644 --- a/mails/it/account.html +++ b/mails/it/account.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,19 +14,19 @@ - + - + - + @@ -44,10 +44,10 @@ - +
 
Salve {firstname} {lastname},Salve {firstname} {lastname},
 
I tuoi dati di login dell'accountI tuoi dati di login dell'account
 
Indirizzo e-mail: {email}
Password: {passwd}		Indirizzo e-mail: {email}
Password: {passwd}
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/backoffice_order.html b/mails/it/backoffice_order.html index 91ae1152c..ad5b4a9f5 100644 --- a/mails/it/backoffice_order.html +++ b/mails/it/backoffice_order.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,28 +14,28 @@ - + - + - + - +
 
Hi {firstname} {lastname},Hi {firstname} {lastname},
 
A new command has been generated to you.A new command has been generated to you.
 
Go on {order_link} to finalize the payment.Go on {order_link} to finalize the payment.
 
{shop_name} powered by PrestaShop™{shop_name} powered by PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/bankwire.html b/mails/it/bankwire.html index bfdbc82e7..7bf32983d 100644 --- a/mails/it/bankwire.html +++ b/mails/it/bankwire.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n.{id_order} +La cronologia del tuo ordine n.{id_order}   @@ -38,16 +38,16 @@   -Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account clicando su "Il mio account" nel nostro sito web. +Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account clicando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite"nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite"nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/cheque.html b/mails/it/cheque.html index da67fd741..40089dd19 100644 --- a/mails/it/cheque.html +++ b/mails/it/cheque.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine {order_name} +La cronologia del tuo ordine {order_name}   @@ -38,16 +38,16 @@   -Puoi rivedere l'ordine e scaricare la fattura dalla sezione"Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere l'ordine e scaricare la fattura dalla sezione"Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite" del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/contact.html b/mails/it/contact.html index d099e7d5b..14afec848 100644 --- a/mails/it/contact.html +++ b/mails/it/contact.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,10 +26,10 @@ - +
 
Messaggio dal tuo negozio {shop_name}Messaggio dal tuo negozio {shop_name}
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/contact_form.html b/mails/it/contact_form.html index e860c8e66..2e863d553 100644 --- a/mails/it/contact_form.html +++ b/mails/it/contact_form.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,16 +26,16 @@ - + - +
 
Il tuo messaggio è stato correttamente inviato al nostro Servizio Clienti.Il tuo messaggio è stato correttamente inviato al nostro Servizio Clienti.
  
Risponderemo quanto prima.Risponderemo quanto prima.
 
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/credit_slip.html b/mails/it/credit_slip.html index 37a9f7cb6..62184a1d8 100644 --- a/mails/it/credit_slip.html +++ b/mails/it/credit_slip.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n.{id_order} +La cronologia del tuo ordine n.{id_order}   @@ -32,13 +32,13 @@   -Puoi rivedere questa nota di credito e scaricare la fattura dalla sezione "Controllo ordini"del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questa nota di credito e scaricare la fattura dalla sezione "Controllo ordini"del tuo account cliccando su "Il mio account" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/download_product.html b/mails/it/download_product.html index a023e9381..61e2ade31 100644 --- a/mails/it/download_product.html +++ b/mails/it/download_product.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, grazie di aver acquistato con {shop_name}. +Salve {firstname} {lastname}, grazie di aver acquistato con {shop_name}.   -Prodotto/i da scaricare +Prodotto/i da scaricare   @@ -38,16 +38,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/employee_password.html b/mails/it/employee_password.html index a62ac1ac5..cf689220f 100644 --- a/mails/it/employee_password.html +++ b/mails/it/employee_password.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,10 +32,10 @@ - +
 
Salve {firstname} {lastname},Salve {firstname} {lastname},
 
I tuoi dati personali di loginI tuoi dati personali di login
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/guest_to_customer.html b/mails/it/guest_to_customer.html index 309d3c4b0..1f4f0c488 100644 --- a/mails/it/guest_to_customer.html +++ b/mails/it/guest_to_customer.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,10 +38,10 @@ - +
 
Salve {firstname} {lastname},Salve {firstname} {lastname},
 
Il tuo account ospite è stato trasformato in account clienteIl tuo account ospite è stato trasformato in account cliente
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/in_transit.html b/mails/it/in_transit.html index fb6ab8286..0f9b585cd 100644 --- a/mails/it/in_transit.html +++ b/mails/it/in_transit.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n.{id_order} +La cronologia del tuo ordine n.{id_order}   @@ -38,16 +38,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/log_alert.html b/mails/it/log_alert.html index f139a74d2..4a8e3da6f 100755 --- a/mails/it/log_alert.html +++ b/mails/it/log_alert.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -38,10 +38,10 @@ - +
 
Nuovo messaggio di avvisoNuovo messaggio di avviso
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/newsletter.html b/mails/it/newsletter.html index 78816108c..df5d9e6ae 100644 --- a/mails/it/newsletter.html +++ b/mails/it/newsletter.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,10 +26,10 @@ - +
 
Newsletter da {shop_name}Newsletter da {shop_name}
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/order_canceled.html b/mails/it/order_canceled.html index bf03ef834..b51d53c44 100644 --- a/mails/it/order_canceled.html +++ b/mails/it/order_canceled.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Riguardo al tuo ordine n.{id_order} +Riguardo al tuo ordine n.{id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/order_changed.html b/mails/it/order_changed.html index 62b96dadf..6dda627ca 100644 --- a/mails/it/order_changed.html +++ b/mails/it/order_changed.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Order changed +Your order with the reference {order_name} - Order changed   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/it/order_conf.html b/mails/it/order_conf.html index 022d90366..1ee5ea498 100644 --- a/mails/it/order_conf.html +++ b/mails/it/order_conf.html @@ -14,19 +14,19 @@   -Salve {firstname} {lastname}, grazie di aver acquistato con {shop_name}. +Salve {firstname} {lastname}, grazie di aver acquistato con {shop_name}.   -Dati dell'ordine +Dati dell'ordine   -Ordine: {order_name} effettuato il {date}
Pagamento: {payment} +Ordine: {order_name} effettuato il {date}
Pagamento: {payment}   @@ -75,7 +75,7 @@   -Spedizione +Spedizione   @@ -103,16 +103,16 @@   -Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/order_customer_comment.html b/mails/it/order_customer_comment.html index 1050f00dd..bb36a3c41 100644 --- a/mails/it/order_customer_comment.html +++ b/mails/it/order_customer_comment.html @@ -1,10 +1,10 @@ - - - - - Messaggio da un cliente da {shop_name} - - + + + + + Messaggio da un cliente da {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -32,10 +32,10 @@ - +
 
Messaggio da {firstname} {lastname} ({email})Messaggio da {firstname} {lastname} ({email})
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/order_merchant_comment.html b/mails/it/order_merchant_comment.html index fa66fde76..0f0605374 100644 --- a/mails/it/order_merchant_comment.html +++ b/mails/it/order_merchant_comment.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,10 +32,10 @@ - +
 
Salve {firstname} {lastname},Salve {firstname} {lastname},
 
Messaggio da {shop_name}Messaggio da {shop_name}
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/order_return_state.html b/mails/it/order_return_state.html index 1d00a9593..4a6ebbd36 100644 --- a/mails/it/order_return_state.html +++ b/mails/it/order_return_state.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Cronologia della restituzione dell'ordine n.{id_order_return} +Cronologia della restituzione dell'ordine n.{id_order_return}   @@ -32,13 +32,13 @@   -Puoi rivedere questo ordine nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/outofstock.html b/mails/it/outofstock.html index e7176cb71..fc4bb0975 100644 --- a/mails/it/outofstock.html +++ b/mails/it/outofstock.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n. id_order} +La cronologia del tuo ordine n. id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web. +Se hai un account ospite puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/password.html b/mails/it/password.html index 8cf5b8311..d61da3270 100644 --- a/mails/it/password.html +++ b/mails/it/password.html @@ -1,10 +1,10 @@ - - - - - Messagio da {shop_name} - - + + + + + Messagio da {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,10 +38,10 @@ - +
 
Salve {firstname} {lastname},Salve {firstname} {lastname},
 
I tuoi nuovi dati di loginI tuoi nuovi dati di login
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/password_query.html b/mails/it/password_query.html index 288bcefc2..f81b2c2f3 100644 --- a/mails/it/password_query.html +++ b/mails/it/password_query.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,10 +32,10 @@ - +
 
Salve {firstname} {lastname},Salve {firstname} {lastname},
  
{shop_name} realised by PrestaShop™{shop_name} realised by PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/payment.html b/mails/it/payment.html index 4c2683f4a..ec753af87 100644 --- a/mails/it/payment.html +++ b/mails/it/payment.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n.{id_order} +La cronologia del tuo ordine n.{id_order}   @@ -32,13 +32,13 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/payment_error.html b/mails/it/payment_error.html index e8fa594ea..084954540 100644 --- a/mails/it/payment_error.html +++ b/mails/it/payment_error.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n. id_order} +La cronologia del tuo ordine n. id_order}   @@ -38,16 +38,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/preparation.html b/mails/it/preparation.html index 976097207..d383d2489 100644 --- a/mails/it/preparation.html +++ b/mails/it/preparation.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Cronologia del tuo ordine n.{id_order} +Cronologia del tuo ordine n.{id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospitedel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospitedel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/refund.html b/mails/it/refund.html index 5c2b49233..b79c7d15c 100644 --- a/mails/it/refund.html +++ b/mails/it/refund.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Cronologia del tuo ordine n.{id_order} +Cronologia del tuo ordine n.{id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/shipped.html b/mails/it/shipped.html index c113f8c1c..96a9a9612 100644 --- a/mails/it/shipped.html +++ b/mails/it/shipped.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Cronologia del tuo ordine n.{id_order} +Cronologia del tuo ordine n.{id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/voucher.html b/mails/it/voucher.html index e1d7593bb..84f68e06a 100644 --- a/mails/it/voucher.html +++ b/mails/it/voucher.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,10 +38,10 @@ - +
 
Salve {firstname} {lastname},Salve {firstname} {lastname},
 
Cronologia del tuo ordine n.{id_order}Cronologia del tuo ordine n.{id_order}
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file diff --git a/mails/it/voucher_new.html b/mails/it/voucher_new.html index d2d9b63f2..2119c2d4d 100644 --- a/mails/it/voucher_new.html +++ b/mails/it/voucher_new.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,10 +32,10 @@ - +
 
Hi {firstname} {lastname},Hi {firstname} {lastname},
  
{shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
- - + + \ No newline at end of file