diff --git a/mails/en/account.html b/mails/en/account.html index c19f2aa43..4e0dd7fb3 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -87,7 +87,7 @@ -

+

Your {shop_name} login details

Here are your login details:
diff --git a/mails/en/account.txt b/mails/en/account.txt index 941afd063..bf8db2761 100644 --- a/mails/en/account.txt +++ b/mails/en/account.txt @@ -5,13 +5,13 @@ Hi {firstname} {lastname}, Thank you for creating a customer account at {shop_name}. -Your {shop_name} login details Here are your login details: +Here are your login details: -E-MAIL ADDRESS: {EMAIL} +E-MAIL ADDRESS: {email} PASSWORD: {passwd} -Important Security Tips: +Important Security Tips: * Always keep your account details safe. diff --git a/mails/en/backoffice_order.txt b/mails/en/backoffice_order.txt index 4db4629cb..7222eaea6 100644 --- a/mails/en/backoffice_order.txt +++ b/mails/en/backoffice_order.txt @@ -3,9 +3,10 @@ Hi {firstname} {lastname}, -A new order has been generated on your behalf. Please go on -{order_link} [{order_link}] to finalize the -payment. +A new order has been generated on your behalf. + +Please go on {order_link} [{order_link}] to +finalize the payment. {shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/bankwire.html b/mails/en/bankwire.html index 2ea050325..5defba4a5 100644 --- a/mails/en/bankwire.html +++ b/mails/en/bankwire.html @@ -87,7 +87,7 @@ -

+

Order {order_name} - Awaiting wire payment

diff --git a/mails/en/bankwire.txt b/mails/en/bankwire.txt index 6742e6fdc..8e610b7be 100644 --- a/mails/en/bankwire.txt +++ b/mails/en/bankwire.txt @@ -5,12 +5,12 @@ Hi {firstname} {lastname}, Thank you for shopping with {shop_name}! -Order {order_name} - Awaiting wire payment Your order with the -reference {ORDER_NAME} has been placed successfully and will be -SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT. +Your order with the reference {order_name} has been placed +successfully and will be SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT. -You have selected to pay by wire transfer. Here are the bank details -for your transfer: +You have selected to pay by wire transfer. + +Here are the bank details for your transfer: AMOUNT: {total_paid} diff --git a/mails/en/cheque.html b/mails/en/cheque.html index a1a4d45e0..9ad882fcb 100644 --- a/mails/en/cheque.html +++ b/mails/en/cheque.html @@ -87,7 +87,7 @@ -

+

Order {order_name} - Awaiting check payment

Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment. diff --git a/mails/en/cheque.txt b/mails/en/cheque.txt index 0dfab7da5..6c62d70d9 100644 --- a/mails/en/cheque.txt +++ b/mails/en/cheque.txt @@ -5,12 +5,12 @@ Hi {firstname} {lastname}, Thank you for shopping with {shop_name}! -Order {order_name} - Awaiting check payment Your order with the -reference {ORDER_NAME} has been placed successfully and will be -SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT. +Your order with the reference {order_name} has been placed +successfully and will be SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT. -You have selected to pay by check. Here are the bank details for your -check: +You have selected to pay by check. + +Here are the bank details for your check: AMOUNT: {total_paid} diff --git a/mails/en/contact.txt b/mails/en/contact.txt index fdfbabf78..b32c0aca7 100644 --- a/mails/en/contact.txt +++ b/mails/en/contact.txt @@ -3,7 +3,9 @@ Hi {firstname} {lastname}, -Message from a {shop_name} customer CUSTOMER E-MAIL ADDRESS: {EMAIL} +Message from a {shop_name} customer + +CUSTOMER E-MAIL ADDRESS: {email} CUSTOMER MESSAGE: {message} diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html index f63fb8222..49aabbbbc 100644 --- a/mails/en/contact_form.html +++ b/mails/en/contact_form.html @@ -86,7 +86,7 @@ -

+

Your message to {shop_name} Customer Service

Your message has been sent successfully.

diff --git a/mails/en/contact_form.txt b/mails/en/contact_form.txt index 53ce27c72..f06f55da3 100644 --- a/mails/en/contact_form.txt +++ b/mails/en/contact_form.txt @@ -3,8 +3,7 @@ Hi {firstname} {lastname}, -Your message to {shop_name} Customer Service Your message has been -sent successfully. +Your message has been sent successfully. MESSAGE: {message} diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index c00b06b71..01bb0762b 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -86,7 +86,7 @@ -

+

Order {order_name} - Credit slip created

We have generated a credit slip in your name for order with the reference {order_name}. diff --git a/mails/en/credit_slip.txt b/mails/en/credit_slip.txt index 3f2a147c3..6a060074f 100644 --- a/mails/en/credit_slip.txt +++ b/mails/en/credit_slip.txt @@ -3,8 +3,8 @@ Hi {firstname} {lastname}, -Order {order_name} - Credit slip created We have generated a credit -slip in your name for order with the reference {ORDER_NAME}. +We have generated a credit slip in your name for order with the +reference {order_name}. You can review this credit slip and download your invoice from the "My credit slips" [{history_url}] section of your diff --git a/mails/en/download_product.html b/mails/en/download_product.html index c2b4c3422..81ff1fecc 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -87,7 +87,7 @@ -

+

Product(s) now available for download

You have {nbProducts} product(s) now available for download using the following link(s):

diff --git a/mails/en/download_product.txt b/mails/en/download_product.txt index 603ab80bc..632938ed8 100644 --- a/mails/en/download_product.txt +++ b/mails/en/download_product.txt @@ -4,12 +4,12 @@ Hi {firstname} {lastname}, Thank you for your order with the reference {order_name} from -{SHOP_NAME} +{shop_name} -Product(s) now available for download You have {NBPRODUCTS} -product(s) now available for download using the following link(s): +You have {nbproducts} product(s) now available for download using the +following link(s): -{virtualProducts} +{virtualproducts} You can review your order and download your invoice from the "Order history" [{history_url}] section of your diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html index 2e2490743..eaa0294a0 100644 --- a/mails/en/employee_password.html +++ b/mails/en/employee_password.html @@ -86,7 +86,7 @@ -

+

Your {shop_name} login information

Here is your personal login information for {shop_name}:

diff --git a/mails/en/employee_password.txt b/mails/en/employee_password.txt index 6056693cc..7fb2cfb05 100644 --- a/mails/en/employee_password.txt +++ b/mails/en/employee_password.txt @@ -3,8 +3,7 @@ Hi {firstname} {lastname}, -Your {shop_name} login information Here is your personal login -information for {SHOP_NAME}: +Here is your personal login information for {shop_name}: FIRST NAME: {firstname} diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html index 09ece28cb..c57d44ade 100644 --- a/mails/en/forward_msg.html +++ b/mails/en/forward_msg.html @@ -86,7 +86,7 @@ -

+

Customer service - Forwarded discussion

{employee} wanted to forward this discussion to you.

diff --git a/mails/en/forward_msg.txt b/mails/en/forward_msg.txt index c5f42a469..e807cf336 100644 --- a/mails/en/forward_msg.txt +++ b/mails/en/forward_msg.txt @@ -3,12 +3,11 @@ Hi {firstname} {lastname}, -Customer service - Forwarded discussion {EMPLOYEE} wanted to forward -this discussion to you. +{employee} wanted to forward this discussion to you. DISCUSSION HISTORY: {messages} -{EMPLOYEE} added "{COMMENT}" +{employee} added "{comment}" {shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html index 384502b80..96f340db4 100644 --- a/mails/en/guest_to_customer.html +++ b/mails/en/guest_to_customer.html @@ -86,7 +86,7 @@ -

+

Your customer account creation

Your guest account for {shop_name} has been transformed into a customer account.

diff --git a/mails/en/guest_to_customer.txt b/mails/en/guest_to_customer.txt index d7bcb43ce..a2ca5e593 100644 --- a/mails/en/guest_to_customer.txt +++ b/mails/en/guest_to_customer.txt @@ -3,8 +3,8 @@ Hi {firstname} {lastname}, -Your customer account creation Your guest account for {SHOP_NAME} has -been transformed into a customer account. +Your guest account for {shop_name} has been transformed into a +customer account. E-MAIL ADDRESS: {email} @@ -12,7 +12,7 @@ PASSWORD: {passwd} Please be careful when sharing these login details with others. -You can access your customer account on our shop: {SHOP_URL} +You can access your customer account on our shop: {shop_url} {shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html index 1fb25bfcd..af268fddf 100755 --- a/mails/en/in_transit.html +++ b/mails/en/in_transit.html @@ -86,7 +86,7 @@ -

+

Order {order_name} - In transit

Your order with the reference {order_name} is currently in transit.

diff --git a/mails/en/in_transit.txt b/mails/en/in_transit.txt index f951aa790..f575f53a2 100755 --- a/mails/en/in_transit.txt +++ b/mails/en/in_transit.txt @@ -3,8 +3,7 @@ Hi {firstname} {lastname}, -Order {order_name} - In transit Your order with the reference -{ORDER_NAME} is currently in transit. +Your order with the reference {order_name} is currently in transit. You can track your package using the following link: {followup} [{followup}] diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html index f313c376f..c71540210 100755 --- a/mails/en/log_alert.html +++ b/mails/en/log_alert.html @@ -86,7 +86,7 @@ -

+

You have received a new log alert

Warning: you have received a new log alert in your Back Office.

diff --git a/mails/en/log_alert.txt b/mails/en/log_alert.txt index c7f4d547c..5c648f815 100755 --- a/mails/en/log_alert.txt +++ b/mails/en/log_alert.txt @@ -3,8 +3,7 @@ Hi {firstname} {lastname}, -You have received a new log alert WARNING: you have received a new -log alert in your Back Office. +WARNING: you have received a new log alert in your Back Office. You can check for it in the "TOOLS" > "LOGS" section of your Back Office. diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html index 4aad11061..c17d5638f 100644 --- a/mails/en/order_canceled.html +++ b/mails/en/order_canceled.html @@ -86,7 +86,7 @@ -

+

Order {order_name} - Order cancelled

Your order with the reference {order_name} from {shop_name} has been cancelled.
diff --git a/mails/en/order_canceled.txt b/mails/en/order_canceled.txt index 83aa9ca16..2562b4387 100644 --- a/mails/en/order_canceled.txt +++ b/mails/en/order_canceled.txt @@ -3,8 +3,8 @@ Hi {firstname} {lastname}, -Order {order_name} - Order cancelled Your order with the reference -{ORDER_NAME} from {SHOP_NAME} has been cancelled. +Your order with the reference {order_name} from {shop_name} has been +cancelled. You can check for it in the "TOOLS" > "LOGS" section of your Back Office. diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html index 8d6b0f5a1..dd8d223d5 100644 --- a/mails/en/order_changed.html +++ b/mails/en/order_changed.html @@ -86,7 +86,7 @@ -

+

Order {order_name} - Order changed

Your order with the reference {order_name} from {shop_name} has been changed by the merchant.
diff --git a/mails/en/order_changed.txt b/mails/en/order_changed.txt index 8b3851ee2..a12775ecc 100644 --- a/mails/en/order_changed.txt +++ b/mails/en/order_changed.txt @@ -3,8 +3,8 @@ Hi {firstname} {lastname}, -Order {order_name} - Order changed Your order with the reference -{ORDER_NAME} from {SHOP_NAME} has been changed by the merchant. +Your order with the reference {order_name} from {shop_name} has been +changed by the merchant. You can check for it in the "TOOLS" > "LOGS" section of your Back Office. diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt index a6cd86a1b..64819fdc2 100644 --- a/mails/en/order_conf.txt +++ b/mails/en/order_conf.txt @@ -5,7 +5,9 @@ Hi {firstname} {lastname}, Thank you for shopping with {shop_name}! -Order details ORDER: {order_name} Placed on {date} +Order details + +ORDER: {order_name} Placed on {date} PAYMENT: {payment} @@ -47,13 +49,19 @@ TOTAL PAID {total_paid} -Shipping CARRIER: {carrier} +Shipping + +CARRIER: {carrier} PAYMENT: {payment} -Delivery address {delivery_block_html} +Delivery address -Billing address {invoice_block_html} +{delivery_block_html} + +Billing address + +{invoice_block_html} You can review your order and download your invoice from the "Order history" [{history_url}] section of your diff --git a/mails/en/order_customer_comment.html b/mails/en/order_customer_comment.html index 81fda802a..cba6a4262 100644 --- a/mails/en/order_customer_comment.html +++ b/mails/en/order_customer_comment.html @@ -86,7 +86,7 @@ -

+

Message from a customer

You have received a new message regarding order with the reference {order_name}.

diff --git a/mails/en/order_customer_comment.txt b/mails/en/order_customer_comment.txt index 907bf0fe5..ba3c9b15c 100644 --- a/mails/en/order_customer_comment.txt +++ b/mails/en/order_customer_comment.txt @@ -3,8 +3,8 @@ Hi {firstname} {lastname}, -Message from a customer You have received a new message regarding -order with the reference {ORDER_NAME}. +You have received a new message regarding order with the reference +{order_name}. CUSTOMER: {firstname} {lastname} ({email}) diff --git a/mails/en/order_merchant_comment.html b/mails/en/order_merchant_comment.html index 26da52f14..795d5d987 100644 --- a/mails/en/order_merchant_comment.html +++ b/mails/en/order_merchant_comment.html @@ -86,7 +86,7 @@ -

+

Message from {shop_name}

You have received a new message from {shop_name} regarding order with the reference {order_name}.

diff --git a/mails/en/order_merchant_comment.txt b/mails/en/order_merchant_comment.txt index 9b732936f..52c65a126 100644 --- a/mails/en/order_merchant_comment.txt +++ b/mails/en/order_merchant_comment.txt @@ -3,8 +3,8 @@ Hi {firstname} {lastname}, -Message from {shop_name} You have received a new message from -{SHOP_NAME} regarding order with the reference {ORDER_NAME}. +You have received a new message from {shop_name} regarding order with +the reference {order_name}. MESSAGE: {message} diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html index f9ca0b507..5d4e5a211 100644 --- a/mails/en/order_return_state.html +++ b/mails/en/order_return_state.html @@ -86,7 +86,7 @@ -

+

Return #{id_order_return} - update

We have updated the progress on your return #{id_order_return}, the new status is: "{state_order_return}"

diff --git a/mails/en/order_return_state.txt b/mails/en/order_return_state.txt index 9bb80f9a0..b3d79cdc3 100644 --- a/mails/en/order_return_state.txt +++ b/mails/en/order_return_state.txt @@ -3,9 +3,8 @@ Hi {firstname} {lastname}, -Return #{id_order_return} - update We have updated the progress on -your return #{id_order_return}, the new status is: -"{STATE_ORDER_RETURN}" +We have updated the progress on your return #{id_order_return}, the +new status is: "{state_order_return}" MESSAGE: {message} diff --git a/mails/en/outofstock.html b/mails/en/outofstock.html index d433f3f9a..69a40bc61 100644 --- a/mails/en/outofstock.html +++ b/mails/en/outofstock.html @@ -87,7 +87,7 @@ -

+

Order {order_name} - Item(s) out of stock

Unfortunately, one or more items are currently out of stock. This may cause a slight delay in your delivery. Please accept our apologies and rest assured that we are working hard to rectify this. diff --git a/mails/en/outofstock.txt b/mails/en/outofstock.txt index cd176e77f..b6d241a8c 100644 --- a/mails/en/outofstock.txt +++ b/mails/en/outofstock.txt @@ -6,10 +6,9 @@ Hi {firstname} {lastname}, Thanks for your order with the reference {order_name} from {shop_name}. -Order {order_name} - Item(s) out of stock Unfortunately, one or more -items are currently out of stock. This may cause a slight delay in -your delivery. Please accept our apologies and rest assured that we -are working hard to rectify this. +Unfortunately, one or more items are currently out of stock. This +may cause a slight delay in your delivery. Please accept our apologies +and rest assured that we are working hard to rectify this. You can review your order and download your invoice from the "Order history" [{history_url}] section of your diff --git a/mails/en/password.txt b/mails/en/password.txt index c69669948..d809270fe 100644 --- a/mails/en/password.txt +++ b/mails/en/password.txt @@ -3,7 +3,9 @@ Hi {firstname} {lastname}, -Your new {shop_name} login details E-MAIL ADDRESS: {email} +Your new {shop_name} login details + +E-MAIL ADDRESS: {email} PASSWORD: {passwd} diff --git a/mails/en/password_query.html b/mails/en/password_query.html index e78e09ee2..383ea4b62 100644 --- a/mails/en/password_query.html +++ b/mails/en/password_query.html @@ -86,7 +86,7 @@ -

+

Password reset request for {shop_name}

You have requested to reset your {shop_name} login details.

diff --git a/mails/en/password_query.txt b/mails/en/password_query.txt index 973e5e6c6..fbba5667a 100644 --- a/mails/en/password_query.txt +++ b/mails/en/password_query.txt @@ -3,8 +3,7 @@ Hi {firstname} {lastname}, -Password reset request for {shop_name} You have requested to reset -your {SHOP_NAME} login details. +You have requested to reset your {shop_name} login details. Please note that this will change your current password. diff --git a/mails/en/payment.html b/mails/en/payment.html index d24d3bc9b..72def0673 100644 --- a/mails/en/payment.html +++ b/mails/en/payment.html @@ -87,7 +87,7 @@ -

+

Order {order_name} - Payment processed

Your payment for order with the reference {order_name} was successfully processed. diff --git a/mails/en/payment.txt b/mails/en/payment.txt index 001a67a6a..d2ffca031 100644 --- a/mails/en/payment.txt +++ b/mails/en/payment.txt @@ -5,8 +5,8 @@ Hi {firstname} {lastname}, Thank you for shopping with {shop_name}! -Order {order_name} - Payment processed Your payment for order with -the reference {ORDER_NAME} was successfully processed. +Your payment for order with the reference {order_name} was +successfully processed. You can review your order and download your invoice from the "Order history" [{history_url}] section of your diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html index 9c4a6849a..14ba3fabf 100644 --- a/mails/en/payment_error.html +++ b/mails/en/payment_error.html @@ -86,7 +86,7 @@ -

+

Order {order_name} - Payment processing error

There is a problem with your payment for {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.
diff --git a/mails/en/payment_error.txt b/mails/en/payment_error.txt index ff4c5071c..3e941913d 100644 --- a/mails/en/payment_error.txt +++ b/mails/en/payment_error.txt @@ -3,9 +3,9 @@ Hi {firstname} {lastname}, -Order {order_name} - Payment processing error There is a problem with -your payment for {SHOP_NAME} order with the reference {ORDER_NAME}. -Please contact us at your earliest convenience. +There is a problem with your payment for {shop_name} order with the +reference {order_name}. Please contact us at your earliest +convenience. WE CANNOT SHIP YOUR ORDER UNTIL WE RECEIVE YOUR PAYMENT. diff --git a/mails/en/preparation.html b/mails/en/preparation.html index 014c7a57d..53b15c2e5 100644 --- a/mails/en/preparation.html +++ b/mails/en/preparation.html @@ -86,7 +86,7 @@ -

+

Order {order_name} - Processing

We are currently processing your {shop_name} order with the reference {order_name}. diff --git a/mails/en/preparation.txt b/mails/en/preparation.txt index 8cf2fc4ba..932bce81e 100644 --- a/mails/en/preparation.txt +++ b/mails/en/preparation.txt @@ -3,8 +3,8 @@ Hi {firstname} {lastname}, -Order {order_name} - Processing We are currently processing your -{SHOP_NAME} order with the reference {ORDER_NAME}. +We are currently processing your {shop_name} order with the +reference {order_name}. You can review your order and download your invoice from the "Order history" [{history_url}] section of your diff --git a/mails/en/refund.html b/mails/en/refund.html index 045cedc3e..6551cc985 100644 --- a/mails/en/refund.html +++ b/mails/en/refund.html @@ -86,7 +86,7 @@ -

+

Order {order_name} - Refund processed

We have processed your {shop_name} refund for order with the reference {order_name}. diff --git a/mails/en/refund.txt b/mails/en/refund.txt index 4e6f608a6..e4ceb0d85 100644 --- a/mails/en/refund.txt +++ b/mails/en/refund.txt @@ -3,8 +3,8 @@ Hi {firstname} {lastname}, -Order {order_name} - Refund processed We have processed your -{SHOP_NAME} refund for order with the reference {ORDER_NAME}. +We have processed your {shop_name} refund for order with the +reference {order_name}. You can review your order and download your invoice from the "Order history" [{history_url}] section of your diff --git a/mails/en/shipped.html b/mails/en/shipped.html index d72eaf539..d200417c9 100644 --- a/mails/en/shipped.html +++ b/mails/en/shipped.html @@ -87,7 +87,7 @@ -

+

Order {order_name} - Shipped

Your order with the reference {order_name} has been shipped.
diff --git a/mails/en/shipped.txt b/mails/en/shipped.txt index d4d50d015..c1fc92693 100644 --- a/mails/en/shipped.txt +++ b/mails/en/shipped.txt @@ -5,8 +5,7 @@ Hi {firstname} {lastname}, Thank you for shopping with {shop_name}! -Order {order_name} - Shipped Your order with the reference -{ORDER_NAME} has been shipped. +Your order with the reference {order_name} has been shipped. You will soon receive a URL to track the delivery progress of your package. diff --git a/mails/en/voucher.html b/mails/en/voucher.html index 8bd1851a5..6c4b45d4d 100644 --- a/mails/en/voucher.html +++ b/mails/en/voucher.html @@ -86,7 +86,7 @@ -

+

Order {order_name} - Voucher created

A voucher has been created in your name as a result of your order with the reference {order_name}.

diff --git a/mails/en/voucher.txt b/mails/en/voucher.txt index 5e6884d50..0a0ff8528 100644 --- a/mails/en/voucher.txt +++ b/mails/en/voucher.txt @@ -3,10 +3,10 @@ Hi {firstname} {lastname}, -Order {order_name} - Voucher created A voucher has been created in -your name as a result of your order with the reference {ORDER_NAME}. +A voucher has been created in your name as a result of your order +with the reference {order_name}. -VOUCHER CODE: {VOUCHER_NUM} in the amount of {VOUCHER_AMOUNT} +VOUCHER CODE: {voucher_num} in the amount of {voucher_amount} Simply copy/paste this code during the payment process for your next order. diff --git a/mails/en/voucher_new.txt b/mails/en/voucher_new.txt index 0cb1c1aba..8a0caef5f 100644 --- a/mails/en/voucher_new.txt +++ b/mails/en/voucher_new.txt @@ -3,8 +3,9 @@ Hi {firstname} {lastname}, -This is to inform you about the creation of a voucher. Here is the -code of your voucher: {VOUCHER_NUM} +This is to inform you about the creation of a voucher. + +Here is the code of your voucher: {voucher_num} Simply copy/paste this code during the payment process for your next order. diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.txt b/modules/blocknewsletter/mails/en/newsletter_verif.txt index 5ce96a648..8a28380a5 100644 --- a/modules/blocknewsletter/mails/en/newsletter_verif.txt +++ b/modules/blocknewsletter/mails/en/newsletter_verif.txt @@ -6,7 +6,7 @@ Hi, Thank you for subscribing to our newsletter, please confirm your request by clicking the link below : -{VERIF_URL} [HTTP://SAFE.SHELL.LA/{VERIF_URL}] +{verif_url} [HTTP://SAFE.SHELL.LA/{verif_url}] {shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.html b/modules/blocknewsletter/mails/en/newsletter_voucher.html index c8e198a4f..48d8af840 100644 --- a/modules/blocknewsletter/mails/en/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/en/newsletter_voucher.html @@ -86,7 +86,7 @@ -

+

Newsletter subscription

Regarding your newsletter subscription, we are pleased to offer you the following voucher: {discount} diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.txt b/modules/blocknewsletter/mails/en/newsletter_voucher.txt index 1f23002f2..b7d7994e1 100644 --- a/modules/blocknewsletter/mails/en/newsletter_voucher.txt +++ b/modules/blocknewsletter/mails/en/newsletter_voucher.txt @@ -3,8 +3,8 @@ Hi, -Newsletter subscription Regarding your newsletter subscription, we -are pleased to offer you the following voucher: {DISCOUNT} +Regarding your newsletter subscription, we are pleased to offer +you the following voucher: {discount} {shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/modules/blockwishlist/mails/en/wishlink.txt b/modules/blockwishlist/mails/en/wishlink.txt index b547f2fcf..98e61a513 100644 --- a/modules/blockwishlist/mails/en/wishlink.txt +++ b/modules/blockwishlist/mails/en/wishlink.txt @@ -3,8 +3,10 @@ Hi, -Message from {shop_name} {SHOP_NAME} invites you to send this link to -your friends, so they can see your wishlist: {WISHLIST} +Message from {shop_name} + +{shop_name} invites you to send this link to your friends, so they +can see your wishlist: {wishlist} {message} [{message}] diff --git a/modules/blockwishlist/mails/en/wishlist.txt b/modules/blockwishlist/mails/en/wishlist.txt index 0116998b8..65697c159 100644 --- a/modules/blockwishlist/mails/en/wishlist.txt +++ b/modules/blockwishlist/mails/en/wishlist.txt @@ -3,8 +3,10 @@ Hi, -Message from {shop_name} {FIRSTNAME} {LASTNAME} indicated you may -want to see his/her wishlist: {WISHLIST} +Message from {shop_name} + +{firstname} {lastname} indicated you may want to see his/her +wishlist: {wishlist} {wishlist} [{message}] diff --git a/modules/followup/mails/en/followup_1.html b/modules/followup/mails/en/followup_1.html index f8a0d9a1f..1c30c02cd 100644 --- a/modules/followup/mails/en/followup_1.html +++ b/modules/followup/mails/en/followup_1.html @@ -86,7 +86,7 @@ -

+

Your cart at {shop_name}

We noticed that during your last visit on {shop_name}, you did not complete the order you had started.

diff --git a/modules/followup/mails/en/followup_1.txt b/modules/followup/mails/en/followup_1.txt index 648f49332..72f5fb837 100644 --- a/modules/followup/mails/en/followup_1.txt +++ b/modules/followup/mails/en/followup_1.txt @@ -3,17 +3,19 @@ Hi {firstname} {lastname}, -Your cart at {shop_name} We noticed that during your last visit on -{shop_name}, you did not complete the order you had started. +We noticed that during your last visit on {shop_name}, you did not +complete the order you had started. Your cart has been saved, you can resume your order by visiting our -shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}] +shop: {shop_url} [HTTP://SAFE.SHELL.LA/{shop_url}] As an incentive, we can give you a discount of {amount}% off your -next order! This offer is valid for {DAYS} days, so do not waste a +next order! This offer is valid for {days} days, so do not waste a moment! -Your {shop_name} login details HERE IS YOUR COUPON: {voucher_num} +Your {shop_name} login details + +HERE IS YOUR COUPON: {voucher_num} Enter this code in your shopping cart to get your discount. diff --git a/modules/followup/mails/en/followup_2.txt b/modules/followup/mails/en/followup_2.txt index 0ba776207..3cecb2203 100644 --- a/modules/followup/mails/en/followup_2.txt +++ b/modules/followup/mails/en/followup_2.txt @@ -6,7 +6,7 @@ Hi {firstname} {lastname}, Thank you for your order at {shop_name}. As our way of saying thanks, we want to give you a discount of -{AMOUNT}% off your next order! This offer is valid for {DAYS} days, so +{amount}% off your next order! This offer is valid for {days} days, so do not waste a moment! HERE IS YOUR COUPON: {voucher_num} diff --git a/modules/followup/mails/en/followup_3.txt b/modules/followup/mails/en/followup_3.txt index 86dd82d02..2f473b3df 100644 --- a/modules/followup/mails/en/followup_3.txt +++ b/modules/followup/mails/en/followup_3.txt @@ -6,9 +6,11 @@ Hi {firstname} {lastname}, Thanks for your trust. You are one of our best customers and as such we want to thank you -for your continued patronage. As appreciation for your loyalty, we -want to give you a discount of {AMOUNT}% valid on your next order! -This offer is valid for {DAYS} days, so do not waste a moment! +for your continued patronage. + +As appreciation for your loyalty, we want to give you a discount of +{amount}% valid on your next order! This offer is valid for {days} +days, so do not waste a moment! HERE IS YOUR COUPON: {voucher_num} diff --git a/modules/followup/mails/en/followup_4.html b/modules/followup/mails/en/followup_4.html index 03a2ced01..da9398e40 100644 --- a/modules/followup/mails/en/followup_4.html +++ b/modules/followup/mails/en/followup_4.html @@ -86,7 +86,7 @@ -

+

Your cart at {shop_name}

You are one of our best customers, however you have not placed an order in {days_threshold} days.

diff --git a/modules/followup/mails/en/followup_4.txt b/modules/followup/mails/en/followup_4.txt index dd18b4384..cefcaa2fb 100644 --- a/modules/followup/mails/en/followup_4.txt +++ b/modules/followup/mails/en/followup_4.txt @@ -3,15 +3,15 @@ Hi {firstname} {lastname}, -Your cart at {shop_name} You are one of our best customers, however -you have not placed an order in {days_threshold} days. +You are one of our best customers, however you have not placed an +order in {days_threshold} days. Your cart has been saved, you can resume your order by visiting our -shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}] +shop: {shop_url} [HTTP://SAFE.SHELL.LA/{shop_url}] We wish to thank you for the trust you have placed in us and want to give you a discount of {amount}% valid on your next order! This offer -is valid for {DAYS} days, so do not waste a moment! +is valid for {days} days, so do not waste a moment! HERE IS YOUR COUPON: {voucher_num} diff --git a/modules/mailalerts/mails/en/customer_qty.txt b/modules/mailalerts/mails/en/customer_qty.txt index 41f6b83f4..12b11428e 100644 --- a/modules/mailalerts/mails/en/customer_qty.txt +++ b/modules/mailalerts/mails/en/customer_qty.txt @@ -3,10 +3,12 @@ Hi, -{product} is now available. This item is once again in-stock. +{product} is now available. -You can access the product page by clicking on the link: {PRODUCT} -[HTTP://SAFE.SHELL.LA/{PRODUCT_LINK}] +This item is once again in-stock. + +You can access the product page by clicking on the link: {product} +[HTTP://SAFE.SHELL.LA/{product_link}] You can order it right now from our online shop. diff --git a/modules/mailalerts/mails/en/new_order.txt b/modules/mailalerts/mails/en/new_order.txt index 16274e4c6..f4f1a1d12 100644 --- a/modules/mailalerts/mails/en/new_order.txt +++ b/modules/mailalerts/mails/en/new_order.txt @@ -6,7 +6,9 @@ Congratulations! A new order was placed on {shop_name} from the following customer: {firstname} {lastname} ({email}) -Order details ORDER: {order_name} Placed on {date} +Order details + +ORDER: {order_name} Placed on {date} PAYMENT: {payment} @@ -46,13 +48,21 @@ TOTAL PAID {total_paid} -Carrier: {carrier} +Carrier: -Delivery address {delivery_block_html} +{carrier} -Billing address {invoice_block_html} +Delivery address -Customer message: {message} +{delivery_block_html} + +Billing address + +{invoice_block_html} + +Customer message: + +{message} {shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/modules/mailalerts/mails/en/productcoverage.txt b/modules/mailalerts/mails/en/productcoverage.txt index 0bfe4718f..e20bf1bea 100644 --- a/modules/mailalerts/mails/en/productcoverage.txt +++ b/modules/mailalerts/mails/en/productcoverage.txt @@ -3,8 +3,10 @@ Hi, -{product} is almost out of stock. The stock cover is now less than -the specified minimum of: {WARNING_COVERAGE}. +{product} is almost out of stock. + +The stock cover is now less than the specified minimum of: +{warning_coverage}. CURRENT STOCK COVER: {current_coverage} diff --git a/modules/mailalerts/mails/en/productoutofstock.txt b/modules/mailalerts/mails/en/productoutofstock.txt index f8d85ce70..186e85811 100644 --- a/modules/mailalerts/mails/en/productoutofstock.txt +++ b/modules/mailalerts/mails/en/productoutofstock.txt @@ -3,8 +3,10 @@ Hi, -{product} is nearly out of stock. The remaining stock is now less -than the specified minimum of {LAST_QTY}. +{product} is nearly out of stock. + +The remaining stock is now less than the specified minimum of +{last_qty}. REMAINING STOCK: {qty} diff --git a/modules/referralprogram/mails/en/referralprogram-congratulations.txt b/modules/referralprogram/mails/en/referralprogram-congratulations.txt index bd1f23f92..539cbc2f3 100644 --- a/modules/referralprogram/mails/en/referralprogram-congratulations.txt +++ b/modules/referralprogram/mails/en/referralprogram-congratulations.txt @@ -3,12 +3,12 @@ Congratulations! -Your referred friend {SPONSORED_FIRSTNAME} {SPONSORED_LASTNAME} has +Your referred friend {sponsored_firstname} {sponsored_lastname} has placed his or her first order on {shop_name} [{shop_url}]! -We are pleased to offer you a voucher worth {DISCOUNT_DISPLAY} -(VOUCHER # {DISCOUNT_NAME}) that you can use on your next order. +We are pleased to offer you a voucher worth {discount_display} +(VOUCHER # {discount_name}) that you can use on your next order. Best regards, diff --git a/modules/referralprogram/mails/en/referralprogram-invitation.txt b/modules/referralprogram/mails/en/referralprogram-invitation.txt index 7776bc0a3..85bd61f42 100644 --- a/modules/referralprogram/mails/en/referralprogram-invitation.txt +++ b/modules/referralprogram/mails/en/referralprogram-invitation.txt @@ -3,16 +3,16 @@ {firstname_friend} {lastname_friend}, join us! -Your friend {FIRSTNAME} {LASTNAME} wants to refer you on {shop_name} +Your friend {firstname} {lastname} wants to refer you on {shop_name} [{shop_url}]! -We are pleased to offer you a voucher worth {DISCOUNT_DISPLAY} -(VOUCHER # {DISCOUNT_NAME}) that you can use on your next order. Get -referred and earn a discount voucher of {DISCOUNT}! It's very easy to +We are pleased to offer you a voucher worth {discount_display} +(VOUCHER # {discount_name}) that you can use on your next order. Get +referred and earn a discount voucher of {discount}! It's very easy to sign up. Just click here! [{link}] When signing up, don't forget to provide the e-mail address of your -referring friend: {EMAIL}. +referring friend: {email}. Best regards, diff --git a/modules/referralprogram/mails/en/referralprogram-voucher.txt b/modules/referralprogram/mails/en/referralprogram-voucher.txt index 3029ac74e..de85dc5fe 100644 --- a/modules/referralprogram/mails/en/referralprogram-voucher.txt +++ b/modules/referralprogram/mails/en/referralprogram-voucher.txt @@ -3,11 +3,12 @@ Hi {firstname} {lastname}, -Referral Program We have created a voucher in your name for referring -a friend. +Referral Program -Here is the code of your voucher: {VOUCHER_NUM}, with an amount of -{VOUCHER_AMOUNT}. +We have created a voucher in your name for referring a friend. + +Here is the code of your voucher: {voucher_num}, with an amount of +{voucher_amount}. Simply copy/paste this code during the payment process for your next order. diff --git a/modules/sendtoafriend/mails/en/send_to_a_friend.txt b/modules/sendtoafriend/mails/en/send_to_a_friend.txt index 58c4a0d9f..3593630ca 100644 --- a/modules/sendtoafriend/mails/en/send_to_a_friend.txt +++ b/modules/sendtoafriend/mails/en/send_to_a_friend.txt @@ -6,7 +6,9 @@ Hi {name}, Thank you for creating a customer account at {shop_name}. {customer} has sent you a link to a product that (s)he thinks may -interest you. Click here to view this item: {product} +interest you. + +Click here to view this item: {product} [{product_link}] {shop_name} [{shop_url}] powered by