diff --git a/.gitignore b/.gitignore
index 54223e3f8..0fb8e24f5 100755
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ phpmyadmin
 templates/default-esi
 local/modules/TemplateEsiModule
 composer.phar
+web/.htaccess
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d5355019..3dd437a0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 - Tinymce is now a dedicated module. You need to activate it.
 - Fix PDF creation. Bug #180
 - Fix many translation issues.
+- The TaxManager is now a service
+- Loop output is now put in cache for better performance
+- loop count is refactored. It used now count propel method instead of classic loop method
+- UTF-8 is used during install process, no more encoding problem in database now
+- an admin can now choose a prefered locale and switch language in admin panel
+- module repository is available on github : https://github.com/thelia-modules
+- import module from Thelia 1 is available. It works from Thelia 1.4.2 : https://github.com/thelia-modules/importT1
 
 #2.0.0-beta3
 - Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too
diff --git a/core/lib/Thelia/Action/Address.php b/core/lib/Thelia/Action/Address.php
index 2195d946f..d5e245b97 100644
--- a/core/lib/Thelia/Action/Address.php
+++ b/core/lib/Thelia/Action/Address.php
@@ -36,7 +36,7 @@ use Thelia\Model\Map\AddressTableMap;
  * @package Thelia\Action
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class Address extends BaseAction implements EventSubscriberInterface
+class Address implements EventSubscriberInterface
 {
 
     public function create(AddressCreateOrUpdateEvent $event)
@@ -69,7 +69,7 @@ class Address extends BaseAction implements EventSubscriberInterface
 
     protected function createOrUpdate(AddressModel $addressModel, AddressCreateOrUpdateEvent $event)
     {
-        $addressModel->setDispatcher($this->getDispatcher());
+        $addressModel->setDispatcher($event->getDispatcher());
         $con = Propel::getWriteConnection(AddressTableMap::DATABASE_NAME);
         $con->beginTransaction();
         try {
diff --git a/core/lib/Thelia/Action/Administrator.php b/core/lib/Thelia/Action/Administrator.php
index 15940082a..bbd4e3336 100644
--- a/core/lib/Thelia/Action/Administrator.php
+++ b/core/lib/Thelia/Action/Administrator.php
@@ -30,7 +30,7 @@ use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Admin as AdminModel;
 use Thelia\Model\AdminQuery;
 
-class Administrator extends BaseAction implements EventSubscriberInterface
+class Administrator implements EventSubscriberInterface
 {
     /**
      * @param AdministratorEvent $event
@@ -40,12 +40,13 @@ class Administrator extends BaseAction implements EventSubscriberInterface
         $administrator = new AdminModel();
 
         $administrator
-            ->setDispatcher($this->getDispatcher())
+            ->setDispatcher($event->getDispatcher())
             ->setFirstname($event->getFirstname())
             ->setLastname($event->getLastname())
             ->setLogin($event->getLogin())
             ->setPassword($event->getPassword())
             ->setProfileId($event->getProfile())
+            ->setLocale($event->getLocale())
         ;
 
         $administrator->save();
@@ -61,11 +62,12 @@ class Administrator extends BaseAction implements EventSubscriberInterface
         if (null !== $administrator = AdminQuery::create()->findPk($event->getId())) {
 
             $administrator
-                ->setDispatcher($this->getDispatcher())
+                ->setDispatcher($event->getDispatcher())
                 ->setFirstname($event->getFirstname())
                 ->setLastname($event->getLastname())
                 ->setLogin($event->getLogin())
                 ->setProfileId($event->getProfile())
+                ->setLocale($event->getLocale())
             ;
 
             if ('' !== $event->getPassword()) {
diff --git a/core/lib/Thelia/Action/Config.php b/core/lib/Thelia/Action/Config.php
index 8bb1e9fbf..b1c714a0e 100644
--- a/core/lib/Thelia/Action/Config.php
+++ b/core/lib/Thelia/Action/Config.php
@@ -23,15 +23,12 @@
 
 namespace Thelia\Action;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-use Thelia\Model\ConfigQuery;
-use Thelia\Model\Config as ConfigModel;
-
-use Thelia\Core\Event\TheliaEvents;
-
-use Thelia\Core\Event\Config\ConfigUpdateEvent;
 use Thelia\Core\Event\Config\ConfigCreateEvent;
 use Thelia\Core\Event\Config\ConfigDeleteEvent;
+use Thelia\Core\Event\Config\ConfigUpdateEvent;
+use Thelia\Core\Event\TheliaEvents;
+use Thelia\Model\Config as ConfigModel;
+use Thelia\Model\ConfigQuery;
 
 class Config extends BaseAction implements EventSubscriberInterface
 {
@@ -44,9 +41,14 @@ class Config extends BaseAction implements EventSubscriberInterface
     {
         $config = new ConfigModel();
 
-        $config->setDispatcher($this->getDispatcher())->setName($event->getEventName())->setValue($event->getValue())
-                ->setLocale($event->getLocale())->setTitle($event->getTitle())->setHidden($event->getHidden())
-                ->setSecured($event->getSecured())->save();
+        $config->setDispatcher($this->getDispatcher())
+            ->setName($event->getEventName())
+            ->setValue($event->getValue())
+            ->setLocale($event->getLocale())
+            ->setTitle($event->getTitle())
+            ->setHidden($event->getHidden())
+            ->setSecured($event->getSecured())
+        ->save();
 
         $event->setConfig($config);
     }
@@ -59,7 +61,7 @@ class Config extends BaseAction implements EventSubscriberInterface
     public function setValue(ConfigUpdateEvent $event)
     {
 
-        if (null !== $config = $search->findPk($event->getConfigId())) {
+        if (null !== $config = ConfigQuery::create()->findPk($event->getConfigId())) {
 
             if ($event->getValue() !== $config->getValue()) {
 
@@ -80,10 +82,17 @@ class Config extends BaseAction implements EventSubscriberInterface
 
         if (null !== $config = ConfigQuery::create()->findPk($event->getConfigId())) {
 
-            $config->setDispatcher($this->getDispatcher())->setName($event->getEventName())->setValue($event->getValue())
-                    ->setHidden($event->getHidden())->setSecured($event->getSecured())->setLocale($event->getLocale())
-                    ->setTitle($event->getTitle())->setDescription($event->getDescription())->setChapo($event->getChapo())
-                    ->setPostscriptum($event->getPostscriptum())->save();
+            $config->setDispatcher($this->getDispatcher())
+                ->setName($event->getEventName())
+                ->setValue($event->getValue())
+                ->setHidden($event->getHidden())
+                ->setSecured($event->getSecured())
+                ->setLocale($event->getLocale())
+                ->setTitle($event->getTitle())
+                ->setDescription($event->getDescription())
+                ->setChapo($event->getChapo())
+                ->setPostscriptum($event->getPostscriptum())
+            ->save();
 
             $event->setConfig($config);
         }
diff --git a/core/lib/Thelia/Action/Customer.php b/core/lib/Thelia/Action/Customer.php
index 4fe5d0f72..84dc8f97f 100644
--- a/core/lib/Thelia/Action/Customer.php
+++ b/core/lib/Thelia/Action/Customer.php
@@ -28,6 +28,7 @@ use Thelia\Core\Event\ActionEvent;
 use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
 use Thelia\Core\Event\Customer\CustomerEvent;
 use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Security\SecurityContext;
 use Thelia\Model\Customer as CustomerModel;
 use Thelia\Core\Event\Customer\CustomerLoginEvent;
 
@@ -39,8 +40,14 @@ use Thelia\Core\Event\Customer\CustomerLoginEvent;
  * @package Thelia\Action
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class Customer extends BaseAction implements EventSubscriberInterface
+class Customer implements EventSubscriberInterface
 {
+    protected $securityContext;
+
+    public function __construct(SecurityContext $securityContext)
+    {
+        $this->securityContext = $securityContext;
+    }
 
     public function create(CustomerCreateOrUpdateEvent $event)
     {
@@ -65,7 +72,7 @@ class Customer extends BaseAction implements EventSubscriberInterface
 
         $customer = $event->getCustomer();
 
-        $customer->setDispatcher($this->getDispatcher());
+        $customer->setDispatcher($event->getDispatcher());
 
         $customer
             ->setTitleId($event->getTitle())
@@ -91,7 +98,7 @@ class Customer extends BaseAction implements EventSubscriberInterface
 
     private function createOrUpdateCustomer(CustomerModel $customer, CustomerCreateOrUpdateEvent $event)
     {
-        $customer->setDispatcher($this->getDispatcher());
+        $customer->setDispatcher($event->getDispatcher());
 
         $customer->createOrUpdate(
             $event->getTitle(),
@@ -140,7 +147,7 @@ class Customer extends BaseAction implements EventSubscriberInterface
      */
     protected function getSecurityContext()
     {
-        return $this->container->get('thelia.securityContext');
+        return $this->securityContext;
     }
 
     /**
diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 276f2103d..2b2c9b7a6 100644
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -23,33 +23,30 @@
 
 namespace Thelia\Action;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Cart\CartTrait;
 use Thelia\Core\Event\Cart\CartEvent;
 use Thelia\Core\Event\Order\OrderAddressEvent;
 use Thelia\Core\Event\Order\OrderEvent;
+use Thelia\Core\Event\Order\OrderManualEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Exception\TheliaProcessException;
 use Thelia\Model\AddressQuery;
+use Thelia\Model\Cart as CartModel;
 use Thelia\Model\ConfigQuery;
-use Thelia\Model\MessageQuery;
-use Thelia\Model\OrderProductAttributeCombination;
-use Thelia\Model\ModuleQuery;
-use Thelia\Model\OrderProduct;
-use Thelia\Model\OrderStatus;
+use Thelia\Model\Currency;
+use Thelia\Model\Customer;
+use Thelia\Model\Lang;
 use Thelia\Model\Map\OrderTableMap;
+use Thelia\Model\MessageQuery;
+use Thelia\Model\ModuleQuery;
+use Thelia\Model\Order as ModelOrder;
 use Thelia\Model\OrderAddress;
+use Thelia\Model\OrderProduct;
+use Thelia\Model\OrderProductAttributeCombination;
+use Thelia\Model\OrderStatus;
 use Thelia\Model\OrderStatusQuery;
 use Thelia\Tools\I18n;
-use Thelia\Model\Currency;
-use Thelia\Model\Lang;
-use Thelia\Model\Country;
-use Thelia\Model\Customer;
-use Thelia\Core\Event\Order\OrderManualEvent;
-
-use Thelia\Model\Cart as CartModel;
-use Thelia\Model\Order as ModelOrder;
 
 /**
  *
@@ -129,7 +126,7 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         $con->beginTransaction();
 
-        /* use a copy to avoid errored reccord in session */
+        /* use a copy to avoid errored record in session */
         $placedOrder = $sessionOrder->copy();
         $placedOrder->setDispatcher($this->getDispatcher());
 
@@ -307,9 +304,7 @@ class Order extends BaseAction implements EventSubscriberInterface
             $this->getSecurityContext()->getCustomerUser()
         );
 
-
-        $this->getDispatcher()->dispatch(TheliaEvents::ORDER_BEFORE_PAYMENT, new OrderEvent($placedOrder));
-
+        $event->getDispatcher()->dispatch(TheliaEvents::ORDER_BEFORE_PAYMENT, new OrderEvent($placedOrder));
 
         /* clear session */
         $session
@@ -322,7 +317,7 @@ class Order extends BaseAction implements EventSubscriberInterface
         $event->setPlacedOrder($placedOrder);
 
         /* empty cart */
-        $this->getDispatcher()->dispatch(TheliaEvents::CART_CLEAR, new CartEvent($this->getCart($this->getRequest())));
+        $event->getDispatcher()->dispatch(TheliaEvents::CART_CLEAR, new CartEvent($this->getCart($this->getRequest())));
 
         /* call pay method */
 
diff --git a/core/lib/Thelia/Command/CreateAdminUser.php b/core/lib/Thelia/Command/CreateAdminUser.php
index 7e9b59ba0..bbc4f9ad0 100644
--- a/core/lib/Thelia/Command/CreateAdminUser.php
+++ b/core/lib/Thelia/Command/CreateAdminUser.php
@@ -62,6 +62,13 @@ class CreateAdminUser extends ContainerAwareCommand
                 'User last name',
                 null
             )
+            ->addOption(
+                "locale",
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Preferred locale (default: en_US)',
+                null
+            )
             ->addOption(
                 'password',
                 null,
@@ -122,6 +129,7 @@ class CreateAdminUser extends ContainerAwareCommand
         $admin->setLogin($input->getOption("login_name") ?: $this->enterData($dialog, $output, "Admin login name : ", "Please enter a login name."));
         $admin->setFirstname($input->getOption("first_name") ?: $this->enterData($dialog, $output, "User first name : ", "Please enter user first name."));
         $admin->setLastname($input->getOption("last_name") ?: $this->enterData($dialog, $output, "User last name : ", "Please enter user last name."));
+        $admin->setLocale($input->getOption("locale") ?: 'en_US');
 
         do {
             $password = $input->getOption("password") ?: $this->enterData($dialog, $output, "Password : ", "Please enter a password.", true);
diff --git a/core/lib/Thelia/Command/Install.php b/core/lib/Thelia/Command/Install.php
index 71c97e9a1..4cff782ad 100644
--- a/core/lib/Thelia/Command/Install.php
+++ b/core/lib/Thelia/Command/Install.php
@@ -227,6 +227,7 @@ class Install extends ContainerAwareCommand
                 $connectionInfo["username"],
                 $connectionInfo["password"]
             );
+            $connection->query('SET NAMES \'UTF8\'');
         } catch (\PDOException $e) {
             $output->writeln(array(
                 "<error>Wrong connection information</error>"
diff --git a/core/lib/Thelia/Command/ModuleGenerateCommand.php b/core/lib/Thelia/Command/ModuleGenerateCommand.php
index 7657f1d89..c6d8bf13f 100644
--- a/core/lib/Thelia/Command/ModuleGenerateCommand.php
+++ b/core/lib/Thelia/Command/ModuleGenerateCommand.php
@@ -106,7 +106,6 @@ class ModuleGenerateCommand extends BaseModuleGenerate
 
             $schemaContent = file_get_contents($skeletonDir . "schema.xml");
 
-            $schemaContent = str_replace("%%CONFIG_DIR%%", THELIA_CONF_DIR, $schemaContent);
             $schemaContent = str_replace("%%NAMESPACE%%", $this->module, $schemaContent);
 
             file_put_contents($this->moduleDirectory . DIRECTORY_SEPARATOR . "Config". DIRECTORY_SEPARATOR . "schema.xml", $schemaContent);
diff --git a/core/lib/Thelia/Command/Skeleton/Module/schema.xml b/core/lib/Thelia/Command/Skeleton/Module/schema.xml
index 3fcba0184..0aa692048 100644
--- a/core/lib/Thelia/Command/Skeleton/Module/schema.xml
+++ b/core/lib/Thelia/Command/Skeleton/Module/schema.xml
@@ -3,5 +3,5 @@
     <!--
     See propel documentation on http://propelorm.org for all information about schema file
     -->
-    <external-schema filename="%%CONFIG_DIR%%schema.xml" referenceOnly="true" />
+    <external-schema filename="local/config/schema.xml" referenceOnly="true" />
 </database>
diff --git a/core/lib/Thelia/Config/I18n/en_US.php b/core/lib/Thelia/Config/I18n/en_US.php
old mode 100644
new mode 100755
index 2b8b661c2..3dd37c895
--- a/core/lib/Thelia/Config/I18n/en_US.php
+++ b/core/lib/Thelia/Config/I18n/en_US.php
@@ -1,14 +1,201 @@
 <?php
 
 return array(
-    'Delivery module' => 'Delivery module',
-    'Quantity' => 'Quantity',
-    'Product' => 'Product',
-    'Unit. price' => 'Unit. price',
-    'Tax' => 'Tax',
-    'Unit taxed price' => 'Unit taxed price',
-    'Taxed total' => 'Taxed total',
-    'Payment module' => 'Payment module',
+    '%obj SEO modification' => '%obj SEO modification',
+    '%obj creation' => '%obj creation',
+    '%obj modification' => '%obj modification',
+    'A currency with code "%name" already exists.' => 'A currency with code "%name" already exists.',
+    'A message with name "%name" already exists.' => 'A message with name "%name" already exists.',
+    'A variable with name "%name" already exists.' => 'A variable with name "%name" already exists.',
+    'Activate logs only for these IP Addresses' => 'Activate logs only for these IP Addresses',
+    'Activate logs only for these files' => 'Activate logs only for these files',
+    'Add to all product templates' => 'Add to all product templates',
+    'Additional address' => 'Additional address',
+    'Address Line 2' => 'Address Line 2',
+    'Address Line 3' => 'Address Line 3',
+    'Address label' => 'Address label',
+    'Advertise this product as new' => 'Advertise this product as new',
+    'Alerts' => 'Alerts',
+    'Alpha code 2 *' => 'Alpha code 2 *',
+    'Alpha code 3 *' => 'Alpha code 3 *',
+    'Amount removed from the cart' => 'Amount removed from the cart',
+    'Apply exchange rates on price in %sym' => 'Apply exchange rates on price in %sym',
+    'Area' => 'Area',
+    'Attribute ID:Attribute AV ID' => 'Attribute ID:Attribute AV ID',
+    'Auth mode' => 'Auth mode',
+    'Available quantity' => 'Available quantity',
+    'Available quantity *' => 'Available quantity *',
+    'Business ID' => 'Business ID',
+    'Cannot find a default country. Please define one.' => 'Cannot find a default country. Please define one.',
+    'Cannot find the shop country. Please select a shop country.' => 'Cannot find the shop country. Please select a shop country.',
+    'Category title *' => 'Category title *',
+    'Cellphone' => 'Cellphone',
+    'Chapo' => 'Chapo',
+    'City' => 'City',
+    'Combination builder' => 'Combination builder',
+    'Compagny' => 'Compagny',
+    'Company' => 'Company',
+    'Company Name' => 'Company Name',
+    'Conclusion' => 'Conclusion',
+    'Constant amount' => 'Constant amount',
+    'Constant amount found in one of the product\'s feature' => 'Constant amount found in one of the product\'s feature',
+    'Content title *' => 'Content title *',
+    'Country' => 'Country',
+    'Country area' => 'Country area',
+    'Country title *' => 'Country title *',
+    'Critical' => 'Critical',
+    'Current Password' => 'Current Password',
+    'Debug' => 'Debug',
+    'Default folder *' => 'Default folder *',
+    'Default product category *' => 'Default product category *',
+    'Default product sale element' => 'Default product sale element',
+    'Description' => 'Description',
+    'Detailed description' => 'Detailed description',
+    'Disabled' => 'Disabled',
+    'EAN Code' => 'EAN Code',
+    'Email Address' => 'Email Address',
+    'Email address' => 'Email address',
+    'Emergency' => 'Emergency',
+    'Enable remote SMTP use' => 'Enable remote SMTP use',
+    'Encryption' => 'Encryption',
+    'Errors' => 'Errors',
+    'Failed to update language definition: %ex' => 'Failed to update language definition: %ex',
+    'Fax' => 'Fax',
+    'Feature value does not match FLOAT format' => 'Feature value does not match FLOAT format',
+    'First Name' => 'First Name',
+    'Firstname' => 'Firstname',
+    'Folder title *' => 'Folder title *',
+    'Full Name' => 'Full Name',
+    'HTML Message' => 'HTML Message',
+    'Host' => 'Host',
+    'I would like to receive the newsletter or the latest news.' => 'I would like to receive the newsletter or the latest news.',
+    'ISO 4217 code *' => 'ISO 4217 code *',
+    'ISO 639-1 Code' => 'ISO 639-1 Code',
+    'ISO Code *' => 'ISO Code *',
+    'If a translation is missing or incomplete :' => 'If a translation is missing or incomplete :',
+    'Information' => 'Information',
+    'Invalid product_sale_elements' => 'Invalid product_sale_elements',
+    'Invalid value for walkMode parameter: %value' => 'Invalid value for walkMode parameter: %value',
+    'Is it the default product sale element ?' => 'Is it the default product sale element ?',
+    'Language name' => 'Language name',
+    'Last Name' => 'Last Name',
+    'Lastname' => 'Lastname',
+    'Log format *' => 'Log format *',
+    'Log level *' => 'Log level *',
+    'Login' => 'Login',
+    'Login failed. Please check your username and password.' => 'Login failed. Please check your username and password.',
+    'Make this address as my primary address' => 'Make this address as my primary address',
+    'Message subject' => 'Message subject',
+    'Meta Description' => 'Meta Description',
+    'Meta Keywords' => 'Meta Keywords',
+    'Name' => 'Name',
+    'Name *' => 'Name *',
+    'Name of the HTML layout file' => 'Name of the HTML layout file',
+    'Name of the HTML template file' => 'Name of the HTML template file',
+    'Name of the text layout file' => 'Name of the text layout file',
+    'Name of the text template file' => 'Name of the text template file',
+    'New Password' => 'New Password',
+    'No %obj was created.' => 'No %obj was created.',
+    'No %obj was updated.' => 'No %obj was updated.',
+    'No, I am a new customer.' => 'No, I am a new customer.',
+    'Notices' => 'Notices',
+    'Page Title' => 'Page Title',
+    'Parent category *' => 'Parent category *',
+    'Parent folder *' => 'Parent folder *',
+    'Password' => 'Password',
+    'Password *' => 'Password *',
+    'Password confirmation' => 'Password confirmation',
+    'Percentage of the product price' => 'Percentage of the product price',
+    'Percentage removed from the cart' => 'Percentage removed from the cart',
+    'Phone' => 'Phone',
+    'Please enter your email address' => 'Please enter your email address',
+    'Please enter your password' => 'Please enter your password',
+    'Please specify either \'path\' or \'file\' parameter in {url} function.' => 'Please specify either \'path\' or \'file\' parameter in {url} function.',
+    'Port' => 'Port',
+    'Post Scriptum' => 'Post Scriptum',
     'Postage' => 'Postage',
-    'Total' => 'Total',
+    'Preferred locale' => 'Preferred locale',
+    'Prevent mailing template modification or deletion, except for super-admin' => 'Prevent mailing template modification or deletion, except for super-admin',
+    'Prevent variable modification or deletion, except for super-admin' => 'Prevent variable modification or deletion, except for super-admin',
+    'Price' => 'Price',
+    'Price currency *' => 'Price currency *',
+    'Prodcut ID *' => 'Prodcut ID *',
+    'Product ID' => 'Product ID',
+    'Product ID *' => 'Product ID *',
+    'Product base price excluding taxes *' => 'Product base price excluding taxes *',
+    'Product price excluding taxes' => 'Product price excluding taxes',
+    'Product price excluding taxes *' => 'Product price excluding taxes *',
+    'Product price including taxes' => 'Product price including taxes',
+    'Product reference *' => 'Product reference *',
+    'Product sale element ID *' => 'Product sale element ID *',
+    'Product template' => 'Product template',
+    'Product title *' => 'Product title *',
+    'ProductSaleElement modification' => 'ProductSaleElement modification',
+    'Profile' => 'Profile',
+    'Profile Code' => 'Profile Code',
+    'Purpose *' => 'Purpose *',
+    'Quantity' => 'Quantity',
+    'Rate from &euro; *' => 'Rate from &euro; *',
+    'Redirecting ...' => 'Redirecting ...',
+    'Redirecting to %url' => 'Redirecting to %url',
+    'Reference' => 'Reference',
+    'Reference *' => 'Reference *',
+    'Remember me ?' => 'Remember me ?',
+    'Remove X amount to total cart' => 'Remove X amount to total cart',
+    'Remove X percent to total cart' => 'Remove X percent to total cart',
+    'Replace by the default language' => 'Replace by the default language',
+    'Replace current document by this file' => 'Replace current document by this file',
+    'Replace current image by this file' => 'Replace current image by this file',
+    'Rewriten URL' => 'Rewriten URL',
+    'Rotated Text File' => 'Rotated Text File',
+    'Sale price excluding taxes' => 'Sale price excluding taxes',
+    'Sale price including taxes' => 'Sale price including taxes',
+    'Show redirections *' => 'Show redirections *',
+    'Sorry, an error occured: %msg' => 'Sorry, an error occured: %msg',
+    'Sorry, you are not allowed to perform this action.' => 'Sorry, you are not allowed to perform this action.',
+    'Sorry, you\'re not allowed to perform this action' => 'Sorry, you\'re not allowed to perform this action',
+    'Source IP' => 'Source IP',
+    'Store configuration failed.' => 'Store configuration failed.',
+    'Store email address' => 'Store email address',
+    'Store logs into text file' => 'Store logs into text file',
+    'Store logs into text file, up to a certian size, then a new file is created' => 'Store logs into text file, up to a certian size, then a new file is created',
+    'Store name' => 'Store name',
+    'Street Address' => 'Street Address',
+    'Street Address ' => 'Street Address ',
+    'Strictly use the requested language' => 'Strictly use the requested language',
+    'Subject' => 'Subject',
+    'Summary' => 'Summary',
+    'Symbol *' => 'Symbol *',
+    'System log configuration failed.' => 'System log configuration failed.',
+    'Tax rule for this product *' => 'Tax rule for this product *',
+    'Template Name *' => 'Template Name *',
+    'Template file %file cannot be found.' => 'Template file %file cannot be found.',
+    'Text File' => 'Text File',
+    'Text Message' => 'Text Message',
+    'This category is online.' => 'This category is online.',
+    'This content is online.' => 'This content is online.',
+    'This extension must be installed and loaded' => 'This extension must be installed and loaded',
+    'This folder is online.' => 'This folder is online.',
+    'This product is on sale' => 'This product is on sale',
+    'This product is online' => 'This product is online',
+    'Timeout' => 'Timeout',
+    'Title' => 'Title',
+    'Title *' => 'Title *',
+    'Type' => 'Type',
+    'Username' => 'Username',
+    'Username *' => 'Username *',
+    'Value' => 'Value',
+    'Value *' => 'Value *',
+    'Warnings' => 'Warnings',
+    'Weight' => 'Weight',
+    'Weight *' => 'Weight *',
+    'Yes, I have a password :' => 'Yes, I have a password :',
+    'Your Email Address' => 'Your Email Address',
+    'Your Message' => 'Your Message',
+    'Zip code' => 'Zip code',
+    'date format' => 'date format',
+    'language locale' => 'language locale',
+    'mailing system modification' => 'mailing system modification',
+    'shipping area name' => 'shipping area name',
+    'time format' => 'time format',
 );
diff --git a/core/lib/Thelia/Config/I18n/es_ES.php b/core/lib/Thelia/Config/I18n/es_ES.php
old mode 100644
new mode 100755
index 0a749d4c1..aaf1bcb33
--- a/core/lib/Thelia/Config/I18n/es_ES.php
+++ b/core/lib/Thelia/Config/I18n/es_ES.php
@@ -1,36 +1,14 @@
 <?php
 
 return array(
-    'Combination builder' => 'Combination builder',
-    'Title' => 'Title',
-    'City' => 'City',
-    'Zip code' => 'Zip code',
-    'Country' => 'Country',
-    'Phone' => 'Phone',
-    'Login' => 'Login',
-    'Password' => 'Password',
-    'Profile' => 'Profile',
-    'Postage' => 'Postage',
-    'Add to all product templates' => 'Add to all product templates',
-    'Quantity' => 'Quantity',
-    'Name' => 'Name',
-    'Value' => 'Value',
-    'Subject' => 'Subject',
-    'Company' => 'Company',
-    'Description' => 'Description',
-    'Language name' => 'Language name',
-    'ISO 639 Code' => 'ISO 639 Code',
-    'If a translation is missing or incomplete :' => 'If a translation is missing or incomplete :',
-    'Host' => 'Host',
-    'Port' => 'Port',
-    'Encryption' => 'Encryption',
-    'Username' => 'Username',
-    'Timeout' => 'Timeout',
-    'Source IP' => 'Source IP',
-    'Email address' => 'Email address',
-    'Firstname' => 'Firstname',
-    'Lastname' => 'Lastname',
-    'Additional address' => 'Additional address',
-    'Reference' => 'Reference',
-    'EAN Code' => 'EAN Code',
+    'Delivery module' => 'Módulo de entrega',
+    'Quantity' => 'Cantidad',
+    'Product' => 'Producto',
+    'Unit. price' => 'Precio unitario',
+    'Tax' => 'Impuestos',
+    'Unit taxed price' => 'Precio unitario IVA incluido',
+    'Taxed total' => 'Total + IVA',
+    'Payment module' => 'Módulo de pago',
+    'Postage' => 'Gastos de envío',
+    'Total' => 'Total',
 );
diff --git a/core/lib/Thelia/Config/I18n/fr_FR.php b/core/lib/Thelia/Config/I18n/fr_FR.php
old mode 100644
new mode 100755
index aec4f3669..b38c48c88
--- a/core/lib/Thelia/Config/I18n/fr_FR.php
+++ b/core/lib/Thelia/Config/I18n/fr_FR.php
@@ -19,7 +19,9 @@ return array(
     'Alpha code 2 *' => 'Code Alpha 2 *',
     'Alpha code 3 *' => 'Code Alpha 3 *',
     'Amount removed from the cart' => 'Montant déduit du panier',
+    'Apply exchange rates on price in %sym' => 'Appliquer le taux de change sur le prix en %sym',
     'Area' => 'Zone',
+    'Attribute ID:Attribute AV ID' => 'Déclinaison ID : Valeur de déclinaison ID',
     'Auth mode' => 'Mode d\'authentification',
     'Available quantity' => 'Quantité disponible',
     'Available quantity *' => 'Quantité disponible *',
@@ -30,11 +32,13 @@ return array(
     'Cellphone' => 'Numéro de portable',
     'Chapo' => 'Chapeau',
     'City' => 'Ville',
-    'Combination builder' => 'Constructeur de combinaison',
+    'Combination builder' => 'générateur de combinaison',
     'Compagny' => 'Société',
     'Company' => 'Entreprise',
     'Company Name' => 'Nom de la société',
     'Conclusion' => 'Conclusion',
+    'Constant amount' => 'Montant fixe',
+    'Constant amount found in one of the product\'s feature' => 'Montant fixe trouvé depuis une caractéristique produit',
     'Content title *' => 'Titre du contenu *',
     'Country' => 'Pays',
     'Country area' => 'Zone du pays',
@@ -44,6 +48,7 @@ return array(
     'Debug' => 'Debug',
     'Default folder *' => 'Dossier par défaut *',
     'Default product category *' => 'Catégorie du produit par défaut *',
+    'Default product sale element' => 'Product Sale Element par défaut',
     'Description' => 'Description',
     'Detailed description' => 'Description détaillée',
     'Disabled' => 'Désactivé',
@@ -54,21 +59,24 @@ return array(
     'Enable remote SMTP use' => 'Activer l\'utilisation d\'un serveur SMTP distant.',
     'Encryption' => 'Chiffrement',
     'Errors' => 'Erreurs',
+    'Failed to update language definition: %ex' => 'Erreur lors de la mise à jour de la définition de la langue : %ex',
     'Fax' => 'Fax',
+    'Feature value does not match FLOAT format' => 'valeur de caractéristique n\'est pas un FLOAT',
     'First Name' => 'Prénom',
     'Firstname' => 'Prénom',
     'Folder title *' => 'Titre du dossier *',
     'Full Name' => 'Nom complet',
     'HTML Message' => 'Message au format HTML',
-    'Host' => 'Host',
+    'Host' => 'Nom de l\'hôte',
     'I would like to receive the newsletter or the latest news.' => 'Je souhaite recevoir la lettre d\'information ou les dernières actualités.',
     'ISO 4217 code *' => 'Code ISO 4217 *',
-    'ISO 639 Code' => 'Code ISO 639',
+    'ISO 639-1 Code' => 'Code ISO 639-1',
     'ISO Code *' => 'Code ISO *',
-    'If a translation is missing or incomplete :' => 'Si une traduction est manquante ou incomplète:',
+    'If a translation is missing or incomplete :' => 'Si une traduction est manquante ou incomplète :',
     'Information' => 'Information',
     'Invalid product_sale_elements' => 'product_sale_elements invalide',
     'Invalid value for walkMode parameter: %value' => 'Valeur incorrecte pour le paramètre walkMode : %value',
+    'Is it the default product sale element ?' => 'Product Sale Element par défaut ?',
     'Language name' => 'Nom de la langue',
     'Last Name' => 'Nom',
     'Lastname' => 'Nom',
@@ -97,6 +105,7 @@ return array(
     'Password' => 'Mot de passe',
     'Password *' => 'Mot de passe *',
     'Password confirmation' => 'Confirmation du mot de passe.',
+    'Percentage of the product price' => 'Pourcentage du prix du produit',
     'Percentage removed from the cart' => 'Pourcentage déduit du panier',
     'Phone' => 'Téléphone',
     'Please enter your email address' => 'Renseignez votre adresse mail',
@@ -105,6 +114,7 @@ return array(
     'Port' => 'Port',
     'Post Scriptum' => 'Post-scriptum',
     'Postage' => 'Frais de livraison',
+    'Preferred locale' => 'locale souhaitée',
     'Prevent mailing template modification or deletion, except for super-admin' => 'Prévenir la suppression ou la modification ds templates de mail, excepté pour les super-administrateurs.',
     'Prevent variable modification or deletion, except for super-admin' => 'Prévenir la suppression ou la modification de variables, excepté pour les super-administrateurs.',
     'Price' => 'Prix',
@@ -114,18 +124,20 @@ return array(
     'Product ID *' => 'ID produit *',
     'Product base price excluding taxes *' => 'Prix du produit Hors Taxe *',
     'Product price excluding taxes' => 'Prix du produit Hors Taxes',
+    'Product price excluding taxes *' => 'prix HT',
     'Product price including taxes' => 'Prix du produit taxes incluses',
     'Product reference *' => 'Référence du produit *',
+    'Product sale element ID *' => 'Product sale element ID *',
     'Product template' => 'Template du produit',
     'Product title *' => 'Titre du produit *',
     'ProductSaleElement modification' => 'Modification de ProductSaleElement.',
     'Profile' => 'Profil',
     'Profile Code' => 'Profil',
-    'Quantity' => 'Quantité',
+    'Purpose *' => 'Objet',
     'Rate from &euro; *' => 'Taux à partie de l\'&euro; *',
     'Redirecting ...' => 'Redirection ...',
     'Redirecting to %url' => 'Redirection vers %url',
-    'Reference' => 'Reference',
+    'Reference' => 'Référence',
     'Reference *' => 'Référence *',
     'Remember me ?' => 'Se souvenir de moi ?',
     'Remove X amount to total cart' => 'Enlève un montant fixe du total du panier',
@@ -134,6 +146,7 @@ return array(
     'Replace current document by this file' => 'Remplacer le document courant par ce fichier',
     'Replace current image by this file' => 'Remplacer l\'image courante par ce fichier',
     'Rewriten URL' => 'URL re-écrite',
+    'Rotated Text File' => 'Rotation du fichier texte',
     'Sale price excluding taxes' => 'Prix de vente Hors Taxes',
     'Sale price including taxes' => 'Prix de vente Toutes Taxes Comprises',
     'Show redirections *' => 'Montrer les redirections *',
@@ -144,6 +157,7 @@ return array(
     'Store configuration failed.' => 'Erreur de configuration du magasin.',
     'Store email address' => 'Adresse mail du magasin',
     'Store logs into text file' => 'Conserver les logs dans des fichiers texte',
+    'Store logs into text file, up to a certian size, then a new file is created' => 'Sauvegarder les logs dans un fichier texte. A partir d\'une certaine taille un nouveau fichier est crée',
     'Store name' => 'Nom du magasin',
     'Street Address' => 'Adresse',
     'Street Address ' => 'Rue',
@@ -163,7 +177,7 @@ return array(
     'This folder is online.' => 'Ce dossier est en ligne.',
     'This product is on sale' => 'Ce produit est en promo',
     'This product is online' => 'Ce produit est en ligne',
-    'Timeout' => 'Timeout',
+    'Timeout' => 'Délai d\'attente expiré',
     'Title' => 'Titre',
     'Title *' => 'Titre *',
     'Type' => 'Type',
diff --git a/core/lib/Thelia/Config/I18n/it_IT.php b/core/lib/Thelia/Config/I18n/it_IT.php
old mode 100644
new mode 100755
diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml
index d8252f11b..c64e606a8 100644
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -16,13 +16,12 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
-        <service id="thelia.action.customer" class="Thelia\Action\Customer">
-            <argument type="service" id="service_container"/>
+        <service id="thelia.action.customer" class="Thelia\Action\Customer" scope="request">
+            <argument type="service" id="thelia.securityContext"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
         <service id="thelia.action.address" class="Thelia\Action\Address">
-            <argument type="service" id="service_container"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
@@ -156,7 +155,6 @@
         </service>
 
         <service id="thelia.action.administrator" class="Thelia\Action\Administrator">
-            <argument type="service" id="service_container"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
diff --git a/core/lib/Thelia/Controller/Admin/AdministratorController.php b/core/lib/Thelia/Controller/Admin/AdministratorController.php
index 273728206..eabc62c13 100644
--- a/core/lib/Thelia/Controller/Admin/AdministratorController.php
+++ b/core/lib/Thelia/Controller/Admin/AdministratorController.php
@@ -66,6 +66,7 @@ class AdministratorController extends AbstractCrudController
         $event->setLastname($formData['lastname']);
         $event->setPassword($formData['password']);
         $event->setProfile($formData['profile'] ? : null);
+        $event->setLocale($formData['locale']);
 
         return $event;
     }
@@ -80,6 +81,7 @@ class AdministratorController extends AbstractCrudController
         $event->setLastname($formData['lastname']);
         $event->setPassword($formData['password']);
         $event->setProfile($formData['profile'] ? : null);
+        $event->setLocale($formData['locale']);
 
         return $event;
     }
@@ -108,6 +110,7 @@ class AdministratorController extends AbstractCrudController
             'lastname'          => $object->getLastname(),
             'login'             => $object->getLogin(),
             'profile'           => $object->getProfileId(),
+            'locale'            => $object->getLocale()
         );
 
         // Setup the object form
diff --git a/core/lib/Thelia/Controller/Admin/LangController.php b/core/lib/Thelia/Controller/Admin/LangController.php
index add908fab..543f09047 100644
--- a/core/lib/Thelia/Controller/Admin/LangController.php
+++ b/core/lib/Thelia/Controller/Admin/LangController.php
@@ -38,6 +38,7 @@ use Thelia\Form\Lang\LangDefaultBehaviorForm;
 use Thelia\Form\Lang\LangUpdateForm;
 use Thelia\Form\Lang\LangUrlEvent;
 use Thelia\Form\Lang\LangUrlForm;
+use Thelia\Log\Tlog;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\LangQuery;
 
@@ -118,11 +119,12 @@ class LangController extends BaseAdminController
             $changedObject = $event->getLang();
             $this->adminLogAppend(AdminResources::LANGUAGE, AccessManager::UPDATE, sprintf("%s %s (ID %s) modified", 'Lang', $changedObject->getTitle(), $changedObject->getId()));
             $this->redirectToRoute('admin.configuration.languages');
-        } catch (\Exception $e) {
-            $error_msg = $e->getMessage();
+        } catch (\Exception $ex) {
+            $error_msg = $this->getTranslator()->trans("Failed to update language definition: %ex", array("%ex" => $ex->getMessage()));
+            Tlog::getInstance()->addError("Failed to update language definition", $ex->getMessage());
         }
 
-        return $this->renderDefault();
+        return $this->renderDefault(array('error_message' => $error_msg));
     }
 
     protected function hydrateEvent($event,Form $form)
@@ -156,7 +158,7 @@ class LangController extends BaseAdminController
             $this->adminLogAppend(AdminResources::LANGUAGE, AccessManager::UPDATE, sprintf("%s %s (ID %s) modified", 'Lang', $changedObject->getTitle(), $changedObject->getId()));
 
         } catch (\Exception $e) {
-            \Thelia\Log\Tlog::getInstance()->error(sprintf("Error on changing default languages with message : %s", $e->getMessage()));
+            Tlog::getInstance()->error(sprintf("Error on changing default languages with message : %s", $e->getMessage()));
             $error = $e->getMessage();
         }
 
@@ -223,12 +225,12 @@ class LangController extends BaseAdminController
 
             $this->redirectToRoute('admin.configuration.languages');
         } catch (\Exception $ex) {
-            \Thelia\Log\Tlog::getInstance()->error(sprintf("error during language removal with message : %s", $ex->getMessage()));
+            Tlog::getInstance()->error(sprintf("error during language removal with message : %s", $ex->getMessage()));
             $error_msg = $ex->getMessage();
         }
 
         return $this->renderDefault(array(
-           'error_delete_message' => $error_msg
+           'error_message' => $error_msg
         ));
 
     }
diff --git a/core/lib/Thelia/Controller/Admin/OrderController.php b/core/lib/Thelia/Controller/Admin/OrderController.php
index c04e2c93e..97713a589 100644
--- a/core/lib/Thelia/Controller/Admin/OrderController.php
+++ b/core/lib/Thelia/Controller/Admin/OrderController.php
@@ -46,7 +46,11 @@ class OrderController extends BaseAdminController
     public function indexAction()
     {
         if (null !== $response = $this->checkAuth(AdminResources::ORDER, array(), AccessManager::VIEW)) return $response;
-        return $this->render("orders", array("display_order" => 20));
+
+        return $this->render("orders", array(
+                "display_order" => 20,
+                "orders_order"   => $this->getListOrderFromSession("orders", "orders_order", "create-date-reverse")
+            ));
     }
 
     public function viewAction($order_id)
diff --git a/core/lib/Thelia/Controller/Admin/SessionController.php b/core/lib/Thelia/Controller/Admin/SessionController.php
index 2aedfe90a..78394fa19 100644
--- a/core/lib/Thelia/Controller/Admin/SessionController.php
+++ b/core/lib/Thelia/Controller/Admin/SessionController.php
@@ -26,8 +26,11 @@ namespace Thelia\Controller\Admin;
 use Thelia\Form\AdminLogin;
 use Thelia\Core\Security\Authentication\AdminUsernamePasswordFormAuthenticator;
 use Thelia\Form\Exception\FormValidationException;
+use Thelia\Model\Admin;
 use Thelia\Model\AdminLog;
 use Thelia\Core\Security\Exception\AuthenticationException;
+use Thelia\Model\Lang;
+use Thelia\Model\LangQuery;
 use Thelia\Tools\URL;
 use Thelia\Tools\Redirect;
 use Thelia\Core\Event\TheliaEvents;
@@ -56,8 +59,11 @@ class SessionController extends BaseAdminController
                 // Update the cookie
                 $this->createAdminRememberMeCookie($user);
 
+                $this->applyUserLocale($user);
+
                 // Render the home page
                 return $this->render("home");
+
             } catch (TokenAuthenticationException $ex) {
                 $this->adminLogAppend("admin", "LOGIN", "Token based authentication failed.");
 
@@ -69,6 +75,18 @@ class SessionController extends BaseAdminController
         return $this->render("login");
     }
 
+    protected function applyUserLocale(Admin $user) {
+
+        // Set the current language according to Admin locale preference
+        $locale = $user->getLocale();
+
+        if (null === $lang = LangQuery::create()->findOneByLocale($locale)) {
+            $lang = Lang::getDefaultLanguage();
+        }
+
+        $this->getSession()->setLang($lang);
+    }
+
     public function checkLogoutAction()
     {
         $this->dispatch(TheliaEvents::ADMIN_LOGOUT);
@@ -102,6 +120,8 @@ class SessionController extends BaseAdminController
             // Log authentication success
             AdminLog::append("admin", "LOGIN", "Authentication successful", $request, $user, false);
 
+            $this->applyUserLocale($user);
+
             /**
              * FIXME: we have tou find a way to send cookie
              */
diff --git a/core/lib/Thelia/Core/Event/Administrator/AdministratorEvent.php b/core/lib/Thelia/Core/Event/Administrator/AdministratorEvent.php
index 070e57f87..0071526dc 100644
--- a/core/lib/Thelia/Core/Event/Administrator/AdministratorEvent.php
+++ b/core/lib/Thelia/Core/Event/Administrator/AdministratorEvent.php
@@ -35,6 +35,7 @@ class AdministratorEvent extends ActionEvent
     protected $login = null;
     protected $password = null;
     protected $profile = null;
+    protected $locale = null;
 
     public function __construct(Admin $administrator = null)
     {
@@ -61,6 +62,8 @@ class AdministratorEvent extends ActionEvent
     public function setId($id)
     {
         $this->id = $id;
+
+        return $this;
     }
 
     public function getId()
@@ -71,6 +74,8 @@ class AdministratorEvent extends ActionEvent
     public function setFirstname($firstname)
     {
         $this->firstname = $firstname;
+
+        return $this;
     }
 
     public function getFirstname()
@@ -81,6 +86,8 @@ class AdministratorEvent extends ActionEvent
     public function setLastname($lastname)
     {
         $this->lastname = $lastname;
+
+        return $this;
     }
 
     public function getLastname()
@@ -91,6 +98,8 @@ class AdministratorEvent extends ActionEvent
     public function setLogin($login)
     {
         $this->login = $login;
+
+        return $this;
     }
 
     public function getLogin()
@@ -101,6 +110,8 @@ class AdministratorEvent extends ActionEvent
     public function setPassword($password)
     {
         $this->password = $password;
+
+        return $this;
     }
 
     public function getPassword()
@@ -111,10 +122,23 @@ class AdministratorEvent extends ActionEvent
     public function setProfile($profile)
     {
         $this->profile = $profile;
+
+        return $this;
     }
 
     public function getProfile()
     {
         return $this->profile;
     }
-}
+
+    public function setLocale($locale)
+    {
+        $this->locale = $locale;
+        return $this;
+    }
+
+    public function getLocale()
+    {
+        return $this->locale;
+    }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php b/core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
index 8cfe1ee02..5c310d7cb 100644
--- a/core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
+++ b/core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
@@ -54,6 +54,8 @@ class AdministratorUpdatePasswordEvent extends ActionEvent
     public function setPassword($password)
     {
         $this->password = $password;
+
+        return $this;
     }
 
     /**
@@ -70,6 +72,8 @@ class AdministratorUpdatePasswordEvent extends ActionEvent
     public function setAdmin(Admin $admin)
     {
         $this->admin = $admin;
+
+        return $this;
     }
 
     /**
diff --git a/core/lib/Thelia/Core/Event/Cart/CartEvent.php b/core/lib/Thelia/Core/Event/Cart/CartEvent.php
index 4e1ed304d..b62f18f86 100644
--- a/core/lib/Thelia/Core/Event/Cart/CartEvent.php
+++ b/core/lib/Thelia/Core/Event/Cart/CartEvent.php
@@ -48,6 +48,7 @@ class CartEvent extends ActionEvent
     public function setAppend($append)
     {
         $this->append = $append;
+        return $this;
     }
 
     /**
@@ -64,6 +65,7 @@ class CartEvent extends ActionEvent
     public function setCartItem($cartItem)
     {
         $this->cartItem = $cartItem;
+        return $this;
     }
 
     /**
@@ -80,6 +82,7 @@ class CartEvent extends ActionEvent
     public function setNewness($newness)
     {
         $this->newness = $newness;
+        return $this;
     }
 
     /**
@@ -96,6 +99,7 @@ class CartEvent extends ActionEvent
     public function setProduct($product)
     {
         $this->product = $product;
+        return $this;
     }
 
     /**
@@ -112,6 +116,7 @@ class CartEvent extends ActionEvent
     public function setProductSaleElementsId($productSaleElementsId)
     {
         $this->productSaleElementsId = $productSaleElementsId;
+        return $this;
     }
 
     /**
@@ -128,6 +133,7 @@ class CartEvent extends ActionEvent
     public function setQuantity($quantity)
     {
         $this->quantity = $quantity;
+        return $this;
     }
 
     /**
@@ -145,5 +151,4 @@ class CartEvent extends ActionEvent
     {
         return $this->cart;
     }
-
-}
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Event/Order/OrderManualEvent.php b/core/lib/Thelia/Core/Event/Order/OrderManualEvent.php
new file mode 100644
index 000000000..7b6754097
--- /dev/null
+++ b/core/lib/Thelia/Core/Event/Order/OrderManualEvent.php
@@ -0,0 +1,266 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Event\Order;
+
+use Thelia\Model\Order;
+use Thelia\Model\Currency;
+use Thelia\Model\Lang;
+use Thelia\Model\Cart;
+use Thelia\Model\Customer;
+
+class OrderManualEvent extends OrderEvent
+{
+    protected $currency = null;
+    protected $lang = null;
+    protected $cart = null;
+    protected $customer = null;
+
+    /**
+     * @param Order $order
+     */
+    public function __construct(Order $order, Currency $currency, Lang $lang, Cart $cart, Customer $customer)
+    {
+        $this
+            ->setOrder($order)
+            ->setCurrency($currency)
+            ->setLang($lang)
+            ->setCart($cart)
+            ->setCustomer($customer)
+        ;
+    }
+
+    /**
+     * @param Order $order
+     */
+    public function setOrder(Order $order)
+    {
+        $this->order = $order;
+        return $this;
+    }
+
+    /**
+     * @param Order $order
+     */
+    public function setPlacedOrder(Order $order)
+    {
+        $this->placedOrder = $order;
+        return $this;
+    }
+
+    /**
+     * @param $address
+     */
+    public function setInvoiceAddress($address)
+    {
+        $this->invoiceAddress = $address;
+        return $this;
+    }
+
+    /**
+     * @param $address
+     */
+    public function setDeliveryAddress($address)
+    {
+        $this->deliveryAddress = $address;
+        return $this;
+    }
+
+    /**
+     * @param $module
+     */
+    public function setDeliveryModule($module)
+    {
+        $this->deliveryModule = $module;
+        return $this;
+    }
+
+    /**
+     * @param $module
+     */
+    public function setPaymentModule($module)
+    {
+        $this->paymentModule = $module;
+        return $this;
+    }
+
+    /**
+     * @param $postage
+     */
+    public function setPostage($postage)
+    {
+        $this->postage = $postage;
+        return $this;
+    }
+
+    /**
+     * @param $ref
+     */
+    public function setRef($ref)
+    {
+        $this->ref = $ref;
+        return $this;
+    }
+
+    /**
+     * @param $status
+     */
+    public function setStatus($status)
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @param $deliveryRef
+     */
+    public function setDeliveryRef($deliveryRef)
+    {
+        $this->deliveryRef = $deliveryRef;
+    }
+
+    /**
+     * @return null|Order
+     */
+    public function getOrder()
+    {
+        return $this->order;
+    }
+
+    /**
+     * @return null|Order
+     */
+    public function getPlacedOrder()
+    {
+        return $this->placedOrder;
+    }
+
+    /**
+     * @return null|int
+     */
+    public function getInvoiceAddress()
+    {
+        return $this->invoiceAddress;
+    }
+
+    /**
+     * @return null|int
+     */
+    public function getDeliveryAddress()
+    {
+        return $this->deliveryAddress;
+    }
+
+    /**
+     * @return null|int
+     */
+    public function getDeliveryModule()
+    {
+        return $this->deliveryModule;
+    }
+
+    /**
+     * @return null|int
+     */
+    public function getPaymentModule()
+    {
+        return $this->paymentModule;
+    }
+
+    /**
+     * @return null|int
+     */
+    public function getPostage()
+    {
+        return $this->postage;
+    }
+
+    /**
+     * @return null|int
+     */
+    public function getRef()
+    {
+        return $this->ref;
+    }
+
+    /**
+     * @return null|int
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getDeliveryRef()
+    {
+        return $this->deliveryRef;
+    }
+
+    public function getCurrency()
+    {
+        return $this->currency;
+    }
+
+    public function setCurrency($currency)
+    {
+        $this->currency = $currency;
+        return $this;
+    }
+
+    public function getLang()
+    {
+        return $this->lang;
+    }
+
+    public function setLang($lang)
+    {
+        $this->lang = $lang;
+        return $this;
+    }
+
+    public function getCart()
+    {
+        return $this->cart;
+    }
+
+    public function setCart($cart)
+    {
+        $this->cart = $cart;
+        return $this;
+    }
+
+    public function getCustomer()
+    {
+        return $this->customer;
+    }
+
+    public function setCustomer($customer)
+    {
+        $this->customer = $customer;
+        return $this;
+    }
+
+}
diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index 69c05cf6d..4691fd36d 100644
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -378,6 +378,8 @@ final class TheliaEvents
     const ORDER_AFTER_CREATE = "action.order.afterCreate";
     const ORDER_BEFORE_PAYMENT = "action.order.beforePayment";
 
+    const ORDER_CREATE_MANUAL = "action.order.createManual";
+
     const ORDER_UPDATE_STATUS = "action.order.updateStatus";
     const ORDER_UPDATE_DELIVERY_REF = "action.order.updateDeliveryRef";
     const ORDER_UPDATE_ADDRESS = "action.order.updateAddress";
diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
index 80220474b..de851cc8c 100644
--- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php
+++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
@@ -24,14 +24,11 @@
 namespace Thelia\Core\Template\Element;
 
 use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Thelia\Core\Security\SecurityContext;
 use Thelia\Core\Template\Element\Exception\LoopException;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Thelia\Core\Security\SecurityContext;
-use Thelia\Type\AlphaNumStringListType;
 use Thelia\Type\EnumListType;
 use Thelia\Type\EnumType;
 use Thelia\Type\TypeCollection;
@@ -67,6 +64,9 @@ abstract class BaseLoop
     protected $timestampable = false;
     protected $versionable = false;
 
+    private static $cacheLoopResult = array();
+    private static $cacheCount = array();
+
     /**
      * Create a new Loop
      *
@@ -335,71 +335,79 @@ abstract class BaseLoop
 
     public function count()
     {
-        $count = 0;
-        if ($this instanceof PropelSearchLoopInterface) {
-            $searchModelCriteria = $this->buildModelCriteria();
-            if (null === $searchModelCriteria) {
-                $count = 0;
-            } else {
-                $count = $searchModelCriteria->count();
-            }
-        } elseif ($this instanceof ArraySearchLoopInterface) {
-            $searchArray = $this->buildArray();
-            if (null === $searchArray) {
-                $count = 0;
-            } else {
-                $count = count($searchArray);
+        $hash = $this->args->getHash();
+        if(false === isset(self::$cacheCount[$hash]))
+        {
+            $count = 0;
+            if ($this instanceof PropelSearchLoopInterface) {
+                $searchModelCriteria = $this->buildModelCriteria();
+                if (null === $searchModelCriteria) {
+                    $count = 0;
+                } else {
+                    $count = $searchModelCriteria->count();
+                }
+            } elseif ($this instanceof ArraySearchLoopInterface) {
+                $searchArray = $this->buildArray();
+                if (null === $searchArray) {
+                    $count = 0;
+                } else {
+                    $count = count($searchArray);
+                }
             }
+            self::$cacheCount[$hash] = $count;
         }
 
-        return $count;
+        return self::$cacheCount[$hash];
     }
 
     /**
      * @param $pagination
      * @return LoopResult
      */
-    public function exec(&$pagination, $count = false)
+    public function exec(&$pagination)
     {
-        if ($this instanceof PropelSearchLoopInterface) {
-            $searchModelCriteria = $this->buildModelCriteria();
-            if (null === $searchModelCriteria) {
-                $results = array();
-            } else {
-                $results = $this->search(
-                    $searchModelCriteria,
-                    $pagination
-                );
+        $hash = $this->args->getHash();
+        if(false === isset(self::$cacheLoopResult[$hash]))
+        {
+            if ($this instanceof PropelSearchLoopInterface) {
+                $searchModelCriteria = $this->buildModelCriteria();
+                if (null === $searchModelCriteria) {
+                    $results = array();
+                } else {
+                    $results = $this->search(
+                        $searchModelCriteria,
+                        $pagination
+                    );
+                }
+            } elseif ($this instanceof ArraySearchLoopInterface) {
+                $searchArray = $this->buildArray();
+                if (null === $searchArray) {
+                    $results = array();
+                } else {
+                    $results = $this->searchArray(
+                        $searchArray,
+                        $pagination
+                    );
+                }
             }
-        } elseif ($this instanceof ArraySearchLoopInterface) {
-            $searchArray = $this->buildArray();
-            if (null === $searchArray) {
-                $results = array();
-            } else {
-                $results = $this->searchArray(
-                    $searchArray,
-                    $pagination
-                );
+
+            $loopResult = new LoopResult($results);
+
+            if (true === $this->countable) {
+                $loopResult->setCountable();
             }
+            if (true === $this->timestampable) {
+                $loopResult->setTimestamped();
+            }
+            if (true === $this->versionable) {
+                $loopResult->setVersioned();
+            }
+
+            self::$cacheLoopResult[$hash] = $this->parseResults($loopResult);
         }
 
-        if ($count) {
-            return $results ? count($results) : 0;
-        }
+        return self::$cacheLoopResult[$hash];
 
-        $loopResult = new LoopResult($results);
-
-        if (true === $this->countable) {
-            $loopResult->setCountable();
-        }
-        if (true === $this->timestampable) {
-            $loopResult->setTimestamped();
-        }
-        if (true === $this->versionable) {
-            $loopResult->setVersioned();
-        }
-
-        return $this->parseResults($loopResult);
     }
 
     protected function checkInterface()
diff --git a/core/lib/Thelia/Core/Template/Loop/Admin.php b/core/lib/Thelia/Core/Template/Loop/Admin.php
index d9c49ef80..b5ac7d8b8 100644
--- a/core/lib/Thelia/Core/Template/Loop/Admin.php
+++ b/core/lib/Thelia/Core/Template/Loop/Admin.php
@@ -89,6 +89,7 @@ class Admin extends BaseLoop implements PropelSearchLoopInterface
                 ->set("FIRSTNAME",$admin->getFirstname())
                 ->set("LASTNAME",$admin->getLastname())
                 ->set("LOGIN",$admin->getLogin())
+                ->set("LOCALE",$admin->getLocale())
             ;
 
             $loopResult->addRow($loopResultRow);
diff --git a/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php b/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php
index 0ba86e7d0..56100e490 100644
--- a/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php
+++ b/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php
@@ -56,6 +56,11 @@ class Argument
         return $this->type->getFormattedValue($this->value);
     }
 
+    public function getRawValue()
+    {
+        return $this->value;
+    }
+
     public function setValue($value)
     {
         if ($value === null) {
@@ -147,4 +152,5 @@ class Argument
             $empty
         );
     }
+
 }
diff --git a/core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php b/core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php
index dc851098b..eb815c708 100644
--- a/core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php
+++ b/core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php
@@ -144,4 +144,20 @@ class ArgumentCollection implements \Iterator
     {
         reset($this->arguments);
     }
+
+    public function getHash()
+    {
+        $arguments = $this->arguments;
+
+        if (array_key_exists('name', $arguments)) {
+            unset($arguments['name']);
+        }
+
+        $string = '';
+        foreach ($arguments as $key => $argument) {
+            $string .= $key.'='.$argument->getRawValue();
+        }
+
+        return md5($string);
+    }
 }
diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
index 1547202f7..2341db00a 100644
--- a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
+++ b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
@@ -67,7 +67,8 @@ class FeatureValue extends BaseI18nLoop implements PropelSearchLoopInterface
                     new Type\EnumListType(array('alpha', 'alpha_reverse', 'manual', 'manual_reverse'))
                 ),
                 'manual'
-            )
+            ),
+            Argument::createBooleanTypeArgument('force_return', true)
         );
     }
 
diff --git a/core/lib/Thelia/Core/Template/Loop/Order.php b/core/lib/Thelia/Core/Template/Loop/Order.php
index 3fb04d60c..c3e48dc8e 100644
--- a/core/lib/Thelia/Core/Template/Loop/Order.php
+++ b/core/lib/Thelia/Core/Template/Loop/Order.php
@@ -26,17 +26,20 @@ namespace Thelia\Core\Template\Loop;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
-
 use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Element\PropelSearchLoopInterface;
 use Thelia\Core\Template\Element\SearchLoopInterface;
-use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
+use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
+use Thelia\Model\Base\Customer;
 use Thelia\Model\CustomerQuery;
+use Thelia\Model\Map\CustomerTableMap;
+use Thelia\Model\Map\OrderAddressTableMap;
 use Thelia\Model\OrderAddressQuery;
 use Thelia\Model\OrderQuery;
-use Thelia\Type\TypeCollection;
 use Thelia\Type;
+use Thelia\Type\TypeCollection;
+
 /**
  *
  * @package Thelia\Core\Template\Loop
@@ -72,7 +75,14 @@ class Order extends BaseLoop implements SearchLoopInterface, PropelSearchLoopInt
             new Argument(
                 'order',
                 new TypeCollection(
-                    new Type\EnumListType(array('create-date', 'create-date-reverse'))
+                    new Type\EnumListType(array(
+                        'id', 'id-reverse',
+                        'reference', 'reference-reverse',
+                        'create-date', 'create-date-reverse',
+                        'company', 'company-reverse',
+                        'customer-name', 'customer-name-reverse',
+                        'status', 'status-reverse'
+                    ))
                 ),
                 'create-date-reverse'
             )
@@ -165,12 +175,67 @@ class Order extends BaseLoop implements SearchLoopInterface, PropelSearchLoopInt
 
         foreach ($orderers as $orderer) {
             switch ($orderer) {
+                case 'id':
+                    $search->orderById(Criteria::ASC);
+                    break;
+                case 'id_reverse':
+                    $search->orderById(Criteria::DESC);
+                    break;
+
+                case 'reference':
+                    $search->orderByRef(Criteria::ASC);
+                    break;
+                case 'reference_reverse':
+                    $search->orderByRef(Criteria::DESC);
+                    break;
+
                 case "create-date":
                     $search->orderByCreatedAt(Criteria::ASC);
                     break;
                 case "create-date-reverse":
                     $search->orderByCreatedAt(Criteria::DESC);
                     break;
+
+                case "status":
+                    $search->orderByStatusId(Criteria::ASC);
+                    break;
+                case "status":
+                    $search->orderByStatusId(Criteria::DESC);
+                    break;
+
+                case 'company' :
+                    $search
+                        ->joinOrderAddressRelatedByDeliveryOrderAddressId()
+                        ->withColumn(OrderAddressTableMap::COMPANY, 'company')
+                        ->orderBy('company', Criteria::ASC)
+                    ;
+                    break;
+                case 'companyreverse' :
+                    $search
+                        ->joinOrderAddressRelatedByDeliveryOrderAddressId()
+                        ->withColumn(OrderAddressTableMap::COMPANY, 'company')
+                        ->orderBy('company', Criteria::DESC)
+                    ;
+                    break;
+
+                case 'customer-name' :
+                    $search
+                        ->joinCustomer()
+                        ->withColumn(CustomerTableMap::FIRSTNAME, 'firstname')
+                        ->withColumn(CustomerTableMap::LASTNAME, 'lastname')
+                        ->orderBy('lastname', Criteria::ASC)
+                        ->orderBy('firstname', Criteria::ASC)
+                        ;
+                    break;
+                case 'customer-name-reverse' :
+                    $search
+                        ->joinCustomer()
+                        ->withColumn(CustomerTableMap::FIRSTNAME, 'firstname')
+                        ->withColumn(CustomerTableMap::LASTNAME, 'lastname')
+                        ->orderBy('lastname', Criteria::DESC)
+                        ->orderBy('firstname', Criteria::DESC)
+                    ;
+                    break;
             }
         }
 
diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index 778ef8d37..99689fbd2 100644
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -36,10 +36,12 @@ use Thelia\Core\Template\Loop\Argument\Argument;
 
 use Thelia\Exception\TaxEngineException;
 use Thelia\Model\CategoryQuery;
+use Thelia\Model\ConfigQuery;
 use Thelia\Model\CurrencyQuery;
 use Thelia\Model\Map\ProductPriceTableMap;
 use Thelia\Model\Map\ProductSaleElementsTableMap;
 use Thelia\Model\Map\ProductTableMap;
+use Thelia\Model\ProductCategoryQuery;
 use Thelia\Model\ProductQuery;
 use Thelia\TaxEngine\TaxEngine;
 use Thelia\Type\TypeCollection;
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
index d0f021ef5..f022cf0c5 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
@@ -28,6 +28,7 @@ use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
 use Thelia\Core\Template\Smarty\Exception\SmartyPluginException;
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
 use Thelia\Tools\DateTimeFormat;
+use Thelia\Tools\MoneyFormat;
 use Thelia\Tools\NumberFormat;
 
 /**
@@ -135,6 +136,40 @@ class Format extends AbstractSmartyPlugin
                 $this->getParam($params, "thousands_sep", null)
         );
     }
+    /**
+     *
+     * display a amount in expected format
+     *
+     * available parameters :
+     *  number => int or float number
+     *  decimals => how many decimals format expected
+     *  dec_point => separator for the decimal point
+     *  thousands_sep => thousands separator
+     *  symbol => Currency symbol
+     *
+     *  ex : {format_money number="1246.12" decimals="1" dec_point="," thousands_sep=" " symbol="€"} will output "1 246,1 €"
+     *
+     * @param $params
+     * @param  null                                                         $template
+     * @throws \Thelia\Core\Template\Smarty\Exception\SmartyPluginException
+     * @return string                                                       the expected number formatted
+     */
+    public function formatMoney($params, $template = null)
+    {
+        $number = $this->getParam($params, "number", false);
+
+        if ($number ===  false || $number == '') {
+            return "";
+        }
+
+        return MoneyFormat::getInstance($this->request)->format(
+            $number,
+            $this->getParam($params, "decimals", null),
+            $this->getParam($params, "dec_point", null),
+            $this->getParam($params, "thousands_sep", null),
+            $this->getParam($params, "symbol", null)
+        );
+    }
 
     /**
      * @return an array of SmartyPluginDescriptor
@@ -143,7 +178,8 @@ class Format extends AbstractSmartyPlugin
     {
         return array(
             new SmartyPluginDescriptor("function", "format_date", $this, "formatDate"),
-            new SmartyPluginDescriptor("function", "format_number", $this, "formatNumber")
-        );
+            new SmartyPluginDescriptor("function", "format_number", $this, "formatNumber"),
+            new SmartyPluginDescriptor("function", "format_money", $this, "formatMoney")
+       );
     }
 }
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
index 4c92ee85c..da98ce14d 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
@@ -82,8 +82,9 @@ class Module extends AbstractSmartyPlugin
             }
         }
 
-        if (! empty($content))
+        if (! empty($content)) {
             return $template->fetch(sprintf("string:%s", $content));
+        }
 
         return "";
     }
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
index 1b75f2096..daeab4218 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
@@ -31,9 +31,6 @@ use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
 use Thelia\Core\Template\Element\Exception\ElementNotFoundException;
 use Thelia\Core\Template\Element\Exception\InvalidElementException;
 
-use Symfony\Component\HttpFoundation\Request;
-use Thelia\Core\Security\SecurityContext;
-
 class TheliaLoop extends AbstractSmartyPlugin
 {
     protected static $pagination = null;
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 8cb1271d3..cc85ad632 100644
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -59,7 +59,7 @@ use Thelia\Log\Tlog;
 class Thelia extends Kernel
 {
 
-    const THELIA_VERSION = '2.0.0-beta3';
+    const THELIA_VERSION = '2.0.0-beta4';
 
     public function init()
     {
@@ -87,7 +87,7 @@ class Thelia extends Kernel
         $con->setAttribute(ConnectionWrapper::PROPEL_ATTR_CACHE_PREPARES, true);
         if ($this->isDebug()) {
             $serviceContainer->setLogger('defaultLogger', \Thelia\Log\Tlog::getInstance());
-            //$con->useDebug(true);
+            $con->useDebug(true);
         }
 
     }
diff --git a/core/lib/Thelia/Form/AdministratorCreationForm.php b/core/lib/Thelia/Form/AdministratorCreationForm.php
index f0a479dd2..f2a7e2452 100644
--- a/core/lib/Thelia/Form/AdministratorCreationForm.php
+++ b/core/lib/Thelia/Form/AdministratorCreationForm.php
@@ -27,6 +27,7 @@ use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Core\Translation\Translator;
 use Thelia\Model\AdminQuery;
+use Thelia\Model\LangQuery;
 use Thelia\Model\ProfileQuery;
 
 class AdministratorCreationForm extends BaseForm
@@ -100,9 +101,35 @@ class AdministratorCreationForm extends BaseForm
                     ),
                 )
             )
+            ->add(
+                'locale',
+                "choice",
+                array(
+                    "choices" => $this->getLocaleList(),
+                    "constraints" => array(
+                        new Constraints\NotBlank(),
+                    ),
+                    "label" => Translator::getInstance()->trans('Preferred locale'),
+                    "label_attr" => array(
+                        "for" => "locale"
+                    ),
+                )
+            )
         ;
     }
 
+    protected function getLocaleList() {
+        $locales = array();
+
+        $list = LangQuery::create()->find();
+
+        foreach($list as $item) {
+            $locales[$item->getLocale()] = $item->getLocale();
+        }
+
+        return $locales;
+    }
+
     public function verifyPasswordField($value, ExecutionContextInterface $context)
     {
         $data = $context->getRoot()->getData();
diff --git a/core/lib/Thelia/Form/Lang/LangCreateForm.php b/core/lib/Thelia/Form/Lang/LangCreateForm.php
index ccad58320..d41c45641 100644
--- a/core/lib/Thelia/Form/Lang/LangCreateForm.php
+++ b/core/lib/Thelia/Form/Lang/LangCreateForm.php
@@ -70,7 +70,7 @@ class LangCreateForm extends BaseForm
                 'constraints' => array(
                     new NotBlank()
                 ),
-                'label' => Translator::getInstance()->trans('ISO 639 Code'),
+                'label' => Translator::getInstance()->trans('ISO 639-1 Code'),
                 'label_attr' => array(
                     'for' => 'code_lang'
                 )
diff --git a/core/lib/Thelia/Form/TaxCreationForm.php b/core/lib/Thelia/Form/TaxCreationForm.php
index 6ff0cc81e..d3483aa4e 100644
--- a/core/lib/Thelia/Form/TaxCreationForm.php
+++ b/core/lib/Thelia/Form/TaxCreationForm.php
@@ -28,6 +28,7 @@ use Thelia\Core\Form\Type\TheliaType;
 use Thelia\Core\Translation\Translator;
 use Thelia\TaxEngine\TaxEngine;
 use Thelia\Model\Tax;
+use Thelia\Core\HttpFoundation\Request;
 
 /**
  * Class TaxCreationForm
diff --git a/core/lib/Thelia/Install/Update.php b/core/lib/Thelia/Install/Update.php
index 923c8f1ab..ccab092c6 100644
--- a/core/lib/Thelia/Install/Update.php
+++ b/core/lib/Thelia/Install/Update.php
@@ -39,7 +39,8 @@ class Update
     protected static $version = array(
         '0' => '2.0.0-beta1',
         '1' => '2.0.0-beta2',
-        '2' => '2.0.0-beta3'
+        '2' => '2.0.0-beta3',
+        '3' => '2.0.0-beta4'
     );
 
     protected function isLatestVersion($version)
diff --git a/core/lib/Thelia/Log/AbstractTlogDestination.php b/core/lib/Thelia/Log/AbstractTlogDestination.php
index 5dcb76f71..718679d76 100644
--- a/core/lib/Thelia/Log/AbstractTlogDestination.php
+++ b/core/lib/Thelia/Log/AbstractTlogDestination.php
@@ -26,31 +26,29 @@ namespace Thelia\Log;
 abstract class AbstractTlogDestination
 {
     //Tableau de TlogDestinationConfig paramétrant la destination
-    protected $_configs;
+    protected $_configs = array();
 
     //Tableau des lignes de logs stockés avant utilisation par ecrire()
-    protected $_logs;
+    protected $_logs = array();
 
     public function __construct()
     {
-        $this->_configs = array();
-        $this->_logs = array();
-
         // Initialiser les variables de configuration
-         $this->_configs = $this->getConfigs();
+        $this->_configs = $this->getConfigs();
 
          // Appliquer la configuration
          $this->configure();
     }
 
     //Affecte une valeur à une configuration de la destination
-    public function setConfig($name, $value)
+    public function setConfig($name, $value, $apply_changes = true)
     {
         foreach ($this->_configs as $config) {
             if ($config->getName() == $name) {
                 $config->setValue($value);
+
                 // Appliquer les changements
-                $this->configure();
+                if ($apply_changes) $this->configure();
 
                 return true;
             }
diff --git a/core/lib/Thelia/Log/Destination/TlogDestinationFile.php b/core/lib/Thelia/Log/Destination/TlogDestinationFile.php
index 08b7aab66..2f21583a3 100644
--- a/core/lib/Thelia/Log/Destination/TlogDestinationFile.php
+++ b/core/lib/Thelia/Log/Destination/TlogDestinationFile.php
@@ -37,9 +37,6 @@ class TlogDestinationFile extends AbstractTlogDestination
     const VAR_MODE = "tlog_destinationfile_mode";
     const VALEUR_MODE_DEFAULT = "A";
 
-    const VAR_MAX_FILE_SIZE_KB = "tlog_destinationfile_max_file_size";
-    const MAX_FILE_SIZE_KB_DEFAULT = 1024; // 1 Mb
-
     protected $path_defaut = false;
     protected $fh = false;
 
@@ -49,10 +46,18 @@ class TlogDestinationFile extends AbstractTlogDestination
         parent::__construct();
     }
 
+    protected function getFilePath() {
+        return $this->getConfig(self::VAR_PATH_FILE);
+    }
+
+    protected function getOpenMode() {
+        return strtolower($this->getConfig(self::VAR_MODE, self::VALEUR_MODE_DEFAULT)) == 'a' ? 'a' : 'w';
+    }
+
     public function configure()
     {
-        $file_path = $this->getConfig(self::VAR_PATH_FILE);
-        $mode = strtolower($this->getConfig(self::VAR_MODE, self::VALEUR_MODE_DEFAULT)) == 'a' ? 'a' : 'w';
+        $file_path = $this->getFilePath();
+        $mode = $this->getOpenMode();
 
         if (! empty($file_path)) {
             if (! is_file($file_path)) {
@@ -67,23 +72,6 @@ class TlogDestinationFile extends AbstractTlogDestination
 
             if ($this->fh) @fclose($this->fh);
 
-            if (filesize($file_path) > 1024 * $this->getConfig(self::VAR_MAX_FILE_SIZE_KB, self::MAX_FILE_SIZE_KB_DEFAULT)) {
-
-                $idx = 1;
-
-                do {
-                    $file_path_bk = "$file_path.$idx";
-
-                    $idx++;
-
-                } while (file_exists($file_path_bk));
-
-                @rename($file_path, $file_path_bk);
-
-                @touch($file_path);
-                @chmod($file_path, 0666);
-            }
-
             $this->fh = fopen($file_path, $mode);
         }
     }
@@ -114,13 +102,6 @@ class TlogDestinationFile extends AbstractTlogDestination
                 'Enter E to empty this file for each request, or A to always append logs. Consider resetting the file from time to time',
                 self::VALEUR_MODE_DEFAULT,
                 TlogDestinationConfig::TYPE_TEXTFIELD
-            ),
-            new TlogDestinationConfig(
-                self::VAR_MAX_FILE_SIZE_KB,
-                'Maximum log file size, in Kb',
-                'When this size if exeeded, a backup copy of the file is made, and a new log file is opened. As the file size check is performed only at the beginning of a request, the file size may be bigger thant this limit. Note: 1 Mb = 1024 Kb',
-                self::MAX_FILE_SIZE_KB_DEFAULT,
-                TlogDestinationConfig::TYPE_TEXTFIELD
             )
         );
     }
diff --git a/core/lib/Thelia/Log/Destination/TlogDestinationRotatingFile.php b/core/lib/Thelia/Log/Destination/TlogDestinationRotatingFile.php
new file mode 100644
index 000000000..dfd225347
--- /dev/null
+++ b/core/lib/Thelia/Log/Destination/TlogDestinationRotatingFile.php
@@ -0,0 +1,101 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Log\Destination;
+
+use Thelia\Log\AbstractTlogDestination;
+use Thelia\Log\TlogDestinationConfig;
+use Thelia\Core\Translation\Translator;
+
+class TlogDestinationRotatingFile extends TlogDestinationFile
+{
+    // Nom des variables de configuration
+    // ----------------------------------
+
+    const VAR_MAX_FILE_SIZE_KB = "tlog_destinationfile_max_file_size";
+    const MAX_FILE_SIZE_KB_DEFAULT = 1024; // 1 Mb
+
+    public function __construct($maxFileSize = self::MAX_FILE_SIZE_KB_DEFAULT)
+    {
+        $this->path_defaut = THELIA_ROOT . "log" . DS . self::TLOG_DEFAULT_NAME;
+
+        $this->setConfig(self::VAR_MAX_FILE_SIZE_KB, $maxFileSize, false);
+
+        parent::__construct();
+    }
+
+    public function configure()
+    {
+        parent::configure();
+
+        $file_path = $this->getFilePath();
+        $mode = $this->getOpenMode();
+
+        if ($this->fh) @fclose($this->fh);
+
+        if (filesize($file_path) > 1024 * $this->getConfig(self::VAR_MAX_FILE_SIZE_KB, self::MAX_FILE_SIZE_KB_DEFAULT)) {
+
+            $idx = 1;
+
+            do {
+                $file_path_bk = "$file_path.$idx";
+
+                $idx++;
+
+            } while (file_exists($file_path_bk));
+
+            @rename($file_path, $file_path_bk);
+
+            @touch($file_path);
+            @chmod($file_path, 0666);
+        }
+
+        $this->fh = fopen($file_path, $mode);
+    }
+
+    public function getTitle()
+    {
+            return Translator::getInstance()->trans('Rotated Text File');
+    }
+
+    public function getDescription()
+    {
+            return Translator::getInstance()->trans('Store logs into text file, up to a certian size, then a new file is created');
+    }
+
+    public function getConfigs()
+    {
+        $arr = parent::getConfigs();
+
+        $arr[] =
+             new TlogDestinationConfig(
+                self::VAR_MAX_FILE_SIZE_KB,
+                'Maximum log file size, in Kb',
+                'When this size if exeeded, a backup copy of the file is made, and a new log file is opened. As the file size check is performed only at the beginning of a request, the file size may be bigger thant this limit. Note: 1 Mb = 1024 Kb',
+                self::MAX_FILE_SIZE_KB_DEFAULT,
+                TlogDestinationConfig::TYPE_TEXTFIELD
+        );
+
+        return $arr;
+    }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Log/Tlog.php b/core/lib/Thelia/Log/Tlog.php
index 426ea5c7c..5e3d0537a 100644
--- a/core/lib/Thelia/Log/Tlog.php
+++ b/core/lib/Thelia/Log/Tlog.php
@@ -69,7 +69,7 @@ class Tlog Implements LoggerInterface
 
     // default values
     const DEFAULT_LEVEL     	= self::DEBUG;
-    const DEFAUT_DESTINATIONS   = "Thelia\Log\Destination\TlogDestinationFile";
+    const DEFAUT_DESTINATIONS   = "Thelia\Log\Destination\TlogDestinationRotatingFile";
     const DEFAUT_PREFIXE 	= "#INDEX: #LEVEL [#FILE:#FUNCTION()] {#LINE} #DATE #HOUR: ";
     const DEFAUT_FILES 		= "*";
     const DEFAUT_IP 		= "";
diff --git a/core/lib/Thelia/Model/Admin.php b/core/lib/Thelia/Model/Admin.php
index 7c88ee8d2..df8e5ebf5 100644
--- a/core/lib/Thelia/Model/Admin.php
+++ b/core/lib/Thelia/Model/Admin.php
@@ -31,7 +31,7 @@ class Admin extends BaseAdmin implements UserInterface
     {
         $profileId = $this->getProfileId();
 
-        if( null === $profileId ) {
+        if( null === $profileId || 0 === $profileId ) {
             return AdminResources::SUPERADMINISTRATOR;
         }
 
diff --git a/core/lib/Thelia/Model/Base/Admin.php b/core/lib/Thelia/Model/Base/Admin.php
index 22b3492b4..433d47a54 100644
--- a/core/lib/Thelia/Model/Base/Admin.php
+++ b/core/lib/Thelia/Model/Base/Admin.php
@@ -92,6 +92,12 @@ abstract class Admin implements ActiveRecordInterface
      */
     protected $password;
 
+    /**
+     * The value for the locale field.
+     * @var        string
+     */
+    protected $locale;
+
     /**
      * The value for the algo field.
      * @var        string
@@ -465,6 +471,17 @@ abstract class Admin implements ActiveRecordInterface
         return $this->password;
     }
 
+    /**
+     * Get the [locale] column value.
+     *
+     * @return   string
+     */
+    public function getLocale()
+    {
+
+        return $this->locale;
+    }
+
     /**
      * Get the [algo] column value.
      *
@@ -679,6 +696,27 @@ abstract class Admin implements ActiveRecordInterface
         return $this;
     } // setPassword()
 
+    /**
+     * Set the value of [locale] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
+     */
+    public function setLocale($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->locale !== $v) {
+            $this->locale = $v;
+            $this->modifiedColumns[AdminTableMap::LOCALE] = true;
+        }
+
+
+        return $this;
+    } // setLocale()
+
     /**
      * Set the value of [algo] column.
      *
@@ -860,25 +898,28 @@ abstract class Admin implements ActiveRecordInterface
             $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : AdminTableMap::translateFieldName('Password', TableMap::TYPE_PHPNAME, $indexType)];
             $this->password = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : AdminTableMap::translateFieldName('Algo', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : AdminTableMap::translateFieldName('Locale', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->locale = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : AdminTableMap::translateFieldName('Algo', TableMap::TYPE_PHPNAME, $indexType)];
             $this->algo = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : AdminTableMap::translateFieldName('Salt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : AdminTableMap::translateFieldName('Salt', TableMap::TYPE_PHPNAME, $indexType)];
             $this->salt = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : AdminTableMap::translateFieldName('RememberMeToken', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : AdminTableMap::translateFieldName('RememberMeToken', TableMap::TYPE_PHPNAME, $indexType)];
             $this->remember_me_token = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : AdminTableMap::translateFieldName('RememberMeSerial', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : AdminTableMap::translateFieldName('RememberMeSerial', TableMap::TYPE_PHPNAME, $indexType)];
             $this->remember_me_serial = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : AdminTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : AdminTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : AdminTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : AdminTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -891,7 +932,7 @@ abstract class Admin implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 12; // 12 = AdminTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 13; // 13 = AdminTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\Admin object", 0, $e);
@@ -1145,6 +1186,9 @@ abstract class Admin implements ActiveRecordInterface
         if ($this->isColumnModified(AdminTableMap::PASSWORD)) {
             $modifiedColumns[':p' . $index++]  = '`PASSWORD`';
         }
+        if ($this->isColumnModified(AdminTableMap::LOCALE)) {
+            $modifiedColumns[':p' . $index++]  = '`LOCALE`';
+        }
         if ($this->isColumnModified(AdminTableMap::ALGO)) {
             $modifiedColumns[':p' . $index++]  = '`ALGO`';
         }
@@ -1192,6 +1236,9 @@ abstract class Admin implements ActiveRecordInterface
                     case '`PASSWORD`':
                         $stmt->bindValue($identifier, $this->password, PDO::PARAM_STR);
                         break;
+                    case '`LOCALE`':
+                        $stmt->bindValue($identifier, $this->locale, PDO::PARAM_STR);
+                        break;
                     case '`ALGO`':
                         $stmt->bindValue($identifier, $this->algo, PDO::PARAM_STR);
                         break;
@@ -1291,21 +1338,24 @@ abstract class Admin implements ActiveRecordInterface
                 return $this->getPassword();
                 break;
             case 6:
-                return $this->getAlgo();
+                return $this->getLocale();
                 break;
             case 7:
-                return $this->getSalt();
+                return $this->getAlgo();
                 break;
             case 8:
-                return $this->getRememberMeToken();
+                return $this->getSalt();
                 break;
             case 9:
-                return $this->getRememberMeSerial();
+                return $this->getRememberMeToken();
                 break;
             case 10:
-                return $this->getCreatedAt();
+                return $this->getRememberMeSerial();
                 break;
             case 11:
+                return $this->getCreatedAt();
+                break;
+            case 12:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -1343,12 +1393,13 @@ abstract class Admin implements ActiveRecordInterface
             $keys[3] => $this->getLastname(),
             $keys[4] => $this->getLogin(),
             $keys[5] => $this->getPassword(),
-            $keys[6] => $this->getAlgo(),
-            $keys[7] => $this->getSalt(),
-            $keys[8] => $this->getRememberMeToken(),
-            $keys[9] => $this->getRememberMeSerial(),
-            $keys[10] => $this->getCreatedAt(),
-            $keys[11] => $this->getUpdatedAt(),
+            $keys[6] => $this->getLocale(),
+            $keys[7] => $this->getAlgo(),
+            $keys[8] => $this->getSalt(),
+            $keys[9] => $this->getRememberMeToken(),
+            $keys[10] => $this->getRememberMeSerial(),
+            $keys[11] => $this->getCreatedAt(),
+            $keys[12] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1412,21 +1463,24 @@ abstract class Admin implements ActiveRecordInterface
                 $this->setPassword($value);
                 break;
             case 6:
-                $this->setAlgo($value);
+                $this->setLocale($value);
                 break;
             case 7:
-                $this->setSalt($value);
+                $this->setAlgo($value);
                 break;
             case 8:
-                $this->setRememberMeToken($value);
+                $this->setSalt($value);
                 break;
             case 9:
-                $this->setRememberMeSerial($value);
+                $this->setRememberMeToken($value);
                 break;
             case 10:
-                $this->setCreatedAt($value);
+                $this->setRememberMeSerial($value);
                 break;
             case 11:
+                $this->setCreatedAt($value);
+                break;
+            case 12:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1459,12 +1513,13 @@ abstract class Admin implements ActiveRecordInterface
         if (array_key_exists($keys[3], $arr)) $this->setLastname($arr[$keys[3]]);
         if (array_key_exists($keys[4], $arr)) $this->setLogin($arr[$keys[4]]);
         if (array_key_exists($keys[5], $arr)) $this->setPassword($arr[$keys[5]]);
-        if (array_key_exists($keys[6], $arr)) $this->setAlgo($arr[$keys[6]]);
-        if (array_key_exists($keys[7], $arr)) $this->setSalt($arr[$keys[7]]);
-        if (array_key_exists($keys[8], $arr)) $this->setRememberMeToken($arr[$keys[8]]);
-        if (array_key_exists($keys[9], $arr)) $this->setRememberMeSerial($arr[$keys[9]]);
-        if (array_key_exists($keys[10], $arr)) $this->setCreatedAt($arr[$keys[10]]);
-        if (array_key_exists($keys[11], $arr)) $this->setUpdatedAt($arr[$keys[11]]);
+        if (array_key_exists($keys[6], $arr)) $this->setLocale($arr[$keys[6]]);
+        if (array_key_exists($keys[7], $arr)) $this->setAlgo($arr[$keys[7]]);
+        if (array_key_exists($keys[8], $arr)) $this->setSalt($arr[$keys[8]]);
+        if (array_key_exists($keys[9], $arr)) $this->setRememberMeToken($arr[$keys[9]]);
+        if (array_key_exists($keys[10], $arr)) $this->setRememberMeSerial($arr[$keys[10]]);
+        if (array_key_exists($keys[11], $arr)) $this->setCreatedAt($arr[$keys[11]]);
+        if (array_key_exists($keys[12], $arr)) $this->setUpdatedAt($arr[$keys[12]]);
     }
 
     /**
@@ -1482,6 +1537,7 @@ abstract class Admin implements ActiveRecordInterface
         if ($this->isColumnModified(AdminTableMap::LASTNAME)) $criteria->add(AdminTableMap::LASTNAME, $this->lastname);
         if ($this->isColumnModified(AdminTableMap::LOGIN)) $criteria->add(AdminTableMap::LOGIN, $this->login);
         if ($this->isColumnModified(AdminTableMap::PASSWORD)) $criteria->add(AdminTableMap::PASSWORD, $this->password);
+        if ($this->isColumnModified(AdminTableMap::LOCALE)) $criteria->add(AdminTableMap::LOCALE, $this->locale);
         if ($this->isColumnModified(AdminTableMap::ALGO)) $criteria->add(AdminTableMap::ALGO, $this->algo);
         if ($this->isColumnModified(AdminTableMap::SALT)) $criteria->add(AdminTableMap::SALT, $this->salt);
         if ($this->isColumnModified(AdminTableMap::REMEMBER_ME_TOKEN)) $criteria->add(AdminTableMap::REMEMBER_ME_TOKEN, $this->remember_me_token);
@@ -1556,6 +1612,7 @@ abstract class Admin implements ActiveRecordInterface
         $copyObj->setLastname($this->getLastname());
         $copyObj->setLogin($this->getLogin());
         $copyObj->setPassword($this->getPassword());
+        $copyObj->setLocale($this->getLocale());
         $copyObj->setAlgo($this->getAlgo());
         $copyObj->setSalt($this->getSalt());
         $copyObj->setRememberMeToken($this->getRememberMeToken());
@@ -1652,6 +1709,7 @@ abstract class Admin implements ActiveRecordInterface
         $this->lastname = null;
         $this->login = null;
         $this->password = null;
+        $this->locale = null;
         $this->algo = null;
         $this->salt = null;
         $this->remember_me_token = null;
diff --git a/core/lib/Thelia/Model/Base/AdminQuery.php b/core/lib/Thelia/Model/Base/AdminQuery.php
index 0ec88d23e..3b4bb9eb5 100644
--- a/core/lib/Thelia/Model/Base/AdminQuery.php
+++ b/core/lib/Thelia/Model/Base/AdminQuery.php
@@ -27,6 +27,7 @@ use Thelia\Model\Map\AdminTableMap;
  * @method     ChildAdminQuery orderByLastname($order = Criteria::ASC) Order by the lastname column
  * @method     ChildAdminQuery orderByLogin($order = Criteria::ASC) Order by the login column
  * @method     ChildAdminQuery orderByPassword($order = Criteria::ASC) Order by the password column
+ * @method     ChildAdminQuery orderByLocale($order = Criteria::ASC) Order by the locale column
  * @method     ChildAdminQuery orderByAlgo($order = Criteria::ASC) Order by the algo column
  * @method     ChildAdminQuery orderBySalt($order = Criteria::ASC) Order by the salt column
  * @method     ChildAdminQuery orderByRememberMeToken($order = Criteria::ASC) Order by the remember_me_token column
@@ -40,6 +41,7 @@ use Thelia\Model\Map\AdminTableMap;
  * @method     ChildAdminQuery groupByLastname() Group by the lastname column
  * @method     ChildAdminQuery groupByLogin() Group by the login column
  * @method     ChildAdminQuery groupByPassword() Group by the password column
+ * @method     ChildAdminQuery groupByLocale() Group by the locale column
  * @method     ChildAdminQuery groupByAlgo() Group by the algo column
  * @method     ChildAdminQuery groupBySalt() Group by the salt column
  * @method     ChildAdminQuery groupByRememberMeToken() Group by the remember_me_token column
@@ -64,6 +66,7 @@ use Thelia\Model\Map\AdminTableMap;
  * @method     ChildAdmin findOneByLastname(string $lastname) Return the first ChildAdmin filtered by the lastname column
  * @method     ChildAdmin findOneByLogin(string $login) Return the first ChildAdmin filtered by the login column
  * @method     ChildAdmin findOneByPassword(string $password) Return the first ChildAdmin filtered by the password column
+ * @method     ChildAdmin findOneByLocale(string $locale) Return the first ChildAdmin filtered by the locale column
  * @method     ChildAdmin findOneByAlgo(string $algo) Return the first ChildAdmin filtered by the algo column
  * @method     ChildAdmin findOneBySalt(string $salt) Return the first ChildAdmin filtered by the salt column
  * @method     ChildAdmin findOneByRememberMeToken(string $remember_me_token) Return the first ChildAdmin filtered by the remember_me_token column
@@ -77,6 +80,7 @@ use Thelia\Model\Map\AdminTableMap;
  * @method     array findByLastname(string $lastname) Return ChildAdmin objects filtered by the lastname column
  * @method     array findByLogin(string $login) Return ChildAdmin objects filtered by the login column
  * @method     array findByPassword(string $password) Return ChildAdmin objects filtered by the password column
+ * @method     array findByLocale(string $locale) Return ChildAdmin objects filtered by the locale column
  * @method     array findByAlgo(string $algo) Return ChildAdmin objects filtered by the algo column
  * @method     array findBySalt(string $salt) Return ChildAdmin objects filtered by the salt column
  * @method     array findByRememberMeToken(string $remember_me_token) Return ChildAdmin objects filtered by the remember_me_token column
@@ -171,7 +175,7 @@ abstract class AdminQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT `ID`, `PROFILE_ID`, `FIRSTNAME`, `LASTNAME`, `LOGIN`, `PASSWORD`, `ALGO`, `SALT`, `REMEMBER_ME_TOKEN`, `REMEMBER_ME_SERIAL`, `CREATED_AT`, `UPDATED_AT` FROM `admin` WHERE `ID` = :p0';
+        $sql = 'SELECT `ID`, `PROFILE_ID`, `FIRSTNAME`, `LASTNAME`, `LOGIN`, `PASSWORD`, `LOCALE`, `ALGO`, `SALT`, `REMEMBER_ME_TOKEN`, `REMEMBER_ME_SERIAL`, `CREATED_AT`, `UPDATED_AT` FROM `admin` WHERE `ID` = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -460,6 +464,35 @@ abstract class AdminQuery extends ModelCriteria
         return $this->addUsingAlias(AdminTableMap::PASSWORD, $password, $comparison);
     }
 
+    /**
+     * Filter the query on the locale column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByLocale('fooValue');   // WHERE locale = 'fooValue'
+     * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $locale The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildAdminQuery The current query, for fluid interface
+     */
+    public function filterByLocale($locale = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($locale)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $locale)) {
+                $locale = str_replace('*', '%', $locale);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(AdminTableMap::LOCALE, $locale, $comparison);
+    }
+
     /**
      * Filter the query on the algo column
      *
diff --git a/core/lib/Thelia/Model/ConfigQuery.php b/core/lib/Thelia/Model/ConfigQuery.php
index e34ae5e16..d0c629e99 100644
--- a/core/lib/Thelia/Model/ConfigQuery.php
+++ b/core/lib/Thelia/Model/ConfigQuery.php
@@ -92,6 +92,9 @@ class ConfigQuery extends BaseConfigQuery {
         return self::read('check-available-stock', 1) != 0;
     }
 
+    public static function getUnknownFlagPath() {
+        return self::read('unknown-flag-path', '/assets/img/flags/unknown.png');
+    }
     /* smtp config */
     public static function isSmtpEnable()
     {
diff --git a/core/lib/Thelia/Model/Lang.php b/core/lib/Thelia/Model/Lang.php
index 5f7289792..e7b83ead4 100644
--- a/core/lib/Thelia/Model/Lang.php
+++ b/core/lib/Thelia/Model/Lang.php
@@ -5,8 +5,11 @@ namespace Thelia\Model;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Exception\PropelException;
 use Propel\Runtime\Propel;
+use Symfony\Component\Filesystem\Filesystem;
 use Thelia\Core\Event\Lang\LangEvent;
 use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Template\TemplateHelper;
+use Thelia\Core\Translation\Translator;
 use Thelia\Model\Base\Lang as BaseLang;
 use Thelia\Model\LangQuery;
 use Thelia\Model\Map\LangTableMap;
@@ -53,6 +56,33 @@ class Lang extends BaseLang {
 
     }
 
+    protected function fixMissingFlag() {
+        // Be sure that a lang have a flag, otherwise copy the
+        // "unknown" flag
+        $adminTemplate = TemplateHelper::getInstance()->getActiveAdminTemplate();
+        $unknownFlag = ConfigQuery::getUnknownFlagPath();
+
+        $unknownFlagPath = $adminTemplate->getAbsolutePath().DS.$unknownFlag;
+
+        if (! file_exists($unknownFlagPath)) {
+            throw new \RuntimeException(
+                Translator::getInstance()->trans(
+                    "The image which replaces an undefined country flag (%file) was not found. Please check unknown-flag-path configuration variable, and check that the image exists.",
+                    array("%file" => $unknownFlag)
+                )
+            );
+        }
+
+        // Check if the country flag exists
+        $countryFlag = rtrim(dirname($unknownFlagPath), DS).DS.$this->getCode().'.png';
+
+        if (! file_exists($countryFlag)) {
+            $fs = new Filesystem();
+
+            $fs->copy($unknownFlagPath, $countryFlag);
+        }
+    }
+
     public function preInsert(ConnectionInterface $con = null)
     {
         $this->dispatchEvent(TheliaEvents::BEFORE_CREATELANG, new LangEvent($this));
@@ -63,6 +93,8 @@ class Lang extends BaseLang {
     public function postInsert(ConnectionInterface $con = null)
     {
         $this->dispatchEvent(TheliaEvents::AFTER_CREATELANG, new LangEvent($this));
+
+        $this->fixMissingFlag();
     }
 
     public function preUpdate(ConnectionInterface $con = null)
@@ -75,6 +107,8 @@ class Lang extends BaseLang {
     public function postUpdate(ConnectionInterface $con = null)
     {
         $this->dispatchEvent(TheliaEvents::AFTER_UPDATELANG, new LangEvent($this));
+
+        $this->fixMissingFlag();
     }
 
     public function preDelete(ConnectionInterface $con = null)
diff --git a/core/lib/Thelia/Model/Map/AdminTableMap.php b/core/lib/Thelia/Model/Map/AdminTableMap.php
index 2ba6714d1..2010f9a9c 100644
--- a/core/lib/Thelia/Model/Map/AdminTableMap.php
+++ b/core/lib/Thelia/Model/Map/AdminTableMap.php
@@ -58,7 +58,7 @@ class AdminTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 12;
+    const NUM_COLUMNS = 13;
 
     /**
      * The number of lazy-loaded columns
@@ -68,7 +68,7 @@ class AdminTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 12;
+    const NUM_HYDRATE_COLUMNS = 13;
 
     /**
      * the column name for the ID field
@@ -100,6 +100,11 @@ class AdminTableMap extends TableMap
      */
     const PASSWORD = 'admin.PASSWORD';
 
+    /**
+     * the column name for the LOCALE field
+     */
+    const LOCALE = 'admin.LOCALE';
+
     /**
      * the column name for the ALGO field
      */
@@ -142,12 +147,12 @@ class AdminTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'ProfileId', 'Firstname', 'Lastname', 'Login', 'Password', 'Algo', 'Salt', 'RememberMeToken', 'RememberMeSerial', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'profileId', 'firstname', 'lastname', 'login', 'password', 'algo', 'salt', 'rememberMeToken', 'rememberMeSerial', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(AdminTableMap::ID, AdminTableMap::PROFILE_ID, AdminTableMap::FIRSTNAME, AdminTableMap::LASTNAME, AdminTableMap::LOGIN, AdminTableMap::PASSWORD, AdminTableMap::ALGO, AdminTableMap::SALT, AdminTableMap::REMEMBER_ME_TOKEN, AdminTableMap::REMEMBER_ME_SERIAL, AdminTableMap::CREATED_AT, AdminTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'PROFILE_ID', 'FIRSTNAME', 'LASTNAME', 'LOGIN', 'PASSWORD', 'ALGO', 'SALT', 'REMEMBER_ME_TOKEN', 'REMEMBER_ME_SERIAL', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'profile_id', 'firstname', 'lastname', 'login', 'password', 'algo', 'salt', 'remember_me_token', 'remember_me_serial', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
+        self::TYPE_PHPNAME       => array('Id', 'ProfileId', 'Firstname', 'Lastname', 'Login', 'Password', 'Locale', 'Algo', 'Salt', 'RememberMeToken', 'RememberMeSerial', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'profileId', 'firstname', 'lastname', 'login', 'password', 'locale', 'algo', 'salt', 'rememberMeToken', 'rememberMeSerial', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(AdminTableMap::ID, AdminTableMap::PROFILE_ID, AdminTableMap::FIRSTNAME, AdminTableMap::LASTNAME, AdminTableMap::LOGIN, AdminTableMap::PASSWORD, AdminTableMap::LOCALE, AdminTableMap::ALGO, AdminTableMap::SALT, AdminTableMap::REMEMBER_ME_TOKEN, AdminTableMap::REMEMBER_ME_SERIAL, AdminTableMap::CREATED_AT, AdminTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'PROFILE_ID', 'FIRSTNAME', 'LASTNAME', 'LOGIN', 'PASSWORD', 'LOCALE', 'ALGO', 'SALT', 'REMEMBER_ME_TOKEN', 'REMEMBER_ME_SERIAL', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'profile_id', 'firstname', 'lastname', 'login', 'password', 'locale', 'algo', 'salt', 'remember_me_token', 'remember_me_serial', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
     );
 
     /**
@@ -157,12 +162,12 @@ class AdminTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'ProfileId' => 1, 'Firstname' => 2, 'Lastname' => 3, 'Login' => 4, 'Password' => 5, 'Algo' => 6, 'Salt' => 7, 'RememberMeToken' => 8, 'RememberMeSerial' => 9, 'CreatedAt' => 10, 'UpdatedAt' => 11, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'profileId' => 1, 'firstname' => 2, 'lastname' => 3, 'login' => 4, 'password' => 5, 'algo' => 6, 'salt' => 7, 'rememberMeToken' => 8, 'rememberMeSerial' => 9, 'createdAt' => 10, 'updatedAt' => 11, ),
-        self::TYPE_COLNAME       => array(AdminTableMap::ID => 0, AdminTableMap::PROFILE_ID => 1, AdminTableMap::FIRSTNAME => 2, AdminTableMap::LASTNAME => 3, AdminTableMap::LOGIN => 4, AdminTableMap::PASSWORD => 5, AdminTableMap::ALGO => 6, AdminTableMap::SALT => 7, AdminTableMap::REMEMBER_ME_TOKEN => 8, AdminTableMap::REMEMBER_ME_SERIAL => 9, AdminTableMap::CREATED_AT => 10, AdminTableMap::UPDATED_AT => 11, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'PROFILE_ID' => 1, 'FIRSTNAME' => 2, 'LASTNAME' => 3, 'LOGIN' => 4, 'PASSWORD' => 5, 'ALGO' => 6, 'SALT' => 7, 'REMEMBER_ME_TOKEN' => 8, 'REMEMBER_ME_SERIAL' => 9, 'CREATED_AT' => 10, 'UPDATED_AT' => 11, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'profile_id' => 1, 'firstname' => 2, 'lastname' => 3, 'login' => 4, 'password' => 5, 'algo' => 6, 'salt' => 7, 'remember_me_token' => 8, 'remember_me_serial' => 9, 'created_at' => 10, 'updated_at' => 11, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
+        self::TYPE_PHPNAME       => array('Id' => 0, 'ProfileId' => 1, 'Firstname' => 2, 'Lastname' => 3, 'Login' => 4, 'Password' => 5, 'Locale' => 6, 'Algo' => 7, 'Salt' => 8, 'RememberMeToken' => 9, 'RememberMeSerial' => 10, 'CreatedAt' => 11, 'UpdatedAt' => 12, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'profileId' => 1, 'firstname' => 2, 'lastname' => 3, 'login' => 4, 'password' => 5, 'locale' => 6, 'algo' => 7, 'salt' => 8, 'rememberMeToken' => 9, 'rememberMeSerial' => 10, 'createdAt' => 11, 'updatedAt' => 12, ),
+        self::TYPE_COLNAME       => array(AdminTableMap::ID => 0, AdminTableMap::PROFILE_ID => 1, AdminTableMap::FIRSTNAME => 2, AdminTableMap::LASTNAME => 3, AdminTableMap::LOGIN => 4, AdminTableMap::PASSWORD => 5, AdminTableMap::LOCALE => 6, AdminTableMap::ALGO => 7, AdminTableMap::SALT => 8, AdminTableMap::REMEMBER_ME_TOKEN => 9, AdminTableMap::REMEMBER_ME_SERIAL => 10, AdminTableMap::CREATED_AT => 11, AdminTableMap::UPDATED_AT => 12, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'PROFILE_ID' => 1, 'FIRSTNAME' => 2, 'LASTNAME' => 3, 'LOGIN' => 4, 'PASSWORD' => 5, 'LOCALE' => 6, 'ALGO' => 7, 'SALT' => 8, 'REMEMBER_ME_TOKEN' => 9, 'REMEMBER_ME_SERIAL' => 10, 'CREATED_AT' => 11, 'UPDATED_AT' => 12, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'profile_id' => 1, 'firstname' => 2, 'lastname' => 3, 'login' => 4, 'password' => 5, 'locale' => 6, 'algo' => 7, 'salt' => 8, 'remember_me_token' => 9, 'remember_me_serial' => 10, 'created_at' => 11, 'updated_at' => 12, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
     );
 
     /**
@@ -187,6 +192,7 @@ class AdminTableMap extends TableMap
         $this->addColumn('LASTNAME', 'Lastname', 'VARCHAR', true, 100, null);
         $this->addColumn('LOGIN', 'Login', 'VARCHAR', true, 100, null);
         $this->addColumn('PASSWORD', 'Password', 'VARCHAR', true, 128, null);
+        $this->addColumn('LOCALE', 'Locale', 'VARCHAR', true, 45, null);
         $this->addColumn('ALGO', 'Algo', 'VARCHAR', false, 128, null);
         $this->addColumn('SALT', 'Salt', 'VARCHAR', false, 128, null);
         $this->addColumn('REMEMBER_ME_TOKEN', 'RememberMeToken', 'VARCHAR', false, 255, null);
@@ -360,6 +366,7 @@ class AdminTableMap extends TableMap
             $criteria->addSelectColumn(AdminTableMap::LASTNAME);
             $criteria->addSelectColumn(AdminTableMap::LOGIN);
             $criteria->addSelectColumn(AdminTableMap::PASSWORD);
+            $criteria->addSelectColumn(AdminTableMap::LOCALE);
             $criteria->addSelectColumn(AdminTableMap::ALGO);
             $criteria->addSelectColumn(AdminTableMap::SALT);
             $criteria->addSelectColumn(AdminTableMap::REMEMBER_ME_TOKEN);
@@ -373,6 +380,7 @@ class AdminTableMap extends TableMap
             $criteria->addSelectColumn($alias . '.LASTNAME');
             $criteria->addSelectColumn($alias . '.LOGIN');
             $criteria->addSelectColumn($alias . '.PASSWORD');
+            $criteria->addSelectColumn($alias . '.LOCALE');
             $criteria->addSelectColumn($alias . '.ALGO');
             $criteria->addSelectColumn($alias . '.SALT');
             $criteria->addSelectColumn($alias . '.REMEMBER_ME_TOKEN');
diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php
index b85627d74..d18038790 100644
--- a/core/lib/Thelia/Model/Map/CouponTableMap.php
+++ b/core/lib/Thelia/Model/Map/CouponTableMap.php
@@ -208,7 +208,7 @@ class CouponTableMap extends TableMap
         $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
         $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null);
         $this->addColumn('TYPE', 'Type', 'VARCHAR', true, 255, null);
-        $this->addColumn('SERIALIZED_EFFECTS', 'SerializedEffects', 'LONGVARCHAR', true, null, null);
+        $this->addColumn('SERIALIZED_EFFECTS', 'SerializedEffects', 'CLOB', true, null, null);
         $this->addColumn('IS_ENABLED', 'IsEnabled', 'BOOLEAN', true, 1, null);
         $this->addColumn('EXPIRATION_DATE', 'ExpirationDate', 'TIMESTAMP', true, null, null);
         $this->addColumn('MAX_USAGE', 'MaxUsage', 'INTEGER', true, null, null);
diff --git a/core/lib/Thelia/Model/Map/CouponVersionTableMap.php b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php
index 1509d9c24..e111d1682 100644
--- a/core/lib/Thelia/Model/Map/CouponVersionTableMap.php
+++ b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php
@@ -199,7 +199,7 @@ class CouponVersionTableMap extends TableMap
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'coupon', 'ID', true, null, null);
         $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null);
         $this->addColumn('TYPE', 'Type', 'VARCHAR', true, 255, null);
-        $this->addColumn('SERIALIZED_EFFECTS', 'SerializedEffects', 'LONGVARCHAR', true, null, null);
+        $this->addColumn('SERIALIZED_EFFECTS', 'SerializedEffects', 'CLOB', true, null, null);
         $this->addColumn('IS_ENABLED', 'IsEnabled', 'BOOLEAN', true, 1, null);
         $this->addColumn('EXPIRATION_DATE', 'ExpirationDate', 'TIMESTAMP', true, null, null);
         $this->addColumn('MAX_USAGE', 'MaxUsage', 'INTEGER', true, null, null);
diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php
index 12b98c890..5bcc56b46 100644
--- a/core/lib/Thelia/Model/Product.php
+++ b/core/lib/Thelia/Model/Product.php
@@ -55,6 +55,8 @@ class Product extends BaseProduct
 
     /**
      * Return the default PSE for this product.
+     *
+     * @return ProductSaleElements
      */
     public function getDefaultSaleElements() {
         return ProductSaleElementsQuery::create()->filterByProductId($this->id)->filterByIsDefault(true)->find();
diff --git a/core/lib/Thelia/Tests/Action/AddressTest.php b/core/lib/Thelia/Tests/Action/AddressTest.php
index 9c4198c06..b570959e0 100644
--- a/core/lib/Thelia/Tests/Action/AddressTest.php
+++ b/core/lib/Thelia/Tests/Action/AddressTest.php
@@ -36,7 +36,7 @@ use Thelia\Tests\Action\BaseAction;
  * @package Thelia\Tests\Action
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class AddressTest extends BaseAction
+class AddressTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testCreatedAddress()
@@ -59,8 +59,9 @@ class AddressTest extends BaseAction
             ""
         );
         $AddressCreateOrUpdateEvent->setCustomer($customer);
+        $AddressCreateOrUpdateEvent->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"));
 
-        $actionAddress = new Address($this->getContainer());
+        $actionAddress = new Address();
         $actionAddress->create($AddressCreateOrUpdateEvent);
 
         $createdAddress = $AddressCreateOrUpdateEvent->getAddress();
@@ -106,8 +107,9 @@ class AddressTest extends BaseAction
             ""
         );
         $addressEvent->setAddress($address);
+        $addressEvent->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"));
 
-        $actionAddress = new Address($this->getContainer());
+        $actionAddress = new Address();
         $actionAddress->update($addressEvent);
 
         $updatedAddress = $addressEvent->getAddress();
diff --git a/core/lib/Thelia/Tests/Action/AdministratorTest.php b/core/lib/Thelia/Tests/Action/AdministratorTest.php
new file mode 100644
index 000000000..bfaee0d6b
--- /dev/null
+++ b/core/lib/Thelia/Tests/Action/AdministratorTest.php
@@ -0,0 +1,143 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Tests\Action;
+
+use Thelia\Action\Administrator;
+use Thelia\Core\Event\Administrator\AdministratorEvent;
+use Thelia\Core\Event\Administrator\AdministratorUpdatePasswordEvent;
+use Thelia\Model\AdminQuery;
+use Thelia\Model\LangQuery;
+
+
+/**
+ * Class AdministratorTest
+ * @package Thelia\Tests\Action
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class AdministratorTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testCreate()
+    {
+        $login = 'thelia'.uniqid();
+        $locale = LangQuery::create()->findOne()->getLocale();
+        $adminEvent = new AdministratorEvent();
+        $adminEvent
+            ->setFirstname('thelia')
+            ->setLastname('thelia')
+            ->setLogin($login)
+            ->setPassword('azerty')
+            ->setLocale($locale)
+            ->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"))
+        ;
+
+        $admin = new Administrator();
+        $admin->create($adminEvent);
+
+        $createdAdmin = $adminEvent->getAdministrator();
+
+        $this->assertInstanceOf("Thelia\Model\Admin", $createdAdmin);
+        $this->assertFalse($createdAdmin->isNew());
+
+        $this->assertEquals($adminEvent->getFirstname(), $createdAdmin->getFirstname());
+        $this->assertEquals($adminEvent->getLastname(), $createdAdmin->getLastname());
+        $this->assertEquals($adminEvent->getLogin(), $createdAdmin->getLogin());
+        $this->assertEquals($adminEvent->getLocale(), $createdAdmin->getLocale());
+        $this->assertEquals($adminEvent->getProfile(), $createdAdmin->getProfileId());
+        $this->assertTrue(password_verify($adminEvent->getPassword(), $createdAdmin->getPassword()));
+    }
+
+    public function testUpdate()
+    {
+        $admin = AdminQuery::create()->findOne();
+
+        $login = 'thelia'.uniqid();
+        $locale = LangQuery::create()->findOne()->getLocale();
+        $adminEvent = new AdministratorEvent();
+        $adminEvent
+            ->setId($admin->getId())
+            ->setFirstname('thelia_update')
+            ->setLastname('thelia_update')
+            ->setLogin($login)
+            ->setPassword('azertyuiop')
+            ->setLocale($locale)
+            ->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"))
+        ;
+
+        $actionAdmin = new Administrator();
+        $actionAdmin->update($adminEvent);
+
+        $updatedAdmin = $adminEvent->getAdministrator();
+
+        $this->assertInstanceOf("Thelia\Model\Admin", $updatedAdmin);
+        $this->assertFalse($updatedAdmin->isNew());
+
+        $this->assertEquals($adminEvent->getFirstname(), $updatedAdmin->getFirstname());
+        $this->assertEquals($adminEvent->getLastname(), $updatedAdmin->getLastname());
+        $this->assertEquals($adminEvent->getLogin(), $updatedAdmin->getLogin());
+        $this->assertEquals($adminEvent->getLocale(), $updatedAdmin->getLocale());
+        $this->assertEquals($adminEvent->getProfile(), $updatedAdmin->getProfileId());
+        $this->assertTrue(password_verify($adminEvent->getPassword(), $updatedAdmin->getPassword()));
+    }
+
+    public function testDelete()
+    {
+        $admin = AdminQuery::create()->findOne();
+
+        $adminEvent = new AdministratorEvent();
+
+        $adminEvent
+            ->setId($admin->getId())
+            ->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"))
+        ;
+
+        $actionAdmin = new Administrator();
+        $actionAdmin->delete($adminEvent);
+
+        $deletedAdmin = $adminEvent->getAdministrator();
+
+        $this->assertInstanceOf("Thelia\Model\Admin", $deletedAdmin);
+        $this->assertTrue($deletedAdmin->isDeleted());
+    }
+
+    public function testUpdatePassword()
+    {
+        $admin = AdminQuery::create()->findOne();
+
+        $adminEvent = new AdministratorUpdatePasswordEvent($admin);
+        $adminEvent
+            ->setPassword('toto')
+            ->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"));
+
+        $actionAdmin = new Administrator();
+        $actionAdmin->updatePassword($adminEvent);
+
+        $updatedAdmin = $adminEvent->getAdmin();
+
+        $this->assertInstanceOf("Thelia\Model\Admin", $updatedAdmin);
+        $this->assertTrue(password_verify($adminEvent->getPassword(), $updatedAdmin->getPassword()));
+    }
+
+
+} 
\ No newline at end of file
diff --git a/core/lib/Thelia/Tests/Action/CustomerTest.php b/core/lib/Thelia/Tests/Action/CustomerTest.php
index 396eb5257..21918d79d 100644
--- a/core/lib/Thelia/Tests/Action/CustomerTest.php
+++ b/core/lib/Thelia/Tests/Action/CustomerTest.php
@@ -24,6 +24,9 @@
 namespace Thelia\Tests\Action\ImageTest;
 use Thelia\Action\Customer;
 use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
+use Thelia\Core\HttpFoundation\Request;
+use Thelia\Core\Security\SecurityContext;
+use Thelia\Model\CustomerQuery;
 
 /**
  * Class CustomerTest
@@ -32,15 +35,12 @@ use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
  */
 class CustomerTest extends \PHPUnit_Framework_TestCase
 {
-    public function getContainer()
+
+    public static function setUpBeforeClass()
     {
-        $container = new \Symfony\Component\DependencyInjection\ContainerBuilder();
-
-        $dispatcher = $this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface");
-
-        $container->set("event_dispatcher", $dispatcher);
-
-        return $container;
+        CustomerQuery::create()
+            ->filterByRef('testRef')
+            ->delete();
     }
 
     public function testCreatedCustomer()
@@ -67,7 +67,9 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
             null
         );
 
-        $customerAction = new Customer($this->getContainer());
+        $customerCreateEvent->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"));
+
+        $customerAction = new Customer(new SecurityContext(new Request()));
 
         $customerAction->create($customerCreateEvent);
 
@@ -126,7 +128,9 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
             'testRef'
         );
 
-        $customerAction = new Customer($this->getContainer());
+        $customerCreateEvent->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"));
+
+        $customerAction = new Customer(new SecurityContext(new Request()));
 
         $customerAction->create($customerCreateEvent);
 
diff --git a/core/lib/Thelia/Tools/MoneyFormat.php b/core/lib/Thelia/Tools/MoneyFormat.php
new file mode 100644
index 000000000..94239907c
--- /dev/null
+++ b/core/lib/Thelia/Tools/MoneyFormat.php
@@ -0,0 +1,57 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	    email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Tools;
+
+use Symfony\Component\HttpFoundation\Request;
+
+class MoneyFormat extends NumberFormat
+{
+    public static function getInstance(Request $request)
+    {
+        return new MoneyFormat($request);
+    }
+
+    /**
+     * Get a standard number, with '.' as decimal point no thousands separator, and no currency symbol
+     * so that this number can be used to perform calculations.
+     *
+     * @param float  $number   the number
+     * @param string $decimals number of decimal figures
+     */
+    public function formatStandardMoney($number, $decimals = null)
+    {
+        return parent::formatStandardNumber($number, $decimals);
+    }
+
+    public function format($number, $decimals = null, $decPoint = null, $thousandsSep = null, $symbol = null)
+    {
+        $number = parent::format($number, $decimals, $decPoint, $thousandsSep);
+
+        if ($symbol !== null) {
+            // FIXME: should be a parameter related to i18n configuration
+            $number = $number . ' ' . $symbol;
+        }
+        return $number;
+    }
+}
diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php
index f50c7db27..cf593bf06 100644
--- a/core/lib/Thelia/Tools/URL.php
+++ b/core/lib/Thelia/Tools/URL.php
@@ -154,7 +154,8 @@ class URL
         $sepChar = strstr($base, '?') === false ? '?' : '&';
 
         if ('' !== $queryString = rtrim($queryString, "&")) $queryString = $sepChar . $queryString;
-        return $base . $queryString;
+        
+        return rtrim($base, '&') . $queryString;
     }
 
     /**
diff --git a/install/faker.php b/install/faker.php
index 4d2cc3c85..5432021b7 100644
--- a/install/faker.php
+++ b/install/faker.php
@@ -101,6 +101,10 @@ try {
         ->find();
     $customer->delete();
 
+    $admin = Thelia\Model\AdminQuery::create()
+        ->find();
+    $admin->delete();
+
     $folder = Thelia\Model\FolderQuery::create()
         ->find();
     $folder->delete();
@@ -183,6 +187,17 @@ try {
         ;
     }
 
+    for ($i=0; $i<3; $i++) {
+        $admin = new Thelia\Model\Admin();
+        $admin
+            ->setFirstname($faker->firstname)
+            ->setLastname($faker->lastname)
+            ->setLogin($faker->firstname)
+            ->setPassword('azerty')
+            ->setLocale('en_US')
+            ->save();
+    }
+
     for ($i = 0; $i < 50; $i++) {
         $customer = new Thelia\Model\Customer();
         $customer->createOrUpdate(
diff --git a/install/insert.sql b/install/insert.sql
index 61b3e9045..947ac80bb 100644
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -32,16 +32,19 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('url_site','', 0, 0, NOW(), NOW()),
 ('pdf_invoice_file', 'invoice', 0, 0, NOW(), NOW()),
 ('pdf_delivery_file', 'delivery', 0, 0, NOW(), NOW()),
+('unknown-flag-path','assets/img/flags/unknown.png', 0, 0, NOW(), NOW()),
+
 ('session_config.default', '1', 1, 1, NOW(), NOW()),
 ('default_lang_without_translation', '1', 1, 1, NOW(), NOW()),
 ('store_name','', 0, 1, NOW(), NOW()),
 ('store_email','', 0, 1, NOW(), NOW()),
 ('one_domain_foreach_lang','0', 1, 1, NOW(), NOW()),
-('thelia_version','2.0.0-beta3', 1, 1, NOW(), NOW()),
+('thelia_version','2.0.0-beta4', 1, 1, NOW(), NOW()),
 ('thelia_major_version','2', 1, 1, NOW(), NOW()),
 ('thelia_minus_version','0', 1, 1, NOW(), NOW()),
 ('thelia_release_version','0', 1, 1, NOW(), NOW()),
-('thelia_extra_version','beta3', 1, 1, NOW(), NOW());
+('thelia_extra_version','beta4', 1, 1, NOW(), NOW());
+
 
 INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
 (1, 'en_US', 'Class name of the session handler', NULL, NULL, NULL),
@@ -70,7 +73,8 @@ INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `pos
 (24, 'en_US', '"Remember me" cookie expiration time, in seconds, for customer users', NULL, NULL, NULL),
 (25, 'en_US', 'Base URL of the shop (e.g. http://www.yourshopdomain.com)', NULL, NULL, NULL),
 (26, 'en_US', 'Name of the invoice view in the current PDF template (without extension)', NULL, NULL, NULL),
-(27, 'en_US', 'Name of the delivery view in the current PDF template (without extension)', NULL, NULL, NULL);
+(27, 'en_US', 'Name of the delivery view in the current PDF template (without extension)', NULL, NULL, NULL),
+(28, 'en_US', 'The path (relative to the default back-office template) to the image used when no flag image can be found for a country', NULL, NULL, NULL);
 
 INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES
 (1, 'TheliaDebugBar', 1, 1, 1, 'TheliaDebugBar\\TheliaDebugBar', NOW(), NOW()),
diff --git a/install/thelia.sql b/install/thelia.sql
index d7cc7b3c8..3ef2e89c2 100644
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -20,8 +20,10 @@ CREATE TABLE `category`
     `version` INTEGER DEFAULT 0,
     `version_created_at` DATETIME,
     `version_created_by` VARCHAR(100),
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+    PRIMARY KEY (`id`),
+    INDEX `idx_parent` (`parent`),
+    INDEX `idx_parent_position` (`parent`, `position`)
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product
@@ -54,7 +56,7 @@ CREATE TABLE `product`
     CONSTRAINT `fk_product_template`
         FOREIGN KEY (`template_id`)
         REFERENCES `template` (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_category
@@ -83,7 +85,7 @@ CREATE TABLE `product_category`
         REFERENCES `category` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- country
@@ -109,7 +111,7 @@ CREATE TABLE `country`
         REFERENCES `area` (`id`)
         ON UPDATE RESTRICT
         ON DELETE SET NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- tax
@@ -125,7 +127,7 @@ CREATE TABLE `tax`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- tax_rule
@@ -140,7 +142,7 @@ CREATE TABLE `tax_rule`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- tax_rule_country
@@ -175,7 +177,7 @@ CREATE TABLE `tax_rule_country`
         REFERENCES `country` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- feature
@@ -191,7 +193,7 @@ CREATE TABLE `feature`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- feature_av
@@ -213,7 +215,7 @@ CREATE TABLE `feature_av`
         REFERENCES `feature` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- feature_product
@@ -250,7 +252,7 @@ CREATE TABLE `feature_product`
         REFERENCES `feature_av` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- feature_template
@@ -277,7 +279,7 @@ CREATE TABLE `feature_template`
     CONSTRAINT `fk_feature_template`
         FOREIGN KEY (`template_id`)
         REFERENCES `template` (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- attribute
@@ -292,7 +294,7 @@ CREATE TABLE `attribute`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- attribute_av
@@ -314,7 +316,7 @@ CREATE TABLE `attribute_av`
         REFERENCES `attribute` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- attribute_combination
@@ -348,7 +350,7 @@ CREATE TABLE `attribute_combination`
         REFERENCES `product_sale_elements` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_sale_elements
@@ -377,7 +379,7 @@ CREATE TABLE `product_sale_elements`
         REFERENCES `product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- attribute_template
@@ -404,7 +406,7 @@ CREATE TABLE `attribute_template`
     CONSTRAINT `fk_attribute_template`
         FOREIGN KEY (`template_id`)
         REFERENCES `template` (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- config
@@ -423,7 +425,7 @@ CREATE TABLE `config`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `name_UNIQUE` (`name`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- customer
@@ -457,7 +459,7 @@ CREATE TABLE `customer`
         REFERENCES `customer_title` (`id`)
         ON UPDATE RESTRICT
         ON DELETE RESTRICT
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- address
@@ -504,7 +506,7 @@ CREATE TABLE `address`
         REFERENCES `country` (`id`)
         ON UPDATE RESTRICT
         ON DELETE RESTRICT
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- customer_title
@@ -520,7 +522,7 @@ CREATE TABLE `customer_title`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- lang
@@ -546,7 +548,7 @@ CREATE TABLE `lang`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- folder
@@ -566,7 +568,7 @@ CREATE TABLE `folder`
     `version_created_at` DATETIME,
     `version_created_by` VARCHAR(100),
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- content
@@ -585,7 +587,7 @@ CREATE TABLE `content`
     `version_created_at` DATETIME,
     `version_created_by` VARCHAR(100),
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_image
@@ -608,7 +610,7 @@ CREATE TABLE `product_image`
         REFERENCES `product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_document
@@ -631,7 +633,7 @@ CREATE TABLE `product_document`
         REFERENCES `product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- order
@@ -710,7 +712,7 @@ CREATE TABLE `order`
         REFERENCES `lang` (`id`)
         ON UPDATE RESTRICT
         ON DELETE RESTRICT
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- currency
@@ -729,7 +731,7 @@ CREATE TABLE `currency`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- order_address
@@ -754,7 +756,7 @@ CREATE TABLE `order_address`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- order_product
@@ -791,7 +793,7 @@ CREATE TABLE `order_product`
         REFERENCES `order` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- order_status
@@ -807,7 +809,7 @@ CREATE TABLE `order_status`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `code_UNIQUE` (`code`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- order_product_attribute_combination
@@ -836,7 +838,7 @@ CREATE TABLE `order_product_attribute_combination`
         REFERENCES `order_product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- module
@@ -856,7 +858,7 @@ CREATE TABLE `module`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `code_UNIQUE` (`code`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- accessory
@@ -885,7 +887,7 @@ CREATE TABLE `accessory`
         REFERENCES `product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- area
@@ -901,7 +903,7 @@ CREATE TABLE `area`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- area_delivery_module
@@ -930,7 +932,7 @@ CREATE TABLE `area_delivery_module`
         REFERENCES `module` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- profile
@@ -946,7 +948,7 @@ CREATE TABLE `profile`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `code_UNIQUE` (`code`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- resource
@@ -962,7 +964,7 @@ CREATE TABLE `resource`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `code_UNIQUE` (`code`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- admin
@@ -978,6 +980,7 @@ CREATE TABLE `admin`
     `lastname` VARCHAR(100) NOT NULL,
     `login` VARCHAR(100) NOT NULL,
     `password` VARCHAR(128) NOT NULL,
+    `locale` VARCHAR(45) NOT NULL,
     `algo` VARCHAR(128),
     `salt` VARCHAR(128),
     `remember_me_token` VARCHAR(255),
@@ -992,7 +995,7 @@ CREATE TABLE `admin`
         REFERENCES `profile` (`id`)
         ON UPDATE RESTRICT
         ON DELETE RESTRICT
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- profile_resource
@@ -1020,7 +1023,7 @@ CREATE TABLE `profile_resource`
         REFERENCES `resource` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- profile_module
@@ -1048,7 +1051,7 @@ CREATE TABLE `profile_module`
         REFERENCES `module` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- message
@@ -1072,7 +1075,7 @@ CREATE TABLE `message`
     `version_created_by` VARCHAR(100),
     PRIMARY KEY (`id`),
     UNIQUE INDEX `name_UNIQUE` (`name`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- coupon
@@ -1085,7 +1088,7 @@ CREATE TABLE `coupon`
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `code` VARCHAR(45) NOT NULL,
     `type` VARCHAR(255) NOT NULL,
-    `serialized_effects` TEXT NOT NULL,
+    `serialized_effects` LONGTEXT NOT NULL,
     `is_enabled` TINYINT(1) NOT NULL,
     `expiration_date` DATETIME NOT NULL,
     `max_usage` INTEGER NOT NULL,
@@ -1107,7 +1110,7 @@ CREATE TABLE `coupon`
     INDEX `idx_is_removing_postage` (`is_removing_postage`),
     INDEX `idx_max_usage` (`max_usage`),
     INDEX `idx_is_available_on_special_offers` (`is_available_on_special_offers`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- admin_log
@@ -1128,7 +1131,7 @@ CREATE TABLE `admin_log`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- content_folder
@@ -1157,7 +1160,7 @@ CREATE TABLE `content_folder`
         REFERENCES `folder` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- cart
@@ -1202,7 +1205,7 @@ CREATE TABLE `cart`
         REFERENCES `currency` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- cart_item
@@ -1242,7 +1245,7 @@ CREATE TABLE `cart_item`
         REFERENCES `product_sale_elements` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_price
@@ -1270,7 +1273,7 @@ CREATE TABLE `product_price`
         FOREIGN KEY (`currency_id`)
         REFERENCES `currency` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- category_image
@@ -1293,7 +1296,7 @@ CREATE TABLE `category_image`
         REFERENCES `category` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- folder_image
@@ -1316,7 +1319,7 @@ CREATE TABLE `folder_image`
         REFERENCES `folder` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- content_image
@@ -1339,7 +1342,7 @@ CREATE TABLE `content_image`
         REFERENCES `content` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- category_document
@@ -1362,7 +1365,7 @@ CREATE TABLE `category_document`
         REFERENCES `category` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- content_document
@@ -1385,7 +1388,7 @@ CREATE TABLE `content_document`
         REFERENCES `content` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- folder_document
@@ -1408,7 +1411,7 @@ CREATE TABLE `folder_document`
         REFERENCES `folder` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_associated_content
@@ -1437,7 +1440,7 @@ CREATE TABLE `product_associated_content`
         REFERENCES `content` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- category_associated_content
@@ -1466,7 +1469,7 @@ CREATE TABLE `category_associated_content`
         REFERENCES `content` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- rewriting_url
@@ -1493,7 +1496,7 @@ CREATE TABLE `rewriting_url`
         REFERENCES `rewriting_url` (`id`)
         ON UPDATE RESTRICT
         ON DELETE RESTRICT
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- rewriting_argument
@@ -1515,7 +1518,7 @@ CREATE TABLE `rewriting_argument`
         REFERENCES `rewriting_url` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- template
@@ -1529,7 +1532,7 @@ CREATE TABLE `template`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- module_image
@@ -1552,7 +1555,7 @@ CREATE TABLE `module_image`
         REFERENCES `module` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- order_product_tax
@@ -1577,7 +1580,7 @@ CREATE TABLE `order_product_tax`
         REFERENCES `order_product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- newsletter
@@ -1596,7 +1599,7 @@ CREATE TABLE `newsletter`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `email_UNIQUE` (`email`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- order_coupon
@@ -1628,7 +1631,7 @@ CREATE TABLE `order_coupon`
         REFERENCES `order` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- category_i18n
@@ -1652,7 +1655,7 @@ CREATE TABLE `category_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `category` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_i18n
@@ -1676,7 +1679,7 @@ CREATE TABLE `product_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `product` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- country_i18n
@@ -1697,7 +1700,7 @@ CREATE TABLE `country_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `country` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- tax_i18n
@@ -1716,7 +1719,7 @@ CREATE TABLE `tax_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `tax` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- tax_rule_i18n
@@ -1735,7 +1738,7 @@ CREATE TABLE `tax_rule_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `tax_rule` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- feature_i18n
@@ -1756,7 +1759,7 @@ CREATE TABLE `feature_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `feature` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- feature_av_i18n
@@ -1777,7 +1780,7 @@ CREATE TABLE `feature_av_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `feature_av` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- attribute_i18n
@@ -1798,7 +1801,7 @@ CREATE TABLE `attribute_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `attribute` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- attribute_av_i18n
@@ -1819,7 +1822,7 @@ CREATE TABLE `attribute_av_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `attribute_av` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- config_i18n
@@ -1840,7 +1843,7 @@ CREATE TABLE `config_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `config` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- customer_title_i18n
@@ -1859,7 +1862,7 @@ CREATE TABLE `customer_title_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `customer_title` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- folder_i18n
@@ -1883,7 +1886,7 @@ CREATE TABLE `folder_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `folder` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- content_i18n
@@ -1907,7 +1910,7 @@ CREATE TABLE `content_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `content` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_image_i18n
@@ -1928,7 +1931,7 @@ CREATE TABLE `product_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `product_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_document_i18n
@@ -1949,7 +1952,7 @@ CREATE TABLE `product_document_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `product_document` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- currency_i18n
@@ -1967,7 +1970,7 @@ CREATE TABLE `currency_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `currency` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- order_status_i18n
@@ -1988,7 +1991,7 @@ CREATE TABLE `order_status_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `order_status` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- module_i18n
@@ -2009,7 +2012,7 @@ CREATE TABLE `module_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `module` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- profile_i18n
@@ -2030,7 +2033,7 @@ CREATE TABLE `profile_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `profile` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- resource_i18n
@@ -2051,7 +2054,7 @@ CREATE TABLE `resource_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `resource` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- message_i18n
@@ -2072,7 +2075,7 @@ CREATE TABLE `message_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `message` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- coupon_i18n
@@ -2092,7 +2095,7 @@ CREATE TABLE `coupon_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `coupon` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- category_image_i18n
@@ -2113,7 +2116,7 @@ CREATE TABLE `category_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `category_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- folder_image_i18n
@@ -2134,7 +2137,7 @@ CREATE TABLE `folder_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `folder_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- content_image_i18n
@@ -2155,7 +2158,7 @@ CREATE TABLE `content_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `content_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- category_document_i18n
@@ -2176,7 +2179,7 @@ CREATE TABLE `category_document_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `category_document` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- content_document_i18n
@@ -2197,7 +2200,7 @@ CREATE TABLE `content_document_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `content_document` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- folder_document_i18n
@@ -2218,7 +2221,7 @@ CREATE TABLE `folder_document_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `folder_document` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- template_i18n
@@ -2236,7 +2239,7 @@ CREATE TABLE `template_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `template` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- module_image_i18n
@@ -2257,7 +2260,7 @@ CREATE TABLE `module_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `module_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- category_version
@@ -2281,7 +2284,7 @@ CREATE TABLE `category_version`
         FOREIGN KEY (`id`)
         REFERENCES `category` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- product_version
@@ -2307,7 +2310,7 @@ CREATE TABLE `product_version`
         FOREIGN KEY (`id`)
         REFERENCES `product` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- folder_version
@@ -2331,7 +2334,7 @@ CREATE TABLE `folder_version`
         FOREIGN KEY (`id`)
         REFERENCES `folder` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- content_version
@@ -2354,7 +2357,7 @@ CREATE TABLE `content_version`
         FOREIGN KEY (`id`)
         REFERENCES `content` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- message_version
@@ -2381,7 +2384,7 @@ CREATE TABLE `message_version`
         FOREIGN KEY (`id`)
         REFERENCES `message` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 -- ---------------------------------------------------------------------
 -- coupon_version
@@ -2394,7 +2397,7 @@ CREATE TABLE `coupon_version`
     `id` INTEGER NOT NULL,
     `code` VARCHAR(45) NOT NULL,
     `type` VARCHAR(255) NOT NULL,
-    `serialized_effects` TEXT NOT NULL,
+    `serialized_effects` LONGTEXT NOT NULL,
     `is_enabled` TINYINT(1) NOT NULL,
     `expiration_date` DATETIME NOT NULL,
     `max_usage` INTEGER NOT NULL,
@@ -2411,7 +2414,7 @@ CREATE TABLE `coupon_version`
         FOREIGN KEY (`id`)
         REFERENCES `coupon` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8';
 
 # This restores the fkey checks, after having unset them earlier
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/install/update/2.0.0-beta4.sql b/install/update/2.0.0-beta4.sql
index 284663d1e..9a1dc44d4 100644
--- a/install/update/2.0.0-beta4.sql
+++ b/install/update/2.0.0-beta4.sql
@@ -12,4 +12,12 @@ INSERT INTO  `module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `po
 UPDATE `config` SET `value`='2.0.0-beta4' WHERE `name`='thelia_version';
 UPDATE `config` SET `value`='beta4' WHERE `name`='thelia_extra_version';
 
+-- Preferred locale for admin users
+ALTER TABLE `admin` ADD `locale` VARCHAR(45) NOT NULL AFTER `password`;
+UPDATE `admin` SET `locale`='en_US';
+
+-- Unknown flag image path
+INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updated_at`) VALUES
+('unknown-flag-path','assets/img/flags/unknown.png', 1, 1, NOW(), NOW());
+
 SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/local/config/schema.xml b/local/config/schema.xml
index c77b3204f..d6613fa1f 100644
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -1,1287 +1,1299 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <database defaultIdMethod="native" name="thelia">
+  <vendor type="mysql">
+      <parameter name="Engine" value="InnoDB"/>
+      <parameter name="Charset" value="utf8"/>
+  </vendor>
   <table name="category" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="parent" type="INTEGER" />
-    <column name="visible" required="true" type="TINYINT" />
-    <column name="position" required="true" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="meta_title" size="255" type="VARCHAR" />
-    <column name="meta_description" type="LONGVARCHAR" />
-    <column name="meta_keywords" type="LONGVARCHAR" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum, meta_title, meta_description, meta_keywords" />
-    </behavior>
-    <behavior name="versionable">
-      <parameter name="log_created_at" value="true" />
-      <parameter name="log_created_by" value="true" />
-    </behavior>
-    <behavior name="timestampable" />
-  </table>
-  <table name="product" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="tax_rule_id" type="INTEGER" />
-    <column name="ref" required="true" size="255" type="VARCHAR" />
-    <column defaultValue="0" name="visible" required="true" type="TINYINT" />
-    <column name="position" required="true" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="template_id" type="INTEGER" />
-    <column name="meta_title" size="255" type="VARCHAR" />
-    <column name="meta_description" type="LONGVARCHAR" />
-    <column name="meta_keywords" type="LONGVARCHAR" />
-    <foreign-key foreignTable="tax_rule" name="fk_product_tax_rule_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="tax_rule_id" />
-    </foreign-key>
-    <foreign-key foreignTable="template" name="fk_product_template">
-      <reference foreign="id" local="template_id" />
-    </foreign-key>
-    <unique name="ref_UNIQUE">
-      <unique-column name="ref" />
-    </unique>
-    <index name="idx_product_tax_rule_id">
-      <index-column name="tax_rule_id" />
-    </index>
-    <index name="fk_product_template_id">
-      <index-column name="template_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum, meta_title, meta_description, meta_keywords" />
-    </behavior>
-    <behavior name="versionable">
-      <parameter name="log_created_at" value="true" />
-      <parameter name="log_created_by" value="true" />
-    </behavior>
-  </table>
-  <table isCrossRef="true" name="product_category" namespace="Thelia\Model">
-    <column name="product_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="category_id" primaryKey="true" type="INTEGER" />
-    <column name="default_category" type="BOOLEAN" />
-    <foreign-key foreignTable="product" name="fk_product_has_category_product1" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <foreign-key foreignTable="category" name="fk_product_has_category_category1" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="category_id" />
-    </foreign-key>
-    <index name="idx_product_has_category_category1">
-      <index-column name="category_id" />
-    </index>
-    <index name="idx_product_has_category_product1">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_product_has_category_default">
-      <index-column name="default_category" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="country" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="area_id" type="INTEGER" />
-    <column name="isocode" required="true" size="4" type="VARCHAR" />
-    <column name="isoalpha2" size="2" type="VARCHAR" />
-    <column name="isoalpha3" size="4" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column defaultValue="0" name="by_default" type="TINYINT" />
-    <column defaultValue="0" name="shop_country" required="true" type="BOOLEAN" />
-    <foreign-key foreignTable="area" name="fk_country_area_id" onDelete="SET NULL" onUpdate="RESTRICT">
-      <reference foreign="id" local="area_id" />
-    </foreign-key>
-    <index name="idx_country_area_id">
-      <index-column name="area_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="tax" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="type" required="true" size="255" type="VARCHAR" />
-    <column name="serialized_requirements" required="true" type="LONGVARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description" />
-    </behavior>
-  </table>
-  <table name="tax_rule" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column defaultValue="0" name="is_default" required="true" type="BOOLEAN" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description" />
-    </behavior>
-  </table>
-  <table name="tax_rule_country" namespace="Thelia\Model">
-    <column name="tax_rule_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="country_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="tax_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <foreign-key foreignTable="tax" name="fk_tax_rule_country_tax_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="tax_id" />
-    </foreign-key>
-    <foreign-key foreignTable="tax_rule" name="fk_tax_rule_country_tax_rule_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="tax_rule_id" />
-    </foreign-key>
-    <foreign-key foreignTable="country" name="fk_tax_rule_country_country_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="country_id" />
-    </foreign-key>
-    <index name="idx_tax_rule_country_tax_id">
-      <index-column name="tax_id" />
-    </index>
-    <index name="idx_tax_rule_country_tax_rule_id">
-      <index-column name="tax_rule_id" />
-    </index>
-    <index name="idx_tax_rule_country_country_id">
-      <index-column name="country_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="feature" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column defaultValue="0" name="visible" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="position" type="INTEGER" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="feature_av" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="feature_id" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="feature" name="fk_feature_av_feature_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="feature_id" />
-    </foreign-key>
-    <index name="idx_feature_av_feature_id">
-      <index-column name="feature_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="feature_product" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="feature_id" required="true" type="INTEGER" />
-    <column name="feature_av_id" type="INTEGER" />
-    <column name="free_text_value" type="LONGVARCHAR" />
-    <column name="position" type="INTEGER" />
-    <foreign-key foreignTable="product" name="fk_feature_prod_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <foreign-key foreignTable="feature" name="fk_feature_prod_feature_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="feature_id" />
-    </foreign-key>
-    <foreign-key foreignTable="feature_av" name="fk_feature_prod_feature_av_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="feature_av_id" />
-    </foreign-key>
-    <index name="idx_feature_prod_product_id">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_feature_prod_feature_id">
-      <index-column name="feature_id" />
-    </index>
-    <index name="idx_feature_prod_feature_av_id">
-      <index-column name="feature_av_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table isCrossRef="true" name="feature_template" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="feature_id" required="true" type="INTEGER" />
-    <column name="template_id" required="true" type="INTEGER" />
-    <column name="position" type="INTEGER" />
-    <foreign-key foreignTable="feature" name="fk_feature_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="feature_id" />
-    </foreign-key>
-    <foreign-key foreignTable="template" name="fk_feature_template">
-      <reference foreign="id" local="template_id" />
-    </foreign-key>
-    <index name="idx_feature_template_id">
-      <index-column name="feature_id" />
-    </index>
-    <index name="fk_feature_template_idx">
-      <index-column name="template_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="attribute" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="position" type="INTEGER" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="attribute_av" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="attribute_id" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="attribute" name="fk_attribute_av_attribute_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="attribute_id" />
-    </foreign-key>
-    <index name="idx_attribute_av_attribute_id">
-      <index-column name="attribute_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="attribute_combination" namespace="Thelia\Model">
-    <column name="attribute_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="attribute_av_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_sale_elements_id" primaryKey="true" required="true" type="INTEGER" />
-    <foreign-key foreignTable="attribute" name="fk_attribute_combination_attribute_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="attribute_id" />
-    </foreign-key>
-    <foreign-key foreignTable="attribute_av" name="fk_attribute_combination_attribute_av_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="attribute_av_id" />
-    </foreign-key>
-    <foreign-key foreignTable="product_sale_elements" name="fk_attribute_combination_product_sale_elements_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_sale_elements_id" />
-    </foreign-key>
-    <index name="idx_attribute_combination_attribute_id">
-      <index-column name="attribute_id" />
-    </index>
-    <index name="idx_attribute_combination_attribute_av_id">
-      <index-column name="attribute_av_id" />
-    </index>
-    <index name="idx_attribute_combination_product_sale_elements_id">
-      <index-column name="product_sale_elements_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="product_sale_elements" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="ref" required="true" size="255" type="VARCHAR" />
-    <column name="quantity" required="true" type="FLOAT" />
-    <column defaultValue="0" name="promo" type="TINYINT" />
-    <column defaultValue="0" name="newness" type="TINYINT" />
-    <column defaultValue="0" name="weight" type="FLOAT" />
-    <column defaultValue="0" name="is_default" type="BOOLEAN" />
-    <column name="ean_code" size="255" type="VARCHAR" />
-    <foreign-key foreignTable="product" name="fk_product_sale_element_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <index name="idx_product_sale_element_product_id">
-      <index-column name="product_id" />
-    </index>
-    <index name="ref">
-      <index-column name="ref" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table isCrossRef="true" name="attribute_template" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="attribute_id" required="true" type="INTEGER" />
-    <column name="template_id" required="true" type="INTEGER" />
-    <column name="position" type="INTEGER" />
-    <foreign-key foreignTable="attribute" name="fk_attribute_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="attribute_id" />
-    </foreign-key>
-    <foreign-key foreignTable="template" name="fk_attribute_template">
-      <reference foreign="id" local="template_id" />
-    </foreign-key>
-    <index name="idx_attribute_template_id">
-      <index-column name="attribute_id" />
-    </index>
-    <index name="fk_attribute_template_idx">
-      <index-column name="template_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="config" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" required="true" size="255" type="VARCHAR" />
-    <column name="value" required="true" type="LONGVARCHAR" />
-    <column defaultValue="1" name="secured" required="true" type="TINYINT" />
-    <column defaultValue="1" name="hidden" required="true" type="TINYINT" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <unique name="name_UNIQUE">
-      <unique-column name="name" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="customer" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="ref" required="true" size="50" type="VARCHAR" />
-    <column name="title_id" required="true" type="INTEGER" />
-    <column name="firstname" required="true" size="255" type="VARCHAR" />
-    <column name="lastname" required="true" size="255" type="VARCHAR" />
-    <column name="email" size="255" type="VARCHAR" />
-    <column name="password" size="255" type="VARCHAR" />
-    <column name="algo" size="128" type="VARCHAR" />
-    <column name="reseller" type="TINYINT" />
-    <column name="lang" size="10" type="VARCHAR" />
-    <column name="sponsor" size="50" type="VARCHAR" />
-    <column name="discount" type="FLOAT" />
-    <column name="remember_me_token" size="255" type="VARCHAR" />
-    <column name="remember_me_serial" size="255" type="VARCHAR" />
-    <foreign-key foreignTable="customer_title" name="fk_customer_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="title_id" />
-    </foreign-key>
-    <unique name="ref_UNIQUE">
-      <unique-column name="ref" />
-    </unique>
-    <index name="idx_customer_customer_title_id">
-      <index-column name="title_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="address" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="label" size="255" type="VARCHAR" />
-    <column name="customer_id" required="true" type="INTEGER" />
-    <column name="title_id" required="true" type="INTEGER" />
-    <column name="company" size="255" type="VARCHAR" />
-    <column name="firstname" required="true" size="255" type="VARCHAR" />
-    <column name="lastname" required="true" size="255" type="VARCHAR" />
-    <column name="address1" required="true" size="255" type="VARCHAR" />
-    <column name="address2" required="true" size="255" type="VARCHAR" />
-    <column name="address3" required="true" size="255" type="VARCHAR" />
-    <column name="zipcode" required="true" size="10" type="VARCHAR" />
-    <column name="city" required="true" size="255" type="VARCHAR" />
-    <column name="country_id" required="true" type="INTEGER" />
-    <column name="phone" size="20" type="VARCHAR" />
-    <column name="cellphone" size="20" type="VARCHAR" />
-    <column defaultValue="0" name="is_default" type="TINYINT" />
-    <foreign-key foreignTable="customer" name="fk_address_customer_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="customer_id" />
-    </foreign-key>
-    <foreign-key foreignTable="customer_title" name="fk_address_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="title_id" />
-    </foreign-key>
-    <foreign-key foreignTable="country" name="fk_address_country_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="country_id" />
-    </foreign-key>
-    <index name="idx_address_customer_id">
-      <index-column name="customer_id" />
-    </index>
-    <index name="idx_address_customer_title_id">
-      <index-column name="title_id" />
-    </index>
-    <index name="idx_address_country_id">
-      <index-column name="country_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="customer_title" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column defaultValue="0" name="by_default" required="true" type="INTEGER" />
-    <column name="position" required="true" size="45" type="VARCHAR" />
-    <column name="short" size="10" type="VARCHAR" />
-    <column name="long" size="45" type="VARCHAR" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="short, long" />
-    </behavior>
-  </table>
-  <table name="lang" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="title" size="100" type="VARCHAR" />
-    <column name="code" size="10" type="VARCHAR" />
-    <column name="locale" size="45" type="VARCHAR" />
-    <column name="url" size="255" type="VARCHAR" />
-    <column name="date_format" size="45" type="VARCHAR" />
-    <column name="time_format" size="45" type="VARCHAR" />
-    <column name="datetime_format" size="45" type="VARCHAR" />
-    <column name="decimal_separator" size="45" type="VARCHAR" />
-    <column name="thousands_separator" size="45" type="VARCHAR" />
-    <column name="decimals" size="45" type="VARCHAR" />
-    <column name="by_default" type="TINYINT" />
-    <column name="position" type="INTEGER" />
-    <behavior name="timestampable" />
-  </table>
-  <table name="folder" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="parent" required="true" type="INTEGER" />
-    <column name="visible" type="TINYINT" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="meta_title" size="255" type="VARCHAR" />
-    <column name="meta_description" type="LONGVARCHAR" />
-    <column name="meta_keywords" type="LONGVARCHAR" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum, meta_title, meta_description, meta_keywords" />
-    </behavior>
-    <behavior name="versionable">
-      <parameter name="log_created_at" value="true" />
-      <parameter name="log_created_by" value="true" />
-    </behavior>
-  </table>
-  <table name="content" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="visible" type="TINYINT" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="meta_title" size="255" type="VARCHAR" />
-    <column name="meta_description" type="LONGVARCHAR" />
-    <column name="meta_keywords" type="LONGVARCHAR" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum, meta_title, meta_description, meta_keywords" />
-    </behavior>
-    <behavior name="versionable">
-      <parameter name="log_created_at" value="true" />
-      <parameter name="log_created_by" value="true" />
-    </behavior>
-  </table>
-  <table name="product_image" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="product" name="fk_product_image_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <index name="idx_product_image_product_id">
-      <index-column name="product_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="product_document" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="product" name="fk_product_document_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <index name="idx_product_document_product_id">
-      <index-column name="product_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="order" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="ref" required="true" size="45" type="VARCHAR" />
-    <column name="customer_id" required="true" type="INTEGER" />
-    <column name="invoice_order_address_id" required="true" type="INTEGER" />
-    <column name="delivery_order_address_id" required="true" type="INTEGER" />
-    <column name="invoice_date" type="DATE" />
-    <column name="currency_id" required="true" type="INTEGER" />
-    <column name="currency_rate" required="true" type="FLOAT" />
-    <column description="transaction reference - usually use to identify a transaction with banking modules" name="transaction_ref" size="100" type="VARCHAR" />
-    <column description="delivery reference - usually use to identify a delivery progress on a distant delivery tracker website" name="delivery_ref" size="100" type="VARCHAR" />
-    <column description="the invoice reference" name="invoice_ref" size="100" type="VARCHAR" />
-    <column name="discount" type="FLOAT" />
-    <column name="postage" required="true" type="FLOAT" />
-    <column name="payment_module_id" required="true" type="INTEGER" />
-    <column name="delivery_module_id" required="true" type="INTEGER" />
-    <column name="status_id" required="true" type="INTEGER" />
-    <column name="lang_id" required="true" type="INTEGER" />
-    <foreign-key foreignTable="currency" name="fk_order_currency_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="currency_id" />
-    </foreign-key>
-    <foreign-key foreignTable="customer" name="fk_order_customer_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="customer_id" />
-    </foreign-key>
-    <foreign-key foreignTable="order_address" name="fk_order_invoice_order_address_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="invoice_order_address_id" />
-    </foreign-key>
-    <foreign-key foreignTable="order_address" name="fk_order_delivery_order_address_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="delivery_order_address_id" />
-    </foreign-key>
-    <foreign-key foreignTable="order_status" name="fk_order_status_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="status_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="fk_order_payment_module_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="payment_module_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="fk_order_delivery_module_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="delivery_module_id" />
-    </foreign-key>
-    <foreign-key foreignTable="lang" name="fk_order_lang_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="lang_id" />
-    </foreign-key>
-    <index name="idx_order_currency_id">
-      <index-column name="currency_id" />
-    </index>
-    <index name="idx_order_customer_id">
-      <index-column name="customer_id" />
-    </index>
-    <index name="idx_order_invoice_order_address_id">
-      <index-column name="invoice_order_address_id" />
-    </index>
-    <index name="idx_order_delivery_order_address_id">
-      <index-column name="delivery_order_address_id" />
-    </index>
-    <index name="idx_order_status_id">
-      <index-column name="status_id" />
-    </index>
-    <unique name="ref_UNIQUE">
-      <unique-column name="ref" />
-    </unique>
-    <index name="fk_order_payment_module_id_idx">
-      <index-column name="payment_module_id" />
-    </index>
-    <index name="fk_order_delivery_module_id_idx">
-      <index-column name="delivery_module_id" />
-    </index>
-    <index name="fk_order_lang_id_idx">
-      <index-column name="lang_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="currency" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" size="45" type="VARCHAR" />
-    <column name="code" size="45" type="VARCHAR" />
-    <column name="symbol" size="45" type="VARCHAR" />
-    <column name="rate" type="FLOAT" />
-    <column name="position" type="INTEGER" />
-    <column name="by_default" type="TINYINT" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="name" />
-    </behavior>
-  </table>
-  <table name="order_address" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="customer_title_id" type="INTEGER" />
-    <column name="company" size="255" type="VARCHAR" />
-    <column name="firstname" required="true" size="255" type="VARCHAR" />
-    <column name="lastname" required="true" size="255" type="VARCHAR" />
-    <column name="address1" required="true" size="255" type="VARCHAR" />
-    <column name="address2" size="255" type="VARCHAR" />
-    <column name="address3" size="255" type="VARCHAR" />
-    <column name="zipcode" required="true" size="10" type="VARCHAR" />
-    <column name="city" required="true" size="255" type="VARCHAR" />
-    <column name="phone" size="20" type="VARCHAR" />
-    <column name="country_id" required="true" type="INTEGER" />
-    <behavior name="timestampable" />
-  </table>
-  <table name="order_product" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="order_id" required="true" type="INTEGER" />
-    <column name="product_ref" required="true" size="255" type="VARCHAR" />
-    <column name="product_sale_elements_ref" required="true" size="255" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="quantity" required="true" type="FLOAT" />
-    <column name="price" required="true" type="FLOAT" />
-    <column name="promo_price" size="45" type="VARCHAR" />
-    <column name="was_new" required="true" type="TINYINT" />
-    <column name="was_in_promo" required="true" type="TINYINT" />
-    <column name="weight" size="45" type="VARCHAR" />
-    <column name="ean_code" size="255" type="VARCHAR" />
-    <column name="tax_rule_title" size="255" type="VARCHAR" />
-    <column name="tax_rule_description" type="CLOB" />
-    <column description="not managed yet" name="parent" type="INTEGER" />
-    <foreign-key foreignTable="order" name="fk_order_product_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="order_id" />
-    </foreign-key>
-    <index name="idx_order_product_order_id">
-      <index-column name="order_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="order_status" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" required="true" size="45" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <unique name="code_UNIQUE">
-      <unique-column name="code" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="order_product_attribute_combination" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="order_product_id" required="true" type="INTEGER" />
-    <column name="attribute_title" required="true" size="255" type="VARCHAR" />
-    <column name="attribute_chapo" type="LONGVARCHAR" />
-    <column name="attribute_description" type="CLOB" />
-    <column name="attribute_postscriptum" type="LONGVARCHAR" />
-    <column name="attribute_av_title" required="true" size="255" type="VARCHAR" />
-    <column name="attribute_av_chapo" type="LONGVARCHAR" />
-    <column name="attribute_av_description" type="CLOB" />
-    <column name="attribute_av_postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="order_product" name="fk_order_product_attribute_combination_order_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="order_product_id" />
-    </foreign-key>
-    <index name="idx_order_product_attribute_combination_order_product_id">
-      <index-column name="order_product_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="module" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" required="true" size="55" type="VARCHAR" />
-    <column name="type" required="true" type="TINYINT" />
-    <column name="activate" type="TINYINT" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="full_namespace" size="255" type="VARCHAR" />
-    <unique name="code_UNIQUE">
-      <unique-column name="code" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table isCrossRef="true" name="accessory" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="accessory" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <foreign-key foreignTable="product" name="fk_accessory_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <foreign-key foreignTable="product" name="fk_accessory_accessory" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="accessory" />
-    </foreign-key>
-    <index name="idx_address_product_id">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_address_accessory">
-      <index-column name="accessory" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="area" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" required="true" size="100" type="VARCHAR" />
-    <column name="postage" type="FLOAT" />
-    <behavior name="timestampable" />
-  </table>
-  <table name="area_delivery_module" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="area_id" required="true" type="INTEGER" />
-    <column name="delivery_module_id" required="true" type="INTEGER" />
-    <foreign-key foreignTable="area" name="fk_area_delivery_module_area_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="area_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="idx_area_delivery_module_delivery_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="delivery_module_id" />
-    </foreign-key>
-    <index name="idx_area_delivery_module_area_id">
-      <index-column name="area_id" />
-    </index>
-    <index name="idx_area_delivery_module_delivery_module_id_idx">
-      <index-column name="delivery_module_id" />
-    </index>
-    <unique name="area_id_delivery_module_id_UNIQUE">
-      <unique-column name="area_id" />
-      <unique-column name="delivery_module_id" />
-    </unique>
-    <behavior name="timestampable" />
-  </table>
-  <table name="profile" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" required="true" size="30" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <unique name="code_UNIQUE">
-      <unique-column name="code" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="resource" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" required="true" size="255" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <unique name="code_UNIQUE">
-      <unique-column name="code" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="admin" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="profile_id" type="INTEGER" />
-    <column name="firstname" required="true" size="100" type="VARCHAR" />
-    <column name="lastname" required="true" size="100" type="VARCHAR" />
-    <column name="login" required="true" size="100" type="VARCHAR" />
-    <column name="password" required="true" size="128" type="VARCHAR" />
-    <column name="algo" size="128" type="VARCHAR" />
-    <column name="salt" size="128" type="VARCHAR" />
-    <column name="remember_me_token" size="255" type="VARCHAR" />
-    <column name="remember_me_serial" size="255" type="VARCHAR" />
-    <foreign-key foreignTable="profile" name="fk_admin_profile_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="profile_id" />
-    </foreign-key>
-    <index name="idx_admin_profile_id">
-      <index-column name="profile_id" />
-    </index>
-    <unique name="login_UNIQUE">
-      <unique-column name="login" />
-    </unique>
-    <behavior name="timestampable" />
-  </table>
-  <table isCrossRef="true" name="profile_resource" namespace="Thelia\Model">
-    <column name="profile_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="resource_id" primaryKey="true" required="true" type="INTEGER" />
-    <column defaultValue="0" name="access" required="true" type="INTEGER" />
-    <foreign-key foreignTable="profile" name="fk_profile_resource_profile_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="profile_id" />
-    </foreign-key>
-    <foreign-key foreignTable="resource" name="fk_profile_resource_resource_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="resource_id" />
-    </foreign-key>
-    <index name="idx_profile_resource_profile_id">
-      <index-column name="profile_id" />
-    </index>
-    <index name="idx_profile_resource_resource_id">
-      <index-column name="resource_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="profile_module" namespace="Thelia\Model">
-    <column name="profile_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="module_id" primaryKey="true" required="true" type="INTEGER" />
-    <column defaultValue="0" name="access" type="TINYINT" />
-    <foreign-key foreignTable="profile" name="fk_profile_module_profile_id" onDelete="CASCADE" onUpdate="CASCADE">
-      <reference foreign="id" local="profile_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="fk_profile_module_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="module_id" />
-    </foreign-key>
-    <index name="idx_profile_module_profile_id">
-      <index-column name="profile_id" />
-    </index>
-    <index name="idx_profile_module_module_id">
-      <index-column name="module_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="message" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" required="true" size="255" type="VARCHAR" />
-    <column name="secured" type="TINYINT" />
-    <column name="title" type="LONGVARCHAR" />
-    <column name="subject" type="LONGVARCHAR" />
-    <column name="text_message" type="CLOB" />
-    <column name="html_message" type="CLOB" />
-    <column name="text_layout_file_name" size="255" type="VARCHAR" />
-    <column name="text_template_file_name" size="255" type="VARCHAR" />
-    <column name="html_layout_file_name" size="255" type="VARCHAR" />
-    <column name="html_template_file_name" size="255" type="VARCHAR" />
-    <unique name="name_UNIQUE">
-      <unique-column name="name" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, subject, text_message, html_message" />
-    </behavior>
-    <behavior name="versionable">
-      <parameter name="log_created_at" value="true" />
-      <parameter name="log_created_by" value="true" />
-    </behavior>
-  </table>
-  <table name="coupon" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" required="true" size="45" type="VARCHAR" />
-    <column name="type" required="true" size="255" type="VARCHAR" />
-    <column name="serialized_effects" required="true" type="LONGVARCHAR" />
-    <column name="title" required="true" size="255" type="VARCHAR" />
-    <column name="is_enabled" required="true" type="BOOLEAN" />
-    <column name="short_description" required="true" type="LONGVARCHAR" />
-    <column name="description" required="true" type="CLOB" />
-    <column name="expiration_date" required="true" type="TIMESTAMP" />
-    <column name="max_usage" required="true" type="INTEGER" />
-    <column name="is_cumulative" required="true" type="BOOLEAN" />
-    <column name="is_removing_postage" required="true" type="BOOLEAN" />
-    <column name="is_available_on_special_offers" required="true" type="BOOLEAN" />
-    <column name="is_used" required="true" type="BOOLEAN" />
-    <column name="serialized_conditions" required="true" type="LONGVARCHAR" />
-    <unique name="code_UNIQUE">
-      <unique-column name="code" />
-    </unique>
-    <index name="idx_is_enabled">
-      <index-column name="is_enabled" />
-    </index>
-    <index name="idx_is_used">
-      <index-column name="is_used" />
-    </index>
-    <index name="idx_type">
-      <index-column name="type" />
-    </index>
-    <index name="idx_expiration_date">
-      <index-column name="expiration_date" />
-    </index>
-    <index name="idx_is_cumulative">
-      <index-column name="is_cumulative" />
-    </index>
-    <index name="idx_is_removing_postage">
-      <index-column name="is_removing_postage" />
-    </index>
-    <index name="idx_max_usage">
-      <index-column name="max_usage" />
-    </index>
-    <index name="idx_is_available_on_special_offers">
-      <index-column name="is_available_on_special_offers" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, short_description, description" />
-    </behavior>
-    <behavior name="versionable" />
-  </table>
-  <table name="admin_log" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="admin_login" size="255" type="VARCHAR" />
-    <column name="admin_firstname" size="255" type="VARCHAR" />
-    <column name="admin_lastname" size="255" type="VARCHAR" />
-    <column name="resource" size="255" type="VARCHAR" />
-    <column name="action" size="255" type="VARCHAR" />
-    <column name="message" type="LONGVARCHAR" />
-    <column name="request" type="CLOB" />
-    <behavior name="timestampable" />
-  </table>
-  <table isCrossRef="true" name="content_folder" namespace="Thelia\Model">
-    <column name="content_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="folder_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="default_folder" type="BOOLEAN" />
-    <foreign-key foreignTable="content" name="fk_content_folder_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <foreign-key foreignTable="folder" name="fk_content_folder_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="folder_id" />
-    </foreign-key>
-    <index name="idx_content_folder_content_id">
-      <index-column name="content_id" />
-    </index>
-    <index name="idx_content_folder_folder_id">
-      <index-column name="folder_id" />
-    </index>
-    <index name="idx_content_folder_default">
-      <index-column name="default_folder" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="cart" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="token" size="255" type="VARCHAR" />
-    <column name="customer_id" type="INTEGER" />
-    <column name="address_delivery_id" type="INTEGER" />
-    <column name="address_invoice_id" type="INTEGER" />
-    <column name="currency_id" type="INTEGER" />
-    <column defaultValue="0" name="discount" type="FLOAT" />
-    <foreign-key foreignTable="customer" name="fk_cart_customer_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="customer_id" />
-    </foreign-key>
-    <foreign-key foreignTable="address" name="fk_cart_address_delivery_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="address_delivery_id" />
-    </foreign-key>
-    <foreign-key foreignTable="address" name="fk_cart_address_invoice_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="address_invoice_id" />
-    </foreign-key>
-    <foreign-key foreignTable="currency" name="fk_cart_currency_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="currency_id" />
-    </foreign-key>
-    <index name="idx_cart_customer_id">
-      <index-column name="customer_id" />
-    </index>
-    <index name="idx_cart_address_delivery_id">
-      <index-column name="address_delivery_id" />
-    </index>
-    <index name="idx_cart_address_invoice_id">
-      <index-column name="address_invoice_id" />
-    </index>
-    <index name="idx_cart_currency_id">
-      <index-column name="currency_id" />
-    </index>
-    <unique name="token_UNIQUE">
-      <unique-column name="token" />
-    </unique>
-    <behavior name="timestampable" />
-  </table>
-  <table name="cart_item" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="cart_id" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column defaultValue="1" name="quantity" type="FLOAT" />
-    <column name="product_sale_elements_id" required="true" type="INTEGER" />
-    <column name="price" type="FLOAT" />
-    <column name="promo_price" type="FLOAT" />
-    <column name="price_end_of_life" type="TIMESTAMP" />
-    <column name="promo" type="INTEGER" />
-    <foreign-key foreignTable="cart" name="fk_cart_item_cart_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="cart_id" />
-    </foreign-key>
-    <foreign-key foreignTable="product" name="fk_cart_item_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <foreign-key foreignTable="product_sale_elements" name="fk_cart_item_product_sale_elements_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_sale_elements_id" />
-    </foreign-key>
-    <index name="idx_cart_item_cart_id">
-      <index-column name="cart_id" />
-    </index>
-    <index name="idx_cart_item_product_id">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_cart_item_product_sale_elements_id">
-      <index-column name="product_sale_elements_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="product_price" namespace="Thelia\Model">
-    <column name="product_sale_elements_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="currency_id" primaryKey="true" required="true" type="INTEGER" />
-    <column defaultValue="0" name="price" required="true" type="FLOAT" />
-    <column defaultValue="0" name="promo_price" required="true" type="FLOAT" />
-    <column defaultValue="1" name="from_default_currency" required="true" type="BOOLEAN" />
-    <foreign-key foreignTable="product_sale_elements" name="fk_product_price_product_sale_elements_id" onDelete="CASCADE">
-      <reference foreign="id" local="product_sale_elements_id" />
-    </foreign-key>
-    <foreign-key foreignTable="currency" name="fk_product_price_currency_id" onDelete="CASCADE">
-      <reference foreign="id" local="currency_id" />
-    </foreign-key>
-    <index name="idx_product_price_product_sale_elements_id">
-      <index-column name="product_sale_elements_id" />
-    </index>
-    <index name="idx_product_price_currency_id">
-      <index-column name="currency_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="category_image" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="category_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="category" name="fk_category_image_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="category_id" />
-    </foreign-key>
-    <index name="idx_category_image_category_id">
-      <index-column name="category_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="folder_image" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="folder_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="folder" name="fk_folder_image_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="folder_id" />
-    </foreign-key>
-    <index name="idx_folder_image_folder_id">
-      <index-column name="folder_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="content_image" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="content_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="content" name="fk_content_image_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <index name="idx_content_image_content_id">
-      <index-column name="content_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="category_document" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="category_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="category" name="fk_catgory_document_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="category_id" />
-    </foreign-key>
-    <index name="idx_category_document_category_id">
-      <index-column name="category_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="content_document" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="content_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="content" name="fk_content_document_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <index name="idx_content_document_content_id">
-      <index-column name="content_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="folder_document" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="folder_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="folder" name="fk_folder_document_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="folder_id" />
-    </foreign-key>
-    <index name="idx_folder_document_folder_id">
-      <index-column name="folder_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="product_associated_content" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="content_id" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <foreign-key foreignTable="product" name="fk_product_associated_content_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <foreign-key foreignTable="content" name="fk_product_associated_content_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <index name="idx_product_associated_content_product_id">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_product_associated_content_content_id">
-      <index-column name="content_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="category_associated_content" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="category_id" required="true" type="INTEGER" />
-    <column name="content_id" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <foreign-key foreignTable="category" name="fk_category_associated_content_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="category_id" />
-    </foreign-key>
-    <foreign-key foreignTable="content" name="fk_category_associated_content_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <index name="idx_category_associated_content_category_id">
-      <index-column name="category_id" />
-    </index>
-    <index name="idx_category_associated_content_content_id">
-      <index-column name="content_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="rewriting_url" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="url" required="true" size="255" type="VARCHAR" />
-    <column name="view" size="255" type="VARCHAR" />
-    <column name="view_id" size="255" type="VARCHAR" />
-    <column name="view_locale" size="255" type="VARCHAR" />
-    <column name="redirected" type="INTEGER" />
-    <foreign-key foreignTable="rewriting_url" name="fk_rewriting_url_redirected" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="redirected" />
-    </foreign-key>
-    <unique name="url_UNIQUE">
-      <unique-column name="url" />
-    </unique>
-    <index name="idx_view_id">
-      <index-column name="view_id" />
-    </index>
-    <index name="idx_rewriting_url_redirected">
-      <index-column name="redirected" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="rewriting_argument" namespace="Thelia\Model">
-    <column name="rewriting_url_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="parameter" primaryKey="true" required="true" size="255" type="VARCHAR" />
-    <column name="value" primaryKey="true" required="true" size="255" type="VARCHAR" />
-    <foreign-key foreignTable="rewriting_url" name="fk_rewriting_argument_rewirting_url_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="rewriting_url_id" />
-    </foreign-key>
-    <index name="idx_rewriting_argument_rewirting_url_id">
-      <index-column name="rewriting_url_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="template" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" size="255" type="VARCHAR" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="name" />
-    </behavior>
-    <behavior name="timestampable" />
-  </table>
-  <table name="module_image" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="module_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="module" name="fk_module_image_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="module_id" />
-    </foreign-key>
-    <index name="idx_module_image_module_id">
-      <index-column name="module_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="order_product_tax" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="order_product_id" required="true" type="INTEGER" />
-    <column name="title" required="true" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="amount" required="true" type="FLOAT" />
-    <column name="promo_amount" type="FLOAT" />
-    <foreign-key foreignTable="order_product" name="fk_ order_product_tax_order_product_id0" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="order_product_id" />
-    </foreign-key>
-    <index name="idx_ order_product_tax_order_product_id">
-      <index-column name="order_product_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="newsletter" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="email" required="true" size="255" type="VARCHAR" />
-    <column name="firstname" size="255" type="VARCHAR" />
-    <column name="lastname" size="255" type="VARCHAR" />
-    <column name="locale" size="5" type="VARCHAR" />
-    <unique name="email_UNIQUE">
-      <unique-column name="email" />
-    </unique>
-    <behavior name="timestampable" />
-  </table>
-  <table name="order_coupon" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="order_id" required="true" type="INTEGER" />
-    <column name="code" required="true" size="45" type="VARCHAR" />
-    <column name="type" required="true" size="255" type="VARCHAR" />
-    <column name="amount" required="true" type="FLOAT" />
-    <column name="title" required="true" size="255" type="VARCHAR" />
-    <column name="short_description" required="true" type="LONGVARCHAR" />
-    <column name="description" required="true" type="CLOB" />
-    <column name="expiration_date" required="true" type="TIMESTAMP" />
-    <column name="is_cumulative" required="true" type="BOOLEAN" />
-    <column name="is_removing_postage" required="true" type="BOOLEAN" />
-    <column name="is_available_on_special_offers" required="true" type="BOOLEAN" />
-    <column name="serialized_conditions" required="true" type="LONGVARCHAR" />
-    <foreign-key foreignTable="order" name="fk_order_coupon_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="order_id" />
-    </foreign-key>
-    <index name="idx_order_coupon_order_id">
-      <index-column name="order_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-</database>
+    <column name="visible" required="true" type="TINYINT" />
+    <column name="position" required="true" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="meta_title" size="255" type="VARCHAR" />
+    <column name="meta_description" type="LONGVARCHAR" />
+    <column name="meta_keywords" type="LONGVARCHAR" />
+    <index name="idx_parent">
+      <index-column name="parent" />
+    </index>
+    <index name="idx_parent_position">
+      <index-column name="parent" />
+      <index-column name="position" />
+    </index>
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum, meta_title, meta_description, meta_keywords" />
+    </behavior>
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
+    <behavior name="timestampable" />
+  </table>
+  <table name="product" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="tax_rule_id" type="INTEGER" />
+    <column name="ref" required="true" size="255" type="VARCHAR" />
+    <column defaultValue="0" name="visible" required="true" type="TINYINT" />
+    <column name="position" required="true" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="template_id" type="INTEGER" />
+    <column name="meta_title" size="255" type="VARCHAR" />
+    <column name="meta_description" type="LONGVARCHAR" />
+    <column name="meta_keywords" type="LONGVARCHAR" />
+    <foreign-key foreignTable="tax_rule" name="fk_product_tax_rule_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="tax_rule_id" />
+    </foreign-key>
+    <foreign-key foreignTable="template" name="fk_product_template">
+      <reference foreign="id" local="template_id" />
+    </foreign-key>
+    <unique name="ref_UNIQUE">
+      <unique-column name="ref" />
+    </unique>
+    <index name="idx_product_tax_rule_id">
+      <index-column name="tax_rule_id" />
+    </index>
+    <index name="fk_product_template_id">
+      <index-column name="template_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum, meta_title, meta_description, meta_keywords" />
+    </behavior>
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
+  </table>
+  <table isCrossRef="true" name="product_category" namespace="Thelia\Model">
+    <column name="product_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="category_id" primaryKey="true" type="INTEGER" />
+    <column name="default_category" type="BOOLEAN" />
+    <foreign-key foreignTable="product" name="fk_product_has_category_product1" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <foreign-key foreignTable="category" name="fk_product_has_category_category1" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="category_id" />
+    </foreign-key>
+    <index name="idx_product_has_category_category1">
+      <index-column name="category_id" />
+    </index>
+    <index name="idx_product_has_category_product1">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_product_has_category_default">
+      <index-column name="default_category" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="country" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="area_id" type="INTEGER" />
+    <column name="isocode" required="true" size="4" type="VARCHAR" />
+    <column name="isoalpha2" size="2" type="VARCHAR" />
+    <column name="isoalpha3" size="4" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column defaultValue="0" name="by_default" type="TINYINT" />
+    <column defaultValue="0" name="shop_country" required="true" type="BOOLEAN" />
+    <foreign-key foreignTable="area" name="fk_country_area_id" onDelete="SET NULL" onUpdate="RESTRICT">
+      <reference foreign="id" local="area_id" />
+    </foreign-key>
+    <index name="idx_country_area_id">
+      <index-column name="area_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="tax" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="type" required="true" size="255" type="VARCHAR" />
+    <column name="serialized_requirements" required="true" type="LONGVARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description" />
+    </behavior>
+  </table>
+  <table name="tax_rule" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column defaultValue="0" name="is_default" required="true" type="BOOLEAN" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description" />
+    </behavior>
+  </table>
+  <table name="tax_rule_country" namespace="Thelia\Model">
+    <column name="tax_rule_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="country_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="tax_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <foreign-key foreignTable="tax" name="fk_tax_rule_country_tax_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="tax_id" />
+    </foreign-key>
+    <foreign-key foreignTable="tax_rule" name="fk_tax_rule_country_tax_rule_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="tax_rule_id" />
+    </foreign-key>
+    <foreign-key foreignTable="country" name="fk_tax_rule_country_country_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="country_id" />
+    </foreign-key>
+    <index name="idx_tax_rule_country_tax_id">
+      <index-column name="tax_id" />
+    </index>
+    <index name="idx_tax_rule_country_tax_rule_id">
+      <index-column name="tax_rule_id" />
+    </index>
+    <index name="idx_tax_rule_country_country_id">
+      <index-column name="country_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="feature" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column defaultValue="0" name="visible" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="position" type="INTEGER" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="feature_av" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="feature_id" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="feature" name="fk_feature_av_feature_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="feature_id" />
+    </foreign-key>
+    <index name="idx_feature_av_feature_id">
+      <index-column name="feature_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="feature_product" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="feature_id" required="true" type="INTEGER" />
+    <column name="feature_av_id" type="INTEGER" />
+    <column name="free_text_value" type="LONGVARCHAR" />
+    <column name="position" type="INTEGER" />
+    <foreign-key foreignTable="product" name="fk_feature_prod_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <foreign-key foreignTable="feature" name="fk_feature_prod_feature_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="feature_id" />
+    </foreign-key>
+    <foreign-key foreignTable="feature_av" name="fk_feature_prod_feature_av_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="feature_av_id" />
+    </foreign-key>
+    <index name="idx_feature_prod_product_id">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_feature_prod_feature_id">
+      <index-column name="feature_id" />
+    </index>
+    <index name="idx_feature_prod_feature_av_id">
+      <index-column name="feature_av_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table isCrossRef="true" name="feature_template" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="feature_id" required="true" type="INTEGER" />
+    <column name="template_id" required="true" type="INTEGER" />
+    <column name="position" type="INTEGER" />
+    <foreign-key foreignTable="feature" name="fk_feature_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="feature_id" />
+    </foreign-key>
+    <foreign-key foreignTable="template" name="fk_feature_template">
+      <reference foreign="id" local="template_id" />
+    </foreign-key>
+    <index name="idx_feature_template_id">
+      <index-column name="feature_id" />
+    </index>
+    <index name="fk_feature_template_idx">
+      <index-column name="template_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="attribute" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="position" type="INTEGER" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="attribute_av" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="attribute_id" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="attribute" name="fk_attribute_av_attribute_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="attribute_id" />
+    </foreign-key>
+    <index name="idx_attribute_av_attribute_id">
+      <index-column name="attribute_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="attribute_combination" namespace="Thelia\Model">
+    <column name="attribute_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="attribute_av_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_sale_elements_id" primaryKey="true" required="true" type="INTEGER" />
+    <foreign-key foreignTable="attribute" name="fk_attribute_combination_attribute_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="attribute_id" />
+    </foreign-key>
+    <foreign-key foreignTable="attribute_av" name="fk_attribute_combination_attribute_av_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="attribute_av_id" />
+    </foreign-key>
+    <foreign-key foreignTable="product_sale_elements" name="fk_attribute_combination_product_sale_elements_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_sale_elements_id" />
+    </foreign-key>
+    <index name="idx_attribute_combination_attribute_id">
+      <index-column name="attribute_id" />
+    </index>
+    <index name="idx_attribute_combination_attribute_av_id">
+      <index-column name="attribute_av_id" />
+    </index>
+    <index name="idx_attribute_combination_product_sale_elements_id">
+      <index-column name="product_sale_elements_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="product_sale_elements" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="ref" required="true" size="255" type="VARCHAR" />
+    <column name="quantity" required="true" type="FLOAT" />
+    <column defaultValue="0" name="promo" type="TINYINT" />
+    <column defaultValue="0" name="newness" type="TINYINT" />
+    <column defaultValue="0" name="weight" type="FLOAT" />
+    <column defaultValue="0" name="is_default" type="BOOLEAN" />
+    <column name="ean_code" size="255" type="VARCHAR" />
+    <foreign-key foreignTable="product" name="fk_product_sale_element_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <index name="idx_product_sale_element_product_id">
+      <index-column name="product_id" />
+    </index>
+    <index name="ref">
+      <index-column name="ref" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table isCrossRef="true" name="attribute_template" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="attribute_id" required="true" type="INTEGER" />
+    <column name="template_id" required="true" type="INTEGER" />
+    <column name="position" type="INTEGER" />
+    <foreign-key foreignTable="attribute" name="fk_attribute_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="attribute_id" />
+    </foreign-key>
+    <foreign-key foreignTable="template" name="fk_attribute_template">
+      <reference foreign="id" local="template_id" />
+    </foreign-key>
+    <index name="idx_attribute_template_id">
+      <index-column name="attribute_id" />
+    </index>
+    <index name="fk_attribute_template_idx">
+      <index-column name="template_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="config" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" required="true" size="255" type="VARCHAR" />
+    <column name="value" required="true" type="LONGVARCHAR" />
+    <column defaultValue="1" name="secured" required="true" type="TINYINT" />
+    <column defaultValue="1" name="hidden" required="true" type="TINYINT" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <unique name="name_UNIQUE">
+      <unique-column name="name" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="customer" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="ref" required="true" size="50" type="VARCHAR" />
+    <column name="title_id" required="true" type="INTEGER" />
+    <column name="firstname" required="true" size="255" type="VARCHAR" />
+    <column name="lastname" required="true" size="255" type="VARCHAR" />
+    <column name="email" size="255" type="VARCHAR" />
+    <column name="password" size="255" type="VARCHAR" />
+    <column name="algo" size="128" type="VARCHAR" />
+    <column name="reseller" type="TINYINT" />
+    <column name="lang" size="10" type="VARCHAR" />
+    <column name="sponsor" size="50" type="VARCHAR" />
+    <column name="discount" type="FLOAT" />
+    <column name="remember_me_token" size="255" type="VARCHAR" />
+    <column name="remember_me_serial" size="255" type="VARCHAR" />
+    <foreign-key foreignTable="customer_title" name="fk_customer_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="title_id" />
+    </foreign-key>
+    <unique name="ref_UNIQUE">
+      <unique-column name="ref" />
+    </unique>
+    <index name="idx_customer_customer_title_id">
+      <index-column name="title_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="address" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="label" size="255" type="VARCHAR" />
+    <column name="customer_id" required="true" type="INTEGER" />
+    <column name="title_id" required="true" type="INTEGER" />
+    <column name="company" size="255" type="VARCHAR" />
+    <column name="firstname" required="true" size="255" type="VARCHAR" />
+    <column name="lastname" required="true" size="255" type="VARCHAR" />
+    <column name="address1" required="true" size="255" type="VARCHAR" />
+    <column name="address2" required="true" size="255" type="VARCHAR" />
+    <column name="address3" required="true" size="255" type="VARCHAR" />
+    <column name="zipcode" required="true" size="10" type="VARCHAR" />
+    <column name="city" required="true" size="255" type="VARCHAR" />
+    <column name="country_id" required="true" type="INTEGER" />
+    <column name="phone" size="20" type="VARCHAR" />
+    <column name="cellphone" size="20" type="VARCHAR" />
+    <column defaultValue="0" name="is_default" type="TINYINT" />
+    <foreign-key foreignTable="customer" name="fk_address_customer_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="customer_id" />
+    </foreign-key>
+    <foreign-key foreignTable="customer_title" name="fk_address_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="title_id" />
+    </foreign-key>
+    <foreign-key foreignTable="country" name="fk_address_country_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="country_id" />
+    </foreign-key>
+    <index name="idx_address_customer_id">
+      <index-column name="customer_id" />
+    </index>
+    <index name="idx_address_customer_title_id">
+      <index-column name="title_id" />
+    </index>
+    <index name="idx_address_country_id">
+      <index-column name="country_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="customer_title" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column defaultValue="0" name="by_default" required="true" type="INTEGER" />
+    <column name="position" required="true" size="45" type="VARCHAR" />
+    <column name="short" size="10" type="VARCHAR" />
+    <column name="long" size="45" type="VARCHAR" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="short, long" />
+    </behavior>
+  </table>
+  <table name="lang" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="title" size="100" type="VARCHAR" />
+    <column name="code" size="10" type="VARCHAR" />
+    <column name="locale" size="45" type="VARCHAR" />
+    <column name="url" size="255" type="VARCHAR" />
+    <column name="date_format" size="45" type="VARCHAR" />
+    <column name="time_format" size="45" type="VARCHAR" />
+    <column name="datetime_format" size="45" type="VARCHAR" />
+    <column name="decimal_separator" size="45" type="VARCHAR" />
+    <column name="thousands_separator" size="45" type="VARCHAR" />
+    <column name="decimals" size="45" type="VARCHAR" />
+    <column name="by_default" type="TINYINT" />
+    <column name="position" type="INTEGER" />
+    <behavior name="timestampable" />
+  </table>
+  <table name="folder" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="parent" required="true" type="INTEGER" />
+    <column name="visible" type="TINYINT" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="meta_title" size="255" type="VARCHAR" />
+    <column name="meta_description" type="LONGVARCHAR" />
+    <column name="meta_keywords" type="LONGVARCHAR" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum, meta_title, meta_description, meta_keywords" />
+    </behavior>
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
+  </table>
+  <table name="content" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="visible" type="TINYINT" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="meta_title" size="255" type="VARCHAR" />
+    <column name="meta_description" type="LONGVARCHAR" />
+    <column name="meta_keywords" type="LONGVARCHAR" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum, meta_title, meta_description, meta_keywords" />
+    </behavior>
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
+  </table>
+  <table name="product_image" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="product" name="fk_product_image_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <index name="idx_product_image_product_id">
+      <index-column name="product_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="product_document" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="product" name="fk_product_document_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <index name="idx_product_document_product_id">
+      <index-column name="product_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="order" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="ref" required="true" size="45" type="VARCHAR" />
+    <column name="customer_id" required="true" type="INTEGER" />
+    <column name="invoice_order_address_id" required="true" type="INTEGER" />
+    <column name="delivery_order_address_id" required="true" type="INTEGER" />
+    <column name="invoice_date" type="DATE" />
+    <column name="currency_id" required="true" type="INTEGER" />
+    <column name="currency_rate" required="true" type="FLOAT" />
+    <column description="transaction reference - usually use to identify a transaction with banking modules" name="transaction_ref" size="100" type="VARCHAR" />
+    <column description="delivery reference - usually use to identify a delivery progress on a distant delivery tracker website" name="delivery_ref" size="100" type="VARCHAR" />
+    <column description="the invoice reference" name="invoice_ref" size="100" type="VARCHAR" />
+    <column name="discount" type="FLOAT" />
+    <column name="postage" required="true" type="FLOAT" />
+    <column name="payment_module_id" required="true" type="INTEGER" />
+    <column name="delivery_module_id" required="true" type="INTEGER" />
+    <column name="status_id" required="true" type="INTEGER" />
+    <column name="lang_id" required="true" type="INTEGER" />
+    <foreign-key foreignTable="currency" name="fk_order_currency_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="currency_id" />
+    </foreign-key>
+    <foreign-key foreignTable="customer" name="fk_order_customer_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="customer_id" />
+    </foreign-key>
+    <foreign-key foreignTable="order_address" name="fk_order_invoice_order_address_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="invoice_order_address_id" />
+    </foreign-key>
+    <foreign-key foreignTable="order_address" name="fk_order_delivery_order_address_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="delivery_order_address_id" />
+    </foreign-key>
+    <foreign-key foreignTable="order_status" name="fk_order_status_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="status_id" />
+    </foreign-key>
+    <foreign-key foreignTable="module" name="fk_order_payment_module_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="payment_module_id" />
+    </foreign-key>
+    <foreign-key foreignTable="module" name="fk_order_delivery_module_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="delivery_module_id" />
+    </foreign-key>
+    <foreign-key foreignTable="lang" name="fk_order_lang_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="lang_id" />
+    </foreign-key>
+    <index name="idx_order_currency_id">
+      <index-column name="currency_id" />
+    </index>
+    <index name="idx_order_customer_id">
+      <index-column name="customer_id" />
+    </index>
+    <index name="idx_order_invoice_order_address_id">
+      <index-column name="invoice_order_address_id" />
+    </index>
+    <index name="idx_order_delivery_order_address_id">
+      <index-column name="delivery_order_address_id" />
+    </index>
+    <index name="idx_order_status_id">
+      <index-column name="status_id" />
+    </index>
+    <unique name="ref_UNIQUE">
+      <unique-column name="ref" />
+    </unique>
+    <index name="fk_order_payment_module_id_idx">
+      <index-column name="payment_module_id" />
+    </index>
+    <index name="fk_order_delivery_module_id_idx">
+      <index-column name="delivery_module_id" />
+    </index>
+    <index name="fk_order_lang_id_idx">
+      <index-column name="lang_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="currency" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" size="45" type="VARCHAR" />
+    <column name="code" size="45" type="VARCHAR" />
+    <column name="symbol" size="45" type="VARCHAR" />
+    <column name="rate" type="FLOAT" />
+    <column name="position" type="INTEGER" />
+    <column name="by_default" type="TINYINT" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="name" />
+    </behavior>
+  </table>
+  <table name="order_address" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="customer_title_id" type="INTEGER" />
+    <column name="company" size="255" type="VARCHAR" />
+    <column name="firstname" required="true" size="255" type="VARCHAR" />
+    <column name="lastname" required="true" size="255" type="VARCHAR" />
+    <column name="address1" required="true" size="255" type="VARCHAR" />
+    <column name="address2" size="255" type="VARCHAR" />
+    <column name="address3" size="255" type="VARCHAR" />
+    <column name="zipcode" required="true" size="10" type="VARCHAR" />
+    <column name="city" required="true" size="255" type="VARCHAR" />
+    <column name="phone" size="20" type="VARCHAR" />
+    <column name="country_id" required="true" type="INTEGER" />
+    <behavior name="timestampable" />
+  </table>
+  <table name="order_product" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="order_id" required="true" type="INTEGER" />
+    <column name="product_ref" required="true" size="255" type="VARCHAR" />
+    <column name="product_sale_elements_ref" required="true" size="255" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="quantity" required="true" type="FLOAT" />
+    <column name="price" required="true" type="FLOAT" />
+    <column name="promo_price" size="45" type="VARCHAR" />
+    <column name="was_new" required="true" type="TINYINT" />
+    <column name="was_in_promo" required="true" type="TINYINT" />
+    <column name="weight" size="45" type="VARCHAR" />
+    <column name="ean_code" size="255" type="VARCHAR" />
+    <column name="tax_rule_title" size="255" type="VARCHAR" />
+    <column name="tax_rule_description" type="CLOB" />
+    <column description="not managed yet" name="parent" type="INTEGER" />
+    <foreign-key foreignTable="order" name="fk_order_product_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="order_id" />
+    </foreign-key>
+    <index name="idx_order_product_order_id">
+      <index-column name="order_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="order_status" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" required="true" size="45" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="order_product_attribute_combination" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="order_product_id" required="true" type="INTEGER" />
+    <column name="attribute_title" required="true" size="255" type="VARCHAR" />
+    <column name="attribute_chapo" type="LONGVARCHAR" />
+    <column name="attribute_description" type="CLOB" />
+    <column name="attribute_postscriptum" type="LONGVARCHAR" />
+    <column name="attribute_av_title" required="true" size="255" type="VARCHAR" />
+    <column name="attribute_av_chapo" type="LONGVARCHAR" />
+    <column name="attribute_av_description" type="CLOB" />
+    <column name="attribute_av_postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="order_product" name="fk_order_product_attribute_combination_order_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="order_product_id" />
+    </foreign-key>
+    <index name="idx_order_product_attribute_combination_order_product_id">
+      <index-column name="order_product_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="module" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" required="true" size="55" type="VARCHAR" />
+    <column name="type" required="true" type="TINYINT" />
+    <column name="activate" type="TINYINT" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="full_namespace" size="255" type="VARCHAR" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table isCrossRef="true" name="accessory" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="accessory" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <foreign-key foreignTable="product" name="fk_accessory_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <foreign-key foreignTable="product" name="fk_accessory_accessory" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="accessory" />
+    </foreign-key>
+    <index name="idx_address_product_id">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_address_accessory">
+      <index-column name="accessory" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="area" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" required="true" size="100" type="VARCHAR" />
+    <column name="postage" type="FLOAT" />
+    <behavior name="timestampable" />
+  </table>
+  <table name="area_delivery_module" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="area_id" required="true" type="INTEGER" />
+    <column name="delivery_module_id" required="true" type="INTEGER" />
+    <foreign-key foreignTable="area" name="fk_area_delivery_module_area_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="area_id" />
+    </foreign-key>
+    <foreign-key foreignTable="module" name="idx_area_delivery_module_delivery_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="delivery_module_id" />
+    </foreign-key>
+    <index name="idx_area_delivery_module_area_id">
+      <index-column name="area_id" />
+    </index>
+    <index name="idx_area_delivery_module_delivery_module_id_idx">
+      <index-column name="delivery_module_id" />
+    </index>
+    <unique name="area_id_delivery_module_id_UNIQUE">
+      <unique-column name="area_id" />
+      <unique-column name="delivery_module_id" />
+    </unique>
+    <behavior name="timestampable" />
+  </table>
+  <table name="profile" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" required="true" size="30" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="resource" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" required="true" size="255" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="admin" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="profile_id" type="INTEGER" />
+    <column name="firstname" required="true" size="100" type="VARCHAR" />
+    <column name="lastname" required="true" size="100" type="VARCHAR" />
+    <column name="login" required="true" size="100" type="VARCHAR" />
+    <column name="password" required="true" size="128" type="VARCHAR" />
+    <column name="locale" required="true" size="45" type="VARCHAR" />
+    <column name="algo" size="128" type="VARCHAR" />
+    <column name="salt" size="128" type="VARCHAR" />
+    <column name="remember_me_token" size="255" type="VARCHAR" />
+    <column name="remember_me_serial" size="255" type="VARCHAR" />
+    <foreign-key foreignTable="profile" name="fk_admin_profile_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="profile_id" />
+    </foreign-key>
+    <index name="idx_admin_profile_id">
+      <index-column name="profile_id" />
+    </index>
+    <unique name="login_UNIQUE">
+      <unique-column name="login" />
+    </unique>
+    <behavior name="timestampable" />
+  </table>
+  <table isCrossRef="true" name="profile_resource" namespace="Thelia\Model">
+    <column name="profile_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="resource_id" primaryKey="true" required="true" type="INTEGER" />
+    <column defaultValue="0" name="access" required="true" type="INTEGER" />
+    <foreign-key foreignTable="profile" name="fk_profile_resource_profile_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="profile_id" />
+    </foreign-key>
+    <foreign-key foreignTable="resource" name="fk_profile_resource_resource_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="resource_id" />
+    </foreign-key>
+    <index name="idx_profile_resource_profile_id">
+      <index-column name="profile_id" />
+    </index>
+    <index name="idx_profile_resource_resource_id">
+      <index-column name="resource_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="profile_module" namespace="Thelia\Model">
+    <column name="profile_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="module_id" primaryKey="true" required="true" type="INTEGER" />
+    <column defaultValue="0" name="access" type="TINYINT" />
+    <foreign-key foreignTable="profile" name="fk_profile_module_profile_id" onDelete="CASCADE" onUpdate="CASCADE">
+      <reference foreign="id" local="profile_id" />
+    </foreign-key>
+    <foreign-key foreignTable="module" name="fk_profile_module_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="module_id" />
+    </foreign-key>
+    <index name="idx_profile_module_profile_id">
+      <index-column name="profile_id" />
+    </index>
+    <index name="idx_profile_module_module_id">
+      <index-column name="module_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="message" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" required="true" size="255" type="VARCHAR" />
+    <column name="secured" type="TINYINT" />
+    <column name="title" type="LONGVARCHAR" />
+    <column name="subject" type="LONGVARCHAR" />
+    <column name="text_message" type="CLOB" />
+    <column name="html_message" type="CLOB" />
+    <column name="text_layout_file_name" size="255" type="VARCHAR" />
+    <column name="text_template_file_name" size="255" type="VARCHAR" />
+    <column name="html_layout_file_name" size="255" type="VARCHAR" />
+    <column name="html_template_file_name" size="255" type="VARCHAR" />
+    <unique name="name_UNIQUE">
+      <unique-column name="name" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, subject, text_message, html_message" />
+    </behavior>
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
+  </table>
+  <table name="coupon" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" required="true" size="45" type="VARCHAR" />
+    <column name="type" required="true" size="255" type="VARCHAR" />
+    <column name="serialized_effects" required="true" type="CLOB" />
+    <column name="title" required="true" size="255" type="VARCHAR" />
+    <column name="is_enabled" required="true" type="BOOLEAN" />
+    <column name="short_description" required="true" type="LONGVARCHAR" />
+    <column name="description" required="true" type="CLOB" />
+    <column name="expiration_date" required="true" type="TIMESTAMP" />
+    <column name="max_usage" required="true" type="INTEGER" />
+    <column name="is_cumulative" required="true" type="BOOLEAN" />
+    <column name="is_removing_postage" required="true" type="BOOLEAN" />
+    <column name="is_available_on_special_offers" required="true" type="BOOLEAN" />
+    <column name="is_used" required="true" type="BOOLEAN" />
+    <column name="serialized_conditions" required="true" type="LONGVARCHAR" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
+    <index name="idx_is_enabled">
+      <index-column name="is_enabled" />
+    </index>
+    <index name="idx_is_used">
+      <index-column name="is_used" />
+    </index>
+    <index name="idx_type">
+      <index-column name="type" />
+    </index>
+    <index name="idx_expiration_date">
+      <index-column name="expiration_date" />
+    </index>
+    <index name="idx_is_cumulative">
+      <index-column name="is_cumulative" />
+    </index>
+    <index name="idx_is_removing_postage">
+      <index-column name="is_removing_postage" />
+    </index>
+    <index name="idx_max_usage">
+      <index-column name="max_usage" />
+    </index>
+    <index name="idx_is_available_on_special_offers">
+      <index-column name="is_available_on_special_offers" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, short_description, description" />
+    </behavior>
+    <behavior name="versionable" />
+  </table>
+  <table name="admin_log" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="admin_login" size="255" type="VARCHAR" />
+    <column name="admin_firstname" size="255" type="VARCHAR" />
+    <column name="admin_lastname" size="255" type="VARCHAR" />
+    <column name="resource" size="255" type="VARCHAR" />
+    <column name="action" size="255" type="VARCHAR" />
+    <column name="message" type="LONGVARCHAR" />
+    <column name="request" type="CLOB" />
+    <behavior name="timestampable" />
+  </table>
+  <table isCrossRef="true" name="content_folder" namespace="Thelia\Model">
+    <column name="content_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="folder_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="default_folder" type="BOOLEAN" />
+    <foreign-key foreignTable="content" name="fk_content_folder_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <foreign-key foreignTable="folder" name="fk_content_folder_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="folder_id" />
+    </foreign-key>
+    <index name="idx_content_folder_content_id">
+      <index-column name="content_id" />
+    </index>
+    <index name="idx_content_folder_folder_id">
+      <index-column name="folder_id" />
+    </index>
+    <index name="idx_content_folder_default">
+      <index-column name="default_folder" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="cart" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="token" size="255" type="VARCHAR" />
+    <column name="customer_id" type="INTEGER" />
+    <column name="address_delivery_id" type="INTEGER" />
+    <column name="address_invoice_id" type="INTEGER" />
+    <column name="currency_id" type="INTEGER" />
+    <column defaultValue="0" name="discount" type="FLOAT" />
+    <foreign-key foreignTable="customer" name="fk_cart_customer_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="customer_id" />
+    </foreign-key>
+    <foreign-key foreignTable="address" name="fk_cart_address_delivery_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="address_delivery_id" />
+    </foreign-key>
+    <foreign-key foreignTable="address" name="fk_cart_address_invoice_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="address_invoice_id" />
+    </foreign-key>
+    <foreign-key foreignTable="currency" name="fk_cart_currency_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="currency_id" />
+    </foreign-key>
+    <index name="idx_cart_customer_id">
+      <index-column name="customer_id" />
+    </index>
+    <index name="idx_cart_address_delivery_id">
+      <index-column name="address_delivery_id" />
+    </index>
+    <index name="idx_cart_address_invoice_id">
+      <index-column name="address_invoice_id" />
+    </index>
+    <index name="idx_cart_currency_id">
+      <index-column name="currency_id" />
+    </index>
+    <unique name="token_UNIQUE">
+      <unique-column name="token" />
+    </unique>
+    <behavior name="timestampable" />
+  </table>
+  <table name="cart_item" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="cart_id" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column defaultValue="1" name="quantity" type="FLOAT" />
+    <column name="product_sale_elements_id" required="true" type="INTEGER" />
+    <column name="price" type="FLOAT" />
+    <column name="promo_price" type="FLOAT" />
+    <column name="price_end_of_life" type="TIMESTAMP" />
+    <column name="promo" type="INTEGER" />
+    <foreign-key foreignTable="cart" name="fk_cart_item_cart_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="cart_id" />
+    </foreign-key>
+    <foreign-key foreignTable="product" name="fk_cart_item_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <foreign-key foreignTable="product_sale_elements" name="fk_cart_item_product_sale_elements_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_sale_elements_id" />
+    </foreign-key>
+    <index name="idx_cart_item_cart_id">
+      <index-column name="cart_id" />
+    </index>
+    <index name="idx_cart_item_product_id">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_cart_item_product_sale_elements_id">
+      <index-column name="product_sale_elements_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="product_price" namespace="Thelia\Model">
+    <column name="product_sale_elements_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="currency_id" primaryKey="true" required="true" type="INTEGER" />
+    <column defaultValue="0" name="price" required="true" type="FLOAT" />
+    <column defaultValue="0" name="promo_price" required="true" type="FLOAT" />
+    <column defaultValue="1" name="from_default_currency" required="true" type="BOOLEAN" />
+    <foreign-key foreignTable="product_sale_elements" name="fk_product_price_product_sale_elements_id" onDelete="CASCADE">
+      <reference foreign="id" local="product_sale_elements_id" />
+    </foreign-key>
+    <foreign-key foreignTable="currency" name="fk_product_price_currency_id" onDelete="CASCADE">
+      <reference foreign="id" local="currency_id" />
+    </foreign-key>
+    <index name="idx_product_price_product_sale_elements_id">
+      <index-column name="product_sale_elements_id" />
+    </index>
+    <index name="idx_product_price_currency_id">
+      <index-column name="currency_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="category_image" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="category_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="category" name="fk_category_image_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="category_id" />
+    </foreign-key>
+    <index name="idx_category_image_category_id">
+      <index-column name="category_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="folder_image" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="folder_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="folder" name="fk_folder_image_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="folder_id" />
+    </foreign-key>
+    <index name="idx_folder_image_folder_id">
+      <index-column name="folder_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="content_image" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="content_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="content" name="fk_content_image_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <index name="idx_content_image_content_id">
+      <index-column name="content_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="category_document" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="category_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="category" name="fk_catgory_document_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="category_id" />
+    </foreign-key>
+    <index name="idx_category_document_category_id">
+      <index-column name="category_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="content_document" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="content_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="content" name="fk_content_document_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <index name="idx_content_document_content_id">
+      <index-column name="content_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="folder_document" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="folder_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="folder" name="fk_folder_document_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="folder_id" />
+    </foreign-key>
+    <index name="idx_folder_document_folder_id">
+      <index-column name="folder_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="product_associated_content" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="content_id" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <foreign-key foreignTable="product" name="fk_product_associated_content_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <foreign-key foreignTable="content" name="fk_product_associated_content_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <index name="idx_product_associated_content_product_id">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_product_associated_content_content_id">
+      <index-column name="content_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="category_associated_content" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="category_id" required="true" type="INTEGER" />
+    <column name="content_id" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <foreign-key foreignTable="category" name="fk_category_associated_content_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="category_id" />
+    </foreign-key>
+    <foreign-key foreignTable="content" name="fk_category_associated_content_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <index name="idx_category_associated_content_category_id">
+      <index-column name="category_id" />
+    </index>
+    <index name="idx_category_associated_content_content_id">
+      <index-column name="content_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="rewriting_url" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="url" required="true" size="255" type="VARCHAR" />
+    <column name="view" size="255" type="VARCHAR" />
+    <column name="view_id" size="255" type="VARCHAR" />
+    <column name="view_locale" size="255" type="VARCHAR" />
+    <column name="redirected" type="INTEGER" />
+    <foreign-key foreignTable="rewriting_url" name="fk_rewriting_url_redirected" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="redirected" />
+    </foreign-key>
+    <unique name="url_UNIQUE">
+      <unique-column name="url" />
+    </unique>
+    <index name="idx_view_id">
+      <index-column name="view_id" />
+    </index>
+    <index name="idx_rewriting_url_redirected">
+      <index-column name="redirected" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="rewriting_argument" namespace="Thelia\Model">
+    <column name="rewriting_url_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="parameter" primaryKey="true" required="true" size="255" type="VARCHAR" />
+    <column name="value" primaryKey="true" required="true" size="255" type="VARCHAR" />
+    <foreign-key foreignTable="rewriting_url" name="fk_rewriting_argument_rewirting_url_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="rewriting_url_id" />
+    </foreign-key>
+    <index name="idx_rewriting_argument_rewirting_url_id">
+      <index-column name="rewriting_url_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="template" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" size="255" type="VARCHAR" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="name" />
+    </behavior>
+    <behavior name="timestampable" />
+  </table>
+  <table name="module_image" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="module_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="module" name="fk_module_image_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="module_id" />
+    </foreign-key>
+    <index name="idx_module_image_module_id">
+      <index-column name="module_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="order_product_tax" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="order_product_id" required="true" type="INTEGER" />
+    <column name="title" required="true" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="amount" required="true" type="FLOAT" />
+    <column name="promo_amount" type="FLOAT" />
+    <foreign-key foreignTable="order_product" name="fk_ order_product_tax_order_product_id0" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="order_product_id" />
+    </foreign-key>
+    <index name="idx_ order_product_tax_order_product_id">
+      <index-column name="order_product_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="newsletter" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="email" required="true" size="255" type="VARCHAR" />
+    <column name="firstname" size="255" type="VARCHAR" />
+    <column name="lastname" size="255" type="VARCHAR" />
+    <column name="locale" size="5" type="VARCHAR" />
+    <unique name="email_UNIQUE">
+      <unique-column name="email" />
+    </unique>
+    <behavior name="timestampable" />
+  </table>
+  <table name="order_coupon" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="order_id" required="true" type="INTEGER" />
+    <column name="code" required="true" size="45" type="VARCHAR" />
+    <column name="type" required="true" size="255" type="VARCHAR" />
+    <column name="amount" required="true" type="FLOAT" />
+    <column name="title" required="true" size="255" type="VARCHAR" />
+    <column name="short_description" required="true" type="LONGVARCHAR" />
+    <column name="description" required="true" type="CLOB" />
+    <column name="expiration_date" required="true" type="TIMESTAMP" />
+    <column name="is_cumulative" required="true" type="BOOLEAN" />
+    <column name="is_removing_postage" required="true" type="BOOLEAN" />
+    <column name="is_available_on_special_offers" required="true" type="BOOLEAN" />
+    <column name="serialized_conditions" required="true" type="LONGVARCHAR" />
+    <foreign-key foreignTable="order" name="fk_order_coupon_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="order_id" />
+    </foreign-key>
+    <index name="idx_order_coupon_order_id">
+      <index-column name="order_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+</database>
diff --git a/reset_install.bat b/reset_install.bat
index dc6d667e2..4deec3f46 100644
--- a/reset_install.bat
+++ b/reset_install.bat
@@ -2,7 +2,8 @@ echo off
 REM @author Guillaume MOREL
 REM v0.1
 
-echo [WARN] This script will reset this Thelia2 install
+echo [WARN] This script will reset this Thelia2 install, all data will be cleared.
+pause
 
 if exist local\config\database.yml (
 
@@ -40,10 +41,10 @@ if exist local\config\database.yml (
 
     echo [INFO] Admin user thelia2 with password thelia2 successfully created.
 
-    echo [INFO] Activating Delivery Module(s)
+    echo [INFO] Activating Delivery Module
     php Thelia module:activate Colissimo
 
-    echo "[INFO] Activating Payment Module(s)"
+    echo [INFO] Activating Payment Module
     php Thelia module:activate Cheque
 
     echo [SUCCESS] Reset done
diff --git a/templates/backOffice/default/I18n/en_US.php b/templates/backOffice/default/I18n/en_US.php
old mode 100644
new mode 100755
index 8663b8c48..241fa1299
--- a/templates/backOffice/default/I18n/en_US.php
+++ b/templates/backOffice/default/I18n/en_US.php
@@ -4,13 +4,19 @@ return array(
     ' (default)' => ' (default)',
     '&copy; Thelia 2013' => '&copy; Thelia 2013',
     '(edit)' => '(edit)',
-    '14.50' => '14.50',
+    '<a href="http://en.wikipedia.org/wiki/ISO_639-1_language_matrix" target="_other">Check the list</a> of ISO 639-1 codes' => '<a href="http://en.wikipedia.org/wiki/ISO_639-1_language_matrix" target="_other">Check the list</a> of ISO 639-1 codes',
     '<span id="number_of_generated_combinations">0</span> combinations' => '<span id="number_of_generated_combinations">0</span> combinations',
+    '<strong>Congratulations</strong>, all text is now translated !' => '<strong>Congratulations</strong>, all text is now translated !',
+    '<strong>Did not found any text to translate</strong>. It\'s probably normal. If not, please be sure to use Smarty\'s "intl" function in templates, or the Translator::trans() method in PHP files.' => '<strong>Did not found any text to translate</strong>. It\'s probably normal. If not, please be sure to use Smarty\'s "intl" function in templates, or the Translator::trans() method in PHP files.',
+    'A content could be attached to more than one folder. Select here the additional folders for this content.' => 'A content could be attached to more than one folder. Select here the additional folders for this content.',
+    'A product could be attached to more than one category. Select here the additional categories for this product.' => 'A product could be attached to more than one category. Select here the additional categories for this product.',
     'A short description, used when a summary or an introduction is required' => 'A short description, used when a summary or an introduction is required',
     'A short post-description information' => 'A short post-description information',
     'Aborted orders' => 'Aborted orders',
+    'Accessory title' => 'Accessory title',
     'Action' => 'Action',
     'Actions' => 'Actions',
+    'Activate this log destination' => 'Activate this log destination',
     'Add' => 'Add',
     'Add a new Customer' => 'Add a new Customer',
     'Add a new address' => 'Add a new address',
@@ -35,6 +41,7 @@ return array(
     'Add to all product templates' => 'Add to all product templates',
     'Additional Folders' => 'Additional Folders',
     'Additional address' => 'Additional address',
+    'Additional categories' => 'Additional categories',
     'Address' => 'Address',
     'Administration logs' => 'Administration logs',
     'Administration profiles' => 'Administration profiles',
@@ -43,7 +50,6 @@ return array(
     'Alpha code 2' => 'Alpha code 2',
     'Alpha code 3' => 'Alpha code 3',
     'Amount' => 'Amount',
-    'Amount :' => 'Amount :',
     'An error occured' => 'An error occured',
     'And' => 'And',
     'Application field' => 'Application field',
@@ -62,19 +68,28 @@ return array(
     'Average cart' => 'Average cart',
     'Back' => 'Back',
     'Back-office home' => 'Back-office home',
+    'Back-office templates' => 'Back-office templates',
+    'Back-office users' => 'Back-office users',
     'Browse' => 'Browse',
     'Browse files' => 'Browse files',
     'Browse this category' => 'Browse this category',
     'Browse this folder' => 'Browse this folder',
+    'Can\'t be cumulative' => 'Can\'t be cumulative',
+    'Can\'t load documents, please refresh this page.' => 'Can\'t load documents, please refresh this page.',
+    'Can\'t load images, please refresh this page.' => 'Can\'t load images, please refresh this page.',
+    'Can\'t reorder documents, please refresh this page.' => 'Can\'t reorder documents, please refresh this page.',
+    'Can\'t reorder images, please refresh this page.' => 'Can\'t reorder images, please refresh this page.',
     'Cancel' => 'Cancel',
     'Cancel changes and revert to original value' => 'Cancel changes and revert to original value',
     'Cancel this order' => 'Cancel this order',
-    'Cart' => 'Cart',
+    'Cart - Prices in %currency' => 'Cart - Prices in %currency',
     'Catalog' => 'Catalog',
     'Categories' => 'Categories',
     'Categories in %cat' => 'Categories in %cat',
     'Category created on %date_create. Last modification: %date_change' => 'Category created on %date_create. Last modification: %date_change',
     'Category title' => 'Category title',
+    'Cellular phone' => 'Cellular phone',
+    'Cellular phone number' => 'Cellular phone number',
     'Change this administrator' => 'Change this administrator',
     'Change this attribute' => 'Change this attribute',
     'Change this country' => 'Change this country',
@@ -85,12 +100,14 @@ return array(
     'Change this product attribute' => 'Change this product attribute',
     'Change this product feature' => 'Change this product feature',
     'Change this product template' => 'Change this product template',
+    'Change this profile' => 'Change this profile',
     'Change this shipping configuration' => 'Change this shipping configuration',
     'Change this shipping zone' => 'Change this shipping zone',
     'Change this tax' => 'Change this tax',
     'Change this tax rule' => 'Change this tax rule',
     'Change this template' => 'Change this template',
     'Change this variable' => 'Change this variable',
+    'Chapo' => 'Chapo',
     'Check this box if you want to add this attributes to all product templates' => 'Check this box if you want to add this attributes to all product templates',
     'Check this box if you want to add this features to all product templates' => 'Check this box if you want to add this features to all product templates',
     'Choose a country' => 'Choose a country',
@@ -105,14 +122,19 @@ return array(
     'Combination builder' => 'Combination builder',
     'Combination reference' => 'Combination reference',
     'Company' => 'Company',
+    'Condition type :' => 'Condition type :',
+    'Condition\'s category :' => 'Condition\'s category :',
     'Conditions' => 'Conditions',
     'Configuration' => 'Configuration',
     'Configuration mailing system' => 'Configuration mailing system',
+    'Configure' => 'Configure',
+    'Configure this module' => 'Configure this module',
     'Confirm' => 'Confirm',
     'Confirm changes' => 'Confirm changes',
     'Confirmation' => 'Confirmation',
     'Content title' => 'Content title',
     'Contents in %fold' => 'Contents in %fold',
+    'Copy source text in input field' => 'Copy source text in input field',
     'Countries' => 'Countries',
     'Countries that have the same tax rule' => 'Countries that have the same tax rule',
     'Country' => 'Country',
@@ -125,6 +147,7 @@ return array(
     'Coupons' => 'Coupons',
     'Coupons : ' => 'Coupons : ',
     'Create' => 'Create',
+    'Create a customer address' => 'Create a customer address',
     'Create a new administrator' => 'Create a new administrator',
     'Create a new attribute' => 'Create a new attribute',
     'Create a new attribute value' => 'Create a new attribute value',
@@ -178,18 +201,22 @@ return array(
     'Customer informations' => 'Customer informations',
     'Customers' => 'Customers',
     'Customers list' => 'Customers list',
+    'Cutomer Name' => 'Cutomer Name',
     'Dashboard' => 'Dashboard',
     'Date & Hour' => 'Date & Hour',
+    'Date of last order' => 'Date of last order',
     'Days before expiration' => 'Days before expiration',
     'Deactivate %title module' => 'Deactivate %title module',
     'Default' => 'Default',
     'Default address' => 'Default address',
+    'Define here this product\'s accessories' => 'Define here this product\'s accessories',
     'Delete' => 'Delete',
     'Delete a combination' => 'Delete a combination',
     'Delete a module' => 'Delete a module',
     'Delete a variable' => 'Delete a variable',
     'Delete address' => 'Delete address',
     'Delete administrator' => 'Delete administrator',
+    'Delete also module data' => 'Delete also module data',
     'Delete an order' => 'Delete an order',
     'Delete attribute' => 'Delete attribute',
     'Delete attribute value' => 'Delete attribute value',
@@ -209,6 +236,9 @@ return array(
     'Delete tax' => 'Delete tax',
     'Delete tax rule' => 'Delete tax rule',
     'Delete template' => 'Delete template',
+    'Delete this accessory' => 'Delete this accessory',
+    'Delete this administrator' => 'Delete this administrator',
+    'Delete this attribute' => 'Delete this attribute',
     'Delete this category and all its contents' => 'Delete this category and all its contents',
     'Delete this combination' => 'Delete this combination',
     'Delete this content' => 'Delete this content',
@@ -224,6 +254,7 @@ return array(
     'Delete this product attribute' => 'Delete this product attribute',
     'Delete this product feature' => 'Delete this product feature',
     'Delete this product template' => 'Delete this product template',
+    'Delete this profile' => 'Delete this profile',
     'Delete this shipping configuration' => 'Delete this shipping configuration',
     'Delete this tax' => 'Delete this tax',
     'Delete this tax rule' => 'Delete this tax rule',
@@ -234,6 +265,7 @@ return array(
     'Delivery module' => 'Delivery module',
     'Delivery modules' => 'Delivery modules',
     'Description' => 'Description',
+    'Destinations' => 'Destinations',
     'Details' => 'Details',
     'Disabled coupons' => 'Disabled coupons',
     'Discount' => 'Discount',
@@ -267,73 +299,113 @@ return array(
     'Do you really want to delete this variable ?' => 'Do you really want to delete this variable ?',
     'Do you really want to enable this element ?' => 'Do you really want to enable this element ?',
     'Do you really want to remove the content from this folder ?' => 'Do you really want to remove the content from this folder ?',
+    'Do you really want to remove the product from this category ?' => 'Do you really want to remove the product from this category ?',
+    'Do you really want to remove this accessory from the product ?' => 'Do you really want to remove this accessory from the product ?',
     'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.' => 'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.',
+    'Do you really want to remove this attribute from the template ?' => 'Do you really want to remove this attribute from the template ?',
     'Do you really want to remove this country ?' => 'Do you really want to remove this country ?',
     'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.' => 'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.',
     'Do you really want to remove this feature from the template ?' => 'Do you really want to remove this feature from the template ?',
     'Do you really want to remove this related content ?' => 'Do you really want to remove this related content ?',
+    'Do you really want to remove this related content from the product ?' => 'Do you really want to remove this related content from the product ?',
     'Do you really want to remove this zone ?' => 'Do you really want to remove this zone ?',
+    'Do you really want to set this coupon available to everyone ?' => 'Do you really want to set this coupon available to everyone ?',
     'Do you really want to use this address by default ?' => 'Do you really want to use this address by default ?',
+    'Document' => 'Document',
+    'Document informations' => 'Document informations',
     'Documents' => 'Documents',
+    'Don\'t repeat keywords over and over in a row. Rather, put in keyword phrases.' => 'Don\'t repeat keywords over and over in a row. Rather, put in keyword phrases.',
     'Download invoice as PDF' => 'Download invoice as PDF',
     'Download purchase order as PDF' => 'Download purchase order as PDF',
     'Drop files to upload' => 'Drop files to upload',
     'Drop tax here to create a tax group' => 'Drop tax here to create a tax group',
     'Drop tax here to delete from group' => 'Drop tax here to delete from group',
+    'E-mail templates' => 'E-mail templates',
     'EAN Code' => 'EAN Code',
     'Ecotax is a tax wich add a defined amount (throug a product feature) to the product price.' => 'Ecotax is a tax wich add a defined amount (throug a product feature) to the product price.',
     'Edit' => 'Edit',
     'Edit a country' => 'Edit a country',
     'Edit a currency' => 'Edit a currency',
     'Edit a customer' => 'Edit a customer',
+    'Edit a customer address' => 'Edit a customer address',
+    'Edit a document' => 'Edit a document',
     'Edit a feature' => 'Edit a feature',
     'Edit a language' => 'Edit a language',
     'Edit a mailing template' => 'Edit a mailing template',
+    'Edit a module' => 'Edit a module',
+    'Edit a profile' => 'Edit a profile',
     'Edit a shipping configuration' => 'Edit a shipping configuration',
     'Edit a shipping zone' => 'Edit a shipping zone',
     'Edit a system variable' => 'Edit a system variable',
     'Edit a tax' => 'Edit a tax',
     'Edit a tax rule' => 'Edit a tax rule',
+    'Edit a template' => 'Edit a template',
     'Edit an attribute' => 'Edit an attribute',
+    'Edit an image' => 'Edit an image',
     'Edit an order' => 'Edit an order',
+    'Edit attribute "%name"' => 'Edit attribute "%name"',
     'Edit category' => 'Edit category',
     'Edit category %title' => 'Edit category %title',
     'Edit content' => 'Edit content',
     'Edit content %title' => 'Edit content %title',
+    'Edit country "%name"' => 'Edit country "%name"',
+    'Edit currency "%name"' => 'Edit currency "%name"',
+    'Edit customer %firstname %lastname' => 'Edit customer %firstname %lastname',
     'Edit delivery address' => 'Edit delivery address',
+    'Edit document "%name"' => 'Edit document "%name"',
+    'Edit feature "%name"' => 'Edit feature "%name"',
+    'Edit folder' => 'Edit folder',
+    'Edit folder %title' => 'Edit folder %title',
+    'Edit image "%name"' => 'Edit image "%name"',
     'Edit information in %lng' => 'Edit information in %lng',
     'Edit invoice address' => 'Edit invoice address',
+    'Edit mailing template "%name"' => 'Edit mailing template "%name"',
     'Edit next category' => 'Edit next category',
+    'Edit next content' => 'Edit next content',
+    'Edit next folder' => 'Edit next folder',
+    'Edit next product' => 'Edit next product',
     'Edit order address' => 'Edit order address',
+    'Edit previous category' => 'Edit previous category',
+    'Edit previous content' => 'Edit previous content',
+    'Edit previous folder' => 'Edit previous folder',
+    'Edit previous product' => 'Edit previous product',
     'Edit prices in %curr' => 'Edit prices in %curr',
     'Edit product' => 'Edit product',
     'Edit product %title' => 'Edit product %title',
     'Edit shipping configuration %title' => 'Edit shipping configuration %title',
     'Edit shipping zone %title' => 'Edit shipping zone %title',
     'Edit tax rule taxes' => 'Edit tax rule taxes',
+    'Edit template "%name"' => 'Edit template "%name"',
     'Edit this address' => 'Edit this address',
     'Edit this category' => 'Edit this category',
     'Edit this content' => 'Edit this content',
     'Edit this customer' => 'Edit this customer',
     'Edit this folder' => 'Edit this folder',
-    'Edit this language' => 'Edit this language',
     'Edit this module' => 'Edit this module',
     'Edit this order' => 'Edit this order',
     'Edit this product' => 'Edit this product',
+    'Edit variable %name' => 'Edit variable %name',
     'Editing %cat' => 'Editing %cat',
+    'Editing %fold' => 'Editing %fold',
     'Editing %title' => 'Editing %title',
     'Editing attribute "%name"' => 'Editing attribute "%name"',
     'Editing country "%name"' => 'Editing country "%name"',
     'Editing currency "%name"' => 'Editing currency "%name"',
     'Editing customer "%name"' => 'Editing customer "%name"',
+    'Editing document "%name"' => 'Editing document "%name"',
     'Editing feature "%name"' => 'Editing feature "%name"',
+    'Editing image "%name"' => 'Editing image "%name"',
     'Editing mailing template "%name"' => 'Editing mailing template "%name"',
+    'Editing module' => 'Editing module',
+    'Editing profile' => 'Editing profile',
     'Editing shipping configuration "%name"' => 'Editing shipping configuration "%name"',
     'Editing shipping zone "%name"' => 'Editing shipping zone "%name"',
     'Editing tax' => 'Editing tax',
     'Editing tax rule' => 'Editing tax rule',
+    'Editing template "%name"' => 'Editing template "%name"',
     'Editing variable "%name"' => 'Editing variable "%name"',
     'Email address' => 'Email address',
+    'Email used when you send an email to your customers (Order confirmations, etc).' => 'Email used when you send an email to your customers (Order confirmations, etc).',
     'Enable remote SMTP use : ' => 'Enable remote SMTP use : ',
     'Enable/Disable' => 'Enable/Disable',
     'Enabled coupons' => 'Enabled coupons',
@@ -341,22 +413,33 @@ return array(
     'Encryption :' => 'Encryption :',
     'Enter here all possible attribute values.' => 'Enter here all possible attribute values.',
     'Enter here all possible feature values. To get a free text feature in product forms, don\'t add any value.' => 'Enter here all possible feature values. To get a free text feature in product forms, don\'t add any value.',
+    'Enter here the attribute name in the default language (%language_name)' => 'Enter here the attribute name in the default language (%language_name)',
     'Enter here the category name in the default language (%title)' => 'Enter here the category name in the default language (%title)',
     'Enter here the content name in the default language (%title)' => 'Enter here the content name in the default language (%title)',
+    'Enter here the currency name in the default language (%title)' => 'Enter here the currency name in the default language (%title)',
+    'Enter here the feature name in the default language (%title)' => 'Enter here the feature name in the default language (%title)',
     'Enter here the feature value as free text' => 'Enter here the feature value as free text',
     'Enter here the folder name in the default language (%title)' => 'Enter here the folder name in the default language (%title)',
+    'Enter here the mailing template purpose in the default language (%title)' => 'Enter here the mailing template purpose in the default language (%title)',
     'Enter here the product name in the default language (%title)' => 'Enter here the product name in the default language (%title)',
     'Enter here the product price in the default currency (%title)' => 'Enter here the product price in the default currency (%title)',
     'Enter here the product reference' => 'Enter here the product reference',
     'Enter here the product weight, in Kilogrammes' => 'Enter here the product weight, in Kilogrammes',
+    'Enter here the template name in the default language (%title)' => 'Enter here the template name in the default language (%title)',
+    'Enter here the value in the current edit language (%language_name)' => 'Enter here the value in the current edit language (%language_name)',
+    'Enter here the value in the current edit language (%title)' => 'Enter here the value in the current edit language (%title)',
+    'Enter new accessory position' => 'Enter new accessory position',
     'Enter new attribute position' => 'Enter new attribute position',
     'Enter new category position' => 'Enter new category position',
     'Enter new content position' => 'Enter new content position',
     'Enter new currency position' => 'Enter new currency position',
     'Enter new feature position' => 'Enter new feature position',
     'Enter new folder position' => 'Enter new folder position',
+    'Enter new module position' => 'Enter new module position',
     'Enter new product position' => 'Enter new product position',
     'Enter new value position' => 'Enter new value position',
+    'Enter one or more IP V4 addresses separated by ";". Leave empty to display logs for all IP addresses' => 'Enter one or more IP V4 addresses separated by ";". Leave empty to display logs for all IP addresses',
+    'Enter one or more file names without path separated by ";". Use "!" before a file name to exclude it. Use "*" to activate logs for all files.' => 'Enter one or more file names without path separated by ";". Use "!" before a file name to exclude it. Use "*" to activate logs for all files.',
     'Error' => 'Error',
     'Example :' => 'Example :',
     'Existing combinations will be deleted. Do you want to continue ?' => 'Existing combinations will be deleted. Do you want to continue ?',
@@ -364,6 +447,7 @@ return array(
     'Expiration date :' => 'Expiration date :',
     'Failed to get converted prices. Please try again.' => 'Failed to get converted prices. Please try again.',
     'Failed to get prices. Please try again.' => 'Failed to get prices. Please try again.',
+    'Fax number' => 'Fax number',
     'Feature Name' => 'Feature Name',
     'Feature information' => 'Feature information',
     'Feature title' => 'Feature title',
@@ -371,7 +455,11 @@ return array(
     'Feature value for this product' => 'Feature value for this product',
     'Feature values' => 'Feature values',
     'Features' => 'Features',
+    'File' => 'File',
+    'File names' => 'File names',
     'Files manager' => 'Files manager',
+    'First Name' => 'First Name',
+    'First name' => 'First name',
     'First orders' => 'First orders',
     'FirstName' => 'FirstName',
     'Firstname' => 'Firstname',
@@ -382,32 +470,45 @@ return array(
     'French 19.6% VAT is a tax which add a 19.6% tax to the product price.' => 'French 19.6% VAT is a tax which add a 19.6% tax to the product price.',
     'French 19.6% VAT with ecotax is the applicance of the ecotax (on the product price) then the applicance of the 19.6% tax (on the product price + the ecotax amount).' => 'French 19.6% VAT with ecotax is the applicance of the ecotax (on the product price) then the applicance of the 19.6% tax (on the product price + the ecotax amount).',
     'From' => 'From',
+    'Front-office templates' => 'Front-office templates',
     'General' => 'General',
+    'General configuration' => 'General configuration',
     'General description' => 'General description',
     'Go to administration home' => 'Go to administration home',
     'H:i:s' => 'H:i:s',
+    'HTML version of this message' => 'HTML version of this message',
     'Home' => 'Home',
     'Host' => 'Host',
     'Host :' => 'Host :',
     'ID' => 'ID',
+    'IP Addresses' => 'IP Addresses',
     'ISO 4217 Code' => 'ISO 4217 Code',
     'ISO 4217 code' => 'ISO 4217 code',
     'ISO 639 Code' => 'ISO 639 Code',
     'ISO Code' => 'ISO Code',
     'If a translation is missing or incomplete :' => 'If a translation is missing or incomplete :',
+    'If yes, redirections through Redirect::exec() will be displayed as links' => 'If yes, redirections through Redirect::exec() will be displayed as links',
+    'Il seems that this string contains a Smarty variable (&#36;). If \'s the case, it cannot be transleted properly.' => 'Il seems that this string contains a Smarty variable (&#36;). If \'s the case, it cannot be transleted properly.',
+    'Image' => 'Image',
+    'Image information' => 'Image information',
     'Images' => 'Images',
     'Impossible to change default country. Please contact your administrator or try later' => 'Impossible to change default country. Please contact your administrator or try later',
     'Impossible to change default languages. Please contact your administrator or try later' => 'Impossible to change default languages. Please contact your administrator or try later',
     'In order to manges your shop taxes you can manage' => 'In order to manges your shop taxes you can manage',
+    'In page' => 'In page',
+    'In pages:' => 'In pages:',
+    'Install a new module' => 'Install a new module',
     'Invoice and Delivery' => 'Invoice and Delivery',
     'Invoice date' => 'Invoice date',
     'Invoice informations' => 'Invoice informations',
     'Invoice reference' => 'Invoice reference',
     'Is available on special offers' => 'Is available on special offers',
     'Is cumulative' => 'Is cumulative',
+    'Is disabled' => 'Is disabled',
     'Is enabled' => 'Is enabled',
     'Is removing postage' => 'Is removing postage',
     'Is unlimited' => 'Is unlimited',
+    'Keep the most important part of your description in the first 150-160 characters.' => 'Keep the most important part of your description in the first 150-160 characters.',
     'Kg' => 'Kg',
     'Label' => 'Label',
     'Language name' => 'Language name',
@@ -415,13 +516,19 @@ return array(
     'Languages' => 'Languages',
     'Languages &amp; URLs' => 'Languages &amp; URLs',
     'Languages management' => 'Languages management',
+    'Last Name' => 'Last Name',
+    'Last name' => 'Last name',
+    'Last order amount' => 'Last order amount',
     'LastName' => 'LastName',
     'Lastname' => 'Lastname',
     'Latest version available' => 'Latest version available',
     'Leave empty to keep current password' => 'Leave empty to keep current password',
     'Lire la suite' => 'Lire la suite',
     'List' => 'List',
+    'Loading Thelia lastest news...' => 'Loading Thelia lastest news...',
     'Locale' => 'Locale',
+    'Log lines format' => 'Log lines format',
+    'Log lines header format. You may use the following variables: ' => 'Log lines header format. You may use the following variables: ',
     'Login' => 'Login',
     'Logout' => 'Logout',
     'Long description :' => 'Long description :',
@@ -429,11 +536,20 @@ return array(
     'Mailing template name' => 'Mailing template name',
     'Mailing template purpose' => 'Mailing template purpose',
     'Mailing templates' => 'Mailing templates',
+    'Make sure it uses keywords found within the page itself.' => 'Make sure it uses keywords found within the page itself.',
+    'Make sure that your title is clear, and contains many of the keywords within the page itself.' => 'Make sure that your title is clear, and contains many of the keywords within the page itself.',
+    'Manage module rights' => 'Manage module rights',
+    'Manage resource rights' => 'Manage resource rights',
     'Manage taxes' => 'Manage taxes',
     'Manage the tax rule taxes appliance order' => 'Manage the tax rule taxes appliance order',
     'Max usage :' => 'Max usage :',
     'May be cumulative' => 'May be cumulative',
     'Message created on %date_create. Last modification: %date_change' => 'Message created on %date_create. Last modification: %date_change',
+    'Message level' => 'Message level',
+    'Messages which have a level greater or equal to the selected level will be added to the log destinations. ' => 'Messages which have a level greater or equal to the selected level will be added to the log destinations. ',
+    'Module' => 'Module',
+    'Module access rights' => 'Module access rights',
+    'Module created on %date_create. Last modification: %date_change' => 'Module created on %date_create. Last modification: %date_change',
     'Modules' => 'Modules',
     'More information about ISO 4217' => 'More information about ISO 4217',
     'NONE' => 'NONE',
@@ -445,7 +561,9 @@ return array(
     'No Folders found' => 'No Folders found',
     'No area defined with this id' => 'No area defined with this id',
     'No available content in this folder' => 'No available content in this folder',
+    'No available product in this category' => 'No available product in this category',
     'No available value for this attribute' => 'No available value for this attribute',
+    'No categories found' => 'No categories found',
     'No country has been created yet. Click the + button to create one.' => 'No country has been created yet. Click the + button to create one.',
     'No currency has been created yet. Click the + button to create one.' => 'No currency has been created yet. Click the + button to create one.',
     'No folders found' => 'No folders found',
@@ -460,13 +578,22 @@ return array(
     'Online' => 'Online',
     'Online products' => 'Online products',
     'Oops! An Error Occurred' => 'Oops! An Error Occurred',
+    'Or' => 'Or',
+    'Order #' => 'Order #',
+    'Order %ref' => 'Order %ref',
     'Order n°' => 'Order n°',
+    'Order status:' => 'Order status:',
     'Ordered products' => 'Ordered products',
     'Orders' => 'Orders',
+    'Originating file line number ' => 'Originating file line number ',
+    'Originating file name' => 'Originating file name',
+    'Originating function name ' => 'Originating function name ',
     'Other addresses' => 'Other addresses',
     'Overall sales' => 'Overall sales',
+    'PDF templates' => 'PDF templates',
     'PDF | Invoice' => 'PDF | Invoice',
     'PDF | Purchase order' => 'PDF | Purchase order',
+    'Page not found' => 'Page not found',
     'Parameters' => 'Parameters',
     'Password' => 'Password',
     'Password :' => 'Password :',
@@ -475,33 +602,48 @@ return array(
     'Payment modules' => 'Payment modules',
     'Period' => 'Period',
     'Phone' => 'Phone',
+    'Phone number' => 'Phone number',
     'Please retry' => 'Please retry',
     'Please save your Coupon in oder to affect it some conditions' => 'Please save your Coupon in oder to affect it some conditions',
     'Please select a condition category' => 'Please select a condition category',
     'Please select a coupon type' => 'Please select a coupon type',
     'Please select another condition' => 'Please select another condition',
+    'Please select items to translate' => 'Please select items to translate',
+    'Please select the B.O. template to translate' => 'Please select the B.O. template to translate',
+    'Please select the E-mail template to translate' => 'Please select the E-mail template to translate',
+    'Please select the F.O. template to translate' => 'Please select the F.O. template to translate',
+    'Please select the PDF template to translate' => 'Please select the PDF template to translate',
+    'Please select the module to translate' => 'Please select the module to translate',
     'Please wait, loading' => 'Please wait, loading',
     'Port' => 'Port',
     'Port :' => 'Port :',
     'Position' => 'Position',
+    'Post Scriptum' => 'Post Scriptum',
     'Postage' => 'Postage',
     'Postscriptum' => 'Postscriptum',
+    'Preview' => 'Preview',
     'Preview category page' => 'Preview category page',
     'Preview folder page' => 'Preview folder page',
     'Preview product page' => 'Preview product page',
     'Previous month sales' => 'Previous month sales',
     'Previous year sales' => 'Previous year sales',
+    'Price' => 'Price',
     'Price excl. taxes' => 'Price excl. taxes',
+    'Price incl. taxes' => 'Price incl. taxes',
     'Price<br />w/ taxes (%currency)' => 'Price<br />w/ taxes (%currency)',
     'Price<br />w/o taxes (%currency)' => 'Price<br />w/o taxes (%currency)',
+    'Pricing' => 'Pricing',
     'Product' => 'Product',
     'Product Attributes' => 'Product Attributes',
+    'Product EAN Code' => 'Product EAN Code',
     'Product Features' => 'Product Features',
+    'Product accessories' => 'Product accessories',
     'Product attributes' => 'Product attributes',
     'Product catalog configuration' => 'Product catalog configuration',
     'Product created on %date_create. Last modification: %date_change' => 'Product created on %date_create. Last modification: %date_change',
     'Product features' => 'Product features',
     'Product price' => 'Product price',
+    'Product price including taxes' => 'Product price including taxes',
     'Product templates' => 'Product templates',
     'Product title' => 'Product title',
     'Product weight' => 'Product weight',
@@ -510,28 +652,41 @@ return array(
     'Profil' => 'Profile',
     'Profile' => 'Profile',
     'Profile code' => 'Profile code',
+    'Profile created on %date_create. Last modification: %date_change' => 'Profile created on %date_create. Last modification: %date_change',
     'Profiles' => 'Profiles',
+    'Promotion' => 'Promotion',
+    'Published by OpenStudio' => 'Published by OpenStudio',
     'Purpose' => 'Purpose',
     'Quantity' => 'Quantity',
     'Quickly create combinations using the combination builder' => 'Quickly create combinations using the combination builder',
     'Rate' => 'Rate',
     'Rate from Euro' => 'Rate from Euro',
     'Rate in &euro;' => 'Rate in &euro;',
+    'Read the documentation of this module' => 'Read the documentation of this module',
     'Reference' => 'Reference',
+    'Registration date' => 'Registration date',
     'Related content' => 'Related content',
+    'Remove an accessory' => 'Remove an accessory',
     'Remove associated folder' => 'Remove associated folder',
+    'Remove attribute' => 'Remove attribute',
     'Remove country' => 'Remove country',
     'Remove feature' => 'Remove feature',
     'Remove from all product templates' => 'Remove from all product templates',
+    'Remove from category' => 'Remove from category',
     'Remove related content' => 'Remove related content',
     'Remove selected values' => 'Remove selected values',
     'Remove the product from this category' => 'Remove the product from this category',
     'Remove this attribute from all product templates' => 'Remove this attribute from all product templates',
     'Remove this feature from all product templates' => 'Remove this feature from all product templates',
     'Remove zone' => 'Remove zone',
+    'Resource' => 'Resource',
+    'Resource access rights' => 'Resource access rights',
     'Resources' => 'Resources',
     'Rewritten URL' => 'Rewritten URL',
+    'Rights' => 'Rights',
+    'SEO' => 'SEO',
     'Sale' => 'Sale',
+    'Sale price incl. taxes' => 'Sale price incl. taxes',
     'Sale price<br />w/ taxes (%currency)' => 'Sale price<br />w/ taxes (%currency)',
     'Sale price<br />w/o taxes (%currency)' => 'Sale price<br />w/o taxes (%currency)',
     'Sales' => 'Sales',
@@ -541,16 +696,24 @@ return array(
     'Save and close' => 'Save and close',
     'Save chages' => 'Save chages',
     'Save changes' => 'Save changes',
+    'Save this address' => 'Save this address',
     'Save this condition' => 'Save this condition',
     'Save your modifications' => 'Save your modifications',
     'Search' => 'Search',
+    'Select a category and click (+) to add it to the additional category list' => 'Select a category and click (+) to add it to the additional category list',
+    'Select a category to get its products' => 'Select a category to get its products',
+    'Select a category...' => 'Select a category...',
     'Select a content and click (+) to add it to this category' => 'Select a content and click (+) to add it to this category',
+    'Select a content and click (+) to add it to this product' => 'Select a content and click (+) to add it to this product',
     'Select a folder and click (+) to add it to the additional folder list' => 'Select a folder and click (+) to add it to the additional folder list',
     'Select a folder content...' => 'Select a folder content...',
     'Select a folder to get its content' => 'Select a folder to get its content',
     'Select a folder...' => 'Select a folder...',
+    'Select a product and click (+) to add it as an accessory' => 'Select a product and click (+) to add it as an accessory',
+    'Select a product...' => 'Select a product...',
     'Select a tax tule' => 'Select a tax tule',
     'Select a value click (+) to add it to the combination' => 'Select a value click (+) to add it to the combination',
+    'Select an attribute and click (+) to add it to this template' => 'Select an attribute and click (+) to add it to this template',
     'Select an attribute and click (+) to view available values' => 'Select an attribute and click (+) to view available values',
     'Select an attribute value...' => 'Select an attribute value...',
     'Select an attribute...' => 'Select an attribute...',
@@ -558,8 +721,15 @@ return array(
     'Select an feature...' => 'Select an feature...',
     'Select attribute values to combine. You may enter a default value for some of the fields of the generated combinations.' => 'Select attribute values to combine. You may enter a default value for some of the fields of the generated combinations.',
     'Select here the tax applicable to this product' => 'Select here the tax applicable to this product',
+    'Select the E-mail template you want to translate' => 'Select the E-mail template you want to translate',
+    'Select the PDF template you want to translate' => 'Select the PDF template you want to translate',
+    'Select the back-office template you want to translate' => 'Select the back-office template you want to translate',
+    'Select the front-office template you want to translate' => 'Select the front-office template you want to translate',
+    'Select the module you want to translate' => 'Select the module you want to translate',
+    'Select which items you want to translate' => 'Select which items you want to translate',
     'Send a mail to this customer' => 'Send a mail to this customer',
     'Send files' => 'Send files',
+    'Sequential number of log line' => 'Sequential number of log line',
     'Set as default tax rule' => 'Set as default tax rule',
     'Shipping configuration' => 'Shipping configuration',
     'Shipping configuration name' => 'Shipping configuration name',
@@ -570,13 +740,31 @@ return array(
     'Short description' => 'Short description',
     'Short description :' => 'Short description :',
     'Show logs' => 'Show logs',
+    'Some of your translations are not saved. Continue anyway ?' => 'Some of your translations are not saved. Continue anyway ?',
+    'Sorry, attribute ID=%id was not found.' => 'Sorry, attribute ID=%id was not found.',
+    'Sorry, country ID=%id was not found.' => 'Sorry, country ID=%id was not found.',
+    'Sorry, currency ID=%id was not found.' => 'Sorry, currency ID=%id was not found.',
+    'Sorry, customer ID=%id was not found.' => 'Sorry, customer ID=%id was not found.',
+    'Sorry, document ID=%id was not found.' => 'Sorry, document ID=%id was not found.',
+    'Sorry, feature ID=%id was not found.' => 'Sorry, feature ID=%id was not found.',
+    'Sorry, image ID=%id was not found.' => 'Sorry, image ID=%id was not found.',
+    'Sorry, message ID=%id was not found.' => 'Sorry, message ID=%id was not found.',
+    'Sorry, template ID=%id was not found.' => 'Sorry, template ID=%id was not found.',
+    'Sorry, variable ID=%id was not found.' => 'Sorry, variable ID=%id was not found.',
     'Source IP' => 'Source IP',
     'Source IP :' => 'Source IP :',
     'Status' => 'Status',
+    'Stock' => 'Stock',
+    'Store' => 'Store',
+    'Store Business Identification Number (SIRET, etc).' => 'Store Business Identification Number (SIRET, etc).',
+    'Store address' => 'Store address',
+    'Store configuration' => 'Store configuration',
     'Street address' => 'Street address',
     'Subject' => 'Subject',
     'Superadministrator' => 'Superadministrator',
     'Symbol' => 'Symbol',
+    'System Logs' => 'System Logs',
+    'System Logs configuration' => 'System Logs configuration',
     'System logs' => 'System logs',
     'System parameters' => 'System parameters',
     'System variables' => 'System variables',
@@ -584,15 +772,27 @@ return array(
     'Tax created on %date_create. Last modification: %date_change' => 'Tax created on %date_create. Last modification: %date_change',
     'Tax rule created on %date_create. Last modification: %date_change' => 'Tax rule created on %date_create. Last modification: %date_change',
     'Tax rule taxes will be update for the following countries :' => 'Tax rule taxes will be update for the following countries :',
+    'Tax rules' => 'Tax rules',
     'Tax rules are combination of different taxes.' => 'Tax rules are combination of different taxes.',
     'Taxed total' => 'Taxed total',
     'Taxes' => 'Taxes',
+    'Taxes define the amount of money which is added to a bought product.' => 'Taxes define the amount of money which is added to a bought product.',
     'Taxes rules' => 'Taxes rules',
+    'Template name' => 'Template name',
     'Template title' => 'Template title',
+    'Templates' => 'Templates',
+    'Text version of this message' => 'Text version of this message',
+    'The HTML TITLE element is the most important element on your web page.' => 'The HTML TITLE element is the most important element on your web page.',
+    'The default pricing is used when no combination is defined.' => 'The default pricing is used when no combination is defined.',
+    'The destinations processes logs to display, store or send them. You can select and configure zero, one or more destinations below.' => 'The destinations processes logs to display, store or send them. You can select and configure zero, one or more destinations below.',
     'The detailed description.' => 'The detailed description.',
     'The mailing template in HTML format.' => 'The mailing template in HTML format.',
     'The mailing template in text-only format.' => 'The mailing template in text-only format.',
+    'The page you\'ve requested was not found. Please check the page address, and try again.' => 'The page you\'ve requested was not found. Please check the page address, and try again.',
     'The rate from Euro (Price in Euro * rate = Price in this currency)' => 'The rate from Euro (Price in Euro * rate = Price in this currency)',
+    'The server returned a "404 Not Found"' => 'The server returned a "404 Not Found"',
+    'The symbol, such as &#36;, £, &euro;...' => 'The symbol, such as $, £, €...',
+    'The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function' => 'The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function',
     'Thelia Back Office' => 'Thelia Back Office',
     'Thelia Languages' => 'Thelia Languages',
     'Thelia Mailing System' => 'Thelia Mailing System',
@@ -604,12 +804,16 @@ return array(
     'Thelia Shipping zones' => 'Thelia Shipping zones',
     'Thelia System Variables' => 'Thelia System Variables',
     'Thelia configuration' => 'Thelia configuration',
+    'Thelia contributions' => 'Thelia contributions',
+    'Thelia core' => 'Thelia core',
     'Thelia informations' => 'Thelia informations',
     'Thelia mailing templates' => 'Thelia mailing templates',
     'Thelia product attributes' => 'Thelia product attributes',
     'Thelia product features' => 'Thelia product features',
     'Thelia product templates' => 'Thelia product templates',
+    'Thelia support forum' => 'Thelia support forum',
     'Thelia system variables' => 'Thelia system variables',
+    'Thelia, the open source e-commerce solution' => 'Thelia, the open source e-commerce solution',
     'There is no documents attached to this %type.' => 'There is no documents attached to this %type.',
     'There is no images attached to this %type.' => 'There is no images attached to this %type.',
     'They are some administrator which are linked to this administrator. Please edit/remove them before deleting this administrator.' => 'They are some administrator which are linked to this administrator. Please edit/remove them before deleting this administrator.',
@@ -618,19 +822,32 @@ return array(
     'This category doesn\'t contains any products. To add a new product, <strong>click the + button</strong> above.' => 'This category doesn\'t contains any products. To add a new product, <strong>click the + button</strong> above.',
     'This category has no sub-categories.' => 'This category has no sub-categories.',
     'This category has no sub-categories. To create a new one, click the + button above.' => 'This category has no sub-categories. To create a new one, click the + button above.',
+    'This coupon is disabled, you can enable at the bottom of this form.' => 'This coupon is disabled, you can enable at the bottom of this form.',
+    'This customer has not defined any delivery address' => 'This customer has not defined any delivery address',
     'This folder doesn\'t contains any contents. To add a new content, <strong>click the + button</strong> above.' => 'This folder doesn\'t contains any contents. To add a new content, <strong>click the + button</strong> above.',
     'This folder has no sub-folders.' => 'This folder has no sub-folders.',
     'This folder has no sub-folders. To create a new one, click the + button above.' => 'This folder has no sub-folders. To create a new one, click the + button above.',
+    'This is the message purpose, such as \'Order confirmation\'.' => 'This is the message purpose, such as \'Order confirmation\'.',
+    'This is the subject of the e-mail, such as \'Your order is confirmed\'.' => 'This is the subject of the e-mail, such as \'Your order is confirmed\'.',
+    'This mailing template could not be changed.' => 'This mailing template could not be changed.',
     'This month' => 'This month',
+    'This product contains no accessories' => 'This product contains no accessories',
+    'This product contains no contents' => 'This product contains no contents',
+    'This product doesn\'t belong to any additional category.' => 'This product doesn\'t belong to any additional category.',
     'This product doesn\'t belong to any additional folder.' => 'This product doesn\'t belong to any additional folder.',
     'This product template does not contains any features' => 'This product template does not contains any features',
+    'This template contains no attributes' => 'This template contains no attributes',
     'This template contains no features' => 'This template contains no features',
+    'This the unique name of this message. Do not change this value unless you understand what you do.' => 'This the unique name of this message. Do not change this value unless you understand what you do.',
+    'This variable could not be changed.' => 'This variable could not be changed.',
     'This year' => 'This year',
     'Timeout' => 'Timeout',
     'Timeout :' => 'Timeout :',
     'Title' => 'Title',
     'Title :' => 'Title :',
     'To' => 'To',
+    'To create a new content, select an existing folder, or create a new one.' => 'To create a new content, select an existing folder, or create a new one.',
+    'To create a new product, select an existing category, or create a new one.' => 'To create a new product, select an existing category, or create a new one.',
     'To remove a value from the combination, select it and click "remove"' => 'To remove a value from the combination, select it and click "remove"',
     'Today' => 'Today',
     'Top level' => 'Top level',
@@ -642,20 +859,27 @@ return array(
     'Total including discount' => 'Total including discount',
     'Total without discount' => 'Total without discount',
     'Transaction reference' => 'Transaction reference',
+    'Translation' => 'Translation',
+    'Translations' => 'Translation',
     'Type :' => 'Type :',
     'Unit taxed price' => 'Unit taxed price',
     'Unit. price' => 'Unit. price',
     'Unlimited' => 'Unlimited',
     'Update' => 'Update',
-    'Update a new administrator' => 'Update a new administrator',
+    'Update an administrator' => 'Update an administrator',
     'Update coupon' => 'Update coupon',
     'Update rates' => 'Update rates',
     'Update tax rule taxes' => 'Update tax rule taxes',
     'Update this image' => 'Update this image',
     'Usage left' => 'Usage left',
     'Use Ctrl+click to select more than one value. You can also <a href="#" class="clear_feature_value" data-id="%id">clear selected values</a>.' => 'Use Ctrl+click to select more than one value. You can also <a href="#" class="clear_feature_value" data-id="%id">clear selected values</a>.',
+    'Use HTML message defined below' => 'Use HTML message defined below',
+    'Use Text message defined below' => 'Use Text message defined below',
     'Use address by default' => 'Use address by default',
+    'Use default layout' => 'Use default layout',
+    'Use the keyword phrase in your URL.' => 'Use the keyword phrase in your URL.',
     'Use this address by default' => 'Use this address by default',
+    'Used in your store front' => 'Used in your store front',
     'Username' => 'Username',
     'Username :' => 'Username :',
     'Using a domain or subdomain for each language' => 'Using a domain or subdomain for each language',
@@ -666,23 +890,33 @@ return array(
     'Variable value' => 'Variable value',
     'Version %ver' => 'Version %ver',
     'View' => 'View',
+    'View only missing translations' => 'View only missing translations',
     'View shop' => 'View shop',
     'View site' => 'View site',
     'Visibility' => 'Visibility',
     'Warning' => 'Warning',
     'Weight<br />(Kg)' => 'Weight<br />(Kg)',
+    'Welcome' => 'Welcome',
     'Will be available on special offers' => 'Will be available on special offers',
+    'Will remove postage' => 'Will remove postage',
+    'Won\'t be available on special offers' => 'Won\'t be available on special offers',
     'Won\'t remove postage' => 'Won\'t remove postage',
     'Yes' => 'Yes',
     'Yesterday sales' => 'Yesterday sales',
     'You can attach here some content to this category' => 'You can attach here some content to this category',
+    'You can attach here some content to this product' => 'You can attach here some content to this product',
     'You can attach this product to more categories in the details tab.' => 'You can attach this product to more categories in the details tab.',
+    'You can change the default category (%title) in the "General" tab.' => 'You can change the default category (%title) in the "General" tab.',
     'You can change the default folder (%title) in the "General" tab.' => 'You can change the default folder (%title) in the "General" tab.',
     'You can\'t delete this administrator' => 'You can\'t delete this administrator',
     'You can\'t delete this profile' => 'You can\'t delete this profile',
+    'You don\'t need to use commas or other punctuations.' => 'You don\'t need to use commas or other punctuations.',
+    'Your current IP address is %ip' => 'Your current IP address is %ip',
     'Zip code' => 'Zip code',
     'Zones' => 'Zones',
     'activate' => 'activate',
+    'activate %title module' => 'activate %title module',
+    'activation' => 'activation',
     'and' => 'and',
     'classic modules' => 'classic modules',
     'code' => 'code',
@@ -690,11 +924,13 @@ return array(
     'customer ref' => 'customer ref',
     'd-m-Y' => 'd-m-Y',
     'date form' => 'date form',
+    'date in yyyy-mm-dd format' => 'date in yyyy-mm-dd format',
     'days left' => 'days left',
     'deactivate' => 'deactivate',
     'deactivation' => 'deactivation',
     'en_US' => 'en_US',
     'firstname & lastname' => 'firstname & lastname',
+    'hour in hh:mm:ss format' => 'hour in hh:mm:ss format',
     'last order' => 'last order',
     'long description' => 'long description',
     'max usage' => 'max usage',
diff --git a/templates/backOffice/default/I18n/es_ES.php b/templates/backOffice/default/I18n/es_ES.php
old mode 100644
new mode 100755
index 58f83ebb2..d1f604f3f
--- a/templates/backOffice/default/I18n/es_ES.php
+++ b/templates/backOffice/default/I18n/es_ES.php
@@ -1,806 +1,712 @@
 <?php
 
-return array (
-  'Lire la suite' => '',
-  'Back-office home' => '',
-  'Thelia Back Office' => '',
-  'Version %ver' => '',
-  'View site' => '',
-  'View shop' => '',
-  'Profil' => '',
-  'Close administation session' => '',
-  'Logout' => '',
-  'Home' => '',
-  'Customers' => '',
-  'Orders' => '',
-  'All orders' => '',
-  'Catalog' => '',
-  'Folders' => '',
-  'Coupons' => '',
-  'Configuration' => '',
-  'Modules' => '',
-  'Search' => '',
-  'Thelia, solution e-commerce libre' => '',
-  'Dashboard' => '',
-  'Sales' => '',
-  'New customers' => '',
-  'First orders' => '',
-  'Aborted orders' => '',
-  'Shop Informations' => '',
-  'Categories' => '',
-  'Products' => '',
-  'Online products' => '',
-  'Offline products' => '',
-  'Pending orders' => '',
-  'In process orderst' => '',
-  'Shipped orders' => '',
-  'Canceled orders' => '',
-  'Sales statistics' => '',
-  'Today' => '',
-  'This month' => '',
-  'This year' => '',
-  'Overall sales' => '',
-  'Sales excluding shipping' => '',
-  'Yesterday sales' => '',
-  'Waiting orders' => '',
-  'In process orders' => '',
-  'Average cart' => '',
-  'Previous month sales' => '',
-  'Previous year sales' => '',
-  'Thelia informations' => '',
-  'Current version' => '',
-  'Latest version available' => '',
-  'News' => '',
-  'Click here' => '',
-  '&copy; Thelia 2013' => '',
-  'Édité par OpenStudio' => '',
-  'Forum Thelia' => '',
-  'Contributions Thelia' => '',
-  'Customer' => '',
-  'Customers list' => '',
-  'Add a new Customer' => '',
-  'customer ref' => '',
-  'firstname & lastname' => '',
-  'last order' => '',
-  'order amount' => '',
-  'Actions' => '',
-  'Edit this customer' => '',
-  'Send a mail to this customer' => '',
-  'Delete this customer and all his orders' => '',
-  'Company Name' => '',
-  'Company' => '',
-  'Title' => '',
-  'First Name' => '',
-  'Firstname' => '',
-  'Last Name' => '',
-  'Lastname' => '',
-  'Street Address' => '',
-  'Address' => '',
-  'Address Line 2' => '',
-  'Additional address' => '',
-  'Address Line 3' => '',
-  'Zip code' => '',
-  'City' => '',
-  'Country' => '',
-  'Email Address' => '',
-  'Email address' => '',
-  'Create a new customer' => '',
-  'Create this customer' => '',
-  'Cancel' => '',
-  'OK' => '',
-  'Delete customer' => '',
-  'Do you really want to delete this customer ?' => '',
-  'No' => '',
-  'Yes' => '',
-  'Thelia configuration' => '',
-  'Product catalog configuration' => '',
-  'Product templates' => '',
-  'Product attributes' => '',
-  'Product features' => '',
-  'Mailing templates' => '',
-  'Currencies' => '',
-  'Taxes rules' => '',
-  'Shipping configuration' => '',
-  'Countries' => '',
-  'Shipping zones' => '',
-  'System parameters' => '',
-  'Modules activation' => '',
-  'System variables' => '',
-  'Administration profiles' => '',
-  'Administrators' => '',
-  'Languages &amp; URLs' => '',
-  'Mailing system' => '',
-  'Administration logs' => '',
-  'System logs' => '',
-  'Thelia System Variables' => '',
-  'Thelia system variables' => '',
-  'Add a new variable' => '',
-  'Save chages' => '',
-  'Save changes' => '',
-  'Purpose' => '',
-  'Name' => '',
-  'Value' => '',
-  'Action' => '',
-  'Change this variable' => '',
-  'Cancel changes and revert to original value' => '',
-  'Delete this variable' => '',
-  'Name *' => '',
-  'Variable name' => '',
-  'Value *' => '',
-  'Variable value' => '',
-  'Purpose *' => '',
-  'Variable purpose' => '',
-  'English' => '',
-  'Enter here the category name in the default language (%title)' => '',
-  'Create a new variable' => '',
-  'Create this variable' => '',
-  'Delete a variable' => '',
-  'Do you really want to delete this variable ?' => '',
-  'Coupon' => '',
-  'Browse' => '',
-  'Coupons : ' => '',
-  'List' => '',
-  'Create a new coupon' => '',
-  'Enabled coupons' => '',
-  'Code' => '',
-  'Days before expiration' => '',
-  'Usage left' => '',
-  'Edit' => '',
-  'Unlimited' => '',
-  'Disabled coupons' => '',
-  'Expiration date' => '',
-  'Update coupon' => '',
-  'Update' => '',
-  'Code :' => '',
-  'code' => '',
-  'Title :' => '',
-  'title' => '',
-  'Is enabled' => '',
-  'Is available on special offers' => '',
-  'Is cumulative' => '',
-  'Is removing postage' => '',
-  'Expiration date :' => '',
-  'yyyy-mm-dd' => '',
-  'Is unlimited' => '',
-  'Max usage :' => '',
-  'max usage' => '',
-  'Type :' => '',
-  'Please select a coupon type' => '',
-  'Amount :' => '',
-  '14.50' => '',
-  'Short description :' => '',
-  'short description' => '',
-  'Long description :' => '',
-  'long description' => '',
-  'Save your modifications' => '',
-  'Conditions' => '',
-  'Delete' => '',
-  'And' => '',
-  'Save this condition' => '',
-  'Condition\'s category :' => '',
-  'Please select a condition category' => '',
-  'Files manager' => '',
-  'Please retry' => '',
-  'Please select another condition' => '',
-  'Edit a customer' => '',
-  'Editing customer "%name"' => '',
-  'Edit customer thelia thelia' => '',
-  'Save' => '',
-  'Save and close' => '',
-  'Customer informations' => '',
-  'Default address' => '',
-  'Other addresses' => '',
-  'Add a new address' => '',
-  'Phone' => '',
-  'cell phone' => '',
-  'Edit this address' => '',
-  'Use this address by default' => '',
-  'orders for this customer' => '',
-  'Order n°' => '',
-  'Date & Hour' => '',
-  'Amount' => '',
-  'Status' => '',
-  'Sorry, customer ID=1 was not found.' => '',
-  'Address label' => '',
-  'Label' => '',
-  'Create an address' => '',
-  'Create this address' => '',
-  'Use address by default' => '',
-  'Do you really want to use this address by default ?' => '',
-  'Delete address' => '',
-  'Do you really want to delete this address ?' => '',
-  'Edit an address' => '',
-  'Edit this order' => '',
-  'Cancel this order' => '',
-  'Delete an order' => '',
-  'Do you really want to cancel this order ?' => '',
-  'Edit an order' => '',
-  'Ordered products' => '',
-  'Invoice and Delivery' => '',
-  'Cart' => '',
-  'Product' => '',
-  'Unit. price' => '',
-  'Tax' => '',
-  'Unit taxed price' => '',
-  'Quantity' => '',
-  'Taxed total' => '',
-  'Total without discount' => '',
-  'Discount' => '',
-  'Coupon code' => '',
-  'Total including discount' => '',
-  'Postage' => '',
-  'Total' => '',
-  'Payment information' => '',
-  'Payment module' => '',
-  'Transaction reference' => '',
-  'Delivery module' => '',
-  'tracking reference' => '',
-  'Description' => '',
-  'Invoice informations' => '',
-  'Download invoice as PDF' => '',
-  'PDF | Invoice' => '',
-  'Edit invoice address' => '',
-  'Invoice reference' => '',
-  'Invoice date' => '',
-  'Street address' => '',
-  'Delivery address' => '',
-  'Download purchase order as PDF' => '',
-  'PDF | Purchase order' => '',
-  'Edit delivery address' => '',
-  'Compagny' => '',
-  'Edit order address' => '',
-  'Confirm changes' => '',
-  'Top level categories' => '',
-  'Add a new category' => '',
-  'ID' => '',
-  'Category title' => '',
-  'Online' => '',
-  'Position' => '',
-  'Browse this category' => '',
-  'Edit this category' => '',
-  'Delete this category and all its contents' => '',
-  'This category has no sub-categories. To create a new one, click the + button above.' => '',
-  'This category has no sub-categories.' => '',
-  'Top level Products' => '',
-  'Add a new product' => '',
-  'Reference' => '',
-  'Product title' => '',
-  'This category doesn\'t contains any products. To add a new product, <strong>click the + button</strong> above.' => '',
-  'Create a new category' => '',
-  'Create this category' => '',
-  'Enter here the product reference' => '',
-  'Enter here the product name in the default language (%title)' => '',
-  'Product price' => '',
-  'Enter here the product price in the default currency (%title)' => '',
-  'Select a tax tule' => '',
-  'Select here the tax applicable to this product' => '',
-  'Product weight' => '',
-  'Kg' => '',
-  'Enter here the product weight, in Kilogrammes' => '',
-  'Create a new product' => '',
-  'Create this product' => '',
-  'Delete category' => '',
-  'Do you really want to delete this category and all its content ?' => '',
-  'Delete product' => '',
-  'Do you really want to delete this product ?' => '',
-  'Enter new category position' => '',
-  'Enter new product position' => '',
-  'Edit category' => '',
-  'Editing %cat' => '',
-  'Edit category %title' => '',
-  'Preview category page' => '',
-  'Edit next category' => '',
-  'General description' => '',
-  'Associations' => '',
-  'Images' => '',
-  'Documents' => '',
-  'Edit information in %lng' => '',
-  'Français' => '',
-  'castellano' => '',
-  'Italiano' => '',
-  'Close' => '',
-  'Category title *' => '',
-  'Summary' => '',
-  'A short description, used when a summary or an introduction is required' => '',
-  'Short description' => '',
-  'Detailed description' => '',
-  'The detailed description.' => '',
-  'Conclusion' => '',
-  'A short post-description information' => '',
-  'Short conclusion' => '',
-  'Rewritten URL' => '',
-  'Parent category *' => '',
-  'Top level' => '',
-  'Visibility' => '',
-  'Category created on %date_create. Last modification: %date_change' => '',
-  'Related content' => '',
-  'You can attach here some content to this category' => '',
-  'Select a folder...' => '',
-  'Select a folder to get its content' => '',
-  'Select a folder content...' => '',
-  'Select a content and click (+) to add it to this category' => '',
-  'No available content in this folder' => '',
-  'No folders found' => '',
-  'Content title' => '',
-  'This category contains no contents' => '',
-  'Send files' => '',
-  'Drop files to upload' => '',
-  'Browse files' => '',
-  'Update this image' => '',
-  'There is no images attached to this %type.' => '',
-  'Can\'t load images, please refresh this page.' => '',
-  'There is no documents attached to this %type.' => '',
-  'Can\'t load documents, please refresh this page.' => '',
-  'Remove related content' => '',
-  'Do you really want to remove this related content ?' => '',
-  '(edit)' => '',
-  'Categories in %cat' => '',
-  'Products in %cat' => '',
-  'Edit this product' => '',
-  'Delete this product' => '',
-  'Edit product' => '',
-  'Editing %title' => '',
-  'Edit product %title' => '',
-  'Preview product page' => '',
-  'General' => '',
-  'Details' => '',
-  'Attributes &amp; Features' => '',
-  'Product reference' => '',
-  'Product title *' => '',
-  'Default product category *' => '',
-  'You can attach this product to more categories in the details tab.' => '',
-  'Product created on %date_create. Last modification: %date_change' => '',
-  'Edit prices in %curr' => '',
-  'Attribute Combinations' => '',
-  'Quickly create combinations using the combination builder' => '',
-  'Combination builder' => '',
-  'Add a new combination' => '',
-  'EAN Code' => '',
-  'Price<br />w/o taxes (%currency)' => '',
-  'Price<br />w/ taxes (%currency)' => '',
-  'Weight<br />(Kg)' => '',
-  'Default' => '',
-  'Sale' => '',
-  'New' => '',
-  'Sale price<br />w/o taxes (%currency)' => '',
-  'Sale price<br />w/ taxes (%currency)' => '',
-  'Delete this combination' => '',
-  'Attribute' => '',
-  'Select an attribute...' => '',
-  'Select an attribute and click (+) to view available values' => '',
-  'Select an attribute value...' => '',
-  'Select a value click (+) to add it to the combination' => '',
-  'No available value for this attribute' => '',
-  'To remove a value from the combination, select it and click "remove"' => '',
-  'Remove selected values' => '',
-  'Create a new combination' => '',
-  'Create this combination' => '',
-  'Delete a combination' => '',
-  'Do you really want to delete this combination ?' => '',
-  'Select attribute values to combine. You may enter a default value for some of the fields of the generated combinations.' => '',
-  'Price excl. taxes' => '',
-  'Combination reference' => '',
-  'Combination EAN Code' => '',
-  'Current quantity' => '',
-  '<span id="number_of_generated_combinations">0</span> combinations' => '',
-  'Create combinations' => '',
-  'Please wait, loading' => '',
-  'Failed to get converted prices. Please try again.' => '',
-  'Failed to get prices. Please try again.' => '',
-  'Existing combinations will be deleted. Do you want to continue ?' => '',
-  'To use features or attributes on this product, please select a product template. You can define product templates in the <a href="%tpl_mgmt_url" target="tpl_window">configuration section</a> of the administration.' => '',
-  'Current product template' => '',
-  'Do not use a product template' => '',
-  'Apply' => '',
-  'Product Attributes' => '',
-  'You can change template attributes and their positions in <a href="%tpl_mgmt_url" target="tpl_window">the template configuration page</a>.' => '',
-  'Attribute Name' => '',
-  'This product template does not contains any features' => '',
-  'Product Features' => '',
-  'You can change templates features and their positions in <a href="%tpl_mgmt_url" target="tpl_window">the template configuration page</a>.' => '',
-  'Feature Name' => '',
-  'Feature value for this product' => '',
-  'Use Ctrl+click to select more than one value. You can also <a href="#" class="clear_feature_value" data-id="%id">clear selected values</a>.' => '',
-  'Enter here the feature value as free text' => '',
-  'Feature value' => '',
-  'Top level folders' => '',
-  'Add a new folder' => '',
-  'Folder title' => '',
-  'Browse this folder' => '',
-  'Edit this folder' => '',
-  'Delete this folder and all its contents' => '',
-  'This folder has no sub-folders. To create a new one, click the + button above.' => '',
-  'This folder has no sub-folders.' => '',
-  'Top level Contents' => '',
-  'Add a new content' => '',
-  'This folder doesn\'t contains any contents. To add a new content, <strong>click the + button</strong> above.' => '',
-  'Enter here the folder name in the default language (%title)' => '',
-  'Create a new folder' => '',
-  'Create this folder' => '',
-  'Enter here the content name in the default language (%title)' => '',
-  'Create a new content' => '',
-  'Create this content' => '',
-  'Delete folder' => '',
-  'Do you really want to delete this folder and all its content ?' => '',
-  'Delete content' => '',
-  'Do you really want to delete this content ?' => '',
-  'Enter new folder position' => '',
-  'Enter new content position' => '',
-  'An error occured' => '',
-  'Oops! An Error Occurred' => '',
-  'Go to administration home' => '',
-  'Folders in %fold' => '',
-  'Contents in %fold' => '',
-  'Edit this content' => '',
-  'Delete this content' => '',
-  'Edit content' => '',
-  'Edit content %title' => '',
-  'Preview folder page' => '',
-  'Content title *' => '',
-  'Default folder *' => '',
-  'Folder created on %date_create. Last modification: %date_change' => '',
-  'Additional Folders' => '',
-  'A content could be attached to more than one folder. Select here the additional fodlers for this content.' => '',
-  'You can change the default folder (%title) in the "General" tab.' => '',
-  ' (default)' => '',
-  'Select a folder and click (+) to add it to the additional folder list' => '',
-  'No Folders found' => '',
-  'This product doesn\'t belong to any additional folder.' => '',
-  'Remove associated folder' => '',
-  'Do you really want to remove the content from this folder ?' => '',
-  'Remove the product from this category' => '',
-  'Coupon : ' => '',
-  'days left' => '',
-  'May be cumulative' => '',
-  'Won\'t remove postage' => '',
-  'Will be available on special offers' => '',
-  'Application field' => '',
-  'Do you really want to enable this element ?' => '',
-  'Confirmation' => '',
-  'Confirm' => '',
-  'Create coupon' => '',
-  'Create' => '',
-  'Please save your Coupon in oder to affect it some conditions' => '',
-  'Do you really want to delete this element ?' => '',
-  'Thelia Product Templates' => '',
-  'Thelia product templates' => '',
-  'Add a new product template' => '',
-  'Change this template' => '',
-  'Change this product template' => '',
-  'Delete this product template' => '',
-  'No product template has been created yet. Click the + button to create one.' => '',
-  'Template Name *' => '',
-  'Template title' => '',
-  'Enter here the template name in the default language (English)' => '',
-  'Create a new product template' => '',
-  'Create this product template' => '',
-  'Delete template' => '',
-  'Do you really want to delete this template ? It will be removed from all products.' => '',
-  'Select an feature...' => '',
-  'Select an feature and click (+) to add it to this template' => '',
-  'Feature title' => '',
-  'Delete this feature' => '',
-  'This template contains no features' => '',
-  'Remove feature' => '',
-  'Do you really want to remove this feature from the template ?' => '',
-  'Thelia Product Attributes' => '',
-  'Thelia product attributes' => '',
-  'Add a new product attribute' => '',
-  'Change this attribute' => '',
-  'Remove this attribute from all product templates' => '',
-  'Add this attribute to all product templates' => '',
-  'Change this product attribute' => '',
-  'Delete this product attribute' => '',
-  'No product attribute has been created yet. Click the + button to create one.' => '',
-  'Title *' => '',
-  'Attribute title' => '',
-  'Enter here the attribute name in the default language (English)' => '',
-  'Check this box if you want to add this attributes to all product templates' => '',
-  'Create a new attribute' => '',
-  'Create this attribute' => '',
-  'Delete attribute' => '',
-  'Do you really want to delete this attribute ? It will be removed from all product templates.' => '',
-  'Add to all product templates' => '',
-  'Do you really want to add this attribute to all product templates ?' => '',
-  'Remove from all product templates' => '',
-  'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.' => '',
-  'Enter new attribute position' => '',
-  'Edit an attribute' => '',
-  'Attributes' => '',
-  'Editing attribute "%name"' => '',
-  'Edit attribute en_US : Officiis cumque.' => '',
-  'Attribute information' => '',
-  'Attribute values' => '',
-  'Enter here all possible attribute values.' => '',
-  'Delete this value' => '',
-  'No value has been created yet. Click the + button to create one.' => '',
-  'Sorry, attribute ID=1 was not found.' => '',
-  'Enter here the value in the current edit language (English)' => '',
-  'Create a new attribute value' => '',
-  'Create this value' => '',
-  'Delete attribute value' => '',
-  'Do you really want to delete this attribute value ?' => '',
-  'Enter new value position' => '',
-  'Thelia Product Features' => '',
-  'Thelia product features' => '',
-  'Add a new product feature' => '',
-  'Change this feature' => '',
-  'Remove this feature from all product templates' => '',
-  'Add this feature to all product templates' => '',
-  'Change this product feature' => '',
-  'Delete this product feature' => '',
-  'No product feature has been created yet. Click the + button to create one.' => '',
-  'Enter here the feature name in the default language (English)' => '',
-  'Check this box if you want to add this features to all product templates' => '',
-  'Create a new feature' => '',
-  'Create this feature' => '',
-  'Delete feature' => '',
-  'Do you really want to delete this feature ? It will be removed from all product templates.' => '',
-  'Do you really want to add this feature to all product templates ?' => '',
-  'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.' => '',
-  'Enter new feature position' => '',
-  'Edit a feature' => '',
-  'Features' => '',
-  'Editing feature "%name"' => '',
-  'Edit feature en_US : Consectetur omnis.' => '',
-  'Feature information' => '',
-  'Feature values' => '',
-  'Enter here all possible feature values. To get a free text feature in product forms, don\'t add any value.' => '',
-  'Sorry, feature ID=1 was not found.' => '',
-  'Create a new feature value' => '',
-  'Delete feature value' => '',
-  'Do you really want to delete this feature value ?' => '',
-  'Thelia Mailing Templates' => '',
-  'Thelia mailing templates' => '',
-  'Add a new mailing template' => '',
-  'Change this mailing template' => '',
-  'Delete this mailing template' => '',
-  'No mailing template has been created yet. Click the + button to create one.' => '',
-  'Mailing template name' => '',
-  'Mailing template purpose' => '',
-  'Enter here the mailing template purpose in the default language (English)' => '',
-  'Create a new mailing template' => '',
-  'Create this mailing template' => '',
-  'Delete mailing template' => '',
-  'Do you really want to delete this mailing template ?' => '',
-  'Edit a mailing template' => '',
-  'Editing mailing template "%name"' => '',
-  'Edit mailing template order_confirmation' => '',
-  'Prevent mailing template modification or deletion, except for super-admin' => '',
-  'Message subject *' => '',
-  'Subject' => '',
-  'HTML Message' => '',
-  'The mailing template in HTML format.' => '',
-  'Text Message' => '',
-  'The mailing template in text-only format.' => '',
-  'Message created on %date_create. Last modification: %date_change' => '',
-  'Sorry, message ID=1 was not found.' => '',
-  'Update rates' => '',
-  'Add a new currency' => '',
-  'ISO 4217 Code' => '',
-  'More information about ISO 4217' => '',
-  'Symbol' => '',
-  'Rate in &euro;' => '',
-  'Change this currency' => '',
-  'Delete this currency' => '',
-  'No currency has been created yet. Click the + button to create one.' => '',
-  'Currency name' => '',
-  'Enter here the currency name in the default language (English)' => '',
-  'ISO 4217 code *' => '',
-  'ISO 4217 code' => '',
-  'Symbol *' => '',
-  'Currency symbol' => '',
-  'Rate from &euro; *' => '',
-  'Currency rate' => '',
-  'Rate' => '',
-  'The rate from Euro (Price in Euro * rate = Price in this currency)' => '',
-  'Create a new currency' => '',
-  'Create this currency' => '',
-  'Delete currency' => '',
-  'Do you really want to delete this currency ?' => '',
-  'Enter new currency position' => '',
-  'Edit a currency' => '',
-  'Editing currency "%name"' => '',
-  'Edit currency Euro' => '',
-  'Currency ISO 4217 Code' => '',
-  'The symbol, such as $, £, &euro;...' => '',
-  'Rate from Euro' => '',
-  'Sorry, currency ID=1 was not found.' => '',
-  'In order to manges your shop taxes you can manage' => '',
-  'taxes' => '',
-  'and' => '',
-  'tax rules' => '',
-  'Taxes define the amount of money which is add to a bought product.' => '',
-  'Example :' => '',
-  'French 19.6% VAT is a tax which add a 19.6% tax to the product price.' => '',
-  'Ecotax is a tax wich add a defined amount (throug a product feature) to the product price.' => '',
-  'Tax rules are combination of different taxes.' => '',
-  'French 19.6% VAT with ecotax is the applicance of the ecotax (on the product price) then the applicance of the 19.6% tax (on the product price + the ecotax amount).' => '',
-  'you can combine taxes in tax rules and chose if they are applied one after the other or at the same time : it allows to apply taxes on an already taxed price or not.' => '',
-  'Taxes' => '',
-  'Create a new tax' => '',
-  'Change this tax' => '',
-  'Delete this tax' => '',
-  'Create a new tax rule' => '',
-  'Change this tax rule' => '',
-  'Set as default tax rule' => '',
-  'Delete this tax rule' => '',
-  'Type' => '',
-  'amount' => '',
-  'feature' => '',
-  'percent' => '',
-  'Delete tax' => '',
-  'Do you really want to delete this tax ?' => '',
-  'Delete tax rule' => '',
-  'Do you really want to delete this tax rule ?' => '',
-  'Edit a tax' => '',
-  'Editing tax' => '',
-  'Tax created on %date_create. Last modification: %date_change' => '',
-  'Edit a tax rule' => '',
-  'Editing tax rule' => '',
-  'Tax rule created on %date_create. Last modification: %date_change' => '',
-  'Manage taxes' => '',
-  'Choose a country' => '',
-  'Countries that have the same tax rule' => '',
-  'NONE' => '',
-  'Manage the tax rule taxes appliance order' => '',
-  'Add tax to this group' => '',
-  'Drop tax here to create a tax group' => '',
-  'Drop tax here to delete from group' => '',
-  'Tax rule taxes will be update for the following countries :' => '',
-  'uncheck all' => '',
-  'Update tax rule taxes' => '',
-  'Edit tax rule taxes' => '',
-  'Add a new country' => '',
-  'Shop' => '',
-  'N° ISO' => '',
-  'ISO Code' => '',
-  'Change this country' => '',
-  'Delete this country' => '',
-  'No country has been created yet. Click the + button to create one.' => '',
-  'Country title *' => '',
-  'Country title' => '',
-  'Country area' => '',
-  'ISO Code *' => '',
-  'Alpha code 2 *' => '',
-  'Alpha code 2' => '',
-  'Alpha code 3 *' => '',
-  'Alpha code 3' => '',
-  'Create a new country' => '',
-  'Create this country' => '',
-  'Delete country' => '',
-  'Do you really want to delete this country ?' => '',
-  'Error' => '',
-  'Impossible to change default country. Please contact your administrator or try later' => '',
-  'Edit a country' => '',
-  'Editing country "%name"' => '',
-  'Edit country ' => '',
-  '' => '',
-  'Country short description' => '',
-  'Country description' => '',
-  'Sorry, country ID=190 was not found.' => '',
-  'Edit country Afghanistan' => '',
-  'Sorry, country ID=1 was not found.' => '',
-  'Thelia Shipping zones' => '',
-  'Change this shipping zone' => '',
-  'Edit a shipping zone' => '',
-  'Editing shipping zone "%name"' => '',
-  'Edit shipping zone %title' => '',
-  'Add' => '',
-  'Zones' => '',
-  'Delete this zone' => '',
-  'Remove zone' => '',
-  'Do you really want to remove this zone ?' => '',
-  'Thelia Shipping configuration' => '',
-  'Add a new shipping configuration' => '',
-  'Change this shipping configuration' => '',
-  'Delete this shipping configuration' => '',
-  'Shipping configuration name' => '',
-  'Create a new shipping configuration' => '',
-  'Create this shipping configuration' => '',
-  'Delete shipping configuration' => '',
-  'Do you really want to delete this shipping configuration ?' => '',
-  'Edit a shipping configuration' => '',
-  'Editing shipping configuration "%name"' => '',
-  'Edit shipping configuration %title' => '',
-  'Add this country' => '',
-  'No area defined with this id' => '',
-  'Remove country' => '',
-  'Do you really want to remove this country ?' => '',
-  'Classic modules' => '',
-  'classic modules' => '',
-  'Enable/Disable' => '',
-  'Deactivate %title module' => '',
-  'deactivation' => '',
-  'Edit this module' => '',
-  'Delete this module' => '',
-  'Delivery modules' => '',
-  'Payment modules' => '',
-  'Delete a module' => '',
-  'Do you really want to delete this module ?' => '',
-  'Edit a system variable' => '',
-  'Editing variable "%name"' => '',
-  'Edit variable active-template' => '',
-  'Prevent variable modification or deletion, except for super-admin' => '',
-  'Variable created on %date_create. Last modification: %date_change' => '',
-  'Sorry, variable ID=3 was not found.' => '',
-  'Profiles' => '',
-  'Create a new profile' => '',
-  'Profile Code' => '',
-  'Profile code' => '',
-  'Postscriptum' => '',
-  'Delete profile' => '',
-  'Do you really want to delete this profile ?' => '',
-  'You can\'t delete this profile' => '',
-  'They are some administrator which are linked to this profile. Please edit/remove them before deleting this profile.' => '',
-  'Create a new administrator' => '',
-  'Login' => '',
-  'FirstName' => '',
-  'LastName' => '',
-  'Profile' => '',
-  'Superadministrator' => '',
-  'Change this administrator' => '',
-  'Password' => '',
-  'Password confirmation' => '',
-  'Leave empty to keep current password' => '',
-  'Update a new administrator' => '',
-  'Delete administrator' => '',
-  'Do you really want to delete this administrator ?' => '',
-  'You can\'t delete this administrator' => '',
-  'They are some administrator which are linked to this administrator. Please edit/remove them before deleting this administrator.' => '',
-  'Thelia Languages' => '',
-  'Languages' => '',
-  'Languages management' => '',
-  'Add a new language' => '',
-  'Language name' => '',
-  'ISO 639 Code' => '',
-  'Locale' => '',
-  'date form' => '',
-  'time form' => '',
-  'Change this language' => '',
-  'Delete this language' => '',
-  'Parameters' => '',
-  'If a translation is missing or incomplete :' => '',
-  'Using a domain or subdomain for each language' => '',
-  'activate' => '',
-  'Language title' => '',
-  'language locale' => '',
-  'en_US' => '',
-  'date format' => '',
-  'd-m-Y' => '',
-  'time format' => '',
-  'H:i:s' => '',
-  'Create a new language' => '',
-  'Create this language' => '',
-  'Delete language' => '',
-  'Do you really want to delete this language ?' => '',
-  'Impossible to change default languages. Please contact your administrator or try later' => '',
-  'Edit a language' => '',
-  'Edit this language' => '',
-  'deactivate' => '',
-  'Thelia Mailing System' => '',
-  'Configuration mailing system' => '',
-  'Enable remote SMTP use : ' => '',
-  'Host :' => '',
-  'Host' => '',
-  'Port :' => '',
-  'Port' => '',
-  'Encryption :' => '',
-  'Encryption' => '',
-  'Username :' => '',
-  'Username' => '',
-  'Password :' => '',
-  'Auth Mode :' => '',
-  'Auth Mode' => '',
-  'Timeout :' => '',
-  'Timeout' => '',
-  'Source IP :' => '',
-  'Source IP' => '',
-  'Show logs' => '',
-  'Period' => '',
-  'From' => '',
-  'To' => '',
-  'Resources' => '',
-  'company' => '',
-)
-;
\ No newline at end of file
+return array(
+    ' (default)' => ' (por defecto)',
+    '&copy; Thelia 2013' => '&copy; Thelia 2013',
+    '(edit)' => '(editar)',
+    '14.50' => '14.50',
+    '<span id="number_of_generated_combinations">0</span> combinations' => '<span id="number_of_generated_combinations">0</span> combinaciones',
+    'A short description, used when a summary or an introduction is required' => 'Una descripción corta, utilizada cuando se requiere un resumen o una introducción',
+    'A short post-description information' => 'Una información corta después de la descripción',
+    'Aborted orders' => 'Pedidos abandonados',
+    'Action' => 'Acción',
+    'Actions' => 'Acciones',
+    'Add' => 'Añadir',
+    'Add a new Customer' => 'Añadir un nuevo cliente',
+    'Add a new address' => 'Añadir una nueva dirección',
+    'Add a new category' => 'Añadir una nueva categoría',
+    'Add a new combination' => 'Añadir una nueva combinación',
+    'Add a new content' => 'Añadir un nuevo contenido',
+    'Add a new country' => 'Añadir un nuevo país',
+    'Add a new currency' => 'Añadir una nueva moneda',
+    'Add a new folder' => 'Añadir una nueva carpeta',
+    'Add a new language' => 'Añadir un nuevo idioma',
+    'Add a new mailing template' => 'Añadir una nueva plantilla de correo electrónico',
+    'Add a new product' => 'Añadir un nuevo producto',
+    'Add a new product attribute' => 'Añadir un nuevo atributo de producto',
+    'Add a new product feature' => 'Añadir una nueva característica de producto',
+    'Add a new product template' => 'Añadir una nueva plantilla de producto',
+    'Add a new shipping configuration' => 'Añadir una nueva configuración de envío',
+    'Add a new variable' => 'Añadir una nueva variable',
+    'Add tax to this group' => 'Añadir impuestos a este grupo',
+    'Add this attribute to all product templates' => 'Añadir este atributo a todas las plantillas de producto',
+    'Add this country' => 'Añadir este país',
+    'Add this feature to all product templates' => 'Añadir esta característica a todas las plantillas de producto',
+    'Add to all product templates' => 'Añadir a todas las plantillas de producto',
+    'Additional Folders' => 'Carpetas adicionales',
+    'Additional address' => 'Dirección adicional',
+    'Address' => 'Dirección',
+    'Administration logs' => 'Logs de administración',
+    'Administration profiles' => 'Perfiles de administración',
+    'Administrators' => 'Administradores',
+    'All orders' => 'Todos los pedidos',
+    'Alpha code 2' => 'Código alfa 2',
+    'Alpha code 3' => 'Código Alfa 3',
+    'Amount' => 'Importe',
+    'Amount :' => 'Importe :',
+    'An error occured' => 'Ha ocurrido un error',
+    'And' => 'Y',
+    'Application field' => 'Campo de aplicación',
+    'Apply' => 'Aplicar',
+    'Associations' => 'Asociaciones',
+    'Attribute' => 'Atributo',
+    'Attribute Combinations' => 'Combinaciones de atributo',
+    'Attribute Name' => 'Nombre del atributo',
+    'Attribute information' => 'Información de atributo',
+    'Attribute title' => 'Título de atributo',
+    'Attribute values' => 'Valores del atributo',
+    'Attributes' => 'Atributos',
+    'Attributes &amp; Features' => 'Atributos y características',
+    'Auth Mode' => 'Modo de identificación',
+    'Auth Mode :' => 'Modo de identificación:',
+    'Average cart' => 'Carrito medio',
+    'Back' => 'Volver',
+    'Back-office home' => 'Página de inicio del panel de adñinistración',
+    'Browse' => 'Explorar',
+    'Browse files' => 'Examinar los archivos',
+    'Browse this category' => 'Explorar esta categoría',
+    'Browse this folder' => 'Explorar esta carpeta',
+    'Cancel' => 'Cancelar',
+    'Cancel changes and revert to original value' => 'Cancelar los cambios y volver al valor original',
+    'Cancel this order' => 'Cancelar este pedido',
+    'Cart' => 'Carrito',
+    'Catalog' => 'Catálogo',
+    'Categories' => 'Categorías',
+    'Categories in %cat' => 'Categorías en %cat',
+    'Category created on %date_create. Last modification: %date_change' => 'Categoría creada en %date_create. Última modificación: %date_change',
+    'Category title' => 'Título de la categoría',
+    'Change this administrator' => 'Cambiar este administrador',
+    'Change this attribute' => 'Modificar este atributo',
+    'Change this country' => 'Modificar este país',
+    'Change this currency' => 'Cambiar esta moneda',
+    'Change this feature' => 'Cambiar esta característica',
+    'Change this language' => 'Cambiar este idioma',
+    'Change this mailing template' => 'Cambiar esta plantilla de correo electrónico',
+    'Change this product attribute' => 'Cambiar el atributo de este producto',
+    'Change this product feature' => 'Cambiar la característica de este producto',
+    'Change this product template' => 'Cambiar la plantilla de este producto',
+    'Change this shipping configuration' => 'Cambiar esta configuración de envío',
+    'Change this shipping zone' => 'Cambiar esta zona de envío',
+    'Change this tax' => 'Cambiar este impuesto',
+    'Change this tax rule' => 'Cambiar esta regla de impuesto',
+    'Change this template' => 'Cambiar esta plantilla',
+    'Change this variable' => 'Cambiar esta variable',
+    'Check this box if you want to add this attributes to all product templates' => 'Comprueba este cuadro si deseas añadir este atributo a todas las plantillas de producto',
+    'Check this box if you want to add this features to all product templates' => 'Comprueba este cuadro si deseas añadir esta característica a todas las plantillas de producto',
+    'Choose a country' => 'Eligir un país',
+    'City' => 'Ciudad',
+    'Classic modules' => 'Módulos clásicos',
+    'Click here' => 'Haz clic aquí',
+    'Close' => 'Cerrar',
+    'Close administation session' => 'Cerrar la sesión de administración',
+    'Code' => 'Código',
+    'Code :' => 'Código:',
+    'Combination EAN Code' => 'Combinación de código EAN',
+    'Combination builder' => 'Constructor de combinación',
+    'Combination reference' => 'Referencia de combinación',
+    'Company' => 'Empresa',
+    'Conditions' => 'Condiciones',
+    'Configuration' => 'Configuración',
+    'Configuration mailing system' => 'Sistema de configuración de correo electrónico',
+    'Confirm' => 'Confirmar',
+    'Confirm changes' => 'Confirmar cambios',
+    'Confirmation' => 'Confirmación',
+    'Content title' => 'Título del contenido',
+    'Contents in %fold' => 'Contenido en %fold',
+    'Countries' => 'Países',
+    'Countries that have the same tax rule' => 'Países que tienen la misma regla de impuestos',
+    'Country' => 'País',
+    'Country description' => 'Descripción del país',
+    'Country short description' => 'Descripción corta del país',
+    'Country title' => 'Título del país',
+    'Coupon' => 'Cupón',
+    'Coupon : ' => 'Cupón: ',
+    'Coupon code' => 'Código del cupón',
+    'Coupons' => 'Cupones',
+    'Coupons : ' => 'Cupones: ',
+    'Create' => 'Crear',
+    'Create a new administrator' => 'Crear un nuevo administrador',
+    'Create a new attribute' => 'Crear un nuevo atributo',
+    'Create a new attribute value' => 'Crear un nuevo valor de atributo',
+    'Create a new category' => 'Crear una nueva categoría',
+    'Create a new combination' => 'Crear una nueva combinación',
+    'Create a new content' => 'Crear un nuevo contenido',
+    'Create a new country' => 'Crear un nuevo país',
+    'Create a new coupon' => 'Crear un nuevo cupón',
+    'Create a new currency' => 'Crear una nueva moneda',
+    'Create a new customer' => 'Crear un nuevo cliente',
+    'Create a new feature' => 'Crear una nueva característica',
+    'Create a new feature value' => 'Crear un nuevo valor de la característica',
+    'Create a new folder' => 'Crear una nueva carpeta',
+    'Create a new language' => 'Crear un nuevo lenguaje',
+    'Create a new mailing template' => 'Crear una nueva plantilla de correo electrónico',
+    'Create a new product' => 'Crear un nuevo producto',
+    'Create a new product template' => 'Crear una nueva plantilla de producto',
+    'Create a new profile' => 'Crear un nuevo perfil',
+    'Create a new shipping configuration' => 'Crear una nueva configuración de envío',
+    'Create a new tax' => 'Crear un nuevo impuesto',
+    'Create a new tax rule' => 'Crear una nueva regla de impuesto',
+    'Create a new variable' => 'Crear una nueva variable',
+    'Create combinations' => 'Crear combinaciones',
+    'Create coupon' => 'Crear cupón',
+    'Create this address' => 'Crear esta dirección',
+    'Create this attribute' => 'Crear este atributo',
+    'Create this category' => 'Crear esta categoría',
+    'Create this combination' => 'Crear esta combinación',
+    'Create this content' => 'Crear este contenido',
+    'Create this country' => 'Crear este país',
+    'Create this currency' => 'Crear esta moneda',
+    'Create this customer' => 'Crear este cliente',
+    'Create this feature' => 'Crear esta característica',
+    'Create this folder' => 'Crear esta carpeta',
+    'Create this language' => 'Crear este idioma',
+    'Create this mailing template' => 'Crear esta plantilla de correo electrónico',
+    'Create this product' => 'Crear este producto',
+    'Create this product template' => 'Crear esta plantilla de producto',
+    'Create this shipping configuration' => 'Crear esta configuración de envío',
+    'Create this value' => 'Crear este valor',
+    'Create this variable' => 'Crear esta variable',
+    'Currencies' => 'Monedas',
+    'Currency ISO 4217 Code' => 'Código de moneda ISO 4217',
+    'Currency name' => 'Nombre de la moneda',
+    'Currency rate' => 'Tasa de cambio',
+    'Currency symbol' => 'Símbolo de la moneda',
+    'Current product template' => 'Plantilla actual del producto',
+    'Current quantity' => 'Cantidad actual',
+    'Current version' => 'Versión actual',
+    'Customer' => 'Cliente',
+    'Customer informations' => 'Datos del cliente',
+    'Customers' => 'Clientes',
+    'Customers list' => 'Listado de clientes',
+    'Dashboard' => 'Panel de Control',
+    'Date & Hour' => 'Fecha y hora',
+    'Days before expiration' => 'Días antes del vencimiento',
+    'Deactivate %title module' => 'Desactivar el módulo %title',
+    'Default' => 'Por defecto',
+    'Default address' => 'Dirección por defecto',
+    'Delete' => 'Borrar',
+    'Delete a combination' => 'Eliminar una combinación',
+    'Delete a module' => 'Eliminar un módulo',
+    'Delete a variable' => 'Eliminar una variable',
+    'Delete address' => 'Eliminar dirección',
+    'Delete administrator' => 'Eliminar administrador',
+    'Delete an order' => 'Eliminar un pedido',
+    'Delete attribute' => 'Eleminar atributo',
+    'Delete attribute value' => 'Eliminar el valor del atributo',
+    'Delete category' => 'Eliminar categoría',
+    'Delete content' => 'Eliminar contenido',
+    'Delete country' => 'Eliminar país',
+    'Delete currency' => 'Eliminar moneda',
+    'Delete customer' => 'Eliminar cliente',
+    'Delete feature' => 'Eliminar característica',
+    'Delete feature value' => 'Eliminar valor de característica',
+    'Delete folder' => 'Eliminar carpeta',
+    'Delete language' => 'Eliminar idioma',
+    'Delete mailing template' => 'Eliminar plantilla de correo electrónico',
+    'Delete product' => 'Eliminar producto',
+    'Delete profile' => 'Eliminar perfil',
+    'Delete shipping configuration' => 'Eliminar configuración de envío',
+    'Delete tax' => 'Eliminar impuesto',
+    'Delete tax rule' => 'Eliminar regla de impuesto',
+    'Delete template' => 'Eliminar plantilla',
+    'Delete this category and all its contents' => 'Eliminar esta categoría y todo su contenido',
+    'Delete this combination' => 'Eliminar esta combinación',
+    'Delete this content' => 'Eliminar este contenido',
+    'Delete this country' => 'Eliminar este país',
+    'Delete this currency' => 'Eliminar esta moneda',
+    'Delete this customer and all his orders' => 'Eliminar este cliente y todos sus pedidos',
+    'Delete this feature' => 'Eliminar esta característica',
+    'Delete this folder and all its contents' => 'Eliminar esta carpeta y todo su contenido',
+    'Delete this language' => 'Eliminar este idioma',
+    'Delete this mailing template' => 'Eliminar esta plantilla de correo electrónico',
+    'Delete this module' => 'Eliminar este módulo',
+    'Delete this product' => 'Eliminar este producto',
+    'Delete this product attribute' => 'Eliminar este atributo del producto',
+    'Delete this product feature' => 'Eliminar esta catacterística de producto',
+    'Delete this product template' => 'Eliminar esta plantilla de producto',
+    'Delete this shipping configuration' => 'Eliminar esta configuración de envío',
+    'Delete this tax' => 'Eliminar este impuesto',
+    'Delete this tax rule' => 'Eliminar esta regla de impuesto',
+    'Delete this value' => 'Eliminar este valor',
+    'Delete this variable' => 'Eliminar esta variable',
+    'Delete this zone' => 'Eliminar esta zona',
+    'Delivery address' => 'Dirección de entrega',
+    'Delivery module' => 'Módulo de entrega',
+    'Delivery modules' => 'Módulos de entrega',
+    'Description' => 'Descripción',
+    'Details' => 'Detalles',
+    'Disabled coupons' => 'Cupones deshabilitados',
+    'Discount' => 'Descuento',
+    'Do not use a product template' => 'No utilizar una plantilla de producto',
+    'Do you really want to add this attribute to all product templates ?' => '¿Quieres añadir este atributo a todas las plantillas de producto?',
+    'Do you really want to add this feature to all product templates ?' => '¿Quieres añadir esta característica a todas las plantillas de producto?',
+    'Do you really want to cancel this order ?' => '¿Quieres cancelar este pedido?',
+    'Do you really want to delete this address ?' => '¿Quieres eliminar esta dirección?',
+    'Do you really want to delete this administrator ?' => '¿Quieres eliminar este administrador?',
+    'Do you really want to delete this attribute ? It will be removed from all product templates.' => '¿Quieres eliminar este atributo? Se quitara de todas las plantillas del producto.',
+    'Do you really want to delete this attribute value ?' => '¿Quieres eliminar este valor de atributo?',
+    'Do you really want to delete this category and all its content ?' => '¿Quieres eliminar esta categoría y todo su contenido?',
+    'Do you really want to delete this combination ?' => '¿Quieres eliminar esta combinación?',
+    'Do you really want to delete this content ?' => '¿Quieres eliminar este contenido?',
+    'Do you really want to delete this country ?' => '¿Quieres eliminar este país?',
+    'Do you really want to delete this currency ?' => '¿Quieres eliminar esta moneda?',
+    'Do you really want to delete this customer ?' => '¿Quieres eliminar a este cliente?',
+    'Do you really want to delete this element ?' => '¿Quieres eliminar este elemento?',
+    'Do you really want to delete this feature ? It will be removed from all product templates.' => '¿Quieres eliminar esta característica? Se quitará de todas las plantillas del producto.',
+    'Do you really want to delete this feature value ?' => '¿Quieres eliminar este valor de característica?',
+    'Do you really want to delete this folder and all its content ?' => '¿Quieres eliminar esta carpeta y todo su contenido?',
+    'Do you really want to delete this language ?' => '¿Quieres eliminar este idioma?',
+    'Do you really want to delete this mailing template ?' => '¿Quieres eliminar esta plantilla de correo electrónico?',
+    'Do you really want to delete this module ?' => '¿Quieres eliminar este módulo?',
+    'Do you really want to delete this product ?' => '¿Quieres eliminar este producto?',
+    'Do you really want to delete this profile ?' => '¿Quieres eliminar este perfil?',
+    'Do you really want to delete this shipping configuration ?' => '¿Quieres eliminar esta configuración del envío?',
+    'Do you really want to delete this tax ?' => '¿Quieres eliminar este impuesto?',
+    'Do you really want to delete this tax rule ?' => '¿Quieres eliminar esta regla de impuesto?',
+    'Do you really want to delete this template ? It will be removed from all products.' => '¿Quieres eliminar esta plantilla? Se quitará de todos los productos.',
+    'Do you really want to delete this variable ?' => '¿Quieres eliminar esta variable?',
+    'Do you really want to enable this element ?' => '¿Quieres activar este elemento?',
+    'Do you really want to remove the content from this folder ?' => '¿Quieres eliminar el contenido de esta carpeta?',
+    'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.' => '¿Quieres eliminar este atributo de todas las plantillas de producto? Perderás todas las relaciones de este atributo con todos los productos.',
+    'Do you really want to remove this country ?' => '¿Quieres eliminar este país?',
+    'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.' => '¿Quieres eliminar esta característica de todas las plantillas de producto? Perderás todas las relaciones de esta característica de todos los productos relacionados.',
+    'Do you really want to remove this feature from the template ?' => '¿Quieres eliminar esta característica de la plantilla?',
+    'Do you really want to remove this related content ?' => '¿Quieres eliminar este contenido relacionado?',
+    'Do you really want to remove this zone ?' => '¿Quieres eliminar esta zona?',
+    'Do you really want to use this address by default ?' => '¿Quieres utilizar esta dirección por defecto?',
+    'Documents' => 'Documentos',
+    'Download invoice as PDF' => 'Descargar factura en formato PDF',
+    'Download purchase order as PDF' => 'Descargar pedidos de compra en formato PDF',
+    'Drop files to upload' => 'Soltar archivos para cargar',
+    'Drop tax here to create a tax group' => 'Soltar impuesto aquí para crear un grupo de impuesto',
+    'Drop tax here to delete from group' => 'Soltar impuesto aquí para eliminar del grupo',
+    'EAN Code' => 'Código EAN',
+    'Ecotax is a tax wich add a defined amount (throug a product feature) to the product price.' => 'Ecotasa es un impuesto que añade un importe definido (a través de una característica de producto) al precio del producto.',
+    'Edit' => 'Editar',
+    'Edit a country' => 'Editar un país',
+    'Edit a currency' => 'Editar una moneda',
+    'Edit a customer' => 'Editar un cliente',
+    'Edit a feature' => 'Editar una característica',
+    'Edit a language' => 'Editar un idioma',
+    'Edit a mailing template' => 'Editar una plantilla de correo electrónico',
+    'Edit a shipping configuration' => 'Editar una configuración de envío',
+    'Edit a shipping zone' => 'Editar una zona de envío',
+    'Edit a system variable' => 'Editar una variable de sistema',
+    'Edit a tax' => 'Editar un impuesto',
+    'Edit a tax rule' => 'Editar una regla de impuesto',
+    'Edit an attribute' => 'Editar un atributo',
+    'Edit an order' => 'Editar un pedido',
+    'Edit category' => 'Editar categoría',
+    'Edit category %title' => 'Editar categoría %title',
+    'Edit content' => 'Editar contenido',
+    'Edit content %title' => 'Editar contenido %title',
+    'Edit delivery address' => 'Editar la dirección de entrega',
+    'Edit information in %lng' => 'Editar información en %lng',
+    'Edit invoice address' => 'Editar dirección de facturación',
+    'Edit next category' => 'Editar la siguiente categoría',
+    'Edit order address' => 'Editar la dirección de pedido',
+    'Edit prices in %curr' => 'Editar precios en %curr',
+    'Edit product' => 'Editar productos',
+    'Edit product %title' => 'Editar producto %title',
+    'Edit shipping configuration %title' => 'Editar configuración del envío %title',
+    'Edit shipping zone %title' => 'Editar zona envío %title',
+    'Edit tax rule taxes' => 'Editar los impuestos de la regla de impuesto',
+    'Edit this address' => 'Editar esta dirección',
+    'Edit this category' => 'Editar esta categoría',
+    'Edit this content' => 'Editar este contenido',
+    'Edit this customer' => 'Editar este cliente',
+    'Edit this folder' => 'Editar esta carpeta',
+    'Edit this language' => 'Editar este idioma',
+    'Edit this module' => 'Editar este módulo',
+    'Edit this order' => 'Editar este pedido',
+    'Edit this product' => 'Editar este producto',
+    'Editing %cat' => 'Editando %cat',
+    'Editing %title' => 'Editando %title',
+    'Editing attribute "%name"' => 'Editando atributo "%name"',
+    'Editing country "%name"' => 'Editando país "%name"',
+    'Editing currency "%name"' => 'Editando moneda "%name"',
+    'Editing customer "%name"' => 'Editando cliente "%name"',
+    'Editing feature "%name"' => 'Editando característica "%name"',
+    'Editing mailing template "%name"' => 'Editando plantilla de correo electrónico "%name"',
+    'Editing shipping configuration "%name"' => 'Editando configuración del envío "%name"',
+    'Editing shipping zone "%name"' => 'Editando zona de envío "%name"',
+    'Editing tax' => 'Editando impuestos',
+    'Editing tax rule' => 'Editando regla de impuesto',
+    'Editing variable "%name"' => 'Editando variable "%name"',
+    'Email address' => 'Dirección de correo electrónico',
+    'Enable remote SMTP use : ' => 'Activar el uso de SMTP remoto: ',
+    'Enable/Disable' => 'Activar/Desactivar',
+    'Enabled coupons' => 'Cupones habilitados',
+    'Encryption' => 'Cifrado',
+    'Encryption :' => 'Cifrado:',
+    'Enter here all possible attribute values.' => 'Introduce aquí todos los valores de atributo posible.',
+    'Enter here all possible feature values. To get a free text feature in product forms, don\'t add any value.' => 'Introduce aquí todos los valores posibles de la característica. Para obtener un texto libre en el formulario de producto, no añadas ningún valor.',
+    'Enter here the category name in the default language (%title)' => 'Introduce aquí el nombre de categoría en el idioma por defecto (%title)',
+    'Enter here the content name in the default language (%title)' => 'Introduce aquí el nombre de contenido en el idioma por defecto (%title)',
+    'Enter here the feature value as free text' => 'Introduce aquí el valor de la característica',
+    'Enter here the folder name in the default language (%title)' => 'Introduce aquí el nombre de carpeta en el idioma por defecto (%title)',
+    'Enter here the product name in the default language (%title)' => 'Introduce aquí el nombre de producto en el idioma por defecto (%title)',
+    'Enter here the product price in the default currency (%title)' => 'Introduce aquí el precio del producto en la moneda por defecto (%title)',
+    'Enter here the product reference' => 'Introduce aquí la referencia de producto',
+    'Enter here the product weight, in Kilogrammes' => 'Introduce aquí el peso del producto, en kilogramos',
+    'Enter new attribute position' => 'Introduce la nueva posición de atributo',
+    'Enter new category position' => 'Introduce la nueva posición de categoría',
+    'Enter new content position' => 'Introduce la nueva posición del contenido',
+    'Enter new currency position' => 'Introduce la nueva posición de la moneda',
+    'Enter new feature position' => 'Introduce la nueva posición de la característica',
+    'Enter new folder position' => 'Introduce la nueva posición de la carpeta',
+    'Enter new product position' => 'Introduce la nueva posición del producto',
+    'Enter new value position' => 'Introduce la nueva posición del valor',
+    'Error' => 'Error',
+    'Example :' => 'Ejemplo:',
+    'Existing combinations will be deleted. Do you want to continue ?' => 'Se eliminarán las combinaciones existentes. ¿Quieres continuar?',
+    'Expiration date' => 'Fecha de caducidad',
+    'Expiration date :' => 'Fecha de caducidad:',
+    'Failed to get converted prices. Please try again.' => 'Error al obtener precios convertidos. Por favor inténtalo de nuevo.',
+    'Failed to get prices. Please try again.' => 'Error al obtener los precios. Por favor inténtalo de nuevo.',
+    'Feature Name' => 'Nombre de la característica',
+    'Feature information' => 'Información sobre la característica',
+    'Feature title' => 'Título de la característica',
+    'Feature value' => 'Valor de la catacterística',
+    'Feature value for this product' => 'Valor de la característica para este producto',
+    'Feature values' => 'Valores de la característica',
+    'Features' => 'Características',
+    'Files manager' => 'Gestor de archivos',
+    'First orders' => 'Primeros pedidos',
+    'FirstName' => 'Apellido',
+    'Firstname' => 'Apellido',
+    'Folder created on %date_create. Last modification: %date_change' => 'Carpeta creada en %date_create. Última modificación: %date_change',
+    'Folder title' => 'Título de la carpeta',
+    'Folders' => 'Carpetas',
+    'Folders in %fold' => 'Carpetas en %fold',
+    'French 19.6% VAT is a tax which add a 19.6% tax to the product price.' => 'IVA francés al 19,6% es un impuesto que añade un 19,6% de impuesto al precio del producto.',
+    'French 19.6% VAT with ecotax is the applicance of the ecotax (on the product price) then the applicance of the 19.6% tax (on the product price + the ecotax amount).' => 'El IVA francés 19,6% con ecotasa es la aplicación de la ecotasa (sobre el precio del producto) y luego la aplicación del impuesto 19,6% (sobre el precio del producto + el importe de la ecotasa).',
+    'From' => 'De',
+    'General' => 'General',
+    'General description' => 'Descripción general',
+    'Go to administration home' => 'Ir a la página de inicio de la administración',
+    'H:i:s' => 'H:i:s',
+    'Home' => 'Página de inicio',
+    'Host' => 'Hostname',
+    'Host :' => 'Hostname:',
+    'ID' => 'ID',
+    'ISO 4217 Code' => 'Código ISO 4217',
+    'ISO 4217 code' => 'Código ISO 4217',
+    'ISO 639 Code' => 'Código ISO 639',
+    'ISO Code' => 'Código ISO',
+    'If a translation is missing or incomplete :' => 'Si falta una traducción o esta incompleta:',
+    'Images' => 'Imágenes',
+    'Impossible to change default country. Please contact your administrator or try later' => 'Es imposible cambiar el país por defecto. Por favor, contacta con tu administrador o intentalo más tarde',
+    'Impossible to change default languages. Please contact your administrator or try later' => 'Es imposible cambiar el país por defecto. Por favor, contacta con tu administrador o intentalo más tarde',
+    'In order to manges your shop taxes you can manage' => 'Para poder gestionar los impuestos de tu tienda puedes gestionar',
+    'Invoice and Delivery' => 'Factura y Entrega',
+    'Invoice date' => 'Fecha factura',
+    'Invoice informations' => 'Datos de factura',
+    'Invoice reference' => 'Referencia de factura',
+    'Is available on special offers' => 'está disponible en ofertas especiales',
+    'Is cumulative' => 'Es acumulativo',
+    'Is enabled' => 'Está habilitado',
+    'Is removing postage' => 'Regala los gastos de envió',
+    'Is unlimited' => 'Es ilimitado',
+    'Kg' => 'Kg',
+    'Label' => 'Etiqueta',
+    'Language name' => 'Nombre del idioma',
+    'Language title' => 'Título del idioma',
+    'Languages' => 'Idiomas',
+    'Languages &amp; URLs' => 'Idiomas &amp; URLs',
+    'Languages management' => 'Gestión de idiomas',
+    'LastName' => 'Apellido',
+    'Lastname' => 'Apellido',
+    'Latest version available' => 'Última versión disponible',
+    'Leave empty to keep current password' => 'Déjalo en blanco para mantener la contraseña actual',
+    'Lire la suite' => 'Leer más',
+    'List' => 'Lista',
+    'Locale' => 'Configuración regional',
+    'Login' => 'Iniciar sesión',
+    'Logout' => 'Cerrar sesión',
+    'Long description :' => 'Descripción larga:',
+    'Mailing system' => 'Sistema de correo electrónico',
+    'Mailing template name' => 'Nombre de la plantilla de correo electrónico',
+    'Mailing template purpose' => 'Objetivo de la plantilla de correo electrónico',
+    'Mailing templates' => 'Plantillas de correo electrónico',
+    'Manage taxes' => 'Gestionar impuestos',
+    'Manage the tax rule taxes appliance order' => 'Gestionar las reglas de impuesto y el orden de ejecución de las mismas',
+    'Max usage :' => 'Utilización máxima:',
+    'May be cumulative' => 'Puede acumularse',
+    'Message created on %date_create. Last modification: %date_change' => 'Mensaje creado en %date_create. Última modificación: %date_change',
+    'Modules' => 'Módulos',
+    'More information about ISO 4217' => 'Más información sobre ISO 4217',
+    'NONE' => 'NINGUNO',
+    'Name' => 'Nombre',
+    'New' => 'Nuevo',
+    'New customers' => 'Nuevos clientes',
+    'News' => 'Noticias',
+    'No' => 'No',
+    'No Folders found' => 'Ninguna carpeta encontrada',
+    'No area defined with this id' => 'Ninguna zona definida con este id',
+    'No available content in this folder' => 'No hay contenido disponible en esta carpeta',
+    'No available value for this attribute' => 'Ningún valor disponible para este atributo',
+    'No country has been created yet. Click the + button to create one.' => 'Ningún país ha sido creado aún. Pulsa (+) para crear uno.',
+    'No currency has been created yet. Click the + button to create one.' => 'Ninguna moneda ha sido creada todavía. Pulsa (+) para crear una.',
+    'No folders found' => 'Ninguna carpeta encontrada',
+    'No mailing template has been created yet. Click the + button to create one.' => 'Ninguna plantilla de correo electrónico ha sido creada aún. Pulsa (+) para crear una.',
+    'No product attribute has been created yet. Click the + button to create one.' => 'Ningún atributo de producto ha sido creado aún. Pulsa (+) para crear uno.',
+    'No product feature has been created yet. Click the + button to create one.' => 'Ninguna característica de producto ha sido creada aún. Pulsa (+) para crear una.',
+    'No product template has been created yet. Click the + button to create one.' => 'Ninguna plantilla de producto ha sido creada aún. Pulsa (+) para crear una.',
+    'No value has been created yet. Click the + button to create one.' => 'Ningún valor ha sido creado aún. Pulsa (+) para crear uno.',
+    'N° ISO' => 'N° ISO',
+    'OK' => 'OK',
+    'Offline products' => 'Productos fuera de línea',
+    'Online' => 'En línea',
+    'Online products' => 'Productos en línea',
+    'Oops! An Error Occurred' => '¡Uy! Se ha producido un error',
+    'Order n°' => 'N° de pedido',
+    'Ordered products' => 'Productos pedidos',
+    'Orders' => 'Pedidos',
+    'Other addresses' => 'Otras direcciones',
+    'Overall sales' => 'Ventas totales',
+    'PDF | Invoice' => 'PDF | Factura',
+    'PDF | Purchase order' => 'PDF | Orden de compra',
+    'Parameters' => 'Parámetros',
+    'Password' => 'Contraseña',
+    'Password :' => 'Contraseña:',
+    'Payment information' => 'Información de pago',
+    'Payment module' => 'Módulo de pago',
+    'Payment modules' => 'Módulos de pago',
+    'Period' => 'Período',
+    'Phone' => 'Teléfono',
+    'Please retry' => 'Por favor vuelva a reintentar',
+    'Please save your Coupon in oder to affect it some conditions' => 'Por favor guarda tu cupón para poder afectarle condiciones',
+    'Please select a condition category' => 'Por favor, selecciona una categoría de condición',
+    'Please select a coupon type' => 'Por favor selecciona un tipo de cupón',
+    'Please select another condition' => 'Por favor, selecciona otra condición',
+    'Please wait, loading' => 'Por favor espera, cargando',
+    'Port' => 'Puerto',
+    'Port :' => 'Puerto:',
+    'Position' => 'Posición',
+    'Postage' => 'Gastos de envío',
+    'Postscriptum' => 'Posdata',
+    'Preview category page' => 'Vista previa de la página de categoría',
+    'Preview folder page' => 'Vista previa de la pagina de carpeta',
+    'Preview product page' => 'Vista previa de la página de producto',
+    'Previous month sales' => 'Ventas del mes anterior',
+    'Previous year sales' => 'Ventas del año anterior',
+    'Price excl. taxes' => 'Precio impuestos excluidos',
+    'Price<br />w/ taxes (%currency)' => 'Precio<br />con impuestos (%currency)',
+    'Price<br />w/o taxes (%currency)' => 'Precio<br />sin impuestos (%currency)',
+    'Product' => 'Producto',
+    'Product Attributes' => 'Atributos del producto',
+    'Product Features' => 'Características del producto',
+    'Product attributes' => 'Atributos del producto',
+    'Product catalog configuration' => 'Configuración del catálogo de producto',
+    'Product created on %date_create. Last modification: %date_change' => 'Producto creado en %date_create. Última modificación: %date_change',
+    'Product features' => 'Características del producto',
+    'Product price' => 'Precio del producto',
+    'Product templates' => 'Plantillas de producto',
+    'Product title' => 'Título del producto',
+    'Product weight' => 'Peso del producto',
+    'Products' => 'Productos',
+    'Products in %cat' => 'Productos en %cat',
+    'Profil' => 'Perfil',
+    'Profile' => 'Perfil',
+    'Profile code' => 'Código de perfil',
+    'Profiles' => 'Perfiles',
+    'Purpose' => 'Propósito',
+    'Quantity' => 'Cantidad',
+    'Quickly create combinations using the combination builder' => 'Crear combinaciones rápidamente mediante el generador de combinación',
+    'Rate' => 'Tipo de cambio',
+    'Rate from Euro' => 'Tipo de cambio basado en el Euro',
+    'Rate in &euro;' => 'Tipo de cambio en &euro;',
+    'Reference' => 'Referencia',
+    'Related content' => 'Contenido relacionado',
+    'Remove associated folder' => 'Eliminar carpeta asociada',
+    'Remove country' => 'Eliminar país',
+    'Remove feature' => 'Eliminar característica',
+    'Remove from all product templates' => 'Eliminar de todas las plantillas de producto',
+    'Remove related content' => 'Eliminar contenido relacionado',
+    'Remove selected values' => 'Eliminar valores seleccionados',
+    'Remove the product from this category' => 'Eliminar el producto de esta categoría',
+    'Remove this attribute from all product templates' => 'Eliminar este atributo de todas las plantillas de producto',
+    'Remove this feature from all product templates' => 'Eliminar esta característica de todas las plantillas de producto',
+    'Remove zone' => 'Eliminar zona',
+    'Resources' => 'Recursos',
+    'Rewritten URL' => 'URL reescrita',
+    'Sale' => 'Venta',
+    'Sale price<br />w/ taxes (%currency)' => 'Precio de venta<br />con impuestos (%currency)',
+    'Sale price<br />w/o taxes (%currency)' => 'Precio de venta<br />sin impuestos (%currency)',
+    'Sales' => 'Ventas',
+    'Sales excluding shipping' => 'Ventas sin el envio',
+    'Sales statistics' => 'Estadísticas de ventas',
+    'Save' => 'Guardar',
+    'Save and close' => 'Guardar y cerrar',
+    'Save chages' => 'Guardar cambios',
+    'Save changes' => 'Guardar cambios',
+    'Save this condition' => 'Guardar esta condición',
+    'Save your modifications' => 'Guarde las modificaciones',
+    'Search' => 'Buscar',
+    'Select a content and click (+) to add it to this category' => 'Selecciona un contenido y pulsa (+) para añadirlo a esta categoría',
+    'Select a folder and click (+) to add it to the additional folder list' => 'Selecciona una carpeta y pulsa (+) para añadirlo a la lista de carpetas adicionales',
+    'Select a folder content...' => 'Selecciona una carpeta de contenido...',
+    'Select a folder to get its content' => 'Selecciona una carpeta para conseguir su contenido',
+    'Select a folder...' => 'Selecciona una carpeta...',
+    'Select a tax tule' => 'Selecciona una regla de impuesto',
+    'Select a value click (+) to add it to the combination' => 'Selecciona un valor y pulsa (+) para añadirlo a la combinación',
+    'Select an attribute and click (+) to view available values' => 'Selecciona un atributo y pulsa (+) para ver los valores disponibles',
+    'Select an attribute value...' => 'Selecciona un valor de atributo...',
+    'Select an attribute...' => 'Selecciona un atributo...',
+    'Select an feature and click (+) to add it to this template' => 'Selecciona una característica y pulsa (+) para añadirlo a esta plantilla',
+    'Select an feature...' => 'Selecciona una característica...',
+    'Select attribute values to combine. You may enter a default value for some of the fields of the generated combinations.' => 'Selecciona los valores de atributo para combinar. Puedes rellenar un valor por defecto para algunos de los campos de las combinaciones generadas.',
+    'Select here the tax applicable to this product' => 'Selecciona aquí el impuesto aplicable a este producto',
+    'Send a mail to this customer' => 'Enviar un mail a este cliente',
+    'Send files' => 'Enviar archivos',
+    'Set as default tax rule' => 'Definir como regla de impuesto por defecto',
+    'Shipping configuration' => 'Configuración de envío',
+    'Shipping configuration name' => 'Nombre de la configuración de envío',
+    'Shipping zones' => 'Zonas de envío',
+    'Shop' => 'Tienda',
+    'Shop Informations' => 'Datos de la tienda',
+    'Short conclusion' => 'Conclusión corta',
+    'Short description' => 'Descripción corta',
+    'Short description :' => 'Descripcion corta :',
+    'Show logs' => 'Mostrar logs',
+    'Source IP' => 'IP de origen',
+    'Source IP :' => 'IP de origen:',
+    'Status' => 'Estado',
+    'Street address' => 'Calle',
+    'Subject' => 'Asunto',
+    'Superadministrator' => 'Superadministrador',
+    'Symbol' => 'Símbolo',
+    'System logs' => 'Logs del sistema',
+    'System parameters' => 'Parámetros de sistema',
+    'System variables' => 'Variables de sistema',
+    'Tax' => 'Impuestos',
+    'Tax created on %date_create. Last modification: %date_change' => 'Impuesto creado en %date_create. Última modificación: %date_change',
+    'Tax rule created on %date_create. Last modification: %date_change' => 'Regla de impuesto creada en %date_create. Última modificación: %date_change',
+    'Tax rule taxes will be update for the following countries :' => 'Las reglas de impuestos se actualizaran para los siguientes países:',
+    'Tax rules are combination of different taxes.' => 'Las reglas de impuesto son la combinación de distintos impuestos.',
+    'Taxed total' => 'Total impuesto',
+    'Taxes' => 'Impuestos',
+    'Taxes rules' => 'Reglas de impuestos',
+    'Template title' => 'Título de la plantilla',
+    'The detailed description.' => 'La descripción detallada.',
+    'The mailing template in HTML format.' => 'La plantilla de correo electrónico en formato HTML.',
+    'The mailing template in text-only format.' => 'La plantilla de correo electrónico únicamente en formato texto.',
+    'The rate from Euro (Price in Euro * rate = Price in this currency)' => 'El tipo de cambio basado en el Euro (Precio en Euro * tipo de cambio = precio en esta moneda)',
+    'Thelia Back Office' => 'Panel de administración de Thelia',
+    'Thelia Languages' => 'Idiomas de Thelia',
+    'Thelia Mailing System' => 'Sistema de correo electrónico de Thelia',
+    'Thelia Mailing Templates' => 'Plantillas de correo electrónico de Thelia',
+    'Thelia Product Attributes' => 'Atributos del producto de Thelia',
+    'Thelia Product Features' => 'Características de producto de Thelia',
+    'Thelia Product Templates' => 'Plantillas de producto de Thelia',
+    'Thelia Shipping configuration' => 'Configuración de envío de Thelia',
+    'Thelia Shipping zones' => 'Zonas de envío de Thelia',
+    'Thelia System Variables' => 'Variables de sistema de Thelia',
+    'Thelia configuration' => 'Configuración de Thelia',
+    'Thelia informations' => 'información sobre Thelia',
+    'Thelia mailing templates' => 'Plantillas de correo electrónico de Thelia',
+    'Thelia product attributes' => 'Atributos del producto de Thelia',
+    'Thelia product features' => 'Características de producto de Thelia',
+    'Thelia product templates' => 'Plantillas de producto de Thelia',
+    'Thelia system variables' => 'Variables de sistema de Thelia',
+    'There is no documents attached to this %type.' => 'No hay ningún documento adjunto a este %type.',
+    'There is no images attached to this %type.' => 'No hay ninguna imagen adjunta a este %type.',
+    'They are some administrator which are linked to this administrator. Please edit/remove them before deleting this administrator.' => 'Este administrador esta vinculado con uno o varios administradores. Por favor, editarlos o eliminalos antes de eliminar este administrador.',
+    'They are some administrator which are linked to this profile. Please edit/remove them before deleting this profile.' => 'Hay administradores vinculados a este perfil. Por favor, editalos o eliminalos antes de eliminar este perfil.',
+    'This category contains no contents' => 'Esta categoría no contiene ningún contenido',
+    'This category doesn\'t contains any products. To add a new product, <strong>click the + button</strong> above.' => 'Esta categoría no contiene ningún producto. Para añadir un nuevo producto,<strong>pulsa (+)</strong>.',
+    'This category has no sub-categories.' => 'Esta categoría no tiene subcategorías.',
+    'This category has no sub-categories. To create a new one, click the + button above.' => 'Esta categoría no tiene subcategorías. Para crear una nueva, pulsa (+).',
+    'This folder doesn\'t contains any contents. To add a new content, <strong>click the + button</strong> above.' => 'Esta carpeta no contiene ningún contenido. Para añadir un nuevo contenido, <strong>pulsa (+)</strong>.',
+    'This folder has no sub-folders.' => 'Esta carpeta no tiene subcarpetas.',
+    'This folder has no sub-folders. To create a new one, click the + button above.' => 'Esta carpeta no tiene subcarpetas. Para crear una nueva, pulsa (+).',
+    'This month' => 'Este mes',
+    'This product doesn\'t belong to any additional folder.' => 'Este producto no pertenece a ninguna carpeta adicional.',
+    'This product template does not contains any features' => 'La plantilla de este producto no contiene ningunas características',
+    'This template contains no features' => 'Esta plantilla no contiene características',
+    'This year' => 'Este año',
+    'Timeout' => 'Timeout',
+    'Timeout :' => 'Timeout:',
+    'Title' => 'Título',
+    'Title :' => 'Título:',
+    'To' => 'Para',
+    'To remove a value from the combination, select it and click "remove"' => 'Para eliminar un valor de la combinación, selecciónalo y pulsa "eliminar"',
+    'Today' => 'Hoy',
+    'Top level' => 'Nivel superior',
+    'Top level Contents' => 'Contenidos de nivel superior',
+    'Top level Products' => 'Productos del nivel superior',
+    'Top level categories' => 'Categorías de nivel superior',
+    'Top level folders' => 'Carpetas de nivel superior',
+    'Total' => 'Total',
+    'Total including discount' => 'Total con descuento',
+    'Total without discount' => 'Total sin descuento',
+    'Transaction reference' => 'Referencia de la transacción',
+    'Type :' => 'Tipo:',
+    'Unit taxed price' => 'Precio unitario IVA incluido',
+    'Unit. price' => 'Precio unitario',
+    'Unlimited' => 'Ilimitado',
+    'Update' => 'Actualizar',
+    'Update a new administrator' => 'Actualizar un nuevo administrador',
+    'Update coupon' => 'Actualizar un cupón',
+    'Update rates' => 'Actualizar las tasas',
+    'Update tax rule taxes' => 'Actualizar los impuestos de las reglas de impuesto',
+    'Update this image' => 'Actualizar esta imagen',
+    'Usage left' => 'Utilización restante',
+    'Use Ctrl+click to select more than one value. You can also <a href="#" class="clear_feature_value" data-id="%id">clear selected values</a>.' => 'Pulsa Ctrl+click para seleccionar más de un valor. También puedes <a href="#" class="clear_feature_value" data-id="%id">borrar los valores seleccionados</a>.',
+    'Use address by default' => 'Utilizar la dirección por defecto',
+    'Use this address by default' => 'Utilizar esta dirección por defecto',
+    'Username' => 'Nombre de usuario',
+    'Username :' => 'Nombre de usuario:',
+    'Using a domain or subdomain for each language' => 'Utilizando un dominio o subdominio para cada idioma',
+    'Value' => 'Valor',
+    'Variable created on %date_create. Last modification: %date_change' => 'Variable creada en %date_create. Última modificación: %date_change',
+    'Variable name' => 'Nombre de la variable',
+    'Variable purpose' => 'Objetivo de la variable',
+    'Variable value' => 'Valor de la variable',
+    'Version %ver' => 'Versión %ver',
+    'View' => 'Ver',
+    'View shop' => 'Ver tienda',
+    'View site' => 'Ver sitio',
+    'Visibility' => 'Visibilidad',
+    'Warning' => 'Alerta',
+    'Weight<br />(Kg)' => 'Peso< br />(Kg)',
+    'Will be available on special offers' => 'Estará disponible en ofertas especiales',
+    'Won\'t remove postage' => 'No eliminara los gastos de envió',
+    'Yes' => 'Sí',
+    'Yesterday sales' => 'Ventas de ayer',
+    'You can attach here some content to this category' => 'Puedes adjuntar aquí algún contenido a esta categoría',
+    'You can attach this product to more categories in the details tab.' => 'Puedes adjuntar este producto a más categorías en la pestaña detalles.',
+    'You can change the default folder (%title) in the "General" tab.' => 'Puedes cambiar la carpeta por defecto (%title) en la pestaña "General".',
+    'You can\'t delete this administrator' => 'No puedes eliminar este administrador',
+    'You can\'t delete this profile' => 'No puedes eliminar este perfil',
+    'Zip code' => 'Código postal',
+    'Zones' => 'Zonas',
+    'activate' => 'activar',
+    'and' => 'y',
+    'classic modules' => 'módulos clásicos',
+    'code' => 'Código',
+    'company' => 'empresa',
+    'customer ref' => 'Referencia de cliente',
+    'd-m-Y' => 'd-m-Y',
+    'date form' => 'formulario de fecha',
+    'days left' => 'días restantes',
+    'deactivate' => 'desactivar',
+    'deactivation' => 'desactivación',
+    'en_US' => 'es_ES',
+    'firstname & lastname' => 'Nombre y apellido',
+    'last order' => 'último pedido',
+    'long description' => 'descripción larga',
+    'max usage' => 'Utilización máxima',
+    'order amount' => 'Importe del pedido',
+    'orders for this customer' => 'pedidos para este cliente',
+    'short description' => 'descripción corta',
+    'tax rules' => 'reglas de impuesto',
+    'taxes' => 'impuestos',
+    'time form' => 'formulario de tiempos',
+    'title' => 'Título',
+    'tracking reference' => 'Referencia de seguimiento',
+    'uncheck all' => 'Desmarcar todo',
+    'you can combine taxes in tax rules and chose if they are applied one after the other or at the same time : it allows to apply taxes on an already taxed price or not.' => 'Puedes combinar los impuestos en las reglas de impuesto y elegir si se aplican uno tras otro o al mismo tiempo: permite aplicar impuestos sobre un precio ya gravado o no.',
+    'yyyy-mm-dd' => 'yyyy-mm-dd',
+);
diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php
old mode 100644
new mode 100755
index c447b6d4c..7239570f7
--- a/templates/backOffice/default/I18n/fr_FR.php
+++ b/templates/backOffice/default/I18n/fr_FR.php
@@ -4,22 +4,19 @@ return array(
     ' (default)' => '(défaut)',
     '&copy; Thelia 2013' => '&copy; Thelia 2013',
     '(edit)' => '(modification)',
-    '14.50' => '14.50',
+    '<a href="http://en.wikipedia.org/wiki/ISO_639-1_language_matrix" target="_other">Check the list</a> of ISO 639-1 codes' => '<a href="http://en.wikipedia.org/wiki/ISO_639-1_language_matrix" target="_other">Consulter la liste</a> des codes ISO 639-1',
     '<span id="number_of_generated_combinations">0</span> combinations' => '<span id="number_of_generated_combinations">0</span> combinaisons',
-    '<strong>Cannot translate all fields.</strong> According to your PHP configuration, forms cannot contains more than
-	                                        %current_max_input_vars input fields, but at least %required_max_input_vars are required. Please change the value of max_input_vars in your PHP configuration
-	                                        of change the translation file by hand.' => '<strong>Impossible de traduire tout les champs.</strong> Selon votre configuration PHP, les formulaires ne peuvent pas contenir plus de %current_max_input_vars champs input, mais au moins %required_max_input_vars sont nécessaire. Vous devez changer la valeur max_input_vars dans votre fichier de configuration PHP ou modifier le fichier de traduction manuellement.',
-    '<strong>Congratulations</strong>, all text is now translated !' => '<strong>Félicitation</strong>, tout est traduit !',
-    '<strong>Did not found any text to translate</strong>. It\'s probably normal. If not, please be sure to use Smarty\'s "intl" function in templates, or the Translator::trans() method in PHP files.' => '<strong>Aucun texte à traduire trouvé</strong>. Cela est probablement normal. Sinon veuillez-vous assurer d\'utiliser la fonction Smarty intl dans vos templates, ou la méthode Translator::trans() dans vos fichiers PHP.',
-    'A content could be attached to more than one folder. Select here the additional folders for this content.' => 'Un contenu peut-être lié à un ou plusieurs fichier. Sélectionnez ici les dossiers additionnels pour ce contenu.',
-    'A product could be attached to more than one category. Select here the additional categories for this product.' => 'Un produit ne peut être lié à plus d\'une catégorie. Sélectionnez ici les catégories additionnelles pour ce produit.',
+    '<strong>Congratulations</strong>, all text is now translated !' => '<strong>Félicitations</strong>, Toute la traduction a été effectué',
+    '<strong>Did not found any text to translate</strong>. It\'s probably normal. If not, please be sure to use Smarty\'s "intl" function in templates, or the Translator::trans() method in PHP files.' => '<streong>Aucun texte à traduire</strong>. C\'est probablement normal. Si ce n\'est pas le cas vérifiez que vous utilisez bien la fonction Smarty "intl" ou bien le translator Translator::trans dans un fichier php',
+    'A content could be attached to more than one folder. Select here the additional folders for this content.' => 'Un contenu peut être rattaché à plusieurs dossiers. Sélectionnez ici les dossiers dans lesquels ce contenu apparaîtra',
+    'A product could be attached to more than one category. Select here the additional categories for this product.' => 'Un produit peut être associé à plusieurs rubriques. Sélectionner les rubrique pour lesquels le produit sera associé',
     'A short description, used when a summary or an introduction is required' => 'Une courte description, utilisée lorsqu\'un résumé ou une introduction est requise',
-    'A short post-description information' => 'A courte post-description',
+    'A short post-description information' => 'champs d\'information complémentaire',
     'Aborted orders' => 'Paniers abandonnés',
     'Accessory title' => 'Titre de l\'accessoire',
     'Action' => 'Action',
     'Actions' => 'Actions',
-    'Activate this log destination' => 'Activer cette destination de log',
+    'Activate this log destination' => 'Activer cette destination',
     'Add' => 'Ajouter',
     'Add a new Customer' => 'Ajouter un client',
     'Add a new address' => 'Ajouter une nouvelle adresse',
@@ -27,7 +24,7 @@ return array(
     'Add a new combination' => 'Ajouter une nouvelle combinaison',
     'Add a new content' => 'Ajouter un nouveau contenu',
     'Add a new country' => 'Ajouter un nouveau pays',
-    'Add a new currency' => 'Ajouter une devise',
+    'Add a new currency' => 'Ajouter une nouvelle devise',
     'Add a new folder' => 'Ajouter un nouveau dossier',
     'Add a new language' => 'Ajouter une nouvelle langue',
     'Add a new mailing template' => 'Ajouter un nouveau template de mailing',
@@ -36,24 +33,23 @@ return array(
     'Add a new product feature' => 'Ajouter une nouvelle caractéristique produit',
     'Add a new product template' => 'Ajouter un nouveau template produit',
     'Add a new shipping configuration' => 'Ajouter une nouvelle configuration de livraison',
-    'Add a new variable' => 'Ajouter une variable',
+    'Add a new variable' => 'Ajouter une nouvelle variable',
     'Add tax to this group' => 'Ajouter une taxe à ce groupe',
     'Add this attribute to all product templates' => 'Ajouter cette déclinaison à tous les templates produit',
     'Add this country' => 'Ajouter ce pays',
     'Add this feature to all product templates' => 'Ajouter cette caractéristique à tous les templates produit',
     'Add to all product templates' => 'Ajouter à tous les templates produit',
-    'Additional Folders' => 'Dossiers additionnels',
+    'Additional Folders' => 'Dossiers associés',
     'Additional address' => 'Adresse complémentaire',
-    'Additional categories' => 'Catégories additionnelles',
+    'Additional categories' => 'Rubriques supplémentaires',
     'Address' => 'Adresse',
-    'Administration logs' => 'Gestion des logs',
+    'Administration logs' => 'Journal des logs',
     'Administration profiles' => 'Gestion des administrateurs',
     'Administrators' => 'Administrateurs',
     'All orders' => 'Toutes les commandes',
     'Alpha code 2' => 'Code alpha 2',
     'Alpha code 3' => 'Code alpha 3',
     'Amount' => 'Montant',
-    'Amount :' => 'Montant',
     'An error occured' => 'Une erreur est survenue',
     'And' => 'Et',
     'Application field' => 'Champs d\'application',
@@ -68,31 +64,31 @@ return array(
     'Attributes' => 'Déclinaisons',
     'Attributes &amp; Features' => 'Déclinaisons &amp; caractéristiques',
     'Auth Mode' => 'Mode d\'authentification',
-    'Auth Mode :' => 'Mode d\'authentification:',
+    'Auth Mode :' => 'Mode d\'authentification :',
     'Average cart' => 'Panier moyen',
     'Back' => 'Retour',
     'Back-office home' => 'Accueil administration',
-    'Back-office templates' => 'Template Back-office',
-    'Back-office users' => 'Utilisateurs du back-office',
+    'Back-office templates' => 'templates Back-office',
+    'Back-office users' => 'Utilisateur du B.O',
     'Browse' => 'Parcourir',
-    'Browse files' => 'Sélectionnez les fichiers',
+    'Browse files' => 'Parcourir les fichiers',
     'Browse this category' => 'Parcourir cette catégorie',
     'Browse this folder' => 'Parcourir ce dossier',
-    'Can\'t be cumulative' => 'Ne peut être cumulé',
-    'Can\'t load documents, please refresh this page.' => 'Impossible de charger le document, veuillez rafraîchir cette page.',
-    'Can\'t load images, please refresh this page.' => 'Impossible de charger les images, veuillez rafraîchir cette page.',
-    'Can\'t reorder documents, please refresh this page.' => 'Impossible de réorganiser les documents, rafraichissez la page.',
-    'Can\'t reorder images, please refresh this page.' => 'Impossible de réorganiser les images, rafraichissez la page.',
+    'Can\'t be cumulative' => 'Ne peut pas se cumuler',
+    'Can\'t load documents, please refresh this page.' => 'Impossible de charger les documents. Rechargez la page',
+    'Can\'t load images, please refresh this page.' => 'Impossible de charger l\'image. Rechargez la page',
+    'Can\'t reorder documents, please refresh this page.' => 'Impossible de trier les documents. Rechargez la page',
+    'Can\'t reorder images, please refresh this page.' => 'Impossible de trier les images. Rechargez la page',
     'Cancel' => 'Annuler',
     'Cancel changes and revert to original value' => 'Annuler les modifications et revenir à la version antérieure',
     'Cancel this order' => 'Annuler cette commande',
-    'Cart' => 'Panier',
+    'Cart - Prices in %currency' => 'Panier - prix en %currency',
     'Catalog' => 'Catalogue',
-    'Categories' => 'Catégories',
-    'Categories in %cat' => 'Catégories dans %cat',
-    'Category created on %date_create. Last modification: %date_change' => 'Catégorie créée le %date_create. Dernière modification le %date_change',
-    'Category title' => 'Titre de la catégorie',
-    'Cellular phone' => 'Téléphone portable',
+    'Categories' => 'Rubriques',
+    'Categories in %cat' => 'Rubrique dans %cat',
+    'Category created on %date_create. Last modification: %date_change' => 'Rubrique créée le %date_create. Dernière modification le %date_change',
+    'Category title' => 'Titre de la rubrique',
+    'Cellular phone' => 'téléphone portable',
     'Cellular phone number' => 'Numéro de portable',
     'Change this administrator' => 'Modifier cet administrateur',
     'Change this attribute' => 'Modifier cette déclinaison',
@@ -104,7 +100,7 @@ return array(
     'Change this product attribute' => 'Modifier cette déclinaison produit',
     'Change this product feature' => 'Modifier cette caractéristique produit',
     'Change this product template' => 'Modifier ce template produit',
-    'Change this profile' => 'Modifier ce profil',
+    'Change this profile' => 'Changer ce profil',
     'Change this shipping configuration' => 'Modifier cette configuration de livraison',
     'Change this shipping zone' => 'Modifier cette zone de livraison',
     'Change this tax' => 'Modifier cette taxe',
@@ -121,24 +117,24 @@ return array(
     'Close' => 'Fermer',
     'Close administation session' => 'Quitter l\'interface d\'administration',
     'Code' => 'Code',
-    'Code :' => 'Code',
+    'Code :' => 'Code : ',
     'Combination EAN Code' => 'Combinaison de code EAN',
-    'Combination builder' => 'Constructeur de combinaison',
+    'Combination builder' => 'générateur de combinaison',
     'Combination reference' => 'Référence de la combinaison',
     'Company' => 'Entreprise',
-    'Condition type :' => 'Type de la condition:',
-    'Condition\'s category :' => 'Type de condition',
+    'Condition type :' => 'Type de condition',
+    'Condition\'s category :' => 'Rubrique de la condition',
     'Conditions' => 'Conditions',
     'Configuration' => 'Configuration',
     'Configuration mailing system' => 'Configuration du système de mailing',
     'Configure' => 'Configurer',
-    'Configure this module' => 'Configurer ce module',
+    'Configure this module' => 'Configuration',
     'Confirm' => 'Confirmer',
     'Confirm changes' => 'Valider les modifications',
     'Confirmation' => 'Confirmation',
     'Content title' => 'Titre du contenu',
     'Contents in %fold' => 'Contenus dans %fold',
-    'Copy source text in input field' => 'Copier le texte source dans le champs',
+    'Copy source text in input field' => 'Copier la source dans le champs de traduction',
     'Countries' => 'Pays',
     'Countries that have the same tax rule' => 'Pays qui ont les même règles de taxe',
     'Country' => 'Pays',
@@ -146,22 +142,22 @@ return array(
     'Country short description' => 'Courte description du pays',
     'Country title' => 'Titre du pays',
     'Coupon' => 'Code promo',
-    'Coupon : ' => 'Code promo:',
+    'Coupon : ' => 'Code promo :',
     'Coupon code' => 'Code promo',
     'Coupons' => 'Codes Promo',
-    'Coupons : ' => 'Codes promo',
+    'Coupons : ' => 'Codes promo : ',
     'Create' => 'Créer',
-    'Create a customer address' => 'Créer une adresse client',
+    'Create a customer address' => 'Créer une adresse',
     'Create a new administrator' => 'Créer un nouvel administrateur',
     'Create a new attribute' => 'Créer une nouvelle déclinaison',
     'Create a new attribute value' => 'Créer une nouvelle valeur de déclinaison',
-    'Create a new category' => 'Créer une catégorie',
+    'Create a new category' => 'Créer une nouvelle rubrique',
     'Create a new combination' => 'Créer une nouvelle combinaison',
     'Create a new content' => 'Créer un nouveau contenu',
     'Create a new country' => 'Créer un nouveau pays',
     'Create a new coupon' => 'Créer un nouveau code promo',
     'Create a new currency' => 'Créer une nouvelle devise',
-    'Create a new customer' => 'Ajouter un client',
+    'Create a new customer' => 'Ajouter un nouveau client',
     'Create a new feature' => 'Créer une nouvelle caractéristique',
     'Create a new feature value' => 'Créer une nouvelle valeur de caractéristique',
     'Create a new folder' => 'Créer un nouveau dossier',
@@ -178,7 +174,7 @@ return array(
     'Create coupon' => 'Créer un code promo',
     'Create this address' => 'Créer cette adresse',
     'Create this attribute' => 'Créer cette déclinaison',
-    'Create this category' => 'Créer cette catégorie',
+    'Create this category' => 'Créer cette rubrique',
     'Create this combination' => 'Créer cette combinaison',
     'Create this content' => 'Créer ce contenu',
     'Create this country' => 'Créer ce pays',
@@ -193,11 +189,11 @@ return array(
     'Create this shipping configuration' => 'Créer cette nouvelle configuration de livraison',
     'Create this value' => 'Créer cette valeur',
     'Create this variable' => 'Ajouter cette variable',
-    'Currencies' => 'Monnaie',
+    'Currencies' => 'Devises',
     'Currency ISO 4217 Code' => 'Code ISO 4217 de la devise',
     'Currency name' => 'Nom de la devise',
     'Currency rate' => 'Taux de la devise',
-    'Currency symbol' => 'Symbole de la monaie',
+    'Currency symbol' => 'Symbole de la devise',
     'Current product template' => 'Gabarit de produit actuel',
     'Current quantity' => 'Quantité actuelle',
     'Current version' => 'Version en cours',
@@ -205,50 +201,52 @@ return array(
     'Customer informations' => 'Informations client',
     'Customers' => 'Clients',
     'Customers list' => 'Liste des clients',
+    'Cutomer Name' => 'Nom du client',
     'Dashboard' => 'Tableau de bord',
     'Date & Hour' => 'Date et heure',
     'Date of last order' => 'Date de la dernière commande',
-    'Days before expiration' => 'Jours de validité',
+    'Days before expiration' => 'Jours restants avant expiration',
     'Deactivate %title module' => 'Désactiver le module %title',
     'Default' => 'Défaut',
     'Default address' => 'Adresse par défaut',
-    'Define here this product\'s accessories' => 'Définissez ici ces accessoires produit',
+    'Define here this product\'s accessories' => 'Choisir ici les accessoire pour ce produit',
     'Delete' => 'Supprimer',
     'Delete a combination' => 'Supprimer une combinaison',
     'Delete a module' => 'Supprimer un module',
     'Delete a variable' => 'Supprimer une variable',
     'Delete address' => 'Supprimer cette adresse',
     'Delete administrator' => 'Supprimer un administrateur',
+    'Delete also module data' => 'Supprimer aussi les données de ce module',
     'Delete an order' => 'Supprimer une commande',
     'Delete attribute' => 'Supprimer cette déclinaison',
     'Delete attribute value' => 'Supprimer une valeur de déclinaison',
-    'Delete category' => 'Supprimer cette catégorie',
+    'Delete category' => 'Supprimer cette rubrique',
     'Delete content' => 'Supprimer le contenu',
     'Delete country' => 'Supprimer le pays',
     'Delete currency' => 'Supprimer cette devise',
     'Delete customer' => 'Supprimer ce client',
     'Delete feature' => 'Supprimer cette caractéristique',
     'Delete feature value' => 'Supprimer la valeur de la caractéristique',
-    'Delete folder' => 'Supprimer ce contenu',
+    'Delete folder' => 'Supprimer ce dossier',
     'Delete language' => 'Supprimer cette langue',
     'Delete mailing template' => 'Supprimer ce template de mailing',
     'Delete product' => 'Supprimer ce produit',
     'Delete profile' => 'Supprimer le profil',
     'Delete shipping configuration' => 'Supprimer cette configuration de livraison',
     'Delete tax' => 'Supprimer la taxe',
-    'Delete tax rule' => 'Supprimer une règle de taxe',
+    'Delete tax rule' => 'Supprimer cette règle de taxe',
     'Delete template' => 'Supprimer ce template produit',
     'Delete this accessory' => 'Supprimer cet accessoire',
     'Delete this administrator' => 'Supprimer cet administrateur',
-    'Delete this attribute' => 'Supprimer cette déclinaison',
-    'Delete this category and all its contents' => 'Supprimer cette catégorie et tout ce qu\'elle contient ?',
+    'Delete this attribute' => 'supprimer cette déclinaison',
+    'Delete this category and all its contents' => 'Supprimer cette rubrique et tout ce qu\'elle contient ?',
     'Delete this combination' => 'Supprimer cette combinaison',
     'Delete this content' => 'Supprimer ce contenu',
     'Delete this country' => 'Supprimer ce pays',
     'Delete this currency' => 'Supprimer cette devise',
     'Delete this customer and all his orders' => 'Supprimer ce client et toutes ses commandes',
     'Delete this feature' => 'Supprimer cette caractéristique',
-    'Delete this folder and all its contents' => 'Supprimer ce dossier et tous ces contenus',
+    'Delete this folder and all its contents' => 'Supprimer ce dossier et tout ses contenus',
     'Delete this language' => 'Supprimer cette langue',
     'Delete this mailing template' => 'Supprimer ce template de mailing',
     'Delete this module' => 'Supprimer ce module',
@@ -269,17 +267,17 @@ return array(
     'Description' => 'Description',
     'Destinations' => 'Destinations',
     'Details' => 'Détails',
-    'Disabled coupons' => 'Codes désactivés',
+    'Disabled coupons' => 'Codes promo désactivés',
     'Discount' => 'Remise',
     'Do not use a product template' => 'Ne pas utiliser de gabarit',
     'Do you really want to add this attribute to all product templates ?' => 'Voulez-vous vraiment ajouter cette déclinaison de tous les templates produit ?',
     'Do you really want to add this feature to all product templates ?' => 'Voulez-vous vraiment ajouter cette caractéristique à tous les templates produit ?',
-    'Do you really want to cancel this order ?' => 'Voulez-vous vraiment sup primer cette commande ?',
+    'Do you really want to cancel this order ?' => 'Voulez-vous vraiment supprimer cette commande ?',
     'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?',
-    'Do you really want to delete this administrator ?' => 'Confirmez-vous la suppression de cet adminisrateur ?',
+    'Do you really want to delete this administrator ?' => 'Confirmez-vous la suppression de cet administrateur ?',
     'Do you really want to delete this attribute ? It will be removed from all product templates.' => 'Voulez-vous vraiment supprimer cette déclinaison ? Elle sera supprimée de tous les templates produit.',
     'Do you really want to delete this attribute value ?' => 'Voulez-vous vraiment supprimer cette déclinaison ?',
-    'Do you really want to delete this category and all its content ?' => 'Voulez-vous vraiment supprimer cette catégorie et tout ce qu\'elle contient ?',
+    'Do you really want to delete this category and all its content ?' => 'Voulez-vous vraiment supprimer cette rubrique et tout ce qu\'elle contient ?',
     'Do you really want to delete this combination ?' => 'Voulez-vous vraiment supprimer cette combinaison ?',
     'Do you really want to delete this content ?' => 'Voulez-vous vraiment supprimer ce contenu ?',
     'Do you really want to delete this country ?' => 'Voulez-vous vraiment supprimer ce pays ?',
@@ -301,40 +299,41 @@ return array(
     'Do you really want to delete this variable ?' => 'Voulez-vous vraiment supprimer cette variable ?',
     'Do you really want to enable this element ?' => 'Voulez-vous vraiment activer cet élément ?',
     'Do you really want to remove the content from this folder ?' => 'Voulez-vous vraiment enlever le contenu de ce dossier ?',
-    'Do you really want to remove the product from this category ?' => 'Voulez-vous vraiment supprimer ce produit de cette catégorie ?',
-    'Do you really want to remove this accessory from the product ?' => 'Voulez-vous vraiment supprimer cet accessoire de ce produit ?',
+    'Do you really want to remove the product from this category ?' => 'êtes-vous sur de vouloir enlever le produit de cette rubrique',
+    'Do you really want to remove this accessory from the product ?' => 'êtes-vous sur de vouloir supprimer cet accessoire ?',
     'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.' => 'Voulez-vous vraiment supprimer cette déclinaison de tous les templates produits ? Vous allez perdre toutes les informations produit liées à cette déclinaison.',
-    'Do you really want to remove this attribute from the template ?' => 'Voulez-vous vraiment supprimer cette déclinaison de ce template ?',
+    'Do you really want to remove this attribute from the template ?' => 'êtes-vous sur de vouloir retirer cette déclinaison de ce template',
     'Do you really want to remove this country ?' => 'Voulez-vous vraiment enlever ce pays ?',
     'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.' => 'Voulez-vous vraiment enlever cette caractéristique de tous les templates produit ? Vous allez perdre toutes les informations des produits liées à cette caractéristique.',
     'Do you really want to remove this feature from the template ?' => 'Voulez-vous vraiment supprimer cette caractéristique de ce template ?',
     'Do you really want to remove this related content ?' => 'Voulez-vous vraiment supprimer ce contenu lié ?',
-    'Do you really want to remove this related content from the product ?' => 'Voulez-vous vraiment supprimer ce contenu lié de ce produit ?',
+    'Do you really want to remove this related content from the product ?' => 'êtes-vous sur de vouloir supprimer ce contenu associé ?',
     'Do you really want to remove this zone ?' => 'Voulez-vous vraiment supprimer cette zone ?',
+    'Do you really want to set this coupon available to everyone ?' => 'êtes-vous sur de vouloir rendre ce code promo disponible à tout le monde ?',
     'Do you really want to use this address by default ?' => 'Voulez-vous vraiment utiliser cette adresse comme adresse par défaut ?',
     'Document' => 'Document',
-    'Document informations' => 'Informations sur le document',
+    'Document informations' => 'Informations du document',
     'Documents' => 'Documents',
-    'Don\'t repeat keywords over and over in a row. Rather, put in keyword phrases.' => 'Ne pas répéter les mots-clés. Il est préférable de les intégrer dans des phrases.',
+    'Don\'t repeat keywords over and over in a row. Rather, put in keyword phrases.' => 'Ne répétez pas sans cesse les même mots-clés dans une ligne. Préférez utiliser des expressions de mots-clés',
     'Download invoice as PDF' => 'Télécharger la facture au format PDF',
     'Download purchase order as PDF' => 'Télécharger le bon de commande au format PDF',
     'Drop files to upload' => 'Déposez des fichiers à envoyer',
     'Drop tax here to create a tax group' => 'Déposer une taxe ici afin de créer un groupe de taxe',
     'Drop tax here to delete from group' => 'Déposer une taxe ici afin de la supprimer du groupe',
-    'E-mail templates' => 'Template e-mail',
+    'E-mail templates' => 'templates E-mail',
     'EAN Code' => 'Code EAN',
-    'Ecotax is a tax wich add a defined amount (throug a product feature) to the product price.' => 'L\'écotaxe est une taxe qui ajoute un montant défini (grâce à une caractéristique produit) à prix du produit.',
+    'Ecotax is a tax wich add a defined amount (throug a product feature) to the product price.' => 'L\'écotaxe est une taxe qui ajoute un montant défini (grâce à une caractéristique produit) au prix du produit.',
     'Edit' => 'Editer',
     'Edit a country' => 'Modifier un pays',
     'Edit a currency' => 'Modifier une devise',
-    'Edit a customer' => 'Editer un client',
-    'Edit a customer address' => 'Modifier une adresse client',
+    'Edit a customer' => 'Éditer un client',
+    'Edit a customer address' => 'Modifier une adresse',
     'Edit a document' => 'Modifier un document',
     'Edit a feature' => 'Modifier une caractéristique',
     'Edit a language' => 'Modifier une langue',
     'Edit a mailing template' => 'Modifier un template de mailing',
     'Edit a module' => 'Modifier un module',
-    'Edit a profile' => 'Modifier un profil',
+    'Edit a profile' => 'Modifier le profil',
     'Edit a shipping configuration' => 'Modifier une configuration de livraison',
     'Edit a shipping zone' => 'Modifier la zone de livraison',
     'Edit a system variable' => 'Modifier une variable système',
@@ -345,31 +344,31 @@ return array(
     'Edit an image' => 'Modifier une image',
     'Edit an order' => 'Editer une commande',
     'Edit attribute "%name"' => 'Modifier la déclinaison "%name"',
-    'Edit category' => 'Editer la catégorie',
-    'Edit category %title' => 'Modifier la catégorie %title',
+    'Edit category' => 'Editer la rubrique',
+    'Edit category %title' => 'Modifier la rubrique %title',
     'Edit content' => 'Modifier le contenu',
     'Edit content %title' => 'Modifier le contenu %title',
     'Edit country "%name"' => 'Modifier le pays "%name"',
-    'Edit currency "%name"' => 'Modification de la devise "%name"',
-    'Edit customer %firstname %lastname' => 'Modifier le client %firstname %lastname',
+    'Edit currency "%name"' => 'Modifier la devise "%name"',
+    'Edit customer %firstname %lastname' => 'Modification du client %firstname %lastname ',
     'Edit delivery address' => 'Editer l\'adresse de livraison',
     'Edit document "%name"' => 'Modifier le document "%name"',
-    'Edit feature "%name"' => 'Modifier la caractéristique "%name"',
+    'Edit feature "%name"' => 'modifier la caractéristique "%name"',
     'Edit folder' => 'Modifier le dossier',
     'Edit folder %title' => 'Modifier le dossier %title',
     'Edit image "%name"' => 'Modifier l\'image "%name"',
-    'Edit information in %lng' => 'Modifier les information en %lng',
+    'Edit information in %lng' => 'Modifier les informations en %lng',
     'Edit invoice address' => 'Editer l\'adresse de facturation',
-    'Edit mailing template "%name"' => 'Modifier le template de mailing "%name"',
-    'Edit next category' => 'Modifier la catégorie suivante',
+    'Edit mailing template "%name"' => 'Modifier le template de mail "%name"',
+    'Edit next category' => 'Modifier la rubrique suivante',
     'Edit next content' => 'Modifier le contenu suivant',
     'Edit next folder' => 'Modifier le dossier suivant',
     'Edit next product' => 'Modifier le produit suivant',
     'Edit order address' => 'Editer l\'adresse de commande',
-    'Edit previous category' => 'Modifier la catégorie précedente',
-    'Edit previous content' => 'Modifier le contenu précèdent',
+    'Edit previous category' => 'Modifier la rubrique précédente',
+    'Edit previous content' => 'Modifier le contenu précédent',
     'Edit previous folder' => 'Modifier le dossier précédent',
-    'Edit previous product' => 'Modifier le produit précèdent',
+    'Edit previous product' => 'Modifier le produit précédent',
     'Edit prices in %curr' => 'Modifier les prix en %curr',
     'Edit product' => 'Modifier le produit',
     'Edit product %title' => 'Modifier le produit %title',
@@ -378,75 +377,73 @@ return array(
     'Edit tax rule taxes' => 'Modifier les taxes de la règle de taxe',
     'Edit template "%name"' => 'Modifier le template "%name"',
     'Edit this address' => 'Editer cette adresse',
-    'Edit this category' => 'Editer cette catégorie',
+    'Edit this category' => 'Editer cette rubrique',
     'Edit this content' => 'Modifier ce contenu',
     'Edit this customer' => 'Modifier ce client',
     'Edit this folder' => 'Modifier ce dossier',
-    'Edit this language' => 'Modifier cette langue',
     'Edit this module' => 'Modifier ce module',
     'Edit this order' => 'Editer cette commande',
     'Edit this product' => 'Modifier ce produit',
-    'Edit variable %name' => 'Modifier de la variable "%name"',
+    'Edit variable %name' => 'Modifier la variable %name',
     'Editing %cat' => 'Edition de %cat',
-    'Editing %fold' => 'En cours de modification de %fold',
+    'Editing %fold' => 'Modification de %fold',
     'Editing %title' => 'En cours de modification de %title',
     'Editing attribute "%name"' => 'En cours de modification de la déclinaison "%name"',
     'Editing country "%name"' => 'En cours de modification du pays "%name"',
     'Editing currency "%name"' => 'En cours de modification de la devise "%name"',
     'Editing customer "%name"' => 'Edition du client "%name"',
-    'Editing document "%name"' => 'En cours de modification du document "%name"',
+    'Editing document "%name"' => 'Modification du document "%name"',
     'Editing feature "%name"' => 'En cours de modification de la caractéristique "%name"',
-    'Editing image "%name"' => 'En cours de modification de l\'image "%name"',
+    'Editing image "%name"' => 'Modification de l\'image "%name"',
     'Editing mailing template "%name"' => 'En cours de modification du template de mailing "%name"',
-    'Editing module' => 'En cours de modification du module',
-    'Editing profile' => 'En cours du profil',
+    'Editing module' => 'Module en cours de modification',
+    'Editing profile' => 'Modification du profil',
     'Editing shipping configuration "%name"' => 'En cours de modification de la configuration de livraison "%name"',
     'Editing shipping zone "%name"' => 'En cours de modification de la zone de livraison "%name"',
     'Editing tax' => 'En cours de modification de la taxe',
     'Editing tax rule' => 'En cours de modification de la règle de taxe',
-    'Editing template "%name"' => 'En cours de modification du template "%name"',
+    'Editing template "%name"' => 'Modification du template "%name"',
     'Editing variable "%name"' => 'Modification de la variable "%name" ',
     'Email address' => 'Adresse e-mail',
-    'Email used when you send an email to your customers (Order confirmations, etc).' => 'Email utilisé lorsque vous envoyez un email à vos clients (Confirmation de commande, etc...).',
+    'Email used when you send an email to your customers (Order confirmations, etc).' => 'adresse email utilisé pour envoyer les mails à vos clients',
     'Enable remote SMTP use : ' => 'Activer l\'utilisation d\'un serveur SMTP distant:',
     'Enable/Disable' => 'Activer/Désactiver',
     'Enabled coupons' => 'Codes promo disponibles',
     'Encryption' => 'Chiffrement',
-    'Encryption :' => 'Chiffrement:',
+    'Encryption :' => 'Chiffrement :',
     'Enter here all possible attribute values.' => 'Entrez ici toutes les valeurs de déclinaison possible.',
     'Enter here all possible feature values. To get a free text feature in product forms, don\'t add any value.' => 'Entrez ici toutes les caractéristiques possibles. Afin d\'avoir un texte libre dans le formulaire du produit, n\'ajoutez aucune valeur.',
     'Enter here the attribute name in the default language (%language_name)' => 'Entrez ici le nom de la déclinaison dans la langue par défaut (%language_name)',
-    'Enter here the category name in the default language (%title)' => 'Entrer ici le nom de la catégorie dans la langue par défaut (%title)',
-    'Enter here the content name in the default language (%title)' => 'Entrez ici le nom du contenu dans le language par défaut (%title)',
-    'Enter here the currency name in the default language (%title)' => 'Entrez ici le nom de la devise dans la langue par défaut (%title)',
-    'Enter here the feature name in the default language (%title)' => 'Entrez ici le nom de la caractéristique dans la langue par défaut (%title)',
+    'Enter here the category name in the default language (%title)' => 'Entrer ici le nom de la rubrique dans la langue par défaut (%title)',
+    'Enter here the content name in the default language (%title)' => 'Entrez ici le nom du contenu dans la langue par défaut (%title)',
+    'Enter here the currency name in the default language (%title)' => 'Renseigner le nom de la devise dans la langue par défaut (%title)',
+    'Enter here the feature name in the default language (%title)' => 'Renseigner le nom de la caractéristique dans la langue par défaut (%title)',
     'Enter here the feature value as free text' => 'Indiquez ici la valeur de la caractéristique',
     'Enter here the folder name in the default language (%title)' => 'Entrez ici le nom du dossier dans la langue par défaut (%title)',
-    'Enter here the mailing template purpose in the default language (%title)' => 'Entrez ici l\'objectif du template de mailing dans le language par défaut (%title)',
     'Enter here the product name in the default language (%title)' => 'Entrez ici le nom du produit dans la langue par défaut (%title)',
-    'Enter here the product price in the default currency (%title)' => 'ntrez ici le prix du produit dans la langue par défaut (%title)',
+    'Enter here the product price in the default currency (%title)' => 'entrez ici le prix du produit dans la langue par défaut (%title)',
     'Enter here the product reference' => 'Entrez ici la nouvelle référence produit',
     'Enter here the product weight, in Kilogrammes' => 'Entrez ici le poids du produit, en Kilogrammes',
-    'Enter here the template name in the default language (%title)' => 'Entrez ici le nom du template dans la langue par défaut (%title)',
-    'Enter here the value in the current edit language (%language_name)' => 'Entrez ici la valeur dans la langue courante (%language_name)',
-    'Enter here the value in the current edit language (%title)' => 'Entrez ici la valeur dans le langue courante (%title)',
-    'Enter new accessory position' => 'Modifier la position de l\'accessoire',
+    'Enter here the template name in the default language (%title)' => 'Renseignez le nom du template dans la langue par défaut (%title)',
+    'Enter here the value in the current edit language (%language_name)' => 'Rensignez la valeur dans la langue d\'édition actuelle (%language_name)',
+    'Enter here the value in the current edit language (%title)' => 'Entrez la valeur dans la langue d\'édition courante (%title)',
+    'Enter new accessory position' => 'Renseigner la nouvelle position pour cet accessoire',
     'Enter new attribute position' => 'Modifier la position de la déclinaison',
     'Enter new category position' => 'Classement de la catégorie',
     'Enter new content position' => 'Modifier la position du contenu',
     'Enter new currency position' => 'Modifier la position de la devise',
     'Enter new feature position' => 'Modifier la position de la caractéristique',
     'Enter new folder position' => 'Modifier la position du dossier',
-    'Enter new module position' => 'Entrez l\'emplacement du nouveau module',
+    'Enter new module position' => 'Renseigner la nouvelle position pour ce module',
     'Enter new product position' => 'Classement du produit',
     'Enter new value position' => 'Entrez une nouvelle position',
-    'Enter one or more IP V4 addresses separated by ";". Leave empty to display logs for all IP addresses' => 'Entrez une ou plusieurs adresses IP V4 séparées par un ";". Laissez vide afin d\'afficher les logs pour toutes les adresses IP',
-    'Enter one or more file names without path separated by ";". Use "!" before a file name to exclude it. Use "*" to activate logs for all files.' => 'Entrez un ou plusieurs nom de fichiers sans chemin séparés par un ";". Utilisez "!" avant un nom de fichier pour l\'exclure. Utilisez "*" afin d\'activer les logs pour tous les fichiers.',
+    'Enter one or more IP V4 addresses separated by ";". Leave empty to display logs for all IP addresses' => 'Entrer une ou plusieurs adresse IP (V4) séparés pas des ";". Laisser vide pour afficher les logs pour toutes les adresses IP',
+    'Enter one or more file names without path separated by ";". Use "!" before a file name to exclude it. Use "*" to activate logs for all files.' => 'entrer un ou plusieurs nom de fichiers, séparés par des ";". Utiliser "!" avant le nom d\'un fichier pour l\'exclure. Utiliser "*" pour activer les logs sur tous les fichiers',
     'Error' => 'Erreur',
-    'Example :' => 'Exemple:',
+    'Example :' => 'Exemple :',
     'Existing combinations will be deleted. Do you want to continue ?' => 'Les combinaisons existantes seront supprimées. Voulez-vous continuer ?',
-    'Expiration date' => 'Date de fin',
-    'Expiration date :' => 'Date de fin de validité',
+    'Expiration date' => 'Date de fin de validité',
+    'Expiration date :' => 'Date de fin de validité : ',
     'Failed to get converted prices. Please try again.' => 'Erreur lors de la récupération des prix convertis. Veuillez réessayer.',
     'Failed to get prices. Please try again.' => 'Erreur lors de la récupération des prix. Veuillez réessayer.',
     'Fax number' => 'Numéro de fax',
@@ -454,11 +451,11 @@ return array(
     'Feature information' => 'Informations sur la caractéristique',
     'Feature title' => 'Titre de la caractéristique',
     'Feature value' => 'Valeur de la caractéristique',
-    'Feature value for this product' => 'Valeur de la caractéristique',
+    'Feature value for this product' => 'Valeur de la caractéristique pour ce produit',
     'Feature values' => 'Valeurs de la caractéristique',
     'Features' => 'Caractéristiques',
-    'File' => 'Fichier ',
-    'File names' => 'Noms du fichier',
+    'File' => 'Fichier',
+    'File names' => 'Nom du fichier',
     'Files manager' => 'Gestionnaire de fichiers',
     'First Name' => 'Prénom',
     'First name' => 'Prénom',
@@ -467,20 +464,20 @@ return array(
     'Firstname' => 'Prénom',
     'Folder created on %date_create. Last modification: %date_change' => 'Dossier créé le %date_create. Dernière modification le %date_change',
     'Folder title' => 'Titre du dossier',
-    'Folders' => 'Dossier',
+    'Folders' => 'Dossiers',
     'Folders in %fold' => 'Dossier dans %fold',
-    'French 19.6% VAT is a tax which add a 19.6% tax to the product price.' => 'La TVA française de 19.6% est une taxe qui ajoute 19.6% au prix du produit.',
-    'French 19.6% VAT with ecotax is the applicance of the ecotax (on the product price) then the applicance of the 19.6% tax (on the product price + the ecotax amount).' => 'La TVA française de 19.6% avec écotaxe est l\'application de l\'écotaxe (sur le prix du produit) puis l\'application de la taxe de 19.6% (sur le prix du produit + le montant écotaxe).',
+    'French 19.6% VAT is a tax which add a 19.6% tax to the product price.' => 'La TVA française de 20% est une taxe qui ajoute 20% au prix du produit.',
+    'French 19.6% VAT with ecotax is the applicance of the ecotax (on the product price) then the applicance of the 19.6% tax (on the product price + the ecotax amount).' => 'La TVA française de 20% avec écotaxe est l\'application de l\'écotaxe (sur le prix du produit) puis l\'application de la taxe de20% (sur le prix du produit + le montant écotaxe).',
     'From' => 'De',
-    'Front-office templates' => 'Template Front-office',
+    'Front-office templates' => 'templates Front-office',
     'General' => 'Général',
     'General configuration' => 'Configuration générale',
     'General description' => 'Description générale',
     'Go to administration home' => 'Aller à l\'accueil de l\'interface d\'administration',
     'H:i:s' => 'H:i:s',
-    'HTML version of this message' => 'Version HTML de ce message',
+    'HTML version of this message' => 'Version HTML du message',
     'Home' => 'Accueil',
-    'Host' => 'Host',
+    'Host' => 'Nom de l\'hôte',
     'Host :' => 'Host',
     'ID' => 'ID',
     'IP Addresses' => 'Adresse IP',
@@ -488,29 +485,29 @@ return array(
     'ISO 4217 code' => 'Code ISO 4217',
     'ISO 639 Code' => 'Code ISO 639',
     'ISO Code' => 'Code ISO',
-    'If a translation is missing or incomplete :' => 'Si une traduction est manquante ou incomplète:',
-    'If yes, redirections through Redirect::exec() will be displayed as links' => 'Si oui, les redirections seront faites via Redirect::exec() seront affichées comme liens',
-    'Il seems that this string contains a Smarty variable (&#36;). If \'s the case, it cannot be transleted properly.' => 'Il semble que cette chaîne contient une variable Smarty(&#36;). Si c\'est le cas, elle ne pourra pas être traduire correctement.',
+    'If a translation is missing or incomplete :' => 'Si une traduction est manquante ou incomplète :',
+    'If yes, redirections through Redirect::exec() will be displayed as links' => 'Si oui, les redirections générés pas Redirect::exec seront affichés par des liens',
+    'Il seems that this string contains a Smarty variable (&#36;). If \'s the case, it cannot be transleted properly.' => 'La chaîne semble contient une variable smarty (&#36;). Si c\'est le cas elle ne peut pas être traduite correctement',
     'Image' => 'Image',
-    'Image information' => 'Information sur l\'image',
+    'Image information' => 'Information de l\'image',
     'Images' => 'Images',
     'Impossible to change default country. Please contact your administrator or try later' => 'Impossible de modifier le pays par défaut. Veuillez contacter votre administrateur ou réessayer plus tard',
     'Impossible to change default languages. Please contact your administrator or try later' => 'Impossible de modifier la langue par défaut. Veuillez contacter votre administrateur ou essayer plus tard',
     'In order to manges your shop taxes you can manage' => 'Pour pouvoir gérer les taxes de votre magasin vous pouvez gérer',
-    'In page' => 'Sur la page:',
-    'In pages:' => 'Sur les pages:',
+    'In page' => 'Dans la page',
+    'In pages:' => 'Dans les pages : ',
     'Install a new module' => 'Installer un nouveau module',
     'Invoice and Delivery' => 'Livraison et facturation',
-    'Invoice date' => 'Facture date',
+    'Invoice date' => 'Date de facturation',
     'Invoice informations' => 'Informations de facturation',
     'Invoice reference' => 'Facture ref',
     'Is available on special offers' => 'Est valide sur les offres promotionnelles',
     'Is cumulative' => 'Est cumulable',
-    'Is disabled' => 'Est désactivé',
-    'Is enabled' => 'Est valide',
+    'Is disabled' => 'désactivé',
+    'Is enabled' => 'Est activé',
     'Is removing postage' => 'Offre les frais de port',
     'Is unlimited' => 'Est illimité',
-    'Keep the most important part of your description in the first 150-160 characters.' => 'Insérez la partie la plus importante de votre description dans les 150-160 premiers caractères.',
+    'Keep the most important part of your description in the first 150-160 characters.' => 'Votre description ne devrait pas dépasser 150 à 160 caractères',
     'Kg' => 'Kg',
     'Label' => 'Libellé',
     'Language name' => 'Nom de la langue',
@@ -527,10 +524,10 @@ return array(
     'Leave empty to keep current password' => 'Laisser ce champ vide pour ne pas modifier le mot de passe',
     'Lire la suite' => 'Lire la suite',
     'List' => 'Liste',
-    'Loading Thelia lastest news...' => 'Chargement des dernières nouvelles de Thelia...',
-    'Locale' => 'Locale',
-    'Log lines format' => 'Format de la ligne de log',
-    'Log lines header format. You may use the following variables: ' => 'Format de l\'en-tête des lignes de log. Vous pouvez utiliser les variables suivantes:',
+    'Loading Thelia lastest news...' => 'Chargement des dernières information Thelia...',
+    'Locale' => 'Paramètre régional',
+    'Log lines format' => 'Format d\'une ligne de log',
+    'Log lines header format. You may use the following variables: ' => 'Format d\'une ligne de log. Vous pouvez utiliser ces variables : ',
     'Login' => 'Connexion',
     'Logout' => 'Se déconnecter',
     'Long description :' => 'Description longue',
@@ -538,20 +535,20 @@ return array(
     'Mailing template name' => 'Nom du template de mailing',
     'Mailing template purpose' => 'Objectif du template de mailing',
     'Mailing templates' => 'Template e-mail',
-    'Make sure it uses keywords found within the page itself.' => 'Assurez-vous d\'utiliser des mot-clés qui apparaissent dans le contenu de la page en cours.',
-    'Make sure that your title is clear, and contains many of the keywords within the page itself.' => 'Assurez-vous que votre titre est clair et qu\'il contient les mot clés pertinents de la page en cours.',
-    'Manage module rights' => 'Gestion des accès aux modules',
-    'Manage resource rights' => 'Gérer les droits d\'accès aux ressources',
+    'Make sure it uses keywords found within the page itself.' => 'Assurez vous d\'utiliser des mots-clés présents dans la page courante',
+    'Make sure that your title is clear, and contains many of the keywords within the page itself.' => 'Assurez-vous d\'avoir un titre clair et qui contient les mots-clés correspondant à la page en cours',
+    'Manage module rights' => 'Gestion des droits pour les modules',
+    'Manage resource rights' => 'Gestion de droits pour les ressources',
     'Manage taxes' => 'Gérer les taxes',
     'Manage the tax rule taxes appliance order' => 'Gérer les règles de taxe et leur ordre d\'application',
-    'Max usage :' => 'Utilisations max',
+    'Max usage :' => 'Utilisations max : ',
     'May be cumulative' => 'Peut être cumulé',
     'Message created on %date_create. Last modification: %date_change' => 'Message créé le %date_create. Dernière modification le %date_change',
-    'Message level' => 'Niveau du message',
-    'Messages which have a level greater or equal to the selected level will be added to the log destinations. ' => 'Messages qui ont un niveau supérieur ou égale au niveau sélectionné seront ajoutés au logs.',
+    'Message level' => 'Message level',
+    'Messages which have a level greater or equal to the selected level will be added to the log destinations. ' => 'Les messages avec un niveau d\'erreur supérieur ou égal à celui sélectionné seront rajoutés dans les logs',
     'Module' => 'Module',
-    'Module access rights' => 'Droits d\'accès aux modules',
-    'Module created on %date_create. Last modification: %date_change' => 'Module créé le %date_create. Dernière modification le %date_change',
+    'Module access rights' => 'Droits d\'accès pour les modules',
+    'Module created on %date_create. Last modification: %date_change' => 'Module crée le %date_create. Dernière modification le %date_change',
     'Modules' => 'Modules',
     'More information about ISO 4217' => 'Plus d\'information à propos de l\'ISO 4217',
     'NONE' => 'AUCUN',
@@ -562,10 +559,10 @@ return array(
     'No' => 'Non',
     'No Folders found' => 'Aucun dossier trouvé',
     'No area defined with this id' => 'Pas de zone définie avec cette id',
-    'No available content in this folder' => 'Ce dossier est vide de contenus',
-    'No available product in this category' => 'Aucun produit disponible pour cette catégorie',
+    'No available content in this folder' => 'Ce dossier n\'a pas de contenu',
+    'No available product in this category' => 'Aucun produit disponible dans cette rubrique',
     'No available value for this attribute' => 'Aucune valeur disponible pour cette déclinaison',
-    'No categories found' => 'Aucune catégorie trouvée',
+    'No categories found' => 'Aucune rubrique trouvée',
     'No country has been created yet. Click the + button to create one.' => 'Aucun pays n\'a encore été créé. Cliquez sur le bouton + pour en créer un',
     'No currency has been created yet. Click the + button to create one.' => 'Aucune devise n\'a encore été crée. Cliquez sur le bouton + pour en créer une.',
     'No folders found' => 'Aucun dossier n\'a été trouvé.',
@@ -580,23 +577,25 @@ return array(
     'Online' => 'En ligne',
     'Online products' => 'Produits en ligne',
     'Oops! An Error Occurred' => 'Oops ! Une erreur est survenue',
-    'Operator :' => 'Opérateur:',
     'Or' => 'Ou',
+    'Order #' => 'Commande #',
+    'Order %ref' => 'Commande %ref',
     'Order n°' => 'Commande n°',
+    'Order status:' => 'Statut de la commande : ',
     'Ordered products' => 'Produits commandés',
     'Orders' => 'Commandes',
-    'Originating file line number ' => 'Nombre de ligne du fichier d\'origine.',
-    'Originating file name' => 'Nom du fichier d\'origine.',
-    'Originating function name ' => 'Nom de la fonction d\'origine.',
+    'Originating file line number ' => 'Originating file line number ',
+    'Originating file name' => 'Originating file name',
+    'Originating function name ' => 'Originating function name ',
     'Other addresses' => 'Autres adresses',
     'Overall sales' => 'Total des ventes',
-    'PDF templates' => 'Template PDF',
+    'PDF templates' => 'templates PDF',
     'PDF | Invoice' => 'Facure PDF',
     'PDF | Purchase order' => 'Bon de commande PDF',
     'Page not found' => 'Page non trouvée',
     'Parameters' => 'Paramètres',
     'Password' => 'Mot de passe',
-    'Password :' => 'Mot de passe',
+    'Password :' => 'Mot de passe : ',
     'Payment information' => 'Informations de paiement',
     'Payment module' => 'Module de paiement',
     'Payment modules' => 'Modules de payment',
@@ -608,35 +607,36 @@ return array(
     'Please select a condition category' => 'Merci d\'entrer le type de condition',
     'Please select a coupon type' => 'Merci d\'entrer le type de code',
     'Please select another condition' => 'Merci de sélectionner une autre condition',
-    'Please select items to translate' => 'Veuillez sélectionner les éléments à traduire',
-    'Please select the B.O. template to translate' => 'Veuillez sélectionnez le template B.O. à traduire',
-    'Please select the E-mail template to translate' => 'Veuillez sélectionnez le template e-mail à traduire',
-    'Please select the F.O. template to translate' => 'Veuillez sélectionnez le template F.O. à traduire',
-    'Please select the PDF template to translate' => 'Veuillez sélectionnez le template PDF à traduire',
-    'Please select the module to translate' => 'Veuillez sélectionner le module à traduire',
-    'Please wait, loading' => 'Veuillez patienter, chargement',
+    'Please select items to translate' => 'Veuillez sélectionner un élément',
+    'Please select the B.O. template to translate' => 'Sélectionnez le template back-office que vous souhaitez traduire',
+    'Please select the E-mail template to translate' => 'Sélectionnez le template de mail à traduire',
+    'Please select the F.O. template to translate' => 'Sélectionnez le template front-office que vous souhaitez traduire',
+    'Please select the PDF template to translate' => 'Sélectionnez le template PDF à traduire',
+    'Please select the module to translate' => 'Sélectionnez le module à traduire',
+    'Please wait, loading' => 'Chargement, veuillez patienter',
     'Port' => 'Port',
-    'Port :' => 'Port',
+    'Port :' => 'Port : ',
     'Position' => 'Position',
     'Post Scriptum' => 'Post-scriptum',
     'Postage' => 'Frais de livraison',
     'Postscriptum' => 'Post-scriptum',
-    'Preview' => 'Aperçu',
-    'Preview category page' => 'Aperçu de la page catégorie',
+    'Preview' => 'Prévisualisation',
+    'Preview category page' => 'Aperçu de la page rubrique',
     'Preview folder page' => 'Aperçu de la page dossier',
     'Preview product page' => 'Aperçu de la page produit',
     'Previous month sales' => 'Ventes du mois précédent',
     'Previous year sales' => 'Ventes de l\année précédente',
+    'Price' => 'Prix',
     'Price excl. taxes' => 'Prix taxes exclues',
-    'Price incl. taxes' => 'Prix taxes incluses',
+    'Price incl. taxes' => 'Prix TTC',
     'Price<br />w/ taxes (%currency)' => 'Prix<br />avec taxes (%currency)',
     'Price<br />w/o taxes (%currency)' => 'Prix<br />sans taxes (%currency)',
-    'Pricing' => 'Tarifs',
+    'Pricing' => 'défintion des prix',
     'Product' => 'Produit',
     'Product Attributes' => 'Déclinaisons du produit',
     'Product EAN Code' => 'Code EAN du produit',
     'Product Features' => 'Caractéristiques du produit',
-    'Product accessories' => 'Accessoires du produit',
+    'Product accessories' => 'Accessoires',
     'Product attributes' => 'Déclinaisons produit',
     'Product catalog configuration' => 'Configuration du catalogue produit',
     'Product created on %date_create. Last modification: %date_change' => 'Produit créé le %date_create. Dernière modification le %date_change',
@@ -651,43 +651,42 @@ return array(
     'Profil' => 'Profil',
     'Profile' => 'Profil',
     'Profile code' => 'Code du profil',
-    'Profile created on %date_create. Last modification: %date_change' => 'Profil créé le %date_create. Dernière modification le %date_change',
+    'Profile created on %date_create. Last modification: %date_change' => 'Profil crée le %date_create. Dernière modification le %date_change ',
     'Profiles' => 'Profils',
-    'Promotion' => 'Promotion',
-    'Published by OpenStudio' => 'Edité par OpenStudio',
+    'Promotion' => 'Promo',
+    'Published by OpenStudio' => 'Développé par OpenStudio',
     'Purpose' => 'Objet',
-    'Quantity' => 'Quantité',
-    'Quickly create combinations using the combination builder' => 'Créer rapidement une combinaison via le constructeur de combinaison',
+    'Quickly create combinations using the combination builder' => 'Créer rapidement une combinaison via le générateur de combinaison',
     'Rate' => 'Taux',
     'Rate from Euro' => 'Taux à partir de l\'Euro',
     'Rate in &euro;' => 'Taux en &euro;',
-    'Read the documentation of this module' => 'Lire la documentation du module',
-    'Reference' => 'Reference',
-    'Registration date' => 'Date d\'inscription',
+    'Read the documentation of this module' => 'Lire la documentation de ce module',
+    'Reference' => 'Référence',
+    'Registration date' => 'Date d\'enregistrement',
     'Related content' => 'Contenu associé',
-    'Remove an accessory' => 'Enlever un accessoire',
+    'Remove an accessory' => 'Supprimer l\'accessoire',
     'Remove associated folder' => 'Enlever le dossier associé',
-    'Remove attribute' => 'Enlever la déclinaison',
+    'Remove attribute' => 'Supprimer la déclinaison',
     'Remove country' => 'Enlever ce pays',
     'Remove feature' => 'Enlever la caractéristique',
     'Remove from all product templates' => 'Enlever de tous les templates produit',
-    'Remove from category' => 'Enlever de la catégorie',
+    'Remove from category' => 'Supprimer de la rubrique',
     'Remove related content' => 'Enlever les contenus liés',
     'Remove selected values' => 'Enlever les valeur sélectionnées',
-    'Remove the product from this category' => 'Enlever ce produit de cette catégorie',
+    'Remove the product from this category' => 'Enlever ce produit de cette rubrique',
     'Remove this attribute from all product templates' => 'Enlever cette déclinaison de tous les template produit',
     'Remove this feature from all product templates' => 'Enlever cette caractéristique de tous les templates produit',
     'Remove zone' => 'Supprimer la zone',
-    'Resource' => 'Ressources',
-    'Resource access rights' => 'Droits d\'accès aux ressources',
+    'Resource' => 'Ressource',
+    'Resource access rights' => 'Droits d\'accès pour les ressources',
     'Resources' => 'Ressources',
     'Rewritten URL' => 'URL réécrites',
     'Rights' => 'Droits',
     'SEO' => 'SEO',
     'Sale' => 'En promo',
-    'Sale price incl. taxes' => 'Prix de vente taxes incluses',
-    'Sale price<br />w/ taxes (%currency)' => 'Prix de vente<br />sans taxes (%currency)',
-    'Sale price<br />w/o taxes (%currency)' => 'Prix de vente<br />avec taxes (%currency)',
+    'Sale price incl. taxes' => 'Prix promo TTC',
+    'Sale price<br />w/ taxes (%currency)' => 'Prix promo<br />HT (%currency)',
+    'Sale price<br />w/o taxes (%currency)' => 'Prix promo<br />TTC (%currency)',
     'Sales' => 'Ventes',
     'Sales excluding shipping' => 'Ventes hors frais de port',
     'Sales statistics' => 'Statistiques de vente',
@@ -699,21 +698,20 @@ return array(
     'Save this condition' => 'Enregistrer cette condition',
     'Save your modifications' => 'Enregistrer les modifications',
     'Search' => 'Recherche',
-    'Select a category and click (+) to add it to the additional category list' => 'Sélectionnez une catégorie et cliquez sur (+) pour l\'ajouter à la liste de catégorie additionnelle',
-    'Select a category to get its products' => 'Sélectionnez une catégorie pour avoir ses produits',
-    'Select a category...' => 'Sélectionnez une catégorie...',
-    'Select a content and click (+) to add it to this category' => 'Selectionnez un contenu et cliquez sur (+) pour l\'ajouter à cette catégorie',
-    'Select a content and click (+) to add it to this folder' => 'Sélectionnez un contenu et cliquez sur (+) pour l\'ajouter à ce dossier',
-    'Select a content and click (+) to add it to this product' => 'Chosiissez un contenu, et cliquez [+] pour l\'attacher au produit',
+    'Select a category and click (+) to add it to the additional category list' => 'Sélectionner une rubrique et cliquez sur (+) pour la rajouter dans la liste des rubrique associées',
+    'Select a category to get its products' => 'Sélectionner une rubrique pour avoir les produits qu\'elle contient',
+    'Select a category...' => 'Sélectionner une rubrique...',
+    'Select a content and click (+) to add it to this category' => 'Selectionnez un contenu et cliquez sur (+) pour l\'ajouter à cette rubrique',
+    'Select a content and click (+) to add it to this product' => 'Sélectionner un contenu et cliquer sur (+) pour l\'associer au produit',
     'Select a folder and click (+) to add it to the additional folder list' => 'Sélectionnez un dossier et cliquez sur (+) afin de l\'ajouter à la liste des dossiers aditionnels',
     'Select a folder content...' => 'Choisissez un dossier de contenu...',
     'Select a folder to get its content' => 'Choisissez un dossier de contenu pour lister ses contenus',
     'Select a folder...' => 'Choisissez un dossier de contenu...',
-    'Select a product and click (+) to add it as an accessory' => 'Sélectionnez un produit et cliquez sur (+) pour lui ajouter un accessoire',
-    'Select a product...' => 'Sélectionnez un produit...',
+    'Select a product and click (+) to add it as an accessory' => 'Sélectionner un produit et cliquer sur (+) pour l\'ajouter en tant qu\'accessoire',
+    'Select a product...' => 'Sélectionner un produit...',
     'Select a tax tule' => 'Sélectionnez une règle de taxes',
     'Select a value click (+) to add it to the combination' => 'Sélectionnez une valeur et cliquez sur (+) pour l\'ajouter à la combinaison',
-    'Select an attribute and click (+) to add it to this template' => 'Sélectionnez une déclinaison et cliquez sur (+) pour l\'ajouter à ce template',
+    'Select an attribute and click (+) to add it to this template' => 'Sélectionner une déclinaison et cliquer sur (+) pour l\'ajouter à ce template',
     'Select an attribute and click (+) to view available values' => 'Sélectionnez une déclinaison et cliquez sur (+) pour voir les valeurs disponibles',
     'Select an attribute value...' => 'Sélectionnez une valeur de déclinaison...',
     'Select an attribute...' => 'Sélectionnez une déclinaison...',
@@ -721,76 +719,79 @@ return array(
     'Select an feature...' => 'Sélectionnez une caractéristique...',
     'Select attribute values to combine. You may enter a default value for some of the fields of the generated combinations.' => 'Sélectionnez les valeurs de déclinaison à combiner. Vous pouvez entrer une valeur par défaut pour certains champs des combinaisons générées.',
     'Select here the tax applicable to this product' => 'Sélectionnez ici la taxe applicable sur ce produit',
-    'Select the E-mail template you want to translate' => 'Sélectionnez le template E-mail que vous voulez traduire',
-    'Select the PDF template you want to translate' => 'Sélectionnez le template PDF que vous voulez traduire',
-    'Select the back-office template you want to translate' => 'Sélectionnez le template Back-office que vous voulez traduire',
-    'Select the front-office template you want to translate' => 'Sélectionnez le template Front-office que vous voulez traduire',
-    'Select the module you want to translate' => 'Sélectionnez le module que vous voulez traduire',
-    'Select which items you want to translate' => 'Sélectionnez quels éléments vous voulez traduire',
+    'Select the E-mail template you want to translate' => 'Sélectionnez le template de mail à traduire',
+    'Select the PDF template you want to translate' => 'Sélectionnez le template PDF à traduire',
+    'Select the back-office template you want to translate' => 'Sélectionnez le template back-office que vous souhaitez traduire',
+    'Select the front-office template you want to translate' => 'Sélectionnez le template front-office que vous souhaitez traduire',
+    'Select the module you want to translate' => 'Sélectionnez le module à traduire',
+    'Select which items you want to translate' => 'Sélectionnez l\'élément que vous souhaitez traduire',
     'Send a mail to this customer' => 'Contacter ce client par mail',
     'Send files' => 'Envoyer des fichiers',
-    'Sequential number of log line' => 'Numéro de ligne du log.',
+    'Sequential number of log line' => 'Sequential number of log line',
     'Set as default tax rule' => 'Configurer en tant que règle par défaut',
     'Shipping configuration' => 'Configuration du transport',
     'Shipping configuration name' => 'Nom de la configuration de livraison',
     'Shipping zones' => 'Zones de livraison',
-    'Shop' => 'Magasin',
-    'Shop Informations' => 'Informations sur le magasin',
+    'Shop' => 'Boutique',
+    'Shop Informations' => 'Informations sur la boutique',
     'Short conclusion' => 'Courte conclusion',
     'Short description' => 'Description courte',
-    'Short description :' => 'Description courte',
+    'Short description :' => 'Description courte : ',
     'Show logs' => 'Voir les logs',
-    'Some of your translations are not saved. Continue anyway ?' => 'Certaines de vos traduction ne sont pas sauvegardée. Continuer quand même ?',
-    'Sorry, attribute ID=%id was not found.' => 'Veuillez nous excuser, la déclinaison ID=%id n\'a pas été trouvée',
-    'Sorry, country ID=%id was not found.' => 'Veuillez nous excuser, le pays ID=%id n\'a pas été trouvé',
-    'Sorry, currency ID=%id was not found.' => 'Veuillez nous excuser, la devise ID=%id n\'a pas été trouvée',
-    'Sorry, customer ID=%id was not found.' => 'Veuillez nous excuser, le client ID=%id n\'a pas été trouvé',
-    'Sorry, document ID=%id was not found.' => 'Veuillez nous excuser, le document ID=%id n\'a pas été trouvé',
-    'Sorry, feature ID=%id was not found.' => 'Veuillez nous excuser, la caractéristique ID=%id n\'a pas été trouvée',
-    'Sorry, image ID=%id was not found.' => 'Veuillez nous excuser, l\'image ID=%id n\'a pas été trouvée',
-    'Sorry, message ID=%id was not found.' => 'Veuillez nous excuser, le message ID=%id n\'a pas été trouvé',
-    'Sorry, template ID=%id was not found.' => 'Veuillez nous excuser, le template ID=%id n\'a pas été trouvé',
-    'Sorry, variable ID=%id was not found.' => 'Désolé, la variable ID=%id n\'a pas été trouvée.',
+    'Some of your translations are not saved. Continue anyway ?' => 'Certaines des traductions ne sont pas sauvegardées. Souhaitez-vous continuer ?',
+    'Sorry, attribute ID=%id was not found.' => 'Désolé, la déclinaison ID=%id n\'a pas été trouvé',
+    'Sorry, country ID=%id was not found.' => 'Désolé, le pays ID=%id n\'a pas été trouvé',
+    'Sorry, currency ID=%id was not found.' => 'Désolé, le devise ID=%id n\'a pas été trouvé',
+    'Sorry, customer ID=%id was not found.' => 'Désolé, le client ID=%id n\'a pas été trouvé',
+    'Sorry, document ID=%id was not found.' => 'Désolé, le document ID=%id n\'a pas été trouvé',
+    'Sorry, feature ID=%id was not found.' => 'Désolé, la caractéristique ID=%id n\'a pas été trouvé',
+    'Sorry, image ID=%id was not found.' => 'Désolé, l\'image ID=%id n\'a pas été trouvé',
+    'Sorry, message ID=%id was not found.' => 'Désolé, le message ID=%id n\'a pas été trouvé',
+    'Sorry, template ID=%id was not found.' => 'Désolé, le template ID=%id n\'a pas été trouvé',
+    'Sorry, variable ID=%id was not found.' => 'Désolé, la variable ID=%id n\'a pas été trouvé',
     'Source IP' => 'IP source',
-    'Source IP :' => 'IP source',
+    'Source IP :' => 'IP source : ',
     'Status' => 'Etat',
-    'Store' => 'Magasin',
-    'Store Business Identification Number (SIRET, etc).' => 'Numéro d\'identification de votre magasin (SIRET, etc).',
-    'Store address' => 'Adresse du magasin',
-    'Store configuration' => 'Configuration du magasin',
+    'Stock' => 'Stock',
+    'Store' => 'Information boutique',
+    'Store Business Identification Number (SIRET, etc).' => 'identifiant de la boutique (SIRET, etc)',
+    'Store address' => 'Adresse de la boutique',
+    'Store configuration' => 'Configuration de la boutique',
     'Street address' => 'Adresse',
     'Subject' => 'Sujet',
     'Superadministrator' => 'Super-administrateur',
     'Symbol' => 'Symbole',
-    'System Logs' => 'Logs système',
-    'System Logs configuration' => 'Configuration du système de logs',
-    'System logs' => 'Journal des logs',
+    'System Logs' => 'Gestion des logs',
+    'System Logs configuration' => 'Configuration des logs',
+    'System logs' => 'Gestion des logs',
     'System parameters' => 'Paramètres système ',
     'System variables' => 'Gestion des variables',
     'Tax' => 'Taxes',
     'Tax created on %date_create. Last modification: %date_change' => 'Taxe créée le %date_create. Dernière modification: %date_change',
     'Tax rule created on %date_create. Last modification: %date_change' => 'Règle de taxe créée le %date_create. Dernière modification le %date_change',
-    'Tax rule taxes will be update for the following countries :' => 'Les règles de taxe seront modifiées pour les pays suivants:',
+    'Tax rule taxes will be update for the following countries :' => 'Les règles de taxe seront modifiées pour les pays suivants :',
+    'Tax rules' => 'Règles de taxes',
     'Tax rules are combination of different taxes.' => 'Les règles de taxe sont une combinaison de différentes taxes.',
     'Taxed total' => 'Montant total des taxes',
     'Taxes' => 'Taxes',
-    'Taxes define the amount of money which is added to a bought product.' => 'Les taxes définissent le montant d\'argent qui est ajouté à un produit acheté',
+    'Taxes define the amount of money which is added to a bought product.' => 'Les taxes correspondent au montant ajouté au prix HT d\'un produit acheté',
     'Taxes rules' => 'Règles de taxes',
     'Template name' => 'Nom du template',
     'Template title' => 'Titre du template',
     'Templates' => 'Templates',
-    'Text version of this message' => 'Version texte de ce message',
-    'The HTML TITLE element is the most important element on your web page.' => 'La balise HTML TITLE est l\'élément le plus important de votre page.',
-    'The default pricing is used when no combination is defined.' => 'Le tarif par défaut est utilisé lorsque aucune combinaison n\'est définie.',
-    'The destinations processes logs to display, store or send them. You can select and configure zero, one or more destinations below.' => 'Destinations des processus de journaux à afficher, stocker ou envoyer. Vous pouvez sélectionner et configurer aucune, une ou plusieurs destinations ci-dessous.',
+    'Text version of this message' => 'Version texte du message',
+    'The HTML TITLE element is the most important element on your web page.' => 'L\'élément HTML TITLE est le plus important dans votre page',
+    'The default pricing is used when no combination is defined.' => 'Le prix pas défaut est utilisez lorsqu\'aucune combinaison n\'est utilisé',
+    'The destinations processes logs to display, store or send them. You can select and configure zero, one or more destinations below.' => 'Les destinations permettent d\'afficher, stocker ou bien envoyer les logs. Vous pouvez en sélectionner zéro, un ou plusieurs dans la liste ci-dessous',
     'The detailed description.' => 'La description détaillée.',
     'The mailing template in HTML format.' => 'Le template de mailing au format HTML',
     'The mailing template in text-only format.' => 'Le template de mailing en format text-only.',
-    'The page you\'ve requested was not found. Please check the page address, and try again.' => 'La page que vous avez demandé n\'est pas disponible.',
+    'The page you\'ve requested was not found. Please check the page address, and try again.' => 'La page désirée n\'existe pas. Merci de vérifier votre adresse et réessayer',
     'The rate from Euro (Price in Euro * rate = Price in this currency)' => 'Le taux à partir de l\'Euro (Prix en Euro * taux = Prix dans la devise)',
-    'The server returned a "404 Not Found"' => 'Le serveur à retourné l\'erreur "404 non trouvé"',
-    'The symbol, such as &#36;, £, &euro;...' => 'Le symbole, tel que &#36;, £, &euro;...',
-    'Thelia Back Office' => 'Thelia Back Office',
+    'The server returned a "404 Not Found"' => 'Le serveur a retourné une erreur "404 Not Found"',
+    'The symbol, such as &#36;, £, &euro;...' => 'Symbole tel que $, £, €',
+    'The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function' => 'La syntaxe utilisé est la même que la fonction <a href="http://www.php.net/date" target="_other">date()</a> de PHP',
+    'Thelia Back Office' => 'Panel d\'administration de Thelia',
     'Thelia Languages' => 'Langue Thelia',
     'Thelia Mailing System' => 'Configuration des envois de mails',
     'Thelia Mailing Templates' => 'Template de Mailing Thelia',
@@ -801,85 +802,85 @@ return array(
     'Thelia Shipping zones' => 'Zone de livraison de Thelia',
     'Thelia System Variables' => 'Variables Thelia',
     'Thelia configuration' => 'Configuration thelia',
-    'Thelia contributions' => 'Contributions Thelia',
-    'Thelia core' => 'Coeur Thelia',
+    'Thelia contributions' => 'Contributions de Thelia',
+    'Thelia core' => 'Coeur de Thelia',
     'Thelia informations' => 'Informations Thelia',
     'Thelia mailing templates' => 'Template de mailing Thelia',
     'Thelia product attributes' => 'Déclinaisons du produit Thelia',
     'Thelia product features' => 'caractéristiques produit de Thelia',
     'Thelia product templates' => 'templates produit Thelia',
-    'Thelia support forum' => 'Communauté Thelia',
+    'Thelia support forum' => 'Forum de Thelia',
     'Thelia system variables' => 'Variables Thelia',
-    'Thelia, the open source e-commerce solution' => 'Thelia, solution e-commerce libre',
+    'Thelia, the open source e-commerce solution' => 'Thelia, la solution e-commerce libre',
     'There is no documents attached to this %type.' => 'Il n\'y a aucun document lié à ce %type.',
     'There is no images attached to this %type.' => 'Il n\'y a pas d\'image liée à ce %type.',
     'They are some administrator which are linked to this administrator. Please edit/remove them before deleting this administrator.' => 'Cet administrateur est lié avec un ou plusieurs autres administrateurs. Supprimez ou modifiez ces administrateurs d\'abord.',
     'They are some administrator which are linked to this profile. Please edit/remove them before deleting this profile.' => 'Il y a des administrateurs liés à ce profil. Veuillez les modifier/supprimer avant de supprimer ce profil.',
-    'This category contains no contents' => 'Cette catégorie ne contient aucun contenu',
-    'This category doesn\'t contains any products. To add a new product, <strong>click the + button</strong> above.' => 'Cette catégorie n\'a aucun produit. Pour créer un nouveau product, <strong>cliques sur le bouton +</strong> ci-dessus. ',
-    'This category has no sub-categories.' => 'Cette catégorie n\'a pas de sous-catégorie.',
-    'This category has no sub-categories. To create a new one, click the + button above.' => 'Cette catégorie n\'a pas de sous-catégorie. Pour en créer une nouvelle, cliquez sur le bouton + ci-dessus.',
-    'This coupon is disabled, you can enable at the bottom of this form.' => 'Ce code promo est désactivé, vous pouvez l\'activer en bas du formulaire.',
-    'This folder contains no contents' => 'Ce dossier ne contient aucun contenu',
-    'This folder doesn\'t contains any contents. To add a new content, <strong>click the + button</strong> above.' => 'Ce dossier ne contient pas de contenu. Pour ajouter un nouveau contenu, <strong>cliquez sur le bouton + ci-dessus</strong>.',
+    'This category contains no contents' => 'Cette rubrique n\'a aucun contenu',
+    'This category doesn\'t contains any products. To add a new product, <strong>click the + button</strong> above.' => 'Cette rubrique n\'a aucun produit. Pour créer un nouveau produit, <strong>cliquer sur le bouton +</strong> ci-dessus. ',
+    'This category has no sub-categories.' => 'Cette rubrique n\'a pas de sous-rubrique.',
+    'This category has no sub-categories. To create a new one, click the + button above.' => 'Cette rubrique n\'a pas de sous-rubrique. Pour en créer une nouvelle, cliquez sur le bouton + ci-dessus.',
+    'This coupon is disabled, you can enable at the bottom of this form.' => 'Le code promo est désactivé. Vous pouvez l\'activer au début de ce formulaire',
+    'This customer has not defined any delivery address' => 'Ce client n\'a pas saisi aucune adresse de livraison',
+    'This folder doesn\'t contains any contents. To add a new content, <strong>click the + button</strong> above.' => 'Ce dossier n\'a aucun contenu. Pour ajouter un nouveau contenu, <strong>cliquez sur le bouton + ci-dessus</strong>.',
     'This folder has no sub-folders.' => 'Ce dossier n\'a pas de sous-dossiers.',
     'This folder has no sub-folders. To create a new one, click the + button above.' => 'Ce dossier n\'a pas de sous-dossiers. Afin de créer un nouveau, cliquez sur le bouton + ci-dessus.',
-    'This is the message purpose, such as \'Order confirmation\'.' => 'L\'objectif du message (ex: \'Confirmation de la commande\').',
-    'This is the subject of the e-mail, such as \'Your order is confirmed\'.' => 'Le sujet de l\'e-mail (ex: \'Votre commande est confirmée\').',
-    'This mailing template could not be changed.' => 'Ce template de mailing ne peut être modifié.',
+    'This is the message purpose, such as \'Order confirmation\'.' => 'Titre du message (ex : confirmation de commande)',
+    'This is the subject of the e-mail, such as \'Your order is confirmed\'.' => 'Sujet du message (ex : votre commande est validée)',
+    'This mailing template could not be changed.' => 'Le template de mailing ne peut pas être changé',
     'This month' => 'Ce mois',
-    'This product contains no accessories' => 'Ce produit ne contient aucun accessoire',
-    'This product contains no contents' => 'Ce produit ne contient aucun contenu',
-    'This product doesn\'t belong to any additional category.' => 'Ce produit n\'appartient à aucune catégorie additionnelle.',
+    'This product contains no accessories' => 'Ce produit n\'a aucun accessoire',
+    'This product contains no contents' => 'Ce produit n\'a aucun contenu associé',
+    'This product doesn\'t belong to any additional category.' => 'Ce produit n\'est associé à aucune rubrique supplémentaire',
     'This product doesn\'t belong to any additional folder.' => 'Ce produit n\'appartient à aucun dossier addoitionnel',
     'This product template does not contains any features' => 'Ce gabarit de produit ne comporte aucune caractéristique',
-    'This template contains no attributes' => 'Ce template ne contient aucune déclinaison',
+    'This template contains no attributes' => 'Ce template n\'a pas de déclinaison',
     'This template contains no features' => 'Ce template ne contient aucune caractéristique',
-    'This the unique name of this message. Do not change this value unless you understand what you do.' => 'La valeur unique du message. Ne pas la modifier à moins que vous compreniez ce que vous faites.',
-    'This variable could not be changed.' => 'Cette variable ne peut pas être modifiée',
+    'This the unique name of this message. Do not change this value unless you understand what you do.' => 'Ceci est le nom unique du message. Ne le modifiez que si vous savez ce que vous faîtes',
+    'This variable could not be changed.' => 'Cette variable ne peut pas être modifié',
     'This year' => 'Cette année',
-    'Timeout' => 'Timeout',
-    'Timeout :' => 'Timeout:',
+    'Timeout' => 'Délai d\'attente expiré',
+    'Timeout :' => 'Délai d\'attente expiré : ',
     'Title' => 'Titre',
-    'Title :' => 'Titre',
+    'Title :' => 'Titre : ',
     'To' => 'A',
-    'To create a new content, select an existing folder, or create a new one.' => 'Piur créer un nouveau contenu, choisissez un des dossiers ci dessus, ou créez un nouveau dossier.',
-    'To create a new product, select an existing category, or create a new one.' => 'Piur créer un nouveau produit, choisissez une des catégories ci-dessus, ou créez une nouvelle catégorie.',
+    'To create a new content, select an existing folder, or create a new one.' => 'Pour créer un nouveau contenu, sélectionnez un dossier existant ou créez en un nouveau',
+    'To create a new product, select an existing category, or create a new one.' => 'Pour créer un nouveau produit, veuillez sélectionner une rubrique existante ou en créer une nouvelle',
     'To remove a value from the combination, select it and click "remove"' => 'Afin de supprimer une valeur de la combinaison, sélectionnez la et cliquez sur "Enlever"',
     'Today' => 'Aujourd\'hui',
     'Top level' => 'Niveau 1',
     'Top level Contents' => 'Contenus de niveau 1',
     'Top level Products' => 'Produits mis en avant',
-    'Top level categories' => 'Catégories de niveau 1',
+    'Top level categories' => 'Rubriques de niveau 1',
     'Top level folders' => 'Dossiers de niveau 1',
     'Total' => 'Total',
     'Total including discount' => 'Total avec remise',
     'Total without discount' => 'Montant total hors remises',
     'Transaction reference' => 'Référence de la transaction',
-    'Translation' => 'Traduction',
+    'Translation' => 'Traductions',
     'Translations' => 'Traductions',
-    'Type :' => 'Type',
+    'Type :' => 'Type : ',
     'Unit taxed price' => 'Prix unitaire TTC',
     'Unit. price' => 'Prix unitaire',
     'Unlimited' => 'Illimité',
     'Update' => 'Mettre à jour',
-    'Update a new administrator' => 'Modifier cet administrateur',
+    'Update an administrator' => 'Mettre à jour cet administrateur',
     'Update coupon' => 'Mettre à jour le code',
     'Update rates' => 'Mettre à jour les taux',
     'Update tax rule taxes' => 'Mettre à jour les taxes de la règle de taxe',
     'Update this image' => 'Modifier cette image',
     'Usage left' => 'Utilisation restante',
     'Use Ctrl+click to select more than one value. You can also <a href="#" class="clear_feature_value" data-id="%id">clear selected values</a>.' => 'Utilisez Ctrl+clic pour choisir plus d\'une valeur. Vous pouvez aussi <a href="#" class="clear_feature_value" data-id="%id">tout désélectionner</a>.',
-    'Use HTML message defined below' => 'Utiliser le message HTML défini ci-dessous',
-    'Use Text message defined below' => 'Utiliser le message Text défini ci-dessous',
+    'Use HTML message defined below' => 'Utiliser le message HTML définie ci-dessous',
+    'Use Text message defined below' => 'Utiliser la version texte définie ci-dessous',
     'Use address by default' => 'Utiliser comme adresse par défaut',
     'Use default layout' => 'Utiliser le layout par défaut',
-    'Use the keyword phrase in your URL.' => 'Utilisez les mot-clés importants de la page dans votre URL.',
-    'Use this address by default' => 'Utiliser comme adresse par défaut',
-    'Used in your store front' => 'Utilisé dans votre vitrine',
+    'Use the keyword phrase in your URL.' => 'Utilisez des mots clés dans votre url',
+    'Use this address by default' => 'Utiliser cette adresse par défaut',
+    'Used in your store front' => 'Utilisé dans le front de votre boutique',
     'Username' => 'Nom d\'utilisateur',
-    'Username :' => 'Nom d\'utilisateur',
-    'Using a domain or subdomain for each language' => 'En utilisant un domaine ou un sous domaine pour chaque langue',
+    'Username :' => 'Nom d\'utilisateur : ',
+    'Using a domain or subdomain for each language' => 'utiliser un domaine ou un sous domaine pour chaque langue',
     'Value' => 'Valeur',
     'Variable created on %date_create. Last modification: %date_change' => 'Variable créée le %date_create. Dernière modification: %date_change',
     'Variable name' => 'Nom de la variable',
@@ -887,7 +888,7 @@ return array(
     'Variable value' => 'Valeur de la variable',
     'Version %ver' => 'Version %ver',
     'View' => 'Voir',
-    'View only missing translations' => 'Voir uniquement les traductions manquantes',
+    'View only missing translations' => 'N\'afficher que les traductions manquantes',
     'View shop' => 'Voir la boutique',
     'View site' => 'Voir le site',
     'Visibility' => 'Visibilité',
@@ -896,38 +897,38 @@ return array(
     'Welcome' => 'Bienvenue',
     'Will be available on special offers' => 'Sera disponible pour les produits en promotion',
     'Will remove postage' => 'Supprimera les frais de port',
-    'Won\'t be available on special offers' => 'Ne sera pas disponible pour les produits en promotion',
+    'Won\'t be available on special offers' => 'N\'est pas disponible pour les offres spéciales',
     'Won\'t remove postage' => 'Ne supprimera pas les frais de port',
     'Yes' => 'Oui',
     'Yesterday sales' => 'Ventes de la veille',
-    'You can attach here some content to this category' => 'Vous pouvez lier ici des contenus à cette catégorie',
-    'You can attach here some content to this product' => 'Attachez ici un ou plusieurs contenus à ce produit',
-    'You can attach this product to more categories in the details tab.' => 'Vous pouvez lier ce produit à plusieurs catégories dans l\'onglet détail.',
-    'You can change the default category (%title) in the "General" tab.' => 'Vous pouvez modifier la catégorie par défaut (%title) dans l\'onglet "Général".',
+    'You can attach here some content to this category' => 'Vous pouvez lier ici des contenus à cette rubrique',
+    'You can attach here some content to this product' => 'Vous pouvez associer des contenus avec ce produit',
+    'You can attach this product to more categories in the details tab.' => 'Vous pouvez lier ce produit à plusieurs rubriques dans l\'onglet détail.',
+    'You can change the default category (%title) in the "General" tab.' => 'Vous pouvez changer la catégorie par défaut (%title) dans l\'onglet "Général"',
     'You can change the default folder (%title) in the "General" tab.' => 'Vous pouvez modifier le dossier par défaut (%title) dans l\'onglet "Général".',
     'You can\'t delete this administrator' => 'Vous ne pouvez pas supprimer cet administrateur',
     'You can\'t delete this profile' => 'Vous ne pouvez pas supprimer ce profil',
-    'You don\'t need to use commas or other punctuations.' => 'Il n\'est pas nécessaire d\'utiliser d\'apostrophe ou autre ponctuation.',
-    'Your current IP address is %ip' => 'Votre adresse IP courante est %ip',
+    'You don\'t need to use commas or other punctuations.' => 'Vous n\'avez pas besoin d\'utiliser de virgules ou d\'autres signes de ponctuation',
+    'Your current IP address is %ip' => 'Votre adresse IP est %ip',
     'Zip code' => 'Code postal',
     'Zones' => 'Zones',
     'activate' => 'activer',
-    'activate %title module' => 'activer le module %title',
-    'activation' => 'activation',
+    'activate %title module' => 'Activez le module %title',
+    'activation' => 'Activation',
     'and' => 'et',
     'classic modules' => 'Modules classiques',
     'code' => 'code',
     'company' => 'entreprise',
     'customer ref' => 'ref client',
-    'd-m-Y' => 'j-m-A',
+    'd-m-Y' => 'd-m-Y',
     'date form' => 'formulaire de date',
-    'date in yyyy-mm-dd format' => 'date au format yyyy-mm-dd',
+    'date in yyyy-mm-dd format' => 'date in yyyy-mm-dd format',
     'days left' => 'jours restants',
     'deactivate' => 'désactiver',
     'deactivation' => 'désactivation',
     'en_US' => 'en_US',
     'firstname & lastname' => 'Prénom & nom',
-    'hour in hh:mm:ss format' => 'date au format hh:mm:ss',
+    'hour in hh:mm:ss format' => 'hour in hh:mm:ss format',
     'last order' => 'Dernière commande',
     'long description' => 'description longue',
     'max usage' => 'utilisations max',
@@ -941,5 +942,5 @@ return array(
     'tracking reference' => 'Reference Tracking',
     'uncheck all' => 'tout décocher',
     'you can combine taxes in tax rules and chose if they are applied one after the other or at the same time : it allows to apply taxes on an already taxed price or not.' => 'vous pouvez combiner des taxes en règles de taxe et choisir si elle sont appliquées l\'une après l\'autre ou en même temps: cela permet d\'appliquer des taxes sur un produit déjà taxé ou non.',
-    'yyyy-mm-dd' => 'jjjj--mm--aa',
+    'yyyy-mm-dd' => 'yyyy-mm-dd',
 );
diff --git a/templates/backOffice/default/I18n/it_IT.php b/templates/backOffice/default/I18n/it_IT.php
old mode 100644
new mode 100755
diff --git a/templates/backOffice/default/admin-layout.tpl b/templates/backOffice/default/admin-layout.tpl
index 6876b5dd5..4e04f15be 100644
--- a/templates/backOffice/default/admin-layout.tpl
+++ b/templates/backOffice/default/admin-layout.tpl
@@ -67,16 +67,36 @@
 		      		    <div class="version-info pull-left">{intl l='Version %ver' ver="{$THELIA_VERSION}"}</div>
 
                         <div class="clearfix pull-right hidden-xs">
-                            <div class="btn-group pull-right">
-                                <a href="{navigate to="index"}" title="{intl l='View site'}" target="_blank" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> {intl l="View shop"}</a>
-                                <button class="btn btn-default btn-primary"><span class="glyphicon glyphicon-user"></span> {admin attr="firstname"} {admin attr="lastname"}</button>
-                                <button class="btn btn-default btn-primary dropdown-toggle" data-toggle="dropdown">
-                                    <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a class="profile" href="{url path='admin/configuration/administrators'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
-                                    <li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li>
-                                </ul>
+                            <div class="button-toolbar pull-righ" role="toolbar">
+
+                                <div class="btn-group">
+                                    <a href="{navigate to="index"}" title="{intl l='View site'}" target="_blank" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> {intl l="View shop"}</a>
+                                    <button class="btn btn-default btn-primary"><span class="glyphicon glyphicon-user"></span> {admin attr="firstname"} {admin attr="lastname"}</button>
+                                    <button class="btn btn-default btn-primary dropdown-toggle" data-toggle="dropdown">
+                                        <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        <li><a class="profile" href="{url path='admin/configuration/administrators'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
+                                        <li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li>
+                                    </ul>
+                                </div>
+
+                                <div class="btn-group">
+                                    {loop type="lang" name="ui-lang" id="{lang attr='id'}"}
+                                    <button class="btn btn-default">
+                                        <img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /> {$CODE|ucfirst}</a>
+                                    </button>
+                                    {/loop}
+
+                                    <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                        <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        {loop type="lang" name="ui-lang"}
+                                        <li><a href="{url path="{navigate to="current"}" lang={$CODE}}"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /> {$CODE|ucfirst}</a></li>
+                                        {/loop}
+                                     </ul>
+                                </div>
                             </div>
                         </div>
 
diff --git a/templates/backOffice/default/administrators.html b/templates/backOffice/default/administrators.html
index 73fd9724d..9bec35ee3 100644
--- a/templates/backOffice/default/administrators.html
+++ b/templates/backOffice/default/administrators.html
@@ -39,6 +39,7 @@
                                     <th>{intl l="Login"}</th>
                                     <th>{intl l="First Name"}</th>
                                     <th>{intl l="Last Name"}</th>
+                                    <th>{intl l="Locale"}</th>
                                     <th>{intl l="Profile"}</th>
                                     <th class="col-md-1">{intl l="Actions"}</th>
                                 </tr>
@@ -51,6 +52,7 @@
                                     <td data-field-class="js-login">{$LOGIN}</td>
                                     <td data-field-class="js-firstname">{$FIRSTNAME}</td>
                                     <td data-field-class="js-lastname">{$LASTNAME}</td>
+                                    <td data-field-class="js-locale">{$LOCALE}</td>
                                     <td data-field-class="js-profile" data-value="{$PROFILE}">
                                         {if $PROFILE}
                                             {loop type="profile" name="admin-profile" id=$PROFILE}
@@ -149,6 +151,19 @@
         </div>
     {/form_field}
 
+    {form_field form=$form field='locale'}
+        <div class="form-group {if $error}has-error{/if}">
+            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+
+            <select id="{$label_attr.for}" name="{$name}" required="required" data-toggle="selectpicker">
+                {loop name='lang-admin' type="lang"}
+                    <option value="{$LOCALE}">{$LOCALE}: {$TITLE}</option>
+                {/loop}
+            </select>
+
+        </div>
+    {/form_field}
+
     {form_field form=$form field='profile'}
         <div class="form-group {if $error}has-error{/if}">
             <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
@@ -240,6 +255,19 @@
         </div>
     {/form_field}
 
+    {form_field form=$form field='locale'}
+        <div class="form-group {if $error}has-error{/if}">
+            <label for="{$label_attr.for}" class="control-label">{intl l=$label}: </label>
+
+            <select id="{$label_attr.for}" name="{$name}" required="required" data-toggle="selectpicker">
+                {loop name='lang-admin' type="lang"}
+                    <option value="{$LOCALE}" {if $LOCALE == $value}selected="selected"{/if}>{$LOCALE}: {$TITLE}</option>
+                {/loop}
+            </select>
+
+        </div>
+    {/form_field}
+
     {form_field form=$form field='profile'}
         <div class="form-group {if $error}has-error{/if}">
             <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
@@ -265,7 +293,7 @@
         file = "includes/generic-create-dialog.html"
 
         dialog_id    = "administrator_update_dialog"
-        dialog_title = {intl l="Update a new administrator"}
+        dialog_title = {intl l="Update an administrator"}
         dialog_body  = {$smarty.capture.administrator_update_dialog nofilter}
 
         dialog_ok_label     = {intl l="Update"}
diff --git a/templates/backOffice/default/ajax/language-update-modal.html b/templates/backOffice/default/ajax/language-update-modal.html
index 909b351b0..cc40933a9 100644
--- a/templates/backOffice/default/ajax/language-update-modal.html
+++ b/templates/backOffice/default/ajax/language-update-modal.html
@@ -18,6 +18,7 @@
         <div class="form-group {if $error}has-error{/if}">
             <label for="{$label_attr.for}" class="control-label">{intl l={$label}} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l={$label}}" placeholder="{intl l='Company'}">
+            <span class="help-block">{intl l='<a href="http://en.wikipedia.org/wiki/ISO_639-1_language_matrix" target="_other">Check the list</a> of ISO 639-1 codes'}</span>
         </div>
     {/form_field}
 
@@ -32,6 +33,7 @@
         <div class="form-group {if $error}has-error{/if}">
             <label for="{$label_attr.for}" class="control-label">{intl l={$label}} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l={$label}}" placeholder="{intl l='Company'}">
+            <span class="help-block">{intl l='The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function'}</span>
         </div>
     {/form_field}
 
@@ -39,6 +41,7 @@
         <div class="form-group {if $error}has-error{/if}">
             <label for="{$label_attr.for}" class="control-label">{intl l={$label}} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l={$label}}" placeholder="{intl l='Company'}">
+            <span class="help-block">{intl l='The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function'}</span>
         </div>
     {/form_field}
 
@@ -53,7 +56,7 @@
     dialog_title = {intl l="Edit a language"}
     dialog_body  = {$smarty.capture.edit_lang_dialog nofilter}
 
-dialog_ok_label     = {intl l="Edit this language"}
+dialog_ok_label     = {intl l="Save changes"}
 dialog_cancel_label = {intl l="Cancel"}
 
 form_action        = {url path="/admin/configuration/languages/save/{$lang_id}"}
diff --git a/templates/backOffice/default/ajax/product-attributes-tab.html b/templates/backOffice/default/ajax/product-attributes-tab.html
index f9913d413..25cdc502a 100644
--- a/templates/backOffice/default/ajax/product-attributes-tab.html
+++ b/templates/backOffice/default/ajax/product-attributes-tab.html
@@ -198,6 +198,7 @@
 
 								                     {elseloop rel="product-features-av"}
 								                         {* Get the free text value *}
+                                                        {$feature_value=''}
 
 								                         {loop name="free-text-value" exclude_feature_availability="1" type="feature_value" product=$product_id feature=$ID  backend_context="1" lang="$edit_language_id"}
 								                            {$feature_value=$FREE_TEXT_VALUE}
diff --git a/templates/backOffice/default/assets/img/flags/ad.png b/templates/backOffice/default/assets/img/flags/ad.png
new file mode 100644
index 000000000..d965a794e
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ad.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ae.png b/templates/backOffice/default/assets/img/flags/ae.png
new file mode 100644
index 000000000..f429cc47a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ae.png differ
diff --git a/templates/backOffice/default/assets/img/flags/af.png b/templates/backOffice/default/assets/img/flags/af.png
new file mode 100644
index 000000000..482779b5c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/af.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ag.png b/templates/backOffice/default/assets/img/flags/ag.png
new file mode 100644
index 000000000..6470e12b4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ag.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ai.png b/templates/backOffice/default/assets/img/flags/ai.png
new file mode 100644
index 000000000..6c8ce5503
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ai.png differ
diff --git a/templates/backOffice/default/assets/img/flags/al.png b/templates/backOffice/default/assets/img/flags/al.png
new file mode 100644
index 000000000..69ba464d8
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/al.png differ
diff --git a/templates/backOffice/default/assets/img/flags/am.png b/templates/backOffice/default/assets/img/flags/am.png
new file mode 100644
index 000000000..5b222d90c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/am.png differ
diff --git a/templates/backOffice/default/assets/img/flags/an.png b/templates/backOffice/default/assets/img/flags/an.png
new file mode 100644
index 000000000..2c9e769ba
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/an.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ao.png b/templates/backOffice/default/assets/img/flags/ao.png
new file mode 100644
index 000000000..129a2d9e7
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ao.png differ
diff --git a/templates/backOffice/default/assets/img/flags/aq.png b/templates/backOffice/default/assets/img/flags/aq.png
new file mode 100644
index 000000000..565eba0f2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/aq.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ar.png b/templates/backOffice/default/assets/img/flags/ar.png
new file mode 100644
index 000000000..aa5049b30
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ar.png differ
diff --git a/templates/backOffice/default/assets/img/flags/as.png b/templates/backOffice/default/assets/img/flags/as.png
new file mode 100644
index 000000000..f959e3ac2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/as.png differ
diff --git a/templates/backOffice/default/assets/img/flags/at.png b/templates/backOffice/default/assets/img/flags/at.png
new file mode 100644
index 000000000..aa8d102b6
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/at.png differ
diff --git a/templates/backOffice/default/assets/img/flags/au.png b/templates/backOffice/default/assets/img/flags/au.png
new file mode 100644
index 000000000..f2fc59c83
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/au.png differ
diff --git a/templates/backOffice/default/assets/img/flags/aw.png b/templates/backOffice/default/assets/img/flags/aw.png
new file mode 100644
index 000000000..6ef2467ba
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/aw.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ax.png b/templates/backOffice/default/assets/img/flags/ax.png
new file mode 100644
index 000000000..21a5e1c0c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ax.png differ
diff --git a/templates/backOffice/default/assets/img/flags/az.png b/templates/backOffice/default/assets/img/flags/az.png
new file mode 100644
index 000000000..b6ea7c714
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/az.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ba.png b/templates/backOffice/default/assets/img/flags/ba.png
new file mode 100644
index 000000000..570594bb1
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ba.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bb.png b/templates/backOffice/default/assets/img/flags/bb.png
new file mode 100644
index 000000000..3e86dbbba
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bb.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bd.png b/templates/backOffice/default/assets/img/flags/bd.png
new file mode 100644
index 000000000..fc7affbfa
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bd.png differ
diff --git a/templates/backOffice/default/assets/img/flags/be.png b/templates/backOffice/default/assets/img/flags/be.png
new file mode 100644
index 000000000..182e9add5
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/be.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bf.png b/templates/backOffice/default/assets/img/flags/bf.png
new file mode 100644
index 000000000..2a861b5fb
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bf.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bg.png b/templates/backOffice/default/assets/img/flags/bg.png
new file mode 100644
index 000000000..903ed4f0c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bh.png b/templates/backOffice/default/assets/img/flags/bh.png
new file mode 100644
index 000000000..e2514bb98
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bh.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bi.png b/templates/backOffice/default/assets/img/flags/bi.png
new file mode 100644
index 000000000..82dc6c5b8
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bi.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bj.png b/templates/backOffice/default/assets/img/flags/bj.png
new file mode 100644
index 000000000..e9f24b0b9
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bj.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bl.png b/templates/backOffice/default/assets/img/flags/bl.png
new file mode 100644
index 000000000..533cce919
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bl.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bm.png b/templates/backOffice/default/assets/img/flags/bm.png
new file mode 100644
index 000000000..5b66e1f69
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bn.png b/templates/backOffice/default/assets/img/flags/bn.png
new file mode 100644
index 000000000..64cfbb9f5
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bo.png b/templates/backOffice/default/assets/img/flags/bo.png
new file mode 100644
index 000000000..3f0c41f7d
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bo.png differ
diff --git a/templates/backOffice/default/assets/img/flags/br.png b/templates/backOffice/default/assets/img/flags/br.png
new file mode 100644
index 000000000..f97b96a2c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/br.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bs.png b/templates/backOffice/default/assets/img/flags/bs.png
new file mode 100644
index 000000000..10a987f18
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bs.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bt.png b/templates/backOffice/default/assets/img/flags/bt.png
new file mode 100644
index 000000000..fe52b8727
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bt.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bw.png b/templates/backOffice/default/assets/img/flags/bw.png
new file mode 100644
index 000000000..8da822f15
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bw.png differ
diff --git a/templates/backOffice/default/assets/img/flags/by.png b/templates/backOffice/default/assets/img/flags/by.png
new file mode 100644
index 000000000..772539f89
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/by.png differ
diff --git a/templates/backOffice/default/assets/img/flags/bz.png b/templates/backOffice/default/assets/img/flags/bz.png
new file mode 100644
index 000000000..9ae671554
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/bz.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ca.png b/templates/backOffice/default/assets/img/flags/ca.png
new file mode 100644
index 000000000..3153c20f5
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ca.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cc.png b/templates/backOffice/default/assets/img/flags/cc.png
new file mode 100644
index 000000000..7e5d0df21
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cc.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cd.png b/templates/backOffice/default/assets/img/flags/cd.png
new file mode 100644
index 000000000..afebbaa74
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cd.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cf.png b/templates/backOffice/default/assets/img/flags/cf.png
new file mode 100644
index 000000000..60fadb290
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cf.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cg.png b/templates/backOffice/default/assets/img/flags/cg.png
new file mode 100644
index 000000000..7a7dc51d4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ch.png b/templates/backOffice/default/assets/img/flags/ch.png
new file mode 100644
index 000000000..dcdb068ef
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ch.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ci.png b/templates/backOffice/default/assets/img/flags/ci.png
new file mode 100644
index 000000000..25a99ef24
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ci.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ck.png b/templates/backOffice/default/assets/img/flags/ck.png
new file mode 100644
index 000000000..c8eba1690
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ck.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cl.png b/templates/backOffice/default/assets/img/flags/cl.png
new file mode 100644
index 000000000..1a7c983ff
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cl.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cm.png b/templates/backOffice/default/assets/img/flags/cm.png
new file mode 100644
index 000000000..2b4cea9a6
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cn.png b/templates/backOffice/default/assets/img/flags/cn.png
new file mode 100644
index 000000000..edd5f1de8
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/co.png b/templates/backOffice/default/assets/img/flags/co.png
new file mode 100644
index 000000000..ad276d074
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/co.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cr.png b/templates/backOffice/default/assets/img/flags/cr.png
new file mode 100644
index 000000000..a102ffa47
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cu.png b/templates/backOffice/default/assets/img/flags/cu.png
new file mode 100644
index 000000000..99f7118e8
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cu.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cv.png b/templates/backOffice/default/assets/img/flags/cv.png
new file mode 100644
index 000000000..7736ea1f3
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cv.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cw.png b/templates/backOffice/default/assets/img/flags/cw.png
new file mode 100644
index 000000000..3f65fa783
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cw.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cx.png b/templates/backOffice/default/assets/img/flags/cx.png
new file mode 100644
index 000000000..0f383db4b
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cx.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cy.png b/templates/backOffice/default/assets/img/flags/cy.png
new file mode 100644
index 000000000..a1b08de3d
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cy.png differ
diff --git a/templates/backOffice/default/assets/img/flags/cz.png b/templates/backOffice/default/assets/img/flags/cz.png
new file mode 100644
index 000000000..95ffbf620
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/cz.png differ
diff --git a/templates/backOffice/default/assets/img/flags/de.png b/templates/backOffice/default/assets/img/flags/de.png
new file mode 100644
index 000000000..f2f6175a1
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/de.png differ
diff --git a/templates/backOffice/default/assets/img/flags/dj.png b/templates/backOffice/default/assets/img/flags/dj.png
new file mode 100644
index 000000000..a08f8e112
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/dj.png differ
diff --git a/templates/backOffice/default/assets/img/flags/dk.png b/templates/backOffice/default/assets/img/flags/dk.png
new file mode 100644
index 000000000..349cb415c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/dk.png differ
diff --git a/templates/backOffice/default/assets/img/flags/dm.png b/templates/backOffice/default/assets/img/flags/dm.png
new file mode 100644
index 000000000..117e74d38
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/dm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/do.png b/templates/backOffice/default/assets/img/flags/do.png
new file mode 100644
index 000000000..892e2e2a6
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/do.png differ
diff --git a/templates/backOffice/default/assets/img/flags/dz.png b/templates/backOffice/default/assets/img/flags/dz.png
new file mode 100644
index 000000000..5e97662f0
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/dz.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ec.png b/templates/backOffice/default/assets/img/flags/ec.png
new file mode 100644
index 000000000..574108804
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ec.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ee.png b/templates/backOffice/default/assets/img/flags/ee.png
new file mode 100644
index 000000000..1f1189921
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ee.png differ
diff --git a/templates/backOffice/default/assets/img/flags/eg.png b/templates/backOffice/default/assets/img/flags/eg.png
new file mode 100644
index 000000000..0e873bebc
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/eg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/eh.png b/templates/backOffice/default/assets/img/flags/eh.png
new file mode 100644
index 000000000..a5b3b1cc2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/eh.png differ
diff --git a/templates/backOffice/default/assets/img/flags/en.gif b/templates/backOffice/default/assets/img/flags/en.gif
deleted file mode 100644
index 91b2b0090..000000000
Binary files a/templates/backOffice/default/assets/img/flags/en.gif and /dev/null differ
diff --git a/templates/backOffice/default/assets/img/flags/en.png b/templates/backOffice/default/assets/img/flags/en.png
new file mode 100644
index 000000000..43ebed3b0
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/en.png differ
diff --git a/templates/backOffice/default/assets/img/flags/er.png b/templates/backOffice/default/assets/img/flags/er.png
new file mode 100644
index 000000000..50781ce53
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/er.png differ
diff --git a/templates/backOffice/default/assets/img/flags/es.gif b/templates/backOffice/default/assets/img/flags/es.gif
deleted file mode 100644
index bdf09f8f7..000000000
Binary files a/templates/backOffice/default/assets/img/flags/es.gif and /dev/null differ
diff --git a/templates/backOffice/default/assets/img/flags/es.png b/templates/backOffice/default/assets/img/flags/es.png
new file mode 100644
index 000000000..b89db6856
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/es.png differ
diff --git a/templates/backOffice/default/assets/img/flags/et.png b/templates/backOffice/default/assets/img/flags/et.png
new file mode 100644
index 000000000..aa1472352
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/et.png differ
diff --git a/templates/backOffice/default/assets/img/flags/eu.png b/templates/backOffice/default/assets/img/flags/eu.png
new file mode 100644
index 000000000..2bfaf108d
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/eu.png differ
diff --git a/templates/backOffice/default/assets/img/flags/fi.png b/templates/backOffice/default/assets/img/flags/fi.png
new file mode 100644
index 000000000..b5a380c54
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/fi.png differ
diff --git a/templates/backOffice/default/assets/img/flags/fj.png b/templates/backOffice/default/assets/img/flags/fj.png
new file mode 100644
index 000000000..1cb520c59
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/fj.png differ
diff --git a/templates/backOffice/default/assets/img/flags/fk.png b/templates/backOffice/default/assets/img/flags/fk.png
new file mode 100644
index 000000000..a7cadb774
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/fk.png differ
diff --git a/templates/backOffice/default/assets/img/flags/fm.png b/templates/backOffice/default/assets/img/flags/fm.png
new file mode 100644
index 000000000..5a9b85cc2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/fm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/fo.png b/templates/backOffice/default/assets/img/flags/fo.png
new file mode 100644
index 000000000..4a49e30cb
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/fo.png differ
diff --git a/templates/backOffice/default/assets/img/flags/fr.gif b/templates/backOffice/default/assets/img/flags/fr.gif
deleted file mode 100644
index 2f6cf9ea3..000000000
Binary files a/templates/backOffice/default/assets/img/flags/fr.gif and /dev/null differ
diff --git a/templates/backOffice/default/assets/img/flags/fr.png b/templates/backOffice/default/assets/img/flags/fr.png
new file mode 100644
index 000000000..0706dcc05
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/fr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ga.png b/templates/backOffice/default/assets/img/flags/ga.png
new file mode 100644
index 000000000..38899c4a4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ga.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gb.png b/templates/backOffice/default/assets/img/flags/gb.png
new file mode 100644
index 000000000..fb1edaa08
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gb.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gd.png b/templates/backOffice/default/assets/img/flags/gd.png
new file mode 100644
index 000000000..2d33bbbdf
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gd.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ge.png b/templates/backOffice/default/assets/img/flags/ge.png
new file mode 100644
index 000000000..7aff2749c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ge.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gg.png b/templates/backOffice/default/assets/img/flags/gg.png
new file mode 100644
index 000000000..c0c3a78fd
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gh.png b/templates/backOffice/default/assets/img/flags/gh.png
new file mode 100644
index 000000000..e9b79a6dd
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gh.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gi.png b/templates/backOffice/default/assets/img/flags/gi.png
new file mode 100644
index 000000000..e14ebe597
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gi.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gl.png b/templates/backOffice/default/assets/img/flags/gl.png
new file mode 100644
index 000000000..6b995ff17
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gl.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gm.png b/templates/backOffice/default/assets/img/flags/gm.png
new file mode 100644
index 000000000..72c170aa4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gn.png b/templates/backOffice/default/assets/img/flags/gn.png
new file mode 100644
index 000000000..99830391e
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gq.png b/templates/backOffice/default/assets/img/flags/gq.png
new file mode 100644
index 000000000..9b020456c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gq.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gr.png b/templates/backOffice/default/assets/img/flags/gr.png
new file mode 100644
index 000000000..dc34d1913
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gs.png b/templates/backOffice/default/assets/img/flags/gs.png
new file mode 100644
index 000000000..55392f92f
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gs.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gt.png b/templates/backOffice/default/assets/img/flags/gt.png
new file mode 100644
index 000000000..0b4b8b4fd
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gt.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gu.png b/templates/backOffice/default/assets/img/flags/gu.png
new file mode 100644
index 000000000..31e9cc578
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gu.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gw.png b/templates/backOffice/default/assets/img/flags/gw.png
new file mode 100644
index 000000000..98c66331b
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gw.png differ
diff --git a/templates/backOffice/default/assets/img/flags/gy.png b/templates/backOffice/default/assets/img/flags/gy.png
new file mode 100644
index 000000000..8cc6d9cf1
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/gy.png differ
diff --git a/templates/backOffice/default/assets/img/flags/hk.png b/templates/backOffice/default/assets/img/flags/hk.png
new file mode 100644
index 000000000..89c38aa1a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/hk.png differ
diff --git a/templates/backOffice/default/assets/img/flags/hn.png b/templates/backOffice/default/assets/img/flags/hn.png
new file mode 100644
index 000000000..e794c437e
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/hn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/hr.png b/templates/backOffice/default/assets/img/flags/hr.png
new file mode 100644
index 000000000..6f845d5dd
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/hr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ht.png b/templates/backOffice/default/assets/img/flags/ht.png
new file mode 100644
index 000000000..da4dc3b11
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ht.png differ
diff --git a/templates/backOffice/default/assets/img/flags/hu.png b/templates/backOffice/default/assets/img/flags/hu.png
new file mode 100644
index 000000000..98de28af8
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/hu.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ic.png b/templates/backOffice/default/assets/img/flags/ic.png
new file mode 100644
index 000000000..500d9dbe2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ic.png differ
diff --git a/templates/backOffice/default/assets/img/flags/id.png b/templates/backOffice/default/assets/img/flags/id.png
new file mode 100644
index 000000000..a14683d77
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/id.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ie.png b/templates/backOffice/default/assets/img/flags/ie.png
new file mode 100644
index 000000000..105c26b88
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ie.png differ
diff --git a/templates/backOffice/default/assets/img/flags/il.png b/templates/backOffice/default/assets/img/flags/il.png
new file mode 100644
index 000000000..9ad54c5d2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/il.png differ
diff --git a/templates/backOffice/default/assets/img/flags/im.png b/templates/backOffice/default/assets/img/flags/im.png
new file mode 100644
index 000000000..f0ff46659
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/im.png differ
diff --git a/templates/backOffice/default/assets/img/flags/in.png b/templates/backOffice/default/assets/img/flags/in.png
new file mode 100644
index 000000000..f1c32fac9
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/in.png differ
diff --git a/templates/backOffice/default/assets/img/flags/iq.png b/templates/backOffice/default/assets/img/flags/iq.png
new file mode 100644
index 000000000..8d5a32366
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/iq.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ir.png b/templates/backOffice/default/assets/img/flags/ir.png
new file mode 100644
index 000000000..354a3ac5a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ir.png differ
diff --git a/templates/backOffice/default/assets/img/flags/is.png b/templates/backOffice/default/assets/img/flags/is.png
new file mode 100644
index 000000000..87253cdba
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/is.png differ
diff --git a/templates/backOffice/default/assets/img/flags/it.gif b/templates/backOffice/default/assets/img/flags/it.gif
deleted file mode 100644
index cdd750a54..000000000
Binary files a/templates/backOffice/default/assets/img/flags/it.gif and /dev/null differ
diff --git a/templates/backOffice/default/assets/img/flags/it.png b/templates/backOffice/default/assets/img/flags/it.png
new file mode 100644
index 000000000..ce11f1f82
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/it.png differ
diff --git a/templates/backOffice/default/assets/img/flags/je.png b/templates/backOffice/default/assets/img/flags/je.png
new file mode 100644
index 000000000..904b61010
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/je.png differ
diff --git a/templates/backOffice/default/assets/img/flags/jm.png b/templates/backOffice/default/assets/img/flags/jm.png
new file mode 100644
index 000000000..378f70d08
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/jm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/jo.png b/templates/backOffice/default/assets/img/flags/jo.png
new file mode 100644
index 000000000..270e5248e
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/jo.png differ
diff --git a/templates/backOffice/default/assets/img/flags/jp.png b/templates/backOffice/default/assets/img/flags/jp.png
new file mode 100644
index 000000000..78c159ac8
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/jp.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ke.png b/templates/backOffice/default/assets/img/flags/ke.png
new file mode 100644
index 000000000..ecbeb5db8
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ke.png differ
diff --git a/templates/backOffice/default/assets/img/flags/kg.png b/templates/backOffice/default/assets/img/flags/kg.png
new file mode 100644
index 000000000..12b0dadd3
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/kg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/kh.png b/templates/backOffice/default/assets/img/flags/kh.png
new file mode 100644
index 000000000..6fb7f578a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/kh.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ki.png b/templates/backOffice/default/assets/img/flags/ki.png
new file mode 100644
index 000000000..e2762a670
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ki.png differ
diff --git a/templates/backOffice/default/assets/img/flags/km.png b/templates/backOffice/default/assets/img/flags/km.png
new file mode 100644
index 000000000..43d8a75ae
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/km.png differ
diff --git a/templates/backOffice/default/assets/img/flags/kn.png b/templates/backOffice/default/assets/img/flags/kn.png
new file mode 100644
index 000000000..5decf8da7
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/kn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/kp.png b/templates/backOffice/default/assets/img/flags/kp.png
new file mode 100644
index 000000000..b303f8e7e
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/kp.png differ
diff --git a/templates/backOffice/default/assets/img/flags/kr.png b/templates/backOffice/default/assets/img/flags/kr.png
new file mode 100644
index 000000000..d21bef98a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/kr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/kw.png b/templates/backOffice/default/assets/img/flags/kw.png
new file mode 100644
index 000000000..6f7010b86
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/kw.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ky.png b/templates/backOffice/default/assets/img/flags/ky.png
new file mode 100644
index 000000000..c4bfbd994
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ky.png differ
diff --git a/templates/backOffice/default/assets/img/flags/kz.png b/templates/backOffice/default/assets/img/flags/kz.png
new file mode 100644
index 000000000..1a0ca4fda
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/kz.png differ
diff --git a/templates/backOffice/default/assets/img/flags/la.png b/templates/backOffice/default/assets/img/flags/la.png
new file mode 100644
index 000000000..f78e67f6a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/la.png differ
diff --git a/templates/backOffice/default/assets/img/flags/lb.png b/templates/backOffice/default/assets/img/flags/lb.png
new file mode 100644
index 000000000..a9643c34e
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/lb.png differ
diff --git a/templates/backOffice/default/assets/img/flags/lc.png b/templates/backOffice/default/assets/img/flags/lc.png
new file mode 100644
index 000000000..ab5916ba4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/lc.png differ
diff --git a/templates/backOffice/default/assets/img/flags/li.png b/templates/backOffice/default/assets/img/flags/li.png
new file mode 100644
index 000000000..cf7bbe495
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/li.png differ
diff --git a/templates/backOffice/default/assets/img/flags/lk.png b/templates/backOffice/default/assets/img/flags/lk.png
new file mode 100644
index 000000000..a60c8edcd
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/lk.png differ
diff --git a/templates/backOffice/default/assets/img/flags/lr.png b/templates/backOffice/default/assets/img/flags/lr.png
new file mode 100644
index 000000000..dd3a57f76
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/lr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ls.png b/templates/backOffice/default/assets/img/flags/ls.png
new file mode 100644
index 000000000..ad2aa4a2c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ls.png differ
diff --git a/templates/backOffice/default/assets/img/flags/lt.png b/templates/backOffice/default/assets/img/flags/lt.png
new file mode 100644
index 000000000..f40f2e288
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/lt.png differ
diff --git a/templates/backOffice/default/assets/img/flags/lu.png b/templates/backOffice/default/assets/img/flags/lu.png
new file mode 100644
index 000000000..92e72f9d1
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/lu.png differ
diff --git a/templates/backOffice/default/assets/img/flags/lv.png b/templates/backOffice/default/assets/img/flags/lv.png
new file mode 100644
index 000000000..3966acfc3
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/lv.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ly.png b/templates/backOffice/default/assets/img/flags/ly.png
new file mode 100644
index 000000000..4db084539
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ly.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ma.png b/templates/backOffice/default/assets/img/flags/ma.png
new file mode 100644
index 000000000..69424d592
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ma.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mc.png b/templates/backOffice/default/assets/img/flags/mc.png
new file mode 100644
index 000000000..a14683d77
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mc.png differ
diff --git a/templates/backOffice/default/assets/img/flags/md.png b/templates/backOffice/default/assets/img/flags/md.png
new file mode 100644
index 000000000..21fd6eca4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/md.png differ
diff --git a/templates/backOffice/default/assets/img/flags/me.png b/templates/backOffice/default/assets/img/flags/me.png
new file mode 100644
index 000000000..0ca932d91
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/me.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mf.png b/templates/backOffice/default/assets/img/flags/mf.png
new file mode 100644
index 000000000..16692f711
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mf.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mg.png b/templates/backOffice/default/assets/img/flags/mg.png
new file mode 100644
index 000000000..09f2469a2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mh.png b/templates/backOffice/default/assets/img/flags/mh.png
new file mode 100644
index 000000000..3ffcf0133
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mh.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mk.png b/templates/backOffice/default/assets/img/flags/mk.png
new file mode 100644
index 000000000..a67650957
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mk.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ml.png b/templates/backOffice/default/assets/img/flags/ml.png
new file mode 100644
index 000000000..bd2384186
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ml.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mm.png b/templates/backOffice/default/assets/img/flags/mm.png
new file mode 100644
index 000000000..1bf0d5bb4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mn.png b/templates/backOffice/default/assets/img/flags/mn.png
new file mode 100644
index 000000000..67a53355d
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mo.png b/templates/backOffice/default/assets/img/flags/mo.png
new file mode 100644
index 000000000..2dc29c861
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mo.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mp.png b/templates/backOffice/default/assets/img/flags/mp.png
new file mode 100644
index 000000000..b50575402
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mp.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mq.png b/templates/backOffice/default/assets/img/flags/mq.png
new file mode 100644
index 000000000..4e9f76b67
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mq.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mr.png b/templates/backOffice/default/assets/img/flags/mr.png
new file mode 100644
index 000000000..6bda86130
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ms.png b/templates/backOffice/default/assets/img/flags/ms.png
new file mode 100644
index 000000000..a860c6fe4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ms.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mt.png b/templates/backOffice/default/assets/img/flags/mt.png
new file mode 100644
index 000000000..93d502bde
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mt.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mu.png b/templates/backOffice/default/assets/img/flags/mu.png
new file mode 100644
index 000000000..6bf523597
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mu.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mv.png b/templates/backOffice/default/assets/img/flags/mv.png
new file mode 100644
index 000000000..b87bb2ec0
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mv.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mw.png b/templates/backOffice/default/assets/img/flags/mw.png
new file mode 100644
index 000000000..d75a8d30b
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mw.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mx.png b/templates/backOffice/default/assets/img/flags/mx.png
new file mode 100644
index 000000000..8fa79193a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mx.png differ
diff --git a/templates/backOffice/default/assets/img/flags/my.png b/templates/backOffice/default/assets/img/flags/my.png
new file mode 100644
index 000000000..a8e39961d
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/my.png differ
diff --git a/templates/backOffice/default/assets/img/flags/mz.png b/templates/backOffice/default/assets/img/flags/mz.png
new file mode 100644
index 000000000..0fdc38c77
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/mz.png differ
diff --git a/templates/backOffice/default/assets/img/flags/na.png b/templates/backOffice/default/assets/img/flags/na.png
new file mode 100644
index 000000000..52e2a792c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/na.png differ
diff --git a/templates/backOffice/default/assets/img/flags/nc.png b/templates/backOffice/default/assets/img/flags/nc.png
new file mode 100644
index 000000000..e3288acf0
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/nc.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ne.png b/templates/backOffice/default/assets/img/flags/ne.png
new file mode 100644
index 000000000..841e77fb5
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ne.png differ
diff --git a/templates/backOffice/default/assets/img/flags/nf.png b/templates/backOffice/default/assets/img/flags/nf.png
new file mode 100644
index 000000000..7c1af026a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/nf.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ng.png b/templates/backOffice/default/assets/img/flags/ng.png
new file mode 100644
index 000000000..25fe78f02
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ng.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ni.png b/templates/backOffice/default/assets/img/flags/ni.png
new file mode 100644
index 000000000..0f66accb6
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ni.png differ
diff --git a/templates/backOffice/default/assets/img/flags/nl.png b/templates/backOffice/default/assets/img/flags/nl.png
new file mode 100644
index 000000000..036658e75
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/nl.png differ
diff --git a/templates/backOffice/default/assets/img/flags/no.png b/templates/backOffice/default/assets/img/flags/no.png
new file mode 100644
index 000000000..38a13c4c2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/no.png differ
diff --git a/templates/backOffice/default/assets/img/flags/np.png b/templates/backOffice/default/assets/img/flags/np.png
new file mode 100644
index 000000000..eed654be4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/np.png differ
diff --git a/templates/backOffice/default/assets/img/flags/nr.png b/templates/backOffice/default/assets/img/flags/nr.png
new file mode 100644
index 000000000..4b2d0806d
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/nr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/nu.png b/templates/backOffice/default/assets/img/flags/nu.png
new file mode 100644
index 000000000..d791c4af6
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/nu.png differ
diff --git a/templates/backOffice/default/assets/img/flags/nz.png b/templates/backOffice/default/assets/img/flags/nz.png
new file mode 100644
index 000000000..913b18af1
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/nz.png differ
diff --git a/templates/backOffice/default/assets/img/flags/om.png b/templates/backOffice/default/assets/img/flags/om.png
new file mode 100644
index 000000000..b2a16c030
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/om.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pa.png b/templates/backOffice/default/assets/img/flags/pa.png
new file mode 100644
index 000000000..fc0a34a37
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pa.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pe.png b/templates/backOffice/default/assets/img/flags/pe.png
new file mode 100644
index 000000000..ce31457eb
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pe.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pf.png b/templates/backOffice/default/assets/img/flags/pf.png
new file mode 100644
index 000000000..c93270961
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pf.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pg.png b/templates/backOffice/default/assets/img/flags/pg.png
new file mode 100644
index 000000000..68b758df2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ph.png b/templates/backOffice/default/assets/img/flags/ph.png
new file mode 100644
index 000000000..dc75142c5
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ph.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pk.png b/templates/backOffice/default/assets/img/flags/pk.png
new file mode 100644
index 000000000..014af0652
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pk.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pl.png b/templates/backOffice/default/assets/img/flags/pl.png
new file mode 100644
index 000000000..4d0fc51f7
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pl.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pn.png b/templates/backOffice/default/assets/img/flags/pn.png
new file mode 100644
index 000000000..c046e9bcc
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pr.png b/templates/backOffice/default/assets/img/flags/pr.png
new file mode 100644
index 000000000..7d54f19aa
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ps.png b/templates/backOffice/default/assets/img/flags/ps.png
new file mode 100644
index 000000000..d4d85dcf4
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ps.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pt.png b/templates/backOffice/default/assets/img/flags/pt.png
new file mode 100644
index 000000000..18e276e53
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pt.png differ
diff --git a/templates/backOffice/default/assets/img/flags/pw.png b/templates/backOffice/default/assets/img/flags/pw.png
new file mode 100644
index 000000000..f9bcdc6ed
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/pw.png differ
diff --git a/templates/backOffice/default/assets/img/flags/py.png b/templates/backOffice/default/assets/img/flags/py.png
new file mode 100644
index 000000000..c289b6cf7
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/py.png differ
diff --git a/templates/backOffice/default/assets/img/flags/qa.png b/templates/backOffice/default/assets/img/flags/qa.png
new file mode 100644
index 000000000..95c7485d5
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/qa.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ro.png b/templates/backOffice/default/assets/img/flags/ro.png
new file mode 100644
index 000000000..3d9c2a3ec
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ro.png differ
diff --git a/templates/backOffice/default/assets/img/flags/rs.png b/templates/backOffice/default/assets/img/flags/rs.png
new file mode 100644
index 000000000..d95bcdfc2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/rs.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ru.png b/templates/backOffice/default/assets/img/flags/ru.png
new file mode 100644
index 000000000..a4318e7d5
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ru.png differ
diff --git a/templates/backOffice/default/assets/img/flags/rw.png b/templates/backOffice/default/assets/img/flags/rw.png
new file mode 100644
index 000000000..00f5e1e01
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/rw.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sa.png b/templates/backOffice/default/assets/img/flags/sa.png
new file mode 100644
index 000000000..ba3f2de91
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sa.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sb.png b/templates/backOffice/default/assets/img/flags/sb.png
new file mode 100644
index 000000000..1b6384a06
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sb.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sc.png b/templates/backOffice/default/assets/img/flags/sc.png
new file mode 100644
index 000000000..2a4951833
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sc.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sd.png b/templates/backOffice/default/assets/img/flags/sd.png
new file mode 100644
index 000000000..5fc853b10
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sd.png differ
diff --git a/templates/backOffice/default/assets/img/flags/se.png b/templates/backOffice/default/assets/img/flags/se.png
new file mode 100644
index 000000000..ad7854b7a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/se.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sg.png b/templates/backOffice/default/assets/img/flags/sg.png
new file mode 100644
index 000000000..8b1c5f03f
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sh.png b/templates/backOffice/default/assets/img/flags/sh.png
new file mode 100644
index 000000000..4b2961be8
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sh.png differ
diff --git a/templates/backOffice/default/assets/img/flags/si.png b/templates/backOffice/default/assets/img/flags/si.png
new file mode 100644
index 000000000..08cc3f4e9
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/si.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sk.png b/templates/backOffice/default/assets/img/flags/sk.png
new file mode 100644
index 000000000..d622ef05f
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sk.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sl.png b/templates/backOffice/default/assets/img/flags/sl.png
new file mode 100644
index 000000000..e8a3530f6
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sl.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sm.png b/templates/backOffice/default/assets/img/flags/sm.png
new file mode 100644
index 000000000..f0d657249
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sn.png b/templates/backOffice/default/assets/img/flags/sn.png
new file mode 100644
index 000000000..a4fc08fde
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/so.png b/templates/backOffice/default/assets/img/flags/so.png
new file mode 100644
index 000000000..3f0f4163e
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/so.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sr.png b/templates/backOffice/default/assets/img/flags/sr.png
new file mode 100644
index 000000000..6a8eea245
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ss.png b/templates/backOffice/default/assets/img/flags/ss.png
new file mode 100644
index 000000000..c71cafaa1
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ss.png differ
diff --git a/templates/backOffice/default/assets/img/flags/st.png b/templates/backOffice/default/assets/img/flags/st.png
new file mode 100644
index 000000000..480886cac
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/st.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sv.png b/templates/backOffice/default/assets/img/flags/sv.png
new file mode 100644
index 000000000..b5f69fae8
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sv.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sy.png b/templates/backOffice/default/assets/img/flags/sy.png
new file mode 100644
index 000000000..dd5927a66
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sy.png differ
diff --git a/templates/backOffice/default/assets/img/flags/sz.png b/templates/backOffice/default/assets/img/flags/sz.png
new file mode 100644
index 000000000..b0615c363
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/sz.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tc.png b/templates/backOffice/default/assets/img/flags/tc.png
new file mode 100644
index 000000000..b17607b91
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tc.png differ
diff --git a/templates/backOffice/default/assets/img/flags/td.png b/templates/backOffice/default/assets/img/flags/td.png
new file mode 100644
index 000000000..787eebb6b
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/td.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tf.png b/templates/backOffice/default/assets/img/flags/tf.png
new file mode 100644
index 000000000..829290451
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tf.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tg.png b/templates/backOffice/default/assets/img/flags/tg.png
new file mode 100644
index 000000000..be814c694
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/th.png b/templates/backOffice/default/assets/img/flags/th.png
new file mode 100644
index 000000000..5ff77db9a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/th.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tj.png b/templates/backOffice/default/assets/img/flags/tj.png
new file mode 100644
index 000000000..b0b546be2
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tj.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tk.png b/templates/backOffice/default/assets/img/flags/tk.png
new file mode 100644
index 000000000..b70e8235c
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tk.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tl.png b/templates/backOffice/default/assets/img/flags/tl.png
new file mode 100644
index 000000000..b7e77dce5
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tl.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tm.png b/templates/backOffice/default/assets/img/flags/tm.png
new file mode 100644
index 000000000..e6f69d734
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tn.png b/templates/backOffice/default/assets/img/flags/tn.png
new file mode 100644
index 000000000..2548fd925
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/to.png b/templates/backOffice/default/assets/img/flags/to.png
new file mode 100644
index 000000000..f96d99646
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/to.png differ
diff --git a/templates/backOffice/default/assets/img/flags/toto.png b/templates/backOffice/default/assets/img/flags/toto.png
new file mode 100644
index 000000000..9d91c7f4b
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/toto.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tr.png b/templates/backOffice/default/assets/img/flags/tr.png
new file mode 100644
index 000000000..3af317d9f
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tr.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tt.png b/templates/backOffice/default/assets/img/flags/tt.png
new file mode 100644
index 000000000..890321abe
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tt.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tv.png b/templates/backOffice/default/assets/img/flags/tv.png
new file mode 100644
index 000000000..2ec316053
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tv.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tw.png b/templates/backOffice/default/assets/img/flags/tw.png
new file mode 100644
index 000000000..26425e4bb
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tw.png differ
diff --git a/templates/backOffice/default/assets/img/flags/tz.png b/templates/backOffice/default/assets/img/flags/tz.png
new file mode 100644
index 000000000..c1671cf73
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/tz.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ua.png b/templates/backOffice/default/assets/img/flags/ua.png
new file mode 100644
index 000000000..74c201221
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ua.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ug.png b/templates/backOffice/default/assets/img/flags/ug.png
new file mode 100644
index 000000000..c8c244364
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ug.png differ
diff --git a/templates/backOffice/default/assets/img/flags/unknown.png b/templates/backOffice/default/assets/img/flags/unknown.png
new file mode 100644
index 000000000..9d91c7f4b
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/unknown.png differ
diff --git a/templates/backOffice/default/assets/img/flags/us.png b/templates/backOffice/default/assets/img/flags/us.png
new file mode 100644
index 000000000..31aa3f187
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/us.png differ
diff --git a/templates/backOffice/default/assets/img/flags/uy.png b/templates/backOffice/default/assets/img/flags/uy.png
new file mode 100644
index 000000000..9397cece5
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/uy.png differ
diff --git a/templates/backOffice/default/assets/img/flags/uz.png b/templates/backOffice/default/assets/img/flags/uz.png
new file mode 100644
index 000000000..1df6c8822
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/uz.png differ
diff --git a/templates/backOffice/default/assets/img/flags/va.png b/templates/backOffice/default/assets/img/flags/va.png
new file mode 100644
index 000000000..25a852e90
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/va.png differ
diff --git a/templates/backOffice/default/assets/img/flags/vc.png b/templates/backOffice/default/assets/img/flags/vc.png
new file mode 100644
index 000000000..e63a9c1d9
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/vc.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ve.png b/templates/backOffice/default/assets/img/flags/ve.png
new file mode 100644
index 000000000..875f7733f
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ve.png differ
diff --git a/templates/backOffice/default/assets/img/flags/vg.png b/templates/backOffice/default/assets/img/flags/vg.png
new file mode 100644
index 000000000..0bd002e4b
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/vg.png differ
diff --git a/templates/backOffice/default/assets/img/flags/vi.png b/templates/backOffice/default/assets/img/flags/vi.png
new file mode 100644
index 000000000..69d667a5a
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/vi.png differ
diff --git a/templates/backOffice/default/assets/img/flags/vn.png b/templates/backOffice/default/assets/img/flags/vn.png
new file mode 100644
index 000000000..69d87f909
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/vn.png differ
diff --git a/templates/backOffice/default/assets/img/flags/vu.png b/templates/backOffice/default/assets/img/flags/vu.png
new file mode 100644
index 000000000..5401c2a6d
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/vu.png differ
diff --git a/templates/backOffice/default/assets/img/flags/wf.png b/templates/backOffice/default/assets/img/flags/wf.png
new file mode 100644
index 000000000..922b74e26
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/wf.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ws.png b/templates/backOffice/default/assets/img/flags/ws.png
new file mode 100644
index 000000000..d1f62df10
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ws.png differ
diff --git a/templates/backOffice/default/assets/img/flags/ye.png b/templates/backOffice/default/assets/img/flags/ye.png
new file mode 100644
index 000000000..bad5e1f42
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/ye.png differ
diff --git a/templates/backOffice/default/assets/img/flags/yt.png b/templates/backOffice/default/assets/img/flags/yt.png
new file mode 100644
index 000000000..676e06ca7
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/yt.png differ
diff --git a/templates/backOffice/default/assets/img/flags/za.png b/templates/backOffice/default/assets/img/flags/za.png
new file mode 100644
index 000000000..701e01061
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/za.png differ
diff --git a/templates/backOffice/default/assets/img/flags/zm.png b/templates/backOffice/default/assets/img/flags/zm.png
new file mode 100644
index 000000000..e3d80780d
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/zm.png differ
diff --git a/templates/backOffice/default/assets/img/flags/zw.png b/templates/backOffice/default/assets/img/flags/zw.png
new file mode 100644
index 000000000..79864d469
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/zw.png differ
diff --git a/templates/backOffice/default/attribute-edit.html b/templates/backOffice/default/attribute-edit.html
index 7c82d8b9d..e8058983b 100644
--- a/templates/backOffice/default/attribute-edit.html
+++ b/templates/backOffice/default/attribute-edit.html
@@ -223,7 +223,7 @@
                 {loop type="lang" name="current-edit-lang" id="$edit_language_id"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Attribute title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
                     </div>
 
                     <div class="help-block">{intl l="Enter here the value in the current edit language (%title)" title=$TITLE}</div>
diff --git a/templates/backOffice/default/attributes.html b/templates/backOffice/default/attributes.html
index 2fcb8b0ed..1994c2e76 100644
--- a/templates/backOffice/default/attributes.html
+++ b/templates/backOffice/default/attributes.html
@@ -166,7 +166,7 @@
                 {loop type="lang" name="default-lang" default_only="1"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Attribute title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
                     </div>
 
                     <div class="help-block">{intl l="Enter here the attribute name in the default language (%language_name)" language_name=$TITLE}</div>
diff --git a/templates/backOffice/default/categories.html b/templates/backOffice/default/categories.html
index a3b3bb4a9..a0b43145c 100644
--- a/templates/backOffice/default/categories.html
+++ b/templates/backOffice/default/categories.html
@@ -373,7 +373,7 @@
                 {loop type="lang" name="default-lang" default_only="1"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Category title'}" placeholder="{intl l='Name'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
                     </div>
 
                     <div class="help-block">{intl l='Enter here the category name in the default language (%title)' title="$TITLE"}</div>
@@ -457,7 +457,7 @@
                 {loop type="lang" name="default-lang" default_only="1" backend_context="1"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
                     </div>
 
                     <div class="help-block">{intl l='Enter here the product name in the default language (%title)' title="$TITLE"}</div>
diff --git a/templates/backOffice/default/currencies.html b/templates/backOffice/default/currencies.html
index 21784fd3b..6e1d29fc5 100644
--- a/templates/backOffice/default/currencies.html
+++ b/templates/backOffice/default/currencies.html
@@ -219,7 +219,7 @@
 			        {loop type="lang" name="default-lang" default_only="1"}
 			            <div class="input-group">
 			                <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Currency name'}" placeholder="{intl l='Name'}">
-			                <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+			                <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
 			            </div>
 
 			            <div class="help-block">{intl l="Enter here the currency name in the default language (%title)" title=$TITLE}</div>
diff --git a/templates/backOffice/default/customer-edit.html b/templates/backOffice/default/customer-edit.html
index d5b48f3d6..9747c935c 100644
--- a/templates/backOffice/default/customer-edit.html
+++ b/templates/backOffice/default/customer-edit.html
@@ -160,6 +160,7 @@
                                                     </span>
                                                 </p>
 
+                                                {ifloop rel="address"}
                                                 <div class="table-responsive">
                                                     <table class="table table-bordered table-striped">
                                                         <thead>
@@ -212,6 +213,13 @@
                                                         </tbody>
                                                     </table>
                                                 </div>
+                                                {/ifloop}
+
+                                                {elseloop rel="address"}
+                                                    <div class="alert alert-info">
+                                                    {intl l="This customer has not defined any delivery address"}
+                                                </div>
+                                                {/elseloop}
                                             </div>
 
                                         </form>
diff --git a/templates/backOffice/default/feature-edit.html b/templates/backOffice/default/feature-edit.html
index 0f9d2d652..8c19ed761 100644
--- a/templates/backOffice/default/feature-edit.html
+++ b/templates/backOffice/default/feature-edit.html
@@ -223,7 +223,7 @@
                 {loop type="lang" name="current-edit-lang" id="$edit_language_id"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Feature title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
                     </div>
 
                     <div class="help-block">{intl l="Enter here the value in the current edit language (%language_name)" language_name=$TITLE}</div>
diff --git a/templates/backOffice/default/features.html b/templates/backOffice/default/features.html
index 281b06eb1..b44679348 100644
--- a/templates/backOffice/default/features.html
+++ b/templates/backOffice/default/features.html
@@ -166,7 +166,7 @@
                 {loop type="lang" name="default-lang" default_only="1"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Feature title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
                     </div>
 
                     <div class="help-block">{intl l="Enter here the feature name in the default language (%title)" title=$TITLE}</div>
diff --git a/templates/backOffice/default/folders.html b/templates/backOffice/default/folders.html
index 286270abc..0557d79ac 100644
--- a/templates/backOffice/default/folders.html
+++ b/templates/backOffice/default/folders.html
@@ -360,7 +360,7 @@
                 {loop type="lang" name="default-lang" default_only="1"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Folder title'}" placeholder="{intl l='Name'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
                     </div>
 
                     <div class="help-block">{intl l='Enter here the folder name in the default language (%title)' title="$TITLE"}</div>
@@ -432,7 +432,7 @@
     {loop type="lang" name="default-lang" default_only="1"}
     <div class="input-group">
         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
                             </div>
 
                             <div class="help-block">{intl l='Enter here the content name in the default language (%title)' title="$TITLE"}</div>
diff --git a/templates/backOffice/default/includes/inner-form-toolbar.html b/templates/backOffice/default/includes/inner-form-toolbar.html
index 88f2781d5..6e7835e73 100644
--- a/templates/backOffice/default/includes/inner-form-toolbar.html
+++ b/templates/backOffice/default/includes/inner-form-toolbar.html
@@ -17,7 +17,7 @@ Parameters:
 		    {loop name="lang_list" type="lang"}
 		    <li {if $ID == $edit_language_id}class="active"{/if}>
 		        <a class="language-change-button" data-language-id="{$ID}" href="{url path={$page_url|default:$current_url nofilter} edit_language_id=$ID}" title="{intl l='Edit information in %lng' lng=$TITLE}">
-		            <img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="$TITLE" />
+		            <img src="{image file="../assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" />
 		        </a>
 		    </li>
 		    {/loop}
diff --git a/templates/backOffice/default/includes/product-prices-tab.html b/templates/backOffice/default/includes/product-prices-tab.html
new file mode 100644
index 000000000..32aa42af6
--- /dev/null
+++ b/templates/backOffice/default/includes/product-prices-tab.html
@@ -0,0 +1,770 @@
+<div class="form-container">
+
+    {$has_at_least_one_combination = false}
+    {$default_product_sale_element_id = 0}
+
+    {loop name="product.sales.elements.test" type="product_sale_elements" product=$product_id currency=$edit_currency_id backend_context="1"}
+        {loop name="product.combinations" type="attribute_combination" product_sale_elements="$ID"}
+            {$has_at_least_one_combination = true}
+        {/loop}
+
+        {elseloop rel="product.combinations"}
+            {$default_product_sale_element_id = $ID}
+        {/elseloop}
+    {/loop}
+
+    {if $has_at_least_one_combination == false}
+	    {form name="thelia.admin.product_default_sale_element.update"}
+	    <form method="POST" action="{url path='/admin/product/default-price/update'}" {form_enctype form=$form} class="clearfix">
+
+		    {include
+		        file = "includes/inner-form-toolbar.html"
+	            hide_submit_buttons = false
+	            show_currencies = true
+
+		        page_url  = "{url path='/admin/products/update' product_id=$ID}"
+		        close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}"
+		    }
+
+	        {* Be sure to get the product ID and current tab, even if the form could not be validated *}
+            <input type="hidden" name="product_id" value="{$product_id}" />
+	        <input type="hidden" name="current_tab" value="prices" />
+
+	        {form_hidden_fields form=$form}
+
+            {form_field form=$form field='product_id'}
+                <input type="hidden" name="{$name}" value="{$value}" />
+            {/form_field}
+
+            {form_field form=$form field='product_sale_element_id'}
+                <input type="hidden" name="{$name}" value="{$default_product_sale_element_id}" />
+            {/form_field}
+
+            {form_field form=$form field='isdefault'}
+                <input type="hidden" name="{$name}" value="{$value}" />
+            {/form_field}
+
+            {form_field form=$form field='reference'}
+                <input type="hidden" name="{$name}" value="{$value}" />
+            {/form_field}
+
+	        {form_field form=$form field='success_url'}
+	            <input type="hidden" name="{$name}" value="{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" />
+	        {/form_field}
+
+	        {loop type="currency" name="product-currency" id=$edit_currency_id backend_context="1"}
+
+	            {$currency_symbol = $SYMBOL}
+	            {$currency_name = $NAME}
+
+	            {form_field form=$form field='currency'}
+	                <input type="hidden" name="{$name}" value="{$ID}" />
+	            {/form_field}
+
+	            {$current_currency_is_default = $IS_DEFAULT}
+	        {/loop}
+
+
+            {if $form_error}
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="alert alert-danger">{$form_error_message}</div>
+                </div>
+            </div>
+            {/if}
+
+			<div class="row">
+			    <div class="col-md-4">
+			        {form_field form=$form field='tax_rule'}
+			            <div class="form-group {if $error}has-error{/if}">
+			                <label for="tax_rule_field" class="control-label">{$label} : </label>
+			                <div class="form-group">
+			                    <select id="tax_rule_field" required="required" name="{$name}" class="form-control">
+			                        <option value="">{intl l="Select a tax tule"}</option>
+			                        {loop name="tax" type="tax-rule" backend_context="1"}
+			                            <option value="{$ID}" {if $ID == $TAX_RULE_ID}selected="selected"{/if}>{$TITLE}</option>
+			                        {/loop}
+			                    </select>
+			                </div>
+
+			            </div>
+			        {/form_field}
+			    </div>
+			</div>
+
+	        <p class="title title-without-tabs">{intl l='Pricing'}</p>
+
+	        <p>{intl l="The default pricing is used when no combination is defined."}</p>
+
+		    <div class="row">
+
+		        {* -- Pricing ------------------------------------------------------- *}
+
+		        <div class="col-md-4">
+	                <div class="well well-sm">
+			            <p class="title title-without-tabs">{intl l='Pricing'}</p>
+
+			              <p></p> <!-- LAME !!! FIXME -->
+
+	                      {form_field form=$form field='use_exchange_rate'}
+	                          {if $current_currency_is_default}
+	                             <input type="hidden" name="{$name}" value="0">
+	                             {$show_pricing_fields = true}
+	                          {else}
+			                      <div class="form-group {if $error}has-error{/if}">
+			                          <div class="checkbox">
+			                              <label>
+			                                  <input type="checkbox" data-pse-id="{$default_product_sale_element_id}" class="use_exchange_rate_box" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
+			                                  {$label}
+			                              </label>
+			                          </div>
+			                      </div>
+			                      {$show_pricing_fields = ($value == 0)}
+			                  {/if}
+	                      {/form_field}
+
+			              {form_field form=$form field='price'}
+			                  <div class="form-group {if $error}has-error{/if}">
+			                      <label for="price_without_tax" class="control-label">{$label} : </label>
+
+			                         <div class="input-group">
+			                             <input {if !$show_pricing_fields}readonly{/if} data-pse-id="{$default_product_sale_element_id}" data-price-type="price-without-tax" data-rel-price="price_with_tax" type="text" id="price_without_tax" required="required" name="{$name}" class="price_field automatic_price_field form-control" value="{$value}" title="{$label}" placeholder="{intl l='Price excl. taxes'}">
+			                             <span class="input-group-addon">{$currency_symbol}</span>
+			                         </div>
+			                  </div>
+			              {/form_field}
+
+                          {form_field form=$form field='price_with_tax'}
+			                  <div class="form-group">
+			                      <label for="price_with_tax" class="control-label">{intl l="Product price including taxes"} : </label>
+			                      <div class="input-group">
+			                          <input {if !$show_pricing_fields}readonly{/if} data-pse-id="{$default_product_sale_element_id}" data-price-type="price-with-tax" data-rel-price="price_without_tax" type="text" id="price_with_tax" name="{$name}" class="price_field automatic_price_field form-control" value="{$value}" title="{$value}" placeholder="{intl l='Price incl. taxes'}">
+			                          <span class="input-group-addon">{$currency_symbol}</span>
+			                      </div>
+			                  </div>
+                          {/form_field}
+
+			              {module_include location='product_details_pricing_form'}
+			          </div>
+		        </div>
+
+
+                 {* -- Détails -------------------------------------------------- *}
+
+                 <div class="col-md-4">
+                     <div class="well well-sm">
+                        <p class="title title-without-tabs">{intl l='Stock'}</p>
+
+						{form_field form=$form field='ean_code'}
+						   <div class="form-group {if $error}has-error{/if}">
+						       <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+
+						       <div class="form-group">
+						           <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product EAN Code'}">
+						       </div>
+						   </div>
+						{/form_field}
+
+                         {form_field form=$form field='weight'}
+                            <div class="form-group {if $error}has-error{/if}">
+                                <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+
+                                <div class="input-group">
+                                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product weight'}">
+                                    <span class="input-group-addon">{intl l="Kg"}</span>
+                                </div>
+                            </div>
+                         {/form_field}
+
+                         {form_field form=$form field='quantity'}
+                            <div class="form-group {if $error}has-error{/if}">
+                                <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+
+                                <div class="form-group">
+                                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Current quantity'}">
+                                </div>
+                            </div>
+                         {/form_field}
+
+                         {module_include location='product_details_details_form'}
+                    </div>
+                </div>
+
+
+		        {* -- Promotion ------------------------------------------------- *}
+
+		        <div class="col-md-4">
+	                <div class="well well-sm">
+			            <p class="title title-without-tabs">{intl l='Promotion'}</p>
+
+			            {form_field form=$form field='sale_price'}
+			                <div class="form-group {if $error}has-error{/if}">
+			                    <label for="sale_price_without_tax" class="control-label">{$label} : </label>
+
+			                    <div class="input-group">
+			                        <input {if !$show_pricing_fields}readonly{/if} data-pse-id="{$default_product_sale_element_id}" data-price-type="sale-price-without-tax" data-rel-price="sale_price_with_tax" type="text" id="sale_price_without_tax" required="required" name="{$name}" class="price_field automatic_price_field form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product price'}">
+			                        <span class="input-group-addon">{$currency_symbol}</span>
+			                    </div>
+			               </div>
+			            {/form_field}
+
+                        {form_field form=$form field='sale_price_with_tax'}
+                        <div class="form-group">
+                            <label for="sale_price_with_tax" class="control-label">{$label} : </label>
+                            <div class="input-group">
+                                <input {if !$show_pricing_fields}readonly{/if} data-pse-id="{$default_product_sale_element_id}" data-price-type="sale-price-with-tax" data-rel-price="sale_price_without_tax" type="text" id="sale_price_with_tax" name="sale_price_with_tax" class="price_field automatic_price_field form-control" value="{$value}" title="{$label}" placeholder="{intl l='Sale price incl. taxes'}">
+                                <span class="input-group-addon">{$currency_symbol}</span>
+                            </div>
+                        </div>
+                        {/form_field}
+
+						{form_field form=$form field='onsale'}
+						<div class="form-group {if $error}has-error{/if}">
+						    <div class="checkbox">
+						        <label>
+						            <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
+						            {$label}
+						        </label>
+						    </div>
+						</div>
+						{/form_field}
+
+			            {form_field form=$form field='isnew'}
+			            <div class="form-group {if $error}has-error{/if}">
+			                <div class="checkbox">
+			                    <label>
+			                        <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
+			                        {$label}
+			                    </label>
+			                </div>
+			            </div>
+			            {/form_field}
+
+			            {module_include location='product_details_promotion_form'}
+			        </div>
+		         </div>
+	        </div>
+	    </form>
+	    {/form}
+    {/if}
+
+    {* -- Attribute combinations -------------------------------------------- *}
+
+    {if $has_at_least_one_combination}
+
+       {form name="thelia.admin.product_sale_element.update"}
+       <form method="POST" action="{url path='/admin/product/combinations/update'}" {form_enctype form=$form}>
+            <div class="row">
+                <div class="col-md-12">
+
+					{include
+					    file = "includes/inner-form-toolbar.html"
+					    hide_submit_buttons = false
+					    show_currencies = true
+					    page_url  = "{url path='/admin/products/update' product_id=$ID}"
+					    close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}"
+					}
+
+					{* Be sure to get the product ID and current tab, even if the form could not be validated *}
+					<input type="hidden" name="product_id" value="{$product_id}" />
+					<input type="hidden" name="current_tab" value="prices" />
+
+					{form_hidden_fields form=$form}
+
+					{form_field form=$form field='product_id'}
+					    <input type="hidden" name="{$name}" value="{$value}" />
+					{/form_field}
+
+					{form_field form=$form field='success_url'}
+					    <input type="hidden" name="{$name}" value="{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" />
+					{/form_field}
+
+	                {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+
+                    {loop type="currency" name="get-currency-symbol" id=$edit_currency_id backend_context="1"}
+                        {$currency_symbol = $SYMBOL}
+                        {$current_currency_is_default = $IS_DEFAULT}
+
+                        {form_field form=$form field='currency'}
+                            <input type="hidden" name="{$name}" value="{$ID}" />
+                        {/form_field}
+                    {/loop}
+
+					<div class="row">
+					    <div class="col-md-4">
+					        {form_field form=$form field='tax_rule'}
+					            <div class="form-group {if $error}has-error{/if}">
+					                <label for="tax_rule_field" class="control-label">{$label} : </label>
+					                <div class="form-group">
+					                   <select id="tax_rule_field" required="required" name="{$name}" class="form-control">
+					                        <option value="">{intl l="Select a tax tule"}</option>
+					                        {loop name="tax" type="tax-rule" backend_context="1"}
+					                            <option value="{$ID}" {if $ID == $TAX_RULE_ID}selected="selected"{/if}>{$TITLE}</option>
+					                        {/loop}
+					                    </select>
+					                </div>
+					            </div>
+					        {/form_field}
+					    </div>
+					    <div class="col-md-4">
+                          {form_field form=$form field='use_exchange_rate'}
+                              {if $current_currency_is_default}
+                                 <input type="hidden" name="{$name}" value="0">
+                                 {$show_pricing_fields = true}
+                              {else}
+                                  <div class="form-group {if $error}has-error{/if}">
+                                      <label>&nbsp;</label>
+                                      <div class="checkbox">
+                                          <label>
+                                              <input type="checkbox" class="use_exchange_rate_box" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
+                                              {$label}
+                                          </label>
+                                      </div>
+                                  </div>
+                                  {$show_pricing_fields = ($value == 0)}
+                              {/if}
+                          {/form_field}
+					    </div>
+					</div>
+
+	                {module_include location='product_before_combinations'}
+
+					<table class="table table-striped table-condensed" id="category_list">
+					    <caption>
+					        {intl l='Attribute Combinations'}
+
+					        {module_include location='product_combinations_list_caption'}
+
+					        {loop type="auth" name="can_create" role="ADMIN" resource="admin.product" access="UPDATE"}
+                            <a class="btn btn-default btn-primary action-btn" id="open_combination_builder" title="{intl l='Quickly create combinations using the combination builder'}" href="#combination_builder_dialog" data-toggle="modal">
+                                {intl l='Combination builder'}
+                            </a>
+					        <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new combination'}" href="#combination_creation_dialog" data-toggle="modal">
+					            <span class="glyphicon glyphicon-plus-sign"></span>
+					        </a>
+					        {/loop}
+					    </caption>
+
+					    <thead>
+					        <tr>
+                                <th class="text-center">{intl l='Reference'}</th>
+                                <th class="text-center">{intl l='EAN Code'}</th>
+                                <th class="text-center">{intl l='Stock'}</th>
+								<th class="text-center">{intl l='Price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="text-center">{intl l='Price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="text-center">{intl l='Weight<br />(Kg)'}</th>
+                                <th class="text-center">{intl l='Default'}</th>
+                                <th class="text-center">{intl l='Sale'}</th>
+                                <th class="text-center">{intl l='New'}</th>
+								<th class="text-center">{intl l='Sale price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="text-center">{intl l='Sale price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="actions">&nbsp;</th>
+					        </tr>
+					    </thead>
+
+					    <tbody>
+	                        {* Get number of PSE defined, assumin the form have the same number of values for each fields *}
+
+	                        {form_field form=$form field='product_sale_element_id' value_key=0}
+	                           {$pse_count = $total_value_count}
+	                        {/form_field}
+
+	                        {for $idx = 0 to $total_value_count-1}
+	                        <tr>
+                                <td colspan="10">
+
+			                    {form_field form=$form field='product_sale_element_id' value_key=$idx}
+			                        <input type="hidden" name="{$name}" value="{$value}" />
+
+                                    {$current_pse_id = $value}
+
+	                                {loop name="product.sales.elements.combinations" type="attribute_combination" product_sale_elements=$current_pse_id backend_context="1"}
+	                                    {if $LOOP_COUNT > 1} - {/if}{$ATTRIBUTE_TITLE}
+	                                {/loop}
+                                {/form_field}
+                                </td>
+
+                                <td colspan="2" class="text-right">ID: {$current_pse_id}</td>
+	                        </tr>
+
+                            <tr>
+                                {form_field form=$form field='reference' value_key=$idx}
+                                <td {if $error}class="has-error"{/if}><input class="form-control" type="text" name="{$name}" value="{$value}" /></td>
+                                {/form_field}
+
+                                {form_field form=$form field='ean_code' value_key=$idx}
+                                <td {if $error}class="has-error"{/if}><input class="form-control" type="text" name="{$name}" value="{$value}" /></td>
+                                {/form_field}
+
+                                {form_field form=$form field='quantity' value_key=$idx}
+                                <td {if $error}class="has-error"{/if}>
+                                    <input class="form-control text-right" required type="text" name="{$name}" value="{$value}" />
+                                </td>
+                                {/form_field}
+
+                                {form_field form=$form field='price' value_key=$idx}
+                                <td {if $error}class="has-error"{/if}><input {if !$show_pricing_fields}readonly{/if} required data-price-type="price-without-tax" data-rel-price="price_with_tax_{$idx}" id="price_without_tax_{$idx}" class="price_field automatic_price_field form-control text-right" required type="text" name="{$name}" value="{$value}" /></td>
+                                {/form_field}
+
+                                {form_field form=$form field='price_with_tax' value_key=$idx}
+                                <td {if $error}class="has-error"{/if}><input {if !$show_pricing_fields}readonly{/if} data-price-type="price-with-tax" data-rel-price="price_without_tax_{$idx}" id="price_with_tax_{$idx}" class="price_field automatic_price_field form-control text-right" type="text" name="{$name}" value="{$value}" /></td>
+                                {/form_field}
+
+                                {form_field form=$form field='weight' value_key=$idx}
+                                <td {if $error}class="has-error"{/if}><input required class="form-control text-right" required type="text" name="{$name}" value="{$value}" /></td>
+                                {/form_field}
+
+
+                                {form_field form=$form field='default_pse'}
+                                <td class="{if $error}has-error {/if}text-center">
+                                    <input class="form-control" type="radio" name="{$name}" value="{$current_pse_id}" {if $value == $current_pse_id}checked="checked"{/if}/>
+                                </td>
+                                {/form_field}
+
+                                {form_field form=$form field='onsale' value_key=$idx}
+                                <td class="{if $error}has-error {/if}text-center">
+                                    <input class="form-control" type="checkbox" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}/>
+                                </td>
+                                {/form_field}
+
+                                {form_field form=$form field='isnew' value_key=$idx}
+                                <td class="{if $error}has-error {/if}text-center">
+                                     <input class="form-control" type="checkbox" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}/>
+                                </td>
+                                {/form_field}
+
+                                {form_field form=$form field='sale_price' value_key=$idx}
+                                <td {if $error}class="has-error"{/if}>
+                                    <input {if !$show_pricing_fields}readonly{/if} required data-price-type="sale-price-without-tax" data-rel-price="sale_price_with_tax_{$idx}" id="sale_price_without_tax_{$idx}" class="price_field automatic_price_field form-control text-right" type="text" name="{$name}" value="{$value}"  />
+                                </td>
+                                {/form_field}
+
+                                {form_field form=$form field='sale_price_with_tax' value_key=$idx}
+                                <td {if $error}class="has-error"{/if}>
+                                    <input {if !$show_pricing_fields}readonly{/if} data-price-type="sale-price-with-tax" data-rel-price="sale_price_without_tax_{$idx}" id="sale_price_with_tax_{$idx}" class="price_field automatic_price_field form-control text-right" type="text" name="{$name}" value="{$value}"  />
+                                </td>
+                                {/form_field}
+
+                                <td class="actions">
+                                    <a class="btn btn-default btn-xs combination-delete" title="{intl l='Delete this combination'}"  href="#combination_delete_dialog" data-id="{$current_pse_id}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                </td>
+                            </tr>
+	                        {/for}
+					    </tbody>
+					</table>
+
+	                {module_include location='product_after_combinations'}
+	            </div>
+	        </div>
+
+        </form>
+        {/form}
+    {/if}
+
+    {if $has_at_least_one_combination == false}
+       <div class="row">
+           <div class="col-md-12">
+		        <p class="title title-without-tabs">{intl l='Attribute Combinations'}</p>
+
+		        <div class="alert alert-info">
+			        <p>{intl
+			             l='This product has no combination. The default price is used. <a data-toggle="modal" href="%url">Click here to create a new combination</a>.'
+			             url='#combination_creation_dialog'
+			        }</p>
+			        <p>
+			          {intl
+			             l='You may also quickly create combinations from products attributes using the  <a href="%url" data-toggle="modal">Combination Builder</a>.'
+			             url='#combination_builder_dialog'
+			          }
+			        </p>
+		        </div>
+		    </div>
+		</div>
+    {/if}
+
+{module_include location='product_after_combinations'}
+	</div>
+
+{* -- Adding a new combination ------------------------------------------------- *}
+
+{* Capture the dialog body, to pass it to the generic dialog *}
+
+{capture "combination_creation_dialog"}
+
+    <input type="hidden" name="product_id" value="{$product_id}" />
+    <input type="hidden" name="current_tab" value="prices" />
+
+	<div class="form-group">
+	   <label class="control-label">{intl l="Attribute"} : </label>
+	   <select  name="attribute_id" id="attribute_id" class="form-control">
+	       <option value="">{intl l='Select an attribute...'}</option>
+	       {loop name="product-attributes" type="attribute" order="manual" product=$product_id backend_context="1" lang=$edit_language_id}
+	           <option value="{$ID}">{$TITLE}</option>
+	       {/loop}
+	   </select>
+	   <span class="help-block">{intl l='Select an attribute and click (+) to view available values'}</span>
+	</div>
+
+
+	<div id="attribute_value_selector" class="hide">
+	    <div class="input-group">
+	        {* <label class="control-label">{intl l="Attribute values"} : </label> *}
+
+	        <select name="attribute_value_id" id="attribute_value_id" class="form-control">
+	            <option value="">{intl l='Select an attribute value...'}</option>
+	        </select>
+
+	        <span class="input-group-btn" id="add_attr_value_button">
+	           <button class="btn btn-default btn-primary action-btn add-value-to-combination" type="button"><span class="glyphicon glyphicon-plus-sign"></span></button>
+	        </span>
+	    </div>
+
+	    <span class="help-block">{intl l='Select a value click (+) to add it to the combination'}</span>
+	</div>
+
+	<div id="attribute_value_selector_empty" class="hide">
+	    <div class="alert alert-info">
+	       {intl l="No available value for this attribute"}
+	   </div>
+	</div>
+
+	<div class="form-group">
+	    <div class="alert alert-danger hide" id="combination_attributes_error"></div>
+
+	    <select required="required" multiple="multiple" size="5" name="combination_attributes[]" id="combination_attributes" class="form-control">
+	    </select>
+
+	    <div class="help-block">
+	        {intl l='To remove a value from the combination, select it and click "remove"'}
+
+	        <div class="pull-right">
+	            <button class="btn btn-info btn-xs remove-value-from-combination" type="button">
+	                {intl l="Remove selected values"} <span class="glyphicon glyphicon-minus-sign"></span>
+	            </button>
+	        </div>
+	    </div>
+	</div>
+
+{/capture}
+
+{include
+    file = "includes/generic-create-dialog.html"
+
+    dialog_id    = "combination_creation_dialog"
+    dialog_title = {intl l="Create a new combination"}
+    dialog_body  = {$smarty.capture.combination_creation_dialog nofilter}
+
+    dialog_ok_label     = {intl l="Create this combination"}
+
+    form_action        = {url path='/admin/product/combination/add'}
+    form_enctype       = ''
+    form_error_message = ''
+
+    ok_button_id = "combination_creation_dialog_ok"
+}
+
+
+{* -- Delete combination confirmation dialog ----------------------------------- *}
+
+{capture "combination_delete_dialog"}
+
+    <input type="hidden" name="product_id" value="{$product_id}" />
+    <input type="hidden" name="current_tab" value="prices" />
+
+    <input type="hidden" name="product_sale_element_id" id="combination_delete_id" value="" />
+
+    {module_include location='category_delete_form'}
+
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "combination_delete_dialog"
+    dialog_title    = {intl l="Delete a combination"}
+    dialog_message  = {intl l="Do you really want to delete this combination ?"}
+
+    form_action     = {url path='/admin/product/combination/delete'}
+    form_content    = {$smarty.capture.combination_delete_dialog nofilter}
+}
+
+{* -- Combination builder dialog -------------------------------------------- *}
+
+{* Capture the dialog body, to pass it to the generic dialog *}
+
+{form name="thelia.admin.product_combination.build"}
+
+{capture "combination_builder_dialog"}
+
+    {* Be sure to get the product ID and current tab, even if the form could not be validated *}
+    <input type="hidden" name="product_id" value="{$product_id}" />
+    <input type="hidden" name="current_tab" value="prices" />
+
+    {form_hidden_fields form=$form}
+
+    {form_field form=$form field='product_id'}
+        <input type="hidden" name="{$name}" value="{$product_id}" />
+    {/form_field}
+
+    {if $form_error}<div class="alert alert-danger" id="combination_builder_dialog_error">{$form_error_message}</div>{/if}
+
+    {loop type="currency" name="get-currency-symbol" id=$edit_currency_id backend_context="1"}
+        {$currency_symbol = $SYMBOL}
+
+        {form_field form=$form field='currency'}
+            <input type="hidden" name="{$name}" value="{$ID}" />
+        {/form_field}
+    {/loop}
+
+    {form_field form=$form field='success_url'}
+         <input type="hidden" name="{$name}" value="{url path='/admin/products/update' product_id=$product_id current_tab='prices'}" />
+    {/form_field}
+
+    <div class="alert alert-info">
+        {intl l='Select attribute values to combine. You may enter a default value for some of the fields of the generated combinations.'}
+    </div>
+
+    <div class="row">
+        <div class="col-md-6">
+		    <div class="scrollable">
+		        <ul class="list-unstyled">
+		        {$index = 0}
+		        {loop name="product-attributes" type="attribute" order="manual" product=$product_id backend_context="1" lang=$edit_language_id}
+		            {ifloop rel="product-attributes-av"}
+		            <li>
+		                <strong>{$TITLE}</strong>
+		                <ul class="list-unstyled">
+		                {loop name="product-attributes-av" type="attribute_availability" attribute="{$ID}" order="manual" backend_context="1" lang=$edit_language_id}
+		                    <li>
+			                    <div class="checkbox">
+			                        <label>
+			                            {form_field form=$form field='attribute_av' value_key=$index}
+			                            <input data-attribute-id="{$ATTRIBUTE_ID}" class="attribute_av_value" type="checkbox" name="{$name}" value="{$ATTRIBUTE_ID}:{$ID}" {if $value == "$ATTRIBUTE_ID:$ID"}checked="checked"{/if}>{$TITLE}
+			                            {/form_field}
+			                        </label>
+			                    </div>
+		                    </li>
+		                    {$index = $index + 1}
+		                {/loop}
+		                </ul>
+		            </li>
+		            {/ifloop}
+		        {/loop}
+		        </ul>
+		    </div>
+		</div>
+
+		<div class="col-md-6">
+         {form_field form=$form field='price'}
+             <div class="form-group {if $error}has-error{/if}">
+                 <label for="price_without_tax" class="control-label">{$label} : </label>
+
+                    <div class="input-group">
+                        <input type="text" id="price_without_tax" name="{$name}" class="price_field automatic_price_field form-control" value="{$value}" title="{$label}" placeholder="{intl l='Price excl. taxes'}">
+                        <span class="input-group-addon">{$currency_symbol}</span>
+                    </div>
+             </div>
+         {/form_field}
+
+         {form_field form=$form field='reference'}
+            <div class="form-group {if $error}has-error{/if}">
+                <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+
+                <div class="form-group">
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Combination reference'}">
+                </div>
+            </div>
+         {/form_field}
+
+         {form_field form=$form field='ean_code'}
+            <div class="form-group {if $error}has-error{/if}">
+                <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+
+                <div class="form-group">
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Combination EAN Code'}">
+                </div>
+            </div>
+         {/form_field}
+
+         <div class="row">
+            <div class="col-md-6">
+	            {form_field form=$form field='weight'}
+	            <div class="form-group {if $error}has-error{/if}">
+	                <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+
+	                <div class="input-group">
+	                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product weight'}">
+	                    <span class="input-group-addon">{intl l="Kg"}</span>
+	                </div>
+	            </div>
+	            {/form_field}
+	         </div>
+
+	          <div class="col-md-6">
+	          {form_field form=$form field='quantity'}
+	             <div class="form-group {if $error}has-error{/if}">
+	                 <label for="{$label_attr.for}" class="control-label">{intl l='Stock'} : </label>
+
+	                 <div class="form-group">
+	                     <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Current quantity'}">
+	                 </div>
+	             </div>
+	          {/form_field}
+	          </div>
+	     </div>
+
+         {form_field form=$form field='sale_price'}
+             <div class="form-group {if $error}has-error{/if}">
+                 <label for="sale_price_without_tax" class="control-label">{$label} : </label>
+                 <div class="input-group">
+                     <input type="text" id="sale_price_without_tax" name="{$name}" class="price_field automatic_price_field form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product price'}">
+                     <span class="input-group-addon">{$currency_symbol}</span>
+                 </div>
+            </div>
+         {/form_field}
+
+		 {form_field form=$form field='onsale'}
+	     <div class="form-group {if $error}has-error{/if}">
+	        <div class="checkbox">
+	            <label>
+	                <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1">
+	                {$label}
+	            </label>
+	        </div>
+	     </div>
+	     {/form_field}
+
+         {form_field form=$form field='isnew'}
+         <div class="form-group {if $error}has-error{/if}">
+             <div class="checkbox">
+                 <label>
+                     <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1">
+                     {$label}
+                 </label>
+             </div>
+         </div>
+         {/form_field}
+
+         <div class="well well-sm" style="margin-bottom: 0"><b>{intl l='<span id="number_of_generated_combinations">0</span> combinations'}</b></div>
+    </div>
+</div>
+
+{/capture}
+
+{include
+    file = "includes/generic-create-dialog.html"
+
+    dialog_id    = "combination_builder_dialog"
+    dialog_title = {intl l="Create combinations"}
+    dialog_body  = {$smarty.capture.combination_builder_dialog nofilter}
+
+    dialog_ok_label     = {intl l="Create combinations"}
+
+    form_action        = {url path='/admin/product/combination/build'}
+    form_enctype       = {form_enctype form=$form}
+    form_error_message = ''
+
+    ok_button_id = "combination_builder_dialog_ok"
+}
+
+{/form}
diff --git a/templates/backOffice/default/languages.html b/templates/backOffice/default/languages.html
index 5d14da4a8..3054db1c0 100644
--- a/templates/backOffice/default/languages.html
+++ b/templates/backOffice/default/languages.html
@@ -18,12 +18,20 @@
 
         {module_include location='languages_top'}
 
+        {if $error_message}
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="alert alert-danger">
+                        {$error_message}
+                    </div>
+                </div>
+             </div>
+        {/if}
+
         <div class="row">
             <div class="col-md-12">
                 <div class="general-block-decorator">
-
                     <form action="" method="">
-
                         <table class="table table-striped table-condensed table-left-aligned">
                             <caption>
                                {intl l="Languages management"}
@@ -36,7 +44,7 @@
                             </caption>
                             <thead>
                                 <tr>
-                                    <th>{intl l="Language name"}</th>
+                                    <th colspan="2">{intl l="Language name"}</th>
                                     <th>{intl l="ISO 639 Code"}</th>
                                     <th>{intl l="Locale"}</th>
                                     <th>{intl l="date form"}</th>
@@ -48,6 +56,7 @@
                             <tbody>
                                 {loop type="lang" name="lang.list" backend_context="1"}
                                 <tr>
+                                    <td class="text-center"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$CODE}" /></td>
                                     <td>{$TITLE}</td>
                                     <td>{$CODE}</td>
                                     <td>{$LOCALE}</td>
@@ -98,7 +107,7 @@
                         <div class="form-group {if $error}has-error{/if}" >
                             <label for="{$label_attr.for}" class="label-control">{intl l="If a translation is missing or incomplete :"}</label>
                             <div class="input-group">
-                                <select name="{$name}" id="{$label_attr.for}" data-toggle="selectpicker" class="form-control">
+                                <select name="{$name}" id="{$label_attr.for}" data-toggle="selectpicker">
                                     {foreach $choices as $choice}
                                         <option value="{$choice->value}" {if $lang_without_translation == $choice->value}selected="selected"{/if}>{$choice->label}</option>
                                     {/foreach}
@@ -178,6 +187,7 @@
             <div class="form-group {if $error}has-error{/if}">
                 <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                 <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='ISO Code'}">
+                <span class="help-block">{intl l='<a href="http://en.wikipedia.org/wiki/ISO_639-1_language_matrix" target="_other">Check the list</a> of ISO 639-1 codes'}</span>
             </div>
         {/form_field}
         {form_field form=$form field='locale'}
@@ -190,12 +200,14 @@
             <div class="form-group {if $error}has-error{/if}">
                 <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                 <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='d-m-Y'}">
+                <span class="help-block">{intl l='The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function'}</span>
             </div>
         {/form_field}
         {form_field form=$form field='time_format'}
             <div class="form-group {if $error}has-error{/if}">
                 <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                 <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='H:i:s'}">
+                <span class="help-block">{intl l='The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function'}</span>
             </div>
         {/form_field}
 
diff --git a/templates/backOffice/default/messages.html b/templates/backOffice/default/messages.html
index e64f81d87..6344aa45b 100644
--- a/templates/backOffice/default/messages.html
+++ b/templates/backOffice/default/messages.html
@@ -143,7 +143,7 @@
 
 	                <div class="input-group">
 	                    <input type="text" id="{$label_attr.for}" {if $required}required="required"{/if} name="{$name}" value="{$value}" title="{intl l='Mailing template purpose'}" placeholder="{intl l='Mailing template purpose'}" class="form-control">
-	                    <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+	                    <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
 	                </div>
 
 	                <div class="help-block">{intl l="Enter here the mailing template purpose in the default language (%title)" title=$TITLE}</div>
diff --git a/templates/backOffice/default/order-edit.html b/templates/backOffice/default/order-edit.html
index fc7903e1c..12915da92 100644
--- a/templates/backOffice/default/order-edit.html
+++ b/templates/backOffice/default/order-edit.html
@@ -28,22 +28,30 @@
                             {loop type="order" name="the-order" id=$order_id customer="*"}
 
                                 {loop type="currency" name="order-currency" id=$CURRENCY}
-                                    {assign "orderCurrency" $SYMBOL}
+                                    {$orderCurrency=$SYMBOL}
                                 {/loop}
 
                                 {assign "orderStatusId" $STATUS}
 
-                                <div class="lead clearfix">
-                                    <span class='label label-default pull-left'>{$REF}</span>
-                                    <div class="pull-right select-fixed-width">
-                                        <form id="order-update-status-form" action="{url path="/admin/order/update/$ID/status"}" method="post">
+                                <div class="row">
+                                    <div class="col-md-7 title">
+                                        {intl l='Order %ref' ref=$REF}
+                                    </div>
+
+                                    <div class="col-md-5 actions">
+                                        <form class="form-horizontal" role="form" id="order-update-status-form" action="{url path="/admin/order/update/$ID/status"}" method="post">
                                             <input class="js-current-tab" type="hidden" name="tab" value="{$oder_tab}">
-                                            <select class="js-update-order-status" name="status_id" data-toggle="selectpicker">
-                                                {loop type="order-status" name="all-status"}
-                                                {assign "orderStatusLabel" "order_$CODE"}
-                                                    <option {if $ID == $orderStatusId}selected="selected" {/if} value="{$ID}" data-content="<span class='label label-{#$orderStatusLabel#}'>{$TITLE}</span>">{$TITLE}</option>
-                                                {/loop}
-                                            </select>
+                                            <div class="form-group">
+                                                <label class="col-sm-6 control-label">{intl l="Order status:"}</label>
+                                                <div class="col-sm-6">
+                                                    <select class="js-update-order-status" name="status_id" data-toggle="selectpicker">
+                                                    {loop type="order-status" name="all-status"}
+                                                    {assign "orderStatusLabel" "order_$CODE"}
+                                                        <option {if $ID == $orderStatusId}selected="selected" {/if} value="{$ID}" data-content="<span class='label label-{#$orderStatusLabel#}'>{$TITLE}</span>">{$TITLE}</option>
+                                                    {/loop}
+                                                    </select>
+                                                </div>
+                                            </div>
                                         </form>
                                     </div>
                                 </div>
@@ -59,16 +67,16 @@
                                         <div class="table-responsive">
                                             <table class="table table-striped table-condensed table-left-aligned">
                                                 <caption class="clearfix">
-                                                   {intl l='Cart'}
+                                                   {intl l='Cart - Prices in %currency' currency=$orderCurrency}
                                                 </caption>
                                                 <thead>
                                                     <tr>
                                                        <th class="col-md-7">{intl l="Product"}</th>
-                                                       <th class="col-md-1">{intl l="Unit. price"}</th>
-                                                       <th class="col-md-1">{intl l="Tax"}</th>
-                                                       <th class="col-md-1">{intl l="Unit taxed price"}</th>
-                                                       <th class="col-md-1">{intl l="Quantity"}</th>
-                                                       <th class="col-md-1">{intl l="Taxed total"}</th>
+                                                       <th class="col-md-1 text-right">{intl l="Unit. price"}</th>
+                                                       <th class="col-md-1 text-right">{intl l="Tax"}</th>
+                                                       <th class="col-md-1 text-right">{intl l="Unit taxed price"}</th>
+                                                       <th class="col-md-1 text-right">{intl l="Quantity"}</th>
+                                                       <th class="col-md-1 text-right">{intl l="Taxed total"}</th>
                                                     </tr>
                                                 </thead>
 
@@ -95,11 +103,11 @@
                                                             </dl>
                                                             {/ifloop}
                                                         </td>
-                                                        <td>{$orderCurrency} {$realPrice}</td>
-                                                        <td>{$orderCurrency} {$realTax}</td>
-                                                        <td>{$orderCurrency} {$realTaxedPrice}</td>
-                                                        <td>{$QUANTITY}</td>
-                                                        <td>{$orderCurrency} {$realTaxedPrice * $QUANTITY}</td>
+                                                        <td class="text-right">{format_money number=$realPrice symbol=$orderCurrency}</td>
+                                                        <td class="text-right">{format_money number=$realTax symbol=$orderCurrency}</td>
+                                                        <td class="text-right">{format_money number=$realTaxedPrice symbol=$orderCurrency}</td>
+                                                        <td class="text-right">{$QUANTITY}</td>
+                                                        <td class="text-right">{format_money number=$realTaxedPrice * $QUANTITY symbol=$orderCurrency}</td>
                                                     </tr>
                                                 {/loop}
                                                 </tbody>
@@ -107,17 +115,17 @@
                                                     <tr class="active">
                                                         <td colspan="2" class="td-unstyled"></td>
                                                         <td colspan="3"><strong>{intl l="Total without discount"}</strong></td>
-                                                        <td><strong>{$orderCurrency} {$TOTAL_TAXED_AMOUNT-$POSTAGE}</strong></td>
+                                                        <td class="text-right"><strong>{format_money number=$TOTAL_TAXED_AMOUNT-$POSTAGE symbol=$orderCurrency}</strong></td>
                                                     </tr>
                                                     <tr>
                                                         <td colspan="2" class="td-unstyled"></td>
                                                         <td colspan="3"><strong>{intl l="Discount"}</strong></td>
-                                                        <td><strong>{$orderCurrency} {$DISCOUNT}</strong></td>
+                                                        <td class="text-right"><strong>{format_money number=$DISCOUNT symbol=$orderCurrency}</strong></td>
                                                     </tr>
                                                     <tr class="active">
                                                         <td colspan="2" class="td-unstyled"></td>
                                                         <td colspan="3"><strong>{intl l="Coupon code"}</strong></td>
-                                                        <td>
+                                                        <td class="text-right">
                                                             {loop type="order_coupon" name="couponcode" order=$ID}
                                                                 {$CODE}{if $LOOP_COUNT != $LOOP_TOTAL}, {/if}
                                                             {/loop}
@@ -129,17 +137,17 @@
                                                     <tr>
                                                         <td colspan="2" class="td-unstyled"></td>
                                                         <td colspan="3"><strong>{intl l="Total including discount"}</strong></td>
-                                                        <td><strong>{$orderCurrency} {$TOTAL_TAXED_AMOUNT-$POSTAGE}</strong></td>
+                                                        <td class="text-right"><strong>{format_money number=$TOTAL_TAXED_AMOUNT-$POSTAGE symbol=$orderCurrency}</strong></td>
                                                     </tr>
                                                     <tr class="active">
                                                         <td colspan="2" class="td-unstyled"></td>
                                                         <td colspan="3"><strong>{intl l="Postage"}</strong></td>
-                                                        <td><strong>{$orderCurrency} {$POSTAGE}</strong></td>
+                                                        <td class="text-right"><strong>{format_money number=$POSTAGE symbol=$orderCurrency}</strong></td>
                                                     </tr>
                                                     <tr>
                                                         <td colspan="2" class="td-unstyled"></td>
                                                         <td colspan="3" class="last"><strong>{intl l="Total"}</strong></td>
-                                                        <td class="last"><strong>{$orderCurrency} {$TOTAL_TAXED_AMOUNT}</strong></td>
+                                                        <td class="last text-right"><strong>{format_money number=$TOTAL_TAXED_AMOUNT symbol=$orderCurrency}</strong></td>
                                                     </tr>
                                                 </tbody>
                                             </table>
diff --git a/templates/backOffice/default/orders.html b/templates/backOffice/default/orders.html
index 808bd8c8d..0cfd9c286 100644
--- a/templates/backOffice/default/orders.html
+++ b/templates/backOffice/default/orders.html
@@ -32,12 +32,57 @@
 
 	                        <thead>
 		                        <tr>
-		                           <th>{intl l="Order n°"}</th>
-	                               <th>{intl l="Date & Hour"}</th>
-	                               <th>{intl l="Company"}</th>
-	                               <th>{intl l="Name"}</th>
-	                               <th>{intl l="Amount"}</th>
-	                               <th>{intl l="Status"}</th>
+                                    <th class="object-title">
+                                    {admin_sortable_header
+                                        current_order=$orders_order
+                                        order='reference'
+                                        reverse_order='reference-reverse'
+                                        path={url path='/admin/orders'}
+                                        request_parameter_name='orders_order'
+                                        label="{intl l='Order #'}"
+                                    } </th>
+
+                                    <th class="object-title">
+                                    {admin_sortable_header
+                                        current_order=$orders_order
+                                        order='create-date'
+                                        reverse_order='create-date-reverse'
+                                        path={url path='/admin/orders'}
+                                        request_parameter_name='orders_order'
+                                        label="{intl l='Date & Hour'}"
+                                    } </th>
+
+                                    <th class="object-title">
+                                    {admin_sortable_header
+                                        current_order=$orders_order
+                                        order='company'
+                                        reverse_order='company-reverse'
+                                        path={url path='/admin/orders'}
+                                        request_parameter_name='orders_order'
+                                        label="{intl l='Company'}"
+                                    } </th>
+
+                                    <th class="object-title">
+                                    {admin_sortable_header
+                                        current_order=$orders_order
+                                        order='customer-name'
+                                        reverse_order='customer-name-reverse'
+                                        path={url path='/admin/orders'}
+                                        request_parameter_name='orders_order'
+                                        label="{intl l='Cutomer Name'}"
+                                     } </th>
+
+                                    <th class="object-title text-right">{intl l='Amount'}</th>
+
+                                    <th class="object-title text-center">
+                                    {admin_sortable_header
+                                        current_order=$orders_order
+                                        order='status'
+                                        reverse_order='status-reverse'
+                                        path={url path='/admin/orders'}
+                                        request_parameter_name='orders_order'
+                                        label="{intl l='Status'}"
+                                    } </th>
 
 	                               {module_include location='orders_table_header'}
 
@@ -47,7 +92,11 @@
 
 	                        <tbody>
 
-                                {loop type="order" name="order-list" customer="*" backend_context="1" page={$order_page} limit={#max_displayed_orders#} status=$status_filter|default:'*'}
+                                {loop type="order" name="order-list" customer="*" order=$orders_order backend_context="1" page={$order_page} limit={#max_displayed_orders#} status=$status_filter|default:'*'}
+
+                                    {loop type="currency" name="order-currency" id=$CURRENCY}
+                                        {$orderCurrency=$SYMBOL}
+                                    {/loop}
 
                                     {loop type="order_address" name="order-invoice-address" id=$INVOICE_ADDRESS}
                                         {assign "orderInvoiceFirstName" $FIRSTNAME}
@@ -66,8 +115,8 @@
 		                               	<td>{format_date date=$CREATE_DATE}</td>
 		                               	<td>{$orderInvoiceCompany}</td>
 		                               	<td><a href="{url path='/admin/customer/update' customer_id=$CUSTOMER}">{$orderInvoiceFirstName|ucwords} {$orderInvoiceLastName|upper}</a></td>
-		                               	<td>{$TOTAL_TAXED_AMOUNT}</td>
-		                               	<td><span class="label label-{#$orderStatusLabel#}">{$orderStatus}</span></td>
+		                               	<td class="text-right">{format_money number=$TOTAL_TAXED_AMOUNT symbol=$orderCurrency}</td>
+		                               	<td class="text-center"><span class="label label-{#$orderStatusLabel#}">{$orderStatus}</span></td>
 
 		                                {module_include location='orders_table_row'}
 
@@ -94,14 +143,14 @@
                                         <div class="text-center">
                                             <ul class="pagination pagination-centered">
                                                 {if $order_page != 1}
-                                                    <li><a href="{url path="/admin/orders" page="1"}">&laquo;</a></li>
+                                                    <li><a href="{url path="/admin/orders" page=1 orders_order=$orders_order}">&laquo;</a></li>
                                                 {else}
                                                     <li class="disabled"><a href="#">&laquo;</a></li>
                                                 {/if}
 
                                                 {pageloop rel="order-list"}
                                                 {if $PAGE != $CURRENT}
-                                                    <li><a href="{url path="/admin/orders" page=$PAGE}">{$PAGE}</a></li>
+                                                    <li><a href="{url path="/admin/orders" page=$PAGE orders_order=$orders_order}">{$PAGE}</a></li>
 
                                                 {else}
                                                     <li class="active"><a href="#">{$PAGE}</a></li>
@@ -110,7 +159,7 @@
 
                                                 {/pageloop}
                                                 {if $PAGE == $LAST && $LAST != $CURRENT}
-                                                    <li><a href="{url path="/admin/orders" page="$PAGE"}">&raquo;</a></li>
+                                                    <li><a href="{url path="/admin/orders" page=$PAGE orders_order=$orders_order}">&raquo;</a></li>
                                                 {else}
                                                     <li class="disabled"><a href="#">&raquo;</a></li>
                                                 {/if}
diff --git a/templates/backOffice/default/product-edit.html b/templates/backOffice/default/product-edit.html
index 36eff1a6e..7a91f2647 100644
--- a/templates/backOffice/default/product-edit.html
+++ b/templates/backOffice/default/product-edit.html
@@ -38,7 +38,7 @@
                             <ul class="nav nav-tabs" id="tabbed-menu">
                                 <li><a href="#general" data-toggle="tab">{intl l="General"}</a></li>
                                 <li><a href="#seo" data-toggle="tab">{intl l="SEO"}</a></li>
-                                <li><a href="#details" data-toggle="tab">{intl l="Details"}</a></li>
+                                <li><a href="#prices" data-toggle="tab">{intl l="Price"}</a></li>
                                 <li>
                                     <a href="#attributes"
                                        data-href="{url path='/admin/products/attributes/tab' product_id=$ID}"
@@ -88,8 +88,8 @@
                                     {/form}
                                 </div>
 
-                                <div class="tab-pane fade" id="details">
-                                    {include file="includes/product-details-tab.html"}
+                                <div class="tab-pane fade" id="prices">
+                                    {include file="includes/product-prices-tab.html"}
                                 </div>
 
                                 <div class="tab-pane fade" id="attributes">
@@ -163,7 +163,7 @@ $(function() {
     // Load active tab
     $('.nav-tabs a[href="#{$current_tab}"]').trigger("click");
 
-    // -- Product details management tab ---------------------------------------
+    // -- Product prices management tab ---------------------------------------
 
 	// Load value on attribute selection
 	$('#attribute_id').change(function(event) {
@@ -258,7 +258,7 @@ $(function() {
     	$('#combination_attributes option').prop('selected', 'selected');
     });
 
-    // In details tab, process exchange rate usage checkbox changes
+    // In proces tab, process exchange rate usage checkbox changes
     $('.use_exchange_rate_box').change(function(ev) {
 
     	if ($(this).is(':checked')) {
diff --git a/templates/backOffice/default/templates.html b/templates/backOffice/default/templates.html
index 880c35747..2fa5d61b9 100644
--- a/templates/backOffice/default/templates.html
+++ b/templates/backOffice/default/templates.html
@@ -138,7 +138,7 @@
                 {loop type="lang" name="default-lang" default_only="1"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Template title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
                     </div>
 
                     <div class="help-block">{intl l="Enter here the template name in the default language (%title)" title=$TITLE}</div>
diff --git a/templates/backOffice/default/translations.html b/templates/backOffice/default/translations.html
index e209dcfcf..bbcd7c6c0 100644
--- a/templates/backOffice/default/translations.html
+++ b/templates/backOffice/default/translations.html
@@ -178,7 +178,7 @@
 											<div class="panel panel-default">
 											    <div class="panel-heading">
                                                     {loop name="lang_list" type="lang" id=$edit_language_id}
-                                                        <img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{$TITLE}" />
+                                                        <img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" />
                                                     {/loop}
 
                                                     {$label} {$file_names nofilter}
diff --git a/templates/backOffice/default/variables.html b/templates/backOffice/default/variables.html
index 89f0a423c..a6433a023 100644
--- a/templates/backOffice/default/variables.html
+++ b/templates/backOffice/default/variables.html
@@ -186,7 +186,7 @@
 
 		            <div class="input-group">
 		              <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Variable purpose'}" placeholder="{intl l='Variable purpose'}" class="form-control">
-		              <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+		              <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
 		            </div>
 
 		            <div class="help-block">{intl l='Enter here the category name in the default language (%title)' title="$TITLE"}</div>
diff --git a/templates/frontOffice/default/I18n/en_US.php b/templates/frontOffice/default/I18n/en_US.php
old mode 100644
new mode 100755
index 304452073..c4ad5753a
--- a/templates/frontOffice/default/I18n/en_US.php
+++ b/templates/frontOffice/default/I18n/en_US.php
@@ -3,16 +3,19 @@
 return array(
     '%nb Item' => '%nb Item',
     '%nb Items' => '%nb Items',
+    '+' => '+',
     '+ View All' => '+ View All',
     '404' => '404',
+    '<strong>Sorry!</strong> We are not able to give you a delivery method for your order.' => '<strong>Sorry!</strong> We are not able to give you a delivery method for your order.',
     'A summary of your order email has been sent to the following address' => 'A summary of your order email has been sent to the following address',
     'Account' => 'Account',
     'Add a new address' => 'Add a new address',
     'Add to cart' => 'Add to cart',
     'Additional Info' => 'Additional Info',
+    'Address' => 'Address',
     'Address %nb' => 'Address %nb',
     'Address Update' => 'Address update',
-    'Address' => 'Address',
+    'All rights reserved.' => 'All rights reserved.',
     'Amount' => 'Amount',
     'Availability' => 'Availability',
     'Available' => 'Available',
@@ -22,75 +25,79 @@ return array(
     'Cancel' => 'Cancel',
     'Cart' => 'Cart',
     'Categories' => 'Categories',
+    'Change Password' => 'Change Password',
     'Change address' => 'Change address',
     'Change my account information' => 'Change my account information',
     'Change my password' => 'Change my password',
-    'Change Password' => 'Change Password',
     'Check my order' => 'Check my order',
     'Checkout' => 'Checkout',
     'Choose your delivery address' => 'Choose your delivery address',
     'Choose your delivery method' => 'Choose your delivery method',
     'Choose your payment method' => 'Choose your payment method',
     'Code :' => 'Code :',
-    'Complementary address' => 'Complementary address',
     'Contact Us' => 'Contact Us',
     'Continue Shopping' => 'Continue Shopping',
     'Copyright' => 'Copyright',
     'Coupon code' => 'Coupon code',
+    'Create' => 'Create',
     'Create New Account' => 'Create New Account',
     'Create New Address' => 'Create New Address',
-    'Create' => 'Create',
+    'Currency' => 'Currency',
     'Currency:' => 'Currency:',
     'Date' => 'Date',
-    'Delete address' => 'Delete address',
-    'Delivery address' => 'Delivery address',
     'Delivery Information' => 'Delivery Information',
+    'Delivery address' => 'Delivery address',
     'Demo product description' => 'Demo product description',
     'Demo product title' => 'Demo product title',
     'Description' => 'Description',
+    'Discount' => 'Discount',
     'Do you have an account?' => 'Do you have an account?',
     'Do you really want to delete this address ?' => 'Do you really want to delete this address ?',
-    'Edit this address' => 'Edit this address',
     'Edit' => 'Edit',
+    'Edit this address' => 'Edit this address',
     'Email address' => 'Email address',
+    'Email not displaying correctly?' => 'Email not displaying correctly?',
+    'Facebook' => 'Facebook',
     'Follow us' => 'Follow us',
+    'Follow us introduction' => 'Follow us introduction',
     'Forgot your Password?' => 'Forgot your Password?',
     'Free shipping' => 'Free shipping',
     'Go home' => 'Go home',
+    'Google+' => 'Google+',
     'Grid' => 'Grid',
-    'Home address' => 'Home address',
     'Home' => 'Home',
+    'I\'ve read and agreed on <a href=\'#\'>Terms &amp; Conditions</a>' => 'I\'ve read and agreed on <a href=\'#\'>Terms &amp; Conditions</a>',
     'In Stock' => 'In Stock',
-    'instead of' => 'instead of',
-    'Item(s)' => 'Item(s)',
+    'Instagram' => 'Instagram',
+    'Language' => 'Language',
     'Language:' => 'Language:',
+    'Latest' => 'Latest',
     'Latest articles' => 'Latest articles',
     'Latest products' => 'Latest products',
-    'Latest' => 'Latest',
-    'List of orders' => 'List of orders',
     'List' => 'List',
+    'List of orders' => 'List of orders',
     'Log In!' => 'Log In!',
     'Log out!' => 'Log out!',
-    'Login Information' => 'Login Information',
     'Login' => 'Login',
+    'Login Information' => 'Login Information',
     'Main Navigation' => 'Main Navigation',
     'Minimum 2 characters.' => 'Minimum 2 characters.',
-    'missing or invalid data' => 'missing or invalid data',
     'Multi-payment platform' => 'Multi-payment platform',
     'My Account' => 'My Account',
-    'My Address book' => 'My Address book',
     'My Address Books' => 'My Address Books',
-    'My order' => 'My order',
+    'My Address book' => 'My Address book',
     'My Orders' => 'My Orders',
+    'My order' => 'My order',
+    'Name' => 'Name',
     'Name ascending' => 'Name ascending',
     'Name descending' => 'Name descending',
-    'Name' => 'Name',
     'Need help ?' => 'Need help ?',
-    'Newsletter Subscription' => 'Newsletter Subscription',
     'Newsletter' => 'Newsletter',
-    'Next product' => 'Next product',
-    'Next Step' => 'Next Step',
+    'Newsletter Subscription' => 'Newsletter Subscription',
     'Next' => 'Next',
+    'Next Step' => 'Next Step',
+    'Next product' => 'Next product',
+    'No Content in this folder.' => 'No Content in this folder.',
     'No articles currently' => 'No articles currently',
     'No products available in this category' => 'No products available in this category',
     'No results found' => 'No results found',
@@ -100,11 +107,11 @@ return array(
     'Order details' => 'Order details',
     'Order number' => 'Order number',
     'Orders over $50' => 'Orders over $50',
+    'Our mailing address is:' => 'Our mailing address is:',
     'Out of Stock' => 'Out of stock',
     'Pagination' => 'Pagination',
-    'Password Forgotten' => 'Password Forgotten',
     'Password' => 'Password',
-    'per page' => 'per page',
+    'Password Forgotten' => 'Password Forgotten',
     'Personal Information' => 'Personal Information',
     'Placeholder address label' => 'Home, Work office, other',
     'Placeholder address1' => '76 Ninth Avenue',
@@ -123,43 +130,45 @@ return array(
     'Placeholder zipcode' => 'NY 10011',
     'Please enter your email address below.' => 'Please enter your email address below.',
     'Position' => 'Position',
-    'Previous product' => 'Previous product',
     'Previous' => 'Previous',
+    'Previous product' => 'Previous product',
+    'Price' => 'Price',
     'Price ascending' => 'Price ascending',
     'Price descending' => 'Price descending',
-    'Price' => 'Price',
     'Proceed checkout' => 'Proceed checkout',
     'Product Empty Button' => 'Add my first product',
-    'Product Empty Message' => 'It\'s really quick to add a product.
-        <ol>
-            <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
-            <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
+    'Product Empty Message' => 'It\'s really quick to add a product.
+        <ol>
+            <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
+            <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
         </ol>',
     'Product Empty Title' => 'Welcome',
     'Product Name' => 'Product Name',
     'Product Offers' => 'Product Offers',
-    'products' => 'products',
     'Qty' => 'Qty',
     'Quantity' => 'Quantity',
     'Questions ? See our F.A.Q.' => 'Questions ? See our F.A.Q.',
+    'RSS' => 'RSS',
     'Rating' => 'Rating',
     'Ref.' => 'Ref.',
-    'Register!' => 'Register!',
     'Register' => 'Register',
+    'Register!' => 'Register!',
     'Regular Price:' => 'Regular Price:',
     'Related' => 'Related',
-    'Remove this address' => 'Remove this address',
     'Remove' => 'Remove',
-    'Search a product' => 'Search a product',
-    'Search Result for' => 'Search Result for',
+    'Remove this address' => 'Remove this address',
+    'SELECT YOUR CURRENCY' => 'SELECT YOUR CURRENCY',
+    'SELECT YOUR LANGUAGE' => 'SELECT YOUR LANGUAGE',
     'Search' => 'Search',
+    'Search Result for' => 'Search Result for',
+    'Search a product' => 'Search a product',
     'Search...' => 'Search...',
-    'Secure payment' => 'Secure payment',
     'Secure Payment' => 'Secure Payment',
+    'Secure payment' => 'Secure payment',
     'Select Country' => 'Select Country',
     'Select Title' => 'Select Title',
-    'Send us a message' => 'Send us a message',
     'Send' => 'Send',
+    'Send us a message' => 'Send us a message',
     'Shipping Tax' => 'Shipping Tax',
     'Show' => 'Show',
     'Sign In' => 'Sign In',
@@ -169,7 +178,6 @@ return array(
     'Special Price:' => 'Special Price:',
     'Status' => 'Status',
     'Subscribe' => 'Subscribe',
-    'Tax Inclusive' => 'Tax Inclusive',
     'Thank you for the trust you place in us.' => 'Thank you for the trust you place in us.',
     'Thanks !' => 'Thanks !',
     'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.',
@@ -178,20 +186,22 @@ return array(
     'Thelia V2' => 'Thelia V2',
     'Toggle navigation' => 'Toggle navigation',
     'Total' => 'Total',
-    'TTC' => 'TTC',
+    'Twitter' => 'Twitter',
     'Unit Price' => 'Unit Price',
-    'Update Profile' => 'Update Profile',
     'Update' => 'Update',
+    'Update Profile' => 'Update Profile',
+    'Update Quantity' => 'Update Quantity',
     'Upsell Products' => 'Upsell Products',
     'Useful links' => 'Useful links',
+    'View' => 'View',
+    'View Cart' => 'View Cart',
     'View all' => 'View all',
     'View as' => 'View as',
-    'View Cart' => 'View Cart',
+    'View it in your browser' => 'View it in your browser',
     'View order %ref as pdf document' => 'View order %ref as pdf document',
     'View product' => 'View product',
-    'View' => 'View',
     'Warning' => 'Warning',
-    'Yes' => 'Yes',
+    'Welcome to Thelia. This is a demo site built with Thelia V2 an E-Commerce solution based on Symfony 2.' => 'Welcome to Thelia. This is a demo site built with Thelia V2 an E-Commerce solution based on Symfony 2.',
     'You are here:' => 'You are here:',
     'You choose to pay by' => 'You choose to pay by',
     'You don\'t have orders yet.' => 'You don\'t have orders yet.',
@@ -202,4 +212,8 @@ return array(
     'Your Cart' => 'Your Cart',
     'Your email address' => 'Your email address',
     'Your order will be confirmed by us upon receipt of your payment.' => 'Your order will be confirmed by us upon receipt of your payment.',
+    'Youtube' => 'Youtube',
+    'instead of' => 'instead of',
+    'missing or invalid data' => 'missing or invalid data',
+    'per page' => 'per page',
 );
diff --git a/templates/frontOffice/default/I18n/es_ES.php b/templates/frontOffice/default/I18n/es_ES.php
old mode 100644
new mode 100755
index 410d328b4..6194a5b0b
--- a/templates/frontOffice/default/I18n/es_ES.php
+++ b/templates/frontOffice/default/I18n/es_ES.php
@@ -1,201 +1,205 @@
 <?php
 
 return array(
-    '%nb Item' => '',
-    '%nb Items' => '',
-    '+ View All' => '',
-    '404' => '',
-    'A summary of your order email has been sent to the following address' => '',
-    'Account' => '',
-    'Add a new address' => '',
-    'Add to cart' => '',
-    'Additional Info' => '',
-    'Address %nb' => '',
-    'Address Update' => '',
-    'Address' => '',
-    'Amount' => '',
-    'Availability' => '',
-    'Available' => '',
-    'Back' => '',
-    'Billing address' => '',
-    'Billing and delivery' => '',
-    'Cancel' => '',
-    'Cart' => '',
-    'Categories' => '',
-    'Change address' => '',
-    'Change my account information' => '',
-    'Change my password' => '',
-    'Change Password' => '',
-    'Check my order' => '',
-    'Checkout' => '',
-    'Choose your delivery address' => '',
-    'Choose your delivery method' => '',
-    'Choose your payment method' => '',
-    'Code :' => '',
-    'Complementary address' => '',
-    'Contact Us' => '',
-    'Continue Shopping' => '',
-    'Copyright' => '',
-    'Coupon code' => '',
-    'Create New Account' => '',
-    'Create New Address' => '',
-    'Create' => '',
-    'Currency:' => '',
-    'Date' => '',
-    'Delete address' => '',
-    'Delivery address' => '',
-    'Delivery Information' => '',
-    'Demo product description' => '',
-    'Demo product title' => '',
-    'Description' => '',
-    'Do you have an account?' => '',
-    'Do you really want to delete this address ?' => '',
-    'Edit this address' => '',
-    'Edit' => '',
-    'Email address' => '',
-    'Follow us' => '',
-    'Forgot your Password?' => '',
-    'Free shipping' => '',
-    'Go home' => '',
-    'Grid' => '',
-    'Home address' => '',
-    'Home' => '',
-    'In Stock' => '',
-    'instead of' => '',
-    'Item(s)' => '',
-    'Language:' => '',
-    'Latest articles' => '',
-    'Latest products' => '',
-    'Latest' => '',
-    'List of orders' => '',
-    'List' => '',
-    'Log In!' => '',
-    'Log out!' => '',
-    'Login Information' => '',
-    'Login' => '',
-    'Main Navigation' => '',
-    'Minimum 2 characters.' => '',
-    'missing or invalid data' => '',
-    'Multi-payment platform' => '',
-    'My Account' => '',
-    'My Address book' => '',
-    'My Address Books' => '',
-    'My order' => '',
-    'My Orders' => '',
-    'Name ascending' => '',
-    'Name descending' => '',
-    'Name' => '',
-    'Need help ?' => '',
-    'Newsletter Subscription' => '',
-    'Newsletter' => '',
-    'Next product' => '',
-    'Next Step' => '',
-    'Next' => '',
-    'No articles currently' => '',
-    'No products available in this category' => '',
-    'No results found' => '',
-    'No.' => '',
-    'Offers' => '',
-    'Ok' => '',
-    'Order details' => '',
-    'Order number' => '',
-    'Orders over $50' => '',
-    'Out of Stock' => '',
-    'Pagination' => '',
-    'Password Forgotten' => '',
-    'Password' => '',
-    'per page' => '',
-    'Personal Information' => '',
-    'Placeholder address label' => '',
-    'Placeholder address1' => '',
-    'Placeholder address2' => '',
-    'Placeholder cellphone' => '',
-    'Placeholder city' => '',
-    'Placeholder company' => '',
-    'Placeholder contact email' => '',
-    'Placeholder contact message' => '',
-    'Placeholder contact name' => '',
-    'Placeholder contact subject' => '',
-    'Placeholder email' => '',
-    'Placeholder firstname' => '',
-    'Placeholder lastname' => '',
-    'Placeholder phone' => '',
-    'Placeholder zipcode' => '',
-    'Please enter your email address below.' => '',
-    'Position' => '',
-    'Previous product' => '',
-    'Previous' => '',
-    'Price ascending' => '',
-    'Price descending' => '',
-    'Price' => '',
-    'Proceed checkout' => '',
-    'Product Empty Button' => '',
-    'Product Empty Message' => '',
-    'Product Empty Title' => '',
-    'Product Name' => '',
-    'Product Offers' => '',
-    'products' => '',
-    'Qty' => '',
-    'Quantity' => '',
-    'Questions ? See or F.A.Q.' => '',
-    'Rating' => '',
-    'Ref.' => '',
-    'Register!' => '',
-    'Register' => '',
-    'Regular Price:' => '',
-    'Related' => '',
-    'Remove this address' => '',
-    'Remove' => '',
-    'Search a product' => '',
-    'Search Result for' => '',
-    'Search' => '',
-    'Search...' => '',
-    'Secure payment' => '',
-    'Secure Payment' => '',
-    'Select Country' => '',
-    'Select Title' => '',
-    'Send us a message' => '',
-    'Send' => '',
-    'Shipping Tax' => '',
-    'Show' => '',
-    'Sign In' => '',
-    'Sign up to receive our latest news.' => '',
-    'Skip to content' => '',
-    'Sort By' => '',
-    'Special Price:' => '',
-    'Status' => '',
-    'Subscribe' => '',
-    'Tax Inclusive' => '',
-    'Thank you for the trust you place in us.' => '',
-    'Thanks !' => '',
-    'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => '',
-    'Thanks for your message, we will contact as soon as possible.' => '',
-    'The page cannot be found' => '',
-    'Thelia V2' => '',
-    'Toggle navigation' => '',
-    'Total' => '',
-    'TTC' => '',
-    'Unit Price' => '',
-    'Update Profile' => '',
-    'Update' => '',
-    'Upsell Products' => '',
-    'Useful links' => '',
-    'View all' => '',
-    'View as' => '',
-    'View Cart' => '',
-    'View order %ref as pdf document' => '',
-    'View product' => '',
-    'View' => '',
-    'Warning' => '',
-    'Yes' => '',
-    'You are here:' => '',
-    'You choose to pay by' => '',
-    'You don\'t have orders yet.' => '',
-    'You have no items in your shopping cart.' => '',
-    'You may have a coupon ?' => '',
-    'You want to subscribe to the newsletter? Please enter your email address below.' => '',
-    'You will receive a link to reset your password.' => '',
-    'Your Cart' => '',
-    'Your email address' => '',
-    'Your order will be confirmed by us upon receipt of your payment.' => '',
-);
\ No newline at end of file
+    '%nb Item' => '%nb artículo',
+    '%nb Items' => '%nb artículos',
+    '+ View All' => '+ Ver todo',
+    '404' => '404',
+    'A summary of your order email has been sent to the following address' => 'Un resumen de tu pedido ha sido enviado a la siguiente dirección de correo',
+    'Account' => 'Cuenta',
+    'Add a new address' => 'Añadir una nueva dirección',
+    'Add to cart' => 'Añadir al carrito',
+    'Additional Info' => 'Información adicional',
+    'Address %nb' => 'Dirección %nb',
+    'Address Update' => 'Dirección actualizada',
+    'Address' => 'Dirección',
+    'Amount' => 'Importe',
+    'Availability' => 'Disponibilidad',
+    'Available' => 'Disponible',
+    'Back' => 'Volver',
+    'Billing address' => 'Dirección de facturación',
+    'Billing and delivery' => 'Facturación y entrega',
+    'Cancel' => 'Cancelar',
+    'Cart' => 'Carrito',
+    'Categories' => 'Categorías',
+    'Change address' => 'Cambiar dirección',
+    'Change my account information' => 'Cambiar la información de mi cuenta',
+    'Change my password' => 'Cambiar mi contraseña',
+    'Change Password' => 'Cambiar contraseña',
+    'Check my order' => 'Verificar mi pedido',
+    'Checkout' => 'Checkout',
+    'Choose your delivery address' => 'Elige tu dirección de entrega',
+    'Choose your delivery method' => 'Elegir el método de entrega',
+    'Choose your payment method' => 'Elegir el método de pago',
+    'Code :' => 'Código:',
+    'Complementary address' => 'Dirección complementaria',
+    'Contact Us' => 'Contacte con nosotros',
+    'Continue Shopping' => 'Seguir comprando',
+    'Copyright' => 'Derechos de autor',
+    'Coupon code' => 'Código de cupón',
+    'Create New Account' => 'Crear una cuenta nueva',
+    'Create New Address' => 'Crear una nueva dirección',
+    'Create' => 'Crear',
+    'Currency:' => 'Moneda:',
+    'Date' => 'Fecha',
+    'Delete address' => 'Eliminar dirección',
+    'Delivery address' => 'Dirección de entrega',
+    'Delivery Information' => 'Información de entrega',
+    'Demo product description' => 'Descripción del producto demo',
+    'Demo product title' => 'Título del producto demo',
+    'Description' => 'Descripción',
+    'Do you have an account?' => '¿Tienes una cuenta?',
+    'Do you really want to delete this address ?' => '¿Quieres eliminar esta dirección?',
+    'Edit this address' => 'Editar esta dirección',
+    'Edit' => 'Editar',
+    'Email address' => 'Dirección de correo electrónico',
+    'Follow us' => 'Síguenos',
+    'Forgot your Password?' => '¿Olvidaste tu contraseña?',
+    'Free shipping' => '¡Envío gratuito!',
+    'Go home' => 'Vuelve a la página de inicio',
+    'Grid' => 'Cuadrícula',
+    'Home address' => 'Dirección de la página de inicio',
+    'Home' => 'Página de inicio',
+    'In Stock' => 'En stock',
+    'instead of' => 'En lugar de',
+    'Item(s)' => 'Artículo(s)',
+    'Language:' => 'Idioma:',
+    'Latest articles' => 'Últimos artículos',
+    'Latest products' => 'Últimos productos',
+    'Latest' => 'Más reciente',
+    'List of orders' => 'Lista de pedidos',
+    'List' => 'Lista',
+    'Log In!' => '¡Iniciar sesión!',
+    'Log out!' => '¡Cerrar sesión!',
+    'Login Information' => 'Información de registro',
+    'Login' => '¡Iniciar sesión!',
+    'Main Navigation' => 'Navegación principal',
+    'Minimum 2 characters.' => 'Mínimo 2 caracteres.',
+    'missing or invalid data' => 'Dato aunsente o no válido',
+    'Multi-payment platform' => 'Plataforma multi-pago',
+    'My Account' => 'Mi cuenta',
+    'My Address book' => 'Mi libreta de direcciones',
+    'My Address Books' => 'Mis libretas de direcciones',
+    'My order' => 'Mi pedido',
+    'My Orders' => 'Mis pedidos',
+    'Name ascending' => 'Nombre ascendente',
+    'Name descending' => 'Nombre descendente',
+    'Name' => 'Nombre',
+    'Need help ?' => '¿Necesitas ayuda?',
+    'Newsletter Subscription' => 'Suscripción al boletín',
+    'Newsletter' => 'Boletín de noticias',
+    'Next product' => 'Producto siguiente',
+    'Next Step' => 'Siguiente paso',
+    'Next' => 'Próximo',
+    'No articles currently' => 'Actualmente no hay artículos',
+    'No products available in this category' => 'No hay productos disponibles en esta categoría',
+    'No results found' => 'No se encontraron resultados',
+    'No.' => 'No.',
+    'Offers' => 'Ofertas',
+    'Ok' => 'Ok',
+    'Order details' => 'Detalles del pedido',
+    'Order number' => 'Número de pedido',
+    'Orders over $50' => 'Pedidos superiores a 50$',
+    'Out of Stock' => 'Fuera de stock',
+    'Pagination' => 'Paginación',
+    'Password Forgotten' => 'Contraseña olvidada',
+    'Password' => 'Contraseña',
+    'per page' => 'por página',
+    'Personal Information' => 'Información personal',
+    'Placeholder address label' => 'Casa, Trabajo, otros',
+    'Placeholder address1' => 'Paseo del prado 76',
+    'Placeholder address2' => 'Dirección',
+    'Placeholder cellphone' => 'Número de teléfono móvil',
+    'Placeholder city' => 'Nueva York',
+    'Placeholder company' => 'Google',
+    'Placeholder contact email' => 'Entonces, puedo ponerme en contacto contigo.',
+    'Placeholder contact message' => 'Y tu mensaje...',
+    'Placeholder contact name' => '¿Cómo te llamas?',
+    'Placeholder contact subject' => 'El asunto de tu mensaje.',
+    'Placeholder email' => 'Johndoe@domain.com',
+    'Placeholder firstname' => 'Juan',
+    'Placeholder lastname' => 'Doe',
+    'Placeholder phone' => 'Número de teléfono',
+    'Placeholder zipcode' => 'Madrid 28011',
+    'Please enter your email address below.' => 'Por favor, introduce tu dirección de correo electrónico.',
+    'Position' => 'Posición',
+    'Previous product' => 'Producto anterior',
+    'Previous' => 'Anterior',
+    'Price ascending' => 'Precio ascendente',
+    'Price descending' => 'Precio descendente',
+    'Price' => 'Precio',
+    'Proceed checkout' => 'Realizar el checkout',
+    'Product Empty Button' => 'Añadir mi primer producto',
+    'Product Empty Message' => 'Es rápido añadir un producto.
+<ol>
+<li>Pincha <strong>Nuevo</strong> en la pestaña de detalles si quieres ver tu producto en la sección de últimos productos.</li>
+<li>Pincha <strong>En promoción</strong> en la pestaña de detalles si quieres ver tu producto en la sección de promociones.</li>
+</ol>',
+    'Product Empty Title' => 'Bienvenido',
+    'Product Name' => 'Nombre de producto',
+    'Product Offers' => 'Ofertas de producto',
+    'products' => 'productos',
+    'Qty' => 'Cant.',
+    'Quantity' => 'Cantidad',
+    'Questions ? See our F.A.Q.' => '¿Preguntas? Mira nuestras preguntas más frecuentes.',
+    'Rating' => 'Valoración',
+    'Ref.' => 'Ref.',
+    'Register!' => '¡Registrarse!',
+    'Register' => 'Registrarse',
+    'Regular Price:' => 'Precio normal:',
+    'Related' => 'Relacionado',
+    'Remove this address' => 'Eliminar esta dirección',
+    'Remove' => 'Eliminar',
+    'Search a product' => 'Buscar un producto',
+    'Search Result for' => 'Resultados de búsqueda de',
+    'Search' => 'Buscar',
+    'Search...' => 'Buscar...',
+    'Secure payment' => 'Pago seguro',
+    'Secure Payment' => 'Pago seguro',
+    'Select Country' => 'Elegir país',
+    'Select Title' => 'Selecciona título',
+    'Send us a message' => 'Envíanos un mensaje',
+    'Send' => 'Enviar',
+    'Shipping Tax' => 'Impuestos de envío',
+    'Show' => 'Mostrar',
+    'Sign In' => 'Registrate',
+    'Sign up to receive our latest news.' => 'Regístrate para recibir nuestras últimas noticias.',
+    'Skip to content' => 'Pasar al contenido',
+    'Sort By' => 'Ordenar por',
+    'Special Price:' => 'Precio especial:',
+    'Status' => 'Estado',
+    'Subscribe' => 'suscribir',
+    'Tax Inclusive' => 'Impuesto incluido',
+    'Thank you for the trust you place in us.' => 'Gracias por la confianza que depositas en nosotros.',
+    'Thanks !' => '¡Gracias!',
+    'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => '¡Gracias por registrarte! Te mantendremos informado cuando tengamos cualquier nueva actualización.',
+    'Thanks for your message, we will contact as soon as possible.' => 'Gracias por tu mensaje, nos pondremos en contacto contigo lo antes posible.',
+    'The page cannot be found' => 'No se puede encontrar la página',
+    'Thelia V2' => 'Thelia V2',
+    'Toggle navigation' => 'Cambiar el modo de navegación',
+    'Total' => 'Total',
+    'TTC' => 'IVA incluido',
+    'Unit Price' => 'Precio unitario',
+    'Update Profile' => 'Actualizar el perfil',
+    'Update' => 'Actualizar',
+    'Upsell Products' => 'Productos relacionados',
+    'Useful links' => 'Enlaces útiles',
+    'View all' => 'Ver todos',
+    'View as' => 'Ver como',
+    'View Cart' => 'Ver carrito',
+    'View order %ref as pdf document' => 'Ver pedido %ref como documento pdf',
+    'View product' => 'Ver producto',
+    'View' => 'Ver',
+    'Warning' => 'Alerta',
+    'Yes' => 'Sí',
+    'You are here:' => 'Estas aquí:',
+    'You choose to pay by' => 'Eliges pagar por',
+    'You don\'t have orders yet.' => 'Todavía no tienes pedidos.',
+    'You have no items in your shopping cart.' => 'No hay artículos en tu carrito de compras.',
+    'You may have a coupon ?' => '¿Tienes un cupón?',
+    'You want to subscribe to the newsletter? Please enter your email address below.' => '¿Deseas suscribirte al boletín de noticias? Por favor, introduce tu dirección de correo electrónico.',
+    'You will receive a link to reset your password.' => 'Recibirás un enlace para restablecer tu contraseña.',
+    'Your Cart' => 'Tu carrito',
+    'Your email address' => 'Tu dirección de correo electrónico',
+    'Your order will be confirmed by us upon receipt of your payment.' => 'Tu pedido será confirmado a recepción del pago.',
+);
diff --git a/templates/frontOffice/default/I18n/fr_FR.php b/templates/frontOffice/default/I18n/fr_FR.php
old mode 100644
new mode 100755
index 45ed72b63..d5f65a7f0
--- a/templates/frontOffice/default/I18n/fr_FR.php
+++ b/templates/frontOffice/default/I18n/fr_FR.php
@@ -24,7 +24,7 @@ return array(
     'Billing and delivery' => 'Facturation et livraison',
     'Cancel' => 'Annuler',
     'Cart' => 'Panier',
-    'Categories' => 'Catégories',
+    'Categories' => 'Rubriques',
     'Change Password' => 'Modifier mon mot de passe',
     'Change address' => 'Changer d\'adresse',
     'Change my account information' => 'Modifier mes informations personnelles',
@@ -34,7 +34,7 @@ return array(
     'Choose your delivery address' => 'Choisissez une adresse de livraison',
     'Choose your delivery method' => 'Choisissez votre moyen de livraison',
     'Choose your payment method' => 'Choisissez voter moyen de paiement',
-    'Code :' => 'Code',
+    'Code :' => 'Code : ',
     'Contact Us' => 'Contactez-nous',
     'Continue Shopping' => 'Continuer mes achats',
     'Copyright' => 'Copyright',
@@ -47,6 +47,8 @@ return array(
     'Date' => 'Date',
     'Delivery Information' => 'Information de livraison',
     'Delivery address' => 'Adresse de livraison',
+    'Demo product description' => 'Descrption produit de démo',
+    'Demo product title' => 'Titre produit de démo',
     'Description' => 'Description',
     'Discount' => 'Remise',
     'Do you have an account?' => 'Avez-vous un compte ?',
@@ -64,6 +66,7 @@ return array(
     'Google+' => 'Google+',
     'Grid' => 'Grille',
     'Home' => 'Accueil',
+    'I\'ve read and agreed on <a href=\'#\'>Terms &amp; Conditions</a>' => 'J\'ai lu et j\'accepte les <a href=\'#\'>CGV</a>',
     'In Stock' => 'Disponible',
     'Instagram' => 'Instagram',
     'Language' => 'Langue',
@@ -133,11 +136,13 @@ return array(
     'Price ascending' => 'Prix croissant',
     'Price descending' => 'Prix décroissant',
     'Proceed checkout' => 'Continuer la commande',
+    'Product Empty Button' => 'Bouton produit vide',
+    'Product Empty Message' => 'Message produit vide',
+    'Product Empty Title' => 'Titre produit vide',
     'Product Name' => 'Nom du produit',
     'Product Offers' => 'Offre spéciale',
     'Qty' => 'Qté',
-    'Quantity' => 'Quantité',
-    'Questions ? See or F.A.Q.' => 'Des questions ? Lisez notre F.A.Q',
+    'Questions ? See our F.A.Q.' => 'Questions ? Voir notre FAQ',
     'RSS' => 'RSS',
     'Rating' => 'Avis',
     'Ref.' => 'Ref.',
diff --git a/templates/frontOffice/default/I18n/it_IT.php b/templates/frontOffice/default/I18n/it_IT.php
old mode 100644
new mode 100755
diff --git a/templates/frontOffice/default/category.html b/templates/frontOffice/default/category.html
index 0b7c27a85..3fd86bfed 100644
--- a/templates/frontOffice/default/category.html
+++ b/templates/frontOffice/default/category.html
@@ -5,14 +5,14 @@
 
 {* Page Title *}
 {block name='no-return-functions' append}
-    {loop name="category.seo.title" type="category" id="{category attr="id"}"}
+    {loop name="category.seo.title" type="category" current="yes"}
     {$page_title = {$META_TITLE}}
     {/loop}
 {/block}
 
 {* Meta *}
 {block name="meta"}
-    {loop name="category.seo.meta" type="category" id="{category attr="id"}"}
+    {loop name="category.seo.meta" type="category" current="yes"}
     {if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
     {if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
     {/loop}
@@ -35,7 +35,43 @@
         <article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
             {ifloop rel="product_list"}
                 {assign var="amount" value="{count type="product" category="{category attr="id"}"}"}
-                {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={$amount}}
+                <div class="toolbar toolbar-top" role="toolbar">
+                    <div class="sorter-container">
+                    <span class="amount">{if ($amount > 1)}{intl l="%nb Items" nb="{$amount}"}{else}{intl l="%nb Item" nb="{$amount}"}{/if}</span>
+
+                    <span class="limiter">
+                        <label for="limit-top">{intl l="Show"}</label>
+                        <select id="limit-top" name="limit">
+                            <option value="{url path={navigate to="current"} limit="4"}" {if $limit==4}selected{/if}>4</option>
+                            <option value="{url path={navigate to="current"} limit="8"}" {if $limit==8}selected{/if}>8</option>
+                            <option value="{url path={navigate to="current"} limit="12"}" {if $limit==12}selected{/if}>12</option>
+                            <option value="{url path={navigate to="current"} limit="50"}"{if $limit==50}selected{/if}>50</option>
+                            <option value="{url path={navigate to="current"} limit="9999999999"}" {if $limit==9999999999}selected{/if}>All</option>
+                        </select>
+                        <span class="per-page">{intl l="per page"}</span>
+                    </span><!-- /.limiter -->
+
+                    <span class="sort-by">
+                        <label for="sortby-top">{intl l="Sort By"}</label>
+                        <select id="sortby-top" name="sortby">
+                            {*<option value="{url path="{category attr="url"}" order="manual"}">{intl l="Position"}</option>*}
+                            <option value="{url path={navigate to="current"} limit=$limit order="alpha"}" {if $product_order=="alpha"}selected{/if}>{intl l="Name ascending"}</option>
+                            <option value="{url path={navigate to="current"} limit=$limit order="alpha_reverse"}" {if $product_order=="alpha_reverse"}selected{/if}>{intl l="Name descending"}</option>
+                            <option value="{url path={navigate to="current"} limit=$limit order="min_price"}" {if $product_order=="min_price"}selected{/if}>{intl l="Price ascending"}</option>
+                            <option value="{url path={navigate to="current"} limit=$limit order="max_price"}" {if $product_order=="max_price"}selected{/if}>{intl l="Price descending"}</option>
+                        </select>
+                    </span><!-- /.sort-by -->
+
+                    <span class="view-mode">
+                        <span class="view-mode-label">{intl l="View as"}:</span>
+                        <span class="view-mode-btn">
+                            <a href="{url path={navigate to="current"} mode="grid"}" data-toggle="view" role="button" title="{intl l="Grid"}" rel="nofollow" class="btn btn-grid"><i class="icon-grid"></i></a>
+                            <a href="{url path={navigate to="current"} mode="list"}" data-toggle="view" role="button" title="{intl l="List"}" rel="nofollow" class="btn btn-list"><i class="icon-list"></i></a>
+                        </span>
+                    </span><!-- /.view-mode -->
+
+                </div><!-- /.sorter -->
+            </div>
                 <div id="category-products">
                     <div class="products-content">
                         <ul class="product-col-4">
@@ -45,7 +81,23 @@
                         </ul>
                     </div>
                 </div><!-- /#category-products -->
-                {include file="includes/toolbar.html" toolbar="bottom" amount={$amount}}
+            <div class="toolbar toolbar-bottom" role="toolbar">
+
+                {if $amount > $limit}
+                    <div class="pagination-container" role="pagination" aria-labelledby="pagination-label-{$toolbar}}">
+                        <strong id="pagination-label-{$toolbar}}" class="pagination-label">{intl l="Pagination"}</strong>
+                        <ul class="pagination">
+                            <li{if $product_page le 1} class="disabled"{/if}><a href="{url path={navigate to="current"} page={$product_page-1} }" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
+                            {pageloop rel="product_list"}
+                                <li{if $PAGE eq $CURRENT} class="active"{/if}><a href="{url path={navigate to="current"} page=$PAGE }"> {$PAGE} </a></li>
+                                {if $PAGE eq $LAST}
+                                    <li{if $CURRENT eq $LAST} class="disabled"{/if}><a href="{url path={navigate to="current"} page={$CURRENT+1} }"  title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
+                                {/if}
+                            {/pageloop}
+                        </ul>
+                    </div>
+                {/if}
+            </div><!-- /.toolbar toolbar-bottom -->
             {/ifloop}
             {elseloop rel="product_list"}
                 <div class="address-warning">
@@ -55,11 +107,7 @@
         </article>
 
         <aside class="col-left" role="complementary" itemscope itemtype="http://schema.org/WPSideBar">
-
             {include file="includes/menu.html"}
-
-            {*include file="includes/categories-filters.html"*}
-
         </aside>
 
     </div>
diff --git a/templates/frontOffice/default/includes/menu.html b/templates/frontOffice/default/includes/menu.html
index de39f9fe6..a34e99a1e 100644
--- a/templates/frontOffice/default/includes/menu.html
+++ b/templates/frontOffice/default/includes/menu.html
@@ -20,19 +20,12 @@
 
                     {loop name="cat-parent-$level" type="category" parent=$parent}
 
-                        {assign var="product_count" value="0"}
-                        {loop name="product_count" type="product" category="{$ID}"}
-                            {if $LOOP_COUNT == 1}
-                                {assign var="product_count" value="{$LOOP_TOTAL}"}
-                            {/if}
-                        {/loop}
-
                             {if $CHILD_COUNT> 0}
                                 <li><a href="{$URL}#collapse{$ID}" class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#collapse{$ID}">{$TITLE} ({$PRODUCT_COUNT})</a>
                                 {menu parent=$ID level=$level+1}
                                 </li>
                             {else}
-                                <li><a href="{$URL}">{$TITLE} ({$product_count})</a></li>
+                                <li><a href="{$URL}">{$TITLE} ({count type="product" category="{$ID}"})</a></li>
                             {/if}
                     {/loop}
 
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index 5aa76525c..2a3880167 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -376,7 +376,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                                 {/if}
                                 {if {config key="store_email"} }
                                 <li class="contact-email">
-                                    {mailto address="{config key="store_email"}" encode="hex" extra='class="email" itemprop="email"'}
+                                    {mailto address={config key="store_email"} encode="hex" extra='class="email" itemprop="email"'}
                                 </li>
                                 {/if}
                             </ul>
diff --git a/templates/frontOffice/default/product.html b/templates/frontOffice/default/product.html
index 4f417054c..c5db9541b 100644
--- a/templates/frontOffice/default/product.html
+++ b/templates/frontOffice/default/product.html
@@ -242,7 +242,7 @@
                     </div>
                     {if $smarty.capture.additional ne ""}
                     <div class="tab-pane" id="additional" role="tabpanel" aria-labelledby="tab2">
-                        {$smarty.capture.additional}
+                        {$smarty.capture.additional nofilter}
                     </div>
                     {/if}
                 </div>
diff --git a/templates/frontOffice/default/register.html b/templates/frontOffice/default/register.html
index afe5e8a2b..7090c9501 100644
--- a/templates/frontOffice/default/register.html
+++ b/templates/frontOffice/default/register.html
@@ -265,7 +265,7 @@
                     <div class="control-input">
                         <div class="checkbox">
                             <label class="control-label" for="{$label_attr.for}">
-                                <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="{$value}"{if $checked} checked{/if}  {if $required} aria-required="true" required{/if}>{intl l="I've read and agreed on <a href='#'>Terms &amp; Conditions"}</a>.
+                                <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="{$value}"{if $checked} checked{/if}  {if $required} aria-required="true" required{/if}>{intl l="I've read and agreed on <a href='#'>Terms &amp; Conditions</a>"}.
                             </label>
                             {if $error }
                                 <span class="help-block">{$message}</span>
diff --git a/templates/pdf/default/I18n/en_US.php b/templates/pdf/default/I18n/en_US.php
old mode 100644
new mode 100755
index 8f9845d30..e7e1d6202
--- a/templates/pdf/default/I18n/en_US.php
+++ b/templates/pdf/default/I18n/en_US.php
@@ -1,4 +1,27 @@
 <?php
 
-return array (
-);
\ No newline at end of file
+return array(
+    'Delivery module' => 'Delivery module',
+    'Page' => 'Page',
+    'Payment module' => 'Payment module',
+    'Postage' => 'Postage',
+    'Product' => 'Product',
+    'Quantity' => 'Quantity',
+    'Ref' => 'Ref',
+    'Tax' => 'Tax',
+    'Taxed total' => 'Taxed total',
+    'Total' => 'Total',
+    'Total with tax' => 'Total incl. tax',
+    'Total without tax' => 'Total without tax',
+    'Unit taxed price' => 'Unit taxed price',
+    'Unit. price' => 'Unit. price',
+    'customer number' => 'customer number',
+    'delivery address' => 'delivery address',
+    'delivery module' => 'delivery module',
+    'invoice' => 'invoice',
+    'invoice address' => 'invoice address',
+    'invoice date' => 'invoice date',
+    'invoice ref' => 'invoice ref',
+    'page' => 'page',
+    'product' => 'product',
+);
diff --git a/templates/pdf/default/I18n/es_ES.php b/templates/pdf/default/I18n/es_ES.php
old mode 100644
new mode 100755
diff --git a/templates/pdf/default/I18n/fr_FR.php b/templates/pdf/default/I18n/fr_FR.php
old mode 100644
new mode 100755
diff --git a/templates/pdf/default/I18n/it_IT.php b/templates/pdf/default/I18n/it_IT.php
old mode 100644
new mode 100755
diff --git a/web/install/config.php b/web/install/config.php
index 938befb9d..643e88f93 100644
--- a/web/install/config.php
+++ b/web/install/config.php
@@ -92,6 +92,10 @@ $website_url = preg_replace("#/install/[a-z](.*)#" ,'', $url);
             <label for="admin_password_verif"><?php echo $trans->trans('Administrator password verification :'); ?></label>
             <input id="admin_password_verif" class="form-control" type="password" name="admin_password_verif" value="" required>
         </div>
+        <div class="form-group">
+            <label for="admin_locale"><?php echo $trans->trans('Administrator preferred locale :'); ?></label>
+            <input id="admin_locale" class="form-control" type="password" name="admin_locale" value="" required>
+        </div>
         <div class="form-group">
             <label for="email_contact"><?php echo $trans->trans('Contact email :'); ?></label>
             <input id="email_contact" class="form-control" type="text" name="store_email" placeholder="foo@bar.com" value="" required>
diff --git a/web/install/end.php b/web/install/end.php
index d3eee16f4..9c0f0352b 100644
--- a/web/install/end.php
+++ b/web/install/end.php
@@ -33,6 +33,7 @@ if($_SESSION['install']['step'] == 5) {
         ->setPassword($_POST['admin_password'])
         ->setFirstname('admin')
         ->setLastname('admin')
+        ->setLocale(empty($_POST['admin_locale']) ? 'en_US' : $_POST['admin_locale'])
         ->save();