From 5372f31b4c65bbbeaf87a73c43d973361c969c79 Mon Sep 17 00:00:00 2001 From: djfm Date: Mon, 4 Nov 2013 16:57:50 +0000 Subject: [PATCH] // updated English emails --- mails/en/account.html | 43 ++++--- mails/en/backoffice_order.html | 27 ++-- mails/en/bankwire.html | 51 ++++---- mails/en/cheque.html | 49 +++---- mails/en/contact.html | 35 ++--- mails/en/contact_form.html | 39 +++--- mails/en/credit_slip.html | 33 ++--- mails/en/download_product.html | 37 +++--- mails/en/employee_password.html | 37 +++--- mails/en/forward_msg.html | 33 ++--- mails/en/guest_to_customer.html | 39 +++--- mails/en/header.html | 11 +- mails/en/in_transit.html | 35 ++--- mails/en/log_alert.html | 31 ++--- mails/en/newsletter.html | 23 ++-- mails/en/order_canceled.html | 37 +++--- mails/en/order_changed.html | 37 +++--- mails/en/order_conf.html | 121 +++++++++--------- mails/en/order_customer_comment.html | 31 ++--- mails/en/order_merchant_comment.html | 31 ++--- mails/en/order_return_state.html | 35 ++--- mails/en/outofstock.html | 35 ++--- mails/en/password.html | 37 +++--- mails/en/password_query.html | 29 +++-- mails/en/payment.html | 37 +++--- mails/en/payment_error.html | 37 +++--- mails/en/preparation.html | 35 ++--- mails/en/refund.html | 35 ++--- mails/en/reply_msg.html | 31 ++--- mails/en/shipped.html | 33 ++--- mails/en/test.html | 25 ++-- mails/en/voucher.html | 31 ++--- mails/en/voucher_new.html | 29 +++-- modules/blocknewsletter/mails/en/header.html | 10 +- .../mails/en/newsletter_conf.html | 24 ++-- .../mails/en/newsletter_verif.html | 26 ++-- .../mails/en/newsletter_voucher.html | 28 ++-- modules/blockwishlist/mails/en/header.html | 10 +- modules/blockwishlist/mails/en/wishlink.html | 28 ++-- modules/blockwishlist/mails/en/wishlist.html | 28 ++-- modules/followup/mails/en/followup_1.html | 38 +++--- modules/followup/mails/en/followup_2.html | 30 ++--- modules/followup/mails/en/followup_3.html | 32 ++--- modules/followup/mails/en/followup_4.html | 36 +++--- modules/followup/mails/en/header.html | 10 +- modules/mailalerts/mails/en/customer_qty.html | 28 ++-- modules/mailalerts/mails/en/header.html | 10 +- modules/mailalerts/mails/en/new_order.html | 112 ++++++++-------- .../mailalerts/mails/en/productcoverage.html | 30 ++--- .../mails/en/productoutofstock.html | 30 ++--- modules/referralprogram/mails/en/header.html | 10 +- .../en/referralprogram-congratulations.html | 32 ++--- .../mails/en/referralprogram-invitation.html | 34 ++--- .../mails/en/referralprogram-voucher.html | 28 ++-- modules/sendtoafriend/mails/en/header.html | 10 +- .../mails/en/send_to_a_friend.html | 28 ++-- 56 files changed, 947 insertions(+), 914 deletions(-) diff --git a/mails/en/account.html b/mails/en/account.html index 65721d8ba..0a156b46e 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + - - + - - + -
- Hi {firstname} {lastname},
- Thank you for creating a customer account at {shop_name}. +
+ Hi {firstname} {lastname},
+ Thank you for creating a customer account at {shop_name}.
 
-

+

+

Your {shop_name} login details

Here are your login details:
- E-mail address: {email}
- Password: {passwd} + E-mail address: {email}
+ Password: {passwd}
 
-

Important Security Tips:

+
+

Important Security Tips:

  1. Always keep your account details safe.
  2. Never disclose your login details to anyone.
  3. @@ -55,25 +56,25 @@
 
+ You can now place orders on our shop: {shop_name}
  
diff --git a/mails/en/backoffice_order.html b/mails/en/backoffice_order.html index ff5f17dec..1ef21830c 100644 --- a/mails/en/backoffice_order.html +++ b/mails/en/backoffice_order.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + -
- Hi {firstname} {lastname}, + + Hi {firstname} {lastname},
 
-

+

+

A new order has been generated on your behalf.

Please go on {order_link} to finalize the payment. @@ -39,16 +40,16 @@
  
diff --git a/mails/en/bankwire.html b/mails/en/bankwire.html index cbd86eb3f..5166b59c7 100644 --- a/mails/en/bankwire.html +++ b/mails/en/bankwire.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + - - + - - - + -
- Hi {firstname} {lastname},
- Thank you for shopping with {shop_name}! +
+ 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:
- Amount: {total_paid}
- Account owner: {bankwire_owner}
- Account details: {bankwire_details}
- Bank address: {bankwire_address} + Amount: {total_paid}
+ Account owner: {bankwire_owner}
+ Account details: {bankwire_details}
+ Bank address: {bankwire_address}
 
+ 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.
  
diff --git a/mails/en/cheque.html b/mails/en/cheque.html index 8fa0e852a..75449f706 100644 --- a/mails/en/cheque.html +++ b/mails/en/cheque.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + - - + - - @@ -71,16 +72,16 @@ - + -
- Hi {firstname} {lastname},
- Thank you for shopping with {shop_name}! +
+ 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:
- Amount: {total_paid}
- Payable to the order of: {cheque_name}
- Please mail your check to: {cheque_address_html} + Amount: {total_paid}
+ Payable to the order of: {cheque_name}
+ Please mail your check to: {cheque_address_html}
 
+ 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.
  
diff --git a/mails/en/contact.html b/mails/en/contact.html index 11c403026..1c2804e51 100644 --- a/mails/en/contact.html +++ b/mails/en/contact.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + -
- Hi {firstname} {lastname}, + + Hi {firstname} {lastname},
 
-

+

+

Message from a {shop_name} customer

- Customer e-mail address: {email}

- Customer message: {message}

- Order ID: {order_name}
- Attached file: {attached_file} + Customer e-mail address: {email}

+ Customer message: {message}

+ Order ID: {order_name}
+ Attached file: {attached_file}
  
diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html index 922b0a899..d6ab29d89 100644 --- a/mails/en/contact_form.html +++ b/mails/en/contact_form.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + - - + -
- Hi {firstname} {lastname}, + + Hi {firstname} {lastname},
 
-

+

+

Your message to {shop_name} Customer Service

Your message has been sent successfully.

- Message: {message}

- Order ID: {order_name}
- Product: {product_name}
- Attached file: {attached_file} + Message: {message}

+ Order ID: {order_name}
+ Product: {product_name}
+ Attached file: {attached_file}
 
+ We will answer as soon as possible.
  
diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index f663508cc..40a567db0 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + - - + -
- Hi {firstname} {lastname}, + + 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" section of your account by clicking "My account" on our shop.
  
diff --git a/mails/en/download_product.html b/mails/en/download_product.html index 0c3cabff8..8f6e8f8ae 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + - - - + -
- Hi {firstname} {lastname},
- Thank you for your order with the reference {order_name} from {shop_name} +
+ Hi {firstname} {lastname},
+ Thank you for your order with the reference {order_name} from {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}
 
+ 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.
  
diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html index 60f12ca5a..699aeb3ed 100644 --- a/mails/en/employee_password.html +++ b/mails/en/employee_password.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + -
- Hi {firstname} {lastname}, + + Hi {firstname} {lastname},
 
-

+

+

Your {shop_name} login information

- Here is your personal login information for {shop_name}:

- First name: {firstname}
- Last name: {lastname}
- Password: {passwd}
- E-mail address: {email} + Here is your personal login information for {shop_name}:

+ First name: {firstname}
+ Last name: {lastname}
+ Password: {passwd}
+ E-mail address: {email}
  
diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html index 8c898d457..cdd87b9df 100644 --- a/mails/en/forward_msg.html +++ b/mails/en/forward_msg.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + -
- Hi {firstname} {lastname}, + + Hi {firstname} {lastname},
 
-

+

+

Customer service - Forwarded discussion

- {employee} wanted to forward this discussion to you.

- Discussion history: {messages}

- {employee} added "{comment}" + {employee} wanted to forward this discussion to you.

+ Discussion history: {messages}

+ {employee} added "{comment}"
  
diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html index 4cbfc1e84..63e963662 100644 --- a/mails/en/guest_to_customer.html +++ b/mails/en/guest_to_customer.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- + - +
   - +
- - - + - - + - - - + -
- Hi {firstname} {lastname}, + + Hi {firstname} {lastname},
 
-

+

+

Your customer account creation

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

- E-mail address: {email}

- Password: {passwd} + Your guest account for {shop_name} has been transformed into a customer account.

+ E-mail address: {email}

+ Password: {passwd}
 
+ Please be careful when sharing these login details with others.
+ You can access your customer account on our shop: {shop_url} @@ -57,16 +58,16 @@
  
diff --git a/mails/en/header.html b/mails/en/header.html index 3824b9a1a..eb000891d 100644 --- a/mails/en/header.html +++ b/mails/en/header.html @@ -3,17 +3,18 @@ + Message from {shop_name} - - + +
- +
   - +
-