From c5f635f967a778a51107115494081b008e7e6aaf Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Tue, 20 Aug 2013 10:31:03 +0200 Subject: [PATCH] // Updated some meta and translations --- install-dev/langs/en/data/meta.xml | 24 ++++++++--------- install-dev/langs/fr/data/meta.xml | 20 +++++++------- mails/en/lang.php | 43 ++++++++++++++---------------- 3 files changed, 42 insertions(+), 45 deletions(-) diff --git a/install-dev/langs/en/data/meta.xml b/install-dev/langs/en/data/meta.xml index bae593782..9fc060f31 100644 --- a/install-dev/langs/en/data/meta.xml +++ b/install-dev/langs/en/data/meta.xml @@ -3,61 +3,61 @@ 404 error This page cannot be found - error, 404, not found + page-not-found Best sales Our best sales - best sales + best-sales Contact us Use our form to contact us - contact, form, e-mail + contact-us <description>Shop powered by PrestaShop</description> - <keywords>shop, prestashop</keywords> + <keywords/> <url_rewrite/> </meta> <meta id="manufacturer" id_shop="1"> <title>Manufacturers Manufacturers list - manufacturer + manufacturers New products Our new products - new, products + new-products Forgot your password Enter your e-mail address used to register in goal to get e-mail with your new password - forgot, password, e-mail, new, reset + password-recovery Prices drop Our special products - special, prices drop + prices-drop Sitemap Lost ? Find what your are looking for - sitemap + sitemap Suppliers Suppliers list - supplier + supplier @@ -73,10 +73,10 @@ addresses - Authentication + Login - authentication + login Cart diff --git a/install-dev/langs/fr/data/meta.xml b/install-dev/langs/fr/data/meta.xml index a197ea60a..9d845be18 100644 --- a/install-dev/langs/fr/data/meta.xml +++ b/install-dev/langs/fr/data/meta.xml @@ -3,61 +3,61 @@ Erreur 404 Cette page est introuvable - erreur, 404, introuvable + page-non-trouvee Meilleures ventes Liste de nos produits les mieux vendus - meilleures ventes + meilleures-ventes Contactez-nous Utilisez notre formulaire pour nous contacter - contact, formulaire, e-mail + contactez-nous <description>Boutique propulsée par PrestaShop</description> - <keywords>boutique, prestashop</keywords> + <keywords/> <url_rewrite/> </meta> <meta id="manufacturer" id_shop="1"> <title>Fabricants Liste de nos fabricants - fabricants + fabricants Nouveaux produits Liste de nos nouveaux produits - nouveau, produit + nouveaux-produits Mot de passe oublié Renseignez votre adresse e-mail afin de recevoir votre nouveau mot de passe. - mot de passe, oublié, e-mail, nouveau, regénération + mot-de-passe-oublie Promotions Nos produits en promotion - promotion, réduction + promotions Plan du site Perdu ? Trouvez ce que vous cherchez - plan, site + plan-du-site Fournisseurs Liste de nos fournisseurs - fournisseurs + fournisseurs diff --git a/mails/en/lang.php b/mails/en/lang.php index 5a7a5d491..2ddd3600f 100644 --- a/mails/en/lang.php +++ b/mails/en/lang.php @@ -26,38 +26,35 @@ global $_LANGMAIL; $_LANGMAIL = array(); -$_LANGMAIL['Welcome!'] = 'Welcome!'; -$_LANGMAIL['Message from contact form'] = 'Customer message from contact form'; -$_LANGMAIL['Your message has been correctly sent'] = 'Your message has been sent successfully'; -$_LANGMAIL['New credit slip regarding your order'] = 'New credit slip regarding your order'; + $_LANGMAIL['Virtual product to download'] = 'Virtual product(s) available for download'; -$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Customer message'; $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Your guest account has been transformed to a customer account'; -$_LANGMAIL['Package in transit'] = 'Package in transit'; -$_LANGMAIL['[Log'] = '[Log'; -$_LANGMAIL['Order confirmation'] = 'Order confirmation'; -$_LANGMAIL['Message from a customer'] = 'Message from a customer'; -$_LANGMAIL['New message regarding your order'] = 'New message regarding your order'; $_LANGMAIL['Your order return state has changed'] = 'Your order return status has changed'; -$_LANGMAIL['Your password'] = 'Your password has been reset'; $_LANGMAIL['Password query confirmation'] = 'Forgot password'; -$_LANGMAIL['An answer to your message is available'] = 'New response to your inquiry'; $_LANGMAIL['New voucher regarding your order %s'] = 'New voucher for your order %s'; -$_LANGMAIL['Happy birthday!'] = 'Happy birthday!'; $_LANGMAIL['Newsletter confirmation'] = 'Newsletter subscription confirmation'; -$_LANGMAIL['Newsletter voucher'] = 'Newsletter voucher'; -$_LANGMAIL['Your wishlist\\\'s link'] = 'Your wishlist\'s link'; -$_LANGMAIL['Message from '] = 'Message from '; -$_LANGMAIL['$subject'] = ''; $_LANGMAIL['Your cart and your discount'] = 'Discount offer for items in your cart'; $_LANGMAIL['Thanks for your order'] = 'Thanks for your order!'; $_LANGMAIL['You are one of our best customers'] = 'Thank you for being one of our best customers'; -$_LANGMAIL['We miss you'] = 'We miss you'; $_LANGMAIL['Product available'] = 'Your watched product is now available'; $_LANGMAIL['Product out of stock'] = 'One or more products are almost out of stock'; -$_LANGMAIL['Error reporting from your PayPal module'] = 'Error reporting from your PayPal module'; +$_LANGMAIL['We miss you'] = 'We miss you'; +$_LANGMAIL['Email verification'] = 'Email verification'; +$_LANGMAIL['Newsletter voucher'] = 'Newsletter voucher'; +$_LANGMAIL['Stock coverage'] = 'Stock coverage'; $_LANGMAIL['Congratulations!'] = 'Congratulations!'; -$_LANGMAIL['Referral Program'] = 'Referral program'; -$_LANGMAIL['A friend sent you a link to'] = 'A friend sent you a link to'; - -?> \ No newline at end of file +$_LANGMAIL['Your wishlist\\\'s link'] = 'Your wishlist\'s link'; +$_LANGMAIL['Message from %1$s %2$s'] = 'Message from %1$s %2$s'; +$_LANGMAIL['Your order has been changed'] = 'Your order has been changed'; +$_LANGMAIL['Welcome!'] = 'Welcome!'; +$_LANGMAIL['New credit slip regarding your order'] = 'New credit slip regarding your order'; +$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Customer message'; +$_LANGMAIL['Package in transit'] = 'Package in transit'; +$_LANGMAIL['Order confirmation'] = 'Order confirmation'; +$_LANGMAIL['Message from a customer'] = 'Message from a customer'; +$_LANGMAIL['New message regarding your order'] = 'New message regarding your order'; +$_LANGMAIL['Process the payment of your order'] = 'Process the payment of your order'; +$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: You have a new alert from your shop'; +$_LANGMAIL['Your new password'] = 'Your new password'; +$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'An answer to your message is available #ct%1$s #tc%2$s'; +$_LANGMAIL['%1$s sent you a link to %2$s'] = '%1$s sent you a link to %2$s';