diff --git a/admin-dev/cron_currency_rates.php b/admin-dev/cron_currency_rates.php
new file mode 100644
index 000000000..4b9bb67fc
--- /dev/null
+++ b/admin-dev/cron_currency_rates.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2011 PrestaShop SA
+* @version Release: $Revision$
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+include(dirname(__FILE__).'/../config/config.inc.php');
+
+if (isset($_GET['secure_key']))
+{
+ $secureKey = md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME'));
+ if (!empty($secureKey) AND $secureKey === $_GET['secure_key'])
+ Currency::refreshCurrencies();
+}
\ No newline at end of file
diff --git a/admin-dev/tabs/AdminCurrencies.php b/admin-dev/tabs/AdminCurrencies.php
index 3e8c8b061..196f45b9e 100644
--- a/admin-dev/tabs/AdminCurrencies.php
+++ b/admin-dev/tabs/AdminCurrencies.php
@@ -127,6 +127,10 @@ class AdminCurrencies extends AdminTab
{
parent::displayOptionsList();
+ $dir = explode(DIRECTORY_SEPARATOR, dirname(__FILE__));
+ for ($i = 0; $i < 2; ++$i)
+ $adminDir = array_pop($dir);
+
echo '
+ '.$this->l('Place this URL in crontab or call it manually daily').':'.Tools::getShopDomain(true, true).__PS_BASE_URI__.$adminDir.DIRECTORY_SEPARATOR.'cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'
+ ';
}
public function displayForm($isMainTab = true)
diff --git a/admin-dev/tabs/AdminGenerator.php b/admin-dev/tabs/AdminGenerator.php
index 4eb479a17..c04956669 100644
--- a/admin-dev/tabs/AdminGenerator.php
+++ b/admin-dev/tabs/AdminGenerator.php
@@ -139,7 +139,14 @@ class AdminGenerator extends AdminTab
fwrite($writeFd, "# For more information about the robots.txt standard, see:\n");
fwrite($writeFd, "# http://www.robotstxt.org/wc/robots.html\n\n");
+ //GoogleBot specific
+ fwrite($writeFd, "# GoogleBot specific\n");
+ fwrite($writeFd, "User-agent: Googlebot\n");
+ foreach ($this->_rbData['GB'] as $GB)
+ fwrite($writeFd, 'Disallow: '.__PS_BASE_URI__.$GB."\n");
+
// User-Agent
+ fwrite($writeFd, "# All bots\n\n");
fwrite($writeFd, "User-agent: *\n");
// Directories
@@ -178,8 +185,11 @@ class AdminGenerator extends AdminTab
$tab['Files'] = array('addresses.php', 'address.php', 'authentication.php', 'cart.php', 'discount.php', 'footer.php',
'get-file.php', 'header.php', 'history.php', 'identity.php', 'images.inc.php', 'init.php', 'my-account.php', 'order.php', 'order-opc.php',
'order-slip.php', 'order-detail.php', 'order-follow.php', 'order-return.php', 'order-confirmation.php', 'pagination.php', 'password.php',
- 'pdf-invoice.php', 'pdf-order-return.php', 'pdf-order-slip.php', 'product-sort.php', 'search.php', 'statistics.php','attachment.php', 'guest-tracking',
- '*orderby=','*orderway=','*tag=','*id_currency=','*search_query=','*id_lang=','*back=','*utm_source=','*utm_medium=','*utm_campaign=','*n=');
+ 'pdf-invoice.php', 'pdf-order-return.php', 'pdf-order-slip.php', 'product-sort.php', 'search.php', 'statistics.php','attachment.php', 'guest-tracking');
+
+ $tab['GB'] = array(
+ '*orderby=','*orderway=','*tag=','*id_currency=','*search_query=','*id_lang=','*back=','*utm_source=','*utm_medium=','*utm_campaign=','*n='
+ );
return $tab;
}
diff --git a/controllers/CMSController.php b/controllers/CMSController.php
index d1ebb1928..fd4dd90fd 100644
--- a/controllers/CMSController.php
+++ b/controllers/CMSController.php
@@ -27,35 +27,44 @@
class CmsControllerCore extends FrontController
{
+ public $php_self = 'cms';
public $assignCase;
public $cms;
public $cms_category;
+ public function canonicalRedirection()
+ {
+ // Automatically redirect to the canonical URL if the current in is the right one
+ // $_SERVER['HTTP_HOST'] must be replaced by the real canonical domain
+
+ if (Configuration::get('PS_CANONICAL_REDIRECT'))
+ {
+ if (Validate::isLoadedObject($this->cms) AND $canonicalURL = $this->context->link->getCMSLink($this->cms))
+ if (!preg_match('/^'.Tools::pRegexp($canonicalURL, '/').'([&?].*)?$/', Tools::getProtocol().$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
+ {
+ header('HTTP/1.0 301 Moved');
+ if (_PS_MODE_DEV_)
+ die('[Debug] This page has moved'.$canonicalURL.' ');
+ Tools::redirectLink($canonicalURL);
+ }
+ if (Validate::isLoadedObject($this->cms_category) AND $canonicalURL = $this->context->link->getCMSCategoryLink($this->cms_category))
+ if (!preg_match('/^'.Tools::pRegexp($canonicalURL, '/').'([&?].*)?$/', Tools::getProtocol().$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
+ {
+ header('HTTP/1.0 301 Moved');
+ if (_PS_MODE_DEV_ )
+ die('[Debug] This page has moved'.$canonicalURL.' ');
+ Tools::redirectLink($canonicalURL);
+ }
+ }
+ }
+
public function preProcess()
{
if ($id_cms = (int)Tools::getValue('id_cms'))
$this->cms = new CMS($id_cms, $this->context->language->id);
elseif ($id_cms_category = (int)Tools::getValue('id_cms_category'))
$this->cms_category = new CMSCategory($id_cms_category, $this->context->language->id);
-
- // Automatically redirect to the canonical URL if the current in is the right one
- // $_SERVER['HTTP_HOST'] must be replaced by the real canonical domain
- if ($this->cms AND $canonicalURL = $this->context->link->getCMSLink($this->cms))
- if (!preg_match('/^'.Tools::pRegexp($canonicalURL, '/').'([&?].*)?$/i', Tools::getProtocol().$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
- {
- header('HTTP/1.0 301 Moved');
- if (defined(_PS_MODE_DEV_) AND _PS_MODE_DEV_ )
- die('[Debug] This page has moved'.$canonicalURL.' ');
- Tools::redirectLink($canonicalURL);
- }
- if ($this->cms_category AND $canonicalURL = $this->context->link->getCMSCategoryLink($this->cms_category))
- if (!preg_match('/^'.Tools::pRegexp($canonicalURL, '/').'([&?].*)?$/i', Tools::getProtocol().$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
- {
- header('HTTP/1.0 301 Moved');
- if (_PS_MODE_DEV_ )
- die('[Debug] This page has moved'.$canonicalURL.' ');
- Tools::redirectLink($canonicalURL);
- }
+ $this->canonicalRedirection();
parent::preProcess();
diff --git a/controllers/CategoryController.php b/controllers/CategoryController.php
index 0a26b0aba..9c6bf8690 100644
--- a/controllers/CategoryController.php
+++ b/controllers/CategoryController.php
@@ -27,6 +27,7 @@
class CategoryControllerCore extends FrontController
{
+ public $php_self = 'category';
protected $category;
public function setMedia()
@@ -47,6 +48,27 @@ class CategoryControllerCore extends FrontController
parent::displayHeader();
$this->productSort();
}
+
+ public function canonicalRedirection()
+ {
+ if (Configuration::get('PS_CANONICAL_REDIRECT'))
+ {
+ // Automatically redirect to the canonical URL if the current in is the right one
+ // $_SERVER['HTTP_HOST'] must be replaced by the real canonical domain
+ if (Validate::isLoadedObject($this->category))
+ {
+ $currentURL = $this->context->link->getCategoryLink($this->category);
+ $currentURL = preg_replace('/[?&].*$/', '', $currentURL);
+ if (!preg_match('/^'.Tools::pRegexp($currentURL, '/').'([&?].*)?$/', Tools::getProtocol().$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
+ {
+ header('HTTP/1.0 301 Moved');
+ if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_ )
+ die('[Debug] This page has moved'.$currentURL.' ');
+ Tools::redirectLink($currentURL);
+ }
+ }
+ }
+ }
public function preProcess()
{
@@ -58,19 +80,7 @@ class CategoryControllerCore extends FrontController
header('Status: 404 Not Found');
}
else
- {
- // Automatically redirect to the canonical URL if the current in is the right one
- // $_SERVER['HTTP_HOST'] must be replaced by the real canonical domain
- $currentURL = $this->context->link->getCategoryLink($this->category);
- $currentURL = preg_replace('/[?&].*$/', '', $currentURL);
- if (!preg_match('/^'.Tools::pRegexp($currentURL, '/').'([&?].*)?$/i', Tools::getProtocol().$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
- {
- header('HTTP/1.0 301 Moved');
- if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_ )
- die('[Debug] This page has moved'.$currentURL.' ');
- Tools::redirectLink($currentURL);
- }
- }
+ $this->canonicalRedirection();
parent::preProcess();
}
diff --git a/controllers/ManufacturerController.php b/controllers/ManufacturerController.php
index 4ca696b84..73b1fb931 100644
--- a/controllers/ManufacturerController.php
+++ b/controllers/ManufacturerController.php
@@ -27,6 +27,7 @@
class ManufacturerControllerCore extends FrontController
{
+ public $php_self = 'manufacturer';
protected $manufacturer;
public function setMedia()
@@ -35,48 +36,71 @@ class ManufacturerControllerCore extends FrontController
$this->addCSS(_THEME_CSS_DIR_.'product_list.css');
}
- public function process()
+ public function canonicalRedirection()
+ {
+ if (Validate::isLoadedObject($this->manufacturer))
+ {
+ $canonicalURL = $this->context->link->getManufacturerLink($this->manufacturer);
+ if (!preg_match('/^'.Tools::pRegexp($canonicalURL, '/').'([&?].*)?$/', Tools::getProtocol().$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
+ {
+ header('HTTP/1.0 301 Moved');
+ if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_)
+ die('[Debug] This page has moved'.$canonicalURL.' ');
+ Tools::redirectLink($canonicalURL);
+ }
+ }
+ }
+
+ public function preProcess()
{
if ($id_manufacturer = Tools::getValue('id_manufacturer'))
{
$this->manufacturer = new Manufacturer((int)$id_manufacturer, $this->context->language->id);
- if (Validate::isLoadedObject($this->manufacturer) AND $this->manufacturer->active AND $this->manufacturer->isAssociatedToGroupShop())
- {
- $nbProducts = $this->manufacturer->getProducts($id_manufacturer, NULL, NULL, NULL, $this->orderBy, $this->orderWay, true);
- $this->pagination((int)$nbProducts);
- $this->context->smarty->assign(array(
- 'nb_products' => $nbProducts,
- 'products' => $this->manufacturer->getProducts($id_manufacturer, $this->context->language->id, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay),
- 'path' => ($this->manufacturer->active ? Tools::safeOutput($this->manufacturer->name) : ''),
- 'manufacturer' => $this->manufacturer));
- }
- else
+ if (!Validate::isLoadedObject($this->manufacturer) OR !$this->manufacturer->active || !$this->manufacturer->isAssociatedToGroupShop())
{
header('HTTP/1.1 404 Not Found');
header('Status: 404 Not Found');
$this->errors[] = Tools::displayError('Manufacturer does not exist.');
}
+ else
+ $this->canonicalRedirection();
+ }
+
+ parent::preProcess();
+ }
+
+ public function process()
+ {
+ if (Validate::isLoadedObject($this->manufacturer) AND $this->manufacturer->active AND $this->manufacturer->isAssociatedToGroupShop())
+ {
+ $nbProducts = $this->manufacturer->getProducts($this->manufacturer->id, NULL, NULL, NULL, $this->orderBy, $this->orderWay, true);
+ $this->pagination((int)$nbProducts);
+ $this->context->smarty->assign(array(
+ 'nb_products' => $nbProducts,
+ 'products' => $this->manufacturer->getProducts($this->manufacturer->id, $this->context->language->id, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay),
+ 'path' => ($this->manufacturer->active ? Tools::safeOutput($this->manufacturer->name) : ''),
+ 'manufacturer' => $this->manufacturer));
}
else
{
if (Configuration::get('PS_DISPLAY_SUPPLIERS'))
{
$id_current_group_shop = $this->context->shop->getGroupID();
- $data = call_user_func(array('Manufacturer', 'getManufacturers'), true, $this->context->language->id, true, false, false, false, $id_current_group_shop);
+ $data = Manufacturer::getManufacturers(true, $this->context->language->id, true, false, false, false, $id_current_group_shop);
$nbProducts = count($data);
$this->pagination($nbProducts);
- $data = call_user_func(array('Manufacturer', 'getManufacturers'), true, $this->context->language->id, true, $this->p, $this->n, false, $id_current_group_shop);
+ $manufacturers = Manufacturer::getManufacturers(true, (int)self::$cookie->id_lang, true, $this->p, $this->n, false, $id_current_group_shop);
$imgDir = _PS_MANU_IMG_DIR_;
foreach ($data AS &$item)
- $item['image'] = (!file_exists($imgDir.'/'.$item['id_manufacturer'].'-medium.jpg')) ?
- $this->context->language->iso_code.'-default' : $item['id_manufacturer'];
+ $row['image'] = (!file_exists(_PS_MANU_IMG_DIR_.'/'.$row['id_manufacturer'].'-medium.jpg')) ? $this->context->language->iso_code.'-default' : $row['id_manufacturer'];
+
$this->context->smarty->assign(array(
- 'pages_nb' => ceil($nbProducts / (int)($this->n)),
- 'nbManufacturers' => $nbProducts,
- 'mediumSize' => Image::getSize('medium'),
- 'manufacturers' => $data,
- 'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
+ 'pages_nb' => ceil($nbProducts / (int)($this->n)),
+ 'nbManufacturers' => $nbProducts,
+ 'mediumSize' => Image::getSize('medium'),
+ 'manufacturers' => $data,
+ 'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
));
}
else
diff --git a/controllers/StoresController.php b/controllers/StoresController.php
index 649a484ca..f58e7575f 100644
--- a/controllers/StoresController.php
+++ b/controllers/StoresController.php
@@ -31,6 +31,12 @@ class StoresControllerCore extends FrontController
public function preProcess()
{
+ if(!extension_loaded('Dom'))
+ {
+ $this->errors[] = Tools::displayError('Dom extension is not loaded.');
+ $smarty->assign('errors', $this->errors);
+ }
+
$simplifiedStoreLocator = Configuration::get('PS_STORES_SIMPLIFIED');
$distanceUnit = Configuration::get('PS_DISTANCE_UNIT');
if (!in_array($distanceUnit, array('km', 'mi')))
diff --git a/controllers/SupplierController.php b/controllers/SupplierController.php
index 9e26e5816..367665f02 100644
--- a/controllers/SupplierController.php
+++ b/controllers/SupplierController.php
@@ -39,6 +39,8 @@ class SupplierControllerCore extends FrontController
public function canonicalRedirection()
{
+ if (Configuration::get('PS_CANONICAL_REDIRECT'))
+ {
if (Validate::isLoadedObject($this->supplier))
{
$canonicalURL = self::$link->getSupplierLink($this->supplier);
@@ -51,6 +53,7 @@ class SupplierControllerCore extends FrontController
}
}
}
+ }
public function preProcess()
{
diff --git a/modules/ebay/eBayRequest.php b/modules/ebay/eBayRequest.php
index dd127ae69..7751e8643 100755
--- a/modules/ebay/eBayRequest.php
+++ b/modules/ebay/eBayRequest.php
@@ -987,8 +987,10 @@ class eBayRequest
{
$name = explode(' ', (string)$order->ShippingAddress->Name);
$itemList = array();
- foreach ($order->TransactionArray->Transaction as $transaction)
+ for ($i = 0; isset($order->TransactionArray->Transaction[$i]); $i++)
{
+ $transaction = $order->TransactionArray->Transaction[$i];
+
$id_product = 0;
$id_attribute = 0;
$quantity = (string)$transaction->QuantityPurchased;
@@ -1007,18 +1009,28 @@ class eBayRequest
$itemList[] = array('id_product' => $id_product, 'id_product_attribute' => $id_product_attribute, 'quantity' => $quantity, 'price' => (string)$transaction->TransactionPrice);
else
{
+ $reference = '-----------------------';
+ $skuItem = (string)$transaction->Item->SKU;
+ $skuVariation = (string)$transaction->Variation->SKU;
+ $customLabel = (string)$transaction->SellingManagerProductDetails->CustomLabel;
+ if ($customLabel != '') $reference = $customLabel;
+ else
+ {
+ if ($skuVariation != '') $reference = $skuVariation;
+ else $reference = $skuItem;
+ }
+
+
$id_product = Db::getInstance()->getValue('
SELECT `id_product` FROM `'._DB_PREFIX_.'product`
- WHERE `reference` = \''.pSQL((string)$transaction->item->SKU).'\' OR `reference` = \''.pSQL((string)$transaction->item->CustomLabel).'\' OR `reference` = \''.pSQL((string)$transaction->SellingManagerProductDetails->CustomLabel).'\'
- OR `reference` = \''.pSQL((string)$transaction->Variation->SKU).'\' OR `reference` = \''.pSQL((string)$transaction->Variation->CustomLabel).'\'');
+ WHERE `reference` = \''.pSQL($reference).'\'');
if ((int)$id_product > 0)
$itemList[] = array('id_product' => $id_product, 'quantity' => $quantity, 'price' => (string)$transaction->TransactionPrice);
else
{
$row = Db::getInstance()->getValue('
SELECT `id_product`, `id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute`
- WHERE `reference` = \''.pSQL((string)$transaction->item->SKU).'\' OR `reference` = \''.pSQL((string)$transaction->item->CustomLabel).'\' OR `reference` = \''.pSQL((string)$transaction->SellingManagerProductDetails->CustomLabel).'\'
- OR `reference` = \''.pSQL((string)$transaction->Variation->SKU).'\' OR `reference` = \''.pSQL((string)$transaction->Variation->CustomLabel).'\'');
+ WHERE `reference` = \''.pSQL($reference).'\'');
if ((int)$row['id_product'] > 0)
$itemList[] = array('id_product' => $row['id_product'], 'id_product_attribute' => $row['id_product_attribute'], 'quantity' => $quantity, 'price' => (string)$transaction->TransactionPrice);
}
diff --git a/modules/ebay/ebay.php b/modules/ebay/ebay.php
index 5a52250df..db12e0eed 100755
--- a/modules/ebay/ebay.php
+++ b/modules/ebay/ebay.php
@@ -339,7 +339,6 @@ class Ebay extends Module
if (Validate::isEmail($order['email']) && !empty($order['firstname']) && !empty($order['familyname']))
{
-
// Add customer if he doesn't exist
if ($id_customer < 1)
{
diff --git a/modules/sendtoafriend/sendtoafriend-form.php b/modules/sendtoafriend/sendtoafriend-form.php
index 466c8fe6a..636ff180e 100644
--- a/modules/sendtoafriend/sendtoafriend-form.php
+++ b/modules/sendtoafriend/sendtoafriend-form.php
@@ -28,6 +28,6 @@
include(dirname(__FILE__).'/../../config/config.inc.php');
require_once(dirname(__FILE__).'/sendtoafriend.php');
-$sendtoafriend = new sendToAFriend();
+$sendtoafriend = new sendToAFriend($dontTranslate = true);
echo $sendtoafriend->displayPageForm();
diff --git a/modules/sendtoafriend/sendtoafriend.php b/modules/sendtoafriend/sendtoafriend.php
index f7d836681..0e94cb49f 100644
--- a/modules/sendtoafriend/sendtoafriend.php
+++ b/modules/sendtoafriend/sendtoafriend.php
@@ -30,7 +30,7 @@ if (!defined('_CAN_LOAD_FILES_'))
class sendToAFriend extends Module
{
- function __construct()
+ function __construct($dontTranslate = false)
{
$this->name = 'sendtoafriend';
$this->version = '1.1';
@@ -40,9 +40,12 @@ class sendToAFriend extends Module
parent::__construct();
+ if(!$dontTranslate)
+ {
$this->displayName = $this->l('Send to a Friend module');
$this->description = $this->l('Allows customers to send a product link to a friend.');
}
+ }
function install()
{
diff --git a/themes/prestashop/css/global.css b/themes/prestashop/css/global.css
index 86fc40707..9fd4131c8 100644
--- a/themes/prestashop/css/global.css
+++ b/themes/prestashop/css/global.css
@@ -975,7 +975,7 @@ td.discount_value { white-space: nowrap }
/* address.tpl */
p.address_navigation {
- padding: padding: 1em 0!important;
+ padding: 1em 0!important;
margin-bottom: 1.5em
}
p.address_navigation a.button { float: left }
diff --git a/themes/prestashop/order-opc-new-account.tpl b/themes/prestashop/order-opc-new-account.tpl
index cf1b9c3b3..f3922006b 100644
--- a/themes/prestashop/order-opc-new-account.tpl
+++ b/themes/prestashop/order-opc-new-account.tpl
@@ -200,6 +200,7 @@
{/if}
{l s='Delivery address'}
+ {$stateExist = false}
{foreach from=$dlv_all_fields item=field_name}
{if $field_name eq "company"}
@@ -259,6 +260,15 @@
+ {elseif $field_name eq "state" || $field_name eq 'State:name'}
+ {$stateExist = true}
+
+ {l s='State'}
+
+ -
+
+ *
+
{/if}
{/foreach}
@@ -267,6 +277,7 @@
{l s='DNI / NIF / NIE'}
*
+ {if !$stateExist}
{l s='State'}
@@ -274,6 +285,7 @@
*
+ {/if}
{l s='Additional information'}
diff --git a/translations/fr/admin.php b/translations/fr/admin.php
index b58bccb80..edbae5b3e 100644
--- a/translations/fr/admin.php
+++ b/translations/fr/admin.php
@@ -497,6 +497,8 @@ $_LANGADM['AdminCurrenciese7e915ec26ac2be5f5730752e5fc3b78'] = 'Vous ne pouvez p
$_LANGADM['AdminCurrencies77428b04a1847555eb9bc52422a377b0'] = 'Taux de change';
$_LANGADM['AdminCurrencies876ca43ba50351d4e492970f40632661'] = 'Mettre à jour les taux de change';
$_LANGADM['AdminCurrencies48781284e7a2c2b1479559ce12aa73c5'] = 'Mettre à jour les taux de change en temps réel';
+$_LANGADM['AdminCurrencies5e7ad8ee59bd36302bbc58bc710eeabb'] = 'Mise à jour des taux de change';
+$_LANGADM['AdminCurrencies260f0e6ff1df0aa4f39310176b5d6c44'] = 'Ajoutez cette URL à votre crontab ou appelez-la manuellement chaque jour';
$_LANGADM['AdminCurrenciesdfcfc43722eef1eab1e4a12e50a068b1'] = 'Devises';
$_LANGADM['AdminCurrencies77295c7d814e7397c55f64ec06313984'] = 'Devise :';
$_LANGADM['AdminCurrenciesa5ffda8871e3d3d193c8e67f76686375'] = 'Uniquement les lettres et le tiret sont autorisés';
diff --git a/translations/fr/errors.php b/translations/fr/errors.php
index b9b8e84da..66e6bcfa9 100644
--- a/translations/fr/errors.php
+++ b/translations/fr/errors.php
@@ -406,6 +406,7 @@ $_ERRORS['350e5d76b60ae887c90d55e2fb23fdc5'] = 'ce bon de réduction n\'est pas
$_ERRORS['f8279a73d35437427d4c77e28828c5fc'] = 'Cette adresse mail n\'est pas enregistrée';
$_ERRORS['e0a602c130d12d57cd4ca2a8b9240917'] = 'Ce fichier doit être éditable :';
$_ERRORS['c9615dc36879116ef8c5f1ab08543191'] = 'Ce fichier n\'existe plus.';
+$_ERRORS['b72591580ab2e9ecb08d1a26ac23641b'] = 'Cette clé est utilisée trop de fois (une seule autorisée)';
$_ERRORS['b60be6e4c0df15343a7cdafccb174159'] = 'Ce module ne peut être greffé sur ce hook.';
$_ERRORS['a44f9463879b845e1ad2c45e75aebd18'] = 'Ce module est déjà installé :';
$_ERRORS['aa508f3bd17074b8941571083de1350e'] = 'ce module est déjà greffé sur ce hook';
@@ -511,7 +512,6 @@ $_ERRORS['70f4b635847038d056e33959821a7a66'] = 'caractères max';
$_ERRORS['e0d4da0607fb1793b6e1d348c36d52cb'] = 'config.xml est manquant dans le dossier de votre thème';
$_ERRORS['1d112c010ef14e32e478b36aca8d3414'] = 'config.xml dans votre dossier de thème n\'est pas un fichier xml valide';
$_ERRORS['6364b8f0fcf00c1fedb76a7a7b7ad03e'] = 'Le fichier config.xml du thème n\'a pas été créé pour cette version de Prestashop';
-$_ERRORS['5a0d4dfcb49e88c4c62d91e3e66daef5'] = 'description : longueur > 400 pour la langue';
$_ERRORS['b0accee4a4704ec46d245b722309a8be'] = 'n\'existe pas en base de données';
$_ERRORS['06e3d36fa30cea095545139854ad1fb9'] = 'champ';
$_ERRORS['1cd6f2b0848e672cb987e15e0598a144'] = 'pour la langue';