From eeb5b1611210bf9059320c70157c8bd378fb07d2 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Tue, 11 Oct 2011 12:45:12 +0000
Subject: [PATCH] // Merge -> revision 9221

---
 admin-dev/tabs/AdminAttributeGenerator.php    |   3 +-
 admin-dev/tabs/AdminAttributes.php            |   2 +-
 admin-dev/tabs/AdminCarts.php                 |  10 +-
 admin-dev/tabs/AdminCounty.php                |   2 +-
 admin-dev/tabs/AdminGenerator.php             |  15 +-
 admin-dev/tabs/AdminGeolocation.php           |  11 +-
 admin-dev/tabs/AdminGroups.php                |   2 +-
 admin-dev/tabs/AdminInvoices.php              |   4 +-
 admin-dev/tabs/AdminTranslations.php          |  21 +-
 admin-dev/tabs/AdminUpgrade.php               |   2 +-
 classes/Attribute.php                         |   1 +
 classes/Cart.php                              |   2 +-
 classes/ConfigurationTest.php                 |   2 +-
 classes/Language.php                          |   3 +-
 classes/PDF.php                               |   8 +
 classes/Upgrader.php                          |  17 +-
 install-dev/index.php                         |   8 -
 install-dev/langs/de.php                      |   1 -
 install-dev/langs/es.php                      |   1 -
 install-dev/langs/fr.php                      |   3 +-
 install-dev/langs/it.php                      |   1 -
 install-dev/langs/us.php                      |   1 -
 install-dev/model.php                         |   3 +-
 install-dev/php/country_to_timezone.php       |   2 +-
 install-dev/sql/upgrade/1.4.5.0.sql           |   2 +-
 install-dev/xml/createDB.php                  |  56 +-
 localization/ca.xml                           |  25 +-
 modules/authorizeaim/authorizeaim.php         |  19 +-
 modules/authorizeaim/config.xml               |   2 +-
 modules/authorizeaim/fr.php                   |   1 +
 modules/autoupgrade/AdminPreferences.php      |   4 +
 modules/autoupgrade/AdminSelfTab.php          |   3 +
 modules/autoupgrade/AdminSelfUpgrade.php      | 208 +++++---
 modules/autoupgrade/ConfigurationTest.php     |   2 +-
 modules/autoupgrade/SelfModule.php            |   3 +
 modules/autoupgrade/Upgrader.php              |  17 +-
 modules/autoupgrade/autoupgrade.php           |   2 +-
 modules/autoupgrade/config.xml                |   2 +-
 modules/autoupgrade/fr.php                    |  49 +-
 modules/blocklayered/blocklayered.js          |  37 +-
 modules/blocklayered/blocklayered.php         |  16 +-
 modules/blocklayered/blocklayered.tpl         |   6 +-
 modules/blockrss/fr.php                       |   6 +-
 modules/blockstore/blockstore.php             |  16 +-
 modules/canadapost/fr.php                     |  97 ++++
 modules/carriercompare/fr.php                 |   8 +-
 modules/cashticket/fr.php                     |   2 +
 modules/ebay/ebay.php                         |   2 +-
 modules/fedexcarrier/fr.php                   |   1 +
 modules/importerosc/fr.php                    |   6 +-
 modules/mondialrelay/AdminMondialRelay.php    |  58 ++-
 modules/mondialrelay/ajax.php                 |  15 +-
 .../mondialrelay/classes/MRCreateTickets.php  |  59 ++-
 .../mondialrelay/classes/MRGetRelayPoint.php  |  45 +-
 modules/mondialrelay/classes/MRManagement.php |   3 +
 .../mondialrelay/classes/MRRelayDetail.php    | 274 ++++++++++
 modules/mondialrelay/config.xml               |   2 +-
 modules/mondialrelay/fr.php                   |  42 +-
 modules/mondialrelay/mondialrelay.js          |  81 ++-
 modules/mondialrelay/mondialrelay.php         | 451 ++++++++--------
 modules/mondialrelay/mondialrelay.tpl         |   2 +
 modules/mondialrelay/style.css                |  18 +-
 modules/socolissimo/ajax.php                  |  10 +-
 modules/socolissimo/config.xml                |   2 +-
 modules/socolissimo/redirect.php              |   6 +-
 modules/socolissimo/socolissimo.php           |  51 +-
 modules/socolissimo/socolissimo_fancybox.tpl  | 182 +++++++
 modules/socolissimo/socolissimo_redirect.tpl  |  46 ++
 modules/socolissimo/validation.php            |  45 +-
 modules/upscarrier/carrier.jpg                | Bin 5140 -> 1798 bytes
 modules/uspscarrier/fr.php                    |  71 +--
 themes/prestashop/css/global.css              |   4 +-
 themes/prestashop/header.tpl                  |   2 +-
 themes/prestashop/lang/fr.php                 |  15 +-
 translations/en/admin.php                     | 490 +++++++++++-------
 translations/fr/admin.php                     |  70 +--
 translations/fr/errors.php                    |  41 +-
 77 files changed, 1987 insertions(+), 815 deletions(-)
 create mode 100755 modules/mondialrelay/classes/MRRelayDetail.php
 create mode 100755 modules/socolissimo/socolissimo_fancybox.tpl
 create mode 100755 modules/socolissimo/socolissimo_redirect.tpl

diff --git a/admin-dev/tabs/AdminAttributeGenerator.php b/admin-dev/tabs/AdminAttributeGenerator.php
index 58d448f4b..c89c38f9c 100644
--- a/admin-dev/tabs/AdminAttributeGenerator.php
+++ b/admin-dev/tabs/AdminAttributeGenerator.php
@@ -316,5 +316,4 @@ class AdminAttributeGenerator extends AdminTab
 			</fieldset>
 		</form>';
 	}
-}
-
+}
\ No newline at end of file
diff --git a/admin-dev/tabs/AdminAttributes.php b/admin-dev/tabs/AdminAttributes.php
index 140b2bf0f..db52d4148 100644
--- a/admin-dev/tabs/AdminAttributes.php
+++ b/admin-dev/tabs/AdminAttributes.php
@@ -116,7 +116,7 @@ class AdminAttributes extends AdminTab
 					<label>'.$this->l('Current texture:').' </label>
 					<div class="margin-form">
 						<p>'.(file_exists(_PS_IMG_DIR_.$this->fieldImageSettings['dir'].'/'.$obj->id.'.jpg')
-							? '<img src="../img/'.$this->fieldImageSettings['dir'].'/'.$obj->id.'.jpg" alt="" title="" /> <a href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&deleteImage=1"><img src="../img/admin/delete.gif" alt="'.$this->l('delete').'" title="" /></a>'
+							? '<img src="../img/'.$this->fieldImageSettings['dir'].'/'.$obj->id.'.jpg" alt="" title="" /> <a href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&deleteImage=1"><img src="../img/admin/delete.gif" alt="" title="'.$this->l('Delete').'" />'.$this->l('Delete').'</a>'
 							: $this->l('None')
 						).'</p>
 					</div>
diff --git a/admin-dev/tabs/AdminCarts.php b/admin-dev/tabs/AdminCarts.php
index c5f167d71..9bfdd32a8 100644
--- a/admin-dev/tabs/AdminCarts.php
+++ b/admin-dev/tabs/AdminCarts.php
@@ -241,7 +241,7 @@ class AdminCarts extends AdminTab
 			</table>';
 			}
 				echo '<div style="float:left; margin-top:15px;">'.
-				$this->l('According to the group of this customer, prices are printed:').' '.($order->getTaxCalculationMethod() == PS_TAX_EXC ? $this->l('tax excluded.') : $this->l('tax included.')).'
+				$this->l('According to the group of this customer, prices are printed:').' <b>'.($order->getTaxCalculationMethod() == PS_TAX_EXC ? $this->l('tax excluded.') : $this->l('tax included.')).'</b>
 				</div></div>';
 
 				// Cancel product
@@ -263,7 +263,7 @@ class AdminCarts extends AdminTab
 				<td align="center">'.($image->id ? cacheImage(_PS_IMG_DIR_.'p/'.$image->getExistingImgPath().'.jpg',
 				'product_mini_'.(int)($product['id_product']).(isset($product['id_product_attribute']) ? '_'.(int)($product['id_product_attribute']) : '').'.jpg', 45, 'jpg') : '--').'</td>
 				<td><a href="index.php?tab=AdminCatalog&id_product='.$product['id_product'].'&updateproduct&token='.$tokenCatalog.'">
-					<span class="productName">'.$product['name'].'</span><br />
+							<span class="productName">'.$product['name'].'</span>'.(isset($product['attributes']) ? '<br />'.$product['attributes'] : '').'<br />
 					'.($product['reference'] ? $this->l('Ref:').' '.$product['reference'] : '')
 					.(($product['reference'] AND $product['supplier_reference']) ? ' / '.$product['supplier_reference'] : '')
 					.'</a></td>
@@ -281,7 +281,7 @@ class AdminCarts extends AdminTab
 					if ($type == Product::CUSTOMIZE_FILE)
 					{
 						$i = 0;
-						echo '<ul style="margin: 4px 0px 4px 0px; padding: 0px; list-style-type: none;">';
+						echo '<ul style="margin: 0; padding: 0; list-style-type: none;">';
 						foreach ($datas AS $data)
 							echo '<li style="display: inline; margin: 2px;">
 									<a href="displayImage.php?img='.$data['value'].'&name='.(int)($order->id).'-file'.++$i.'" target="_blank"><img src="'._THEME_PROD_PIC_DIR_.$data['value'].'_small" alt="" /></a>
@@ -291,9 +291,9 @@ class AdminCarts extends AdminTab
 					elseif ($type == Product::CUSTOMIZE_TEXTFIELD)
 					{
 						$i = 0;
-						echo '<ul style="margin: 0px 0px 4px 0px; padding: 0px 0px 0px 6px; list-style-type: none;">';
+						echo '<ul style="margin-bottom: 4px; padding: 0; list-style-type: none;">';
 						foreach ($datas AS $data)
-							echo '<li>'.($data['name'] ? $data['name'] : $this->l('Text #').++$i).$this->l(':').' '.$data['value'].'</li>';
+							echo '<li>'.($data['name'] ? $data['name'] : $this->l('Text #').++$i).$this->l(':').' <b>'.$data['value'].'</b></li>';
 						echo '</ul>';
 					}
 				echo '</td>
diff --git a/admin-dev/tabs/AdminCounty.php b/admin-dev/tabs/AdminCounty.php
index 418f7b0ff..712f4a43c 100644
--- a/admin-dev/tabs/AdminCounty.php
+++ b/admin-dev/tabs/AdminCounty.php
@@ -129,7 +129,7 @@ class AdminCounty extends AdminTab
 			<fieldset><legend><img src="../img/admin/world.gif" />'.$this->l('Counties').'</legend>';
 
 				if (!isset($obj->id))
-					echo '<div class="hint clear" style="display:block;">'.$this->l('Save this county then you will be able to associate zipcodes').'</div><br />';
+					echo '<div class="hint clear" style="display:block;">&nbsp;'.$this->l('Save this county then you will be able to associate zipcodes').'</div><br />';
 
 		$countries = Country::getCountries($this->context->language->id, true, true);
 		echo '<label>'.$this->l('Country:').' </label>
diff --git a/admin-dev/tabs/AdminGenerator.php b/admin-dev/tabs/AdminGenerator.php
index 12d8d083e..97128e0fd 100644
--- a/admin-dev/tabs/AdminGenerator.php
+++ b/admin-dev/tabs/AdminGenerator.php
@@ -43,10 +43,10 @@ class AdminGenerator extends AdminTab
 		// Htaccess
 		echo '
 		<form action="'.self::$currentIndex.'&token='.$this->token.'" method="post" enctype="multipart/form-data">
-		<fieldset><legend><img src="../img/admin/htaccess.gif" />'.$this->l('Htaccess file generation').'</legend>
+		<fieldset><legend><img src="../img/admin/htaccess.gif" alt="" />'.$this->l('Htaccess file generation').'</legend>
 		<p><b>'.$this->l('Warning:').'</b> '.$this->l('this tool can ONLY be used if you are hosted by an Apache web server. Please ask your webhost.').'</p>
-		<p>'.$this->l('This tool will automatically generate a ".htaccess" file that will give you the ability to do URL rewriting and to catch 404 errors.').'</p>
-		<p>'.$this->l('If you do not have "Friendly URL" enabled when generating the ".htaccess" file, this feature won\'t be available.').'</p>';
+		<p>'.$this->l('This tool will automatically generate a ".htaccess" file that will give you the ability to do URL rewriting and to catch 404 errors.').'</p>';
+
 		if ($this->_checkConfiguration($this->_htFile))
 			echo '
 			<div class="clear">&nbsp;</div>
@@ -67,7 +67,7 @@ class AdminGenerator extends AdminTab
 				<input type="checkbox" name="PS_HTACCESS_DISABLE_MULTIVIEWS" id="PS_HTACCESS_CACHE_CONTROL" value="1" '.(Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS') == 1 ? 'checked="checked"' : '').' />
 				<p>'.$this->l('Enable this option only if you have problems with some pages URL rewriting.').'</p>
 			</div>
-			<p class="clear" style="font-weight:bold;">'.$this->l('Generate your ".htaccess" file by clicking on the following button:').'<br /><br />
+			<p class="clear" style="font-weight:bold;">'.$this->l('Generate your ".htaccess" file by clicking on the following button:').' 
 			<input type="submit" value="'.$this->l('Generate .htaccess file').'" name="submitHtaccess" class="button" /></p>
 			<p>'.$this->l('This will erase your').'<b> '.$this->l('old').'</b> '.$this->l('.htaccess file!').'</p>';
 		else
@@ -80,13 +80,13 @@ class AdminGenerator extends AdminTab
 		// Robots
 		echo '<br /><br />
 		<form action="'.self::$currentIndex.'&token='.$this->token.'" method="post" enctype="multipart/form-data">
-		<fieldset><legend><img src="../img/admin/robots.gif" />'.$this->l('Robots file generation').'</legend>
+		<fieldset><legend><img src="../img/admin/binoculars.png" alt="" />'.$this->l('Robots file generation').'</legend>
 		<p><b>'.$this->l('Warning:').' </b>'.$this->l('Your file robots.txt MUST be in your website\'s root directory and nowhere else.').'</p>
 		<p>'.$this->l('eg: http://www.yoursite.com/robots.txt').'.</p>
 		<p>'.$this->l('This tool will automatically generate a "robots.txt" file that you can configure to deny access to search engines for some pages.').'</p>';
 		if ($this->_checkConfiguration($this->_rbFile))
 			echo '
-			<p style="font-weight:bold;">'.$this->l('Generate your "robots.txt" file by clicking on the following button:').'<br /><br />
+			<p style="font-weight:bold;">'.$this->l('Generate your "robots.txt" file by clicking on the following button:').' 
 			<input type="submit" value="'.$this->l('Generate robots.txt file').'" name="submitRobots" class="button" /></p>
 			<p>'.$this->l('This will erase your').'<b> '.$this->l('old').'</b> '.$this->l('robots.txt file!').'</p>';
 		else
@@ -94,7 +94,8 @@ class AdminGenerator extends AdminTab
 			<p style="color:red; font-weight:bold;">'.$this->l('Before being able to use this tool, you need to:').'</p>
 			<p>'.$this->l('- create a').' <b>'. $this->l('robots.txt').'</b> '.$this->l('blank file in dir:').' <b>'.__PS_BASE_URI__.'</b>
 			<br />'.$this->l('- give it write permissions (CHMOD 666 on Unix system)').'</p>';
-		echo '</p></fieldset></form>';
+		echo '</p></fieldset></form>
+		<br />';
 	}
 
 	public function _checkConfiguration($file)
diff --git a/admin-dev/tabs/AdminGeolocation.php b/admin-dev/tabs/AdminGeolocation.php
index 18e4b70e7..995acff10 100755
--- a/admin-dev/tabs/AdminGeolocation.php
+++ b/admin-dev/tabs/AdminGeolocation.php
@@ -39,7 +39,7 @@ class AdminGeolocation extends AdminTab
 		
 		echo '
 		<form method="POST" action="'.self::$currentIndex.'&token='.Tools::getValue('token').'">
-			<fieldset>
+			<fieldset class="width3">
 				<legend><img src="../img/admin/world.gif" alt="" /> '.$this->l('Geolocation by IP').'</legend>
 				
 				<label>'.$this->l('Geolocation by IP:').'</label>
@@ -58,7 +58,7 @@ class AdminGeolocation extends AdminTab
 		$allowedCountries = explode(';', Configuration::get('PS_ALLOWED_COUNTRIES'));
 		echo '
 		<form method="POST" action="'.self::$currentIndex.'&token='.Tools::getValue('token').'">
-			<fieldset style="margin-top:10px;">
+			<fieldset style="margin-top: 10px;" class="width3">
 				<legend><img src="../img/admin/world.gif" alt="" /> '.$this->l('Options').'</legend>
 				
 				<div class="hint" style="display:block;margin-bottom:20px;">
@@ -87,7 +87,7 @@ class AdminGeolocation extends AdminTab
 				<div class="clear" style="margin-top:10px;"></div>
 				
 				<label>'.$this->l('Select countries that can access your store:').'</label>
-				<div class="margin-form">
+				<div class="margin-form" style="float: left; padding-left: 0; width: 317px; margin-top: 6px; height: 300px; overflow-y: auto;">
 					<table class="table" cellspacing="0">
 						<thead>
 							<tr>
@@ -108,7 +108,8 @@ class AdminGeolocation extends AdminTab
 						</tbody>
 					</table>
 				</div>
-				
+				<div class="clear"></div>
+				<br />
 				<div class="margin-form">
 					<input type="submit" class="button" name="submitGeolocationCountries" value="'.$this->l('Save').'" />
 				</div>
@@ -116,7 +117,7 @@ class AdminGeolocation extends AdminTab
 		</form>
 		
 		<form method="POST" action="'.self::$currentIndex.'&token='.Tools::getValue('token').'">
-			<fieldset style="margin-top:10px;">
+			<fieldset style="margin-top: 10px;" class="width3">
 				<legend><img src="../img/admin/world.gif" alt="" /> '.$this->l('Whitelist of IP addresses').'</legend>
 				
 				<div class="hint" style="display:block;margin-bottom:20px;">
diff --git a/admin-dev/tabs/AdminGroups.php b/admin-dev/tabs/AdminGroups.php
index 51d39321e..7f876b287 100644
--- a/admin-dev/tabs/AdminGroups.php
+++ b/admin-dev/tabs/AdminGroups.php
@@ -67,7 +67,7 @@ class AdminGroups extends AdminTab
 		echo '
 		<form id="group" action="'.self::$currentIndex.'&submitAdd'.$this->table.'=1&token='.$this->token.'" method="post">
 		'.($obj->id ? '<input type="hidden" name="id_'.$this->table.'" value="'.$obj->id.'" />' : '').'
-			<fieldset><legend><img src="../img/admin/tab-groups.gif" />'.$this->l('Group').'</legend>
+			<fieldset class="width3"><legend><img src="../img/admin/tab-groups.gif" alt="" />'.$this->l('Customer group').'</legend>
 				<label>'.$this->l('Name:').' </label>
 				<div class="margin-form">';
 				foreach ($this->_languages as $language)
diff --git a/admin-dev/tabs/AdminInvoices.php b/admin-dev/tabs/AdminInvoices.php
index 30f7be73e..38c671caa 100644
--- a/admin-dev/tabs/AdminInvoices.php
+++ b/admin-dev/tabs/AdminInvoices.php
@@ -37,7 +37,9 @@ class AdminInvoices extends AdminTab
 				'fields' =>	array(
 					'PS_INVOICE' => array('title' => $this->l('Enable invoices:'), 'desc' => $this->l('Select whether or not to activate invoices for your shop'), 'cast' => 'intval', 'type' => 'bool'),
 					'PS_INVOICE_PREFIX' => array('title' => $this->l('Invoice prefix:'), 'desc' => $this->l('Prefix used for invoices'), 'size' => 6, 'type' => 'textLang'),
-					'PS_INVOICE_START_NUMBER' => array('title' => $this->l('Invoice number:'), 'desc' => $this->l('The next invoice will begin with this number, and then increase with each additional invoice. Set to 0 if you want to keep the current number (#').(Order::getLastInvoiceNumber() + 1).').', 'size' => 6, 'type' => 'text', 'cast' => 'intval')
+			'PS_INVOICE_START_NUMBER' => array('title' => $this->l('Invoice number:'), 'desc' => $this->l('The next invoice will begin with this number, and then increase with each additional invoice. Set to 0 if you want to keep the current number (#').(Order::getLastInvoiceNumber() + 1).').', 'size' => 6, 'type' => 'text', 'cast' => 'intval'),
+			'PS_INVOICE_FREE_TEXT' => array('title' => $this->l('Free Text:'), 'desc' => $this->l('This text will appear at the bottom of the invoice'), 'size' => 6, 'type' => 'textareaLang',
+			'cols' => 40, 'rows' => 8)
 				),
 			),
 		);
diff --git a/admin-dev/tabs/AdminTranslations.php b/admin-dev/tabs/AdminTranslations.php
index a0510616e..16ca27e4c 100644
--- a/admin-dev/tabs/AdminTranslations.php
+++ b/admin-dev/tabs/AdminTranslations.php
@@ -32,6 +32,8 @@ define ('TEXTAREA_SIZED', 70);
 
 class AdminTranslations extends AdminTab
 {
+
+	protected $link_lang_pack = 'http://www.prestashop.com/download/lang_packs/get_each_language_pack.php';
 	protected $total_expression = 0;
 	protected $all_iso_lang = array();
 	protected $modules_translations = array();
@@ -394,8 +396,11 @@ class AdminTranslations extends AdminTab
 		{
 			if ((preg_match('/^(.*).tpl$/', $template_file) OR ($is_default AND preg_match('/^(.*).php$/', $template_file))) AND file_exists($tpl = $dir.$template_file))
 			{
-				// Get translations key
 				$content = file_get_contents($tpl);
+				// module files can now be ignored by adding this string in a file
+				if (strpos($content, 'IGNORE_THIS_FILE_FOR_TRANSLATION') !== false)
+					continue;
+				// Get translations key
 				preg_match_all(substr($template_file, -4) == '.tpl' ? self::$tpl_regexp : self::$php_regexp, $content, $matches);
 
 				// Write each translation on its module file
@@ -712,7 +717,7 @@ class AdminTranslations extends AdminTab
 			$this->displayWarning($this->l('If you choose to update an existing language pack, all your previous customization in the theme named prestashop will be lost. This includes front office expressions and default e-mail templates.'));
 			echo '<div style="font-weight:bold; float:left;">'.$this->l('Language you want to add or update:').' ';
 
-			if ($lang_packs = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_each_language_pack.php?version='._PS_VERSION_, false, @stream_context_create(array('http' => array('method' => 'GET', 'timeout' => 5)))))
+			if ($lang_packs = Tools::file_get_contents($this->link_lang_pack .'?version='._PS_VERSION_, false, @stream_context_create(array('http' => array('method' => 'GET', 'timeout' => 5)))))
 			{
 				// Notice : for php < 5.2 compatibility, Tools::jsonDecode. The second parameter to true will set us
 				if ($lang_packs != '' AND $lang_packs = Tools::jsonDecode($lang_packs,true))
@@ -1323,10 +1328,12 @@ class AdminTranslations extends AdminTab
 								<input type="text" name="subject['.$group_name.']['.$subject_mail.']" value="'.(isset($mails['subject'][$subject_mail]) ? $mails['subject'][$subject_mail] : '').'" />
 							</div>
 						</div>';
-					} else {
+					}
+					else
+					{
 						$str_return .= '
 						<div class="label-subject">
-							<b>'.sprintf($this->l('No Subject was found for %s.'), '<em>'.$mail_name.'</em>').'</b>'
+							<b>'.sprintf($this->l('No Subject was found for %s, or subject is generated in database.'), '<em>'.$mail_name.'</em>').'</b>'
 						.'</div>';
 					}
 					if (key_exists('html', $mail_files))
@@ -1587,7 +1594,7 @@ class AdminTranslations extends AdminTab
 		echo $str_output;
 	}
 
-	protected function getSubjectMail($directory, $subject_mail)
+	protected static function getSubjectMail($directory, $subject_mail)
 	{
 		foreach (scandir($directory) AS $filename)
 		{
@@ -1605,7 +1612,7 @@ class AdminTranslations extends AdminTab
 							if ($tab2 && isset($tab2[1]))
 							{
 								$tab2[1] = trim(str_replace('\'', '', $tab2[1]));
-								if (preg_match('/Mail::l\(\''._PS_TRANS_PATTERN_.'\'\)/s', $tab2[2], $tab3))
+								if (preg_match('/Mail::l\(\''._PS_TRANS_PATTERN_.'\'/s', $tab2[2], $tab3))
 									$tab2[2] = $tab3[1];
 								$subject_mail[$tab2[1]] = $tab2[2];
 							}
@@ -1848,8 +1855,8 @@ class AdminTranslations extends AdminTab
 		@include(_PS_TRANSLATIONS_DIR_.$lang.'/pdf.php');
 		$files = array();
 		$count = 0;
-		$tabsArray = array($tab=>array());
 		$tab = 'PDF_invoice';
+		$tabsArray = array($tab=>array());
 		$regex = '/self::l\(\''._PS_TRANS_PATTERN_.'\'[\)|\,]/U';
 		// need to parse PDF.php in order to find $regex and add this to $tabsArray
 		// this has to be done for the core class, and eventually for the override
diff --git a/admin-dev/tabs/AdminUpgrade.php b/admin-dev/tabs/AdminUpgrade.php
index 4e3a2da78..05b769ac5 100644
--- a/admin-dev/tabs/AdminUpgrade.php
+++ b/admin-dev/tabs/AdminUpgrade.php
@@ -1110,7 +1110,7 @@ class AdminUpgrade extends AdminPreferences
 			}
 			else if (!method_exists(get_class($this), 'ajaxProcess'.$action))
 			{
-				$this->nextDesc = sprintf($this->l('action "%1$s" non trouvée '), $action);
+				$this->nextDesc = sprintf($this->l('action "%1$s" not found'), $action);
 				$this->next = 'error';
 				$this->error = '1';
 			}
diff --git a/classes/Attribute.php b/classes/Attribute.php
index 43a776062..31e1a0914 100644
--- a/classes/Attribute.php
+++ b/classes/Attribute.php
@@ -44,6 +44,7 @@ class AttributeCore extends ObjectModel
 
 	protected 	$table = 'attribute';
 	protected 	$identifier = 'id_attribute';
+	protected	$image_dir = _PS_COL_IMG_DIR_;
 
 	protected	$webserviceParameters = array(
 		'objectsNodeName' => 'product_option_values',
diff --git a/classes/Cart.php b/classes/Cart.php
index 06dbf158b..0f0ec4b77 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -475,7 +475,7 @@ class CartCore extends ObjectModel
 				$row['total'] = Tools::ps_round($row['price'] * (int)($row['cart_quantity']), 2);
 			}
 
-			if (!isset($row['pai_id_image']))
+			if (!isset($row['pai_id_image']) OR $row['pai_id_image'] == 0)
 			{
 				$row2 = Db::getInstance()->getRow('
 				SELECT i.`id_image`, il.`legend`
diff --git a/classes/ConfigurationTest.php b/classes/ConfigurationTest.php
index 21273b291..cd28461b2 100644
--- a/classes/ConfigurationTest.php
+++ b/classes/ConfigurationTest.php
@@ -55,7 +55,7 @@ class	ConfigurationTestCore
 	
 	static function test_magicquotes()
 	{
-		return !ini_get('magic_quotes_gpc');
+		return !get_magic_quotes_gpc();
 	}
 
 	static	function test_upload()
diff --git a/classes/Language.php b/classes/Language.php
index 7b015a629..46b832577 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -99,7 +99,8 @@ class LanguageCore extends ObjectModel
 	 * Generate traslations files
 	 *
 	 */
-	private function _generateFiles($newIso){
+	private function _generateFiles($newIso = null)
+	{
 		$iso_code = $newIso?$newIso:$this->iso_code;
 
 		if (!file_exists(_PS_TRANSLATIONS_DIR_.$iso_code))
diff --git a/classes/PDF.php b/classes/PDF.php
index c97dccfd6..0296b6b98 100644
--- a/classes/PDF.php
+++ b/classes/PDF.php
@@ -289,6 +289,14 @@ class PDFCore extends PDF_PageGroupCore
 		$this->SetFont(self::fontname(), '', 7);
 		$this->Cell(190, 5, ' '."\n".Tools::iconv('utf-8', self::encoding(), 'P. ').$this->GroupPageNo().' / '.$this->PageGroupAlias(), 'T', 1, 'R');
 
+		global $cookie;
+		if (Configuration::get('PS_INVOICE_FREE_TEXT', $cookie->id_lang))
+		{
+
+			$this->Cell(0, 10, utf8_decode(Configuration::get('PS_INVOICE_FREE_TEXT', $cookie->id_lang)), 0, 0, 'C', 0);
+			$this->Ln(4);
+		}
+
 		/*
 		 * Display a message for customer
 		 */
diff --git a/classes/Upgrader.php b/classes/Upgrader.php
index 2cf42fd5b..c4c4c1327 100644
--- a/classes/Upgrader.php
+++ b/classes/Upgrader.php
@@ -31,9 +31,7 @@ class UpgraderCore
 	public $rss_version_link = 'http://www.prestashop.com/xml/upgrader.xml';
 	public $rss_md5file_link_dir = 'http://www.prestashop.com/xml/md5/';
 	/**
-	 * link contains hte url where to download the file
-	 * 
-	 * @var string 
+	 * @var boolean contains true if last version is not installed
 	 */
 	private $need_upgrade = false;
 	private $changed_files = array();
@@ -41,6 +39,9 @@ class UpgraderCore
 
 	public $version_name;
 	public $version_num;
+	/**
+	 * @var string contains hte url where to download the file
+	 */
 	public $link;
 	public $autoupgrade;
 	public $autoupgrade_module;
@@ -68,7 +69,7 @@ class UpgraderCore
 			$this->checkPSVersion();
 
 		$destPath =  realpath($dest).DIRECTORY_SEPARATOR.$filename;
-		if (@copy($this->link, $destPath) && md5_file($destPath) == $this->md5 )
+		if (@copy($this->link, $destPath))
 			return true;
 		else
 			return false;
@@ -131,13 +132,21 @@ class UpgraderCore
 			else
 			{
 				$last_version_check = @unserialize(Configuration::get('PS_LAST_VERSION'));
+				if (isset($last_version_check['name']))
 				$this->version_name = $last_version_check['name'];
+				if (isset($last_version_check['num']))
 				$this->version_num = $last_version_check['num'];
+				if (isset($last_version_check['link']))
 				$this->link = $last_version_check['link'];
+				if (isset($last_version_check['autoupgrade']))
 				$this->autoupgrade = $last_version_check['autoupgrade'];
+				if (isset($last_version_check['autoupgrade_module']))
 				$this->autoupgrade_module = $last_version_check['autoupgrade_module'];
+				if (isset($last_version_check['md5']))
 				$this->md5 = $last_version_check['md5'];
+				if (isset($last_version_check['desc']))
 				$this->desc = $last_version_check['desc'];
+				if (isset($last_version_check['changelog']))
 				$this->changelog = $last_version_check['changelog'];
 			}
 		}
diff --git a/install-dev/index.php b/install-dev/index.php
index 55fc7a66b..5eb426517 100644
--- a/install-dev/index.php
+++ b/install-dev/index.php
@@ -992,9 +992,6 @@ if ($lm->getIncludeTradFilename())
 						<td id="endEmail" class="resultEnd">&nbsp;</td>
 					</tr>
 				</table>
-
-				<h3 class="infosBlock"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?></h3>
-
 				<div id="boBlock" class="blockInfoEnd clearfix">
 						<img src="img/visu_boBlock.png" />
 						<h3><?php echo lang('Back Office'); ?></h3>
@@ -1326,11 +1323,6 @@ if ($lm->getIncludeTradFilename())
 					}
 
 				?>
-
-				<div class="infosBlock">
-					<?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?>
-			</div>
-
 				<div id="foBlock" class="blockInfoEnd clearfix">
 						<img src="img/visu_foBlock.png" />
 						<h3><?php echo lang('Front Office'); ?></h3>
diff --git a/install-dev/langs/de.php b/install-dev/langs/de.php
index 59d60a79a..15dc5625e 100644
--- a/install-dev/langs/de.php
+++ b/install-dev/langs/de.php
@@ -140,7 +140,6 @@ $_LANG['Update is complete!'] = 'Aktualisierung beendet!';
 $_LANG['Upgrade: get the latest stable version!'] = 'Aktualisierung: Installieren Sie die neueste Version von PrestaShop';
 $_LANG['Verify now!'] = 'Testen der SQL-Verbindung';
 $_LANG['Verify system compatibility'] = 'Systemkompatibilität';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\' und die readme-Dateien (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Vorsicht: eine manuelle Sicherung ist UNERLÄSSLICH, bevor mit der Aktualisierung der PrestaShop-Anwendung begonnen wird, um jeglichen versehentlichen Datenverlust zu verhindern';
 $_LANG['Welcome'] = 'Willkommen';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Willkommen bei der Installation von PrestaShop %s';
diff --git a/install-dev/langs/es.php b/install-dev/langs/es.php
index 617a7cd8d..d541d619b 100644
--- a/install-dev/langs/es.php
+++ b/install-dev/langs/es.php
@@ -138,7 +138,6 @@ $_LANG['Update is complete!'] = '¬°Actualización completa!';
 $_LANG['Upgrade: get the latest stable version!'] = 'Actualización: instale la última versión de PrestaShop';
 $_LANG['Verify now!'] = '¬°Pruebe ahora!';
 $_LANG['Verify system compatibility'] = 'Compatibilidad sistema';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATENCION : para más seguridad, por favor suprima la carpeta \'/install\' y los archivos readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG)..';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = '¬°Atención: se recomienda hacer una copia de seguridad manual antes de continuar!';
 $_LANG['Welcome'] = 'Bienvenido';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenido a la instalación de PrestaShop %s';
diff --git a/install-dev/langs/fr.php b/install-dev/langs/fr.php
index c4e5f22e1..0f8d9113e 100644
--- a/install-dev/langs/fr.php
+++ b/install-dev/langs/fr.php
@@ -20,7 +20,7 @@ $_LANG['Community Forum'] = 'notre forum communautaire';
 $_LANG['Configure SMTP manually (advanced users only)'] = 'Configurer l\'envoi SMTP (experts uniquement)';
 $_LANG['Configure your database by filling out the following fields:'] = 'Configurez votre base de données en remplissant les champs ci-dessous :';
 $_LANG['Congratulation, your online shop is now ready!'] = 'Félicitations, votre boutique est installée !';
-$_LANG['Contact us!'] = 'Contactez-nous !';
+$_LANG['Contact us!'] = 'Contactez-nous';
 $_LANG['Create new files and folders allowed'] = 'Création de nouveaux dossiers et fichiers autorisée';
 $_LANG['Your database connection settings are not valid. Please check your server, name, login and prefix.'] = 'Vos informations de connexion à la base de données ne sont pas valides. Veuillez vérifier le serveur, nom, login et préfixe que vous avez indiqué.';
 $_LANG['Database Server is available but database is not found'] = 'Le serveur de bases de données est disponible mais la base de données n\'a pas été trouvée';
@@ -141,7 +141,6 @@ $_LANG['Update is complete!'] = 'Mise à jour terminée !';
 $_LANG['Upgrade: get the latest stable version!'] = 'Mise à jour : installez la dernière version de PrestaShop';
 $_LANG['Verify now!'] = 'Tester la connexion';
 $_LANG['Verify system compatibility'] = 'Compatibilité système';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\' et les fichiers readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attention : une sauvegarde manuelle est INDISPENSABLE avant de procéder à la mise à jour de l\'application PrestaShop, cela afin de prévenir toute perte de données accidentelle';
 $_LANG['Welcome'] = 'Bienvenue';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenue dans l\'installation de PrestaShop %s';
diff --git a/install-dev/langs/it.php b/install-dev/langs/it.php
index e527377bd..5e3343c1e 100644
--- a/install-dev/langs/it.php
+++ b/install-dev/langs/it.php
@@ -140,7 +140,6 @@ $_LANG['Update is complete!'] = 'Aggiornamento terminato!';
 $_LANG['Upgrade: get the latest stable version!'] = 'Aggiornamento installa l\'ultima versione di PrestaShop';
 $_LANG['Verify now!'] = 'Prova la connessione SQL';
 $_LANG['Verify system compatibility'] = 'Compatibilità sistema';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\'  e i file readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attenzione: E\' FONDAMENTALE un backup manuale prima di continuare l\'aggiornamento dell\'applicazione Prestashop, al fine di evitare la perdita accidentale di dati.';
 $_LANG['Welcome'] = 'Benvenuto';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Benvenuto nell\'installazione di PrestaShop %s';
diff --git a/install-dev/langs/us.php b/install-dev/langs/us.php
index 71273f32d..a129cbc3b 100644
--- a/install-dev/langs/us.php
+++ b/install-dev/langs/us.php
@@ -64,7 +64,6 @@ $_LANG['This is not a valid image file.'] = 'Invalid image file';
 $_LANG['Too long!'] = 'Too long';
 $_LANG['Upgrade: get the latest stable version!'] = 'Update: Get the latest stable version';
 $_LANG['Verify system compatibility'] = 'System Compatibility';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'WARNING! A manual backup is HIGHLY recommended before continuing.';
 $_LANG['Welcome'] = 'Welcome!';
 $_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Welcome to the PrestaShop™ v'.INSTALL_VERSION.' Installer wizard.';
diff --git a/install-dev/model.php b/install-dev/model.php
index 18617d825..1fd315c97 100644
--- a/install-dev/model.php
+++ b/install-dev/model.php
@@ -113,5 +113,4 @@ if (isset($_GET['method']))
 			require_once('xml/getVersionFromDb.php');
 		break;
 	}
-}
-
+}
\ No newline at end of file
diff --git a/install-dev/php/country_to_timezone.php b/install-dev/php/country_to_timezone.php
index a705d3563..93533119c 100644
--- a/install-dev/php/country_to_timezone.php
+++ b/install-dev/php/country_to_timezone.php
@@ -63,7 +63,7 @@ $timezones = array(
 	'BW' => 'Africa/Gaborone',
 	'BY' => 'Europe/Minsk',
 	'BZ' => 'America/Belize',
-	'CA' => 'America/St_Johns',
+	'CA' => 'America/Toronto',
 	'CC' => 'Indian/Cocos',
 	'CD' => 'Africa/Kinshasa',
 	'CF' => 'Africa/Bangui',
diff --git a/install-dev/sql/upgrade/1.4.5.0.sql b/install-dev/sql/upgrade/1.4.5.0.sql
index 87077c1c0..f5d05001a 100644
--- a/install-dev/sql/upgrade/1.4.5.0.sql
+++ b/install-dev/sql/upgrade/1.4.5.0.sql
@@ -38,7 +38,7 @@ INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edi
 
 ALTER TABLE `PREFIX_employee` ADD `bo_show_screencast` TINYINT(1) NOT NULL DEFAULT '1' AFTER `bo_uimode`;
 
-UPDATE `PREFIX_country` SET id_zone = (SELECT id_zone FROM `PREFIX_zone` WHERE name = 'Oceania') WHERE iso_code = 'KI' LIMIT 1
+UPDATE `PREFIX_country` SET id_zone = (SELECT id_zone FROM `PREFIX_zone` WHERE name = 'Oceania' LIMIT 1) WHERE iso_code = 'KI' LIMIT 1;
 
 ALTER TABLE `PREFIX_lang` ADD `date_format_lite` char(32) NOT NULL DEFAULT 'Y-m-d' AFTER language_code;
 ALTER TABLE `PREFIX_lang` ADD `date_format_full` char(32) NOT NULL DEFAULT 'Y-m-d H:i:s' AFTER date_format_lite;
diff --git a/install-dev/xml/createDB.php b/install-dev/xml/createDB.php
index 54acc49d3..1d36b32c3 100644
--- a/install-dev/xml/createDB.php
+++ b/install-dev/xml/createDB.php
@@ -46,7 +46,8 @@ global $logger;
 //check db access
 include_once(INSTALL_PATH.'/classes/ToolsInstall.php');
 $resultDB = ToolsInstall::checkDB($_GET['server'], $_GET['login'], $_GET['password'], $_GET['name'], true);
-if ($resultDB !== true){
+if ($resultDB !== true)
+{
 	$logger->logError('Invalid database configuration');
 	die("<action result='fail' error='".$resultDB."'/>\n");
 }
@@ -102,19 +103,20 @@ require_once(SETTINGS_FILE);
 //-----------
 //import SQL data
 //-----------
-switch (_DB_TYPE_) {
-	case "MySQL" :
+switch (_DB_TYPE_)
+{
+	case 'MySQL':
 
 		$filePrefix = 'PREFIX_';
 		$engineType = 'ENGINE_TYPE';
 		//send the SQL structure file requests
-		$structureFile = dirname(__FILE__)."/../sql/db.sql";
+		$structureFile = dirname(__FILE__).'/../sql/db.sql';
 		if(!file_exists($structureFile))
 		{
 			$logger->logError('Impossible to access to a MySQL content file. ('.$structureFile.')');
 			die('<action result="fail" error="10" />'."\n");
 		}
-		$db_structure_settings ="";
+		$db_structure_settings = '';
 		if ( !$db_structure_settings .= file_get_contents($structureFile) )
 		{
 			$logger->logError('Impossible to read the content of a MySQL content file. ('.$structureFile.')');
@@ -128,14 +130,20 @@ switch (_DB_TYPE_) {
 			array_unshift($db_structure_settings, 'CREATE DATABASE `'.trim($_GET['name']).'`;');
 			array_unshift($db_structure_settings, 'DROP DATABASE `'.trim($_GET['name']).'`;');
 		}
-		foreach($db_structure_settings as $query){
+		foreach ($db_structure_settings as $query)
+		{
 			$query = trim($query);
-			if(!empty($query)){
-				if(!Db::getInstance()->execute($query)){
-					if(Db::getInstance()->getNumberError() == 1050){
+			if (!empty($query))
+			{
+				if (!Db::getInstance()->Execute($query))
+				{
+					if (Db::getInstance()->getNumberError() == 1050)
+					{
 						$logger->logError('A Prestashop database already exists, please drop it or change the prefix.');
 						die('<action result="fail" error="14" />'."\n");
-					} else {
+					}
+					else
+					{
 						$logger->logError('SQL query: '."\r\n".$query);
 						$logger->logError('SQL error: '."\r\n".Db::getInstance()->getMsgError());
 						die(
@@ -153,17 +161,17 @@ switch (_DB_TYPE_) {
 		}
 
 		//send the SQL data file requests
+		$db_data_settings = '';
 
-		$db_data_settings = "";
-
-		$liteFile = dirname(__FILE__)."/../sql/db_settings_lite.sql";
+		$liteFile = dirname(__FILE__).'/../sql/db_settings_lite.sql';
 		if(!file_exists($liteFile))
 			die('<action result="fail" error="10" />'."\n");
 		if ( !$db_data_settings .= file_get_contents( $liteFile ) )
 			die('<action result="fail" error="9" />'."\n");
 
-		if($_GET['mode'] == "full"){
-			$fullFile = dirname(__FILE__)."/../sql/db_settings_extends.sql";
+		if ($_GET['mode'] == 'full')
+		{
+			$fullFile = dirname(__FILE__).'/../sql/db_settings_extends.sql';
 			if(!file_exists($fullFile))
 			{
 				$logger->logError('Impossible to access to a MySQL content file. ('.$fullFile.')');
@@ -182,13 +190,17 @@ switch (_DB_TYPE_) {
 		$db_data_settings = preg_split("/;\s*[\r\n]+/",$db_data_settings);
 		/* UTF-8 support */
 		array_unshift($db_data_settings, 'SET NAMES \'utf8\';');
-		foreach($db_data_settings as $query){
+		foreach ($db_data_settings as $query)
+		{
 			$query = trim($query);
-			if(!empty($query)){
-				if(!Db::getInstance()->execute($query)){
-					if(Db::getInstance()->getNumberError() == 1050){
+			if (!empty($query))
+			{
+				if (!Db::getInstance()->Execute($query))
+				{
+					if (Db::getInstance()->getNumberError() == 1050)
 						die('<action result="fail" error="14" />'."\n");
-					} else {
+					else
+					{
 						$logger->logError('SQL query: '."\r\n".$query);
 						$logger->logError('SQL error: '."\r\n".Db::getInstance()->getMsgError());
 						die(
@@ -206,6 +218,7 @@ switch (_DB_TYPE_) {
 		}
 	break;
 }
+
 $xml = '<result><action result="ok" error="" />'."\n";
 
 $countries = Db::getInstance()->executeS('
@@ -226,5 +239,4 @@ foreach ($timezones as $timezone)
 	$xml .= "\t".'<timezone value="'.$timezone['name'].'" name="'.$timezone['name'].'" />'."\n";
 $xml .= '</timezones></result>'."\n";
 
-die($xml);
-
+die($xml);
\ No newline at end of file
diff --git a/localization/ca.xml b/localization/ca.xml
index 7ef60b257..f1a670034 100644
--- a/localization/ca.xml
+++ b/localization/ca.xml
@@ -31,20 +31,17 @@
 		<tax id="8" name="PST 5%" rate="5" />
 
 		<taxRulesGroup name="CA Standard Rate">
-			<taxRule iso_code_country="ca" iso_code_state="ab" id_tax="1" />
-			<taxRule iso_code_country="ca" iso_code_state="bc" id_tax="2" />
-			<taxRule iso_code_country="ca" iso_code_state="mb" id_tax="1" />
-			<taxRule iso_code_country="ca" iso_code_state="mb" id_tax="5" />
-			<taxRule iso_code_country="ca" iso_code_state="nb" id_tax="3" />
-			<taxRule iso_code_country="ca" iso_code_state="nl" id_tax="3" />
-			<taxRule iso_code_country="ca" iso_code_state="ns" id_tax="4" />
-			<taxRule iso_code_country="ca" iso_code_state="on" id_tax="3" />
-			<taxRule iso_code_country="ca" iso_code_state="pe" id_tax="1" behavior="2" />
-			<taxRule iso_code_country="ca" iso_code_state="pe" id_tax="6" behavior="2" />
-			<taxRule iso_code_country="ca" iso_code_state="qc" id_tax="1" behavior="2" />
-			<taxRule iso_code_country="ca" iso_code_state="qc" id_tax="7" behavior="2" />
-			<taxRule iso_code_country="ca" iso_code_state="sk" id_tax="1" />
-			<taxRule iso_code_country="ca" iso_code_state="sk" id_tax="8" />
+			<taxRule iso_code_country="ca" id_tax="1" />
+			<taxRule iso_code_country="ca" iso_code_state="ab" id_tax="1" state_behavior="1" />
+			<taxRule iso_code_country="ca" iso_code_state="bc" id_tax="2" state_behavior="1" />
+			<taxRule iso_code_country="ca" iso_code_state="mb" id_tax="5" state_behavior="2" />
+			<taxRule iso_code_country="ca" iso_code_state="nb" id_tax="3" state_behavior="1" />
+			<taxRule iso_code_country="ca" iso_code_state="nl" id_tax="3" state_behavior="1" />
+			<taxRule iso_code_country="ca" iso_code_state="ns" id_tax="4" state_behavior="1" />
+			<taxRule iso_code_country="ca" iso_code_state="on" id_tax="3" state_behavior="1" />
+			<taxRule iso_code_country="ca" iso_code_state="pe" id_tax="6" state_behavior="2" />
+			<taxRule iso_code_country="ca" iso_code_state="qc" id_tax="7" state_behavior="2" />
+			<taxRule iso_code_country="ca" iso_code_state="sk" id_tax="8" state_behavior="2" />
 		</taxRulesGroup>
 	</taxes>
 	<units>
diff --git a/modules/authorizeaim/authorizeaim.php b/modules/authorizeaim/authorizeaim.php
index 31d1f9d91..c204e2eaf 100755
--- a/modules/authorizeaim/authorizeaim.php
+++ b/modules/authorizeaim/authorizeaim.php
@@ -34,7 +34,7 @@ class authorizeAIM extends PaymentModule
 	{
 		$this->name = 'authorizeaim';
 		$this->tab = 'payments_gateways';
-		$this->version = '1.2.1';
+		$this->version = '1.2.2';
 		$this->author = 'PrestaShop';
 		$this->limited_countries = array('us');
 		$this->need_instance = 0;
@@ -45,11 +45,20 @@ class authorizeAIM extends PaymentModule
         $this->description = $this->l('Receive payment with Authorize.net');
 
 		/* For 1.4.3 and less compatibility */
-		$updateConfig = array('PS_OS_CHEQUE', 'PS_OS_PAYMENT', 'PS_OS_PREPARATION', 'PS_OS_SHIPPING', 'PS_OS_CANCELED', 'PS_OS_REFUND', 'PS_OS_ERROR', 'PS_OS_OUTOFSTOCK', 'PS_OS_BANKWIRE', 'PS_OS_PAYPAL', 'PS_OS_WS_PAYMENT');
-		if (!Configuration::get('PS_OS_PAYMENT'))
-			foreach ($updateConfig as $u)
-				if (!Configuration::get($u) && defined('_'.$u.'_'))
+		$updateConfig = array('PS_OS_CHEQUE' => 1, 'PS_OS_PAYMENT' => 2, 'PS_OS_PREPARATION' => 3, 'PS_OS_SHIPPING' => 4, 'PS_OS_DELIVERED' => 5, 'PS_OS_CANCELED' => 6,
+				      'PS_OS_REFUND' => 7, 'PS_OS_ERROR' => 8, 'PS_OS_OUTOFSTOCK' => 9, 'PS_OS_BANKWIRE' => 10, 'PS_OS_PAYPAL' => 11, 'PS_OS_WS_PAYMENT' => 12);
+		foreach ($updateConfig as $u => $v)
+			if (!Configuration::get($u) || (int)Configuration::get($u) < 1)
+			{
+				if (defined('_'.$u.'_') && (int)constant('_'.$u.'_') > 0)
 					Configuration::updateValue($u, constant('_'.$u.'_'));
+				else
+					Configuration::updateValue($u, $v);
+	}
+
+		/* Check if cURL is enabled */
+		if (!is_callable('curl_exec'))
+			$this->warning = $this->l('cURL extension must be enabled on your server to use this module.');
 	}
 
 	public function install()
diff --git a/modules/authorizeaim/config.xml b/modules/authorizeaim/config.xml
index 7084e7b0e..01052018e 100755
--- a/modules/authorizeaim/config.xml
+++ b/modules/authorizeaim/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>authorizeaim</name>
 	<displayName><![CDATA[Authorize.net AIM (Advanced Integration Method)]]></displayName>
-	<version><![CDATA[1.2.1]]></version>
+	<version><![CDATA[1.2.2]]></version>
 	<description><![CDATA[Receive payment with Authorize.net]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[payments_gateways]]></tab>
diff --git a/modules/authorizeaim/fr.php b/modules/authorizeaim/fr.php
index a01eb18ea..501e3a765 100644
--- a/modules/authorizeaim/fr.php
+++ b/modules/authorizeaim/fr.php
@@ -3,6 +3,7 @@
 global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{authorizeaim}prestashop>authorizeaim_cb313e911b15b21b57f4fc7b53058e4f'] = 'Recevoir des paiments avec Authorize.net';
+$_MODULE['<{authorizeaim}prestashop>authorizeaim_9d5b40ff49295ac0b4a5a13a88ccd285'] = 'L\'extension cURL doit être activé sur votre serveur pour utiliser ce module.';
 $_MODULE['<{authorizeaim}prestashop>authorizeaim_20015706a8cbd457cbb6ea3e7d5dc9b3'] = 'Configuration mise a jour';
 $_MODULE['<{authorizeaim}prestashop>authorizeaim_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Aide';
 $_MODULE['<{authorizeaim}prestashop>authorizeaim_11a4b229c0e206b831f729572618553f'] = 'Dans votre panneau d\'aministration PrestaShop';
diff --git a/modules/autoupgrade/AdminPreferences.php b/modules/autoupgrade/AdminPreferences.php
index abf005a79..db444b36d 100644
--- a/modules/autoupgrade/AdminPreferences.php
+++ b/modules/autoupgrade/AdminPreferences.php
@@ -25,6 +25,10 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+// @since 1.4.5.0
+// add the following comment in a module file to skip it in translations
+// IGNORE_THIS_FILE_FOR_TRANSLATION 
+
 class AdminPreferences extends AdminTab
 {
 	public function __construct()
diff --git a/modules/autoupgrade/AdminSelfTab.php b/modules/autoupgrade/AdminSelfTab.php
index d9113156d..c08fbe9e8 100644
--- a/modules/autoupgrade/AdminSelfTab.php
+++ b/modules/autoupgrade/AdminSelfTab.php
@@ -25,6 +25,9 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+// @since 1.4.5.0
+// add the following comment in a module file to skip it in translations
+// IGNORE_THIS_FILE_FOR_TRANSLATION 
 abstract class AdminSelfTab
 {
 	/** @var integer Tab id */
diff --git a/modules/autoupgrade/AdminSelfUpgrade.php b/modules/autoupgrade/AdminSelfUpgrade.php
index 0ecc1b055..d9573accc 100644
--- a/modules/autoupgrade/AdminSelfUpgrade.php
+++ b/modules/autoupgrade/AdminSelfUpgrade.php
@@ -25,6 +25,7 @@
 *	International Registered Trademark & Property of PrestaShop SA
 */
 
+
 if(!defined('_PS_ADMIN_DIR_'))
 	define('_PS_ADMIN_DIR_', _PS_ADMIN_DIR_);
 if(!defined('_PS_USE_SQL_SLAVE_'))
@@ -473,6 +474,13 @@ $this->standalone = true;
 		}
 
 		$changedFileList = $this->upgrader->getChangedFilesList();
+		if (!isset($changedFileList['core']))
+			$changedFileList['core'] = array();
+		if (!isset($changedFileList['translation']))
+			$changedFileList['translation'] = array();
+		if (!isset($changedFileList['mail']))
+			$changedFileList['mail'] = array();
+
 		if ($changedFileList === false)
 		{
 			$changedFileList = array();
@@ -794,11 +802,6 @@ $this->standalone = true;
 			switch ($this->currentParams['upgradeDbStep'])
 			{
 				default:
-					$this->next = 'upgradeComplete';
-					$this->nextResponseType = 'json';
-					return true;
-					// $this->_model('checkConfig');
-				break;
 		// 1) confirm version is correct(DB)
 		// install/model.php?method=getVersionFromDb&language=0
 				case '1':
@@ -825,7 +828,7 @@ $this->standalone = true;
 				case '4':
 					$this->next = 'upgradeComplete';
 					$this->nextResponseType = 'json';
-					$this->nextDesc = $this->l('Way to go ! Upgrade complete.');
+					$this->nextDesc = $this->l('Way to go ! Upgrade complete. You can now reactivate your shop.');
 					break;
 			}
 
@@ -1352,10 +1355,18 @@ $this->standalone = true;
 		{
 			$res = $this->upgrader->downloadLast($this->autoupgradePath,$this->destDownloadFilename);
 			if ($res){
+			 	if (md5_file(realpath($this->autoupgradePath).DIRECTORY_SEPARATOR.$this->destDownloadFilename) == $this->upgrader->md5 )
+				{
 				$this->next = 'unzip';
 				$this->nextDesc = $this->l('Download complete. Now extracting');
 			}
 			else
+			{
+				$this->next = 'error';
+					$this->nextDesc = $this->l('Download complete but md5sum does not match. Operation aborted.');
+				}
+			}
+			else
 			{
 				$this->next = 'error';
 				$this->nextDesc = $this->l('Error during download');
@@ -1376,12 +1387,15 @@ $this->standalone = true;
 		$return['next'] = $this->next;
 		$return['status'] = $this->next == 'error' ? 'error' : 'ok';
 		$return['nextDesc'] = $this->nextDesc;
+		$return['upgradeDbStep'] = 0;
 
 		foreach($this->ajaxParams as $v)
 			if(property_exists($this,$v))
 				$this->nextParams[$v] = $this->$v;
 
 		$return['nextParams'] = $this->nextParams;
+		if (!isset($return['nextParams']['upgradeDbStep']))
+			$return['nextParams']['upgradeDbStep'] = 0;
 
 		$return['nextParams']['typeResult'] = $this->nextResponseType;
 
@@ -1428,7 +1442,7 @@ $this->standalone = true;
 			}
 		}
 
-		if (Tools::apacheModExists('evasive'))
+		if (!method_exists('Tools', 'apacheModExists') || Tools::apacheModExists('evasive'))
 			sleep(1);
 	}
 
@@ -1501,6 +1515,10 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 	{
 		echo '<fieldset><legend>'.$this->l('Rollback').'</legend>
 		<div id="rollbackForm">';
+		echo '<p>'
+		.$this->l('After upgrading your shop, you can rollback to the previously database and files. Use this function if your theme or an essential module is not working correctly.')
+		.'</p><br/>';
+
 		if (empty($this->backupFilesFilename) AND empty($this->backupDbFilename))
 			echo $this->l('No rollback available');
 		else if (!empty($this->backupFilesFilename) OR !empty($this->backupDbFilename))
@@ -1515,20 +1533,22 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 		echo '</div></fieldset>';
 	}
 
-	private function _displayUpgraderForm()
+	/** this returns fieldset containing the configuration points you need to use autoupgrade
+	 * @return string 
+	 */
+	private function getCurrentConfiguration()
 	{
-		global $cookie;
-			$pleaseUpdate = $this->upgrader->checkPSVersion();
-
-			echo '<fieldset class="width autoupgrade " >';
-			echo '<legend>'.$this->l('Your current configuration').'</legend>';
-			echo '<b>'.$this->l('Root directory').' : </b>'.$this->prodRootDir.'<br/><br/>';
+		$content = '<fieldset class="width autoupgrade " >';
+		$content .= '<legend><a href="#" id="currentConfigurationToggle">'.$this->l('Your current configuration').'</a></legend>';
+		$content .= '<div id="currentConfiguration">
+		<p>'.$this->l('All the following points must be ok in order to allow the upgrade.').'</p>
+		<b>'.$this->l('Root directory').' : </b>'.$this->prodRootDir.'<br/><br/>';
 
 			if ($this->rootWritable)
 				$srcRootWritable = '../img/admin/enabled.gif';
 			else
 				$srcRootWritable = '../img/admin/disabled.gif';
-			echo '<b>'.$this->l('Root directory status').' : </b>'.'<img src="'.$srcRootWritable.'" /> '.($this->rootWritable?$this->l('fully writable'):$this->l('not writable recursively')).'<br/><br/>';
+		$content .= '<b>'.$this->l('Root directory status').' : </b>'.'<img src="'.$srcRootWritable.'" /> '.($this->rootWritable?$this->l('fully writable'):$this->l('not writable recursively')).'<br/><br/>';
 
 			if ($this->upgrader->need_upgrade)
 			{
@@ -1536,12 +1556,13 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 					$srcAutoupgrade = '../img/admin/enabled.gif';
 				else
 					$srcAutoupgrade = '../img/admin/disabled.gif';
-				echo '<b>'.$this->l('Autoupgrade allowed').' : </b>'.'<img src="'.$srcAutoupgrade.'" /> '.($this->upgrader->autoupgrade?$this->l('This release allow autoupgrade.'):$this->l('This release does not allow autoupgrade')).'. <br/><br/>';
+
+			$content .= '<b>'.$this->l('Upgrade available').' : </b>'.'<img src="'.$srcAutoupgrade.'" /> '.($this->upgrader->autoupgrade?$this->l('This release allows autoupgrade.'):$this->l('This release does not allow autoupgrade')).' <br/><br/>';
 			}
 			else
 			{
 				$srcAutoupgrade = '../img/admin/disabled.gif';
-				echo '<b>'.$this->l('Autoupgrade allowed').' : </b>'.'<img src="../img/admin/disabled.gif" /> . <br/><br/>';
+			$content .= '<b>'.$this->l('Upgrade available').' : </b>'.'<img src="../img/admin/disabled.gif" />'.$this->l('You already have the last version.').'<br/><br/>';
 			}
 
 
@@ -1555,110 +1576,129 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 				$srcShopStatus = '../img/admin/enabled.gif';
 				$label = $this->l('Yes');
 			}
-			echo '<b>'.$this->l('Shop desactivated').' : </b>'.'<img src="'.$srcShopStatus.'" />'.$label.'<br/><br/>';
-
+		$content .= '<b>'.$this->l('Shop desactivated').' : </b>'.'<img src="'.$srcShopStatus.'" /><a href="index.php?tab=AdminPreferences&token='.Tools::getAdminTokenLite('AdminPreferences').'" class="button">'.$label.'</a><br/><br/>';
 			$max_exec_time = ini_get('max_execution_time');
 			if ($max_exec_time == 0)
 				$srcExecTime = '../img/admin/enabled.gif';
 			else
 				$srcExecTime = '../img/admin/warning.gif';
-			echo '<b>'.$this->l('PHP time limit').' : </b>'.'<img src="'.$srcExecTime.'" />'.($max_exec_time == 0?$this->l('disabled'):$max_exec_time.' '.$this->l('seconds')).' <br/><br/>';
+		$content .= '<b>'.$this->l('PHP time limit').' : </b>'.'<img src="'.$srcExecTime.'" />'.($max_exec_time == 0?$this->l('disabled'):$max_exec_time.' '.$this->l('seconds')).' <br/><br/>';
 
 			if (($testConfigDone = Configuration::get('PS_AUTOUP_DONT_SAVE_IMAGES')) !== false)
 				$configurationDone = '../img/admin/enabled.gif';
 			else
 				$configurationDone = '../img/admin/disabled.gif';
-			echo '<b>'.$this->l('Options chosen').' : </b>'.'<img src="'.$configurationDone.'" /> '.($testConfigDone?$this->l('autoupgrade configuration ok'):$this->l('Please configure autoupgrade options')).'<br/><br/>';
+		$content .= '<b>'.$this->l('Options chosen').' : </b>'.'<img src="'.$configurationDone.'" /> '.($testConfigDone?$this->l('autoupgrade configuration ok'):$this->l('Please configure autoupgrade options')).'<br/><br/>';
 
-			echo '<b>'.$this->l('PrestaShop Original version').' : </b>'.'<span id="checkPrestaShopFilesVersion">
+		$content .= '<b>'.$this->l('PrestaShop Original version').' : </b>'.'<span id="checkPrestaShopFilesVersion">
 			<img id="pleaseWait" src="'.__PS_BASE_URI__.'img/loader.gif"/>
 			</span>';
 
-			echo '<p> <a class="button" id="scrollToOptions" href="#options">'.$this->l('Modify your options').'</a></p>';
-			echo '</fieldset>';
+		$content .= '<p> <a class="button" id="scrollToOptions" href="#options">'.$this->l('Modify your options').'</a></p>
+		</div>';
+		$content .= '</fieldset>';
 
-			echo '<br/>';
+		$content .= '<script type="text/javascript">
+			$("#currentConfigurationToggle").click(function(e){e.preventDefault();$("#currentConfiguration").toggle()});'
 
-			echo '<fieldset class=""><legend>'.$this->l('Update').'</legend>';
+			.($this->configOk()?'$("#currentConfiguration").hide();$("#currentConfigurationToggle").after("<img src=\"../img/admin/enabled.gif\" />");':'').'</script>';
 
 
-		echo '<div style="float:left">
+		return $content;
+	}
+
+	private function _displayUpgraderForm()
+	{
+		global $cookie;
+		$content = '';
+		$pleaseUpdate = $this->upgrader->checkPSVersion();
+
+		$content .= $this->getCurrentConfiguration();
+
+
+			$content .= '<br/>';
+
+			$content .= '<fieldset class=""><legend>'.$this->l('Update').'</legend>';
+
+
+		$content .= '<div style="float:left">
 		<h1>'.sprintf($this->l('Your current prestashop version : %s '),_PS_VERSION_).'</h1>';
-		echo '<p>'.sprintf($this->l('Last version is %1$s (%2$s) '), $this->upgrader->version_name, $this->upgrader->version_num).'</p>';
+		$content .= '<p>'.sprintf($this->l('Last version is %1$s (%2$s) '), $this->upgrader->version_name, $this->upgrader->version_num).'</p>';
 
 		// @TODO : this should be checked when init()
 		if ($this->isUpgradeAllowed()) {
 			if ($pleaseUpdate) {
-				echo '<li><img src="'._PS_ADMIN_IMG_.'information.png" alt="information"/> '.$this->l('Latest Prestashop version available is:').' <b>'.$pleaseUpdate['name'].'</b></li>';
+				$content .= '<li><img src="'._PS_ADMIN_IMG_.'information.png" alt="information"/> '.$this->l('Latest Prestashop version available is:').' <b>'.$pleaseUpdate['name'].'</b></li>';
 			}
 //			echo '<input class="button" type="submit" name="sumbitUpdateVersion" value="'.$this->l('Backup Database, backup files and update right now and in one click !').'"/>';
 //			echo '<input class="button" type="submit" id="refreshCurrent" value="'.$this->l("refresh update dir / current").'"/>';
-			echo '<br/>';
+			$content .= '<br/>';
 		if ($this->upgrader->need_upgrade)
 		{
 			if($this->configOk())
 			{
-				echo '<p><a href="" id="upgradeNow" class="button-autoupgrade upgradestep">'.$this->l('Upgrade PrestaShop now !').'</a></p>';
-				echo '<small>'.sprintf($this->l('PrestaShop will be downloaded from %s'), $this->upgrader->link).'</small><br/>';
-				echo '<small><a href="'.$this->upgrader->changelog.'">'.$this->l('see CHANGELOG').'</a></small>';
+				$content .= '<p><a href="" id="upgradeNow" class="button-autoupgrade upgradestep">'.$this->l('Upgrade PrestaShop now !').'</a></p>';
+info($this->upgrader->link);
+				$content .= '<small>'.sprintf($this->l('PrestaShop will be downloaded from %s'), $this->upgrader->link).'</small><br/>';
+				$content .= '<small><a href="'.$this->upgrader->changelog.'">'.$this->l('see CHANGELOG').'</a></small>';
 			}
 			else
-				echo $this->displayWarning('Your current configuration does not allow upgrade.');
+				$content .= $this->displayWarning('Your current configuration does not allow upgrade.');
 		}
 		else
 		{
-			echo '<span class="button-autoupgrade upgradestep" >'.$this->l('Your shop is already up to date.').'</span> ';
+			$content .= '<span class="button-autoupgrade upgradestep" >'.$this->l('Your shop is already up to date.').'</span> ';
 		}
-		echo '<br/><br/><small>'.sprintf($this->l('last datetime check : %s '),date('Y-m-d H:i:s',Configuration::get('PS_LAST_VERSION_CHECK'))).'</span>
+		$content .= '<br/><br/><small>'.sprintf($this->l('last datetime check : %s '),date('Y-m-d H:i:s',Configuration::get('PS_LAST_VERSION_CHECK'))).'</span> 
 		<a class="button" href="index.php?tab=AdminSelfUpgrade&token='.Tools::getAdminToken('AdminSelfUpgrade'.(int)(Tab::getIdFromClassName(get_class($this))).(int)$cookie->id_employee).'&refreshCurrentVersion=1">'.$this->l('Please click to refresh').'</a>
 		</small>';
 
-			echo'</div>
+			$content .='</div>
 			<div id="currentlyProcessing" style="display:none;float:right"><h4>Currently processing <img id="pleaseWait" src="'.__PS_BASE_URI__.'img/loader.gif"/></h4>
 
 			<div id="infoStep" class="processing" style=height:50px;width:400px;" >'.$this->l('I\'m waiting for your command, sir').'</div>';
-			echo '</div>';
+			$content .= '</div>';
 
-			echo '</fieldset>';
+			$content .= '</fieldset>';
 
 
 
 			if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_ AND $this->manualMode)
 			{
-				echo '<br class="clear"/>';
-				echo '<fieldset class="autoupgradeSteps"><legend>'.$this->l('Step').'</legend>';
-				echo '<h4>'.$this->l('Upgrade steps').'</h4>';
-				echo '<div>';
-				echo '<a href="" id="download" class="button upgradestep" >download</a>';
-				echo '<a href="" id="unzip" class="button upgradestep" >unzip</a>'; // unzip in autoupgrade/latest
-				echo '<a href="" id="removeSamples" class="button upgradestep" >removeSamples</a>'; // remove samples (iWheel images)
-				echo '<a href="" id="backupFiles" class="button upgradestep" >backupFiles</a>'; // backup files
-				echo '<a href="" id="backupDb" class="button upgradestep" >backupDb</a>';
-				echo '<a href="" id="upgradeFiles" class="button upgradestep" >upgradeFiles</a>';
-				echo '<a href="" id="upgradeDb" class="button upgradestep" >upgradeDb</a>';
-				echo '</div>';
+				$content .= '<br class="clear"/>';
+				$content .= '<fieldset class="autoupgradeSteps"><legend>'.$this->l('Step').'</legend>';
+				$content .= '<h4>'.$this->l('Upgrade steps').'</h4>';
+				$content .= '<div>';
+				$content .= '<a href="" id="download" class="button upgradestep" >download</a>';
+				$content .= '<a href="" id="unzip" class="button upgradestep" >unzip</a>'; // unzip in autoupgrade/latest
+				$content .= '<a href="" id="removeSamples" class="button upgradestep" >removeSamples</a>'; // remove samples (iWheel images)
+				$content .= '<a href="" id="backupFiles" class="button upgradestep" >backupFiles</a>'; // backup files
+				$content .= '<a href="" id="backupDb" class="button upgradestep" >backupDb</a>';
+				$content .= '<a href="" id="upgradeFiles" class="button upgradestep" >upgradeFiles</a>';
+				$content .= '<a href="" id="upgradeDb" class="button upgradestep" >upgradeDb</a>';
+				$content .= '</div>';
 
 				if (defined('_PS_ALLOW_UPGRADE_UNSTABLE_') AND _PS_ALLOW_UPGRADE_UNSTABLE_ )
 				{
-					echo '<h4>Development tools </h4><div>';
-					echo '<a href="" name="action" id="svnCheckout"	class="button upgradestep" type="submit" >svnCheckout</a>';
-					echo '<a href="" name="action" id="svnUpdate"	class="button upgradestep" type="submit" >svnUpdate</a>';
-					echo '<a href="" name="action" id="svnExport"	class="button upgradestep" type="submit" >svnExport</a>';
-					echo '<br class="clear"/>';
-					echo '</div>';
+					$content .= '<h4>Development tools </h4><div>';
+					$content .= '<a href="" name="action" id="svnCheckout"	class="button upgradestep" type="submit" >svnCheckout</a>';
+					$content .= '<a href="" name="action" id="svnUpdate"	class="button upgradestep" type="submit" >svnUpdate</a>';
+					$content .= '<a href="" name="action" id="svnExport"	class="button upgradestep" type="submit" >svnExport</a>';
+					$content .= '<br class="clear"/>';
+					$content .= '</div>';
 				}
 			}
 
-			echo'	<div id="quickInfo" class="processing" style="height:100px;">&nbsp;</div>';
+			$content .='	<div id="quickInfo" class="processing" style="height:100px;">&nbsp;</div>';
 			// for upgradeDb
-			echo '<p id="dbResultCheck"></p>';
-			echo '<p id="dbCreateResultCheck"></p>';
+			$content .= '<p id="dbResultCheck"></p>';
+			$content .= '<p id="dbCreateResultCheck"></p>';
 		}
 		else
-			echo '<p>'.$this->l('Your current configuration does not allow upgrade.').'</p>';
+			$content .= '<p>'.$this->l('Your current configuration does not allow upgrade.').'</p>';
 
-		echo '</fieldset>';
-/*		echo '<fieldset class="right">
+		$content .= '</fieldset>';
+/*		$content .= '<fieldset class="right">
 		<legend>Error</legend>
 		<div id="errorWindow" > no error yet</div>
 		</fieldset>';
@@ -1666,13 +1706,14 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 		*/
 		// information to keep will be in #infoStep
 		// temporary infoUpdate will be in #tmpInformation
-		echo '<script type="text/javascript">';
+		$content .= '<script type="text/javascript">';
 		// _PS_MODE_DEV_ is available in js
 		if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_)
-			echo 'var _PS_MODE_DEV_ = true;';
-		echo $this->_getJsErrorMsgs();
+			$content .= 'var _PS_MODE_DEV_ = true;';
+		$content .= $this->_getJsErrorMsgs();
 
-echo '</script>';
+		$content .= '</script>';
+		echo $content;
 	}
 
 	public function display()
@@ -1694,7 +1735,7 @@ echo '</script>';
 #checkPrestaShopFilesVersion{margin-bottom:20px;}
 #changedList ul{list-style-type:circle}
 .changedFileList {margin-left:20px; padding-left:5px;}
-.changedNotice li{color:lightgrey;}
+.changedNotice li{color:grey;}
 .changedImportant li{color:red;font-weight:bold}
 </style>';
 		$this->displayWarning($this->l('This function is experimental. It\'s highly recommended to make a backup of your files and database before starting the upgrade process.'));
@@ -1718,13 +1759,11 @@ echo '</script>';
 			echo '<br/>';
 			$this->_displayForm('autoUpgradeOptions',$this->_fieldsAutoUpgrade,'<a href="" name="options" id="options">'.$this->l('Options').'</a>', '','prefs');
 
-			if ($this->standalone)
-			{
+			// We need jquery 1.6 for json 
 				echo '<script type="text/javascript">
 				  jq13 = jQuery.noConflict(true);
 					</script>
 					<script type="text/javascript" src="'.__PS_BASE_URI__.'modules/autoupgrade/jquery-1.6.2.min.js"></script>';
-			}
 			echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'modules/autoupgrade/jquery.xml2json.js"></script>';
 			echo '<script type="text/javascript">'.$this->_getJsInit().'</script>';
 
@@ -1767,8 +1806,8 @@ function addQuickInfo(arrQuickInfo){
 		$("#quickInfo").show();
 		for(i=0;i<arrQuickInfo.length;i++)
 			$("#quickInfo").append(arrQuickInfo[i]+"<br/>");
-
-		$("#quickInfo").attr({ scrollTop: $("#quickInfo").attr("scrollHeight") });
+		// Note : jquery 1.6 make uses of prop() instead of attr()
+		$("#quickInfo").prop({ scrollTop: $("#quickInfo").prop("scrollHeight") },1);
 	}
 }';
 
@@ -1835,7 +1874,7 @@ function handleXMLResult(xmlRet, previousParams)
 	// use xml2json and put the result in the global var
 	// this will be used in after** javascript functions
 	resGlobal = $.xml2json(xmlRet);
-
+	result = "ok";
 	switch(previousParams.upgradeDbStep)
 	{
 		case 0: // getVersionFromDb
@@ -1858,7 +1897,7 @@ function handleXMLResult(xmlRet, previousParams)
 	if (result == "ok")
 	{
 		nextParams = previousParams;
-			nextParams.upgradeDbStep = previousParams.upgradeDbStep+1;
+			nextParams.upgradeDbStep = parseInt(previousParams.upgradeDbStep)+1;
 			if(nextParams.upgradeDbStep >= 4)
 			{
 				resGlobal.next = "upgradeComplete";
@@ -1899,12 +1938,14 @@ function afterUpgradeComplete()
 	$("#dbResultCheck")
 		.addClass("ok")
 		.removeClass("fail")
-		.html("<p>'.$this->l('upgrade complete. Please check your front-office (try to make an order, check theme)').'</p>")
-		.show("slow");
+		.html("<p>'.$this->l('upgrade complete. Please check your front-office theme is functionnal (try to make an order, check theme)').'</p>")
+		.show("slow")
+		.append("<a href=\"index.php?tab=AdminPreferences&token='.Tools::getAdminTokenLite('AdminPreferences').'\" class=\"button\">'.$this->l('activate your shop here').'</a>");
 	$("#dbCreateResultCheck")
 		.hide("slow");
 	$("#infoStep").html("<h3>'.$this->l('Upgrade Complete ! ').'</h3>");
 }
+
 /**
  * afterBackupDb display the button
  *
@@ -2110,7 +2151,7 @@ function handleError(res)
 	$(fileList).each(function(k,v){
 		$(subList).append("<li>"+v+"</li>");
 	});
-	$("#changedList").append("<h3><a class=\"toggleSublist\">"+title+"</a></h3>");
+	$("#changedList").append("<h3><a class=\"toggleSublist\">"+title+"</a> (" + fileList.length + ")</h3>");
 	$("#changedList").append(subList);
 	$("#cchangedList").append("<br/>");
 
@@ -2119,7 +2160,7 @@ function handleError(res)
 $js.= '$(document).ready(function(){
 	$.ajax({
 			type:"POST",
-			url : "'.($this->standalone? __PS_BASE_URI__ . trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php' : str_replace('index','ajax-tab',$currentIndex)).'",
+			url : "'. __PS_BASE_URI__ . trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php",
 			async: true,
 			data : {
 				dir:"'.trim($this->adminDir,DIRECTORY_SEPARATOR).'",
@@ -2140,9 +2181,12 @@ $js.= '$(document).ready(function(){
 					$("#checkPrestaShopFilesVersion").prepend("<img src=\"../img/admin/warning.gif\" /> ");
 				$("#checkPrestaShopFilesVersion").append("<a id=\"toggleChangedList\" class=\"button\" href=\"\">'.$this->l('See or hide the list').'</a><br/>");
 					$("#checkPrestaShopFilesVersion").append("<div id=\"changedList\" style=\"display:none \"><br/>");
-					addModifiedFileList("'.$this->l('Core files').'", answer.result.core, "changedImportant");
-					addModifiedFileList("'.$this->l('Mail files').'", answer.result.mail, "changedNotice");
-					addModifiedFileList("'.$this->l('Translation files').'", answer.result.translation, "changedNotice");
+					if(answer.result.core.length)
+						addModifiedFileList("'.$this->l('Core file(s)').'", answer.result.core, "changedImportant");
+					if(answer.result.mail.length)
+						addModifiedFileList("'.$this->l('Mail file(s)').'", answer.result.mail, "changedNotice");
+					if(answer.result.translation.length)
+						addModifiedFileList("'.$this->l('Translation file(s)').'", answer.result.translation, "changedNotice");
 
 $("#toggleChangedList").bind("click",function(e){e.preventDefault();$("#changedList").toggle();});
 					$(".toggleSublist").live("click",function(e){e.preventDefault();$(this).parent().next().toggle();});
diff --git a/modules/autoupgrade/ConfigurationTest.php b/modules/autoupgrade/ConfigurationTest.php
index f74539405..d60df6747 100644
--- a/modules/autoupgrade/ConfigurationTest.php
+++ b/modules/autoupgrade/ConfigurationTest.php
@@ -55,7 +55,7 @@ class	ConfigurationTestCore
 	
 	static function test_magicquotes()
 	{
-		return !ini_get('magic_quotes_gpc');
+		return !get_magic_quotes_gpc();
 	}
 
 	static	function test_upload()
diff --git a/modules/autoupgrade/SelfModule.php b/modules/autoupgrade/SelfModule.php
index e9b2250e2..270679fe9 100644
--- a/modules/autoupgrade/SelfModule.php
+++ b/modules/autoupgrade/SelfModule.php
@@ -25,6 +25,9 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+// @since 1.4.5.0
+// add the following comment in a module file to skip it in translations
+// IGNORE_THIS_FILE_FOR_TRANSLATION 
 abstract class SelfModule
 {
 	/** @var integer Module ID */
diff --git a/modules/autoupgrade/Upgrader.php b/modules/autoupgrade/Upgrader.php
index 2cf42fd5b..c4c4c1327 100644
--- a/modules/autoupgrade/Upgrader.php
+++ b/modules/autoupgrade/Upgrader.php
@@ -31,9 +31,7 @@ class UpgraderCore
 	public $rss_version_link = 'http://www.prestashop.com/xml/upgrader.xml';
 	public $rss_md5file_link_dir = 'http://www.prestashop.com/xml/md5/';
 	/**
-	 * link contains hte url where to download the file
-	 * 
-	 * @var string 
+	 * @var boolean contains true if last version is not installed
 	 */
 	private $need_upgrade = false;
 	private $changed_files = array();
@@ -41,6 +39,9 @@ class UpgraderCore
 
 	public $version_name;
 	public $version_num;
+	/**
+	 * @var string contains hte url where to download the file
+	 */
 	public $link;
 	public $autoupgrade;
 	public $autoupgrade_module;
@@ -68,7 +69,7 @@ class UpgraderCore
 			$this->checkPSVersion();
 
 		$destPath =  realpath($dest).DIRECTORY_SEPARATOR.$filename;
-		if (@copy($this->link, $destPath) && md5_file($destPath) == $this->md5 )
+		if (@copy($this->link, $destPath))
 			return true;
 		else
 			return false;
@@ -131,13 +132,21 @@ class UpgraderCore
 			else
 			{
 				$last_version_check = @unserialize(Configuration::get('PS_LAST_VERSION'));
+				if (isset($last_version_check['name']))
 				$this->version_name = $last_version_check['name'];
+				if (isset($last_version_check['num']))
 				$this->version_num = $last_version_check['num'];
+				if (isset($last_version_check['link']))
 				$this->link = $last_version_check['link'];
+				if (isset($last_version_check['autoupgrade']))
 				$this->autoupgrade = $last_version_check['autoupgrade'];
+				if (isset($last_version_check['autoupgrade_module']))
 				$this->autoupgrade_module = $last_version_check['autoupgrade_module'];
+				if (isset($last_version_check['md5']))
 				$this->md5 = $last_version_check['md5'];
+				if (isset($last_version_check['desc']))
 				$this->desc = $last_version_check['desc'];
+				if (isset($last_version_check['changelog']))
 				$this->changelog = $last_version_check['changelog'];
 			}
 		}
diff --git a/modules/autoupgrade/autoupgrade.php b/modules/autoupgrade/autoupgrade.php
index a4c645f3a..0329546c4 100644
--- a/modules/autoupgrade/autoupgrade.php
+++ b/modules/autoupgrade/autoupgrade.php
@@ -47,7 +47,7 @@ class Autoupgrade extends Module
 		parent::__construct();
 
 		$this->displayName = $this->l('Autoupgrade module');
-		$this->description = $this->l('Provides an automated method to upgrade your shop to the last PrestaShop version');
+		$this->description = $this->l('Provides an automated method to upgrade your shop to the last PrestaShop version. Caution : custom theme are not updated.');
 
 	}
 
diff --git a/modules/autoupgrade/config.xml b/modules/autoupgrade/config.xml
index 5b8d10540..ddaa5099f 100644
--- a/modules/autoupgrade/config.xml
+++ b/modules/autoupgrade/config.xml
@@ -3,7 +3,7 @@
 	<name>autoupgrade</name>
 	<displayName><![CDATA[Autoupgrade module]]></displayName>
 	<version><![CDATA[0.1]]></version>
-	<description><![CDATA[Provides an automated method to upgrade your shop to the last PrestaShop version]]></description>
+	<description><![CDATA[Provides an automated method to upgrade your shop to the last PrestaShop version. Caution : custom theme are not updated.]]></description>
 	<author><![CDATA[]]></author>
 	<tab><![CDATA[administration]]></tab>
 	<is_configurable>0</is_configurable>
diff --git a/modules/autoupgrade/fr.php b/modules/autoupgrade/fr.php
index 167184197..bb4d0fa4f 100644
--- a/modules/autoupgrade/fr.php
+++ b/modules/autoupgrade/fr.php
@@ -2,17 +2,23 @@
 
 global $_MODULE;
 $_MODULE = array();
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_124ab8cb7dc504e6848f1b7e5c98636f'] = 'Sauver aussi les images';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a8d6c6734da0083021561b23f2fa88cc'] = 'Vous pouvez exclure le dossier image de la sauvegarde si vous l\'avez déjà sauvegardé d\'une autre manière (non recommandé)';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_af98608eaedd4ba7ffd47a0204e84b23'] = 'Conserver le thème \"prestashop\" actuel';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4ea56ca1a757e426911ff20889c0e93c'] = 'Si vous avez personnalisé le thème par défaut de PrestaShop, vous pouvez le protéger de la mise à niveau (non recommandé)';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8413c63a6ef3717a974094785fd0b588'] = 'Garder les traductions';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_51bbcf7afb0f8d35501d0a7b28979b06'] = 'Si \"oui\", vous conserverez toutes vos traductions';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_08f302d660c7dbf20416d6b4225238c2'] = 'Désactiver les modules non natifs';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8c09b80e27810f6697c90824ab8151d6'] = 'Si vous ne désactivez pas ces modules, des problèmes de compatibilité peuvent apparaitre et la page module peut ne pas se charger correctement.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8c8194a465f0163a6724907755ac1b82'] = 'Mode manuel';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_dd9dbd4916653d683244119a067ca467'] = 'Choisissze \"oui\" si vous voulez vous ';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e7b6d601ff4e9069e726927e211274ea'] = 'Utiliser Subversion';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a15b09729294cf7fea1096f970a0fed4'] = 'Choisissez \"oui\" si vous voulez utiliser une version non stable au lieu de l';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_36be1130454bc8c4e0a41d36fa062a8b'] = 'Impossible de créer le répertoire %s';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e21a52b9631b01c3f1821795b8de451c'] = 'Processus de mise à niveau terminé. Félicitations! Vous pouvez maintenant réactive de votre boutique.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4ad974c7f06be7aa3ce318299d3b5dbb'] = 'Impossible de vérifier les fichiers';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8d8e0207549d32c6f864246403034279'] = 'Les fichiers du coeur sont ok';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c62f82b25de72c3b0bb07225c49fe9d0'] = '%1$s fichier(s) du coeur a été modifié  (sur %2$s au total)';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_7b2f224649ef2ad10a2d73595d67a876'] = 'Démarrage mise à niveau ...';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6b2d0404b7faba0e791e15a52586a149'] = 'Basculer vers svn checkout (useSvn activé)';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f0e38ac0c558a7f216ae98382b9e58f5'] = 'Site désactivé. Téléchargement en cours (peut prendre ';
@@ -23,12 +29,20 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0929f38eaac3ca38801f08b72695
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4f7c02592a962e40a920f32f3a24f2df'] = 'filesToUpgrade n\'est pas un tableau';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3f10faa8b44a7175ae8fc5dcb8dec5de'] = 'Tous les fichiers ont été mis à jour. Mise à jour de la base de données en cours.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_1ad932e3b85eb2907a817cd3e3e6907e'] = 'Erreur pour la mise à jour de %s';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_97507ecafd7ed1843f55071ee48a64d6'] = '%1$s copié. Il reste encore %2$s fichier(s) à mettre à jour';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_078a325fbcc1dbd50bd9f969ce954965'] = 'encore %2$s fichiers à mettre à jour.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_7a92514ea7e0c497f2e37a0ec6e4292d'] = 'erreur lors de la vérification de la configuration';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_97e55f3991353118fbccfb784885b956'] = 'Erreur lors de la mise à jour de la base. Vous pouvez avoir besoin de restaurer votre base de données.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_25b11e6c53fc76612ab7336464f4c95e'] = 'Bravo ! Mise à jour terminée. Vous pouvez maintenant réactiver votre boutique.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_9a2f2cf276ea9f79b31a815897c0e3e6'] = '%s ignoré.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_11978affb3b0dbb16c50d571fd05de6d'] = 'erreur lors  de la création du répertoire %s';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0e06ce0972ad338e1d96e8589dc21b9c'] = 'erreur lors de la copie de %1$s vers %2$s';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6fd2759cb30e7338b91cddedd0b53635'] = 'Restauration des fichiers ...';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_90334cd907dcf0d67fdacc3d767dcdcb'] = 'Restauration de la base de données ...';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a4694800695190f158487235352dafc9'] = 'Rien n\'est à restaurer';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5f7f50973696d0a42c1efcc07f7820a0'] = 'Votre site est maintenant restauré.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_28517b8a291c50d80aa53a078407065b'] = 'Répertoire racine nettoyée.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_026d80c0e57be9ea3c086b735f77611d'] = 'Fichiers restaurés. Calcul de l\'étape suivante ...';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_bb71892737d721949538d6e1c4d3d22d'] = 'Fichiers restaurés. Sauvegarde de la base de données non trouvée. Restauration terminée.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8efc36d230f76fbfd9e4d758964e9414'] = 'impossible d\'extraire %1$ s dans%2$s.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d7624db09c15d46cd37d7709ae05e44b'] = 'aucune sauvegarde trouvée. Il n\'y a rien à restaurer.';
@@ -47,9 +61,12 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d82eef1ba081c54686767c555670
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_344c592d141604c614c219fad3fa0dae'] = '%1$s fichiers exemple à supprimer';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0baf8c94d1d03d1621c17cd6eabf7b9f'] = 'Tous les exemples de fichiers supprimés. Sauvegarde des fichiers en cours...';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_84e31682487d5a0937f9184ebcf594ba'] = 'copie de travail déjà %s à jour. exportation vers le répertoire latest';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_762ab46f0b1e4eae1526ca7d637926f3'] = 'Mise à jour SVN fait pour %s copie de travail. maintenant l\'exporter plus tard dans la ...';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_dcefd261c0dea53fdb159b218503009e'] = 'SVN Checkout fait à partir de %s. maintenant l\'exporter plus tard dans la ...';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8f4c8c87daa3bc0311cfb61b7d36e27b'] = 'Erreur d\'extraction du SVN';
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0e81132066d433d212e237678e1193a3'] = 'non authorisé à utiliser SVN';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0e81132066d433d212e237678e1193a3'] = 'non autorisé à utiliser SVN';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b0d51f91a1118b7c39ee1835cc6c926a'] = 'Téléchargement terminé. Extraction ...';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4723092f623f18928fb35e90cea5e736'] = 'Téléchargement terminé, mais md5sum ne correspond pas. Opération annulée.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0c0db54fe8212c1a7215005fef75d7dd'] = 'Erreur pendant le téléchargement';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_93120c07d8c5cee44042627cd493e0e0'] = 'vous avez besoin allow_url_fopen pour le téléchargement automatique. Vous pouvez également placer le fichier manuellement dans %s';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3bb38e7d0bfd5a02f7c06cae446fee86'] = 'l\'action %s ignorée';
@@ -107,20 +124,30 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_229ee8046cafc09ddaf46fb9db71
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e805a556799b7cef40e9760c81d99218'] = 'erreurs SQL sont apparues.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5627353fd6ac678497af3ece05087068'] = 'Le fichier config/defines.inc.php n\'a pas été trouvé. Ou est-il passé ?';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_446c9e952debe114c86bbd9e5eea7d61'] = 'Restaurer';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3e9eb8e431c3fdd52632fb03d961808e'] = 'Après avoir mis à jour votre boutique, vous pouvez restaurer la version précédente. Utilisez cette fonction si votre thème ou un module non natif essentiel ne fonctionne pas correctement.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4879913b16fa23f723f70a5067bda8d4'] = 'Aucune restauration disponible';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_fff66e9b3d962fa319c8068b5c1997cd'] = 'restaurer';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_ebdabc2d40aa563aabbb3ee57915a7a9'] = 'cliquer pour restaurer %s';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e9c57c7fbc335e66282a32617b01b9be'] = 'Votre configuration actuelle';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e3b486e7a2718a902d24829aba6ee4ef'] = 'Tout les points suivants doivent être ';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2fc4ab825ce2ce9476e8a1c2211ac9b8'] = 'Dossier racine';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8786f48d9cf9618cd2f5c37312ab7e50'] = 'Statut du dossier racine';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d16d80ca66261afba43f5736f6cec7e6'] = 'droits complets en écriture';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_039552aa1d74b68f01a73821f3078158'] = 'pas de droits d\'écriture récursif';
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_31a962ffeb06a6cc6d58ef3ba5fae2b7'] = 'Autoupgrade autorisé';
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_9c30a74657158984997cca4930d6075b'] = 'Cette version autorise la mise à jour automatique';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_228e8380ee42b3ba5d59cdc502dc154d'] = 'Mise à jour disponible';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_93e970ffc765978f032913e590dd51ef'] = 'Cette version autorise la mise à jour automatique';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_af566be1636d11ecc8ddb728a15520b8'] = 'Cette version n\'autorise pas la mise à jour automatique';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_ea4d3af79ad2392b7c0cca4b8ddd7028'] = 'Vous avez déjà la dernière version disponible.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_93cba07454f06a4a960172bbd6e2a435'] = 'Oui';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3d9f7f5927158b5a7dac0d65b4537265'] = 'Boutique désactivée';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_94af5df6182efd3591d0ccccaa04bd5c'] = 'Limite de temps PHP';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_075ae3d2fc31640504f814f60e5ef713'] = 'désactivée';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_783e8e29e6a8c3e22baa58a19420eb4f'] = 'secondes';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f5fcc741c0bf329e4afbde40006373b2'] = 'Options choisies';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_ce2df06e42c501c38c0c8861d0325256'] = 'Configuration du module ok';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_97a2a3a1192fbcca33effe8682a1b43a'] = 'Merci de configurer les options du module';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_71aa2b9774b005c47f9cd225766b2045'] = 'version non modifiée de PrestaShop';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_342299aeb786a06533ba00d9a04794dd'] = 'Modifiez vos options';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_06933067aafd48425d67bcb01bba5cb6'] = 'Mettre à jour';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5d8b77b69c92370ec4e175a638019ca7'] = 'La version actuelle de votre boutique est : %s';
@@ -128,6 +155,12 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_80e3d093272bc011b6bc661e408c
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b47ba7568788e46dbc7fe81e525db863'] = 'La dernière version de prestashop disponible est:';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c97dcfb0df6daa46292a0def8a567822'] = 'Sauvegardez la base de données, les fichiers de sauvegarde et faire la mise en un clic pardi !';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a60ab62ed99ef0358b2efae592be0cdd'] = 'Mettre à jour PrestaShop Maintenant !';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_7f6336f29afd114798bf8ff3e6f2f9c9'] = 'PrestaShop sera téléchargé à partir de l\'url %s';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b1e4effc886020d5e8ca2ab71b0572b1'] = 'Voir le CHANGELOG';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_543af4fda7ca1a5e9a3983890708e2c3'] = 'Votre boutique est déjà à jour';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_1e10402bc6b8d7a64ced8408d57aedb5'] = 'Dernière vérification : %s';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d34978dd8a4be0b0b4cee937a8f71f57'] = 'Cliquez pour rafraichir';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d944def835fefea7e5ce45ec6e4b3554'] = 'J\'attend les étapes, monsieur.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_48c7c41b72e1d678923ce3571aa65b2d'] = 'Etape';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_eeb5a49c38d2d8c2baa51ed09beccf88'] = 'Etape de mise à jour';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c5d769685704e7ddcd70e74a6ebe50b7'] = 'Votre configuration actuelle n\'autorise pas la mise à jour.';
@@ -136,8 +169,16 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3a3a651c9a67bca9ac902da78946
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a22eff458b4f4bce6d3232e367ff0138'] = 'Votre configuration actuelle indique que vous voulez mettre à jour votre système à partir d\'une branche de développement instable, sans numéro de version. Si vous mettez à jour, vous ne pourrez plus appliquer le processus de versions stables officiel.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_dae8ace18bdcbcc6ae5aece263e14fe8'] = 'Options';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_91195bbbacc2147a736c849c46368ed8'] = 'Voulez vous restaurer votre boutique';
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6b3930a184368a458be6e4429f409877'] = 'Mise à jour terminée. Vérifiez votre boutique (essayez de faire une commande, vérifier le thème)';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3794983e0533ce2499b168f8e9bdca3c'] = 'Mise à jour terminée. Vérifiez le thème de votre ';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c208c3853a0c9515bbf0d330fdd51386'] = 'Mise à jour terminée !';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a498f9476a893d51ee02b3601678d318'] = 'Cliquez pour restaurer la base de donnée';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f34d5debb2bba76aa3e077937a07e373'] = 'Cliquez pour restaurer les fichiers';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_60283aa37e2063b2ada2f99216e1332a'] = 'Votre serveur ne peut pas télécharger le fichier. S\'il vous plaît le télécharger d\'abord par ftp dans votre répertoire admin/autoupgrade';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6ef7ebe46f6d16cdbf9e2169e3dd048e'] = 'Allez manuellement au bouton restaurer';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_1607e6098b7b62a2791653b059c975d2'] = 'Afficher / masquer la liste';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_25b91596a896c6cf688104169b4b6a71'] = 'Fichier(s) de la solution';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_65f04958837ddd3643fd5edaee3a0f8d'] = 'fichier(s) des courriels';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_54aca96b35b48dd39265175f61b6bdd2'] = 'fichier(s) des traductions';
+$_MODULE['<{autoupgrade}prestashop>autoupgrade_e79aed52aa295a8d68ff3ecf777cd42d'] = 'Cette version de PrestaShop ne peut pas être mise à jour : la constante PS_ADMIN_DIR est manquante';
+$_MODULE['<{autoupgrade}prestashop>autoupgrade_2a037c3ccd26d087a2a39e6e1f2aa2ac'] = 'Module autoupgrade';
+$_MODULE['<{autoupgrade}prestashop>autoupgrade_9f90d42cd3a3297519c04bdac6da96a1'] = 'Fournit une méthode automatique de mise à jour de votre boutique à la dernière version de PrestaShop. Attention : les thèmes personnalisés ne sont pas mis à jour.';
diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js
index 96dd01fb5..250fcfa7c 100644
--- a/modules/blocklayered/blocklayered.js
+++ b/modules/blocklayered/blocklayered.js
@@ -265,7 +265,7 @@ function reloadContent(params_plus)
 
 			$('.category-product-count').html(result.categoryCount);
 
-			$('#product_list').html(result.productList).html();
+			$('#product_list').replaceWith(result.productList);
 			$('#product_list').css('opacity', '1');
 			$('div#pagination').html(result.pagination);
 			paginationButton();
@@ -310,35 +310,38 @@ function reloadContent(params_plus)
 			if (current_friendly_url == '#')
 				current_friendly_url = '#/';
 				window.location = current_friendly_url;
+			lockLocationChecking = true;
 		}
 	});
 	ajaxQueries.push(ajaxQuery);
 }
 
-function initLocationChange(func, time) {
+function initLocationChange(func, time)
+{
 	if(!time) time = 500;
-	var currLoc = '';
+	var current_friendly_url = getUrlParams();
 	setInterval(function()
 	{
-		if(window.location.href != currLoc)
+		if(getUrlParams() != current_friendly_url && !lockLocationChecking)
 		{
-			currLoc = window.location.href;
-			
 			// Don't reload page if current_friendly_url and real url match
-			if (window.location.href.split('#').length == 2 && window.location.href.split('#')[1] != '')
-				current_url = '#'+window.location.href.split('#')[1];
-			else
-				current_url = '';
-			if (current_friendly_url.replace(/^#(\/)?/, '') == current_url.replace(/^#(\/)?/, ''))
+			if (current_friendly_url.replace(/^#(\/)?/, '') == getUrlParams().replace(/^#(\/)?/, ''))
 				return;
 			
-			if (window.location.href.split('#').length == 2 && window.location.href.split('#')[1] != '')
-			{
-				var params = window.location.href.split('#')[1];
-				reloadContent('&selected_filters='+params);
+			lockLocationChecking = true;
+			reloadContent('&selected_filters='+getUrlParams().replace(/^#/, ''));
 			}
-			else
-				reloadContent('&selected_filters=#');
+		else {
+			lockLocationChecking = false;
+			current_friendly_url = getUrlParams();
 		}
 	}, time);
 }
+
+function getUrlParams()
+{
+	var params = current_friendly_url;
+	if(window.location.href.split('#').length == 2 && window.location.href.split('#')[1] != '')
+		params = '#'+window.location.href.split('#')[1];
+	return params;
+}
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index e6cd68111..b709706dc 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -1002,7 +1002,8 @@ class BlockLayered extends Module
 		
 		$values = array();
 		foreach ($currencyList as $currency)
-			$values[] = '('.(int)$idProduct.', '.(int)$currency['id_currency'].', '.(int)$minPrice[$currency['id_currency']].', '.(int)$maxPrice[$currency['id_currency']].')';
+			$values[] = '('.(int)$idProduct.', '.(int)$currency['id_currency'].',
+			'.(int)$minPrice[$currency['id_currency']].', '.(int)($maxPrice[$currency['id_currency']] * (100+$maxTaxRate) / 100).')';
 		
 			Db::getInstance()->execute('
 			INSERT INTO `'._DB_PREFIX_.'layered_price_index` (id_product, id_currency, price_min, price_max)
@@ -1633,12 +1634,19 @@ class BlockLayered extends Module
 								updElements(0, 0);
 							},
 							\'onComplete\': function() {
+								if($(\'#categories-treeview li#1\').attr(\'cleaned\'))
+									return;
+								if($(\'#categories-treeview li#1\').attr(\'cleaned\', true))
 								$(\'#categories-treeview li#1\').removeClass(\'static\');
 								$(\'#categories-treeview li#1 span\').trigger(\'click\');
 								$(\'#categories-treeview li#1\').children(\'div\').remove();
 								$(\'#categories-treeview li#1\').
 									removeClass(\'collapsable lastCollapsable\').
 									addClass(\'last static\');
+								$(\'.hitarea\').click(function(it)
+								{
+									$(this).parent().find(\'> .category_label\').click();
+								});
 							}
 						});
 
@@ -1935,9 +1943,9 @@ class BlockLayered extends Module
 			
 			$priceFilterQueryOut = 'INNER JOIN `'._DB_PREFIX_.'layered_price_index` psi
 			ON 
-				((psi.price_min < '.(int)$priceFilter['min'].' AND psi.price_max > '.(int)$priceFilter['min'].')
+				((psi.price_min <= '.(int)$priceFilter['min'].' AND psi.price_max >= '.(int)$priceFilter['min'].')
 				OR
-				(psi.price_max > '.(int)$priceFilter['max'].' AND psi.price_min < '.(int)$priceFilter['max'].'))
+				(psi.price_max >= '.(int)$priceFilter['max'].' AND psi.price_min <= '.(int)$priceFilter['max'].'))
 				AND psi.`id_product` = p.`id_product`
 				AND psi.`id_currency` = '.(int)$idCurrency;
 		}
@@ -1964,7 +1972,7 @@ class BlockLayered extends Module
 		while ($product = DB::getInstance()->nextRow($allProductsOut))
 			if (isset($priceFilter) && $priceFilter)
 			{
-				$price = Product::getPriceStatic($product['id_product']);
+				$price = (int)Product::getPriceStatic($product['id_product']); // Cast to int because we don't care about cents
 				if ($price < $priceFilter['min'] || $price > $priceFilter['max'])
 					continue;
 				$productIdList[] = (int)$product['id_product'];
diff --git a/modules/blocklayered/blocklayered.tpl b/modules/blocklayered/blocklayered.tpl
index 1b219253c..af010771d 100644
--- a/modules/blocklayered/blocklayered.tpl
+++ b/modules/blocklayered/blocklayered.tpl
@@ -51,7 +51,7 @@ current_friendly_url = '#{$current_friendly_url}';
 										</li>
 									{else}
 										{foreach from=$filter.values key=id_value item=value}
-											{if $id_value == $filter_key && !is_numeric($filter_value) && ($filter.type eq 'id_attribute_group' || $filter.type eq 'id_feature') || $id_value == $filter_value && $filter.type neq 'id_attribute_group'}
+											{if $id_value == $filter_key && !is_numeric($filter_value) && ($filter.type eq 'id_attribute_group' || $filter.type eq 'id_feature') || $id_value == $filter_value && $filter.type neq 'id_attribute_group' && $filter.type neq 'id_feature'}
 												<li>
 													<a href="#" rel="layered_{$filter.type_lite}_{$id_value}" title="{l s='Cancel' mod='blocklayered'}">x</a>
 													{$filter.name|escape:html:'UTF-8'}{l s=':'} {$value.name|escape:html:'UTF-8'}
@@ -88,9 +88,9 @@ current_friendly_url = '#{$current_friendly_url}';
 									{/if}
 								<label for="layered_{$filter.type_lite}_{$id_value}"{if !$value.nbr} class="disabled"{else}{if isset($filter.is_color_group) && $filter.is_color_group} name="layered_{$filter.type_lite}_{$id_value}" class="layered_color" rel="{$id_value}_{$filter.id_key}"{/if}{/if}>
 									{if !$value.nbr}
-									{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> (0)</span></a>{/if}
+									{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> (0)</span>{/if}</a>
 									{else}
-									<a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span></a>{/if}</label>
+									<a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a></label>
 									{/if}
 								</li>
 							{/foreach}
diff --git a/modules/blockrss/fr.php b/modules/blockrss/fr.php
index a4d2712eb..ce44e6599 100644
--- a/modules/blockrss/fr.php
+++ b/modules/blockrss/fr.php
@@ -8,13 +8,15 @@ $_MODULE['<{blockrss}prestashop>blockrss_9680162225162baf2a085dfdc2814deb'] = 'F
 $_MODULE['<{blockrss}prestashop>blockrss_6706b6d8ba45cc4f0eda0506ba1dc3c8'] = 'URL du flux invalide';
 $_MODULE['<{blockrss}prestashop>blockrss_36ed65ce17306e812fd68d9f634c0c57'] = 'Titre invalide';
 $_MODULE['<{blockrss}prestashop>blockrss_1b3d34e25aef32a3c8daddfff856577f'] = 'Nombre de flux invalide';
-$_MODULE['<{blockrss}prestashop>blockrss_606a95aefd4296583b685aa039f01681'] = 'Vous avez sélectionné une flux RSS de votre propre site, il s\'agit très probablement d\'une erreur ! Choisissez une autre URL (ex : http://news.google.com/?output=rss) sauf si vous êtes sûr de votre action';
+$_MODULE['<{blockrss}prestashop>blockrss_e423bd72f5aa1be13216c5abbd3deb45'] = 'Vous avez choisi le flux RSS de votre site. Veuillez choisir une autre URL';
+$_MODULE['<{blockrss}prestashop>blockrss_7a82db9ac04c55697040556e5cc9dc7c'] = 'Flux introuvable, vérifez votre URL';
+$_MODULE['<{blockrss}prestashop>blockrss_1844ef1bfaa030dc8423c4645a43525c'] = 'Flux invalide :';
 $_MODULE['<{blockrss}prestashop>blockrss_c888438d14855d7d96a2724ee9c306bd'] = 'Paramètres mis à jour';
 $_MODULE['<{blockrss}prestashop>blockrss_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres';
 $_MODULE['<{blockrss}prestashop>blockrss_b22c8f9ad7db023c548c3b8e846cb169'] = 'Titre du bloc';
 $_MODULE['<{blockrss}prestashop>blockrss_2343a40bdffd8c7a6317b6d98c2b1042'] = 'Créez un titre pour le block (par défaut : \'Flux RSS\')';
 $_MODULE['<{blockrss}prestashop>blockrss_402d00ca8e4f0fff26fc24ee9ab8e82b'] = 'Ajouter une URL';
-$_MODULE['<{blockrss}prestashop>blockrss_eb26a56cc4c9ae20bc55c887773bddfd'] = 'Ajouter l\'url du flux que vous souhaitez utiliser';
+$_MODULE['<{blockrss}prestashop>blockrss_695d0986205c1ce17d03b026feb78c97'] = 'Ajouter l\'URL du flux que vous voulez utiliser (exemple: http://news.google.com/?output=rss)';
 $_MODULE['<{blockrss}prestashop>blockrss_ff9aa540e20285875ac8b190a3cb7ccf'] = 'Nombre de messages affichés';
 $_MODULE['<{blockrss}prestashop>blockrss_f33725e23a017705ad35897e849a4db4'] = 'Nombre de messages affichés par le bloc (défaut : 5)';
 $_MODULE['<{blockrss}prestashop>blockrss_c9cc8cce247e49bae79f15173ce97354'] = 'Sauvegarder';
diff --git a/modules/blockstore/blockstore.php b/modules/blockstore/blockstore.php
index 31e9acf3d..8fe5a5ab5 100644
--- a/modules/blockstore/blockstore.php
+++ b/modules/blockstore/blockstore.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -60,20 +60,20 @@ class BlockStore extends Module
 	{
 		return $this->hookRightColumn($params);
 	}
-	
+
 	function hookRightColumn($params)
 	{
-		
-		
+
+
 		$this->context->smarty->assign('store_img', Configuration::get('BLOCKSTORE_IMG'));
 		return $this->display(__FILE__, 'blockstore.tpl');
 	}
-	
+
 	function hookHeader($params)
 	{
 		$this->context->controller->addCSS($this->_path.'blockstore.css', 'all');
 	}
-	
+
 	public function postProcess()
 	{
 		if (Tools::isSubmit('submitStoreConf'))
@@ -98,7 +98,7 @@ class BlockStore extends Module
 		}
 		return '';
 	}
-	
+
 	public function getContent()
 	{
 		$output = $this->postProcess().'
@@ -112,7 +112,7 @@ class BlockStore extends Module
 				<div class="margin-form">
 					<input id="store_img" type="file" name="store_img" /> ( '.$this->l('image will be displayed as 174x115').' )
 				</div>
-		
+
 				<p class="center">
 					<input class="button" type="submit" name="submitStoreConf" value="'.$this->l('Save').'"/>
 				</p>
diff --git a/modules/canadapost/fr.php b/modules/canadapost/fr.php
index e69de29bb..66105a7f1 100644
--- a/modules/canadapost/fr.php
+++ b/modules/canadapost/fr.php
@@ -0,0 +1,97 @@
+<?php
+
+global $_MODULE;
+$_MODULE = array();
+$_MODULE['<{canadapost}prestashop>canadapost_77946efda9f40f6bbcd0e697de948e65'] = 'Transporteur Canada Post';
+$_MODULE['<{canadapost}prestashop>canadapost_a5daea18a1d4214028a538c3bf5a41cc'] = 'Offrez à vos clients différentes méthodes de livraison avec Canada Post';
+$_MODULE['<{canadapost}prestashop>canadapost_9d7d8be1feb0bc026fffd29bc536364e'] = 'option cURL';
+$_MODULE['<{canadapost}prestashop>canadapost_883fa0069f4b0454e2277dd567ab3991'] = '\'Unité de poids (LB ou KG)\'';
+$_MODULE['<{canadapost}prestashop>canadapost_5a3ceec65d417f5d92c26dbf0dccc00d'] = '\'Unité de mesure (CM ou IN)\'';
+$_MODULE['<{canadapost}prestashop>canadapost_4d470fde8487e755a50e9235e3dc13ab'] = 'doit être configuré pour que le module fonctionne correctement';
+$_MODULE['<{canadapost}prestashop>canadapost_2056ed4f6b76a94035f12c041350aa2f'] = 'compte Canada Post';
+$_MODULE['<{canadapost}prestashop>canadapost_20449d3f0b6c6b9265a5cd2a470a6451'] = 'Poids du colis';
+$_MODULE['<{canadapost}prestashop>canadapost_bfc00de34bc04366e7fee516adf7dca5'] = 'Frais additionnels';
+$_MODULE['<{canadapost}prestashop>canadapost_386aad80d82f8245e9ef80352a2240e8'] = 'Tous les produits dans un colis';
+$_MODULE['<{canadapost}prestashop>canadapost_f35eb2a913a3fd6fd8e661012cf0ebd8'] = 'Un produit par colis';
+$_MODULE['<{canadapost}prestashop>canadapost_9c536dc938b99309eab40c9a06fc1c00'] = 'Statut du module Canada Post';
+$_MODULE['<{canadapost}prestashop>canadapost_428a446c88625404645d482927d90b31'] = 'Le module Canada Post est correctement configuré.';
+$_MODULE['<{canadapost}prestashop>canadapost_c31be897c51c899fe1da81c31403e2a4'] = 'Le module Canada Post n\'est pas configuré, vous devez :';
+$_MODULE['<{canadapost}prestashop>canadapost_3e203b9a16f360b88d90bba6eb61ce61'] = 'Remplir le formlaire de l\'onglet \"Configuration générale\"';
+$_MODULE['<{canadapost}prestashop>canadapost_8c0987b9315003df7dae7f130e3cf58e'] = 'Choississez les services de livraison disponible';
+$_MODULE['<{canadapost}prestashop>canadapost_e20f6d6f13fe70e78f6e2ab488493ccf'] = 'Test de connection webservice';
+$_MODULE['<{canadapost}prestashop>canadapost_5378f4ad5f6616fda3ef972deba67f8a'] = 'cURL est activé';
+$_MODULE['<{canadapost}prestashop>canadapost_52f4393e1b52ba63e27310ca92ba098c'] = 'Configuration Général';
+$_MODULE['<{canadapost}prestashop>canadapost_277d63a9b24a09697e3c64092eaf4353'] = 'Configuration des Catégories';
+$_MODULE['<{canadapost}prestashop>canadapost_098eec2cabe2c39c6dec3fc522b6571a'] = 'Configuration des Produits';
+$_MODULE['<{canadapost}prestashop>canadapost_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Aide';
+$_MODULE['<{canadapost}prestashop>canadapost_d2126da975d5b9a5b846efaf57d3fd53'] = 'Configuration générale';
+$_MODULE['<{canadapost}prestashop>canadapost_4af6ad356ba7dd056b265944ef91cb5b'] = 'Votre compte Canada Post';
+$_MODULE['<{canadapost}prestashop>canadapost_db06a2900c66a3a2cb78fe3a470f1b85'] = 'Poids du colis';
+$_MODULE['<{canadapost}prestashop>canadapost_0274f749472f365e7d48a501e14793e6'] = 'Frais additionnels';
+$_MODULE['<{canadapost}prestashop>canadapost_83ad4fdaf06650e6d9d7ca18f82fb975'] = 'Configuration de localisation';
+$_MODULE['<{canadapost}prestashop>canadapost_f489118ea95c746d648d36bb50c226f0'] = 'Unité de poids';
+$_MODULE['<{canadapost}prestashop>canadapost_659c95668841b7d6602ead454b28d4ba'] = 'L\'unité de poids de votre magasin (ex: KG ou LBS)';
+$_MODULE['<{canadapost}prestashop>canadapost_cc13d156306185fd42a860da3049567c'] = 'Unité de dimension';
+$_MODULE['<{canadapost}prestashop>canadapost_f804c2bdebc117d9cde3cddad3b49845'] = 'L\'unité de dimension de votre magasin (ex: CM ou IN)';
+$_MODULE['<{canadapost}prestashop>canadapost_2481447d04ae756836d32e3ade240ff4'] = 'Configuration de l\'adresse';
+$_MODULE['<{canadapost}prestashop>canadapost_5b179e75d464a04d8a04111131b3a3ca'] = 'Votre adresse ligne 1';
+$_MODULE['<{canadapost}prestashop>canadapost_281b2def1a9737b33f88013c94fdfeb8'] = 'Votre adresse ligne 2';
+$_MODULE['<{canadapost}prestashop>canadapost_d30f507473129e70c4b962ceccf175cf'] = 'Code postal / zip code';
+$_MODULE['<{canadapost}prestashop>canadapost_d0585aac6bb77bb49423b2effca0e067'] = 'Votre ville';
+$_MODULE['<{canadapost}prestashop>canadapost_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
+$_MODULE['<{canadapost}prestashop>canadapost_f8f5a972333ee726fbe5bb52409c0ed0'] = 'Choississez votre pays ...';
+$_MODULE['<{canadapost}prestashop>canadapost_4e9863cf5326e6714388045321665d07'] = 'Choississez votre pays dans la liste';
+$_MODULE['<{canadapost}prestashop>canadapost_46a2a41cc6e552044816a2d04634545d'] = 'Etat';
+$_MODULE['<{canadapost}prestashop>canadapost_cf1580798f7aba85d519afadf1ffd886'] = 'Choississez votre état ...';
+$_MODULE['<{canadapost}prestashop>canadapost_02546d525ab356bd43c91e6b07447496'] = 'Il n\'y a pas d\'état pour ce pays';
+$_MODULE['<{canadapost}prestashop>canadapost_0ddc2a5660f7d095fff34d6b93077c80'] = 'Configuration du service';
+$_MODULE['<{canadapost}prestashop>canadapost_8d6bd50f3fe3ee2f4513066c25e5fb4a'] = 'Mode de calcul';
+$_MODULE['<{canadapost}prestashop>canadapost_79a7b64f7e16759d93ef3e74f1916815'] = 'Utilisation du mode calcul \"Tous les produits dans un seul colis\" utilisera automatiquement la taille et les services de livraison par défaut. Les configurations spécifiques pour les catégories et les produits ne seront pas utilisées.';
+$_MODULE['<{canadapost}prestashop>canadapost_5cdd307ba6e260beb4801c0c10e22a3a'] = 'Service de livraison';
+$_MODULE['<{canadapost}prestashop>canadapost_78945de8de090e90045d299651a68a9b'] = 'Disponible';
+$_MODULE['<{canadapost}prestashop>canadapost_2d25c72c1b18e562f6654fff8e11711e'] = 'Indisponible';
+$_MODULE['<{canadapost}prestashop>canadapost_d63e135774e62574e2a1921267dad142'] = 'Choisissez les services de livraison qui seront disponibles pour vos clients.';
+$_MODULE['<{canadapost}prestashop>canadapost_a438cfa1a870740754c9f4b35130cc04'] = 'Votre compte Canada Post n\'est pas spécifié';
+$_MODULE['<{canadapost}prestashop>canadapost_805353d2862ea0e658c9ddda871540fa'] = 'Votre code postal / zip code n\'est pas spécifié';
+$_MODULE['<{canadapost}prestashop>canadapost_ef9bd955e165dfb0207877e9fe180aeb'] = 'Votre ville n\'est pas spécifié';
+$_MODULE['<{canadapost}prestashop>canadapost_5ecc7697a320f93f3ee8fb4048dbd64c'] = 'Votre pays n\'est pas spécifié';
+$_MODULE['<{canadapost}prestashop>canadapost_e7bb7d2ee4d79c9b48cfc443781f00b5'] = 'PrestaShop ne peut pas se connecter aux webservices Canada Post';
+$_MODULE['<{canadapost}prestashop>canadapost_9d1b485edd50e6fbd288b340b386b07d'] = 'Pas de description d\'erreur trouvé';
+$_MODULE['<{canadapost}prestashop>canadapost_c888438d14855d7d96a2724ee9c306bd'] = 'Configuration mise à jour';
+$_MODULE['<{canadapost}prestashop>canadapost_b9284bff13acffdd879ef4ac7fca5234'] = 'Configuration non mise à jour';
+$_MODULE['<{canadapost}prestashop>canadapost_67e19ffdaa0a11e69349810403a9727e'] = 'Vous devez configurer l\'onglet \"Configuration Générale\"';
+$_MODULE['<{canadapost}prestashop>canadapost_a37b48e8684078c0620a997b3baeee9f'] = 'Dans cet onglet, vous pouvez faire une configuration spécifique pour chaque catégorie';
+$_MODULE['<{canadapost}prestashop>canadapost_f421827ff72ef9a61fb27aa0de62f1e4'] = 'ID Configuration';
+$_MODULE['<{canadapost}prestashop>canadapost_3adbdb3ac060038aa0e6e6c138ef9873'] = 'Catégorie';
+$_MODULE['<{canadapost}prestashop>canadapost_20cde117cbc92b9ec1fb4e5bc4a7b9bd'] = 'Frais additionnels';
+$_MODULE['<{canadapost}prestashop>canadapost_992a0f0542384f1ee5ef51b7cf4ae6c4'] = 'Services';
+$_MODULE['<{canadapost}prestashop>canadapost_06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions';
+$_MODULE['<{canadapost}prestashop>canadapost_66001bafca8edd8343802bd20cddc10e'] = 'Il n\'y a pas de configuration spécifique pour les catégories.';
+$_MODULE['<{canadapost}prestashop>canadapost_605c5ae9959cfe9cc0b0d630b8d3144f'] = 'Êtes vous sûr de vouloir effacer cette configuration spécifique ?';
+$_MODULE['<{canadapost}prestashop>canadapost_3e0cb9fd22b124c0839302fef54762d7'] = 'Mettre à jour une règle';
+$_MODULE['<{canadapost}prestashop>canadapost_dd593f8a542ab628cbba98c709255e60'] = 'Ajouter une règle';
+$_MODULE['<{canadapost}prestashop>canadapost_7fcafa7c47e984693fcb8a92c0fd1beb'] = 'Choississez une catégorie';
+$_MODULE['<{canadapost}prestashop>canadapost_d725c0166e978cc30853996c70440873'] = 'Vous devez choisir une catégorie';
+$_MODULE['<{canadapost}prestashop>canadapost_882830cb67e4069370c1be3a1ba4e12a'] = 'Cette catégorie a déjà une configuration spécifique.';
+$_MODULE['<{canadapost}prestashop>canadapost_fd0119c2a5fc18aa64887b5b7ab41c19'] = 'Une erreur est survenue, essayez encore.';
+$_MODULE['<{canadapost}prestashop>canadapost_20f40087c53c662adfb4e780500eaa15'] = 'Dans cet onglet, vous pouvez faire une configuration spécifique par produit.';
+$_MODULE['<{canadapost}prestashop>canadapost_deb10517653c255364175796ace3553f'] = 'Produit';
+$_MODULE['<{canadapost}prestashop>canadapost_2119cb0eeb7e202767f9fa56566efc50'] = 'Il n\'y a pas de configuration spécifique pour les produits.';
+$_MODULE['<{canadapost}prestashop>canadapost_d53b004866635789a76380f66c87e3df'] = 'Êtes vous sûr de vouloir effacer cette configuration spécifique ?';
+$_MODULE['<{canadapost}prestashop>canadapost_3c4d710b56f4318dae775cff80619f84'] = 'Choississez un produit...';
+$_MODULE['<{canadapost}prestashop>canadapost_9c07640370e4681bf98638d0c458cd2e'] = 'Vous devez choisir un produit.';
+$_MODULE['<{canadapost}prestashop>canadapost_c018b9a37818d15477285eb915590d19'] = 'Ce produit a une configuration spécifique';
+$_MODULE['<{canadapost}prestashop>canadapost_73e383f703902e137c2e6d8e2e85cc22'] = 'Bienvenue dans le configateur du module Canada Post';
+$_MODULE['<{canadapost}prestashop>canadapost_92640c80a67da1782a18304336405dac'] = 'Cette section vous aidera à comprendre comment configurer votre module correctement.';
+$_MODULE['<{canadapost}prestashop>canadapost_ec0e6948e8f34818d80f27c309f46661'] = 'Ci-dessous la description de chaque champs :';
+$_MODULE['<{canadapost}prestashop>canadapost_a5f7df92d8088761b0727fb1ce0a013a'] = 'Votre compte Canada Post';
+$_MODULE['<{canadapost}prestashop>canadapost_742e9dca63ccb97a592727c4c2c9abc8'] = 'Vous devez vous inscrire au site Web de Canada Post à cette adresse';
+$_MODULE['<{canadapost}prestashop>canadapost_35ba940948fa0ea163fd01281de10e2f'] = 'Ce champ doit être le Zip / code postal de votre point de départ de vos colis.';
+$_MODULE['<{canadapost}prestashop>canadapost_81822348ace1ceabad5e9f8992ce9ea4'] = 'Ce champ doit être le pays de votre point de départ de vos colis.';
+$_MODULE['<{canadapost}prestashop>canadapost_b9bba478eb4348e49e672e944b072b68'] = 'Ces cases correspondent aux services de livraison que vous voulez rendre disponibles (quand il n\'y a pas de configuration spécifique pour les produits ou les catégories de produits).';
+$_MODULE['<{canadapost}prestashop>canadapost_b7c1051bdf970e718e2a3664ad3e31ac'] = 'Cette section vous permet de définir une configuration Canada Post spécifique pour chaque catégorie de produits (tels que les frais supplémentaires).';
+$_MODULE['<{canadapost}prestashop>canadapost_2911404cfaf6a4c3a6756e157b0edb62'] = 'Cette section vous permet de définir une configuration Canada Post spécifique pour chaque produit (tels que les frais supplémentaires).';
+$_MODULE['<{canadapost}prestashop>canadapost_902b0d55fddef6f8d651fe1035b7d4bd'] = 'Erreur';
+$_MODULE['<{canadapost}prestashop>canadapost_43c9c583cfcb8523ad269708ddcde8b8'] = 'Les webservices de Canada Post semblent être injoignables, veuillez reessayer ultérieurement.';
+$_MODULE['<{canadapost}prestashop>canadapost_f1c83c0ed9e0f992f7f448f7321d9743'] = 'Les webservices de Canada Post ne répondent pas.';
+$_MODULE['<{canadapost}prestashop>canadapost_b7f155fe0169108902b447f572639d0b'] = 'N\'a pas pu se connecter à CanadaPost.com';
diff --git a/modules/carriercompare/fr.php b/modules/carriercompare/fr.php
index 47e116839..843d21163 100644
--- a/modules/carriercompare/fr.php
+++ b/modules/carriercompare/fr.php
@@ -5,9 +5,10 @@ $_MODULE = array();
 $_MODULE['<{carriercompare}prestashop>carriercompare_115484428c82f859100c07ae1170d9e0'] = 'Estimation des livraisons';
 $_MODULE['<{carriercompare}prestashop>carriercompare_68e114c207a6820a8f14d0eceacf17d7'] = 'Module permettant de faire une estimation des coûts de livraison avant de rentrer dans le processus de commande';
 $_MODULE['<{carriercompare}prestashop>carriercompare_ed70a57a190d596171cf324c16a2277d'] = 'L\'identifiant State est invalide';
-$_MODULE['<{carriercompare}prestashop>carriercompare_66e799a222e07b1cf25498465028061d'] = 'L\'identifiant Country est invalide';
+$_MODULE['<{carriercompare}prestashop>carriercompare_ff22c3e7b4cd12813e2033774d987e96'] = 'Choissisez un état';
+$_MODULE['<{carriercompare}prestashop>carriercompare_fb9e838d470b2c27c2c128d127165f9e'] = 'Choississez un pays';
 $_MODULE['<{carriercompare}prestashop>carriercompare_b72dd62d03697b37417288c63e78c8c6'] = 'Veuillez utiliser un code postal valide en fonction du pays choisi';
-$_MODULE['<{carriercompare}prestashop>carriercompare_e3f585e306c3cda18369730a6a628f7b'] = 'L\'identifiant du transporteur est invalide';
+$_MODULE['<{carriercompare}prestashop>carriercompare_3f63451bbacbb1c3303d99d0309fdfe9'] = 'Choississez un transporteur';
 $_MODULE['<{carriercompare}prestashop>carriercompare_efaf5c3827ef576b05de32ad458f196c'] = 'Cet identifiant de transporteur n\'est pas disponible pour cette sélection';
 $_MODULE['<{carriercompare}prestashop>carriercompare_edc5cf1b3bab64b1d45ef51c63b53887'] = 'Impossibilité de mettre a jour le panier';
 $_MODULE['<{carriercompare}prestashop>carriercompare_e7a6ca4e744870d455a57b644f696457'] = 'Offert !';
@@ -15,8 +16,9 @@ $_MODULE['<{carriercompare}prestashop>carriercompare_fbc1bef527a3a092053a244fd8d
 $_MODULE['<{carriercompare}prestashop>carriercompare_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
 $_MODULE['<{carriercompare}prestashop>carriercompare_46a2a41cc6e552044816a2d04634545d'] = 'Etat';
 $_MODULE['<{carriercompare}prestashop>carriercompare_e0ed8e71dbd22a1e91cb570b52443fd5'] = 'Code postal';
+$_MODULE['<{carriercompare}prestashop>carriercompare_51e304bfd2872c9f53c99054b8fb8381'] = 'Nécessaires pour certains transporteurs';
 $_MODULE['<{carriercompare}prestashop>carriercompare_914419aa32f04011357d3b604a86d7eb'] = 'Transporteur';
 $_MODULE['<{carriercompare}prestashop>carriercompare_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Information';
 $_MODULE['<{carriercompare}prestashop>carriercompare_3601146c4e948c32b6424d2c0a7f0118'] = 'Prix';
 $_MODULE['<{carriercompare}prestashop>carriercompare_f620c0ed0c89129c9dd8953406300061'] = 'Aucun  transporteur n\'est disponible pour cette sélection';
-$_MODULE['<{carriercompare}prestashop>carriercompare_c6b61ece4cb72c71e84d91a4d22aa449'] = 'Lancer l\'estimation';
+$_MODULE['<{carriercompare}prestashop>carriercompare_63a6a88c066880c5ac42394a22803ca6'] = 'Rafraichir';
diff --git a/modules/cashticket/fr.php b/modules/cashticket/fr.php
index c3641498c..788f71ad5 100755
--- a/modules/cashticket/fr.php
+++ b/modules/cashticket/fr.php
@@ -2,6 +2,8 @@
 
 global $_MODULE;
 $_MODULE = array();
+$_MODULE['<{cashticket}prestashop>prepaidservices_3e8e30e75887d2f3b02da669ebd5b380'] = 'Un certificat n\'a été trouvé pour cette configuration';
+$_MODULE['<{cashticket}prestashop>prepaidservices_515f3d11e66f6fc5f7bb453e6030241a'] = 'Un mot de passe a déjà été enregistré';
 $_MODULE['<{cashticket}prestashop>cashticket-accept-payment_330bf06fb43e715e5d03c9fd016df4cd'] = 'Le paiement n\'a pas encore été accepté : ';
 $_MODULE['<{cashticket}prestashop>cashticket-accept-payment_486cb12e1ec3c8b28b80a8eb9f2db2c0'] = 'Accepter le paiement';
 $_MODULE['<{cashticket}prestashop>cashticket-accept-payment_e9b3579d8e877bcd29ab436f2ef87cc8'] = 'Relacher le paiement';
diff --git a/modules/ebay/ebay.php b/modules/ebay/ebay.php
index 41128747b..96f2bec8e 100755
--- a/modules/ebay/ebay.php
+++ b/modules/ebay/ebay.php
@@ -915,7 +915,7 @@ class Ebay extends Module
 		// Load categories only if necessary
 		if (Db::getInstance()->getValue('SELECT COUNT(`id_ebay_category_configuration`) FROM `'._DB_PREFIX_.'ebay_category_configuration`') > 4 && Tools::getValue('section') != 'category')
 			return '<p align="center"><b>'.$this->l('Your categories have already been configured.').'</b></p>
-			<form action="index.php?tab='.Tools::safeOuput($_GET['tab']).'&configure='.Tools::safeOuput($_GET['configure']).'&token='.Tools::safeOuput($_GET['token']).'&tab_module='.Tools::safeOuput($_GET['tab_module']).'&module_name='.Tools::safeOuput($_GET['module_name']).'&id_tab=2&section=category" method="post" class="form">
+			<form action="index.php?tab='.Tools::safeOutput($_GET['tab']).'&configure='.Tools::safeOutput($_GET['configure']).'&token='.Tools::safeOutput($_GET['token']).'&tab_module='.Tools::safeOutput($_GET['tab_module']).'&module_name='.Tools::safeOutput($_GET['module_name']).'&id_tab=2&section=category" method="post" class="form">
 			<p align="center"><input class="button" name="submitSave" type="submit" value="'.$this->l('See Categories').'" /></p></form>';
 
 		// Display eBay Categories
diff --git a/modules/fedexcarrier/fr.php b/modules/fedexcarrier/fr.php
index 8e54960ce..79e70ba25 100644
--- a/modules/fedexcarrier/fr.php
+++ b/modules/fedexcarrier/fr.php
@@ -97,6 +97,7 @@ $_MODULE['<{fedexcarrier}prestashop>fedexcarrier_5cdd307ba6e260beb4801c0c10e22a3
 $_MODULE['<{fedexcarrier}prestashop>fedexcarrier_78945de8de090e90045d299651a68a9b'] = 'Disponible';
 $_MODULE['<{fedexcarrier}prestashop>fedexcarrier_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible';
 $_MODULE['<{fedexcarrier}prestashop>fedexcarrier_d63e135774e62574e2a1921267dad142'] = 'Choissisez les services de livraison qui seront disponibles pour vos clients';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_f1206f9fadc5ce41694f69129aecac26'] = 'Configurer';
 $_MODULE['<{fedexcarrier}prestashop>fedexcarrier_9b8c4a7116e8c44e4ebc955fafd47586'] = 'Votre compte fedex n\'est pas spécifié';
 $_MODULE['<{fedexcarrier}prestashop>fedexcarrier_b9cc1a101547b3ece6d946dbbe3469d7'] = 'Votre Fedex meter number n\'est pas spécifié';
 $_MODULE['<{fedexcarrier}prestashop>fedexcarrier_5ce0f66588bbbbbb3ef0634e5ea7da69'] = 'Votre mot de passe Fedex n\'est pas spécifié';
diff --git a/modules/importerosc/fr.php b/modules/importerosc/fr.php
index 598010dff..d3533b994 100644
--- a/modules/importerosc/fr.php
+++ b/modules/importerosc/fr.php
@@ -4,9 +4,9 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{importerosc}prestashop>importerosc_e273168c3697c35b8c737d14b1a5fb26'] = 'Import OsCommerce';
 $_MODULE['<{importerosc}prestashop>importerosc_f4a344f88bab7b04a73077bafc8a0187'] = 'Ce module permet d\'importer votre boutique OsCommerce dans prestashop';
-$_MODULE['<{importerosc}prestashop>importerosc_2737b271f276b90d8a04ea4b9d18b920'] = 'Langue par défaut OsCommerce';
-$_MODULE['<{importerosc}prestashop>importerosc_1b473540f20c3e31ead53f84511d6c77'] = 'Devise par défaut OsCommerce';
-$_MODULE['<{importerosc}prestashop>importerosc_6c61ebc45acfe2f244e91ac4cd423e81'] = 'Url de la boutique';
+$_MODULE['<{importerosc}prestashop>importerosc_a410107bacc21de421c07f0162f40878'] = 'Langue par défaut d\'osCommerce';
+$_MODULE['<{importerosc}prestashop>importerosc_6325b420c7e3747295ebc4265ca5ebf5'] = 'Monnaie par défaut d\'osCommerce';
+$_MODULE['<{importerosc}prestashop>importerosc_3128e575f57c8bff6950eb946748318a'] = 'Url de votre boutique :';
 $_MODULE['<{importerosc}prestashop>importerosc_f106e79e646e4262fae765f77db9ca91'] = 'Indiquez l\'URL racine de votre site oscommerce';
 $_MODULE['<{importerosc}prestashop>importerosc_a89a64592edf58aee0fc749735902cea'] = 'Merci de choisir une langue par défaut';
 $_MODULE['<{importerosc}prestashop>importerosc_375e6e17d4bd18a5163d3a7d13b80b4b'] = 'Merci de choisir la devise par défaut';
diff --git a/modules/mondialrelay/AdminMondialRelay.php b/modules/mondialrelay/AdminMondialRelay.php
index c0ecc5196..b510d390d 100755
--- a/modules/mondialrelay/AdminMondialRelay.php
+++ b/modules/mondialrelay/AdminMondialRelay.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,6 +26,7 @@
 */
 
 require_once(dirname(__FILE__).'/classes/MondialRelayClass.php');
+require_once(dirname(__FILE__).'/classes/MRCreateTickets.php');
 require_once(dirname(__FILE__).'/mondialrelay.php');
 
 class AdminMondialRelay extends AdminTab
@@ -35,10 +36,10 @@ class AdminMondialRelay extends AdminTab
 	public function __construct()
 	{
 		MondialRelay::initModuleAccess();
-		
+
 		$this->table = 'mr_selected';
 		$this->className = 'MondialRelayClass';
-		
+
 		parent::__construct();
 	}
 
@@ -47,14 +48,31 @@ class AdminMondialRelay extends AdminTab
 		$mondialrelay = new MondialRelay();
 		$order_state = new OrderState((int)(Configuration::get('MONDIAL_RELAY_ORDER_STATE')), $this->context->language->id);
 		$mr_weight_coef = (int)(Configuration::get('MR_WEIGHT_COEF'));
-		
+
 		$html = '';
-		
-		$html .= $this->l('To generate labels, you must register a correct address for your store on').
+
+		// Simulate a ticket generation
+		$MRCreateTicket = new MRCreateTickets(array(
+			'orderIdList' => NULL,
+			'totalOrder' => NULL,
+			'weightList' => NULL));
+
+		$errorListTicket = $MRCreateTicket->checkPreValidation();
+
+		if (count($errorListTicket))
+		{
+			$html .= '<div class="error">'.
+				$this->l('Thanks to kindly correct the following errors on ').
 			' <a href="index.php?tab=AdminContact&token='.Tools::getAdminToken('AdminContact'.
-			(int)(Tab::getIdFromClassName('AdminContact')).(int)$this->context->employee->id).'" class="green">'.
-			$this->l('The contact page').'</a>';
-		$html .= '<p>'.$this->l('All orders which have the state').' "<b>'.$order_state->name.'</b>"';
+				(int)(Tab::getIdFromClassName('AdminContact')).(int)$this->context->id_employee).'" style="color:#f00;">'.
+			$this->l('the contact page').'</a>:<ul>';
+			foreach($errorListTicket as $type => $error)
+				$html .= '<li>'.$type.': '.$error.'</li>';
+			$html .= '</ul></div>';
+		}
+
+		$html .= '<p>'.$this->l('All orders which have the state').' "<b>'.$order_state->name.'</b>" '.
+			$this->l('will be available for sticker creation');
 		$html .= '.&nbsp;<a href="index.php?tab=AdminModules&configure=mondialrelay&token='.
 			Tools::getAdminToken('AdminModules'.(int)(Tab::getIdFromClassName('AdminModules')).
 			(int)$this->context->employee->id).'" class="green">' . $this->l('Change configuration') . '</a></p>
@@ -63,7 +81,7 @@ class AdminMondialRelay extends AdminTab
 							<span></span>
 					</div>';
 
-		$orders = MondialRelay::getOrders(array(), MondialRelay::WITHOUT_HOME_DELIVERY);
+		$orders = MondialRelay::getOrders(array());
 		if (empty($orders))
 			$html.= '<h3 style="color:red;">' . $this->l('No orders with this state.') . '</h3>';
 		else
@@ -71,22 +89,22 @@ class AdminMondialRelay extends AdminTab
 			$html.= '<form method="post" action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'">';
 			$html.= "\n<table class=\"table\" id='orders'>";
 			$html.= '<tr>';
+			$html.= '<th><input type="checkbox" id="toggleStatusOrderList" /></th>';
 			$html.= '<th>'.$this->l('Order ID').'</th>';
 			$html.= '<th>'.$this->l('Customer').'</th>';
 			$html.= '<th>'.$this->l('Total price').'</th>';
 			$html.= '<th>'.$this->l('Total shipping').'</th>';
 			$html.= '<th>'.$this->l('Date').'</th>';
 			$html.= '<th>'.$this->l('Put a Weight (grams)').'</th>';
-			$html.= '<th class="fixed"><a href="javascript:void(0);" id="toggleStatusOrderList">'.$this->l('Toggle selection').'</a><br /></th>';
 			$html.= '<th>'.$this->l('MR Number').'</th>';
 			$html.= '<th>'.$this->l('MR Country').'</th>';
 			$html.= '<th>'.$this->l('Exp Number').'</th>';
 			$html.= '<th>'.$this->l('Detail').'</th>';
 			$html.= '</tr>';
-			
+
 			foreach ($orders as $order)
 			{
-				if ($order['weight'] == 0) 
+				if ($order['weight'] == 0)
 				{
 					$result_weight = Db::getInstance()->getRow('
 					SELECT SUM(product_weight * product_quantity) as weight
@@ -96,13 +114,13 @@ class AdminMondialRelay extends AdminTab
 				}
 
 				$html .= '<tr id="PS_MRLineOrderInformation-'.$order['id_order'].'">';
+				$html .= '<td><input type="checkbox" class="order_id_list" name="order_id_list[]" id="order_id_list" value="'.$order['id_order'].'" /></td>';
 				$html .= '<td>'.$order['id_order'].'</td>';
 				$html .= '<td>'.$order['customer'].'</td>';
 				$html .= '<td>'.Tools::displayPrice($order['total'], new Currency($order['id_currency'])) . '</td>';
 				$html .= '<td>'.Tools::displayPrice($order['shipping'], new Currency($order['id_currency'])) . '</td>';
 				$html .= '<td>'.Tools::displayDate($order['date'], $order['id_lang']).'</td>';
 				$html .= '<td><input type="text" name="weight_'.$order['id_order'].'" id="weight_' . $order['id_order'] . '" size="7" value="'.$order['weight'].'" /></td>';
-				$html .= '<td><input type="checkbox" class="order_id_list" name="order_id_list[]" id="order_id_list" value="'.$order['id_order'].'" /></td>';
 				$html .= '<td>'.$order['MR_Selected_Num'].'</td>';
 				$html .= '<td>'.$order['MR_Selected_Pays'].'</td>';
 				$html .= '<td>'.$order['exp_number'].'</td>';
@@ -147,7 +165,7 @@ class AdminMondialRelay extends AdminTab
 		$_html = '';
 	  $query = "SELECT * FROM `" . _DB_PREFIX_ ."mr_historique` ORDER BY `id` DESC ;";
 		$query = Db::getInstance()->executeS($query);
-		
+
 		$_html.= '
 			<fieldset>
 				<legend>' . $this->l('History of labels creation') . '</legend>
@@ -156,13 +174,13 @@ class AdminMondialRelay extends AdminTab
 						<table class="table" id="PS_MRHistoriqueTableList">
 							<tbody>
 								<tr>
-									<th><a href="javascript:void(0);" id="toggleStatusHistoryList">' . $this->l('Toggle selection') . '</a></th>
+									<th><input type="checkbox" id="toggleStatusHistoryList" /></th>
 			 						<th>' . $this->l('Order ID') . '</th>
 			 						<th>' . $this->l('Exp num') . '</th>
 			 						<th>' . $this->l('Print stick A4') . '</th>
 			 						<th>' . $this->l('Print stick A5') . '</th>
 			 					</tr>';
-		foreach ($query AS $k => $row) 
+		foreach ($query AS $k => $row)
 	  {
 			$_html.= '
 				<tr id="detailHistory_'.$row['order'].'">
@@ -194,9 +212,9 @@ class AdminMondialRelay extends AdminTab
 	}
 
 	public function display()
-	{	
+	{
 		$html = '';
-		
+
 		// Allow to override the older jquery to use a new one :)
 		// Added for the 1.3 compatibility to keep using the recent code
 		if (_PS_VERSION_ < '1.4')
@@ -206,7 +224,7 @@ class AdminMondialRelay extends AdminTab
 				<script type="text/javascript" language="javascript">
 				var _PS_MR_MODULE_DIR_ = "'.MondialRelay::$moduleURL.'";
 				</script>';
-			
+
 			$html .= $this->displayOrdersTable();
 			$html .= '<br/><br/>';
 			$html .= $this->displayhistoriqueForm();
diff --git a/modules/mondialrelay/ajax.php b/modules/mondialrelay/ajax.php
index e81f3fee6..d812e711c 100755
--- a/modules/mondialrelay/ajax.php
+++ b/modules/mondialrelay/ajax.php
@@ -1,6 +1,6 @@
-<?php 
+<?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -31,13 +31,14 @@
  * Each Name method allow to instanciate an object containing
  * methods to manage correctly the data and name fields
  */
- 
+
 require_once(realpath(dirname(__FILE__).'/../../config/config.inc.php'));
 require_once(realpath(dirname(__FILE__).'/../../init.php'));
 require(dirname(__FILE__).'/mondialrelay.php');
 require(dirname(__FILE__).'/classes/MRCreateTickets.php');
 require(dirname(__FILE__).'/classes/MRGetTickets.php');
 require(dirname(__FILE__).'/classes/MRGetRelayPoint.php');
+require(dirname(__FILE__).'/classes/MRRelayDetail.php');
 require(dirname(__FILE__).'/classes/MRManagement.php');
 
 MondialRelay::initModuleAccess();
@@ -64,7 +65,7 @@ $result = array();
 if (!isset($accessPageList[$token]) || !in_array($method, $accessPageList[$token]))
 	exit();
 
-// Method name allow to instanciate his object to properly call the 
+// Method name allow to instanciate his object to properly call the
 // implemented interface method and do his job
 switch($method)
 {
@@ -98,12 +99,12 @@ switch($method)
 }
 
 // Try to instanciate the method object name and call the necessaries method
-try 
+try
 {
 	if (class_exists($method, false))
 	{
 		$obj = new $method($params);
-		
+
 		// Verify that the class implement correctly the interface
 		// Else use a Management class to do some ajax stuff
 		if (($obj instanceof IMondialRelayWSMethod))
@@ -117,7 +118,7 @@ try
 	else if (($management = new MRManagement($params)) &&
 				method_exists($management, $method))
 			$result = $management->{$method}();
-	else 
+	else
 		throw new Exception('Method Class : '.$method.' can\'t be found');
 	unset($management);
 }
diff --git a/modules/mondialrelay/classes/MRCreateTickets.php b/modules/mondialrelay/classes/MRCreateTickets.php
index d0aabbd2e..4f18d615d 100755
--- a/modules/mondialrelay/classes/MRCreateTickets.php
+++ b/modules/mondialrelay/classes/MRCreateTickets.php
@@ -49,7 +49,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
 			'ModeLiv'				=>  array(
 						'required'				=> true,
 						'value'						=> '',
-						'regexValidation' => '#^(LCC|LDR|LDS|24R|ESP|DRI)$#'),
+						'regexValidation' => '#^(LCC|LD1|LDS|24R|ESP|DRI)$#'),
 			'NDossier' 			=>  array(
 						'required'				=> false,
 						'value'						=> '',
@@ -272,7 +272,6 @@ class MRCreateTickets implements IMondialRelayWSMethod
 	 */
 	private function _setRequestDefaultValue()
 	{
-
 		$this->_fields['list']['Enseigne']['value'] = Configuration::get('MR_ENSEIGNE_WEBSERVICE');
 		$this->_fields['list']['Expe_Langage']['value'] = Configuration::get('MR_LANGUAGE');
 		$this->_fields['list']['Expe_Ad1']['value'] = Configuration::get('PS_MR_SHOP_NAME');
@@ -422,7 +421,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
 		$order = new Order($params['NDossier']);
 
 	 	// Update the database for order and orderHistory
-		$order->shipping_number = $id_mr_selected;
+		$order->shipping_number = $expeditionNum;
 		$order->update();
 
 		$templateVars = array('{followup}' => $trackingURL);
@@ -507,6 +506,60 @@ class MRCreateTickets implements IMondialRelayWSMethod
 			throw new Exception($this->_mondialRelay->l('The Mondial Relay webservice isn\'t currently reliable'));
 	}
 
+	/*
+	** Check if the shop parameter are currently well configured
+	*/
+	public function checkPreValidation()
+	{
+		$errorList = array();
+		
+		if (!$this->_mondialRelay)
+			$this->_mondialRelay = new MondialRelay();
+		
+		$list = array(
+			'Expe_Langage' => array(
+				'value' => Configuration::get('MR_LANGUAGE'),
+				'error' => $this->_mondialRelay->l('Please check your language configuration')),
+			'Expe_Ad1' => array(
+				'value' => Configuration::get('PS_MR_SHOP_NAME'),
+				'error' => $this->_mondialRelay->l('Please check your shop name configuration')),
+			'Expe_Ad3' => array(
+				'value' => Configuration::get('PS_SHOP_ADDR1'),
+				'error' => $this->_mondialRelay->l('Please check your address 1 configuration')),
+			'Expe_Ville' =>	array(
+				'value' => Configuration::get('PS_SHOP_CITY'),
+				'error' => $this->_mondialRelay->l('Please check your city configuration')),
+			'Expe_CP' => array(
+				'value' => Configuration::get('PS_SHOP_CODE'),
+				'error' => $this->_mondialRelay->l('Please check your zipcode configuration')),
+			'Expe_Pays' => array(
+				'value' => ((_PS_VERSION_ >= '1.4') ? 
+					Country::getIsoById(Configuration::get('PS_SHOP_COUNTRY_ID')) : 
+					substr(Configuration::get('PS_SHOP_COUNTRY'), 0, 2)),
+				'error' => $this->_mondialRelay->l('Please check your country configuration')),
+			'Expe_Tel1' => array(
+				'value' => str_replace(array('.', ' ', '-'), '', Configuration::get('PS_SHOP_PHONE')),
+				'error' => $this->_mondialRelay->l('Please check your Phone configuration')),
+			'Expe_Mail' => array(
+				'value' => Configuration::get('PS_SHOP_EMAIL'),
+				'error' => $this->_mondialRelay->l('Please check your mail configuration')));
+		
+		foreach($list as $name => $tab)
+		{
+			$tab['value'] = strtoupper($tab['value']);
+			if ($name == 'Expe_CP')
+			{
+				if (!MRTools::checkZipcodeByCountry($tab['value'], array(
+						'id_country' => Configuration::get('PS_COUNTRY_DEFAULT'))))
+					$errorList[$name] = $tab['error'];
+			}
+			else if (isset($this->_fields['list'][$name]['regexValidation']) && 
+					(!preg_match($this->_fields['list'][$name]['regexValidation'], $tab['value'], $matches)))
+				$errorList[$name] = $tab['error'];
+		}
+		return $errorList;
+	}
+	
 	/*
 	 * Get the values with associated fields name
 	 * @fields : array containing multiple values information
diff --git a/modules/mondialrelay/classes/MRGetRelayPoint.php b/modules/mondialrelay/classes/MRGetRelayPoint.php
index 795415b43..525f9215a 100755
--- a/modules/mondialrelay/classes/MRGetRelayPoint.php
+++ b/modules/mondialrelay/classes/MRGetRelayPoint.php
@@ -167,6 +167,41 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
 		return $params;
 	}
 	
+	/*
+	** Get detail information for each relay
+	*/
+	private function _getRelayPointDetails($relayPointList)
+	{
+		$relayPointNumList = array();
+		foreach($relayPointList as $num => $relayPoint)
+			$relayPointNumList[] = $relayPoint['Num'];
+			
+		$MRRelayDetail = new MRRelayDetail(array(
+			'relayPointNumList' => $relayPointNumList,
+			'id_address_delivery' => $this->_id_address_delivery));
+ 		$MRRelayDetail->init();
+ 		$MRRelayDetail->send();
+ 		return $MRRelayDetail->getResult();
+	}
+	
+	/*
+	** Generate a perman link to view relay detail on their website
+	*/
+	private function _addLinkHoursDetail(&$relayPointList)
+	{
+		$relayPointNumList = array();
+		foreach($relayPointList as $num => $relayPoint)
+			$relayPointNumList[] = $relayPoint['Num'];
+		$permaList = MRRelayDetail::getPermaLink($relayPointNumList, $this->_id_address_delivery);
+		foreach($relayPointList as $num => &$relayPoint)
+		{
+			$relayPoint['permaLinkDetail'] = '';
+			if (array_key_exists($relayPoint['Num'], $permaList))
+				$relayPoint['permaLinkDetail'] = $permaList[$relayPoint['Num']];
+		}
+		return $relayPointList;
+	}
+	
 	/*
 	 * Manage the return value of the webservice, handle the errors or build the
 	 * succeed message
@@ -206,6 +241,14 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
  				}
  			if (!count($result))
  				$errors[] = $this->_mondialRelay->l('MondialRelay can\'t find any relay point near your address. Maybe your address isn\'t properly filled ?');
+ 			else
+ 			{
+ 				$this->_addLinkHoursDetail($result);
+ 				
+ 				// Fetch detail info using webservice (not used anymore)
+ 				// $this->_generateLinkHoursDetail($result);
+ 				// $result = (count($relayDetail['success'])) ? $relayDetail['success'] : $result;
+ 			}
 			$success = $result;
 		}
 		$this->_resultList['error'] = $errors;
@@ -251,4 +294,4 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
 	{
 		return $this->_resultList;
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/mondialrelay/classes/MRManagement.php b/modules/mondialrelay/classes/MRManagement.php
index 7c44984a6..0083dc626 100755
--- a/modules/mondialrelay/classes/MRManagement.php
+++ b/modules/mondialrelay/classes/MRManagement.php
@@ -56,6 +56,9 @@ class MRManagement extends MondialRelay
 					FROM `' . _DB_PREFIX_ . 'mr_selected`
 					WHERE `id_cart` = '.(int)$this->_params['id_cart'];
 		
+		// Not exist and needed for database
+		unset($this->_params['relayPointInfo']['permaLinkDetail']);
+		
 		// Update if Exist else add a new entry	
 		if (Db::getInstance()->getRow($query))
 		{
diff --git a/modules/mondialrelay/classes/MRRelayDetail.php b/modules/mondialrelay/classes/MRRelayDetail.php
new file mode 100755
index 000000000..d7ca77b4e
--- /dev/null
+++ b/modules/mondialrelay/classes/MRRelayDetail.php
@@ -0,0 +1,274 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 8783 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+/*
+ * Interface
+ */
+require_once(dirname(__FILE__).'/IMondialRelayWSMethod.php');
+
+/*
+ * Allow to retrieve relay point details - 'WSI2_DetailPointRelais'
+ */
+class MRRelayDetail implements IMondialRelayWSMethod
+{
+	private $_fields = array(
+		'list' => array(
+			'Enseigne'			=> array(
+						'required'				=> true,
+						'value'						=> '',
+						'regexValidation' => '#^[0-9A-Z]{2}[0-9A-Z ]{6}$#'),
+			'Num'		=> array(
+						'required'				=> true,
+						'value'						=> '',
+						'regexValidation' => '#^[0-9]{6}$#'),
+			'Pays'				=> array(
+						'required'				=> true,
+						'value'						=> '',
+						'regexValidation' => '#^[A-Z]{2}$#'),
+			'Security'			=> array(
+						'required'				=> true,
+						'value'						=> '',
+						'regexValidation' => '#^[0-9A-Z]{32}$#')));
+	
+	private $_relayPointNumList = array(); 
+	private $_id_address_delivery = 0;
+	private $_webServiceKey = '';
+	private $_mondialRelay = NULL;
+	private $_markCode = '';
+	
+	private $_resultList = array(
+		'error' => array(),
+		'success' => array());
+	
+	private $_webserviceURL = 'http://www.mondialrelay.fr/webservice/Web_Services.asmx?WSDL';
+	
+	public function __construct($params)	
+	{
+		$this->_relayPointNumList = $params['relayPointNumList'];
+		$this->_id_address_delivery = (int)($params['id_address_delivery']);
+		$this->_webServiceKey = Configuration::get('MR_KEY_WEBSERVICE');
+		$this->_markCode = Configuration::get('MR_CODE_MARQUE');
+	}
+	
+	public function __destruct()
+	{
+		 unset($this->_mondialRelay);
+	}
+	
+	public function init()
+	{	
+		$this->_mondialRelay = new MondialRelay();
+		$address = new Address($this->_id_address_delivery);
+		
+		if (!$address)
+			throw new Exception($this->_mondialrelay->l('Customer address can\'t be found'));
+		
+		$this->_fields['list']['Enseigne']['value'] = Configuration::get('MR_ENSEIGNE_WEBSERVICE');
+		$this->_fields['list']['Pays']['value'] = Country::getIsoById($address->id_country);
+		
+		foreach ($this->_relayPointNumList as $num)
+		{
+			// Storage temporary
+			$base = $this->_fields;
+			$tmp = &$base['list'];
+			
+			$tmp['Num']['value'] = $num;
+			$this->_fieldsList[] = $base;
+		}
+		$this->_generateMD5SecurityKey();
+		unset($address);
+	}
+	
+	/*
+	 * Generate the MD5 key for each param list
+	 */
+	private function _generateMD5SecurityKey()
+	{
+		// RootCase is the array case where the main information are stored
+		// it's an array containing id_mr_selected and an array with the necessary fields
+		foreach($this->_fieldsList as &$rootCase)
+		{
+			$concatenationValue = '';
+			foreach($rootCase['list'] as $paramName => &$valueDetailed)
+				if ($paramName != 'Texte' && $paramName != 'Security')
+				{
+					// Mac server make an empty string instead of a cleaned string
+					// TODO : test on windows and linux server
+					$cleanedString = MRTools::replaceAccentedCharacters($valueDetailed['value']);
+					$valueDetailed['value'] = !empty($cleanedString) ? strtoupper($cleanedString) : strtoupper($valueDetailed['value']);
+					
+					// Call a pointer function if exist to do different test
+					if (isset($valueDetailed['methodValidation']) &&
+							method_exists('MRTools', $valueDetailed['methodValidation']) && 
+							isset($valueDetailed['params']) && 
+							MRTools::$valueDetailed['methodValidation']($valueDetailed['value'], $valueDetailed['params']))
+						$concatenationValue .= $valueDetailed['value'];
+					// Use simple Regex test given by MondialRelay
+					else if (isset($valueDetailed['regexValidation']) &&
+							preg_match($valueDetailed['regexValidation'], $valueDetailed['value'], $matches))
+						$concatenationValue .= $valueDetailed['value'];
+					// If the key is required, we set an error, else it's skipped 
+					else if ((!strlen($valueDetailed['value']) && $valueDetailed['required']) || strlen($valueDetailed['value']))
+					{
+						if (empty($valueDetailed['value']))
+							$error = $this->_mondialRelay->l('This key').' ['.$paramName.'] '.$this->_mondialRelay->l('is empty and need to be filled');
+						else
+							$error = 'This key ['.$paramName.'] hasn\'t a valid value format : '.$valueDetailed['value']; 
+						$this->_resultList['error'][$rootCase['list']['Num']['value']] = $error;
+					}
+				}
+			$concatenationValue .= $this->_webServiceKey;
+			$rootCase['list']['Security']['value'	] = strtoupper(md5($concatenationValue));
+		}
+	}
+
+	/*
+	 * Get the values with associated fields name
+	 * @fields : array containing multiple values information
+	 */
+	private function _getSimpleParamArray($fields)
+	{
+		$params = array();
+		
+		foreach($fields as $keyName => $valueDetailed)
+			$params[$keyName] = $valueDetailed['value'];
+		return $params;
+	}
+	
+	/*
+	 * Manage the return value of the webservice, handle the errors or build the
+	 * succeed message
+	 */
+	private function _parseResult($client, $result, $params)
+	{
+		$errors = array();
+
+		if ($client->fault)
+			$errors[$errorTotal++] = $this->_mondialRelay->l('It seems the request isn\'t valid:').
+				$result;
+		$result = $result['WSI2_DetailPointRelaisResult'];
+		if (($errorNumber = $result['STAT']) != 0)
+		{
+			$errors[] = $this->_mondialRelay->l('There is an error number : ').$errorNumber;
+			$errors[] = $this->_mondialRelay->l('Details : ').
+				$this->_mondialRelay->getErrorCodeDetail($errorNumber);
+		}
+		else
+		{
+			$HDayList = array(
+				'Horaires_Lundi' => $this->_mondialRelay->l('Monday'),
+				'Horaires_Mardi' => $this->_mondialRelay->l('Tuesday'),
+				'Horaires_Mercredi' => $this->_mondialRelay->l('Wednesday'),
+				'Horaires_Jeudi' => $this->_mondialRelay->l('Thursday'),
+				'Horaires_Vendredi' => $this->_mondialRelay->l('Friday'),
+				'Horaires_Samedi' => $this->_mondialRelay->l('Saturday'),
+				'Horaires_Dimanche' => $this->_mondialRelay->l('Sunday'));
+		
+			$orderedDate = array();
+			// Format hour properly
+			$priority = 0;
+			foreach($HDayList as $day => $tradDayName)
+			{
+				foreach($result[$day]['string'] as $num => &$value)
+					if ($value == '0000')
+						$value = '';
+					else
+						$value = implode('h', str_split($value, 2));
+				$orderedDate[$priority++] = array('name' => $tradDayName, 'list' => $result[$day]);
+				unset($result[$day]);
+			}
+			$result['orderedDate'] = $orderedDate;
+			$this->_resultList['success'][$result['Num']] = $result;
+		}	
+		$this->_resultList['error'][] = $errors;
+	}
+	
+	/*
+	* Send one or multiple request to the webservice
+	*/
+	public function send()
+	{
+		if ($client = new nusoap_client($this->_webserviceURL, true))
+		{
+			$client->soap_defencoding = 'UTF-8';
+			$client->decode_utf8 = false;
+			
+			foreach($this->_fieldsList as $rootCase)
+			{
+				$params = $this->_getSimpleParamArray($rootCase['list']);
+				$result = $client->call(
+					'WSI2_DetailPointRelais', 
+					$params, 
+					'http://www.mondialrelay.fr/webservice/', 
+					'http://www.mondialrelay.fr/webservice/WSI2_GetEtiquettes');
+				
+				$this->_parseResult($client, $result, $params);
+			}
+			unset($client);
+		}
+		else
+			throw new Exception($this->_mondialRelay->l('The Mondial Relay webservice isn\'t currently reliable'));
+	}
+	
+	/*
+	** Generate a list of perma link
+	*/
+	static public function getPermaLink($relayList, $id_address_delivery)
+	{
+		if (!($address = new Address($id_address_delivery)))
+			return array();
+		
+		$permaList = array();
+		$iso = strtoupper(Country::getIsoById($address->id_country));
+		$ens = strtoupper(Configuration::get('MR_ENSEIGNE_WEBSERVICE').Configuration::get('MR_CODE_MARQUE'));
+		$url = 'http://www.mondialrelay.com/public/permanent/details_relais.aspx?ens='.
+			Configuration::get('MR_ENSEIGNE_WEBSERVICE').Configuration::get('MR_CODE_MARQUE');
+		foreach($relayList as $num => $relayNum)
+		{
+			$crc = strtoupper(MD5('<'.$ens.'>'.$relayNum.$iso.'<'.Configuration::get('MR_KEY_WEBSERVICE').'>'));
+			$permaList[$relayNum] = $url.'&num='.$relayNum.'&pays='.$iso.'&crc='.$crc;
+		}
+		unset($address);
+		return $permaList;
+	}
+	
+	/*
+	 * Get the values with associated fields name
+	 */
+	public function getFieldsList()
+	{
+		return $this->_fieldsList['list'];
+	}
+	
+	/*
+	 * Get the result of one or multiple send request
+	 */
+	public function getResult()
+	{
+		return $this->_resultList;
+	}
+}
\ No newline at end of file
diff --git a/modules/mondialrelay/config.xml b/modules/mondialrelay/config.xml
index b89097dcf..ceed20645 100755
--- a/modules/mondialrelay/config.xml
+++ b/modules/mondialrelay/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>mondialrelay</name>
 	<displayName><![CDATA[Mondial Relay]]></displayName>
-	<version><![CDATA[1.7.5]]></version>
+	<version><![CDATA[1.7.6]]></version>
 	<description><![CDATA[Deliver in Relay points]]></description>
 	<author><![CDATA[]]></author>
 	<tab><![CDATA[shipping_logistics]]></tab>
diff --git a/modules/mondialrelay/fr.php b/modules/mondialrelay/fr.php
index 94202ad09..3efd59f50 100755
--- a/modules/mondialrelay/fr.php
+++ b/modules/mondialrelay/fr.php
@@ -2,18 +2,18 @@
 
 global $_MODULE;
 $_MODULE = array();
-$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_a25569b97604bddcfba04d7eb9950eeb'] = 'Pour générer des étiquettes, vous devez inscrire une adresse correcte pour votre boutique sur ';
-$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_3d2da0d2e731d59465a92f13216cf82d'] = 'La page de contact';
-$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_de21dc13e1ea638777fbfad49f88b332'] = 'Toutes les commandes qui auront un status';
+$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_d1908b9b04e81c4b6112e38b608c49af'] = 'Merci de bien vouloir corriger les erreurs suivantes dans';
+$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_ccce63109db30895153094de05c60fa5'] = 'la page de contact';
+$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_de21dc13e1ea638777fbfad49f88b332'] = 'Toutes les commandes qui auront un statut';
+$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_a0bf3c9ac2d785f053d883b8746e91ba'] = 'seront disponibles pour la création d\'ètiquette';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_2345e28c9b93f368968be4781ed70f5c'] = 'Changer la configuration';
-$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_37c85a61df6352af7285c307022c4413'] = 'Aucune commande n\'existe avec ce status';
+$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_37c85a61df6352af7285c307022c4413'] = 'Aucune commande n\'existe avec ce statut';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_d79cf3f429596f77db95c65074663a54'] = 'Identifiant de la commande';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_ce26601dac0dea138b7295f02b7620a7'] = 'Client';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_0eede552438475bdfe820c13f24c9399'] = 'Prix total';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_f4e8b53a114e5a17d051ab84d326cae5'] = 'Total frais d\'expédition';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_44749712dbec183e983dcd78a7736c41'] = 'Date';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_3715c824cbc0f966c61a72254f248a2e'] = 'Mettez un poids (grammes)';
-$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_5635c2608fff4c95a564aea8c6118b8c'] = 'Inverser la sélection';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_6ccc0fdff9995e1a0fce00c99e5b6085'] = 'Numéro MR';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_f9c50cba4de9032d7a6797a2458f8ed9'] = 'Pays MR';
 $_MODULE['<{mondialrelay}prestashop>adminmondialrelay_428c091372d840900cf8536519fa0056'] = 'Numéro d\'expedition';
@@ -48,7 +48,7 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_cb5e100e5a9a3e7f6d1fd9751221528
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_350c1cc4343826a89f08a33bb49c6d98'] = 'Configuration du Module Mondial Relay';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_d21a9f93917604d5490ad529a7cf1ff9'] = 'Pour créer un transporteur Mondial Relay';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_c6a2e6af5fff47adb3afd780b97d9b4b'] = 'Remplissez et sauvegarder vos paramètres Mondial Relay';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_94fbe32464fcfa902feed9f256439833'] = 'Créer un transporteur utilisant le formulaire \"ajouter un transporteur\" ci-dessous';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_94fbe32464fcfa902feed9f256439833'] = 'Créez un transporteur via le formulaire ‘’ajouter un transporteur’’ ci-dessous';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_b962d8fb95f5a439f50502152f3bad71'] = 'Definissez un prix pour votre transporteur sur';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_faf1247ae6846a9955a466d4f301bbe4'] = 'La page Transporteurs';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_10d78806b84b97ebc774e9f6277af6ac'] = 'Pour générer vos étiquettes, vous devez avoir enregistré une adresse valide de votre boutique sur votre';
@@ -77,9 +77,9 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_0309a6c666a7a803fdb9db95de71cf0
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_6c1674d14bf5f95742f572cddb0641a7'] = 'Belgique';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_06630c890abadde9228ea818ce52b621'] = 'Luxembourg';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_907eba32d950bfab68227fd7ea22999b'] = 'Espagne';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_0c24ec05a02c710cedd400e3680d8b81'] = 'Liste des tranporteurs';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_0c24ec05a02c710cedd400e3680d8b81'] = 'Liste des transporteurs';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_14039af96b01e718a9c9d9c1259b6472'] = 'Aucun transporteur créé';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_8596361cec00f8d2438d264827eee737'] = 'Modification de la configuration';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_8596361cec00f8d2438d264827eee737'] = 'Modifier les paramètres de ce transporteur';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_9ffc3ccc968a96d902af963c6d7b4e97'] = 'Paramètres avancés';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_1d1d57f5840e1da871622295ba206b30'] = 'Cliquez pour afficher / cacher les options';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_fcf5b2122da1d5a5f5c7253b96a3f9d9'] = 'URL de la tache CRON à lancer pour la mise à jour des statuts de commandes';
@@ -110,10 +110,12 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_bba366864d25056c941b72f18ef79e7
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_e0626222614bdee31951d84c64e5e9ff'] = 'Choisir';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_91b442d385b54e1418d81adc34871053'] = 'Sélectionné';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_ef2a1f426c2c289ed5986c7636a5d696'] = 'Merci de choisir un point relay';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_80a0c205cd57b22fca7f174253870300'] = 'Heures d\'ouvertures';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_2b56b60f878922093facd42284848a0c'] = 'Plus de détails';
 $_MODULE['<{mondialrelay}prestashop>orderdetail_81b7b4587a2a3ea7a0d6bb1df3fbba54'] = 'Livraison à';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_a1c3470a944b9625cfb924fd15c8bdbf'] = 'Veuillez choisir au moins une commande';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_dc41aac14af17f1d19fca5e3b9439e74'] = 'Cette clé';
-$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_306b346c19017609403424203ea3d720'] = 'est vide et doit être rensignée';
+$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_306b346c19017609403424203ea3d720'] = 'est vide et doit être renseignée';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_e6940b76f045c8bc0aaaa5b2476cdaf7'] = 'Il semble que la requête ne soit pas valide';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_c9b4de92f371ae545ad6f051c07d58ca'] = 'Erreur numéro :';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_ea5f761be4e4888eabf4e1501d7817d1'] = 'Détails :';
@@ -121,6 +123,14 @@ $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_eabb11bf9623f08409a0a4c9d035
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_b92c3d3319314513c547675924ceecd1'] = 'URL du Ticket :';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_66b793b6b4125e300717e8cf7449f533'] = 'Url de Tracking :';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_2653c23b8c0daac59571e4be5e8fa7d0'] = 'Le webservice Mondial Relay est actuellement innaccessible.';
+$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_26b6b6eaec970108c5e84286159fbf48'] = 'Merci de vérifier la configuration de votre langue';
+$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_557595c2e17c9948a9448eb763ac1a88'] = 'Merci de vérifier la configuration de votre nom de boutique';
+$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_017ca6b770ad53669a4eec82894dfcd3'] = 'Merci de vérifier la configuration de votre adresse 1';
+$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_3f79e1fc66b4f9cca7bd68cab176020d'] = 'Merci de vérifier la configuration de votre ville';
+$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_404665d9b65239985d59b30b3dcb26b5'] = 'Merci de vérifier la configuration de votre code postal';
+$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_0b8a30478b9572b86718989d483fd88d'] = 'Merci de vérifier la configuration de votre pays';
+$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_7ddf2d94bf037b7d1088c0600ea589c3'] = 'Merci de vérifier la configuration de votre téléphone';
+$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_9c7ce7be9a2c593b24d448edb4f804e0'] = 'Merci de vérifier la configuration de votre email';
 $_MODULE['<{mondialrelay}prestashop>mrgetrelaypoint_14288d48d107056c1acf8aaae1bf282b'] = 'L\'adresse du client ne peut etre trouvé';
 $_MODULE['<{mondialrelay}prestashop>mrgetrelaypoint_dc41aac14af17f1d19fca5e3b9439e74'] = 'Cette clé';
 $_MODULE['<{mondialrelay}prestashop>mrgetrelaypoint_135a7b9a62531e066a95093d8951b344'] = 'n\'a pas un format valide';
@@ -142,3 +152,17 @@ $_MODULE['<{mondialrelay}prestashop>mrmanagement_0b7f47fce1d82d53244771c64b1535c
 $_MODULE['<{mondialrelay}prestashop>mrmanagement_ea4788705e6873b424c65e91c2846b19'] = 'Annuler';
 $_MODULE['<{mondialrelay}prestashop>mrmanagement_a42bb0eaa485682166770a54469385f6'] = 'Certaines étiquettes ne peuvent pas être supprimées : veuillez réessayer un peu plus tard.';
 $_MODULE['<{mondialrelay}prestashop>mrmanagement_11744bfebb33e52be37a66a530b7045d'] = 'Veuillez choisir au moins un élèment de l\'historique';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_14288d48d107056c1acf8aaae1bf282b'] = 'L\'adresse du client ne peut être trouvé';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_dc41aac14af17f1d19fca5e3b9439e74'] = 'Cette clé';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_306b346c19017609403424203ea3d720'] = 'est vide et doit être renseignée';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_e6940b76f045c8bc0aaaa5b2476cdaf7'] = 'Il semble que la requête ne soit pas valide';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_c9b4de92f371ae545ad6f051c07d58ca'] = 'Erreur numéro :';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_ea5f761be4e4888eabf4e1501d7817d1'] = 'Détails :';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_6f8522e0610541f1ef215a22ffa66ff6'] = 'Lundi';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_5792315f09a5d54fb7e3d066672b507f'] = 'Mardi';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_796c163589f295373e171842f37265d5'] = 'Mercredi';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_78ae6f0cd191d25147e252dc54768238'] = 'Jeudi';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_c33b138a163847cdb6caeeb7c9a126b4'] = 'Vendredi';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_8b7051187b9191cdcdae6ed5a10e5adc'] = 'Samedi';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_9d1a0949c39e66a0cd65240bc0ac9177'] = 'Dimanche';
+$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_2653c23b8c0daac59571e4be5e8fa7d0'] = 'Le webservice Mondial Relay est actuellement innaccessible.';
diff --git a/modules/mondialrelay/mondialrelay.js b/modules/mondialrelay/mondialrelay.js
index e65e9ed23..9944b587d 100755
--- a/modules/mondialrelay/mondialrelay.js
+++ b/modules/mondialrelay/mondialrelay.js
@@ -1,6 +1,7 @@
 var toggle_status_order_list = false;
 var toggle_history_order_list = false;
 var relay_point_max = 10;
+var last_gmap_info_clicked = '';
 
 // /!\ All the following list data could be store into the same variable
 // But for a better reading of the code, there are separated
@@ -665,7 +666,7 @@ function PS_MRGmapResizeEvent($map)
 ** Move the view of the gmap to a marker 
 ** liable to the relay point 
 */
-function PS_MRGmapPlaceViewOnMarker($map, marker)
+function PS_MRGmapPlaceViewOnMarker($map, marker, relayNum)
 {
 	$map.gmap3(
 	{
@@ -673,6 +674,7 @@ function PS_MRGmapPlaceViewOnMarker($map, marker)
 			args:[marker.position],
 			callback: function()
 			{
+        PS_MRDisplayClickedGmapWindow(marker, relayNum, $map);
 				(function(m)
 				{
       		setTimeout(function() 
@@ -713,7 +715,7 @@ function PS_MRDisplayGmap(contentBlockid, $map)
 		$('#PS_MRGmap_' + id_carrier).slideDown('fast', function()
 		{
 			PS_MRGmapResizeEvent($map);
-			PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber]);
+			PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber], relayPointNumber);
 		});
 	}
 	else
@@ -727,13 +729,60 @@ function PS_MRDisplayGmap(contentBlockid, $map)
 				$('#' + contentBlockid).after($(this));	
 				$('#PS_MRGmap_' + id_carrier).slideDown('fast', function()
 				{
-					PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber]);
+					PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber], relayPointNumber);
 				});
 			}
 		});
 	}
 }
 
+/*
+** Generate an html block to display the opening hours details
+*/
+function PS_MRGetTimeRelayDetail(relayInfo)
+{
+	onClick = 'onClick="PS_MROpenPopupDetail(\'' + relayInfo.permaLinkDetail + '\')"';
+	
+	var html = ' \
+		<div class="PS_MRGmapBulbe"> \
+			<img src="' + _PS_MR_MODULE_DIR_ + 'logo_hd.png" width="10%" style="float:left;" /> \
+			<p><b>' + relayInfo.LgAdr1 + '</b><br /> ' +  relayInfo.LgAdr3
+			+ ' - ' + relayInfo.CP + ' - ' + relayInfo.Ville
+			+ ' ' + relayInfo.Pays + '</p> \
+			<a href="javascript:void(0)" ' + onClick + '>' + PS_MRTranslationList['moreDetails'] + '</a> \
+		</div>';
+	return html;
+}
+
+/*
+** Call a MondialRelay page into a popup
+*/
+function PS_MROpenPopupDetail(url)
+{
+	window.open(url, 'MondialRelay', 
+		'height=200, width=400, top=100, left=100, toolbar=no, menubar=yes, \
+		location=no, resizable=yes, scrollbars=no, status=no');
+}
+
+/*
+** Display the gmap windows selected by the user
+*/
+function PS_MRDisplayClickedGmapWindow(marker, relayNum, mapObject)
+{	
+	if (last_gmap_info_clicked.length)
+  {
+   	// Close the last opening window in gmap
+	  if ((lastWin = mapObject.gmap3({action:'get', name:'infowindow', tag:last_gmap_info_clicked})))
+	  	lastWin.close();
+	}
+
+	// Open the selected detail window
+ 	map = mapObject.gmap3('get');
+  if ((currentWindow = mapObject.gmap3({action:'get', name:'infowindow', tag:relayNum})))
+		currentWindow.open(map, marker);
+  last_gmap_info_clicked = relayNum;
+}
+
 /*
 ** Add a new Marker to a Gmap for a carrier using the 
 ** relay point information 
@@ -743,20 +792,30 @@ function PS_MRAddGMapMarker(id_carrier, relayPointNumber, contentBlockid)
 	// Check if the gmap has been properly created
 	if (GmapList[id_carrier] == undefined)
 		return ;
-	relayInfo = relayPointDataContainers[relayPointNumber];
+	var relayInfo = relayPointDataContainers[relayPointNumber];
+	var detailContentHtml = PS_MRGetTimeRelayDetail(relayInfo);
 	
 	// Add Marker to the map
-	fullFormatedAddress = relayInfo.LgAdr1 + ' ' + relayInfo.LgAdr3 + ' ' + 
+	var fullFormatedAddress = relayInfo.LgAdr1 + ' ' + relayInfo.LgAdr3 + ' ' + 
 		relayInfo.CP + ' ' + relayInfo.Ville + ' ' + relayInfo.Pays;
 	GmapList[id_carrier].gmap3(
 	{ 
 		action: 'addMarker',
 		address: fullFormatedAddress,
+		tag:relayInfo.Num,
 		map:
 		{
     	center: true,
     	zoom: 14
   	},
+  	marker: {
+  		events:
+      {
+       	click:function(marker, event, data)
+       	{
+       		PS_MRDisplayClickedGmapWindow(marker, relayInfo.Num, $(this));
+        }
+      },
 		callback: function(marker)
 		{
 			if (marker)
@@ -776,6 +835,18 @@ function PS_MRAddGMapMarker(id_carrier, relayPointNumber, contentBlockid)
 				return true;
 			}
 		}
+		},
+		infowindow:
+		{
+			options: {content:detailContentHtml},
+			tag:relayInfo.Num,
+			callback: function() {
+				// To avoid any bug, foreach anytime the elements and try to close them
+				var windowList = $(this).gmap3({action:'get', name:'infowindow', all:true});
+				for (var x in windowList)
+					windowList[x].close();
+			}
+		}	
 	});
 	return false;
 }	
diff --git a/modules/mondialrelay/mondialrelay.php b/modules/mondialrelay/mondialrelay.php
index 7a62601b2..8752dd5f4 100755
--- a/modules/mondialrelay/mondialrelay.php
+++ b/modules/mondialrelay/mondialrelay.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -34,9 +34,9 @@ require_once(_PS_MODULE_DIR_.'mondialrelay/classes/MRTools.php');
 class MondialRelay extends Module
 {
 	const INSTALL_SQL_FILE = 'mrInstall.sql';
-	
+
 	private $_postErrors;
-	
+
 	public static $modulePath = '';
 	public static $moduleURL = '';
 	static public $MRFrontToken = '';
@@ -59,20 +59,20 @@ class MondialRelay extends Module
 	{
 		$this->name		= 'mondialrelay';
 		$this->tab		= 'shipping_logistics';
-		$this->version	= '1.7.5.1';
+		$this->version	= '1.7.6';
 
 		parent::__construct();
 
 		$this->page = basename(__FILE__, '.php');
 		$this->displayName = $this->l('Mondial Relay');
 		$this->description = $this->l('Deliver in Relay points');
-		
+
 		self::initModuleAccess();
-		
+
 		// Call everytime to prevent the changement of the module by a recent one
 		$this->_updateProcess();
 	}
-	
+
 	public function install()
 	{
 		$name = "shipping";
@@ -82,19 +82,19 @@ class MondialRelay extends Module
 			return false;
 
 		Db::getInstance()->executeS(
-			'SELECT `name` 
-			FROM `' . _DB_PREFIX_ . 'hook` 
-			WHERE `name` = \''.$name.'\' 
+			'SELECT `name`
+			FROM `' . _DB_PREFIX_ . 'hook`
+			WHERE `name` = \''.$name.'\'
 			AND `title` = \''.$title.'\'');
 
 		if (!Db::getInstance()->NumRows())
-			Db::getInstance()->execute('INSERT INTO ' . _DB_PREFIX_ . 'hook 
-			(name, title, description, position) 
+			Db::getInstance()->execute('INSERT INTO ' . _DB_PREFIX_ . 'hook
+			(name, title, description, position)
 			VALUES(\''.$name.'\', \''.$title.'\', NULL, 0)');
 
 		if (!$this->registerHookByVersion())
 			return false;
-		
+
 		if ((!file_exists(self::$modulePath.self::INSTALL_SQL_FILE)) ||
 			(!$sql = file_get_contents(self::$modulePath.self::INSTALL_SQL_FILE)))
 			return false;
@@ -106,7 +106,7 @@ class MondialRelay extends Module
 				Db::getInstance()->execute(trim($query));
 
 		$result = Db::getInstance()->getRow('
-			SELECT id_tab  
+			SELECT id_tab
 			FROM `' . _DB_PREFIX_ . 'tab`
 			WHERE class_name="AdminMondialRelay"');
 
@@ -114,36 +114,36 @@ class MondialRelay extends Module
 		{
 			/*tab install */
 			$result = Db::getInstance()->getRow('
-				SELECT position 
-				FROM `' . _DB_PREFIX_ . 'tab` 
+				SELECT position
+				FROM `' . _DB_PREFIX_ . 'tab`
 				WHERE `id_parent` = 3
 				ORDER BY `'. _DB_PREFIX_ .'tab`.`position` DESC');
 
 			$pos = (isset($result['position'])) ? $result['position'] + 1 : 0;
 
 			Db::getInstance()->execute('
-				INSERT INTO ' . _DB_PREFIX_ . 'tab 
-				(id_parent, class_name, position, module) 
-				VALUES(3, "AdminMondialRelay",  "'.(int)($pos).'", "mondialrelay")');	 	
+				INSERT INTO ' . _DB_PREFIX_ . 'tab
+				(id_parent, class_name, position, module)
+				VALUES(3, "AdminMondialRelay",  "'.(int)($pos).'", "mondialrelay")');
+
+			$id_tab = Db::getInstance()->Insert_ID();
 
-			$id_tab = Db::getInstance()->Insert_ID();		
-			
 			$languages = Language::getLanguages();
 			foreach ($languages as $language)
 				Db::getInstance()->execute('
-				INSERT INTO ' . _DB_PREFIX_ . 'tab_lang 
-				(id_lang, id_tab, name) 
+				INSERT INTO ' . _DB_PREFIX_ . 'tab_lang
+				(id_lang, id_tab, name)
 				VALUES("'.(int)($language['id_lang']).'", "'.(int)($id_tab).'", "Mondial Relay")');
 
 			$profiles = Profile::getProfiles(Configuration::get('PS_LANG_DEFAULT'));
 			foreach ($profiles as $profile)
 				Db::getInstance()->execute('
-				INSERT INTO ' . _DB_PREFIX_ . 'access 
+				INSERT INTO ' . _DB_PREFIX_ . 'access
 				(`id_profile`,`id_tab`,`view`,`add`,`edit`,`delete`)
 				VALUES('.$profile['id_profile'].', '.(int)($id_tab).', 1, 1, 1, 1)');
 
 			@copy(_PS_MODULE_DIR_.'mondialrelay/AdminMondialRelay.gif', _PS_IMG_DIR_.'/AdminMondialRelay.gif');
-		}	
+		}
 
 		// If module isn't installed, set default value
 		if (!Configuration::get('MONDIAL_RELAY'))
@@ -159,7 +159,7 @@ class MondialRelay extends Module
 		Configuration::updateValue('MR_WEIGHT_COEF', '');
 		Configuration::updateValue('PS_MR_SHOP_NAME', Configuration::get('PS_SHOP_NAME'));
 		}
-		else 
+		else
 		{
 			// Reactive transport if database wasn't remove at the last uninstall
 			Db::getInstance()->execute('
@@ -168,16 +168,16 @@ class MondialRelay extends Module
 					WHERE c.id_carrier = m.id_carrier');
 			if (Configuration::get('MONDIAL_RELAY') < $this->version)
 				;// TODO : ADD upgrade process depending of the last and new version
-		}		 
+		}
 		return true;
 	}
-	
+
 	/*
-	** Return the token depend of the type 
+	** Return the token depend of the type
 	*/
 	static public function getToken($type = 'front')
 	{
-		return ($type == 'front') ? self::$MRFrontToken : (($type == 'back') ? 
+		return ($type == 'front') ? self::$MRFrontToken : (($type == 'back') ?
 			self::$MRBackToken : NULL);
 	}
 
@@ -186,14 +186,14 @@ class MondialRelay extends Module
 	*/
 	private function registerHookByVersion()
 	{
-		if (_PS_VERSION_ >= '1.3' &&  
+		if (_PS_VERSION_ >= '1.3' &&
 				(!$this->registerHook('shipping') ||
 				!$this->registerHook('extraCarrier') ||
 				!$this->registerHook('updateCarrier') ||
 				!$this->registerHook('newOrder') ||
 				!$this->registerHook('BackOfficeHeader')))
 			return false;
-			
+
 		if (_PS_VERSION_ >= '1.4' &&
 				(!$this->registerHook('processCarrier') ||
 				!$this->registerHook('orderDetail') ||
@@ -201,49 +201,49 @@ class MondialRelay extends Module
 			return false;
 		return true;
 	}
-	
+
 	public function uninstallCommonData()
 	{
 		// Tab uninstall
 		$result = Db::getInstance()->getRow('
-			SELECT id_tab  
+			SELECT id_tab
 			FROM `' . _DB_PREFIX_ . 'tab`
 			WHERE class_name="AdminMondialRelay"');
-		
+
 		if ($result)
 		{
 			$id_tab = $result['id_tab'];
 			if (isset($id_tab) && !empty($id_tab))
-			{	
+			{
 				Db::getInstance()->execute('DELETE FROM ' . _DB_PREFIX_ . 'tab WHERE id_tab = '.(int)($id_tab));
 				Db::getInstance()->execute('DELETE FROM ' . _DB_PREFIX_ . 'tab_lang WHERE id_tab = '.(int)($id_tab));
 				Db::getInstance()->execute('DELETE FROM ' . _DB_PREFIX_ . 'access WHERE id_tab = '.(int)($id_tab));
 			}
 		}
 
-		if (_PS_VERSION_ >= '1.4' && 
+		if (_PS_VERSION_ >= '1.4' &&
 				!Db::getInstance()->execute('
-					UPDATE  '._DB_PREFIX_ .'carrier  
-					SET `active` = 0, `deleted` = 1 
+					UPDATE  '._DB_PREFIX_ .'carrier
+					SET `active` = 0, `deleted` = 1
 					WHERE `external_module_name` = "mondialrelay"'))
 			return false;
 		else if (!Db::getInstance()->execute('
-					UPDATE  '._DB_PREFIX_ .'carrier  
-					SET `active` = 0, `deleted` = 1 
+					UPDATE  '._DB_PREFIX_ .'carrier
+					SET `active` = 0, `deleted` = 1
 					WHERE `name` = "mondialrelay"'))
 			return false;
 		return true;
 	}
-	
+
 	public function uninstall()
 	{
 		if (!parent::uninstall())
 			return false;
-		
-		// Uninstall data that doesn't need to be keep	
+
+		// Uninstall data that doesn't need to be keep
 		if (!$this->uninstallCommonData())
 			return false;
-			
+
 		if (Tools::getValue('keepDatabase'))
 		{
 			// Retro Compatibility for older Version than 1.7
@@ -255,7 +255,7 @@ class MondialRelay extends Module
 			}
 			return true;
 		}
-		
+
 		// MondialRelay Configuration
 		if (!Configuration::deleteByName('MONDIAL_RELAY') ||
 				!Configuration::deleteByName('MONDIAL_RELAY_INSTALL_UPDATE') ||
@@ -268,22 +268,22 @@ class MondialRelay extends Module
 				!Configuration::deleteByName('MR_WEIGHT_COEF') ||
 				!Configuration::deleteByName('PS_MR_SHOP_NAME'))
 			return false;
-			
+
 		// Drop databases
 		if (!Db::getInstance()->execute('
-					DROP TABLE 
-					'._DB_PREFIX_ .'mr_historique, 
-					'._DB_PREFIX_ .'mr_method, 
+					DROP TABLE
+					'._DB_PREFIX_ .'mr_historique,
+					'._DB_PREFIX_ .'mr_method,
 					'._DB_PREFIX_ .'mr_selected'))
 			return false;
 		else if (!Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'carrier SET `active` = 0, `deleted` = 1 WHERE `name` = "mondialrelay"'))
-			return false; 
-			
+			return false;
+
 		return true;
 	}
-	
+
 	/*
-	** UpdateProcess if merchant update the module without a 
+	** UpdateProcess if merchant update the module without a
 	** normal installation
 	*/
 	private function _updateProcess()
@@ -298,7 +298,7 @@ class MondialRelay extends Module
 			if ($installedVersion < '1.4.2')
 		$this->_update_v1_4_2();
 	}
-	
+
 		// Process update done just try to update the new configuration value
 		if (Configuration::get('MONDIAL_RELAY_1_4'))
 		{
@@ -306,28 +306,28 @@ class MondialRelay extends Module
 			Configuration::deleteByName('MONDIAL_RELAY_1_4');
 		}
 	}
-	
+
 	/*
-	** Use if the mechant was using Prestashop 1.3 and 
+	** Use if the mechant was using Prestashop 1.3 and
 	** now use 1.4 or more recent
 	*/
 	private function _update_v1_4()
 	{
 			Db::getInstance()->execute('
-				UPDATE `'._DB_PREFIX_.'carrier` 
-				SET 
-					`shipping_external` = 0, 
-					`need_range` = 1, 
-					`external_module_name` = 
-					"mondialrelay", 
-					`shipping_method` = 1 
-			WHERE `id_carrier` 
-			IN (SELECT `id_mr_method` 
+				UPDATE `'._DB_PREFIX_.'carrier`
+				SET
+					`shipping_external` = 0,
+					`need_range` = 1,
+					`external_module_name` =
+					"mondialrelay",
+					`shipping_method` = 1
+			WHERE `id_carrier`
+			IN (SELECT `id_mr_method`
 					FROM `'._DB_PREFIX_.'mr_method`)');
 		}
-	
+
 	/*
-	** Add new Hook for the last recent version >= 1.4.2 
+	** Add new Hook for the last recent version >= 1.4.2
 	*/
 	private function _update_v1_4_2()
 	{
@@ -336,23 +336,23 @@ class MondialRelay extends Module
 		if (!$this->isRegisteredInHook('BackOfficeHeader'))
 			$this->registerHook('BackOfficeHeader');
 	}
-	
+
 	/*
 	** Get the content to ask for a backup of the database
-	*/ 
+	*/
 	private function askForBackup($href)
 	{
 		return 'targetButton = \''.$href.'\';
 			PS_MRGetUninstallDetail();';
 	}
-	
+
 	/*
 	** OnClick for input fields under the module list fields action
 	*/
 	public function onclickOption($type, $href = false)
 	{
 		$content = '';
-		
+
 		switch($type)
 		{
 			case 'desactive':
@@ -368,7 +368,7 @@ class MondialRelay extends Module
 		}
 		return $content;
 	}
-	
+
 	/*
 	** Init the access directory module for URL and file system
 	** Allow a compatibility for Presta < 1.4
@@ -378,18 +378,18 @@ class MondialRelay extends Module
 		self::$modulePath =	_PS_MODULE_DIR_. 'mondialrelay/';
 		self::$MRFrontToken = sha1('mr'._COOKIE_KEY_.'Front');
 		self::$MRBackToken = sha1('mr'._COOKIE_KEY_.'Back');
-	
-		$protocol = (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) 
+
+		$protocol = (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS'])
 			&& strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://';
-		
+
 		$endURL = __PS_BASE_URI__.'/modules/mondialrelay/';
-	
+
 		if (method_exists('Tools', 'getShopDomainSsl'))
 			self::$moduleURL = $protocol.Tools::getShopDomainSsl().$endURL;
 		else
-			self::$moduleURL = $protocol.$_SERVER['HTTP_HOST'].$endURL;			
+			self::$moduleURL = $protocol.$_SERVER['HTTP_HOST'].$endURL;
 	}
-	
+
 	/*
 	** Override a jQuery version included by another one us.
 	** Allow a compatibility for Presta < 1.4
@@ -399,17 +399,17 @@ class MondialRelay extends Module
 		if ($overloadCurrent)
 		return '
 			<script type="text/javascript">
-					current = jQuery.noConflict(true); 
+					current = jQuery.noConflict(true);
 			</script>
 			<script type="text/javascript" src="'.self::$moduleURL.'/jquery-1.4.4.min.js"></script>';
 
 		return '
 			<script type="text/javascript" src="'.self::$moduleURL.'/jquery-1.4.4.min.js"></script>
 			<script type="text/javascript">
-				MRjQuery = jQuery.noConflict(true); 
+				MRjQuery = jQuery.noConflict(true);
 			</script>';
 	}
-	
+
 	public function hookNewOrder($params)
 	{
 		DB::getInstance()->Execute('
@@ -417,12 +417,12 @@ class MondialRelay extends Module
 			SET `id_order` = '.$params['order']->id.'
 			WHERE `id_cart` = '.$params['cart']->id);
 	}
-	
+
 	public function hookBackOfficeHeader()
 	{
 		$cssFilePath = $this->_path.'style.css';
 		$jsFilePath= $this->_path.'mondialrelay.js';
-		
+
 		return '
 			<link type="text/css" rel="stylesheet" href="'.$cssFilePath.'" />
 			<script type="text/javascript">
@@ -432,7 +432,7 @@ class MondialRelay extends Module
 			<script type="text/javascript" src="'.$jsFilePath.'"></script>'.
 			self::getJqueryCompatibility(true);
 	}
-	
+
 	private function _postValidation()
 	{
 		if (Tools::isSubmit('submitMR'))
@@ -484,11 +484,11 @@ class MondialRelay extends Module
 		foreach($_POST AS $key => $value)
 		{
 				$setArray[] = $value;
-				$keyArray[] = pSQL($key);						
+				$keyArray[] = pSQL($key);
 		}
 		array_pop($setArray);
 		array_pop($keyArray);
-	
+
 		if (isset($_POST['submitMR']) AND $_POST['submitMR'])
 			self::mrUpdate('settings', $setArray, $keyArray);
 		else if (isset($_POST['submitShipping']) AND $_POST['submitShipping'])
@@ -509,7 +509,7 @@ class MondialRelay extends Module
 	{
 		$carrier = $params['carrier'];
 		$order = $params['order'];
-	
+
 		if ($carrier->is_module AND $order->shipping_number)
 	 	{
 			$module = $carrier->external_module_name;
@@ -520,7 +520,7 @@ class MondialRelay extends Module
 		else if ($carrier->url AND $order->shipping_number)
 			$this->context->smarty->assign('followup', str_replace('@', $order->shipping_number, $carrier->url));
 	}
-	
+
 	public function hookOrderDetailDisplayed($params)
 	{
 		$res = Db::getInstance()->getRow('
@@ -532,68 +532,77 @@ class MondialRelay extends Module
 		$this->context->smarty->assign('mr_addr', $res['MR_Selected_LgAdr1'].($res['MR_Selected_LgAdr1'] ? ' - ' : '').$res['MR_Selected_LgAdr2'].($res['MR_Selected_LgAdr2'] ? ' - ' : '').$res['MR_Selected_LgAdr3'].($res['MR_Selected_LgAdr3'] ? ' - ' : '').$res['MR_Selected_LgAdr4'].($res['MR_Selected_LgAdr4'] ? ' - ' : '').$res['MR_Selected_CP'].' '.$res['MR_Selected_Ville'].' - '.$res['MR_Selected_Pays']);
 		return $this->display(__FILE__, 'orderDetail.tpl');
 	}
-	
+
 	/*
 	** No need anymore
 	*/
 	public function hookProcessCarrier($params)
 	{
 	}
-	
+
 	public function hookupdateCarrier($params)
 	{
+		// TODO : History shipping
+		/*if ((int)($params['id_carrier']) != (int)($params['carrier']->id))
+    {
+      $serviceSelected = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'mr_method` WHERE `id_carrier` = '.(int)$params['id_carrier']);
+      $update = array('id_carrier' => (int)($params['carrier']->id), 'id_carrier_history' => pSQL($serviceSelected['id_carrier_history'].'|'.(int)($params['carrier']->id)));
+      Db::getInstance()->autoExecute(_DB_PREFIX_.'mr_method', $update, 'UPDATE', '`id_carrier` = '.(int)$params['id_carrier']);
+    }*/
+
+		// TODO : Delete for shipping history
 		$new_carrier = $params['carrier'];
 		// Depends of the Prestashop version, the matches key isn't the same
 		if ((_PS_VERSION_ >= '1.4' && $new_carrier->external_module_name == 'mondialrelay') ||
 				$new_carrier->name = 'mondialrelay')
 		{
 				$mr_data = Db::getInstance()->getRow('
-					SELECT * 
-					FROM `'._DB_PREFIX_.'mr_method` 
+					SELECT *
+					FROM `'._DB_PREFIX_.'mr_method`
 					WHERE `id_carrier` = '.(int)($params['id_carrier']));
-				
+
 				Db::getInstance()->execute('
-					INSERT INTO `'._DB_PREFIX_.'mr_method` 
+					INSERT INTO `'._DB_PREFIX_.'mr_method`
 					(mr_Name, mr_Pays_list, mr_ModeCol, mr_ModeLiv, mr_ModeAss, id_carrier)
 					VALUES (
-						"'.pSQL($mr_data['mr_Name']).'", 
-						"'.pSQL($mr_data['mr_Pays_list']).'", 
-						"'.pSQL($mr_data['mr_ModeCol']).'", 
-						"'.pSQL($mr_data['mr_ModeLiv']).'", 
-						"'.pSQL($mr_data['mr_ModeAss']).'", 
+						"'.pSQL($mr_data['mr_Name']).'",
+						"'.pSQL($mr_data['mr_Pays_list']).'",
+						"'.pSQL($mr_data['mr_ModeCol']).'",
+						"'.pSQL($mr_data['mr_ModeLiv']).'",
+						"'.pSQL($mr_data['mr_ModeAss']).'",
 						'.(int)($new_carrier->id).')');
 		}
 	}
-	
+
 	/*
 	** Get a carrier list liable to the module
 	*/
 	public function _getCarriers()
 	{
-		// Query don't use the external_module_name to keep the 
-		// 1.3 compatibility	
+		// Query don't use the external_module_name to keep the
+		// 1.3 compatibility
 		$carriers = Db::getInstance()->executeS('
-			SELECT 
+			SELECT
 				c.id_carrier,
 				c.range_behavior,
 				m.id_mr_method,
 				m.mr_ModeLiv,
 				cl.delay
 			FROM `'._DB_PREFIX_.'mr_method` m
-			LEFT JOIN `'._DB_PREFIX_.'carrier` c 
+			LEFT JOIN `'._DB_PREFIX_.'carrier` c
 			ON c.`id_carrier` = m.`id_carrier`
-			LEFT JOIN `'._DB_PREFIX_.'carrier_lang` cl 
+			LEFT JOIN `'._DB_PREFIX_.'carrier_lang` cl
 			ON c.`id_carrier` = cl.`id_carrier`
 			WHERE  c.`deleted` = 0
 			AND c.active = 1');
-		
+
 		if (!is_array($carriers))
 			$carriers = array();
 		return $carriers;
 	}
-	
+
 	public function hookextraCarrier($params)
-	{	
+	{
 		global $nbcarriers;
 
 		if (Configuration::get('MR_ENSEIGNE_WEBSERVICE') == '' ||
@@ -606,7 +615,7 @@ class MondialRelay extends Module
 		$id_zone = Address::getZoneById((int)($address->id));
 		//$country = new Country((int)($address->id_country));
 		$carriersList = self::_getCarriers();
-	
+
 		// Check if the defined carrier are ok
 		foreach ($carriersList as $k => $row)
 		{
@@ -619,7 +628,7 @@ class MondialRelay extends Module
 				// Get id zone
 				$id_zone = (isset($this->context->cart->id_address_delivery) AND $this->context->cart->id_address_delivery) ?
 					Address::getZoneById((int)$this->context->cart->id_address_delivery) :
-					(int)$this->context->country->id_zone;				
+					(int)$this->context->country->id_zone;
 				if ((Configuration::get('PS_SHIPPING_METHOD') AND (!Carrier::checkDeliveryPriceByWeight($row['id_carrier'], $this->context->cart->getTotalWeight(), $id_zone))) OR
 					(!Configuration::get('PS_SHIPPING_METHOD') AND (!Carrier::checkDeliveryPriceByPrice($row['id_carrier'], $this->context->cart->getOrderTotal(true, self::BOTH_WITHOUT_SHIPPING), $id_zone, $this->context->cart->id_currency))))
 						unset($carriersList[$k]);
@@ -635,14 +644,14 @@ class MondialRelay extends Module
 			'MRToken' => self::$MRFrontToken,
 			'carriersextra' => $carriersList,
 			'jQueryOverload' => self::getJqueryCompatibility()));
-			
+
 			return $this->display(__FILE__, 'mondialrelay.tpl');
 		}
-	
+
 	public function getContent()
-	{	
+	{
 		$error = null;
-		
+
 		$html = '';
 		if (!empty($_POST))
 		{
@@ -658,18 +667,22 @@ class MondialRelay extends Module
 				$this->_html .= '</ol></div>';
 			}
 		}
-		
+
 		if (isset($_GET['delete_mr']) && !empty($_GET['delete_mr']))
 			self::mrDelete((int)($_GET['delete_mr']));
 
 		$this->_html .= '<h2>'.$this->l('Configure Mondial Relay Rate Module').'</h2>
+
+		<div class="warn">'.
+			$this->l('Try to turn off the cache and put the force compilation to on if you have any problems with the module after an update').'
+		</div>
 		<fieldset>
 			<legend>
 				<img src="../modules/mondialrelay/images/logo.gif" />'.$this->l('To create a Mondial Relay carrier').
 			'</legend>
 		- '.$this->l('Enter and save your Mondial Relay account settings').'<br />
 				- '.$this->l('Create a Carrier using the form "add a carrier" below').'<br />
-				- '.$this->l('Define a price for your carrier on').' 
+				- '.$this->l('Define a price for your carrier on').'
 					<a href="index.php?tab=AdminCarriers&token='.Tools::getAdminToken('AdminCarriers'.(int)(Tab::getIdFromClassName('AdminCarriers')).
 					(int)$this->context->employee->id).'" class="green">'.$this->l('The Carrier page').'</a><br />
 				- '.$this->l('To generate labels, you must have a valid and registered address of your store on your').
@@ -694,23 +707,23 @@ class MondialRelay extends Module
 			'</div><br class="clear" />';
 		return $this->_html;
 	}
-	
+
 	/*
 	** Update the new defined fields of the merchant
 	*/
 	public function updateFieldsPersonalization()
 	{
 		Configuration::updateValue('PS_MR_SHOP_NAME', Tools::getValue('Expe_ad1'));
-		$this->_html .= '<div class="conf confirm"><img src="'._PS_ADMIN_IMG_.'/ok.gif" alt="" /> '.$this->l('Settings updated').'</div>';		
+		$this->_html .= '<div class="conf confirm"><img src="'._PS_ADMIN_IMG_.'/ok.gif" alt="" /> '.$this->l('Settings updated').'</div>';
 	}
-	
+
 	public function mrDelete($id)
 	{
 		$id = Db::getInstance()->getValue('SELECT `id_carrier` FROM `'._DB_PREFIX_ .'mr_method` WHERE `id_mr_method` = "'.(int)($id).'"');
 		Db::getInstance()->execute('UPDATE `'._DB_PREFIX_ .'carrier` SET `active` = 0, `deleted` = 1 WHERE `id_carrier` = "'.(int)($id).'"');
 		$this->_html .= '<div class="conf confirm"><img src="'._PS_ADMIN_IMG_.'/ok.gif" /> '.$this->l('Delete successful').'</div>';
 	}
-	
+
 	public function mrUpdate($type, $array, $keyArray)
 	{
 		if ($type == 'settings')
@@ -731,18 +744,18 @@ class MondialRelay extends Module
 				Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'carrier SET active = "'.(int)($value).'" WHERE `id_carrier` = "'.(int)($id).'"');
 			}
 		}
-		else if ($type == 'addShipping') 
+		else if ($type == 'addShipping')
 		{
 			$query = 'INSERT INTO ' .  _DB_PREFIX_ . 'mr_method (';
 
 			for ($q = 0; $q <= count($keyArray) - 1; $q++)
-			{	
+			{
 				$end    = ($q == count($keyArray) - 1) ? '' : ', ';
 				$query .= $keyArray[$q] . $end;
 			}
-			
+
 			$query .= ') VALUES(';
-			
+
 			for ($j = 0; $j <= count($array) - 1; $j++)
 			{
 				$var = $array[$j];
@@ -754,7 +767,7 @@ class MondialRelay extends Module
 			$query .= ')';
 
 			Db::getInstance()->execute($query);
-		
+
 			$mainInsert = Db::getInstance()->Insert_ID();
 			$default = Db::getInstance()->executeS("SELECT * FROM " . _DB_PREFIX_ . "configuration WHERE name = 'PS_CARRIER_DEFAULT'");
 			$check   = Db::getInstance()->executeS("SELECT * FROM " . _DB_PREFIX_ . "carrier");
@@ -770,9 +783,9 @@ class MondialRelay extends Module
 			// Added for 1.3 compatibility to match with the right key
 			if (_PS_VERSION_ >= '1.4')
 				Db::getInstance()->execute('
-					INSERT INTO `' . _DB_PREFIX_ . 'carrier` 
+					INSERT INTO `' . _DB_PREFIX_ . 'carrier`
 					(`id_tax_rules_group`, `url`, `name`, `active`, `is_module`, `range_behavior`, `shipping_external`, `need_range`, `external_module_name`, `shipping_method`)
-									VALUES("0", NULL, "'.pSQL($array[0]).'", "1", "1", "1", "0", "1", "mondialrelay", "1")');
+					VALUES("0", NULL, "'.pSQL($array[1]).'", "1", "1", "1", "0", "1", "mondialrelay", "1")');
 			else
 				Db::getInstance()->execute('
 				INSERT INTO `' . _DB_PREFIX_ . 'carrier`
@@ -790,7 +803,7 @@ class MondialRelay extends Module
 			foreach ($groups as $group)
 
 				Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'carrier_group` (id_carrier, id_group) VALUES('.(int)($get['id_carrier']).', '.(int)($group['id_group']).')');
-			
+
 			$zones = Zone::getZones();
 			foreach ($zones as $zone)
 			{
@@ -800,22 +813,23 @@ class MondialRelay extends Module
 				Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'delivery` (id_carrier, id_range_price, id_range_weight, id_zone, price) VALUES('.(int)($get['id_carrier']).', '.(int)($range_price_id).', NULL,'.(int)($zone['id_zone']).', 0.00)');
 				Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'delivery` (id_carrier, id_range_price, id_range_weight, id_zone, price) VALUES('.(int)($get['id_carrier']).', NULL, '.(int)($range_weight_id).','.(int)($zone['id_zone']).', 0.00)');
 			}
-			
+
 			if(!in_array($default[0]['value'], $checkD))
 				$default = Db::getInstance()->executeS("UPDATE " . _DB_PREFIX_ . "configuration SET value = '" . (int)($get['id_carrier']) . "' WHERE name = 'PS_CARRIER_DEFAULT'");
 		}
-		else 
+		else
 			return false;
 
 		$this->_html .= '<div class="conf confirm"><img src="'._PS_ADMIN_IMG_.'/ok.gif" /> '.$this->l('Settings updated').'<img src="http://www.prestashop.com/modules/mondialrelay.png?enseigne='.urlencode(Tools::getValue('mr_Enseigne_WebService')).'" style="float:right" /></div>';
 		return true;
 	}
-	
+
 	public function addMethodForm()
 	{
 		$zones = Db::getInstance()->executeS("SELECT * FROM " . _DB_PREFIX_ . "zone WHERE active = 1");
 		$output = '
 		<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" >
+			<input type="hidden" name="mr_ModeCol" value="CCC" />
 			<fieldset>
 				<legend><img src="../modules/mondialrelay/images/logo.gif" alt="" />'.$this->l('Add a Shipping Method').'</legend>
 				<ul>
@@ -825,15 +839,15 @@ class MondialRelay extends Module
 					<li>
 						<label for="mr_Name" class="shipLabel">'.$this->l('Carrier\'s name').'<sup>*</sup></label>
 						<input type="text" id="mr_Name" name="mr_Name" '.(Tools::getValue('mr_Name') ? 'value="'.Tools::safeOutput(Tools::getValue('mr_Name')).'"' : '').'/>
-					</li>
-					<li>
+					</li>';
+					/*<li>
 						<label for="mr_ModeCol" class="shipLabel">'.$this->l('Collection Mode').'<sup>*</sup></label>
 						<select name="mr_ModeCol" id="mr_ModeCol" style="width:200px">
 							<option value="CCC" selected >CCC : '.$this->l('Collection at the store').'</option>
-						</select> 
-					</li>
+						</select>
+					</li>*/
 
-					<li>
+	$output .= '<li>
 						<label for="mr_ModeLiv" class="shipLabel">'.$this->l('Delivery mode').'<sup>*</sup></label>
 						<select name="mr_ModeLiv" id="mr_ModeLiv" style="width:200px">
 						<option value="24R" selected >24R : '.$this->l('Delivery to a relay point').'</option>
@@ -842,7 +856,7 @@ class MondialRelay extends Module
 						<option value="LDS" >LDS : '.$this->l('Special Home delivery (2 persons)').'</option>
 						</select>
 					</li>
-					
+
 					<li>
 						<label for="mr_ModeAss" class="shipLabel">'.$this->l('Insurance').'<sup>*</sup></label>
 						<select name="mr_ModeAss" id="mr_ModeAss" style="width:200px">
@@ -855,73 +869,72 @@ class MondialRelay extends Module
 						</select>
 					</li>
 
-					<li>	
+					<li>
 					<label for="mr_Pays_list" class="shipLabel">'.$this->l('Delivery countries:').'<sup>*</sup><br /><br />
 					<span style="font-size:10px; width:200px;float:left; color:forestgreen">'.
 					$this->l('You can choose several countries by pressing Ctrl while selecting countries').'</span>
-					</label>	
+					</label>
 						<select name="mr_Pays_list[]" id="mr_Pays_list" multiple size="5">
 							<option value="FR">'.$this->l('France').'</option>
 							<option value="BE">'.$this->l('Belgium').'</option>
 							<option value="LU">'.$this->l('Luxembourg').'</option>
 							<option value="ES">'.$this->l('Spain').'</option>
 						</select>
-					</li>			
+					</li>
 					<li class="PS_MRSubmit">
 						<input type="submit" name="submitMethod" value="' . $this->l('Add a Shipping Method') . '" class="button" />
 					</li>
 				</ul>
 			</fieldset>
 		</form>';
-		
+
 		return $output;
 	}
-	
+
 	public function shippingForm()
 	{
 		$query = Db::getInstance()->executeS('
 		SELECT m.*
 		FROM `'._DB_PREFIX_.'mr_method` m
-			JOIN `'._DB_PREFIX_.'carrier` c 
+			JOIN `'._DB_PREFIX_.'carrier` c
 			ON (c.`id_carrier` = m.`id_carrier`)
 		WHERE c.`deleted` = 0');
-			
+
 		$output = '
 		<form action="' . Tools::safeOutput($_SERVER['REQUEST_URI']) . '" method="post">
 			<fieldset class="shippingList">
 				<legend><img src="../modules/mondialrelay/images/logo.gif" />'.$this->l('Shipping Method\'s list').'</legend>
-				<ol>';
+				<ul>';
 		if (!sizeof($query))
 			$output .= '<li>'.$this->l('No shipping methods created').'</li>';
 		foreach ($query AS $Options)
 		{
 			$output .= '
 					<li>
-						<a href="' . 'index.php?tab=AdminModules&configure=mondialrelay&token='.Tools::getAdminToken('AdminModules'.(int)(Tab::getIdFromClassName('AdminModules')).(int)$this->context->employee->id).'&delete_mr=' . $Options['id_mr_method'] . '"><img src="../img/admin/disabled.gif" alt="Delete" title="Delete" /></a>' . str_replace('_', ' ', $Options['mr_Name']) . ' (' . $Options['mr_ModeCol'] . '-' . $Options['mr_ModeLiv'] . ' - ' . $Options['mr_ModeAss'] . ' : '.$Options['mr_Pays_list'].') 
-						<a href="index.php?tab=AdminCarriers&id_carrier=' . (int)($Options['id_carrier']) . '&updatecarrier&token='.Tools::getAdminToken('AdminCarriers'.(int)(Tab::getIdFromClassName('AdminCarriers')).(int)$this->context->employee->id).'">'.$this->l('Config Shipping.').'</a>	
+						<a href="' . 'index.php?tab=AdminModules&configure=mondialrelay&token='.Tools::getAdminToken('AdminModules'.(int)(Tab::getIdFromClassName('AdminModules')).(int)$this->context->employee->id).'&delete_mr=' . $Options['id_mr_method'] . '"><img src="../img/admin/disabled.gif" alt="Delete" title="Delete" /></a>' . str_replace('_', ' ', $Options['mr_Name']) . ' (' . $Options['mr_ModeCol'] . '-' . $Options['mr_ModeLiv'] . ' - ' . $Options['mr_ModeAss'] . ' : '.$Options['mr_Pays_list'].')
+						<div style="float:right;"><a href="index.php?tab=AdminCarriers&id_carrier=' . (int)($Options['id_carrier']) . '&updatecarrier&token='.Tools::getAdminToken('AdminCarriers'.(int)(Tab::getIdFromClassName('AdminCarriers')).(int)$this->context->employee->id).'"><b><u>'.$this->l('Config Shipping.').'</u></b></a></div>
 					</li>';
 		}
-		$output .= ' 
-
-				</ol>
+		$output .= '
+				</ul>
 			</fieldset>
 		</form><br />
 		';
 
-		return $output;	
+		return $output;
 	}
-	
+
 	/*
 	** Display advanced settings form
 	*/
 	public function advancedSettings()
 	{
 		$form = '';
-		
+
 		$form .= '
 			<fieldset class="PS_MRFormStyle">
 				<legend>
-					<img src="../modules/mondialrelay/images/logo.gif" />'.$this->l('Advanced Settings'). ' - 
+					<img src="../modules/mondialrelay/images/logo.gif" />'.$this->l('Advanced Settings'). ' -
 					<a href="javascript:void(0);" id="PS_MRDisplayPersonalizedOptions">
 						<font style="color:#00b511;">'.$this->l('Click to display / hide the options').'</font>
 					</a>'.
@@ -934,9 +947,9 @@ class MondialRelay extends Module
 				'</p>
 			</div>
 			</fieldset>';
-		return $form;	
+		return $form;
 	}
-	
+
 	/*
 	** Form to allow personalization fields sent for MondialRelay
 	** Not used anymore but still present if needed
@@ -945,27 +958,27 @@ class MondialRelay extends Module
 	{
 		$form = '';
 		$warn = '';
-		
+
 		// Load the Default value from the configuration
-		$addr1 = (Configuration::get('PS_MR_SHOP_NAME')) ? 
-			Configuration::get('PS_MR_SHOP_NAME') : 
+		$addr1 = (Configuration::get('PS_MR_SHOP_NAME')) ?
+			Configuration::get('PS_MR_SHOP_NAME') :
 			Configuration::get('PS_SHOP_NAME');
-		
+
 		// Check if a request exist and if errors occured, use the post variable
 		if (Tools::isSubmit('PS_MRSubmitFieldPersonalization') && count($this->_postErrors))
 			$addr1 = Tools::safeOutput(Tools::getValue('Expe_ad1'));
-			
+
 
 		if (!Configuration::get('PS_MR_SHOP_NAME'))
 			$warn .= '<div class="warn">'.
 				$this->l('Its seems you updated Mondialrelay without use the uninstall / install method, you have to set up this part to make working the generating ticket process').
-				'</div>';			
+				'</div>';
 		// Form
 		$form = '<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" class="form">';
 		$form .= '
 			<fieldset class="PS_MRFormStyle">
 				<legend>
-					<img src="../modules/mondialrelay/images/logo.gif" />'.$this->l('Advanced Settings'). ' - 
+					<img src="../modules/mondialrelay/images/logo.gif" />'.$this->l('Advanced Settings'). ' -
 					<a href="javascript:void(0);" id="PS_MRDisplayPersonalizedOptions"><font style="color:#00b511;">'.$this->l('Click to display / hide the options').'</font>	</a>'.
 			'</legend>'.
 			$warn.'
@@ -979,7 +992,7 @@ class MondialRelay extends Module
 				<p>'.$this->l('The key used by Mondialrelay is').' <b>Expe_ad1</b> '.$this->l('and has this default value').'
 			 	: <b>'.Configuration::get('PS_SHOP_NAME').'</b></p>
 			</div>
-		
+
 		<div class="margin-form">
 			<input type="submit" name="PS_MRSubmitFieldPersonalization"  value="' . $this->l('Save') . '" class="button" />
 		</div>
@@ -988,8 +1001,8 @@ class MondialRelay extends Module
 		</form><br  />';
 		return $form;
 	}
-	
-	
+
+
 	public function settingsstateorderForm()
 	{
 		$this->orderState = Configuration::get('MONDIAL_RELAY_ORDER_STATE');
@@ -1015,11 +1028,11 @@ class MondialRelay extends Module
 		<div class="clear"></div>';
 		$output .= '<div class="margin-form"><input type="submit" name="submit_order_state"  value="' . $this->l('Save') . '" class="button" /></div>';
 		$output .= '</fieldset></form><br>';
-		
+
 		return $output;
     }
 
-	
+
 	public function settingsForm()
 	{
 		$output = '
@@ -1055,15 +1068,15 @@ class MondialRelay extends Module
 		$languages = Language::getLanguages();
 		foreach ($languages as $language)
 			$output .= '<option value="'.strtoupper($language['iso_code']).'" '.(strtoupper($language['iso_code']) == Configuration::get('MR_LANGUAGE') ? 'selected="selected"' : '').'>'.$language['name'].'</option>';
-							
+
 				$output .= '</select>
 						</li>
 						<li>
 							<label for="mr_weight_coef" class="mrLabel">' . $this->l('Weight Coefficient:') . '<sup>*</sup></label>
-							<input class="mrInput" type="text" name="mr_weight_coef" value="' . 
+							<input class="mrInput" type="text" name="mr_weight_coef" value="' .
 							(Tools::getValue('mr_weight_coef') ? Tools::safeOutput(Tools::getValue('mr_weight_coef')) : Configuration::get('MR_WEIGHT_COEF')) . '"  style="width:45px;"/>
 							<span class="indication">(' . $this->l('grammes = 1 ') . Configuration::get('PS_WEIGHT_UNIT').')</span>
-						</li>						
+						</li>
 						<li class="PS_MRSubmit">
 							<input type="submit" name="submitMR" value="' . $this->l('Update Settings') . '" class="button" />
 						</li>
@@ -1078,12 +1091,12 @@ class MondialRelay extends Module
 	{
 		$html = '<p>';
 		$simpleresul = Db::getInstance()->executeS('
-			SELECT * FROM ' . _DB_PREFIX_ . 'mr_selected 
+			SELECT * FROM ' . _DB_PREFIX_ . 'mr_selected
 			WHERE id_cart='.(int)($id_cart));
-	
-		if (trim($simpleresul[0]['exp_number']) != '0') 
+
+		if (trim($simpleresul[0]['exp_number']) != '0')
 			$html .= $this->l('Nb expedition:').$simpleresul[0]['exp_number']."<br>";
-		if (trim($simpleresul[0]['url_etiquette']) != '0') 
+		if (trim($simpleresul[0]['url_etiquette']) != '0')
 			$html .= "<a href='".$simpleresul[0]['url_etiquette']."' target='etiquette".$simpleresul[0]['url_etiquette']."'>".$this->l('Label URL')."</a><br>";
 		if (trim($simpleresul[0]['url_suivi']) != '0')
 			$html .= "<a href='".$simpleresul[0]['url_suivi']."' target='suivi".$simpleresul[0]['exp_number']."'>".$this->l('Follow-up URL')."</a><br>";
@@ -1094,9 +1107,9 @@ class MondialRelay extends Module
 		if (trim($simpleresul[0]['MR_Selected_LgAdr2']) != '')
 			$html .= $simpleresul[0]['MR_Selected_LgAdr2']."<br>";
 		if (trim($simpleresul[0]['MR_Selected_LgAdr3']) != '')
-			$html .= $simpleresul[0]['MR_Selected_LgAdr3']."<br>"; 
+			$html .= $simpleresul[0]['MR_Selected_LgAdr3']."<br>";
 		if (trim($simpleresul[0]['MR_Selected_LgAdr4']) != '')
-			$html .= $simpleresul[0]['MR_Selected_LgAdr4']."<br>"; 
+			$html .= $simpleresul[0]['MR_Selected_LgAdr4']."<br>";
 		if (trim($simpleresul[0]['MR_Selected_CP']) != '')
 			$html .= $simpleresul[0]['MR_Selected_CP']." ";
 		if (trim($simpleresul[0]['MR_Selected_Ville']) != '')
@@ -1109,12 +1122,12 @@ class MondialRelay extends Module
 
 	public function get_followup($shipping_number)
 	{
-	  $query = 'SELECT url_suivi 
-	  	FROM '._DB_PREFIX_ .'mr_selected 
+	  $query = 'SELECT url_suivi
+	  	FROM '._DB_PREFIX_ .'mr_selected
 	  	WHERE id_mr_selected=\''.(int)($shipping_number).'\';';
-	  	  
+
 		$settings = Db::getInstance()->executeS($query);
-		
+
 		return $settings[0]['url_suivi'];
 	}
 
@@ -1122,26 +1135,26 @@ class MondialRelay extends Module
 	{
 		if ($key == 'name')
 			$key = 'mr_Name';
-			
+
 		return Db::getInstance()->execute('
-			UPDATE ' . _DB_PREFIX_ . 'mr_method 
-			SET '.pSQL($key).'="'.pSQL($value).'" 
+			UPDATE ' . _DB_PREFIX_ . 'mr_method
+			SET '.pSQL($key).'="'.pSQL($value).'"
 			WHERE id_carrier=\''.(int)($id_carrier).'\' ; ');
 	}
-	
- 	// Add for 1.3 compatibility and avoid duplicate code	
+
+ 	// Add for 1.3 compatibility and avoid duplicate code
 	public static function jsonEncode($result)
 	{
-		return (method_exists('Tools', 'jsonEncode')) ? 
+		return (method_exists('Tools', 'jsonEncode')) ?
 			Tools::jsonEncode($result) : json_encode($result);
 	}
-	
+
 	public static function ordersSQLQuery1_4($id_order_state)
 	{
-		return 'SELECT  o.`id_address_delivery` as id_address_delivery, 
-							o.`id_order` as id_order, 
+		return 'SELECT  o.`id_address_delivery` as id_address_delivery,
+							o.`id_order` as id_order,
 							o.`id_customer` as id_customer,
-							o.`id_cart` as id_cart, 
+							o.`id_cart` as id_cart,
 							o.`id_lang` as id_lang,
 							mrs.`id_mr_selected` as id_mr_selected,
 							CONCAT(c.`firstname`, \' \', c.`lastname`) AS `customer`,
@@ -1149,57 +1162,57 @@ class MondialRelay extends Module
 							o.`date_add` as date, o.`id_currency` as id_currency, o.`id_lang` as id_lang,
 							mrs.`MR_poids` as weight, mr.`mr_Name` as mr_Name, mrs.`MR_Selected_Num` as MR_Selected_Num,
 							mrs.`MR_Selected_Pays` as MR_Selected_Pays, mrs.`exp_number` as exp_number,
-							mr.`mr_ModeCol` as mr_ModeCol, mr.`mr_ModeLiv` as mr_ModeLiv, mr.`mr_ModeAss` as mr_ModeAss 
+							mr.`mr_ModeCol` as mr_ModeCol, mr.`mr_ModeLiv` as mr_ModeLiv, mr.`mr_ModeAss` as mr_ModeAss
 			FROM `'._DB_PREFIX_.'orders` o
-			LEFT JOIN `'._DB_PREFIX_.'carrier` ca 
-			ON (ca.`id_carrier` = o.`id_carrier` 
+			LEFT JOIN `'._DB_PREFIX_.'carrier` ca
+			ON (ca.`id_carrier` = o.`id_carrier`
 			AND ca.`external_module_name` = "mondialrelay")
-			LEFT JOIN `'._DB_PREFIX_.'mr_selected` mrs 
+			LEFT JOIN `'._DB_PREFIX_.'mr_selected` mrs
 			ON (mrs.`id_cart` = o.`id_cart`)
-			LEFT JOIN `'._DB_PREFIX_.'mr_method` mr 
+			LEFT JOIN `'._DB_PREFIX_.'mr_method` mr
 			ON (mr.`id_carrier` = ca.`id_carrier`)
-			LEFT JOIN `'._DB_PREFIX_.'customer` c 
+			LEFT JOIN `'._DB_PREFIX_.'customer` c
 			ON (c.`id_customer` = o.`id_customer`)
 			WHERE (
-				SELECT moh.`id_order_state` 
-				FROM `'._DB_PREFIX_.'order_history` moh 
-				WHERE moh.`id_order` = o.`id_order` 
-				ORDER BY moh.`date_add` DESC LIMIT 1) = '.(int)($id_order_state).' 
+				SELECT moh.`id_order_state`
+				FROM `'._DB_PREFIX_.'order_history` moh
+				WHERE moh.`id_order` = o.`id_order`
+				ORDER BY moh.`date_add` DESC LIMIT 1) = '.(int)($id_order_state).'
 			AND ca.`external_module_name` = "mondialrelay"';
 	}
-		
+
 	public static function ordersSQLQuery1_3($id_order_state)
 	{
 		return '
-				SELECT  o.`id_address_delivery` as id_address_delivery, 
-							o.`id_order` as id_order, 
+				SELECT  o.`id_address_delivery` as id_address_delivery,
+							o.`id_order` as id_order,
 							o.`id_customer` as id_customer,
-							o.`id_cart` as id_cart, 
+							o.`id_cart` as id_cart,
 							mrs.`id_mr_selected` as id_mr_selected,
 							CONCAT(c.`firstname`, \' \', c.`lastname`) AS `customer`,
 							o.`total_paid_real` as total, o.`total_shipping` as shipping,
 							o.`date_add` as date, o.`id_currency` as id_currency, o.`id_lang` as id_lang,
 							mrs.`MR_poids` as weight, mr.`mr_Name` as mr_Name, mrs.`MR_Selected_Num` as MR_Selected_Num,
 							mrs.`MR_Selected_Pays` as MR_Selected_Pays, mrs.`exp_number` as exp_number,
-							mr.`mr_ModeCol` as mr_ModeCol, mr.`mr_ModeLiv` as mr_ModeLiv, mr.`mr_ModeAss` as mr_ModeAss 
+							mr.`mr_ModeCol` as mr_ModeCol, mr.`mr_ModeLiv` as mr_ModeLiv, mr.`mr_ModeAss` as mr_ModeAss
 			FROM `'._DB_PREFIX_.'orders` o
-			LEFT JOIN `'._DB_PREFIX_.'carrier` ca 
+			LEFT JOIN `'._DB_PREFIX_.'carrier` ca
 			ON (ca.`id_carrier` = o.`id_carrier`)
 			AND ca.`name` = "mondialrelay"
-			LEFT JOIN `'._DB_PREFIX_.'mr_selected` mrs 
+			LEFT JOIN `'._DB_PREFIX_.'mr_selected` mrs
 			ON (mrs.`id_cart` = o.`id_cart`)
-			LEFT JOIN `'._DB_PREFIX_.'mr_method` mr 
+			LEFT JOIN `'._DB_PREFIX_.'mr_method` mr
 			ON (mr.`id_carrier` = ca.`id_carrier`)
-			LEFT JOIN `'._DB_PREFIX_.'customer` c 
+			LEFT JOIN `'._DB_PREFIX_.'customer` c
 			ON (c.`id_customer` = o.`id_customer`)
 			WHERE (
-				SELECT moh.`id_order_state` 
-				FROM `'._DB_PREFIX_.'order_history` moh 
-				WHERE moh.`id_order` = o.`id_order` 
+				SELECT moh.`id_order_state`
+				FROM `'._DB_PREFIX_.'order_history` moh
+				WHERE moh.`id_order` = o.`id_order`
 				ORDER BY moh.`date_add` DESC LIMIT 1) = '.(int)($id_order_state).'
 			AND ca.`name` = "mondialrelay"';
 	}
-	
+
 	public static function getBaseOrdersSQLQuery($id_order_state)
 	{
 		if (_PS_VERSION_ >= '1.4')
@@ -1207,12 +1220,12 @@ class MondialRelay extends Module
 		else
 			return self::ordersSQLQuery1_3($id_order_state);
 	}
-	
+
 	public static function getOrders($orderIdList = array(), $filterEntries = self::NO_FILTER)
 	{
 		$id_order_state = Configuration::get('MONDIAL_RELAY_ORDER_STATE');
 		$sql = self::getBaseOrdersSQLQuery($id_order_state);
-		
+
 		if (count($orderIdList))
 		{
 			$sql .= ' AND o.id_order IN (';
@@ -1233,11 +1246,11 @@ class MondialRelay extends Module
 			ORDER BY o.`date_add` ASC';
 		return Db::getInstance()->executeS($sql);
 	}
-	
+
 	public function getErrorCodeDetail($code)
 	{
 		global $statCode;
-		
+
 		if (isset($statCode[$code]))
 			return $statCode[$code];
 		return $this->l('This error isn\'t referred : ') . $code;
diff --git a/modules/mondialrelay/mondialrelay.tpl b/modules/mondialrelay/mondialrelay.tpl
index e86e1904c..46fa38449 100755
--- a/modules/mondialrelay/mondialrelay.tpl
+++ b/modules/mondialrelay/mondialrelay.tpl
@@ -40,6 +40,8 @@
 	PS_MRTranslationList['Select'] = "{l s='Select' mod='mondialrelay'}";
 	PS_MRTranslationList['Selected'] = "{l s='Selected' mod='mondialrelay'}";
 	PS_MRTranslationList['errorSelection'] = "{l s='Please choose a relay point' mod='mondialrelay'}";
+	PS_MRTranslationList['openingRelay'] = "{l s='Opening hours' mod='mondialrelay'}";
+	PS_MRTranslationList['moreDetails'] = "{l s='More details' mod='mondialrelay'}";
 </script>
 
 <script type="text/javascript" src="{$new_base_dir}mondialrelay.js"></script>
diff --git a/modules/mondialrelay/style.css b/modules/mondialrelay/style.css
index f114ed7df..934b5e7a5 100755
--- a/modules/mondialrelay/style.css
+++ b/modules/mondialrelay/style.css
@@ -96,8 +96,7 @@ div#PS_MRUnRemovedItem
 }
 
 .shippingList {
-	width: 400px;
-	float: right;
+
 }
 .shippingList li {
 	margin: 5px;
@@ -326,3 +325,18 @@ div#PS_MRPersonalizedFields
 }
 .clearfix:after {clear: both}
 .clearfix {zoom: 1}
+
+.PS_MRGmapBulbe
+{
+	width:405px;
+	height:66px;
+	overflow: hidden;
+}
+
+.MR_date {width:450px;position:relative;float:right; line-height: 9px;}
+.MR_date span.titre {margin-left:50px;font-weight:bold;}
+.MR_date span.vacances {margin-left:5px;color:Red; }
+.MR_date table {border-spacing:3px;font-size:11pt; border: solid 1px #eee;}
+.MR_date tr.p {background-color:#e9e9e9; height:9px;}
+.MR_date td.g {font-weight:bold;}
+.MR_date td.d {}
diff --git a/modules/socolissimo/ajax.php b/modules/socolissimo/ajax.php
index ffdad3f45..5df8afef9 100644
--- a/modules/socolissimo/ajax.php
+++ b/modules/socolissimo/ajax.php
@@ -4,14 +4,16 @@ include_once('../../config/config.inc.php');
 include_once('../../init.php');
 include_once('../../modules/socolissimo/socolissimo.php');
 
-if (!Tools::getValue('ajax'))
-	die('');
-	
+global $cookie;
+
+if (Tools::getValue('token') == sha1('socolissimo'._COOKIE_KEY_.$cookie->id_cart))
+	die('INVALID TOKEN');
+
 $socolissimo = new Socolissimo();
-	
 $result = $socolissimo->getDeliveryInfos(Context::getContext()->cart->id, Context::getContext()->customer->id);
 if (!$result)
 	die('{"result" : false}');
 else
 	die('{"result" : true}');
+
 ?>
\ No newline at end of file
diff --git a/modules/socolissimo/config.xml b/modules/socolissimo/config.xml
index e8508f088..8f0d496af 100755
--- a/modules/socolissimo/config.xml
+++ b/modules/socolissimo/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>socolissimo</name>
 	<displayName><![CDATA[So Colissimo]]></displayName>
-	<version><![CDATA[2.0]]></version>
+	<version><![CDATA[2.1]]></version>
 	<description><![CDATA[Offer your customers, different delivery methods with LaPoste.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[shipping_logistics]]></tab>
diff --git a/modules/socolissimo/redirect.php b/modules/socolissimo/redirect.php
index 610dfd2cc..d29d66027 100644
--- a/modules/socolissimo/redirect.php
+++ b/modules/socolissimo/redirect.php
@@ -27,13 +27,15 @@
 
 require_once ('../../config/config.inc.php');
 
+$onload_script = 'parent.$.fancybox.close();';
+if (Tools::isSubmit('firstcall'))	
+	$onload_script = 'document.getElementById(\'socoForm\').submit();';
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr"> 
 	<head>
 	</head>
-	
-	<body onload="document.getElementById('socoForm').submit();">
+	<body onload="<?php echo $onload_script; ?>">
 		<?php
 		echo '<form id="socoForm" name="form" action="'.Configuration::get('SOCOLISSIMO_URL').'" method="POST">';
 		foreach($_GET as $key => $val)
diff --git a/modules/socolissimo/socolissimo.php b/modules/socolissimo/socolissimo.php
index e11e1c5d8..fd811faaa 100644
--- a/modules/socolissimo/socolissimo.php
+++ b/modules/socolissimo/socolissimo.php
@@ -57,7 +57,7 @@ class Socolissimo extends CarrierModule
 	{
 		$this->name = 'socolissimo';
 		$this->tab = 'shipping_logistics';
-		$this->version = '2.0';
+		$this->version = '2.1';
 		$this->author = 'PrestaShop';
 		$this->limited_countries = array('fr');
 
@@ -109,8 +109,8 @@ class Socolissimo extends CarrierModule
 		if (!parent::install() OR !Configuration::updateValue('SOCOLISSIMO_ID', NULL) OR !Configuration::updateValue('SOCOLISSIMO_KEY', NULL)
 		 OR !Configuration::updateValue('SOCOLISSIMO_URL', 'https://ws.colissimo.fr/pudo-fo/storeCall.do') OR !Configuration::updateValue('SOCOLISSIMO_PREPARATION_TIME', 1)
 		 OR !Configuration::updateValue('SOCOLISSIMO_OVERCOST', 3.6) OR !$this->registerHook('extraCarrier') OR !$this->registerHook('AdminOrder') OR !$this->registerHook('updateCarrier')
-		 OR !$this->registerHook('newOrder') OR !Configuration::updateValue('SOCOLISSIMO_SUP_URL', 'http://ws.colissimo.fr/supervision-pudo/supervision.jsp')
-		 OR !Configuration::updateValue('SOCOLISSIMO_SUP', true))
+		 OR !$this->registerHook('newOrder') OR !$this->registerHook('paymentTop') OR !Configuration::updateValue('SOCOLISSIMO_SUP_URL', 'http://ws.colissimo.fr/supervision-pudo/supervision.jsp')
+		 OR !Configuration::updateValue('SOCOLISSIMO_SUP', true) OR !Configuration::updateValue('SOCOLISSIMO_USE_FANCYBOX', true))
 			return false;
 
 
@@ -159,7 +159,9 @@ class Socolissimo extends CarrierModule
 		    OR !$this->unregisterHook('AdminOrder')
 		    OR !$this->unregisterHook('newOrder')
 		    OR !$this->unregisterHook('updateCarrier')
+		    OR !$this->unregisterHook('paymentTop')
 		    OR !Configuration::deleteByName('SOCOLISSIMO_ID')
+		    OR !Configuration::deleteByName('SOCOLISSIMO_USE_FANCYBOX')
 		    OR !Configuration::deleteByName('SOCOLISSIMO_KEY')
 		    OR !Configuration::deleteByName('SOCOLISSIMO_URL')
 		    OR !Configuration::deleteByName('SOCOLISSIMO_OVERCOST')
@@ -270,6 +272,15 @@ class Socolissimo extends CarrierModule
 		<p>' . $this->l('Url of back office SoColissimo.') . '</p>
 		</div>
 
+		<label>'.$this->l('Fancybox').' : </label>
+		<div class="margin-form">
+			<input type="radio" name="SOCOLISSIMO_USE_FANCYBOX" id="fancybox_on" value="1" '.(Configuration::get('SOCOLISSIMO_USE_FANCYBOX') ? 'checked="checked" ' : '').'/>
+			<label class="t" for="fancybox_on"> <img src="../img/admin/enabled.gif" alt="'.$this->l('Enabled').'" title="'.$this->l('Enabled').'" /></label>
+			<input type="radio" name="SOCOLISSIMO_USE_FANCYBOX" id="fancybox_off" value="0" '.(!Configuration::get('SOCOLISSIMO_USE_FANCYBOX') ? 'checked="checked" ' : '').'/>
+			<label class="t" for="fancybox_off"> <img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" /></label>
+			<p>'.$this->l('If you enable this option, the page of socolissimo will displayed in a fancybox').'</p>
+		</div>
+
 		<label>'.$this->l('Supervision').' : </label>
 		<div class="margin-form">
 			<input type="radio" name="sup_active" id="active_on" value="1" '.(Configuration::get('SOCOLISSIMO_SUP') ? 'checked="checked" ' : '').'/>
@@ -334,6 +345,7 @@ class Socolissimo extends CarrierModule
 		AND Configuration::updateValue('SOCOLISSIMO_OVERCOST', (float)(Tools::getValue('overcost')))
 		AND Configuration::updateValue('SOCOLISSIMO_SUP_URL', Tools::getValue('url_sup'))
 		AND Configuration::updateValue('SOCOLISSIMO_OVERCOST_TAX', Tools::getValue('id_tax_rules_group'))
+		AND Configuration::updateValue('SOCOLISSIMO_USE_FANCYBOX', Tools::getValue('SOCOLISSIMO_USE_FANCYBOX'))
 		AND Configuration::updateValue('SOCOLISSIMO_SUP', (int)(Tools::getValue('sup_active'))))
 		{
 			//save old carrier id if change
@@ -378,7 +390,10 @@ class Socolissimo extends CarrierModule
 							'CETOWN' => substr($this->upper($params['address']->city),0,32),
 							'DYWEIGHT' => ((float)($params['cart']->getTotalWeight()) * 1000),
 							'SIGNATURE' => htmlentities($signature,ENT_NOQUOTES, 'UTF-8'),
-							'TRPARAMPLUS' => (int)($carrierSo->id),
+							'carrier_id' => (int)($carrierSo->id),
+							'gift' => '',
+							'gift_message' => '',
+							'TRPARAMPLUS' => '',
 							'DYFORWARDINGCHARGES' => number_format((float)($params['cart']->getOrderShippingCost($carrierSo->id)), 2, ',', ''),
 							'DYPREPARATIONTIME' => (int)(Configuration::Get('SOCOLISSIMO_PREPARATION_TIME')),
 							'TRRETURNURLKO' => htmlentities($this->url,ENT_NOQUOTES, 'UTF-8'),
@@ -389,16 +404,25 @@ class Socolissimo extends CarrierModule
 				$serialsInput .= '&'.$key.'='.$val;
 			$serialsInput = ltrim($serialsInput, '&');
 			$row['id_carrier'] = (int)($carrierSo->id);
-			$this->context->smarty->assign(array('urlSo' => Configuration::get('SOCOLISSIMO_URL').'?trReturnUrlKo='.htmlentities($this->url,ENT_NOQUOTES, 'UTF-8'),'id_carrier' => (int)($row['id_carrier']),
-								  'inputs' => $inputs, 'serialsInput' => $serialsInput, 'finishProcess' => $this->l('To choose SoColissimo, click on a delivery method')));
+
+			$this->context->smarty->assign(array(
+				'select_label' => $this->l('Select delivery mode'),
+				'edit_label' => $this->l('Edit delivery mode'),
+				'token' => sha1('socolissimo'._COOKIE_KEY_.$cookie->id_cart),
+				'urlSo' => Configuration::get('SOCOLISSIMO_URL').'?trReturnUrlKo='.htmlentities($this->url,ENT_NOQUOTES, 'UTF-8'),
+				'id_carrier' => (int)$row['id_carrier'],
+				'inputs' => $inputs, 'serialsInput' => $serialsInput, 'finishProcess' => $this->l('To choose SoColissimo, click on a delivery method'),
+			));
 
 			$country = new Country((int)($params['address']->id_country));
-			$carriers = Carrier::getCarriers($this->context->language->id,  true , false,false, NULL, Carrier::ALL_CARRIERS);
+
+			$carriers = Carrier::getCarriers($this->context->language->id, true , false, false, null, (defined('ALL_CARRIERS') ? ALL_CARRIERS : Carrier::ALL_CARRIERS));
+
 			$ids = array();
 			foreach($carriers as $carrier)
 				$ids[] = $carrier['id_carrier'];
 
-			if ($this->getDeliveryInfos($this->context->cart->id, $this->context->customer->id))
+			if ($params['cart']->id_carrier == Configuration::Get('SOCOLISSIMO_CARRIER_ID') && $this->getDeliveryInfos($this->context->cart->id, $this->context->customer->id))
 				$this->context->smarty->assign('already_select_delivery', true);
 			else
 				$this->context->smarty->assign('already_select_delivery', false);
@@ -408,7 +432,10 @@ class Socolissimo extends CarrierModule
 				AND $this->checkSoCarrierAvailable((int)(Configuration::get('SOCOLISSIMO_CARRIER_ID')))
 				AND in_array((int)(Configuration::get('SOCOLISSIMO_CARRIER_ID')),$ids))
 				{
-					return $this->display(__FILE__, 'socolissimo_carrier.tpl');
+					if (Configuration::get('PS_ORDER_PROCESS_TYPE') || Configuration::get('SOCOLISSIMO_USE_FANCYBOX'))
+						return $this->display(__FILE__, 'socolissimo_fancybox.tpl');
+					else
+						return $this->display(__FILE__, 'socolissimo_redirect.tpl');
 				}
 				else
 				{
@@ -497,6 +524,12 @@ class Socolissimo extends CarrierModule
 
 	}
 
+	public function hookpaymentTop($params)
+	{
+		if ($params['cart']->id_carrier == Configuration::Get('SOCOLISSIMO_CARRIER_ID') AND !$this->getDeliveryInfos((int)$params['cookie']->id_cart, (int)$params['cookie']->id_customer))
+			$params['cart']->id_carrier = 0;
+	}
+
 	public function make_key($ceName, $dyPraparationTime, $dyForwardingCharges, $trClientNumber, $orderId)
 	{
 		return sha1(Configuration::get('SOCOLISSIMO_ID').$ceName.$dyPraparationTime.$dyForwardingCharges.$trClientNumber.self::formatOrderId($orderId).Configuration::get('SOCOLISSIMO_KEY'));
diff --git a/modules/socolissimo/socolissimo_fancybox.tpl b/modules/socolissimo/socolissimo_fancybox.tpl
new file mode 100755
index 000000000..9f539aa3d
--- /dev/null
+++ b/modules/socolissimo/socolissimo_fancybox.tpl
@@ -0,0 +1,182 @@
+{*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 6735 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<a href="#" class="iframe" style="display:none" id="soLink"></a>
+{if isset($opc) && $opc}
+<script type="text/javascript">
+	var opc = true;
+</script>
+{else}
+<script type="text/javascript">
+	var opc = false;
+</script>
+{/if}
+{if isset($already_select_delivery) && $already_select_delivery}
+<script type="text/javascript">
+	var already_select_delivery = true;
+</script>
+{else}
+<script type="text/javascript">
+	var already_select_delivery = false;
+</script>
+{/if}
+<script type="text/javascript">
+var soInputs = new Object();
+{foreach from=$inputs item=input key=name name=myLoop}
+		soInputs.{$name} = "{$input|strip_tags|addslashes}";
+{/foreach}
+
+{literal}
+	$('#soLink').fancybox({
+			'width'				: 1000,
+			'height'			: 700,
+		    'autoScale'     	: false,
+		    'centerOnScroll'	: true,
+		    'autoDimensions'	: false,
+		    'transitionIn'		: 'none',
+			'transitionOut'		: 'none',
+			'hideOnOverlayClick' : false,
+			'hideOnContentClick' : false,
+			'showCloseButton'	: true,
+			'showIframeLoading' : true,
+			'enableEscapeButton' : true,
+			'type'				: 'iframe',
+			onStart: function () {
+				$('#soLink').attr('href', 'modules/socolissimo/redirect.php'+serialiseInput(soInputs));
+			},
+			onClosed    :   function() {
+         	   $.ajax({
+			       type: 'GET',
+			       url: baseDir+'/modules/socolissimo/ajax.php',
+			       async: false,
+			       cache: false,
+			       dataType : "json",
+			       data: 'token={$token"}',
+			       success: function(jsonData)
+			       {
+			       		if (jsonData.result && !opc)
+			       			$('#form').submit();
+			       },
+			       error: function(XMLHttpRequest, textStatus, errorThrown)
+				   {
+				   		alert('TECHNICAL ERROR\nDetails:\nError thrown: ' + XMLHttpRequest + '\n' + 'Text status: ' + textStatus);
+				   }
+			   });
+        	}
+				});
+		$(document).ready(function() 
+		{	
+			var interval;	
+			$('input[name=id_carrier]').change(function() {
+				so_click();	
+			});
+			so_click();	
+		});
+		
+	
+	function so_click() 
+	{
+		if (opc)
+		{
+			if (!already_select_delivery)
+				interval = setInterval(function()
+					{
+						modifyCarrierLine(false);
+					},10);
+					
+			else if (!$('#edit_socolissimo').length)
+				interval = setInterval(function()
+					{
+						modifyCarrierLine(true);
+					},10);
+		}
+		else if ($('#id_carrier{/literal}{$id_carrier}{literal}').is(':not(:checked)'))
+		{
+			$('[name=processCarrier]').unbind('click').click(function () {
+				return true;
+			});
+		}
+		else
+		{
+			$('[name=processCarrier]').unbind('click').click(function () {
+				if (acceptCGV())				
+					$("#soLink").trigger("click");
+				return false;
+			})
+		}
+	}
+
+function modifyCarrierLine(edit)
+{
+	if ($('#button_socolissimo').length != 0)
+	{
+		clearInterval(interval);
+		// delete interval value
+		interval = null;
+	}
+	
+	$('#button_socolissimo').remove();
+	if (edit && $('input[name=id_carrier]:checked').attr('value') == {/literal}{$id_carrier}{literal})
+		$('#id_carrier{/literal}{$id_carrier}{literal}').parent().prepend('<a style="margin-left:5px;" class="button" id="button_socolissimo" href="#" onclick="redirect();return;" >{/literal}{$edit_label}{literal}</a>');
+	else
+		$('#id_carrier{/literal}{$id_carrier}{literal}').parent().prepend('<a style="margin-left:5px;" class="exclusive" id="button_socolissimo" href="#" onclick="redirect();return;" >{/literal}{$select_label}{literal}</a>');
+		
+	if (already_select_delivery)
+	{
+		$('#id_carrier{/literal}{$id_carrier}{literal}').css('display', 'block');
+		$('#id_carrier{/literal}{$id_carrier}{literal}').css('margin', 'auto');
+		$('#id_carrier{/literal}{$id_carrier}{literal}').css('margin-top', '5px');
+	}
+	else
+		$('#id_carrier{/literal}{$id_carrier}{literal}').css('display', 'none');	
+	
+}
+
+function redirect()
+{
+	document.location.href = '{/literal}{$urlSo}{literal}'+serialiseInput(soInputs);
+}
+
+
+function serialiseInput(inputs)
+{
+	updateGiftData();
+	soInputs.TRPARAMPLUS = soInputs.carrier_id+'|'+soInputs.gift+'|'+soInputs.gift_message;
+	str = '?firstcall=1&';
+	for ( var cle in inputs )
+   		str += cle+'='+inputs[cle]+'&';
+   	
+	return str;
+}
+
+function updateGiftData()
+{
+	soInputs.gift = ($('#gift').attr('checked') ? '1' : '0' );
+	soInputs.gift_message = $('#gift_message').attr('value');
+}
+
+{/literal}
+</script>
\ No newline at end of file
diff --git a/modules/socolissimo/socolissimo_redirect.tpl b/modules/socolissimo/socolissimo_redirect.tpl
new file mode 100755
index 000000000..4b17f1a81
--- /dev/null
+++ b/modules/socolissimo/socolissimo_redirect.tpl
@@ -0,0 +1,46 @@
+{*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 6735 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<script type="text/javascript">
+{literal}
+	function change_action_form() 
+	{
+		if ($('#id_carrier{/literal}{$id_carrier}{literal}').is(':not(:checked)'))
+			$('#form').attr("action", 'order.php');
+		else
+			$('#form').attr("action", '{/literal}{$urlSo}{literal}');
+	}
+	$(document).ready(function() 
+	{
+		$('input[name=id_carrier]').change(function() {
+			change_action_form();	
+		});
+		change_action_form();
+	});
+{/literal}
+</script>
+{foreach from=$inputs item=input key=name name=myLoop}
+	<input type="hidden" name="{$name|escape:'htmlall':'UTF-8'}" value="{$input|strip_tags|addslashes}"/>
+{/foreach}
diff --git a/modules/socolissimo/validation.php b/modules/socolissimo/validation.php
index f00eb7c30..dd7e3d2c4 100644
--- a/modules/socolissimo/validation.php
+++ b/modules/socolissimo/validation.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -34,8 +34,8 @@ require_once(_PS_MODULE_DIR_ . 'socolissimo/socolissimo.php');
 $validReturn = array('PUDOFOID','CECIVILITY','CENAME','CEFIRSTNAME', 'CECOMPANYNAME','CEEMAIL','CEPHONENUMBER', 'DELIVERYMODE','CEADRESS1','CEADRESS2','CEADRESS3','CEADRESS4',
 				'CEZIPCODE','CEDOORCODE1','CEDOORCODE2','CEENTRYPHONE','DYPREPARATIONTIME','DYFORWARDINGCHARGES','ORDERID', 'SIGNATURE','ERRORCODE','TRPARAMPLUS','TRCLIENTNUMBER','PRID','PRNAME',
 				'PRCOMPLADRESS','PRADRESS1','PRADRESS2','PRZIPCODE', 'PRTOWN','CETOWN','TRADERCOMPANYNAME', 'CEDELIVERYINFORMATION', 'CEDOORCODE1', 'CEDOORCODE2');
-			
-//list of non-blocking error	
+
+//list of non-blocking error
 $nonBlockingError = array(133, 131, 517, 516, 515, 514, 513, 512, 511, 510, 509, 508, 507, 506, 505, 504, 503, 502, 501);
 
 $so = new Socolissimo();
@@ -44,20 +44,27 @@ $return = array();
 foreach ($_POST AS $key => $val)
 	if (in_array(strtoupper($key),$validReturn))
 		$return[strtoupper($key)] = utf8_encode(urldecode(stripslashes($val)));
-		
+
 if (isset($return['SIGNATURE']) AND isset($return['CENAME']) AND isset($return['DYPREPARATIONTIME']) AND isset($return['DYFORWARDINGCHARGES']) AND isset($return['TRCLIENTNUMBER']) AND isset($return['ORDERID']) AND isset($return['TRCLIENTNUMBER']))
 {
 	if (!isset($return['ERRORCODE']) OR $return['ERRORCODE'] == NULL OR in_array($return['ERRORCODE'],$nonBlockingError))
-	{	
-	
+	{
+
 		if ($return['SIGNATURE'] === socolissimo::make_key($return['CENAME'],(float)($return['DYPREPARATIONTIME']),$return['DYFORWARDINGCHARGES'],$return['TRCLIENTNUMBER'], $return['ORDERID']))
 		{
 			if (Context::getContext()->cart->id)
 			{
 				if (saveOrderShippingDetails(Context::getContext()->cart->id,(int)($return['TRCLIENTNUMBER']),$return))
-				{	
-					Context::getContext()->cart->id_carrier = (int)($_POST['TRPARAMPLUS']);
-					if (!Context::getContext()->cart->update())
+				{
+					$cart = Context::getContext()->cart;
+					$TRPARAMPLUS = explode('|', Tools::getValue('TRPARAMPLUS'));
+					$cart->id_carrier = $TRPARAMPLUS[0];
+					$cart->gift = (int)$TRPARAMPLUS[1];
+					if ((int)$cart->gift)
+						if (Validate::isMessage($TRPARAMPLUS[2]))
+							$cart->gift_message = strip_tags($TRPARAMPLUS[2]);
+
+					if (!$cart->update())
 						Tools::redirect();
 					else
 						Tools::redirect('index.php?controller=order&step=3');
@@ -81,7 +88,7 @@ if (isset($return['SIGNATURE']) AND isset($return['CENAME']) AND isset($return['
 		echo '<div class="alert error"><img src="' . _PS_IMG_ . 'admin/forbbiden.gif" alt="nok" />&nbsp;'.$so->displaySoError('999').': ';
 		$errors = explode(',', str_replace('+',',', $return['ERRORCODE']));
 			 foreach($errors as $error)
-			 	echo $so->displaySoError(rtrim($error));	
+			 	echo $so->displaySoError(rtrim($error));
 		echo '<p><br/>
 			 <a href="'.Tools::getProtocol().htmlspecialchars($_SERVER['HTTP_HOST'], ENT_COMPAT, 'UTF-8').__PS_BASE_URI__.'order.php" class="button_small" title="Retour">« Retour
 			 </a></p></div>';	}
@@ -98,15 +105,15 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams)
 						  'A2P' => 'Livraison Commerce de proximité', 'MRL' => 'Livraison Commerce de proximité',
 						  'CIT' => 'Livraison en Cityssimo', 'ACP' => 'Agence ColiPoste', 'CDI' => 'Centre de distribution',
 						  'RDV' => 'Livraison sur Rendez-vous');
-				  
+
 	$db = Db::getInstance();
 	$db->executeS('SELECT * FROM '._DB_PREFIX_.'socolissimo_delivery_info WHERE id_cart = '.(int)($idCart).' AND id_customer ='.(int)($idCustomer));
 	$numRows = (int)($db->NumRows());
 	if ($numRows == 0)
-	{	
+	{
 		$sql = 'INSERT INTO '._DB_PREFIX_.'socolissimo_delivery_info
-										( `id_cart`, `id_customer`, `delivery_mode`, `prid`, `prname`, `prfirstname`, `prcompladress`, 
-										`pradress1`, `pradress2`, `pradress3`, `pradress4`, `przipcode`, `prtown`, `cephonenumber`, `ceemail` , `cecompanyname`, `cedeliveryinformation`, `cedoorcode1`, `cedoorcode2`) 
+										( `id_cart`, `id_customer`, `delivery_mode`, `prid`, `prname`, `prfirstname`, `prcompladress`,
+										`pradress1`, `pradress2`, `pradress3`, `pradress4`, `przipcode`, `prtown`, `cephonenumber`, `ceemail` , `cecompanyname`, `cedeliveryinformation`, `cedoorcode1`, `cedoorcode2`)
 										VALUES ('.(int)($idCart).','.(int)($idCustomer).',';
 		if ($soParams['DELIVERYMODE'] != 'DOM' AND $soParams['DELIVERYMODE'] != 'RDV')
 			$sql .= '\''.pSQL($soParams['DELIVERYMODE']).'\''.',
@@ -144,11 +151,11 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams)
 					'.(isset($soParams['CEDOORCODE1']) ? '\''.pSQL($soParams['CEDOORCODE1']).'\'' : '\'\'').',
 					'.(isset($soParams['CEDOORCODE2']) ? '\''.pSQL($soParams['CEDOORCODE2']).'\'' : '\'\'').')';
 
-	if (Db::getInstance()->execute($sql))	
+	if (Db::getInstance()->execute($sql))
 		return true;
 	}
 	else
-	{	
+	{
 		$table = _DB_PREFIX_.'socolissimo_delivery_info';
 		$values = array();
 		$values['delivery_mode'] = pSQL($soParams['DELIVERYMODE']);
@@ -174,6 +181,7 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams)
 		}
 		else
 		{
+					(isset($soParams['PRID']) ? $values['prid'] = pSQL($soParams['PRID']) : $values['prid'] = '');
 					(isset($soParams['CENAME']) ? $values['prname'] = ucfirst(pSQL($soParams['CENAME'])) : '');
 					(isset($soParams['CEFIRSTNAME']) ? $values['prfirstname'] = ucfirst(pSQL($soParams['CEFIRSTNAME'])) : '');
 					(isset($soParams['CECOMPLADRESS']) ? $values['prcompladress'] = pSQL($soParams['CECOMPLADRESS']) : '');
@@ -191,11 +199,8 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams)
 					(isset($soParams['CECOMPANYNAME']) ? $values['cecompanyname'] = pSQL($soParams['CECOMPANYNAME']) : '');
 		}
 		$where = ' `id_cart` =\''.(int)($idCart).'\' AND `id_customer` =\''.(int)($idCustomer).'\'';
-				
+
 		if (Db::getInstance()->autoExecute($table, $values, 'UPDATE', $where))
 			return true;
 	}
 }
-
-
-
diff --git a/modules/upscarrier/carrier.jpg b/modules/upscarrier/carrier.jpg
index 5a84f12d42961247bfbaf227f9720d89517997fd..02c3ad739e277f01a60a5949ce5e4779014e911a 100644
GIT binary patch
literal 1798
zcmbW$d05hC902eimmsK#0(mSXj}DE>OkCDt%}JrP%v2I<tQja6d5c%@w3YJ+eYD85
z!^b=-%UOA_)L<*gEiLDqCo{v_G8Ih$MHsd{+w<(NZQu9!=RKb9=RNd2`d5It4~0qr
zKp+4B8494+0Xx0?z4rth^!Fr$ogi|em|=tj*UeiA8{%Wxr@{zSpS=VhKkvPS1k$#R
zn+VbI$4|23k_aCWc5FrJ<$xCe0fSenA)tl|L%?8AC=3aQ8zD@PCMGB(3T0|$VQy-M
zHbbGzapq`C3>J$uS+&{<hq1E2U@<G3fFOo7P?#|cW{fdKnPUEP=)VWh2!IF>As~AI
zj0Qo_Abk^HXF$S0?*sTVKwv|TMsS2N5@ncBYYu=x5C|9wS;^Wk`?O&kfTCd*YhCvk
zSspqLw~xkbJCj?CaQNi@4_N>98ArD-W4<y*;#ON(+c>RTzhR^Ec6XA;hdVsIKJ}*T
z-ADB~91s{pI}%I}J;7v!g|j)aaq$Vf#H8e}&z?*BCOsoF@4`jVrTohUg*Qq{%gS%w
zx?S<0x~8^H{N2O)$4{DMPn&=I>DezGzjk(Y_w@ED28V`6M#sh{UMpwk-pwzl)SAT=
z7YKm-!7}uJ!2aPv8(d&06as~>xIkc@p+V44*jiU3i#><n$D=Lnx1B*?KFKY<|AVoE
zoBs^<%b0c~&T+fKNx4FMFZ*|}ul|?pFWBF%KEMP5GF%=64UmE5UET35TyWE|qt#qC
z&izPt>`ssVz;6?#Wu6Ut#=Mx^FoYf`DzKrFr$ri?ZjmF9S%->$K3Ogjh35E)Su7p8
zUXrYqDql=ATFt6sST&hUIj4PZ{p+FSGKPXNwLGc^5+uHEvOxz%k6-?l20`n)dl#|Z
z&mF3iyr<83Pe9j4mkx-9g3LsmyB=sRY@F8vry_{<ypT4uI*3Vr+>I1AEGwM&390+)
zm0`m8h-r2H8~SLmEnmZLb8pJk1CM6w`eukezGI!X2P3SzmRe_ZKMjiu8kQuCm;Jiu
ziQmz8oMXrO;&j8OiQZ>#;u&8^Embr{^V|GajC9Y7^cW6_ecHkKR!w8}$Zl5PF*%>9
zDWFa10qki+spy5v%!LJfd+i$Ap?6WQ6IRntzU88lXi?iYwJf}0OcVKU(*We67W10=
z;u<xU-dE%%EJGfBaF!d}#`mNSCz`P)t0{tOslueYm6c<Y%2T$HSMN<}q!U-U3`Q!q
zgRTb@FK=Ko5y4JeX@CEmz*GBM2RXb76wKCHij^|S{m{W8$i6P6jEx^3&Lj702UO3r
zm30zwx<hbisB`qFO3<p>cKPv<q*&i7%^JfYGVC}yKuuL%`Fv)6iM?1^l|_z?s;Csl
z^xjFWoE1OolrbV+T4gm2m^BKjmU9j$;TdtOs)=*X70bmXX_1e##M;up$c4Jj6ln(D
zM15t(V{qN0!NhqNGMvMAWS3{lb-P8h$qFfNxr{!uD%}n*`5@I_$t@REv2Cu2&%{02
zIhh<1@~u3b)o(XVO4HC<a$4kbwC9Q_QMCWX9gYu~n^_GpTX;)-?{;T&X4|-mhNkJ=
z^S><&oJ+V)?$}KZufw}Z#9fmmUZjFMAx}m$ncZC}B}^TTkw3EXN~9sbDn5RrrVXnm
zdxs9V3`%8osBr$OI;p@c9NgD4aIBn}M=8VwjxF7j|JeFedc<<r&t+Pj6c8|6(J{im
zr1j*93uc4mS-0_2hSKF_Z*$7Ynf+OtHkUb4j;0;%lkOr%w5iwk4`kHZN-fl%(R?2~
z%)Laq(0WJ}6y80`3e=>It4ITlQW>Mf+sKt_uYB|Qf&=otse5Tj^{(U(GyM2d&9C5@
z^IO(voz=m&w4|<GM4^YDWG+AGTp^R~L6L_tHG+|%{>Z`$3iu>*XgagLvhgrmW%H>8
zH*#a~+!kv=<2^mlV)zssmM}tPCzHZc9fndaPt_j4lNwnjrz%TRlCCU|oxdIVv^I`m
zJg&3;Stl!HcP(<SY^J*e^n_&JeUdlu*0LyhZsLn*%+(Uyjj}r&Rb>0P)XqyHIZp9A
z-xryGb6)x?kvCbe<TN3u9?gQ(AnMbD<TjE8VQF)LV~#eauJc&SY=!WScK^Ws4I1yT
s3DTj7#S>c}&(=hr-*`PJw{5Ald0kC%cNHbC1RszT?_B?2G)&+7J21mTk^lez

literal 5140
zcmds2XH?V8(*Gx+mrz0wr9+U8f^>*T5eP^LphyP+Dbf`I5osbt2oOM}OYc=6RIyQ2
zq?d#$2-2I>P;PwgeaqMP>pOd<oHM_joijT-dp>?X3oz<vqBH>z2n5)Y7H~cXx^vUt
z<vswQP$B>o005K#GYA5JNY-Cw{g3_Ea{)vKNR#wE5?=z5|Kpb;f!P0JE0S!X|KPzS
zj3fvQ(2=y--#{d)=KlY~eK6o}`TnWFe`zh0o*|Evgsg<5Bydgu)B$n`85tRboFvG}
z$tfu5s3=LqKub$a$Hc(Q%*4RN1Y_m60AslXXJTUGWxK@5$<56TyTFIw<3ez7adZ6*
z0wQgtq@aXSQ9-#_m{_>}&vgC)V4?y-fDj0X4*)ZPAWWe1F90VgbutL43;vrZ0T2Zh
zn2a1kO>*lo0w4$kL`t2K8cO*W0|G<H0CFY@N@iY3RT$dNn}ts*kqXYQR#W?qRZvLY
z=TYdVfeY7e8r`#ZaP$q!sT<tVFgAG@o|H=p#|{F(q{IH#X%KRNi~<CvBss4!kx~JH
z!Q^yc$iK7sizZ_t=Vg}UQ$^?0P{3G>?7Tx0KMu@oNvU1?w0({T=pZBz6NCv+0h%6_
z7<1ib(Kf2IIy-f#seWB)Y~d7)OuqqdUgl(X=c#b|$dgU;v#EG<DASuYkTLcHn?_lB
zOZpcKjjqtNQPMQ4g=wUD6|&g&9N@1ZPJ9n^^YG&-Xevkx?+JgFdQrI9H9D35S2|8A
zs-kSipnQcgDRsM2uS?%7JNkFhPxd6pqNTNE>(T3&=mO)_t(zz22HpN;X!O&_ES8n|
z66w>XzP`Dj1`TWP=97m0pf6)#zL+G_cco%Qy@56>Ie5Fz^-|{b9rtLT;`n9R*>?0r
zQ$*AkGFq3<jtZm#tUf)F^gDxT*D-Hn&lb$As|TI;>u)Cb&LgY#Ok3%-iZ-D8hF2PT
zJe=6eb={pN=^^mTI;?&O#cYAJktXg~^R-IgmM7a}f|BaS9cTNmoX3U-XG{i3k?g3+
z@=$sC4ta&rF_796%NJZYSmmTq*Tlx#IX}MtLA~3kc^3W?;oc5$oXznXV=9%_FIc4I
zsYLj^sohRPdLQCJ`qq!giQBJxh~j4mmcRmac8THMS6@v7ZOG|_4>6GDxAG-=Rb+@i
z)W$JAor=S&1~cmy#yg0Xi`mp&&J(?y&RMGNWi+Z=h7{Q&ZPw%8u0T)M7E|=h??MqS
zw8g^9Nd|ZNnF|fSBl*!9mnV#clJdoH6FlvYnk@L*r0k1=mXZs@Fed)<B53LbDKDU8
zh*};_GXW6sE;eh<!L~7(HNEfsOcYTZOB@;5%o%zwLcrVD44$oJOVr7C`||pr!Y@Ja
z4h5-M^!q6E3u5D@sfJ*O1`XANskbXGR(bBqQzck`IkruO_+RqDCJc%-GFrOt(5@LC
zXa=Jx_lD8rU!NX1_blyHk|ixLD6-qgW*5xCDYBlKM{1^bjdoCZN@WE7Y9^NXc5swD
zKpUkj8o<!0KR{V498bhF7S#-V9GCl?KdT8&J?`P8F^s-%-fHOwIU(07SkK*|rX$#a
zrv2Xi>Bn2l$33+6_Zy=6<7$8GG?U$2d8+pCG*Mu^&h^%Dja}%GLKVXl&Iob5l_L~z
z?}bOx=QkBj7t$K0E@xY+FNAsC-Rl*T!&y|%?xpcXhR1w|tsgf({hoY^Ck&SbbzBu_
zy4X3g+GTX7?l@)<Bp#;4|AF!5ZSs*90})!YgXP#8xF3+uzpPH{a3(p{>HM!Kwp!xy
z_?4p%%4EcK?fNjrU#<oaQ}zsO6nks_iiVGlM)@vAG9!#-4i9t#B?ni{vB`yB>9Bbr
zl(ra|IiHcFdRmO?kP(~)A7->S4BS~>c{96p4s`n{g)Z{=nMu5>UT6N`jk<SBTU`5w
zJd}Sx2WJo}e33K2r-Ta=>Xltskwj?HwAG0kntJ^fPUeZ=><>g|IB`VSJ~{`a`viN}
z=(3r!uk)>c=pAa80}p^YdFt3_1U$sB1&x)Z=J9ZDW@pi|#m&}AX^qjOESDbij4xFD
z^_}S*bR!G1cAu2@W|ipU?!@A9Mv09Txx3f+Wslsiew>=tmhU?UxE_r@V5$b|gRJa1
z7%$D9q4r7@yaS^<U=l>7#%{b@8`J%?uNz&?$|X|oQM~NMhy=NKnb6Sefi9T;3}p-0
z47?iL-20HLCic}h*^$td<+r-e>b*Gmn@)5@?Xc=EBJLtu{kJP9tv1V)f)1~{q*Uj)
zw^-#V#hbj(SIjsfD-5yF7`RYz(TAzhJ)(ALQ;Pj(BxQDRghgJ7Ny7$PX1m>Z&Ul$L
zfAnWZHlv<$npRiU9BJQqGb=d7=yP6r!GI$umfaC4rNxnT11i|fOy@0op)l2f&k?^W
zJn8LS`vPmQFn9N0pwcx(m~kSr-F7nPqkbU27`w<$f&WPKK=w<ubKq+BKE}kxV$I^`
z>ccU1_<$#Ga!N%s52RTsS)Q9u1f8eC8gXW)vd&RpUNA0kJ8r9mNBhT%m0ya3V;K#q
zn3t{aeS>RD2Dh@D`m!4A90&ht7`Vmo%c=2ak;s9!=RoppW?7FA>6;PA(ckC5{WR8<
zUmI(Jni)h%(wt6_M)&Kk{Rv9uN?;>O+DJVNiE<kC8L2Od^!O0YZiqD>_R|dgCH!L>
zo#)YaLrGz1>9{_=Sfq8`LzP(55_=AOsanoE`#uG6QuKE^RERGYj{8J*>&Hg-4Oj-R
zWBwT&_vO!F+1}lfSEE;qr8mNxtt(Em3pCwDJcASr;01z_i854mSGKC(2RlA1gYzBU
z;BFHqp7mZIVJV$`P_8!S!~0%j0a1_P$46KQ5M)MAOD|Tt%FY+-3P>)<CWNKT^CF;R
z+(mE|d|_sMN!`=c!0!e60=4rrojP|Cv$%YX>y&yQSlzW$<wZ4V@t*_tTvvL!82vG~
zH?7LQUmrF$<v<2L4&T=t%J+Sf)gyP3^X#KLRlVCMSWC3-Zg#@%358$6&IAN`gWhWw
zx!9QgVC+CoKms9ZPw)AD!mGJ%iA}!CkGMQmP-~@5EhT}M9Q!0dxUbmQjRwS1GIwCp
zYRS1;-jwakoc0B4&4moPR`VB_<#WDpj<F+`RdCW57ck;xgO(n5{SFzg1~uM{t_tGm
zU4n9}`9!c<Rq`F(&%Xb@%R>w|FD`a{+K;tj=y_s)R;F@Ud!FWXdR@+br_;P-alG~S
zjVH)^79JNz>&vJTl4su@h&|d}aL&s;2makXmPMws#l02Ss_jRyN<K?d8@gq>N=38T
zZyvP5|7YOfcpXUnW6YH@0!NKOJ=PddS$AJTPO5WXVXZe(>jj(HNfiuLbALwo?nd(=
zl47-n|AuZ}lWKl`e30J0RlxnFoOJ`)-{u56F(r(hGkXz#k=R+<kzVCx)lS8%*@o&m
zSiG&ORaJYO`(y4w_#Fl({nO2I>K~$kDuyO78@HxRgQq^rmv(H0x0FoSPK&1@?4L&s
zu5S{I33MjrVqO)_{;h9fd6OG8mkqT$y@yhm_YSkIuXcHkUZ?$LD3AOQmr&c+{;769
zxU~It8rFS1kRa5~u!!D|E{-es@hNSm{2U->C>_z?JI&ij*D<J}wtl(nOug<Wci{Cl
zz`^Nt5O^}D!S*4Bf(<<z)hsNDzpXHlELh2o8mf7t_A1ZY(G`-*TwNgAEr2+SY23-s
zVK&KojzRPvI1&YMzh9Q&UT-{TnpBb+qFD<>Tut#pL;O>OFq{CnCDcdm@#oUJLuqQ}
zUqevXupz1y6r12=z~M-n>sJ{iZ*|LUs15V8(109R>8E7@!dB^iZWBtsHr+R7H&&Zj
zH?A=}0ues=GEfNL`m%mdB70bfCP~2MzI49Vv{#0JDCfc~STPGZPfz|<EbXh~tD|c~
zO$iYnRoJD@BV=jY+n}7KuEv<j0U}$x!|;};R8{Gls4Io)Zd5JltEg$s?HOfo2*MsC
z`B|aJbi*Y{^LStOp%evS0h+gC;`-4?PWCPiI&+rmJ53juS*iEl*sjw-*03%yG2D<7
z$)SFTycGpim#oxVYG+Us33%El=~~y*sBLaY5KnQ`g2>Mz_o#-Z%D;!gWiwj5;*om%
z9X(eB_-Fo%-jB@qW291*5zlq9Ihk%gw>!JH)$%Li32dydwvhA*J~{5TQPD}YELl$J
zZO*M!(ywdrsd3FzzBHNqEs`h=T3HIlIS77eXlU~3;S_279rw_0aL}X?TA(L(QtqcJ
zbVqSMXS*!DzQw+J!@Fv2|All&6!wMYs)xhA?#ExPCKd<>tQp&f%O#^z(&^29h7!Bv
z@3wD$bTreR{aO@_+EUg&cvOxKO|*QKpO<@<^l&W8&LuCo$1LgU##BspJuaCyl(0M^
z{LOpvb?An$ik_DY>&z8sL&N%=?yVgvTJx7NsLhRYfCid-XGi;Ty+c#RfLYGqgLfb2
z4=jC;qPm#H+-P>MZ`U`OiY7;>2oM5WR?$5?!fY%aqX*|e)4Gi8?)Z}%F$uNP`^$#Y
z!1i)q+04f#e>{89F{Is$#g@RHPLOGfU!)w<bE+@Kuj?fy;xz2X)A|G892;%@JL_9v
zv>0R0p$=SdERooA00=3S?a2^KEK{zp^EAHuD7=siofS>U>#V-*w!EC;k|ksoPWX0^
z4<n@6MYcF9_A42-xyaMwhq#o#K6Euo7(Bhr?~nD$`H7lO%iwHPrP~@BRJs*BOh1zw
zs?bx26#X8@nvzO~z4q|O8>^S-ceMU&>&XP`b=JMIkeJz9cWuMioQYap?WYGLulmgc
zx<&i(l2p*vRBvNm!I)<n#~Se)zo4L*1jT;A*}dG!78`V_VEs$?n*Kt$5Z)txavrC}
zys+r`U9G-3uj>r^S`wxu_`w^dxpfg1>lyw^t6<`^MUM{XOzkL)9*w0cXrUKb2PI|+
z+BXIceEH!RAlB>WHOFn@rs>_8l`6egY4)Wgr8g_pvQ((P(kpkeVuwfHj+w99T~B$i
z)2L3!Hhfm~EwsNbZ5`Q`cKE516%|=~&p3p!bw~YqphS507VWHYm#|)B74-nWUep>Y
z5ueC8oGd?7Ortg!5XJyjrk5CgG``t+X+3I^=^NZ5vuh+6=12Kv-9}M1vR0`hu1j#a
zZ*<wCFAx#?zJG_Sf1Bf}kTvcHOEF8a7f<ZH_tCDIufD!0&>8d@Yye%veS4HSfI%h|
z33mAg{0z#E1?a|}K=fCH%c2A8yK8J><S-U%Sv(w`_7lDebFETJDcax5%!4&o{nJ-*
zE3g+G<ZY`h&^?0z$YYg~3cUU8CZDE~4?Qsrk@qvOD1)_JXe&M|^}P#wO6kR9?u5}5
z8Ujdxj7#~c2yKO|ZmF1v#a7zkG@CL9COa9@!Eri~vx39srhr-G8U2|w{?I7KR@9Ao
zGhwvey;93cx}QfU;Q{&~iBFVS%rgTDDumQ@lJi1<9>GTR70oq!<Ei1u&G3z9T>C5t
zTpI$@Qog`6L=ay3EIk^?IO@sKN6$4gbw=~t8znqv+oO&M%VkbLDFfh_fynW;-r0tw
zl@0s|?VHHB3D1CVV*j?`^xWF)Cb%$a@X|v){hRGNW)9ObfTm7=!bwh2+|NoXJB7Kn
z6*><1C21GE_-~CRQhVR(o?J(<MoE-;s~5Q)kYCwBH%loL8znwo%o)h<V?8E4UBgN?
z(UIw|wL$1T5%}9bNyi<dZlki##0R%_zNMDa4?hp@h*}`(3i9gygke!4^0G!FV9v@Z
zt|`yhN$12g-CI(4uUGwv&-0<P<W3ZbyONh8p-Sla+K?A%E+8s3EgoPN*nn^9*R3mx
zNN&CJ@k8ti;!`Xei3a2ZP`58x1oCQ8Ax*AH?=J)G?c!WllWG^+VYIAhda;{qkgBH%
z?MSoo?<Iu5@WR`9JZdoo8iOKxBs27}AZG63;#&fi-Zdz3^4<l+vS@YCdoqj42MEwG
z?-orYlt=7};1Z}?v`!pmpMvNd#d{Mu_Nv~w>UPsdvS@0~_XyzRy*p7HKA`Th?3k@=
zsMsM!J^f;;WTyUVoN`E=m>=oVQDVR0)0+y^lI`^^em;7(Ba3mZ%y#Q*D!ztw(A0OI
zuy$^nx-C9wESDaeIPAx$h0No1tQlvZ0z5@XSO$&wavNr{$U}Qn4%3r_b#JII5jOSm
z-U0uB+JV?q<T3Zz7;`^F4Qr!Q<2ds-8is_Z)F{0mA@CZbhHz`SfQjhD)5@6z1qr>f
zTl-rY5ccuwCu5@e%S4IvhQgV94L5O}`bbSfitSFh<bV>b(rCo)<)#bke$F*5k{2j0
z<9?T#>tLT3%Nyc3dF4&F?=W!qmY7|vaAEx|1qnU$o`O2n(YlES^FT6oXMr7X2C}kC
d-Jy;tqs6yYcsZmf_lhvh6NjN;bnyAazW|*mF2w)<

diff --git a/modules/uspscarrier/fr.php b/modules/uspscarrier/fr.php
index fafc2c926..e8ba2ecb6 100644
--- a/modules/uspscarrier/fr.php
+++ b/modules/uspscarrier/fr.php
@@ -2,20 +2,21 @@
 
 global $_MODULE;
 $_MODULE = array();
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_ec6bd501021318b872a9eddd897a9cc2'] = 'Calcul des frais U.S.P.S';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_098087ab799def1028233142cafeeafd'] = 'Propose à vos clients le transporteur USPS (US Postal)';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_d7897df448ce113a0205078a9255f7b7'] = 'Transporteur USPS';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_660e7e160b8b390f9d36f6886cbeaa9d'] = 'Calculer les frais de transport pour USPS (United States Postal Service)';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_883fa0069f4b0454e2277dd567ab3991'] = '\'Unité de poids (LB ou KG)\'';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_5a3ceec65d417f5d92c26dbf0dccc00d'] = '\'Unité de mesure (CM ou IN)\'';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_4d470fde8487e755a50e9235e3dc13ab'] = 'doit être configuré pour fonctionner correctement';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_d2d22fe4f85d971b090bcbacec8f0123'] = 'USPS User ID';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_813c2f71e65f4cd51a9c529ee2dd7efe'] = 'Zip code';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_20449d3f0b6c6b9265a5cd2a470a6451'] = 'Poids du colis';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_bfc00de34bc04366e7fee516adf7dca5'] = 'Frais supplémentaire';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_761c02f2b956cac5abe5539c6d908508'] = 'La taille des paquets USPS';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_ca9df8a12e7558c34bcf7b88aab5cba5'] = 'Le type de paquet USPS';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f347d2e6d32688d9174b7aa1fc0124b1'] = 'Cela peut il être traité par une machine';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_abca8ad9739957246c02470f31f040e0'] = 'Mode de calcul';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_d2203cb1237cb6460cbad94564e39345'] = 'Regular';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_3a69b34ce86dacb205936a8094f6c743'] = 'Large';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_5c5f284bdf0e24e2b65a151660b4aa95'] = 'Oversize';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_47c14840d8e15331fa420b9b2f757cd9'] = 'Variable';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_8c2647c84442d515b68c6fdba7d4fb25'] = 'Flat rate box';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_d3d3b81729b689260abfd1b21de630ea'] = 'MD flat rate box';
@@ -28,12 +29,12 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_f8320b26d30ab433c5a54546d21f414c'
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f827cf462f62848df37c5e1e94a4da74'] = 'True';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_386aad80d82f8245e9ef80352a2240e8'] = 'Tous les articles en un seul paquet';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f35eb2a913a3fd6fd8e661012cf0ebd8'] = 'Découper un article par paquet';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_5947e2ae63c0a33524cf81c44a1db580'] = 'Transporteur USPS';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_3a3a3ea18546ae6529e6e439a97b040a'] = 'Calculateur de frais de port USPS';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f57cff5425b6e64843c5f066c5b310d0'] = 'Statut du module USPS';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_09bdd414ce843927aa3dceadc8bce034'] = 'Le transporteur USPS est fonctionnel !';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_ec8b84c83dfee20afa4c2f35245a254b'] = 'Le transporteur USPS n\'est pas encore complètement configuré, vous devez :';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_3e203b9a16f360b88d90bba6eb61ce61'] = 'Remplir le formulaire \"Configuration Générale\"';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_8c0987b9315003df7dae7f130e3cf58e'] = 'Choississez vos services de livraison';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_2923c2caf8d0b17f409e66e798ea94cf'] = 'Le module USPS est configuré et activé :';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_82d36b7a513a66cfdcede4d0b56ba36e'] = 'Le module USPS n\'est pas configuré, vous devez :';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_15507d23c7b911b14ebd95a9a0e12560'] = 'Remplir le champs User ID et zip code d\'origine sur le formulaire \"Configuration Générale\"';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_5ea70d7b669a7e15e6d402bd423aa56e'] = 'Selectionnez vos services de livraison';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_e20f6d6f13fe70e78f6e2ab488493ccf'] = 'Test de connection webservices';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_d5377c8cc8c83b501472660c69f694e8'] = 'cURL extension n\'est pas activée, le module USPS peut fonctionner sans cURL mais il serait préférable de l\'activer.';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_52f4393e1b52ba63e27310ca92ba098c'] = 'Configuration générale';
@@ -43,6 +44,18 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_6a26f548831e6a8c26bfbbd9f6ec61e0'
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_d2126da975d5b9a5b846efaf57d3fd53'] = 'Configuration générale';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_b150f21f4d216c6c275de3d69dffac68'] = 'Votre Identifiant USPS';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_ebbbab87d3a60b18f370b76f59dab31e'] = 'Cliquez ici pour obtenir votre USPS API Key';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_87b78c2dbb5786947e830f13097aece5'] = 'Zip code d\'origine';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_4412f0268c3b3690de46390018a96d1f'] = 'Services de livraison';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_25365926cec8ff5e8fbf1e518505c3e7'] = 'Commercial';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_b9c1e1209dbba5bb9b802c765d27e8a1'] = 'Regulier';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_78945de8de090e90045d299651a68a9b'] = 'Disponible';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_04ff9e6bb8238bad1936e3bdf84e8f23'] = 'Choisissez les services de livraison que vous voulez disponible pour vos clients.';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_a691732939e7e7ef90cfe0d6e738f3e9'] = 'Pour First-Class, Priority et Express Mail, vous avez la possibilité soit de mettre les taux \"COMMERCIAL RATE\" ou \"REGULAR RATE\".';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_e3cc25ccb469ec7047d9e7c4c13f4e46'] = '- Si vous payez pour l\'affranchissement en ligne ou avec une machine à affranchir, alors choisissez \"COMMERCIAL RATE\".';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_b3e6424dbec51d0cbf5c272eca58e275'] = '- Si vous payez l\'affranchissement au bureau de poste, alors choisissez \"Regular Rate\".';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_55219991df83d7a6e4a0ed60c1a11e40'] = '- Choisissiez soit les taux \"COMMERCIAL RATE\" soit les taux \"REGULAR RATE\". Ne choississez pas les deux';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_319c2c41aa9f6b4d5b70b56651abe6e9'] = 'Pour Parcel Post, Media Mail, et Library Mail ils ne s\'afficheront qu\'en \"REGULAR RATE\" seulement si les prix ne sont différents.';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_db06a2900c66a3a2cb78fe3a470f1b85'] = 'Poids du colis';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_0274f749472f365e7d48a501e14793e6'] = 'Frais supplémentaire';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_83ad4fdaf06650e6d9d7ca18f82fb975'] = 'Configuration de localisation';
@@ -50,39 +63,22 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_f489118ea95c746d648d36bb50c226f0'
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_659c95668841b7d6602ead454b28d4ba'] = 'L\'unité de poids de votre magasin (ex: kg ou lbs)';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_cc13d156306185fd42a860da3049567c'] = 'Unité de mesure';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f804c2bdebc117d9cde3cddad3b49845'] = 'L\'unité de mesure de votre magasin (ex: cm ou in)';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_2481447d04ae756836d32e3ade240ff4'] = 'Configuration de l\'adresse';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_e1e854ea29e53169a1301076441805db'] = 'Votre adresse (ligne 1)';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_846a54955f32846032981f8fe48c35ff'] = 'Votre adresse (ligne 2)';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_d30f507473129e70c4b962ceccf175cf'] = 'Code postal';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_57d056ed0984166336b7879c2af3657f'] = 'Votre ville';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_f8f5a972333ee726fbe5bb52409c0ed0'] = 'Choisissez un pays ...';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_4e9863cf5326e6714388045321665d07'] = 'Choisissez votre pays dans la liste.';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_46a2a41cc6e552044816a2d04634545d'] = 'Etat';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_cf1580798f7aba85d519afadf1ffd886'] = 'Choisissez un état ...';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_02546d525ab356bd43c91e6b07447496'] = 'Il n\'y a pas d\'état pour ce pays';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_0ddc2a5660f7d095fff34d6b93077c80'] = 'Configuration du service';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_aa9265dfaf7bc267a6e606335d942883'] = 'Taille des paquets';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_52c46f87566159d11390162e99ed9f68'] = 'Choisissez une taille de paquet';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_2afc962933ab94b832df8bfaa34ef05b'] = 'Choisissez la taille des paquets par défaut';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_da42caf26ef85de3d7e48e16ca60b891'] = 'Type de paquet';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_8d2ee0603dfce09b57d60db628cde269'] = 'Choisissez un type de paquet...';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_795de10b1bdcb843b3703c63ad577fc6'] = 'Choisissez le type de paquet par défaut';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_93c8645dbbc33cf8d126266a827a5501'] = 'Machinable';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_67cd0f5256c40c16a6cfd6effe3ab06b'] = 'Choisissez si cela peut être traité par une machine ou non par défaut';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_f297d2cb126758a96ae196f1865f74ec'] = 'Mode de calcul';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_fc805e1616e45e041e8bef86a9e3180d'] = 'Utiliser le mode de calcul \"Tous les éléments dans un seul paquet\" utilisera automatiquement la taille des emballages par défaut, le type d\'emballage et de livraison. Les configurations spécifiques pour les catégories ou de produit ne seront pas utilisés.';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_5cdd307ba6e260beb4801c0c10e22a3a'] = 'Service de livraison';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_78945de8de090e90045d299651a68a9b'] = 'Disponible';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_bafff0b69daa3ece3cf792eba6c3ef98'] = 'Choisissez les services de livraison qui seront activés par défaut pour vos clients.';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_b9947222399c6199839bb327a6f59d2b'] = 'Votre identifiant USPS n\'est pas spécifié';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_805353d2862ea0e658c9ddda871540fa'] = 'Votre code postal n\'est pas spécifié.';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_ef9bd955e165dfb0207877e9fe180aeb'] = 'Votre ville n\'est pas spécifiée';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_5ecc7697a320f93f3ee8fb4048dbd64c'] = 'Votre pays n\'est pas spécifié.';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_98045fb188a9c6076e839672a7f94485'] = 'La taille des paquets n\'est pas spécifié';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_e794e452ed4d2cfa13083693a2c8810e'] = 'Le type de paquet n\'est pas spécifié';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_b25a0f3caa6e0047ede272a6e91dac29'] = 'Le champs machinable n\'est pas spécifié';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_6a88783cc26a04f204c844a555af04f9'] = 'Mode de calcul';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_68c2e29510ba1fade36948082c1a460d'] = 'Utilisation du mode de calcul \"Tous les produits dans un seul colis\" utilisera automatiquement la taille de colis, le type de colis et les services de livraison par défaut. Les configurations spécifiques pour les catégories ou les produits ne seront pas pris en compte.';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_dd3635ee8f6dbca808391e9e2115114f'] = 'Votre USPS User ID n\'est pas spécifié';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_0304084f81483b19b6ef76799d0dcc98'] = 'Le Zip Code d\'origine n\'est pas spécifié';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_1416b880efa6a1706ec5a3a2e354b38b'] = 'Le Zip Code d\'origine n\'est pas valide';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_89849083c326e9e338193a29b398c8d6'] = 'Le poids du colis doit être \"égal à\" ou \"supérieur à\" 0';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_0a4c0dd36c1c6d407a696ba431661cb4'] = 'Les frais additionnels doivent être \"égal à\" ou \"supérieur à\" 0';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_b0e371d9aaf4dd29dcdf94c8f04a73f8'] = 'Vous devez choisir au moins un service de livraison';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_2c73878daaa3c04dfa31722352c48620'] = 'Vous devez utiliser soit \"COMMERCIAL RATE\" soit \"REGULAR RATE\" pour chaque type de service. Vous ne pouvez pas choisir les deux.';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f858ebce2deafd485f17522ca80bca2b'] = 'Prestashop n\'a pas pu se connecter aux webservices d\'USPS';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_9d1b485edd50e6fbd288b340b386b07d'] = 'Aucune description d\'erreur';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_c888438d14855d7d96a2724ee9c306bd'] = 'Configuration mise à jour';
@@ -100,7 +96,11 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_5406dcacf84176fecac51364e10dcdcf'
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_5dd4dce839d0bddf557af415308a9224'] = 'Êtes vous sûr de vouloir effacer cette configuration USPS pour cette catégorie ?';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_3e0cb9fd22b124c0839302fef54762d7'] = 'Mettre à jour une règle';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_dd593f8a542ab628cbba98c709255e60'] = 'Ajouter une règle';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_8d2ee0603dfce09b57d60db628cde269'] = 'Choisissez un type de paquet...';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_52c46f87566159d11390162e99ed9f68'] = 'Choisissez une taille de paquet';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_56ee8a6c40098a28b2e4859d7f36bfc2'] = 'Choississez l\'option';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_5cdd307ba6e260beb4801c0c10e22a3a'] = 'Service de livraison';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_bafff0b69daa3ece3cf792eba6c3ef98'] = 'Choisissez les services de livraison qui seront activés par défaut pour vos clients.';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_7fcafa7c47e984693fcb8a92c0fd1beb'] = 'Choississez une catégorie';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_d725c0166e978cc30853996c70440873'] = 'Vous devez choisir une catégorie.';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_1ef6b71d233ca3c4d73ec49f18cce6ae'] = 'Cette catégorie a déjà une configuration USPS.';
@@ -116,7 +116,8 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_e41495cddec502278844d90501b8f688'
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_04f65a638b5713539804e1f851f11f6f'] = 'Cette section vous aidera à comprendre comment configurer correctement ce module.';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_ec0e6948e8f34818d80f27c309f46661'] = 'Ci-dessous les descriptions de chaque champs :';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_2d6a1f95c12c41a1937520809bb3e0b0'] = 'Vous devez vous inscrire sur le site d\'USPS à cette adresse';
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_6eef8fc653ad4369da95861ad29ac3ef'] = 'Ce champs doit être le code postal du point de départ de vos colis.';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_997eaba18a174723bb35c745d3bcba04'] = 'Ce champ identifie le code postal de votre point de départ des colis.';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_b79cacaef47c6e646f6afaf139b2863a'] = 'Ce champs doit être le pays du point de départ de vos colis.';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_1d3fce5a25604726c1b3c726f9938858'] = 'Ce champs correspond au type de colis par défaut (lorsqu\'il n\'y a pas de configuration spécifique pour le produit ou pour la catégorie du produit).';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_3223a2c4e378eb07a8e0d21f914389a2'] = 'Ces cases à cocher correspondent aux services de livraisons que vous souhaitez proposer à vos clients (lorsqu\'il n\'y a pas de configuration spécifique pour le produit ou pour la catégorie du produit).';
diff --git a/themes/prestashop/css/global.css b/themes/prestashop/css/global.css
index 6885424e1..07e337606 100644
--- a/themes/prestashop/css/global.css
+++ b/themes/prestashop/css/global.css
@@ -1507,4 +1507,6 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
     border: 2px solid #D0D3D8;
 }
 
-.page404_input { float: left; }
\ No newline at end of file
+.page404_input { float: left; }
+
+#order #discount_name { width: 130px; }
\ No newline at end of file
diff --git a/themes/prestashop/header.tpl b/themes/prestashop/header.tpl
index 53f0882fc..978088200 100644
--- a/themes/prestashop/header.tpl
+++ b/themes/prestashop/header.tpl
@@ -71,7 +71,7 @@
 
 			<!-- Header -->
 			<div id="header">
-				<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'htmlall':'UTF-8'}">
+				<a id="header_logo" href="{$link->getPageLink('index.php')}" title="{$shop_name|escape:'htmlall':'UTF-8'}">
 					<img class="logo" src="{$img_ps_dir}logo.jpg?{$img_update_time}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if} />
 				</a>
 				<div id="header_right">
diff --git a/themes/prestashop/lang/fr.php b/themes/prestashop/lang/fr.php
index d50edbe65..d3ff900aa 100644
--- a/themes/prestashop/lang/fr.php
+++ b/themes/prestashop/lang/fr.php
@@ -7,6 +7,7 @@ $_LANG['404_902b0d55fddef6f8d651fe1035b7d4bd'] = 'Erreur';
 $_LANG['404_4f4816c6984e3c832882b39d8fecbd2c'] = 'La page que vous avez demandée n\'existe plus';
 $_LANG['404_21dfea356c48679a5ce6671ee307d2a4'] = 'Pour rechercher un produit, renseignez son nom dans le champ ci-dessous';
 $_LANG['404_a68ba7d969d1294a35138fa501dfb078'] = 'Chercher dans les produits de notre catalogue :';
+$_LANG['404_13348442cc6a27032d2b4aa28b75a5d3'] = 'Rechercher';
 $_LANG['404_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil';
 $_LANG['address_3908e1afa0ff22fbf112aff3c5ba55c1'] = 'Vos adresses';
 $_LANG['address_e9b6b3aa3cab28048d3879710882e1de'] = 'Modifier cette adresse';
@@ -161,14 +162,23 @@ $_LANG['errors_4ce81305b7edb043d0a7a5c75cab17d0'] = 'Il y a';
 $_LANG['errors_07213a0161f52846ab198be103b5ab43'] = 'erreurs';
 $_LANG['errors_cb5e100e5a9a3e7f6d1fd97512215282'] = 'erreur';
 $_LANG['errors_0557fa923dcee4d0f86b1409f5c2167f'] = 'Retour';
-$_LANG['guest-tracking_c2f0859d6f7e84914b60403fa423e9ad'] = 'Votre compte invité a été transformé en compte client avec succès, vous pouvez vous connecter sur cette';
+$_LANG['guest-tracking_77cd9fa27c50288413e2ead667fdda84'] = 'Suivez votre commande';
+$_LANG['guest-tracking_b5a4f215d9c7e8fbc20532f1e7e03e9e'] = 'Créez votre compte client';
+$_LANG['guest-tracking_943a199b38fa52e39a1ee77b46aed98f'] = 'Votre compte invité a été transformé en compte client avec succès. Vous pouvez maintenant vous connecter sur cette';
 $_LANG['guest-tracking_71860c77c6745379b0d44304d66b6a13'] = 'page';
+$_LANG['guest-tracking_109636f722b8fccc95d072b2760a6282'] = 'Transformez votre compte invité en compte client et profitez de :';
+$_LANG['guest-tracking_7661b3dd0ed101708b4c5ba8948ef03d'] = 'Un accès personnel sécurisé';
+$_LANG['guest-tracking_d019547a449e74a964252e9f0077ba3d'] = 'Une prise de commande facilitée';
 $_LANG['guest-tracking_1f1015bbef5f42d858e8486397ad8f3e'] = 'Réaliser des retours produits facilement';
 $_LANG['guest-tracking_6f789eb510f8b335b306e05ac7b17bec'] = 'Définissez votre mot de passe:';
+$_LANG['guest-tracking_a4d3b161ce1309df1c4e25df28694b7b'] = 'Valider';
+$_LANG['guest-tracking_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Informations';
+$_LANG['guest-tracking_4d0e5e8b1d1499804f5b525e9b553f5d'] = 'Cliquez ici pour vous connecter à votre compte client';
 $_LANG['guest-tracking_d2948a89e47a4ad7eb8412c1c260ea88'] = 'Afin de suivre votre commande, merci d\'entrer les informations suivantes:';
 $_LANG['guest-tracking_83fa39a28a4d159061c408fbd6a249e7'] = 'Numéro de commande:';
 $_LANG['guest-tracking_d51b1df43394fe14cd03d5bcb3a7216b'] = 'Par exemple: 010123';
 $_LANG['guest-tracking_df1555fe48479f594280a2e03f9a8186'] = 'E-mail:';
+$_LANG['guest-tracking_f0d1e86ef00ea0cae0b5a1d3adc8b0c1'] = 'Voir ma commande';
 $_LANG['header_0fcd4065ff78fceb3083316ddb958bc1'] = 'Vous ne pouvez pas créer de nouvelle commande depuis votre pays :';
 $_LANG['history_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mon compte';
 $_LANG['history_782c8b38bce4f2f6975ca7f33ac8189b'] = 'Historique de vos commandes';
@@ -266,6 +276,7 @@ $_LANG['order-address_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Suivant';
 $_LANG['order-carrier_f5bf48aa40cad7891eb709fcf1fde128'] = 'produit';
 $_LANG['order-carrier_86024cad1e83101d97359d7351051156'] = 'produits';
 $_LANG['order-carrier_5508a53851720a210e50f7b8a6f66f46'] = 'Vous devez accepter les conditions générales de vente pour passer à l\'étape suivante';
+$_LANG['order-carrier_e7a6ca4e744870d455a57b644f696457'] = 'Gratuit !';
 $_LANG['order-carrier_ea9cf7e47ff33b2be14e6dd07cbcefc6'] = 'Frais de port';
 $_LANG['order-carrier_6f05787682585c32498e88bcd2ea88fc'] = 'Méthodes de livraison';
 $_LANG['order-carrier_e4045598261988d9988c594243a9434d'] = 'Conditions générales de vente';
@@ -280,7 +291,6 @@ $_LANG['order-carrier_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Informations';
 $_LANG['order-carrier_3601146c4e948c32b6424d2c0a7f0118'] = 'Prix';
 $_LANG['order-carrier_21034ae6d01a83e702839a72ba8a77b0'] = 'HT';
 $_LANG['order-carrier_1f87346a16cf80c372065de3c54c86d9'] = 'TTC';
-$_LANG['order-carrier_e7a6ca4e744870d455a57b644f696457'] = 'Gratuit !';
 $_LANG['order-carrier_0d9175fe89fb80d815e7d03698b6e83a'] = 'Cadeau';
 $_LANG['order-carrier_ea3bd794dfeb4537c194ee43899516ed'] = 'Je souhaite que ma commande soit emballée dans un papier-cadeau.';
 $_LANG['order-carrier_5c2dfd55fea1f5c6adef500fcb6403b4'] = 'Supp. de';
@@ -374,6 +384,7 @@ $_LANG['order-opc-new-account_357e8e55cf47b6f04c354179b303105a'] = 'Commander en
 $_LANG['order-opc-new-account_d50965b89f4bf0dfbc5b1f13052421a4'] = 'Créez votre compte dès aujourd\'hui et profitez:';
 $_LANG['order-opc-new-account_7a8fe8aaa64e691d82f429d39e0df3a5'] = 'Accès personnalisé et sécurisé';
 $_LANG['order-opc-new-account_dec9cc6702179299ae451c11633915c6'] = 'Commande facile et rapide';
+$_LANG['order-opc-new-account_4efcd04126e90b74c744bab6c66b6e63'] = 'Adresse de livraison différente de celle de facturation';
 $_LANG['order-opc-new-account_2fdfd506efea08144c0794c32ca8250a'] = 'Créer un compte';
 $_LANG['order-opc-new-account_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
 $_LANG['order-opc-new-account_bf2957630c4209f61a388a08c2154915'] = '(Min 5 caractères.)';
diff --git a/translations/en/admin.php b/translations/en/admin.php
index b2320b0d1..3f5ad5b3c 100644
--- a/translations/en/admin.php
+++ b/translations/en/admin.php
@@ -12,7 +12,7 @@ $_LANGADM['AdminAccess7dce122004969d56ae2e0245cb754d35'] = 'Edit';
 $_LANGADM['AdminAccessf2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
 $_LANGADM['AdminAccessb1c94ca2fbc3e78fc30069c8d0f01680'] = 'All';
 $_LANGADM['AdminAccess7fcca2f879aa88fea302c675f56428cc'] = 'No tab';
-$_LANGADM['AdminAccess05fe96d753968b151a15b748140e4467'] = 'Administrator permissions can\'t be modified.';
+$_LANGADM['AdminAccess05fe96d753968b151a15b748140e4467'] = 'Administrator permissions cannot be modified.';
 $_LANGADM['AdminAddressesb718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminAddresses20db0bfeecd8fe60533206a2b5e9891a'] = 'First name';
 $_LANGADM['AdminAddresses8d3f5eff9c40ee315d452392bed5309b'] = 'Last name';
@@ -62,18 +62,23 @@ $_LANGADM['AdminAttachmentsaad781b9842958b4552b8edebb83c346'] = 'File copy faile
 $_LANGADM['AdminAttachments06d43815fa42336629ff54da5630143c'] = 'the File';
 $_LANGADM['AdminAttachments2db1c4802b06f0d3979fe280bacfd5f2'] = 'exceeds the size allowed by the server. This limit is set to';
 $_LANGADM['AdminAttachments6dd757cbdd852a16f222a7d1a07eab3e'] = 'Mb';
-$_LANGADM['AdminAttachments06d5d60cedc3946089462c34c719b4d6'] = 'No file or your file isn\'t uploadable, check your server configuration about the upload maximum size.';
+$_LANGADM['AdminAttachments06d5d60cedc3946089462c34c719b4d6'] = 'No file or your file is not uploadable, check your server configuration for the maximum upload size.';
 $_LANGADM['AdminAttachmentse9cb217697088a98b1937d111d936281'] = 'Attachment';
 $_LANGADM['AdminAttachments6492d670e42151cc37574d99f4071f85'] = 'Filename:';
 $_LANGADM['AdminAttachmentsd0042a700e9bdf79689d63ee6846dc0e'] = 'Description:';
 $_LANGADM['AdminAttachmentsab335fe79ef8a5e26c0dbc23332a7148'] = 'Upload file from your computer';
 $_LANGADM['AdminAttachments38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminAttachments19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
+$_LANGADM['AdminAttachmentsf2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
+$_LANGADM['AdminAttachments0071aa279bd1583754a544277740f047'] = 'Delete item #';
+$_LANGADM['AdminAttachments4a21a191879a23aa2a27829300da95f5'] = 'This attachment is associated with the following products:';
 $_LANGADM['AdminAttributeGenerator233c543a23378c4ffd0e1efb17408510'] = 'Price impact';
 $_LANGADM['AdminAttributeGenerator792467936100838046f749e63dadfbdb'] = 'Weight impact';
+$_LANGADM['AdminAttributeGenerator42dc1497090b299a41c64d1389e6ca8c'] = 'Tax Excl.:';
+$_LANGADM['AdminAttributeGenerator419cdd539861e743b872b2c959629a54'] = 'Tax Incl.:';
 $_LANGADM['AdminAttributeGenerator18c17dae7b84c21b38873e823af2bcfe'] = 'product(s) successfully created.';
 $_LANGADM['AdminAttributeGenerator81315cfd898aada1e99e0034b4b078c3'] = 'Attributes generator';
-$_LANGADM['AdminAttributeGeneratorbbfdf55069aaebae3825be9d4425ce2a'] = 'Add or modify attributes for product:';
+$_LANGADM['AdminAttributeGeneratorbbfdf55069aaebae3825be9d4425ce2a'] = 'Add or modify attributes for:';
 $_LANGADM['AdminAttributeGenerator694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantity';
 $_LANGADM['AdminAttributeGenerator63d5049791d9d79d86e9a108b0a999ca'] = 'Reference';
 $_LANGADM['AdminAttributeGenerator32b919d18cfaca89383f6000dcc9c031'] = 'Generate';
@@ -85,12 +90,12 @@ $_LANGADM['AdminAttributes4e140ba723a03baa6948340bf90e2ef6'] = 'Name:';
 $_LANGADM['AdminAttributes6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Invalid characters:';
 $_LANGADM['AdminAttributes1aa4c641d6920ddb97a2562f8ec53853'] = 'Group:';
 $_LANGADM['AdminAttributescb5feb1b7314637725a2e73bdc9f7295'] = 'Color';
-$_LANGADM['AdminAttributes9c29287ce313fd9ed3e9a86e1af4f4b3'] = 'HTML colors only (e.g.,';
+$_LANGADM['AdminAttributes9c29287ce313fd9ed3e9a86e1af4f4b3'] = 'HTML colors only (e.g.';
 $_LANGADM['AdminAttributes76a2e1080cd661b42c6653fc8fd57367'] = 'Texture:';
 $_LANGADM['AdminAttributes390bd26864da3269b496814c118238c0'] = 'Upload color texture from your computer';
 $_LANGADM['AdminAttributesba353198430b2004efeb1ac6d1f410d0'] = 'This will override the HTML color!';
 $_LANGADM['AdminAttributes859c7c7ffc3e60f67f6537f4d7dd98ca'] = 'Current texture:';
-$_LANGADM['AdminAttributes099af53f601532dbd31e0ea99ffdeb64'] = 'delete';
+$_LANGADM['AdminAttributesf2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
 $_LANGADM['AdminAttributes6adf97f83acf6453d4a6a4b1070f3754'] = 'None';
 $_LANGADM['AdminAttributes38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminAttributes19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
@@ -113,25 +118,58 @@ $_LANGADM['AdminAttributesGroups5edfefd49c5d39ef98914f12b9774b8b'] = 'Attributes
 $_LANGADM['AdminAttributesGroups4e140ba723a03baa6948340bf90e2ef6'] = 'Name:';
 $_LANGADM['AdminAttributesGroups6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Invalid characters:';
 $_LANGADM['AdminAttributesGroupsc9e5eb0a273a65da3a04f42e8351dc97'] = 'Public name:';
-$_LANGADM['AdminAttributesGroups4c4a779c55d2a3054839b5ad8615f5cb'] = 'Term or phrase displayed to the customer';
+$_LANGADM['AdminAttributesGroups4c4a779c55d2a3054839b5ad8615f5cb'] = 'Group name displayed to the customer';
 $_LANGADM['AdminAttributesGroups3c2fd298a3d83fdba35636873dcba353'] = 'Color group:';
 $_LANGADM['AdminAttributesGroups00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
 $_LANGADM['AdminAttributesGroups93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
 $_LANGADM['AdminAttributesGroupsb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
 $_LANGADM['AdminAttributesGroupsbafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
-$_LANGADM['AdminAttributesGroups0820cbf22e11a8a8398b7aa177048874'] = 'This is a color group';
+$_LANGADM['AdminAttributesGroups0820cbf22e11a8a8398b7aa177048874'] = 'Is this a color group?';
 $_LANGADM['AdminAttributesGroups38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminAttributesGroups19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
 $_LANGADM['AdminBackup44749712dbec183e983dcd78a7736c41'] = 'Date';
 $_LANGADM['AdminBackup9d8d2d5ab12b515182a505f54db7f538'] = 'Age';
 $_LANGADM['AdminBackup34082694d21dbdcfc31e6e32d9fb2b9f'] = 'File name';
 $_LANGADM['AdminBackup1908624a0bca678cd26b99bfd405324e'] = 'File size';
+$_LANGADM['AdminBackup30c210e0173f2ff607cc84dc01ffc1f0'] = 'Backup options';
+$_LANGADM['AdminBackup810b58656ec020a2bda0b7f74e5e7d0c'] = 'Ignore statistics tables:';
+$_LANGADM['AdminBackup482e4b3e67dabd684819acb8b64887ef'] = 'If enabled, the following tables will NOT be backed up:';
+$_LANGADM['AdminBackupa5498b899882eb314ba0ab4519889cc2'] = 'Drop existing tables during import:';
+$_LANGADM['AdminBackup84695439734fb7b69c173b3e39880e18'] = 'If enabled, the backup script will drop your tables prior to restoring the backed up data';
+$_LANGADM['AdminBackup2dfcd22fa4b395849dba9e20998d24c7'] = 'It appears that the Backup was successful, however, you must download and carefully verify the Backup file.';
+$_LANGADM['AdminBackup801ab24683a4a8c433c6eb40c48bcd9d'] = 'Download';
+$_LANGADM['AdminBackup2000271bb894b988d2097aaf528b6680'] = 'Download the Backup file';
+$_LANGADM['AdminBackup6dd757cbdd852a16f222a7d1a07eab3e'] = 'Mb';
+$_LANGADM['AdminBackupc9d8519a44774664f720c0ce6275ac2a'] = 'Tip: You can also download this file using your FTP. Backup files are located in \"admin/backups\" directory.';
 $_LANGADM['AdminBackup540f529ae6719f17617936818a8afaac'] = '\"Backups\" Directory in admin directory must be writeable (CHMOD 755 / 777)';
 $_LANGADM['AdminBackupc4a8330b099d9409ed1ba801d69a1dd0'] = 'Beginning download ...';
-$_LANGADM['AdminBackupbe0d109f79bd4ce87d2bf3dd216ba165'] = 'Back-up file should automatically download.';
+$_LANGADM['AdminBackupbe0d109f79bd4ce87d2bf3dd216ba165'] = 'Backup file should automatically download.';
 $_LANGADM['AdminBackupb828e7a94de289536d535e8c141868b9'] = 'If not,';
 $_LANGADM['AdminBackupd1c6b1687ebbc336f9bd13beba87b0cf'] = 'please click here!';
 $_LANGADM['AdminBackup630f6dc397fe74e52d5189e2c80f282b'] = 'Back to list';
+$_LANGADM['AdminBackup5a0a50bcda916d40913bbf98675b0633'] = 'Disclaimer before creating a new Backup';
+$_LANGADM['AdminBackup422540a2c50fe85b1f799ff2b2fd5d8d'] = 'PrestaShop is not responsible for your database, Backups, data and recovery.';
+$_LANGADM['AdminBackupee0ea4b3f98494324b3d39df83437f0d'] = 'PrestaShop is Open-source software, you are using it at your own risk under the license agreement.';
+$_LANGADM['AdminBackup714aed045ed859b4e77cddddeeccaed5'] = 'You should Backup your data on a regular basis (both files and database).';
+$_LANGADM['AdminBackup4d247cbe2dbd06ce20b9affd635e7982'] = 'This function only backs up your database, not your files.';
+$_LANGADM['AdminBackupb59917a7c4898ff9a48a78b7a063005d'] = 'By default, your existing database tables will be dropped during Backup recovery (see \"Backup options\" below).';
+$_LANGADM['AdminBackupf15dca6392936098982c8e3457ce87db'] = 'Always verify the quality and integrity of your Backup files.';
+$_LANGADM['AdminBackupc17110fda3272c08371ace783c673e56'] = 'Always verify that your Backup files are complete, up-to-date and valid, even if you had a success message during the Backup process.';
+$_LANGADM['AdminBackup0dc51a7afc30b342b827df535ff616f2'] = 'Always check your data.';
+$_LANGADM['AdminBackup5c5e4f2eda086c93473b2c8e7e9b896c'] = 'Never restore a Backup on a live site.';
+$_LANGADM['AdminBackupc9c8018315982c1aa308a9146e0bed76'] = 'I read the disclaimer - Create a new Backup';
+$_LANGADM['AdminBackup46f0e215b9abb597017994db268fc3a0'] = 'How to restore a database Backup in 10 easy steps';
+$_LANGADM['AdminBackup10479732a2bea7a5a10bb7b47c639789'] = 'Turn off the \"Enable Shop\" option in the \"Preferences\" tab.';
+$_LANGADM['AdminBackupa57e3f4dcacc92f3756b16fde61f6f01'] = 'Download the Backup from the list below or from your FTP server (in the folder \"admin/backups\").';
+$_LANGADM['AdminBackupf3bc009a9ac0e586b7966a1c1352b094'] = 'Check the Backup integrity: look for errors, incomplete file, etc. Be sure to verify all your data.';
+$_LANGADM['AdminBackupa20972942ef0de075f5d9c225c80ae4d'] = 'Ask your hosting provider for \"phpMyAdmin\" access to your database';
+$_LANGADM['AdminBackupad408cc67b79776c0b6c9867326c3493'] = 'Connect to \"phpMyAdmin\" and select your current database';
+$_LANGADM['AdminBackup197ebd1d022def92dd1c64aae3320d6a'] = 'Unless you enabled the \"Drop existing tables\" option, you must delete all tables from your current database.';
+$_LANGADM['AdminBackup42edcff7b40f111d974f2802ea9f5abf'] = 'At the top of the screen select the tab \"Import\"';
+$_LANGADM['AdminBackup6bfc8c9cb81f79f6db4707f115df9788'] = 'Click on the \"Browse...\" button and select the Backup file from your hard drive';
+$_LANGADM['AdminBackup7ea4b668bc415112476c6abea16b5c00'] = 'Check the max. allowed filesize (e.g. Max: 16Mb)';
+$_LANGADM['AdminBackupaea390041b1129a817610ff53181cd4b'] = 'If your Backup file exceeds this limit, contact your hosting provider';
+$_LANGADM['AdminBackupb3bd0f5ff93aa82c778f1486bdfecb90'] = 'Click on the \"Go\" button and wait during the import, the process can take several minutes';
 $_LANGADM['AdminBackup896c55cc5e46fab38ce9f51ebf7bfcd3'] = 'hour';
 $_LANGADM['AdminBackup73cdddd7730abfc13a55efb9f5685a3b'] = 'hours';
 $_LANGADM['AdminBackup628b7db04235f228d40adc671413a8c8'] = 'day';
@@ -197,31 +235,48 @@ $_LANGADM['AdminCarriers49ee3087348e8d44e1feda1917443987'] = 'Name';
 $_LANGADM['AdminCarriers8c2857a9ad1d8f31659e35e904e20fa6'] = 'Logo';
 $_LANGADM['AdminCarriers8f497c1a3d15af9e0c215019f26b887d'] = 'Delay';
 $_LANGADM['AdminCarriersec53a8c4f07baed5d8825072c89799be'] = 'Status';
+$_LANGADM['AdminCarriersf9293626f0c44c6e310fc49280c20790'] = 'Free Shipping';
 $_LANGADM['AdminCarriers8430a7b1b81635e3df949c2845303303'] = 'Carrier options';
 $_LANGADM['AdminCarriers80ac9c802ce4d76982ab5a2e5a54b8bc'] = 'Default carrier:';
-$_LANGADM['AdminCarriers5528aa4f25577dcffcfca40eda4c2a5b'] = 'The default carrier used in shop';
+$_LANGADM['AdminCarriers5528aa4f25577dcffcfca40eda4c2a5b'] = 'Your shop\'s default carrier';
+$_LANGADM['AdminCarriersc0add41517a5511d7b58d2c992db11e7'] = 'How do I create a new carrier?';
+$_LANGADM['AdminCarriersb8bf3ffcbb8025ef76f8d67fff0cdf2b'] = 'Click \"Add new\".';
+$_LANGADM['AdminCarriersb7ccdf6ab58f5514acc520721ddc9f08'] = 'Fill in the fields and click \"Save\".';
+$_LANGADM['AdminCarriers2f937af6e4f35724bb5f3fb808571aee'] = 'You need to decide on a price range or a weight range for which the new carrier will be available. Under the \"Shipping\" tab, click either \"Price Ranges\" or \"Weight Ranges\".';
+$_LANGADM['AdminCarrierscf3eed0e05b900e8508f1aba12ff6b9d'] = 'Select the name of the carrier and define the price range or the weight range. For example the carrier can be made available for a weight range between 0 and 5lbs, and another carrier can have a range between 5 and 10lbs.';
+$_LANGADM['AdminCarriers69123019563697071c2c9ab3eb660b13'] = 'When you are done, click \"Save\".';
+$_LANGADM['AdminCarriers80d803aad983c22d14a0ddad539fad8e'] = 'Click on the \"Shipping\" tab.';
+$_LANGADM['AdminCarriers4462e7845f4d7944f65e2f5fe546b8ed'] = 'You need to set the fees that will be applied for this carrier. At the bottom on the page, in the \"Fees\" section, select the name of the carrier.';
+$_LANGADM['AdminCarriersbe4f75f8b5c30ee4d0333b340c59280d'] = 'For each zone, enter a price and click \"Save\".';
+$_LANGADM['AdminCarriers969011941a0e9f19127bc90042687570'] = 'You are all set! The new carrier will be displayed to your customers.';
 $_LANGADM['AdminCarriers1d6af794b2599c1407a83029a09d1ecf'] = 'Carriers';
 $_LANGADM['AdminCarriers5e5f0a863cd129317037e3def37b4097'] = 'Company:';
 $_LANGADM['AdminCarriers1cc70ef3820fa925ca1dd1ab645d239e'] = 'Allowed characters: letters, spaces and';
 $_LANGADM['AdminCarriers3194ebe40c7a8c29c78ea79066b6e05c'] = 'Carrier name displayed during checkout';
-$_LANGADM['AdminCarriers04bcf925decaf3beb22ef4bcedd93194'] = 'With a value of 0, the carrier name will be replaced by the shop name';
+$_LANGADM['AdminCarriers04bcf925decaf3beb22ef4bcedd93194'] = 'For in-store pickup, enter 0 to replace the carrier name with your shop name';
 $_LANGADM['AdminCarriersacd7b45c9d50280a52990015b2c24ba8'] = 'Logo:';
-$_LANGADM['AdminCarriers980bb228a128556fe3df923d2ede30b4'] = 'Upload logo from your computer';
+$_LANGADM['AdminCarriers980bb228a128556fe3df923d2ede30b4'] = 'Upload a logo from your computer';
 $_LANGADM['AdminCarrierse81c4e4f2b7b93b481e13a8553c2ae1b'] = 'or';
 $_LANGADM['AdminCarriersbf1f5f95d9e15a3cffa21495dbec563a'] = 'Transit time:';
-$_LANGADM['AdminCarriers6e80870e865e8dbcd56b9842ea38e3dd'] = 'Time taken for product delivery; displayed during checkout';
+$_LANGADM['AdminCarriers6e80870e865e8dbcd56b9842ea38e3dd'] = 'Estimated delivery time, displayed during checkout';
 $_LANGADM['AdminCarriers3b3d06023f6353f8fd05f859b298573e'] = 'URL:';
-$_LANGADM['AdminCarrierse460bba7366e1b5118a0d95ee91c6cff'] = 'URL for the tracking number; type \'@\' where the tracking number will appear';
+$_LANGADM['AdminCarrierse460bba7366e1b5118a0d95ee91c6cff'] = 'Delivery tracking URL; type \'@\' where the tracking number will appear, it will be automatically replaced by the tracking number';
 $_LANGADM['AdminCarriersb3ff996fe5c77610359114835baf9b38'] = 'Zone';
-$_LANGADM['AdminCarriers2999d7f21168234abeb28b9e561cfe96'] = 'The zone in which this carrier is to be used';
-$_LANGADM['AdminCarriers920bd1fb6d54c93fca528ce941464225'] = 'Group access';
+$_LANGADM['AdminCarriers2999d7f21168234abeb28b9e561cfe96'] = 'The zones in which this carrier is to be used';
+$_LANGADM['AdminCarriers920bd1fb6d54c93fca528ce941464225'] = 'Customer group access';
 $_LANGADM['AdminCarriersc6155aaecccf794cd2a00fcc35898022'] = 'Group name';
 $_LANGADM['AdminCarriersd3775317d696f0c1e3ae4a7a13b639dc'] = 'Mark all groups you want to give access to this carrier';
 $_LANGADM['AdminCarriers69e62346c35bc63795db142cfbb0af66'] = 'No group created';
 $_LANGADM['AdminCarriers24a23d787190f2c4812ff9ab11847a72'] = 'Status:';
 $_LANGADM['AdminCarriers00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
 $_LANGADM['AdminCarriersb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
-$_LANGADM['AdminCarriers5cb2b3a7c26424a92365f9d73faa0947'] = 'Include or exclude carrier from list of carriers on Front Office';
+$_LANGADM['AdminCarriers5cb2b3a7c26424a92365f9d73faa0947'] = 'Enable carrier in the Front Office';
+$_LANGADM['AdminCarrierscf899ec0add2e9e103ad82c1a2a077ac'] = 'Apply shipping cost:';
+$_LANGADM['AdminCarriers93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
+$_LANGADM['AdminCarriersbafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
+$_LANGADM['AdminCarriers26fe78eca0b885477de9627d58f98cd6'] = 'Apply both regular shipping cost and product-specific additional shipping costs';
+$_LANGADM['AdminCarriers4b78ac8eb158840e9638a3aeb26c4a9d'] = 'Tax';
+$_LANGADM['AdminCarriers7475ec0d41372a307c497acb7eeea8c4'] = 'N/A';
 $_LANGADM['AdminCarriers4b78ac8eb158840e9638a3aeb26c4a9d'] = 'Tax';
 $_LANGADM['AdminCarriers7475ec0d41372a307c497acb7eeea8c4'] = 'No Tax';
 $_LANGADM['AdminCarriers8e97163e9714c4656e00b33f317bc181'] = 'Shipping & handling:';
@@ -235,25 +290,26 @@ $_LANGADM['AdminCarriers482836cce404046ca7dc34fb0a6fc526'] = 'Apply the cost of
 $_LANGADM['AdminCarriers4f890cf6a72112cad95093baecf39831'] = 'Disable carrier';
 $_LANGADM['AdminCarriersa26f79d46b0719d8baa3a5a7c9abda74'] = 'Out-of-range behavior when none is defined (e.g., when a customer\'s cart weight is greater than the highest range limit)';
 $_LANGADM['AdminCarriers53b3cae42737979c884275593a01f468'] = 'Module:';
-$_LANGADM['AdminCarriers1bc1db213690a02eb805aacec96acaf1'] = 'This carrier is bound to this module ';
-$_LANGADM['AdminCarriersf89bf753eb4f6668ff2ec794f12452c6'] = 'The shipping costs are calculated outside of your shop';
-$_LANGADM['AdminCarriers6d54a69c5cb39e7b83de302b8d4b744f'] = 'This carrier uses PrestaShop range to calculate shipping costs';
+$_LANGADM['AdminCarriers1bc1db213690a02eb805aacec96acaf1'] = 'This carrier is associated with this module ';
+$_LANGADM['AdminCarriersf89bf753eb4f6668ff2ec794f12452c6'] = 'Shipping costs are calculated and retrieved from this carrier using an external website';
+$_LANGADM['AdminCarriers6d54a69c5cb39e7b83de302b8d4b744f'] = 'This carrier uses your input (ranges, price, weight, etc.) to calculate shipping costs';
 $_LANGADM['AdminCarriers38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminCarriers19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
-$_LANGADM['AdminCarriersf6308cfdf671a710ebff8ac860d3a406'] = 'Please set another carrier as default before deleting';
+$_LANGADM['AdminCarriersf6308cfdf671a710ebff8ac860d3a406'] = 'Please set another carrier as default before deleting this one';
 $_LANGADM['AdminCartsb718adec73e04ce3ec720dd11a06a308'] = 'ID';
+$_LANGADM['AdminCarts6fde42aa0857eb92fc0d0c3fb1c6c8b7'] = 'Order ID';
 $_LANGADM['AdminCartsce26601dac0dea138b7295f02b7620a7'] = 'Customer';
 $_LANGADM['AdminCarts96b0141273eabab320119c467cdcaf17'] = 'Total';
 $_LANGADM['AdminCarts914419aa32f04011357d3b604a86d7eb'] = 'Carrier';
 $_LANGADM['AdminCarts44749712dbec183e983dcd78a7736c41'] = 'Date';
 $_LANGADM['AdminCartsadb831a7fdd83dd1e2a309ce7591dff8'] = 'Guest';
 $_LANGADM['AdminCarts580034e942d61c23826cb31dc2cb3c89'] = 'Cart #';
-$_LANGADM['AdminCartsd98a07f84921b24ee30f86fd8cd85c3c'] = 'from';
+$_LANGADM['AdminCartsd98a07f84921b24ee30f86fd8cd85c3c'] = 'on';
 $_LANGADM['AdminCarts1d949d2235747b894bbaae35fbf44f1d'] = 'Customer information';
 $_LANGADM['AdminCarts01abfc750a0c942167651c40d088531d'] = '#';
-$_LANGADM['AdminCarts1402e450396cb76b53b95f6e1746d700'] = 'Account registered:';
+$_LANGADM['AdminCarts1402e450396cb76b53b95f6e1746d700'] = 'Account registration date:';
 $_LANGADM['AdminCartsb157524c4be8c2fc80e5ef2f0b1bf1e6'] = 'Valid orders placed:';
-$_LANGADM['AdminCarts5a80b1a10d36fdb4c05b87e01cb7abc9'] = 'Total paid since registration:';
+$_LANGADM['AdminCarts5a80b1a10d36fdb4c05b87e01cb7abc9'] = 'Total spent since registration:';
 $_LANGADM['AdminCartsa8e3c5c577a4b885819e5ba1c785065c'] = 'Guest not registered';
 $_LANGADM['AdminCarts58930025e1f95d65035e0df5d6c2ae41'] = 'Order information';
 $_LANGADM['AdminCartsd1228f5476d15142b1358ae4b5fa2454'] = 'Order #';
@@ -262,8 +318,8 @@ $_LANGADM['AdminCarts30d5706b177c5a77731d1418e95d2900'] = 'No order created from
 $_LANGADM['AdminCarts068f80c7519d0528fb08e82137a72131'] = 'Products';
 $_LANGADM['AdminCarts6f16ab6ec0a6064d0c8961257a3eb1f5'] = 'Cart summary';
 $_LANGADM['AdminCartsdeb10517653c255364175796ace3553f'] = 'Product';
-$_LANGADM['AdminCartsfbaedde498cdead4f2780217646e9ba1'] = 'UP';
-$_LANGADM['AdminCarts03ab340b3f99e03cff9e84314ead38c0'] = 'Qty';
+$_LANGADM['AdminCartsfbaedde498cdead4f2780217646e9ba1'] = 'Unit price';
+$_LANGADM['AdminCarts03ab340b3f99e03cff9e84314ead38c0'] = 'Quantity';
 $_LANGADM['AdminCarts27ce7f8b5623b2e2df568d64cf051607'] = 'Stock';
 $_LANGADM['AdminCartse78b6f4eb3be046f4d25c07ce54954d4'] = 'Ref:';
 $_LANGADM['AdminCarts543ae6adeb524f98cc7d3c816a1ec1e3'] = 'Total products:';
@@ -274,11 +330,13 @@ $_LANGADM['AdminCarts66c4c5112f455a19afde47829df363fa'] = 'Total:';
 $_LANGADM['AdminCarts9d5bf15117441a1b52eb1f0808e4aad3'] = 'Discounts';
 $_LANGADM['AdminCartsf14b582c1b0eab88ed5904fb781568c0'] = 'Discount name';
 $_LANGADM['AdminCarts689202409e48743b914713f96d93947c'] = 'Value';
-$_LANGADM['AdminCarts81a45bb93f6dc37a6c0dcc3af725d331'] = 'According to the group of this customer, prices are printed:';
+$_LANGADM['AdminCarts81a45bb93f6dc37a6c0dcc3af725d331'] = 'For this customer\'s group, prices are displayed as:';
 $_LANGADM['AdminCarts5f9a97c1e1ac934b2eb46a9888c3bc8c'] = 'tax excluded.';
 $_LANGADM['AdminCarts341216368d7ecd01ce32b8b9892293cf'] = 'tax included.';
 $_LANGADM['AdminCarts2fb3b950fd7711136f7f251ae5fbdbdc'] = 'Text #';
 $_LANGADM['AdminCarts853ae90f0351324bd73ea615e6487517'] = ':';
+$_LANGADM['AdminCartsf2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
+$_LANGADM['AdminCarts0071aa279bd1583754a544277740f047'] = 'Delete item #';
 $_LANGADM['AdminCatalog630f6dc397fe74e52d5189e2c80f282b'] = 'Back to list';
 $_LANGADM['AdminCatalog6110e3692a789bcff0870b04b13a06bb'] = 'Back to home';
 $_LANGADM['AdminCatalogc61cd01963c2a9f399c2906e02c7a52a'] = 'Back to catalog';
@@ -303,6 +361,10 @@ $_LANGADM['AdminCategories6637b53a5820cef0817b7f2a2553bfc8'] = 'Displayed:';
 $_LANGADM['AdminCategories00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
 $_LANGADM['AdminCategoriesb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
 $_LANGADM['AdminCategories66f2dd0c775eff24ac95c38347bcaf9a'] = 'Parent category:';
+$_LANGADM['AdminCategories8cf04a9734132302f96da8e113e80ce5'] = 'Home';
+$_LANGADM['AdminCategoriesef7de3f485174ff47f061ad27d83d0ee'] = 'selected';
+$_LANGADM['AdminCategoriesb56c3bda503a8dc4be356edb0cc31793'] = 'Collapse All';
+$_LANGADM['AdminCategories5ffd7a335dd836b3373f5ec570a58bdc'] = 'Expand All';
 $_LANGADM['AdminCategoriesd0042a700e9bdf79689d63ee6846dc0e'] = 'Description:';
 $_LANGADM['AdminCategories461900b74731e07320ca79366df3e809'] = 'Image:';
 $_LANGADM['AdminCategoriesf0eaa209893a6bb5512c9876037b82be'] = 'Upload category logo from your computer';
@@ -312,10 +374,10 @@ $_LANGADM['AdminCategoriesa6bb76858f8b4b61c050ad7a7ac57e06'] = 'Meta description
 $_LANGADM['AdminCategories394deec8b4e901394f69ad41095b1ecc'] = 'Meta keywords:';
 $_LANGADM['AdminCategories02fa003c38fefcda498b876f67f4cac7'] = 'Friendly URL:';
 $_LANGADM['AdminCategories2ef9671539ece086eb5c74c851a08565'] = 'Only letters and the minus (-) character are allowed';
-$_LANGADM['AdminCategories50d783e43630e20d36ad09f7e01f163c'] = 'Groups access:';
+$_LANGADM['AdminCategories50d783e43630e20d36ad09f7e01f163c'] = 'Customer group access:';
 $_LANGADM['AdminCategoriesc6155aaecccf794cd2a00fcc35898022'] = 'Group name';
-$_LANGADM['AdminCategoriesa8cff2e828f241eed159bc28e76707c7'] = 'Mark all groups you want to give access to this category';
-$_LANGADM['AdminCategories69e62346c35bc63795db142cfbb0af66'] = 'No group created';
+$_LANGADM['AdminCategoriesa8cff2e828f241eed159bc28e76707c7'] = 'Mark all customer groups you want to give access to this category';
+$_LANGADM['AdminCategories69e62346c35bc63795db142cfbb0af66'] = 'No customer group created';
 $_LANGADM['AdminCategoriesfd7df45f68e2570620083998fbc0710a'] = 'Save and back to parent category';
 $_LANGADM['AdminCategoriesc9cc8cce247e49bae79f15173ce97354'] = 'Save';
 $_LANGADM['AdminCategories19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
@@ -326,8 +388,10 @@ $_LANGADM['AdminContact792ccc0c7f3d0d20366fbbf44ef7cd78'] = 'Displayed in e-mail
 $_LANGADM['AdminContact237726599268adc200964601cdafeb16'] = 'Shop e-mail:';
 $_LANGADM['AdminContact0188aaac1db951dc90bced9ecd606c04'] = 'Displayed in e-mails sent to customers';
 $_LANGADM['AdminContactd7ceaa3ddb4fc6884046456463ecb258'] = 'Registration:';
-$_LANGADM['AdminContact76cee53a1d378b50e5bc3aa50ab3b4c0'] = 'Shop registration information (e.g., SIRET or RCS)';
-$_LANGADM['AdminContacte0ef7a9e00e6b6189c8da23da3fe79f8'] = 'Post/Zip code:';
+$_LANGADM['AdminContact76cee53a1d378b50e5bc3aa50ab3b4c0'] = 'Additional shop information (e.g. Store ID or company ID number)';
+$_LANGADM['AdminContact3c720ca57528095461f52d40d26d956a'] = 'Shop address line 1:';
+$_LANGADM['AdminContact3d4d4cac03e194ab20154382cd544e0f'] = 'Address line 2:';
+$_LANGADM['AdminContacte0ef7a9e00e6b6189c8da23da3fe79f8'] = 'Postcode / Zip Code:';
 $_LANGADM['AdminContactbffb711ec36f280459d11dce315da72f'] = 'City:';
 $_LANGADM['AdminContactf64be5eef68442a8f50cf535b92ad3e4'] = 'Country:';
 $_LANGADM['AdminContact18325105de95083e4a1d10b78f29c2bc'] = 'State:';
@@ -340,19 +404,19 @@ $_LANGADM['AdminContacts8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
 $_LANGADM['AdminContactsb5a7adde1af5c87d7fd797b6245c2a39'] = 'Description';
 $_LANGADM['AdminContacts8058aef8e4c03453b1b088795677726a'] = 'Contact options';
 $_LANGADM['AdminContactsb3f251dafa622267b0972a0d52dfd9b2'] = 'Allow file upload';
-$_LANGADM['AdminContacts73b06e25d15e914d4d2ba43c6de1805e'] = 'Allow customers to upload file using contact page';
+$_LANGADM['AdminContacts73b06e25d15e914d4d2ba43c6de1805e'] = 'Allow customers to upload a file using contact page';
 $_LANGADM['AdminContactsbafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
 $_LANGADM['AdminContacts93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
 $_LANGADM['AdminContactsd5e76fe30ec7b495d900aa33b91becc4'] = 'Pre-defined message';
-$_LANGADM['AdminContacts338e6d0526d113f735e9dce7c899a185'] = 'Please fill the message that appears by default when you answer a thread on the customer service page';
+$_LANGADM['AdminContacts338e6d0526d113f735e9dce7c899a185'] = 'Please enter the message that will appear by default when you answer a thread on the customer service page';
 $_LANGADM['AdminContacts9aa698f602b1e5694855cee73a683488'] = 'Contacts';
 $_LANGADM['AdminContacts51ec9bf4aaeab1b25bb57f9f8d4de557'] = 'Title:';
-$_LANGADM['AdminContacts7e98c222c4dd2e73d37bc5cd0eca2fca'] = 'Contact name, e.g., Technical Support';
+$_LANGADM['AdminContacts7e98c222c4dd2e73d37bc5cd0eca2fca'] = 'Contact name (e.g. Technical Support)';
 $_LANGADM['AdminContacts76e1a2d01fd855aa7f2df99e2be260c5'] = 'E-mails will be sent to this address';
-$_LANGADM['AdminContactsa4fa45b9c05d906d897b3a04f3d09838'] = 'Save in Customer Service?';
+$_LANGADM['AdminContactsa4fa45b9c05d906d897b3a04f3d09838'] = 'Save messages?';
 $_LANGADM['AdminContacts00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
 $_LANGADM['AdminContactsb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
-$_LANGADM['AdminContactsec444d8079f945e297c3a6d5359bb4d7'] = 'The messages will be saved in the Customer Service tab';
+$_LANGADM['AdminContactsec444d8079f945e297c3a6d5359bb4d7'] = 'If enabled, all messages will be saved in the \"Customer Service\" tab';
 $_LANGADM['AdminContacts0a958d0b68cae1805a8f64cdcddb821b'] = 'Additional information about this contact';
 $_LANGADM['AdminContacts38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminContacts19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
@@ -362,18 +426,24 @@ $_LANGADM['AdminCountriesad68f9bafd9bf2dcf3865dac55662fd5'] = 'ISO code';
 $_LANGADM['AdminCountriesd8ec51bf63378409b1d40cc45c80f926'] = 'Call prefix';
 $_LANGADM['AdminCountriesb3ff996fe5c77610359114835baf9b38'] = 'Zone';
 $_LANGADM['AdminCountries00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
-$_LANGADM['AdminCountries5252b12033d3181aa8270eea2fd4c4d4'] = 'Countries options';
+$_LANGADM['AdminCountries5252b12033d3181aa8270eea2fd4c4d4'] = 'Country options';
 $_LANGADM['AdminCountriesd14d3384847c11b0708990b3343c8dbf'] = 'Default country:';
 $_LANGADM['AdminCountriesb017db41a29dff4007de058af406341e'] = 'The default country used in shop';
+$_LANGADM['AdminCountries13feb6ab1a436929f78c13ec405ce215'] = 'Restrict country selections in Front-office to those covered by active carriers';
+$_LANGADM['AdminCountries91bb198c336e8b4a82bed07cffd78891'] = 'This will restore your last registered address format';
+$_LANGADM['AdminCountriesa86a021f16a103f44a8aa1c06e484831'] = 'This will restore the default address format for this country';
+$_LANGADM['AdminCountriesfc6bff84b96cbd12e8b2acb2cbe4c979'] = 'This will restore your current address format';
+$_LANGADM['AdminCountries96cddc4940425c2e51164e6f53ca3acf'] = 'This will delete the current address format';
+$_LANGADM['AdminCountries4cc62307750c99e9f150d2baa18b6b81'] = 'Are you sure you want to restore the default address format for this country?';
 $_LANGADM['AdminCountries790d59ef178acbc75d233bf4211763c6'] = 'Countries';
 $_LANGADM['AdminCountriesf64be5eef68442a8f50cf535b92ad3e4'] = 'Country:';
 $_LANGADM['AdminCountries6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Invalid characters:';
-$_LANGADM['AdminCountries4aff46f8a7e137cff28dc9011eb2bbd3'] = 'Name of country';
+$_LANGADM['AdminCountries4aff46f8a7e137cff28dc9011eb2bbd3'] = 'Country name';
 $_LANGADM['AdminCountries3af4c1797da60fd50670ddbb669fc0aa'] = 'ISO code:';
-$_LANGADM['AdminCountries4940bea043a2202dd111a1e408438407'] = '2- or 3-letter ISO code, e.g., FR for France';
+$_LANGADM['AdminCountries4940bea043a2202dd111a1e408438407'] = '2- or 3-letter ISO code (e.g. US for United States)';
 $_LANGADM['AdminCountriesd3c5d8339f3840b75b4031c2b1e508de'] = 'Official list here';
 $_LANGADM['AdminCountriesec156a02718eeb18048c8589bea1f4a1'] = 'Call prefix:';
-$_LANGADM['AdminCountries4d92aeac3faeb1d29b189135fe2b3e49'] = 'International call prefix, e.g., 33 for France.';
+$_LANGADM['AdminCountries4d92aeac3faeb1d29b189135fe2b3e49'] = 'International call prefix, (e.g. 1 for United States)';
 $_LANGADM['AdminCountries8e10808175a8d945d13bab31fb2e2663'] = 'Default currency:';
 $_LANGADM['AdminCountriesa4f164d8b1b72c87b8ce558827bcd423'] = 'Default store currency';
 $_LANGADM['AdminCountriese6e42855066e7a3ae050b2c698021b14'] = 'Zone:';
@@ -382,52 +452,77 @@ $_LANGADM['AdminCountries378296aa6056b95fe9d841aed8f3bfae'] = 'Need zip code:';
 $_LANGADM['AdminCountries93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
 $_LANGADM['AdminCountriesbafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
 $_LANGADM['AdminCountries881e132cc7aae22327a99e24c73cbe34'] = 'Zip code format:';
-$_LANGADM['AdminCountriesf986c3dfa3c510d15d32b59e2e83e037'] = 'National zip code (L for a letter, N for a number and C for the Iso code), e.g., NNNNN for France. No verification if undefined';
+$_LANGADM['AdminCountriesf986c3dfa3c510d15d32b59e2e83e037'] = 'National zip code: L for a letter, N for a number and C for the Iso code (e.g. NNNNN for United States). No verification if not defined.';
+$_LANGADM['AdminCountriesa314046def218cebb078f190756b0a4a'] = 'Address format:';
+$_LANGADM['AdminCountries91a69103975e222d07735acffd42239c'] = 'Available fields for the address information (Click for more details)';
+$_LANGADM['AdminCountriesd88def0eb4ff593621b4113e1fc54965'] = 'Use the last registered format';
+$_LANGADM['AdminCountries6d869ac09b11028c6884152b08f52786'] = 'Use a default format';
+$_LANGADM['AdminCountries4a9a923126a30b7ab47cc43ed8a25895'] = 'Use my current modified format';
+$_LANGADM['AdminCountries14a5ddaea551658f02fb0ef893f81313'] = 'Clear format';
 $_LANGADM['AdminCountries24a23d787190f2c4812ff9ab11847a72'] = 'Status:';
 $_LANGADM['AdminCountriesb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
 $_LANGADM['AdminCountriesd42225935a374f1249f2a45ebed00772'] = 'Enabled or disabled';
 $_LANGADM['AdminCountriescef82d41923398076fb06d463541d707'] = 'Contains states:';
-$_LANGADM['AdminCountries09545da0018af8fd4d2725858aa9b26d'] = 'Need tax identification number?';
+$_LANGADM['AdminCountries09545da0018af8fd4d2725858aa9b26d'] = 'Need Tax identification number?';
+$_LANGADM['AdminCountries187dc89384a93e0bd008a5d1ec2339b6'] = 'Display tax label (e.g. \"Tax incl.\"):';
 $_LANGADM['AdminCountries38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminCountries19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
+$_LANGADM['AdminCountyb718adec73e04ce3ec720dd11a06a308'] = 'ID';
+$_LANGADM['AdminCountye25b163360646e8f71af8a8ee0fad1a3'] = 'County';
+$_LANGADM['AdminCounty46a2a41cc6e552044816a2d04634545d'] = 'State';
+$_LANGADM['AdminCounty00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
+$_LANGADM['AdminCountyf66c1590e73de9cb7cd7503f13d80118'] = 'Counties';
+$_LANGADM['AdminCounty3bbbfb7c06723c054b8dd150bc064a36'] = 'Please save this county first in order to add zip codes';
+$_LANGADM['AdminCountyf64be5eef68442a8f50cf535b92ad3e4'] = 'Country:';
+$_LANGADM['AdminCounty18325105de95083e4a1d10b78f29c2bc'] = 'State:';
+$_LANGADM['AdminCounty4e140ba723a03baa6948340bf90e2ef6'] = 'Name:';
+$_LANGADM['AdminCounty24a23d787190f2c4812ff9ab11847a72'] = 'Status:';
+$_LANGADM['AdminCountyb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
+$_LANGADM['AdminCountyd42225935a374f1249f2a45ebed00772'] = 'Enabled or disabled';
+$_LANGADM['AdminCounty38fb7d24e0d60a048f540ecb18e13376'] = 'Save ';
+$_LANGADM['AdminCounty9ea67be453eaccf020697b4654fc021a'] = 'Save and stay';
+$_LANGADM['AdminCounty19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
 $_LANGADM['AdminCurrenciesb718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminCurrencies386c339d37e737a436499d423a77df0c'] = 'Currency';
 $_LANGADM['AdminCurrenciesad68f9bafd9bf2dcf3865dac55662fd5'] = 'ISO code';
-$_LANGADM['AdminCurrenciesde9b254aa38ded29b5a826d9e752b90b'] = 'ISO code num';
+$_LANGADM['AdminCurrenciesde9b254aa38ded29b5a826d9e752b90b'] = 'ISO code number';
 $_LANGADM['AdminCurrencies02c86eb2792f3262c21d030a87e19793'] = 'Symbol';
 $_LANGADM['AdminCurrenciesd311128c6b9f34f85e6b0e29bcbcd165'] = 'Conversion rate';
 $_LANGADM['AdminCurrencies00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
-$_LANGADM['AdminCurrenciesb67536699de7bf5ddd53bd913e87758a'] = 'Currencies options';
+$_LANGADM['AdminCurrenciesb67536699de7bf5ddd53bd913e87758a'] = 'Currency options';
 $_LANGADM['AdminCurrencies8e10808175a8d945d13bab31fb2e2663'] = 'Default currency:';
 $_LANGADM['AdminCurrencies36144ac2644548932977cc36677c1698'] = 'The default currency used in shop';
-$_LANGADM['AdminCurrencies795b18173b4ddc7ea79c606ccd0f3feb'] = 'You can\'t delete the default currency';
-$_LANGADM['AdminCurrenciese7e915ec26ac2be5f5730752e5fc3b78'] = 'You can\'t disable the default currency';
+$_LANGADM['AdminCurrenciescc2f0a18cb0448ca2101f93be765e487'] = 'Warning: If you change the default currency, you will have to manually edit every product price.';
+$_LANGADM['AdminCurrencies795b18173b4ddc7ea79c606ccd0f3feb'] = 'You cannot delete the default currency';
+$_LANGADM['AdminCurrenciese7e915ec26ac2be5f5730752e5fc3b78'] = 'You cannot disable the default currency';
 $_LANGADM['AdminCurrencies77428b04a1847555eb9bc52422a377b0'] = 'Currency rates';
 $_LANGADM['AdminCurrencies876ca43ba50351d4e492970f40632661'] = 'Update currency rates';
-$_LANGADM['AdminCurrencies48781284e7a2c2b1479559ce12aa73c5'] = 'Update your currencies exchanges rates with a real-time tool';
+$_LANGADM['AdminCurrencies48781284e7a2c2b1479559ce12aa73c5'] = 'Use PrestaShop\'s web-service to update your currency exchange rates. Please use caution, rates are provided as-is.';
+$_LANGADM['AdminCurrencies5e7ad8ee59bd36302bbc58bc710eeabb'] = 'Automatically update currency rates';
+$_LANGADM['AdminCurrencies260f0e6ff1df0aa4f39310176b5d6c44'] = 'Use PrestaShop\'s web-service to update your currency exchange rates. Please use caution, rates are provided as-is. Place this URL in crontab or access it manually daily';
 $_LANGADM['AdminCurrenciesdfcfc43722eef1eab1e4a12e50a068b1'] = 'Currencies';
 $_LANGADM['AdminCurrencies77295c7d814e7397c55f64ec06313984'] = 'Currency:';
 $_LANGADM['AdminCurrenciesa5ffda8871e3d3d193c8e67f76686375'] = 'Only letters and the minus character are allowed';
-$_LANGADM['AdminCurrencies2e5845557ed8ecd864f0db5ce4dac829'] = 'Will appear on Front Office, e.g., euro, dollar';
+$_LANGADM['AdminCurrencies2e5845557ed8ecd864f0db5ce4dac829'] = 'Will appear in Front Office (e.g. $, €)';
 $_LANGADM['AdminCurrencies3af4c1797da60fd50670ddbb669fc0aa'] = 'ISO code:';
-$_LANGADM['AdminCurrencies8632ac58071857c4425a9b6042f1fe21'] = 'ISO code, e.g., USD for dollar, EUR for euro';
+$_LANGADM['AdminCurrencies8632ac58071857c4425a9b6042f1fe21'] = 'ISO code (e.g. USD for Dollars, EUR for Euros)';
 $_LANGADM['AdminCurrencies7fa4d1ea7f7b9d819c54d83bb3263512'] = 'Numeric ISO code:';
-$_LANGADM['AdminCurrencies44d23fb07dc0be241d77d922bbc871c1'] = 'Numeric ISO code, e.g., 840 for dollar, 978 for euro';
+$_LANGADM['AdminCurrencies44d23fb07dc0be241d77d922bbc871c1'] = 'Numeric ISO code (e.g. 840 for Dollars, 978 for Euros)';
 $_LANGADM['AdminCurrencies29e59767fa0a8d3adbacc87cae6d061c'] = 'Symbol:';
-$_LANGADM['AdminCurrencies32dd182c91d1a647c40ce4561eb33da9'] = 'Will appear on Front Office, e.g., €, $';
+$_LANGADM['AdminCurrencies32dd182c91d1a647c40ce4561eb33da9'] = 'Will appear in Front Office (e.g. $, €)';
 $_LANGADM['AdminCurrenciesbebbab2c1ac732ccef4181f51ed52967'] = 'Conversion rate:';
-$_LANGADM['AdminCurrencies88ddc0e9e26e200dccfdf7a3a1274b98'] = 'Conversion rate from one unit of your shop\'s default currency (for example, 1€) to this currency. For example, if the default currency is euros and this currency is dollars, type \'1.20\'';
+$_LANGADM['AdminCurrencies88ddc0e9e26e200dccfdf7a3a1274b98'] = 'Conversion rate from one unit of your shop\'s default currency. For example, to convert from Dollars to Euros, type \'0.75\'';
 $_LANGADM['AdminCurrencies007f2226bf0915adaf9ef63b0e8287ca'] = 'Formatting:';
-$_LANGADM['AdminCurrencies19e5c58e6f3027749ab6aa14c5a650fd'] = 'as with dollars';
-$_LANGADM['AdminCurrenciesaa3606501de88ea50155297736664490'] = 'as with euros';
-$_LANGADM['AdminCurrencies444a643f521c7fff9ef731ff301d86cc'] = 'Applies to all prices, e.g.,';
+$_LANGADM['AdminCurrencies19e5c58e6f3027749ab6aa14c5a650fd'] = 'as with Dollars';
+$_LANGADM['AdminCurrenciesaa3606501de88ea50155297736664490'] = 'as with Euros';
+$_LANGADM['AdminCurrencies444a643f521c7fff9ef731ff301d86cc'] = 'Applies to all prices, e.g.';
 $_LANGADM['AdminCurrenciese02162e8fe1c036639e5c8850ce44b3f'] = 'Decimals:';
 $_LANGADM['AdminCurrencies93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
 $_LANGADM['AdminCurrenciesbafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
-$_LANGADM['AdminCurrencies82158fd670cc8b5dedefd4201d9701cd'] = 'Display decimals on prices';
-$_LANGADM['AdminCurrencies87bd3cbac63d9410fff1815181cb60cc'] = 'Blank:';
+$_LANGADM['AdminCurrencies82158fd670cc8b5dedefd4201d9701cd'] = 'Display decimals in prices';
+$_LANGADM['AdminCurrencies87bd3cbac63d9410fff1815181cb60cc'] = 'Spacing:';
 $_LANGADM['AdminCurrenciesb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
-$_LANGADM['AdminCurrenciesd6b378c31ecfd51965a5a318e06af249'] = 'Include a blank between sign and price, e.g.,';
+$_LANGADM['AdminCurrenciesd6b378c31ecfd51965a5a318e06af249'] = 'Include a space between symbol and price, e.g.';
 $_LANGADM['AdminCurrencies0099c0173a3c7758b36025bdae9b4fc7'] = 'Enable:';
 $_LANGADM['AdminCurrencies38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminCurrencies19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
@@ -446,15 +541,15 @@ $_LANGADM['AdminCustomerThreads41de6d6cfb8953c021bbe4ba0701c8a1'] = 'Messages';
 $_LANGADM['AdminCustomerThreadscf090b8fa4a136ed6058aaf84d5d2538'] = 'Last message';
 $_LANGADM['AdminCustomerThreadsd21b5a78517318e6d35414d4217950ce'] = 'Message forwarded to';
 $_LANGADM['AdminCustomerThreads240f3031f25601fa128bd4e15f0a37de'] = 'Comment:';
-$_LANGADM['AdminCustomerThreads518f0adf73dca7abeebc9c3a85352cfc'] = 'No new message';
+$_LANGADM['AdminCustomerThreads518f0adf73dca7abeebc9c3a85352cfc'] = 'No new messages';
 $_LANGADM['AdminCustomerThreads47bab378f9e6268f758db00bcbf014fa'] = 'new messages';
 $_LANGADM['AdminCustomerThreadsf752f758ff0b5c465d65c2d0bcc579cd'] = 'new message';
 $_LANGADM['AdminCustomerThreads693c61ec70b6c06dbd376fd208a125a0'] = 'Total threads';
 $_LANGADM['AdminCustomerThreads068f62c804cc9c4cd4f6dfc5b5d3ecaa'] = 'Threads pending';
 $_LANGADM['AdminCustomerThreads64898ffcd380ab607ccfe2f843447424'] = 'Total customer messages';
 $_LANGADM['AdminCustomerThreads8a1926ed751f4c73a2271945278cf2df'] = 'Total employee messages';
-$_LANGADM['AdminCustomerThreadsf112c37a7318adef5c2d14c687172c25'] = 'Threads unread';
-$_LANGADM['AdminCustomerThreads9cce8dbf2a8e527cbf71bcf8a8a7e352'] = 'Threads closed';
+$_LANGADM['AdminCustomerThreadsf112c37a7318adef5c2d14c687172c25'] = 'Unread threads';
+$_LANGADM['AdminCustomerThreads9cce8dbf2a8e527cbf71bcf8a8a7e352'] = 'Closed threads';
 $_LANGADM['AdminCustomerThreads2273d1167a6212812d95dc8fadbae78e'] = 'Customer service';
 $_LANGADM['AdminCustomerThreadsc33e404a441c6ba9648f88af3c68a1ca'] = 'Statistics';
 $_LANGADM['AdminCustomerThreads9788af9fa097020a285afc0651a0721c'] = 'View customer';
@@ -482,14 +577,15 @@ $_LANGADM['AdminCustomerThreads7bc873cba11f035df692c3549366c722'] = '-- Choose -
 $_LANGADM['AdminCustomerThreads81e053d78f01540e9cd6fb68a1c03976'] = 'Someone else';
 $_LANGADM['AdminCustomerThreads2605a817441c19cc88eb9e5d17845dc0'] = 'You can add a comment here.';
 $_LANGADM['AdminCustomerThreads548abe251b033d863417979998dba612'] = 'Forward this discussion';
-$_LANGADM['AdminCustomerThreads1a7b79fd8642e9a33c12372e405d95d6'] = 'Go to the oldest next unanswered message';
-$_LANGADM['AdminCustomerThreads408f476244defe7636d3143848bf1024'] = 'The other messages in this category have been answered';
-$_LANGADM['AdminCustomerThreadsc9d31b30a6ca5a4613085216dfe9894f'] = 'Set this message as handled';
+$_LANGADM['AdminCustomerThreads1a7b79fd8642e9a33c12372e405d95d6'] = 'Go to the oldest unanswered message';
+$_LANGADM['AdminCustomerThreads54ebd9a5b69ce86503616d72ed9e82c6'] = 'Answer to the next unanswered message in this category';
+$_LANGADM['AdminCustomerThreads408f476244defe7636d3143848bf1024'] = 'All other messages in this category have been answered';
+$_LANGADM['AdminCustomerThreadsc9d31b30a6ca5a4613085216dfe9894f'] = 'Mark this message as handled';
 $_LANGADM['AdminCustomerThreadse2b74d691e528e8686dfb0b72aafe299'] = 'Declare this message';
-$_LANGADM['AdminCustomerThreads73884952f6f4716ecd7c111b2a84e988'] = 'as \"pending 1\"';
+$_LANGADM['AdminCustomerThreads73884952f6f4716ecd7c111b2a84e988'] = 'as \"Pending 1\"';
 $_LANGADM['AdminCustomerThreads7cc947927ae700f1b5086b8575ea1689'] = '(will be answered later)';
 $_LANGADM['AdminCustomerThreads5515c12607ca7c861299ff6c174a79f9'] = 'Click here to disable pending status';
-$_LANGADM['AdminCustomerThreads2a4abb9e0d8f1c4fbaf12a48687f7bb7'] = 'as \"pending 2\"';
+$_LANGADM['AdminCustomerThreads2a4abb9e0d8f1c4fbaf12a48687f7bb7'] = 'as \"Pending 2\"';
 $_LANGADM['AdminCustomerThreads7442e29d7d53e549b78d93c46b8cdcfc'] = 'Orders';
 $_LANGADM['AdminCustomerThreads44749712dbec183e983dcd78a7736c41'] = 'Date';
 $_LANGADM['AdminCustomerThreads068f80c7519d0528fb08e82137a72131'] = 'Products';
@@ -514,15 +610,15 @@ $_LANGADM['AdminCustomers00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
 $_LANGADM['AdminCustomers00ee8a54c1a129585ad8027e6d35222d'] = 'News.';
 $_LANGADM['AdminCustomers74f68b6b29bed7925bc7257ef1c7f9e4'] = 'Opt.';
 $_LANGADM['AdminCustomers0f98b7f230f3c91292f0de4c99e263f2'] = 'Registration';
-$_LANGADM['AdminCustomersc2cc7082a89c1ad6631a2f66af5f00c0'] = 'Connection';
-$_LANGADM['AdminCustomers6dc6993c567c112a42b193c430f9ec43'] = 'Customers options';
+$_LANGADM['AdminCustomersc2cc7082a89c1ad6631a2f66af5f00c0'] = 'Last visit';
+$_LANGADM['AdminCustomers6dc6993c567c112a42b193c430f9ec43'] = 'Customer options';
 $_LANGADM['AdminCustomers6d1b3d500b8a7cbaeb62b0643ee57c7c'] = 'Regenerate password:';
-$_LANGADM['AdminCustomers87eed0b2fbd8bec6796514f309d87aec'] = 'Security minimum time to wait to regenerate the password';
+$_LANGADM['AdminCustomers87eed0b2fbd8bec6796514f309d87aec'] = 'Security: Minimum time to wait between two password changes';
 $_LANGADM['AdminCustomers640fd0cc0ffa0316ae087652871f4486'] = 'minutes';
 $_LANGADM['AdminCustomers45d3153df3f835bbf6a68c2302e494d7'] = 'How do you want to delete your customer(s)?';
 $_LANGADM['AdminCustomers7b4d23148ad2c2f32f217ae0640a375c'] = 'You have two ways to delete a customer, please choose what you want to do.';
-$_LANGADM['AdminCustomers7c02e576ed6029a3a1d64700cc43ebf7'] = 'I want to delete my customer(s) for real, all data will be removed from the database. A customer with the same e-mail address will be able to register again.';
-$_LANGADM['AdminCustomersaa9000a0aa27a0920d69744960520677'] = 'I don\'t want my customer(s) to register again. The customer(s) will be removed from this list but all data will be kept in the database.';
+$_LANGADM['AdminCustomers7c02e576ed6029a3a1d64700cc43ebf7'] = 'I want to delete all data, customer(s) will be deleted from the database. A customer with the same e-mail address will be able to register again.';
+$_LANGADM['AdminCustomersaa9000a0aa27a0920d69744960520677'] = 'I don\'t want my customer(s) to be able to register again. The customer(s) will not appear in this list but all data will be kept in the database.';
 $_LANGADM['AdminCustomersceece2e4b93f9a5a091e1c64120ff5bd'] = 'Delete   ';
 $_LANGADM['AdminCustomerse0f0b0564d3d29a93fad7a4178b7b1ca'] = 'ID:';
 $_LANGADM['AdminCustomersc151015063ad115e4c3b081763c0927d'] = 'Registration date:';
@@ -538,8 +634,9 @@ $_LANGADM['AdminCustomers24a23d787190f2c4812ff9ab11847a72'] = 'Status:';
 $_LANGADM['AdminCustomers125cf762f473a17738b97ee3fabe4e8b'] = 'This customer is registered as';
 $_LANGADM['AdminCustomers084e0343a0486ff05530df6c705c8bb4'] = 'guest';
 $_LANGADM['AdminCustomers80e915c39ca9254655d2802979aa698b'] = 'Transform to customer';
+$_LANGADM['AdminCustomers81fe7d0c685ca9f1829f5ff52370d06e'] = 'A registered customer account already exists with this e-mail address';
 $_LANGADM['AdminCustomersa7136d956fbff49c3912e44722dbf000'] = 'Add a private note';
-$_LANGADM['AdminCustomersac7ba2fb36727fd3fcbf967c27cd9dc0'] = 'This note will be displayed to all the employees but not to the customer.';
+$_LANGADM['AdminCustomersac7ba2fb36727fd3fcbf967c27cd9dc0'] = 'This note will be displayed to all employees but not to the customer.';
 $_LANGADM['AdminCustomers38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminCustomers56eec78925570b01dc23134175172985'] = 'Your note has been saved';
 $_LANGADM['AdminCustomersf81f334947c006163040911e694fc3ec'] = 'Error: your note is not valid';
@@ -555,7 +652,7 @@ $_LANGADM['AdminCustomers06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions';
 $_LANGADM['AdminCustomers7442e29d7d53e549b78d93c46b8cdcfc'] = 'Orders';
 $_LANGADM['AdminCustomers44749712dbec183e983dcd78a7736c41'] = 'Date';
 $_LANGADM['AdminCustomers068f80c7519d0528fb08e82137a72131'] = 'Products';
-$_LANGADM['AdminCustomersea067eb37801c5aab1a1c685eb97d601'] = 'Total paid';
+$_LANGADM['AdminCustomersea067eb37801c5aab1a1c685eb97d601'] = 'Total spent';
 $_LANGADM['AdminCustomersc453a4b8e8d98e82f35b67f433e3b4da'] = 'Payment';
 $_LANGADM['AdminCustomers46a2a41cc6e552044816a2d04634545d'] = 'State';
 $_LANGADM['AdminCustomersd1554912e46f8d36a800ad8b604225f1'] = 'Valid orders:';
@@ -573,7 +670,7 @@ $_LANGADM['AdminCustomers9d5bf15117441a1b52eb1f0808e4aad3'] = 'Discounts';
 $_LANGADM['AdminCustomersca0dbad92a874b2f69b549293387925e'] = 'Code';
 $_LANGADM['AdminCustomersa1fa27779242b4902f7ae3bdd5c6d508'] = 'Type';
 $_LANGADM['AdminCustomers689202409e48743b914713f96d93947c'] = 'Value';
-$_LANGADM['AdminCustomers907d7000b3555d1a1b12f1fed29a9ec4'] = 'Qty available';
+$_LANGADM['AdminCustomers907d7000b3555d1a1b12f1fed29a9ec4'] = 'Quantity available';
 $_LANGADM['AdminCustomers6ff01ff52bb6bc600dcb062808a55c5f'] = 'has no discount vouchers';
 $_LANGADM['AdminCustomersfc26e55e0993a75e892175deb02aae15'] = 'Carts';
 $_LANGADM['AdminCustomers96b0141273eabab320119c467cdcaf17'] = 'Total';
@@ -617,56 +714,56 @@ $_LANGADM['AdminCustomersb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
 $_LANGADM['AdminCustomers8d218b952c9ef571cd270aaef8f849d1'] = 'Allow or disallow this customer to log in';
 $_LANGADM['AdminCustomerscca344269d726c206f3d3894c85cae5a'] = 'Customer will receive your newsletter via e-mail';
 $_LANGADM['AdminCustomers5ed5ce582affef97f07fa474c6751302'] = 'Customer will receive your ads via e-mail';
-$_LANGADM['AdminCustomers8d177b48ffca1fb18c3bfd1e8c0eb645'] = 'Default group:';
-$_LANGADM['AdminCustomers7aea94ad2dc662cb934bc6746775fd3f'] = 'Apply non-cumulative rules (e.g., price, display method, reduction)';
-$_LANGADM['AdminCustomers8783bc7ae2b9e8d93a2bc15150aaefa8'] = 'Groups:';
+$_LANGADM['AdminCustomers8d177b48ffca1fb18c3bfd1e8c0eb645'] = 'Default customer group:';
+$_LANGADM['AdminCustomers7aea94ad2dc662cb934bc6746775fd3f'] = 'Customer group from which all non-cumulative rules (e.g. price display method, reductions, etc.) will be applied';
+$_LANGADM['AdminCustomers8783bc7ae2b9e8d93a2bc15150aaefa8'] = 'Customer groups:';
 $_LANGADM['AdminCustomersc6155aaecccf794cd2a00fcc35898022'] = 'Group name';
-$_LANGADM['AdminCustomers3cf21846659529ae741430ff2ddf287f'] = 'Check all the box(es) of groups of which the customer is to be a member';
-$_LANGADM['AdminCustomers69e62346c35bc63795db142cfbb0af66'] = 'No group created';
+$_LANGADM['AdminCustomers3cf21846659529ae741430ff2ddf287f'] = 'Select all customer groups you would like to apply to this customer';
+$_LANGADM['AdminCustomers69e62346c35bc63795db142cfbb0af66'] = 'No customer group available';
 $_LANGADM['AdminCustomers19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
 $_LANGADM['AdminDbe307db07b3975fef922a80d07455ee5e'] = 'Database';
 $_LANGADM['AdminDb505de52d5ae227b6e8acb02dce2a0c4d'] = 'Server:';
-$_LANGADM['AdminDb67cfd6717606cadb04e8ae03082a0182'] = 'IP or server name; \'localhost\' will work in most cases';
+$_LANGADM['AdminDb67cfd6717606cadb04e8ae03082a0182'] = 'IP address or server name; \'localhost\' will work in most cases';
 $_LANGADM['AdminDb006e7be42e56d810865222669c716f9e'] = 'Database:';
-$_LANGADM['AdminDb9222f8688de5dfd4dabc06fffe8c6aa0'] = 'Database name (e.g., \'prestashop\')';
-$_LANGADM['AdminDbf72ba2e5f0388494cc5041adad99581f'] = 'Prefix:';
+$_LANGADM['AdminDb9222f8688de5dfd4dabc06fffe8c6aa0'] = 'Database name (e.g. \'prestashop\')';
+$_LANGADM['AdminDbf72ba2e5f0388494cc5041adad99581f'] = 'Prefix (e.g. \'ps_\'):';
 $_LANGADM['AdminDb5ff9df198222a96f26bf2cb279d83bd8'] = 'User:';
 $_LANGADM['AdminDbb341a59d5636ed3d6a819137495b08a0'] = 'Password:';
 $_LANGADM['AdminDb3f783e6afc73242779dde81c7825def0'] = 'Leave blank if no change';
 $_LANGADM['AdminDb6bb09f0abb00bcba314068abab6fecb7'] = 'is already in';
-$_LANGADM['AdminDba7fd7e3f904a981a4952454d79a806e8'] = 'Can\'t change engine for';
+$_LANGADM['AdminDba7fd7e3f904a981a4952454d79a806e8'] = 'Cannot change database storage engine for';
 $_LANGADM['AdminDbf4d1ea475eaa85102e2b4e6d95da84bd'] = 'Confirmation';
-$_LANGADM['AdminDb55bf473fba81a29380af1598e67c555b'] = 'Engine change of';
+$_LANGADM['AdminDb55bf473fba81a29380af1598e67c555b'] = 'Change database engine from';
 $_LANGADM['AdminDb01b6e20344b68835c5ed1ddedf20d531'] = 'to';
-$_LANGADM['AdminDbb833598a404d0408f61b9762278c9bea'] = 'Be VERY CAREFUL with these settings, as changes may cause your PrestaShop online store to malfunction. For all issues, check the config/settings.inc.php file.';
+$_LANGADM['AdminDbb833598a404d0408f61b9762278c9bea'] = 'Warning: Be VERY CAREFUL with these settings, as changes may cause your PrestaShop online store to malfunction. For any issues, check the config/settings.inc.php file.';
 $_LANGADM['AdminDb6c1375701d87f2636b01cf951d0a375b'] = 'MySQL Engine';
 $_LANGADM['AdminDb51c45b795d5d18a3e4e0c37e8b20a141'] = 'Table';
 $_LANGADM['AdminDbb0d1963f24d64313f9c8d83662cc551a'] = 'Table Engine';
-$_LANGADM['AdminDbac7484fa4e36b9b26ceb27526ee7268f'] = 'Change Engine to';
-$_LANGADM['AdminDeliverySlip4b8e87b44ae65d84dfab14d17d2f10ee'] = 'Delivery slips options';
+$_LANGADM['AdminDbac7484fa4e36b9b26ceb27526ee7268f'] = 'Change database engine to';
+$_LANGADM['AdminDeliverySlip4b8e87b44ae65d84dfab14d17d2f10ee'] = 'Delivery slip options';
 $_LANGADM['AdminDeliverySlip97794c45ba541adc77cd08dd3114cefc'] = 'Delivery prefix:';
 $_LANGADM['AdminDeliverySlip7b59b85b45733b885f95f89f8924f0fd'] = 'Prefix used for delivery slips';
 $_LANGADM['AdminDeliverySlip1de536cfcff31d969aacc0b7f66410c3'] = 'Delivery number:';
 $_LANGADM['AdminDeliverySlip071e16ef4a5515728cc97ed028d85711'] = 'The next delivery slip will begin with this number, and then increase with each additional slip';
 $_LANGADM['AdminDeliverySlip4bc8978f084bf1726cb133a3dc8cc379'] = 'Print PDF delivery slips';
 $_LANGADM['AdminDeliverySlip1e6d57e813355689e9c77e947d73ad8f'] = 'From:';
-$_LANGADM['AdminDeliverySlip0b1fb1278454d848f968d419e29c253b'] = 'Format: 2007-12-31 (inclusive)';
+$_LANGADM['AdminDeliverySlip0b1fb1278454d848f968d419e29c253b'] = 'Format: 2011-12-31 (inclusive)';
 $_LANGADM['AdminDeliverySlip33caa076f23f453dd4061726f3706325'] = 'To:';
-$_LANGADM['AdminDeliverySlip647ad0242a9d796e3c83ecf6d6435bc2'] = 'Format: 2008-12-31 (inclusive)';
+$_LANGADM['AdminDeliverySlip647ad0242a9d796e3c83ecf6d6435bc2'] = 'Format: 2012-12-31 (inclusive)';
 $_LANGADM['AdminDeliverySlip067af5895a7ced3197520b591f9a41eb'] = 'Generate PDF file';
-$_LANGADM['AdminDeliverySlip70397c4b252a5168c5ec003931cea215'] = 'Required fields';
-$_LANGADM['AdminDeliverySlipf596633d68fc44d6c7460676060d5dcb'] = 'Invalid from date';
-$_LANGADM['AdminDeliverySlipff9e9791ff17e1ca431449bb2fe992c0'] = 'Invalid end date';
+$_LANGADM['AdminDeliverySlip70397c4b252a5168c5ec003931cea215'] = 'Required field';
+$_LANGADM['AdminDeliverySlipf596633d68fc44d6c7460676060d5dcb'] = 'Invalid \"From\" date';
+$_LANGADM['AdminDeliverySlipff9e9791ff17e1ca431449bb2fe992c0'] = 'Invalid \"To\" date';
 $_LANGADM['AdminDeliverySlipc569149bbb8ca2ea337fa0a4c6c98409'] = 'No delivery slip found for this period';
 $_LANGADM['AdminDiscountsb718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminDiscountsca0dbad92a874b2f69b549293387925e'] = 'Code';
 $_LANGADM['AdminDiscountsb5a7adde1af5c87d7fd797b6245c2a39'] = 'Description';
 $_LANGADM['AdminDiscountsa1fa27779242b4902f7ae3bdd5c6d508'] = 'Type';
 $_LANGADM['AdminDiscounts689202409e48743b914713f96d93947c'] = 'Value';
-$_LANGADM['AdminDiscounts03ab340b3f99e03cff9e84314ead38c0'] = 'Qty';
-$_LANGADM['AdminDiscountse12167aa0a7698e6ebc92b4ce3909b53'] = 'To';
+$_LANGADM['AdminDiscounts03ab340b3f99e03cff9e84314ead38c0'] = 'Quantity';
+$_LANGADM['AdminDiscountse12167aa0a7698e6ebc92b4ce3909b53'] = 'Expiration';
 $_LANGADM['AdminDiscountsec53a8c4f07baed5d8825072c89799be'] = 'Status';
-$_LANGADM['AdminDiscountseca147fc2bad45a5b40b1577b27b7be9'] = 'Discounts options';
+$_LANGADM['AdminDiscountseca147fc2bad45a5b40b1577b27b7be9'] = 'Discount options';
 $_LANGADM['AdminDiscounts04ec6ad95a38b319aa81f123b65fa051'] = 'Enable vouchers:';
 $_LANGADM['AdminDiscounts498d8e2df8c61ff257ae9c8fb6000969'] = 'Allow the use of vouchers in shop';
 $_LANGADM['AdminDiscountsa82868319826fb092b73968e661b5b38'] = 'Vouchers';
@@ -676,7 +773,7 @@ $_LANGADM['AdminDiscounts195f63d9a5d9395a335d4d688918e4fc'] = 'The voucher\'s co
 $_LANGADM['AdminDiscountse659b52eba1f0299b2d8ca3483919e72'] = 'Type:';
 $_LANGADM['AdminDiscounts7bc873cba11f035df692c3549366c722'] = '-- Choose --';
 $_LANGADM['AdminDiscounts998d08a9606f9656e8d1fcab8b762155'] = 'Either the monetary amount or the %, depending on Type selected above';
-$_LANGADM['AdminDiscounts1e3daef46deb690d10c979b6c6fd84a8'] = 'Behavior not exhausted:';
+$_LANGADM['AdminDiscounts1e3daef46deb690d10c979b6c6fd84a8'] = 'If voucher is not depleted:';
 $_LANGADM['AdminDiscounts38f19115f40b5d081e3282f8c2df6744'] = 'Reduce the voucher to the total order amount';
 $_LANGADM['AdminDiscounts106e44a3be976738ef3896d06e273ff9'] = 'Create a new voucher with remaining amount';
 $_LANGADM['AdminDiscounts3e351cfbf51376aa42d9f0ec9739af87'] = 'Create negative invoice';
@@ -685,18 +782,20 @@ $_LANGADM['AdminDiscounts6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Invalid character
 $_LANGADM['AdminDiscounts61f9fb8b88d84bd3634ae4723e777c3b'] = 'Will appear in cart next to voucher code';
 $_LANGADM['AdminDiscounts8c38776925f7cf41c090646a43157024'] = 'Categories:';
 $_LANGADM['AdminDiscounts49ee3087348e8d44e1feda1917443987'] = 'Name';
-$_LANGADM['AdminDiscounts2865645a2b9a5767eb89b189f2ecd74b'] = 'Mark all checkbox(es) of categories to which the discount is to be applied';
+$_LANGADM['AdminDiscounts2865645a2b9a5767eb89b189f2ecd74b'] = 'Select all checkbox(es) of categories to which the discount can be applied';
 $_LANGADM['AdminDiscountsc50eaa2ada5495158d3095fa2ddf9c04'] = 'Total quantity:';
 $_LANGADM['AdminDiscounts153d0acf0df787b54f7302940a72d280'] = 'Total quantity available (mainly for vouchers open to everyone)';
-$_LANGADM['AdminDiscounts9b07d8d7f793121a9a69500562f7e25d'] = 'Qty per each user:';
+$_LANGADM['AdminDiscounts9b07d8d7f793121a9a69500562f7e25d'] = 'Quantity allowed per user:';
 $_LANGADM['AdminDiscounts05be82dd4fff82f72167941221540c9f'] = 'Number of times a single customer can use this voucher';
 $_LANGADM['AdminDiscounts9f6e99bdd4184b83dc478d0ab1b4cbf7'] = 'Minimum amount';
+$_LANGADM['AdminDiscounts887ee91702c962a70b87cbef07bbcaec'] = 'tax excl.';
+$_LANGADM['AdminDiscountse2e79605fc9450ec17957cf0e910f5c6'] = 'tax incl.';
 $_LANGADM['AdminDiscounts4f5e701d9688498a831fe5d2c8b14062'] = '0 if not applicable';
 $_LANGADM['AdminDiscountsd7f9e940c5055ccbcdb08849e1eb47df'] = 'Cumulative with other vouchers';
 $_LANGADM['AdminDiscounts5ee348002fb5ec8e0abee8d46d279c75'] = 'Cumulative with price reductions';
 $_LANGADM['AdminDiscounts7046a6b20140e18ec4755718497875de'] = 'To be used by:';
 $_LANGADM['AdminDiscounts7e3a51a56ddd2846e21c33f05e0aea6f'] = 'All customers';
-$_LANGADM['AdminDiscountsa37ede293936e29279ed543129451ec3'] = 'Groups';
+$_LANGADM['AdminDiscountsa37ede293936e29279ed543129451ec3'] = 'Customer groups';
 $_LANGADM['AdminDiscountse6d0e1c8fc6a4fcf47869df87e04cd88'] = 'Customers';
 $_LANGADM['AdminDiscountsf1117307e696cf5dc323c4f226d84e45'] = 'Filter:';
 $_LANGADM['AdminDiscounts5b7ba8ccca237283e41cc488902640dd'] = 'No match found';
@@ -715,16 +814,16 @@ $_LANGADM['AdminDiscounts38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminDiscounts19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
 $_LANGADM['AdminEmails1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
 $_LANGADM['AdminEmails68e07c80282df8c6f72fd4edf630dc75'] = 'Send e-mail to:';
-$_LANGADM['AdminEmails765f159ab61b665aca550bd1a767f9d2'] = 'When customers send message from order page';
+$_LANGADM['AdminEmails765f159ab61b665aca550bd1a767f9d2'] = 'Where customers send message from order page';
 $_LANGADM['AdminEmailsad3bc3094733fbf7e0a10f0da116b864'] = 'Use PHP mail() function.  Recommended; works in most cases';
 $_LANGADM['AdminEmailsfd304ecc43446476fd981bb6b4f41f7f'] = 'Set my own SMTP parameters. For advanced users ONLY';
 $_LANGADM['AdminEmailsde79cca647023ab0f822dce4e3035478'] = 'Send e-mail as HTML';
 $_LANGADM['AdminEmails7d0435ff9cf1b9631daa6c4770441b9e'] = 'Send e-mail as Text';
 $_LANGADM['AdminEmails130c5b3473c57faa76e2a1c54e26f88e'] = 'Both';
-$_LANGADM['AdminEmailsd1e73ceb688ab6a0d6d3e7c10cb1c474'] = 'Mail domain:';
+$_LANGADM['AdminEmailsd1e73ceb688ab6a0d6d3e7c10cb1c474'] = 'Mail domain name:';
 $_LANGADM['AdminEmailsb3e39b71a787e2e14c64bac946c37849'] = 'Fully qualified domain name (keep it empty if you do not know)';
 $_LANGADM['AdminEmails33b3f142e242a624cb69a5f5f689039d'] = 'SMTP server:';
-$_LANGADM['AdminEmailsb0ac90156891121f5fbf84b276f89fcf'] = 'IP or server name (e.g., smtp.mydomain.com)';
+$_LANGADM['AdminEmailsb0ac90156891121f5fbf84b276f89fcf'] = 'IP address or server name (e.g. smtp.mydomain.com)';
 $_LANGADM['AdminEmails2800e9378401033bf3debf195b967343'] = 'SMTP user:';
 $_LANGADM['AdminEmails4ec202ee546b3c9ee3415854939ac39a'] = 'Leave blank if not applicable';
 $_LANGADM['AdminEmails037373672dd4a89426144d40f2e8ad91'] = 'SMTP password:';
@@ -734,13 +833,13 @@ $_LANGADM['AdminEmails6adf97f83acf6453d4a6a4b1070f3754'] = 'None';
 $_LANGADM['AdminEmails099d7d04319e5191b7473e016c55e320'] = 'TLS';
 $_LANGADM['AdminEmailsea52c36203c5f99c3ce2442d531b1a22'] = 'SSL';
 $_LANGADM['AdminEmails64ea53ab0a03507af104853e03c2db28'] = 'Port:';
-$_LANGADM['AdminEmails1fd75178ab1de3368fc619c5bd83b7cb'] = 'Number of port to use';
+$_LANGADM['AdminEmails1fd75178ab1de3368fc619c5bd83b7cb'] = 'Port number to use';
 $_LANGADM['AdminEmails652d1d00f6782dfd7d3dbd4ad2e30145'] = 'Test your e-mail configuration';
-$_LANGADM['AdminEmails66d129a76b5e0b7352c7470f75833e5c'] = 'This is a test message, your server is now available to send email';
+$_LANGADM['AdminEmails66d129a76b5e0b7352c7470f75833e5c'] = 'This is a test message, your server is now configured to send e-mail';
 $_LANGADM['AdminEmailsbe656d2d5c1e6f223dca152937941705'] = 'Test message - Prestashop';
-$_LANGADM['AdminEmailsdb30a86adf0ef9fbc6feb6fa5c8e23d7'] = 'Mail is sent';
+$_LANGADM['AdminEmailsdb30a86adf0ef9fbc6feb6fa5c8e23d7'] = 'A test e-mail has been sent to the e-mail address you specified';
 $_LANGADM['AdminEmails329a07ff51a56b7ce7e8412a8bce3f8b'] = 'Error: please check your configuration';
-$_LANGADM['AdminEmailse5110300599f995b9d8cfbe930fba83e'] = 'This email address is wrong!';
+$_LANGADM['AdminEmailse5110300599f995b9d8cfbe930fba83e'] = 'This e-mail address is invalid';
 $_LANGADM['AdminEmails14dee5807769f30f20b8d17a6afd951c'] = 'Send a test e-mail to';
 $_LANGADM['AdminEmailsd6a55d64219386584388bf3731384c3f'] = 'Send an e-mail test';
 $_LANGADM['AdminEmployeesb718adec73e04ce3ec720dd11a06a308'] = 'ID';
@@ -749,12 +848,12 @@ $_LANGADM['AdminEmployees20db0bfeecd8fe60533206a2b5e9891a'] = 'First name';
 $_LANGADM['AdminEmployees8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
 $_LANGADM['AdminEmployeescce99c598cfdb9773ab041d54c3d973a'] = 'Profile';
 $_LANGADM['AdminEmployees6591effcd7a95eb926b61e1519530b17'] = 'Can log in';
-$_LANGADM['AdminEmployees9273a15f9ab581801b7faeeda6ca08e4'] = 'Employees options';
-$_LANGADM['AdminEmployees06a4c5177eef6113324fdb443b824023'] = 'Password regenerate:';
-$_LANGADM['AdminEmployeesb0534bc7430b91d63ff484c2b3a3e1be'] = 'Security minimum time to wait to regenerate a new password';
+$_LANGADM['AdminEmployees9273a15f9ab581801b7faeeda6ca08e4'] = 'Employee options';
+$_LANGADM['AdminEmployees06a4c5177eef6113324fdb443b824023'] = 'Password regeneration:';
+$_LANGADM['AdminEmployeesb0534bc7430b91d63ff484c2b3a3e1be'] = 'Security: minimum time to wait between two password changes';
 $_LANGADM['AdminEmployees640fd0cc0ffa0316ae087652871f4486'] = 'minutes';
-$_LANGADM['AdminEmployees442a8f5db7f786e260bbd65c7bc0cb55'] = 'Memorize form language:';
-$_LANGADM['AdminEmployeesff37db4701ba8f1a289fc2f81cc43f9d'] = 'Allow employees to save their own default form language';
+$_LANGADM['AdminEmployees442a8f5db7f786e260bbd65c7bc0cb55'] = 'Memorize language used in Admin panel forms:';
+$_LANGADM['AdminEmployeesff37db4701ba8f1a289fc2f81cc43f9d'] = 'Allow employees to select a specific language for Admin panel forms';
 $_LANGADM['AdminEmployeesbafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
 $_LANGADM['AdminEmployees93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
 $_LANGADM['AdminEmployeeseb626c94531ec554f93b2b78a77c8b1b'] = 'Employees';
@@ -764,17 +863,19 @@ $_LANGADM['AdminEmployeesb341a59d5636ed3d6a819137495b08a0'] = 'Password:';
 $_LANGADM['AdminEmployeesdc5e055e0c66ae48929d03a327972a58'] = 'Leave blank if you do not want to change your password';
 $_LANGADM['AdminEmployees2467bfdbc86d3cc7aab2130f56ce6978'] = 'Min. 8 characters; use only letters, numbers or';
 $_LANGADM['AdminEmployees78e365acb087fd1f8d494dae0001de10'] = 'E-mail address:';
-$_LANGADM['AdminEmployeesccec78d886c47adb7e5a79567d262c0d'] = 'Back office color:';
-$_LANGADM['AdminEmployeesc0008270d1fea195879befd65d85298f'] = 'Back office background will be displayed in this color. HTML colors only (e.g.,';
+$_LANGADM['AdminEmployeesccec78d886c47adb7e5a79567d262c0d'] = 'Admin panel color:';
+$_LANGADM['AdminEmployeesc0008270d1fea195879befd65d85298f'] = 'Admin panel background will be displayed in this color. HTML colors only (e.g.';
 $_LANGADM['AdminEmployees0885f0c211f74834f0109c5abaf4cdc4'] = 'Language:';
 $_LANGADM['AdminEmployeesa9e4402481bd9b8e36752bf731f67eb6'] = 'Theme:';
-$_LANGADM['AdminEmployeese4b41fb20213ac1461a81cb0c310bd97'] = 'UI mode:';
-$_LANGADM['AdminEmployeesf177aa999000021a3901ac78a2728b59'] = 'Hover on tabs';
-$_LANGADM['AdminEmployeesd4e0f6342c209912053fec10be72c94b'] = 'Click on tabs';
-$_LANGADM['AdminEmployees24a23d787190f2c4812ff9ab11847a72'] = 'Status:';
+$_LANGADM['AdminEmployeese4b41fb20213ac1461a81cb0c310bd97'] = 'Interface:';
+$_LANGADM['AdminEmployeesf177aa999000021a3901ac78a2728b59'] = 'Change tab on mouseover';
+$_LANGADM['AdminEmployeesd4e0f6342c209912053fec10be72c94b'] = 'Change tab on click';
+$_LANGADM['AdminEmployees79f79257476673a2aea1b2a41adf3384'] = 'Show screencast at log-in:';
 $_LANGADM['AdminEmployees00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
 $_LANGADM['AdminEmployeesb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
-$_LANGADM['AdminEmployees41bc9496fbde8565bd5fc699e513fbd9'] = 'Allow or disallow this employee to log into this Back Office';
+$_LANGADM['AdminEmployees4d1f8c97363b784de6d8924bc655cab6'] = 'Display the welcome video in the Admin panel dashboard at log-in';
+$_LANGADM['AdminEmployees24a23d787190f2c4812ff9ab11847a72'] = 'Status:';
+$_LANGADM['AdminEmployees41bc9496fbde8565bd5fc699e513fbd9'] = 'Allow or disallow this employee to log into the Admin panel';
 $_LANGADM['AdminEmployees9fbf3617c6172a75648e9ac0a864bb56'] = 'Profile:';
 $_LANGADM['AdminEmployees7bc873cba11f035df692c3549366c722'] = '-- Choose --';
 $_LANGADM['AdminEmployees38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
@@ -791,7 +892,7 @@ $_LANGADM['AdminFeatures06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions';
 $_LANGADM['AdminFeatures7dce122004969d56ae2e0245cb754d35'] = 'Edit';
 $_LANGADM['AdminFeatures081ae3451dfd55c52ba7ec21926e0854'] = 'Delete value';
 $_LANGADM['AdminFeaturesf2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
-$_LANGADM['AdminFeatures2a35a5a97d356cd4245c3496bc771f0c'] = 'No values defined';
+$_LANGADM['AdminFeatures2a35a5a97d356cd4245c3496bc771f0c'] = 'No values available';
 $_LANGADM['AdminFeatures6adab6d3fdf92c448d60cf8824e4851c'] = 'Delete selection';
 $_LANGADM['AdminFeaturese25f0ecd41211b01c83e5fec41df4fe7'] = 'Delete selected items?';
 $_LANGADM['AdminFeaturese8cf85cec621489ec026f7e06c67eb4e'] = 'Delete item';
@@ -805,16 +906,19 @@ $_LANGADM['AdminFeaturesValues6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Invalid char
 $_LANGADM['AdminFeaturesValuesb07e7131a6007b2a1a765bdd0e1e4894'] = 'Feature:';
 $_LANGADM['AdminFeaturesValues38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminFeaturesValues19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
-$_LANGADM['AdminGeneratorad11acdc8759d7a20ca3b868a8db30ae'] = 'Htaccess file generation';
+$_LANGADM['AdminGeneratorad11acdc8759d7a20ca3b868a8db30ae'] = '.htaccess file generation';
 $_LANGADM['AdminGenerator3f3e336e2f1fa10375efd923fca18b55'] = 'Warning:';
-$_LANGADM['AdminGenerator620da2256fdfaa8c903cc870221450ca'] = 'this tool can ONLY be used if you are hosted by an Apache web server. Please ask your webhost.';
-$_LANGADM['AdminGenerator53bdd80ab93282cc38ef9c605f058eba'] = 'This tool will automatically generate a \".htaccess\" file that will give you the ability to do URL rewriting and to catch 404 errors.';
-$_LANGADM['AdminGenerator18727f0f95739b6c5e9c2301b5a56ffa'] = 'If you do not have \"Friendly URL\" enabled when generating the \".htaccess\" file, this feature won\'t be available.';
+$_LANGADM['AdminGenerator620da2256fdfaa8c903cc870221450ca'] = 'this tool can ONLY be used if you are hosted by an Apache web server. Please ask your hosting provider if you are not sure.';
+$_LANGADM['AdminGenerator53bdd80ab93282cc38ef9c605f058eba'] = 'This tool will automatically generate a \".htaccess\" file that will give you the ability to do URL rewriting and catch 404 errors.';
 $_LANGADM['AdminGenerator15970c4fdbca1fc48c5b412d94e798c0'] = 'Optimization';
 $_LANGADM['AdminGenerator32d593fb52ab5e4ae3f16844b576867d'] = 'This will add directives to your .htaccess file which should improve caching and compression.';
 $_LANGADM['AdminGenerator1dec4f55522b828fe5dacf8478021a9e'] = 'Friendly URL';
-$_LANGADM['AdminGenerator223cf855cfa657eeb99550e1acd8eaa3'] = 'Enable only if your server allows URL rewriting.';
-$_LANGADM['AdminGeneratorb696dfaf5a833f70d71d26d052c6eaa3'] = 'Generate your \".htaccess\" file by clicking on the following button:';
+$_LANGADM['AdminGenerator223cf855cfa657eeb99550e1acd8eaa3'] = 'Enable only if your server allows URL rewriting. If you have not enabled \"Friendly URL\" in \"Preferences > SEO & URLs\" before generating the \".htaccess\" file, this feature will not work.';
+$_LANGADM['AdminGeneratoracaa02ab1d800ce9a0b3df2e4ab8909a'] = 'Disable Apache multiviews';
+$_LANGADM['AdminGenerator7dc12aaf3ebf9e01ef5b2ec91761c26a'] = 'Enable this option only if you have problems with URL rewriting on some pages.';
+$_LANGADM['AdminGenerator8b1fa347125449d64bb72e2c723cd8bf'] = 'Specific configuration';
+$_LANGADM['AdminGeneratord59b3e143646e3f3e28005adccdb36a3'] = 'Add here the specific directives of your hosting provider (e.g. SetEnv PHP_VER 5, AddType x-mapp-php5 .php, etc.).';
+$_LANGADM['AdminGeneratorb696dfaf5a833f70d71d26d052c6eaa3'] = 'Generate your \".htaccess\" file by clicking here:';
 $_LANGADM['AdminGenerator3c108dd1d7338dcc6a9face1824db1dd'] = 'Generate .htaccess file';
 $_LANGADM['AdminGenerator067b367b527d0a275f99b9071dd69e28'] = 'This will erase your';
 $_LANGADM['AdminGenerator149603e6c03516362a8da23f624db945'] = 'old';
@@ -822,52 +926,52 @@ $_LANGADM['AdminGenerator5b1315f64379c20167cc186f3cfed249'] = '.htaccess file!';
 $_LANGADM['AdminGeneratorb8a27e47e64caa3e36c8894c3745357b'] = 'Before being able to use this tool, you need to:';
 $_LANGADM['AdminGeneratord443c06bc05c5f7d35d95aba3ddcf817'] = '- create a';
 $_LANGADM['AdminGenerator8052c42ab3b8aa06a3f5f788a4ddccc2'] = '.htaccess';
-$_LANGADM['AdminGenerator93f711fc90428ec9589a70706e1866a2'] = 'blank file in directory';
-$_LANGADM['AdminGenerator60e4943ad37920b1f95133fae1420b59'] = '- give it write permissions (CHMOD 666 on Unix system)';
-$_LANGADM['AdminGenerator345d6249c20c6319bb09edaaf536744b'] = 'Robots file generation';
-$_LANGADM['AdminGenerator3b823baba7abb920bd1c18104ae7537b'] = 'Your file robots.txt MUST be in your website\'s root directory and nowhere else.';
-$_LANGADM['AdminGeneratorb65cc08420e484602c7c313336933452'] = 'eg: http://www.yoursite.com/robots.txt';
+$_LANGADM['AdminGenerator93f711fc90428ec9589a70706e1866a2'] = 'blank file in the shop\'s root directory';
+$_LANGADM['AdminGenerator60e4943ad37920b1f95133fae1420b59'] = '- Set write permissions for this file (CHMOD 777 on Unix system)';
+$_LANGADM['AdminGenerator345d6249c20c6319bb09edaaf536744b'] = 'robots.txt file generation';
+$_LANGADM['AdminGenerator3b823baba7abb920bd1c18104ae7537b'] = 'Your robots.txt file MUST be located in your shop\'s root directory.';
+$_LANGADM['AdminGeneratorb65cc08420e484602c7c313336933452'] = 'e.g. http://www.yoursite.com/robots.txt';
 $_LANGADM['AdminGenerator2129c4f9bb14dcddabb6453bfbeff246'] = 'This tool will automatically generate a \"robots.txt\" file that you can configure to deny access to search engines for some pages.';
-$_LANGADM['AdminGeneratorffd4c6a67eb0c56d04a5ebca5e8cbf80'] = 'Generate your \"robots.txt\" file by clicking on the following button:';
+$_LANGADM['AdminGeneratorffd4c6a67eb0c56d04a5ebca5e8cbf80'] = 'Generate your \"robots.txt\" file by clicking here:';
 $_LANGADM['AdminGenerator7959e21ff0b83542251ca0b4e9a62eea'] = 'Generate robots.txt file';
 $_LANGADM['AdminGenerator76bdc7d3324595e5c6430ba466690cba'] = 'robots.txt file!';
 $_LANGADM['AdminGeneratoraa2646a667ee1cd83235786dccef4a26'] = 'robots.txt';
 $_LANGADM['AdminGeneratorc03c063bb390b0042cabd4e08ac92347'] = 'blank file in dir:';
-$_LANGADM['AdminGenerator99bd735570f4e71f3596ad208f6f63c6'] = 'Cannot write into file:';
-$_LANGADM['AdminGeneratorff75496593d3ce1584f5e974e9668330'] = 'Please check write permissions.';
+$_LANGADM['AdminGenerator99bd735570f4e71f3596ad208f6f63c6'] = 'Cannot write file:';
+$_LANGADM['AdminGeneratorff75496593d3ce1584f5e974e9668330'] = 'Please check write permissions on this file.';
 $_LANGADM['AdminGeolocation323d4eb70b252acb4a04eaf9e0882597'] = 'Geolocation';
 $_LANGADM['AdminGeolocation3f089ec9b9ef410a9d81bef70114d387'] = 'In order to use Geolocation, please download';
 $_LANGADM['AdminGeolocation976b976e66879a470635bf0f660e81fc'] = 'this file';
-$_LANGADM['AdminGeolocation3d3aa857bbce5746c7156f447f6bdc60'] = 'and decompress it into tools/geoip/ directory';
-$_LANGADM['AdminGeolocation665d5ac9ea21d13ec63596b0d84bf9ea'] = 'Geolocation by IP';
-$_LANGADM['AdminGeolocationc95467b224ae2a3f8a4c12ddbbb0448e'] = 'Geolocation by IP:';
+$_LANGADM['AdminGeolocation3d3aa857bbce5746c7156f447f6bdc60'] = 'and extract it (e.g. using Winrar or Gzip) into this directory: /tools/geoip/';
+$_LANGADM['AdminGeolocation665d5ac9ea21d13ec63596b0d84bf9ea'] = 'Geolocation by IP address';
+$_LANGADM['AdminGeolocationc95467b224ae2a3f8a4c12ddbbb0448e'] = 'Geolocation by IP address:';
 $_LANGADM['AdminGeolocation00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
 $_LANGADM['AdminGeolocationb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
 $_LANGADM['AdminGeolocation5ce2a0bcb8967528a33c2c0d31cbb194'] = 'This option allows you, among other things, to restrict access to your shop for many countries. See below.';
 $_LANGADM['AdminGeolocationc9cc8cce247e49bae79f15173ce97354'] = 'Save';
 $_LANGADM['AdminGeolocationdae8ace18bdcbcc6ae5aece263e14fe8'] = 'Options';
-$_LANGADM['AdminGeolocation4fe49a258059a1dca12770e1dfe40ea2'] = 'The following features are only available if you enable the Geolocation by IP feature.';
+$_LANGADM['AdminGeolocation4fe49a258059a1dca12770e1dfe40ea2'] = 'The following features are only available if you enable the Geolocation by IP address feature.';
 $_LANGADM['AdminGeolocation2eef60563335b16d4a98900298fe7841'] = 'Geolocation behavior for restricted countries:';
-$_LANGADM['AdminGeolocation9135a9ffd14e4b05e4e3bc4eab58fda7'] = 'Visitors can\'t see your catalog';
-$_LANGADM['AdminGeolocationfff95e613286b45e8c44f4316200a83f'] = 'Visitors can see your catalog but can\'t make an order';
-$_LANGADM['AdminGeolocation38e8888ae62868f7ec6cc940ffcaf373'] = 'Geolocation behavior for undefined countries:';
+$_LANGADM['AdminGeolocation9135a9ffd14e4b05e4e3bc4eab58fda7'] = 'Visitors cannot see your catalog';
+$_LANGADM['AdminGeolocationfff95e613286b45e8c44f4316200a83f'] = 'Visitors can see your catalog but cannot place an order';
+$_LANGADM['AdminGeolocation38e8888ae62868f7ec6cc940ffcaf373'] = 'Geolocation behavior for other countries:';
 $_LANGADM['AdminGeolocation4609449450efd4dbe3f05ef2e9c5151d'] = 'All features are available';
 $_LANGADM['AdminGeolocationa47cbf8871ff07c40a87bb58e412c063'] = 'Select countries that can access your store:';
 $_LANGADM['AdminGeolocation49ee3087348e8d44e1feda1917443987'] = 'Name';
-$_LANGADM['AdminGeolocationa79a12d2d7ab4c5524e33e62a568d77c'] = 'Whitelist of IP addresses';
-$_LANGADM['AdminGeolocation5e23ef5156fb0aca3cb2cc23fed2e267'] = 'You can add many IP addresses, these addresses will always be allowed to access your shop (e.g. Google bots IP).';
-$_LANGADM['AdminGeolocation911bac7fe508d2b815eab0612120b564'] = 'Allowed IP addresses:';
+$_LANGADM['AdminGeolocationa79a12d2d7ab4c5524e33e62a568d77c'] = 'IP address whitelist';
+$_LANGADM['AdminGeolocation5e23ef5156fb0aca3cb2cc23fed2e267'] = 'You can add many IP addresses, they will always be allowed to access your shop (e.g. Google bots IP).';
+$_LANGADM['AdminGeolocation911bac7fe508d2b815eab0612120b564'] = 'Whitelisted IP addresses:';
 $_LANGADM['AdminGroupsb718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminGroups49ee3087348e8d44e1feda1917443987'] = 'Name';
 $_LANGADM['AdminGroups104d9898c04874d0fbac36e125fa1369'] = 'Discount';
 $_LANGADM['AdminGroupsef53538ae41a651c7f72ab6cb1135d8c'] = 'Members';
 $_LANGADM['AdminGroups3112209b2dd9b55cf5dbc4865dd15afd'] = 'Creation date';
-$_LANGADM['AdminGroups03937134cedab9078be39a77ee3a48a0'] = 'Group';
+$_LANGADM['AdminGroupsc38266740494aa4980d05c606fccac10'] = 'Customer group';
 $_LANGADM['AdminGroups4e140ba723a03baa6948340bf90e2ef6'] = 'Name:';
 $_LANGADM['AdminGroups6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Invalid characters:';
 $_LANGADM['AdminGroupsa1e7379abfdbc3b8e03506e5489c6110'] = 'Discount:';
 $_LANGADM['AdminGroups0bcef9c45bd8a48eda1b26eb0c61c869'] = '%';
-$_LANGADM['AdminGroups6ad237b9a44e75f0f947efe1d5f1ccaa'] = 'Will automatically apply this value as a discount on ALL shop\'s products for this group\'s members.';
+$_LANGADM['AdminGroups6ad237b9a44e75f0f947efe1d5f1ccaa'] = 'Will automatically apply this value as a discount on all products for members of this customer group.';
 $_LANGADM['AdminGroups2e9a5410376da9d88c4623a408de2b58'] = 'Current category discount:';
 $_LANGADM['AdminGroups3adbdb3ac060038aa0e6e6c138ef9873'] = 'Category';
 $_LANGADM['AdminGroups689202409e48743b914713f96d93947c'] = 'Value';
@@ -877,21 +981,22 @@ $_LANGADM['AdminGroupsa9199a42a34f3a6004c9cd2cb268c10f'] = 'No discount';
 $_LANGADM['AdminGroups2dc9a383d693a2ded8b1ef832926ea93'] = 'Price display method:';
 $_LANGADM['AdminGroupsbefcac0f9644a7abee43e69f49252ac4'] = 'Tax excluded';
 $_LANGADM['AdminGroupsf4a0d7cb0cd45214c8ca5912c970de13'] = 'Tax included';
-$_LANGADM['AdminGroups35756bfdf07485441e0b1dd219025374'] = 'How the prices are displayed on order summary for this customer group (tax included or excluded).';
+$_LANGADM['AdminGroups35756bfdf07485441e0b1dd219025374'] = 'How prices are displayed in the order summary for this customer group.';
 $_LANGADM['AdminGroups38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminGroups19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
 $_LANGADM['AdminGroupsc53a3dc4f27d93e065c2c5be5a78b74f'] = 'New group discount';
 $_LANGADM['AdminGroups56a8a9eb05f9014da51a4f9b57322ac7'] = 'Category:';
-$_LANGADM['AdminGroups567183b8b1122180690be51cc6df2b74'] = 'Discount (in %):';
+$_LANGADM['AdminGroups60c4a9a7f56f6b9669f84977ebd0f93d'] = 'Only products that have this category as the default category will be affected';
+$_LANGADM['AdminGroups567183b8b1122180690be51cc6df2b74'] = 'Discount (%):';
 $_LANGADM['AdminGroups1fe63847218648baf13474e3d25747bb'] = '   Add   ';
-$_LANGADM['AdminGroupsdaab80c5dadc81fa2d019c562f805994'] = 'Sex';
-$_LANGADM['AdminGroups1ec5f5ec77c51a968271b2ca9862907d'] = 'e-mail';
+$_LANGADM['AdminGroupsdaab80c5dadc81fa2d019c562f805994'] = 'Gender';
+$_LANGADM['AdminGroups1ec5f5ec77c51a968271b2ca9862907d'] = 'E-mail';
 $_LANGADM['AdminGroups9c37b7b6ff829e977df287900543ea54'] = 'Birth date';
 $_LANGADM['AdminGroups22ffd0379431f3b615eb8292f6c31d12'] = 'Registration date';
 $_LANGADM['AdminGroups7442e29d7d53e549b78d93c46b8cdcfc'] = 'Orders';
 $_LANGADM['AdminGroupsec53a8c4f07baed5d8825072c89799be'] = 'Status';
 $_LANGADM['AdminGroups06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions';
-$_LANGADM['AdminGroupsfb93ea877b4e204a3676b9a27fe423b9'] = 'Customer members of this group';
+$_LANGADM['AdminGroupsfb93ea877b4e204a3676b9a27fe423b9'] = 'Members of this customer group';
 $_LANGADM['AdminGroups63889cfb9d3cbe05d1bd2be5cc9953fd'] = 'Male';
 $_LANGADM['AdminGroupsb719ce180ec7bd9641fece2f920f4817'] = 'Female';
 $_LANGADM['AdminGroupsaac3536927a1e082bbdbbd18039b486b'] = 'Write to this customer';
@@ -900,43 +1005,44 @@ $_LANGADM['AdminGroups424b1a913da3df93e2366d28f29e1893'] = 'Modify this customer
 $_LANGADM['AdminGroups729a51874fe901b092899e9e8b31c97a'] = 'Are you sure?';
 $_LANGADM['AdminGroupsc3b0525bb0516119f4233bc8f78ec05e'] = 'Delete this customer';
 $_LANGADM['AdminGroups3987833f7cb48f6bd0cf402d6994d346'] = 'No user in this group.';
-$_LANGADM['AdminHomeafd87eb38820c73315688a7cab2571d4'] = 'A good beginning...';
+$_LANGADM['AdminHomeafd87eb38820c73315688a7cab2571d4'] = 'Configuration checklist';
 $_LANGADM['AdminHomeecd188c0a9e0913f062d22331411158a'] = 'URL rewriting';
 $_LANGADM['AdminHome4d92a8b44ec205ea708bd3f3a8926b2d'] = 'Browser cache & compression';
 $_LANGADM['AdminHome5ad483f10dec94a21c78d89edc1fef94'] = 'Smarty optimization';
 $_LANGADM['AdminHome202460d68b46910927f17628291fdd61'] = 'Combine, Compress & Cache';
 $_LANGADM['AdminHome73a910e532bbbc17742ac1ad88189026'] = 'Shop enabled';
-$_LANGADM['AdminHome6cf148afcc6acae611cf5f65ddf074f9'] = '.htaccess up-to-date';
+$_LANGADM['AdminHomeaff26d06b54b6d6acb2ed185a5477f49'] = 'Index rebuilt after update';
+$_LANGADM['AdminHome6cf148afcc6acae611cf5f65ddf074f9'] = '.htaccess file up-to-date';
 $_LANGADM['AdminHome2938c7f7e560ed972f8a4f68e80ff834'] = 'Dashboard';
-$_LANGADM['AdminHome486389453cfc7006870efa54fb7f6df9'] = 'New PrestaShop version available';
+$_LANGADM['AdminHome486389453cfc7006870efa54fb7f6df9'] = 'New version of PrestaShop is available!';
 $_LANGADM['AdminHome801ab24683a4a8c433c6eb40c48bcd9d'] = 'Download';
 $_LANGADM['AdminHome095939fea07d985d07ababe2c18f5b9c'] = 'Update notification unavailable';
-$_LANGADM['AdminHome8ea6ef7812005ab540c9406c35fa4bb3'] = 'To receive PrestaShop update warnings, you need to activate the <b>allow_url_fopen</b> command in your <b>php.ini</b> config file.';
+$_LANGADM['AdminHome8ea6ef7812005ab540c9406c35fa4bb3'] = 'To receive PrestaShop update notifications, please enable the <b>allow_url_fopen</b> option in your <b>php.ini</b> config file.';
 $_LANGADM['AdminHome5d3ee00c373c5c4ed47a761939e94b76'] = 'more info';
-$_LANGADM['AdminHomeba96d5954aa6db09c9004b6dc12b6014'] = 'If you don\'t know how to do that, please contact your host administrator !';
+$_LANGADM['AdminHomeba96d5954aa6db09c9004b6dc12b6014'] = 'If you do not know how to do this, please ask your hosting provider.';
 $_LANGADM['AdminHome385500f9c4d131f38c706dbc9d3a77c4'] = 'View more video tutorials';
-$_LANGADM['AdminHome57747250ec23a658f7a227ac9241aeef'] = 'don\'t show again';
+$_LANGADM['AdminHome57747250ec23a658f7a227ac9241aeef'] = 'Do not show again';
 $_LANGADM['AdminHome52015afb6ec8b940ef903ff73f4c4058'] = 'New category';
-$_LANGADM['AdminHome830faa39d4dffcb14f4f514c9342e5d1'] = 'Create a new category and organize your products.';
+$_LANGADM['AdminHome830faa39d4dffcb14f4f514c9342e5d1'] = 'Create a new category and organize your catalog.';
 $_LANGADM['AdminHome656c3be690ee43df4b845bd2a2ebe587'] = 'New product';
-$_LANGADM['AdminHome2c3b06b32caf673175832aeb3833f32a'] = 'Fill up your catalog with new articles and attributes.';
+$_LANGADM['AdminHome2c3b06b32caf673175832aeb3833f32a'] = 'Fill your catalog with new products.';
 $_LANGADM['AdminHomec33e404a441c6ba9648f88af3c68a1ca'] = 'Statistics';
-$_LANGADM['AdminHomec0eef64157eb4bb621577e628f595beb'] = 'Manage your activity with a thorough analysis of your e-shop.';
+$_LANGADM['AdminHomec0eef64157eb4bb621577e628f595beb'] = 'Monitor your activity with a thorough analysis of your shop.';
 $_LANGADM['AdminHome4b08baa69304b6f4cd7ee5453beeea5e'] = 'New employee';
-$_LANGADM['AdminHome54361fc9e712ed173d019c3d4a6e2ca0'] = 'Add a new employee account and discharge a part of your duties of shop owner.';
+$_LANGADM['AdminHome54361fc9e712ed173d019c3d4a6e2ca0'] = 'Add a new employee account and discharge a part of your duties as shop owner.';
 $_LANGADM['AdminHomeb24344b6a2c4a94c9b0d0ebd4602aeca'] = 'View more';
-$_LANGADM['AdminHomeb98263dfd493178c43eca9b08a2ce4dc'] = 'Monthly Statistics';
+$_LANGADM['AdminHomeb98263dfd493178c43eca9b08a2ce4dc'] = 'This month\'s activity';
 $_LANGADM['AdminHome11ff9f68afb6b8b5b8eda218d7c83a65'] = 'Sales';
 $_LANGADM['AdminHome145091c4a142b35c98a860e2df97ef26'] = 'Total registrations';
 $_LANGADM['AdminHomebb5ebac63dc37bfae478c91bdf575e03'] = 'Total orders';
 $_LANGADM['AdminHomedcd13f267cf781b25dd8826080425464'] = 'Product pages viewed';
 $_LANGADM['AdminHomebcd454728d21fd1b7adcb2bb02af7316'] = 'Customers service';
-$_LANGADM['AdminHomea340073fa87f8783e926b7865a8d9fe0'] = 'Thread unread';
-$_LANGADM['AdminHome3a1c9b4de5495314cf4e6ce5baaf1001'] = 'Thread pending';
-$_LANGADM['AdminHome490244040ff9e9a9084ac9347fb38b97'] = 'Thread closed';
-$_LANGADM['AdminHomecab723c421c5278820b5020b6f360d54'] = 'Total thread';
-$_LANGADM['AdminHome0b7902adbdb6335dacf47d249fad05f1'] = 'Sales of the week';
-$_LANGADM['AdminHomec89b149018866032dd690b0983f1ac78'] = 'Sales +Tx';
+$_LANGADM['AdminHomea340073fa87f8783e926b7865a8d9fe0'] = 'Threads unread';
+$_LANGADM['AdminHome3a1c9b4de5495314cf4e6ce5baaf1001'] = 'Threads pending';
+$_LANGADM['AdminHome490244040ff9e9a9084ac9347fb38b97'] = 'Threads closed';
+$_LANGADM['AdminHomecab723c421c5278820b5020b6f360d54'] = 'Total threads';
+$_LANGADM['AdminHome0b7902adbdb6335dacf47d249fad05f1'] = 'This week\'s sales';
+$_LANGADM['AdminHomec89b149018866032dd690b0983f1ac78'] = 'Sales +Tax';
 $_LANGADM['AdminHomeb718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminHome2ea989f83006e233627987293f4bde0a'] = 'Customer Name';
 $_LANGADM['AdminHomeec53a8c4f07baed5d8825072c89799be'] = 'Status';
@@ -951,7 +1057,7 @@ $_LANGADM['AdminImageseec6c4bdbd339edf8cbea68becb85244'] = 'Height';
 $_LANGADM['AdminImagescb2f901ceed5c3365d056794a1b5047f'] = 'After modification, do not forget to regenerate thumbnails';
 $_LANGADM['AdminImagesfff0d600f8a0b5e19e88bfb821dd1157'] = 'Images';
 $_LANGADM['AdminImages204dd5cbb153eae3c105e3a42f1c0ff8'] = 'Type name:';
-$_LANGADM['AdminImagesa11abdf9fb207f44c2d44c72d8a1203f'] = 'Letters only (e.g., small, medium, large, extra-large)';
+$_LANGADM['AdminImagesa11abdf9fb207f44c2d44c72d8a1203f'] = 'Letters and minus sign (-) only (e.g. small, medium, large, extra-large)';
 $_LANGADM['AdminImages48ccf48dcf2218a413ce473262f21a0c'] = 'Width:';
 $_LANGADM['AdminImagesc2fc3eea4a3f9c52e7acbdb113b171b7'] = 'Maximum image width in pixels';
 $_LANGADM['AdminImagese933dc24fb245d863a43b4fefe9b45f5'] = 'Height:';
@@ -959,17 +1065,17 @@ $_LANGADM['AdminImagescf40e19ee10782c4284cac90feb4f73e'] = 'Maximum image height
 $_LANGADM['AdminImagesb52b44c9d23e141b067d7e83b44bb556'] = 'Products:';
 $_LANGADM['AdminImages00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Enabled';
 $_LANGADM['AdminImagesb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
-$_LANGADM['AdminImagesf9a9027d728e8c701143cc8b1829400b'] = 'This type will be applied to product images';
+$_LANGADM['AdminImagesf9a9027d728e8c701143cc8b1829400b'] = 'This type will be used for product images';
 $_LANGADM['AdminImages8c38776925f7cf41c090646a43157024'] = 'Categories:';
-$_LANGADM['AdminImages910467fa766cf5eeaa7034bf404e3c6a'] = 'This type will be applied to category images';
+$_LANGADM['AdminImages910467fa766cf5eeaa7034bf404e3c6a'] = 'This type will be used for category images';
 $_LANGADM['AdminImages0e1e874dde345d19583102a9fd63fb7e'] = 'Manufacturers:';
-$_LANGADM['AdminImagesc4fd2ca4519bd381b87fd6078971d87f'] = 'This type will be applied to manufacturer images';
+$_LANGADM['AdminImagesc4fd2ca4519bd381b87fd6078971d87f'] = 'This type will be used for manufacturer images';
 $_LANGADM['AdminImagesa00e46e856e637f8fd077b4fd710c9e2'] = 'Suppliers:';
-$_LANGADM['AdminImages3c9e0f95a0c3f7dd4c650d3ed1a0afb5'] = 'This type will be applied to suppliers images';
+$_LANGADM['AdminImages3c9e0f95a0c3f7dd4c650d3ed1a0afb5'] = 'This type will be used for supplier images';
 $_LANGADM['AdminImages7e92dc38b95095cfee88452579f3fb67'] = 'Scenes:';
-$_LANGADM['AdminImagesd72f2c002b37407379420bf987bca76a'] = 'This type will be applied to scenes images';
+$_LANGADM['AdminImagesd72f2c002b37407379420bf987bca76a'] = 'This type will be used for scene images';
 $_LANGADM['AdminImages89e2077ce10ec7fc0bde234fbc48c5cb'] = 'Stores:';
-$_LANGADM['AdminImages1bb3c9f27926baa18c5070fa6498f34e'] = 'This type will be applied to stores images';
+$_LANGADM['AdminImages1bb3c9f27926baa18c5070fa6498f34e'] = 'This type will be used for store images';
 $_LANGADM['AdminImages38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
 $_LANGADM['AdminImages19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
 $_LANGADM['AdminImagesaf1b98adf7f686b84cd0b443e022b7a0'] = 'Categories';
@@ -979,15 +1085,35 @@ $_LANGADM['AdminImagesbb34f602e45a9fbcb2cdfee7a48673fc'] = 'Scenes';
 $_LANGADM['AdminImages068f80c7519d0528fb08e82137a72131'] = 'Products';
 $_LANGADM['AdminImages821b8ee6937cec96c30fdafbfe836d68'] = 'Stores';
 $_LANGADM['AdminImages258606ef5a3ed5cd7e39da08435adec0'] = 'Regenerate thumbnails';
-$_LANGADM['AdminImagese4bb324f29622b389af104bce1db6fdc'] = 'Regenerates thumbnails for all existing product images';
-$_LANGADM['AdminImages9310244aa3f5325c976135a2a089949b'] = 'Please be patient, as this can take several minutes';
-$_LANGADM['AdminImages66a3f886eb548f3575add71847622388'] = 'Be careful! Manually generated thumbnails will be erased by automatically generated thumbnails.';
+$_LANGADM['AdminImagese4bb324f29622b389af104bce1db6fdc'] = 'Regenerates thumbnails for all existing images';
+$_LANGADM['AdminImages9310244aa3f5325c976135a2a089949b'] = 'Please be patient, this can take several minutes';
+$_LANGADM['AdminImages66a3f886eb548f3575add71847622388'] = 'Be careful! Manually uploaded thumbnails will be erased by automatically generated thumbnails.';
 $_LANGADM['AdminImagesb51000000ff730e7cacd10980186c1a4'] = 'Select image';
 $_LANGADM['AdminImagesb1c94ca2fbc3e78fc30069c8d0f01680'] = 'All';
 $_LANGADM['AdminImagesf559543da6c5866a2dd0ae70f4de370f'] = 'Select format';
 $_LANGADM['AdminImagesd379cadd41b68efe7c945b4d85c72085'] = 'Erase previous images';
-$_LANGADM['AdminImagesed13a29f9258d2b988ea7ba9d11de98b'] = 'Uncheck this checkbox only if your server timed out and you need to resume the regeneration.';
+$_LANGADM['AdminImagesed13a29f9258d2b988ea7ba9d11de98b'] = 'Deselect this checkbox only if your server timed out and you need to resume the regeneration.';
 $_LANGADM['AdminImages729a51874fe901b092899e9e8b31c97a'] = 'Are you sure?';
+$_LANGADM['AdminImages874d3deed67e503cac1d8bc00417794a'] = 'Move images';
+$_LANGADM['AdminImages0be9bdbde253c5d649e8667c0bae6754'] = 'PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a very large number of products.';
+$_LANGADM['AdminImages5e869c034d4bd6df7f278053e786e4fb'] = 'Duplicate images were found when moving the product images. It is probably caused by unused demonstration images. Please make sure that the folder ';
+$_LANGADM['AdminImages6ab89e213e3557e2ab248510d89051d1'] = 'only contains demonstration images then delete this folder.';
+$_LANGADM['AdminImages6713e1295572974656e3e04d18e77ca9'] = 'PrestaShop has detected that your server configuration is not compatible with the new storage system (directive \"safe_mode\" is activated). You should continue to use the actual system.';
+$_LANGADM['AdminImages0fb0d96026cc27f8a45d6cb909289903'] = 'You can choose to keep your images stored in the previous system - there is nothing wrong with that.';
+$_LANGADM['AdminImages6e9b08be274aa15f116c641e4c9b8599'] = 'You can also decide to move your images to the new storage system: in this case, click on the \"Move images\" button below. Please be patient, this can take several minutes.';
+$_LANGADM['AdminImages1bd266b7c30df50f9b77b0e0f55f2878'] = 'After moving all of your product images, for best performance go to the ';
+$_LANGADM['AdminImagese686877843ac3c9f4c45aaea265fe59c'] = 'product preferences tab';
+$_LANGADM['AdminImages8b82bc51644c14c234bb3b635b2e2d1c'] = 'and set \"Activate legacy images compatibility\" to NO.';
+$_LANGADM['AdminImagesff17d73fa2731689640e8afa0f591b0f'] = 'JPEG images have a small file size and standard quality. PNG images have a bigger file size, a higher quality and support transparency. Note that in all cases the image files will have the .jpg extension.';
+$_LANGADM['AdminImagesff167676b1516b34e7f9be0fea5349d6'] = 'WARNING: This feature may not be compatible with your theme or with some modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issue, turn it off by selecting \"Use JPEG\".';
+$_LANGADM['AdminImages42ceb344b0aaf896b362b0db70b46f98'] = 'Image quality';
+$_LANGADM['AdminImages2a911eb0d71d1b707a3f9d722a5935c2'] = 'Use JPEG';
+$_LANGADM['AdminImagesb8d0be967a9105f094abc811656ee660'] = 'Use PNG only if the base image is in PNG format';
+$_LANGADM['AdminImages718e1e271056782b288616e916511980'] = 'Use PNG for all images';
+$_LANGADM['AdminImagesd46bafd645c490bd4be22c4226619db9'] = 'JPEG quality';
+$_LANGADM['AdminImagesb73770b303fc0f331eee23ad7add197c'] = 'Ranges from 0 (worst quality, smallest file) to 100 (best quality, biggest file)';
+$_LANGADM['AdminImagesc5e26b2211d5ecbbeac96ea6e1cbb7c2'] = 'PNG quality';
+$_LANGADM['AdminImages2c1bbb0a5ff08c8011d6ea83084277ff'] = 'Ranges from 9 (worst quality, smallest file) to 0 (best quality, biggest file)';
 $_LANGADM['AdminImportaf1b98adf7f686b84cd0b443e022b7a0'] = 'Categories';
 $_LANGADM['AdminImport068f80c7519d0528fb08e82137a72131'] = 'Products';
 $_LANGADM['AdminImportb9208b03bcc9eb4a336258dcdcb66207'] = 'Combinations';
@@ -1212,6 +1338,7 @@ $_LANGADM['AdminLanguages70212b3d97d23361e0ec0bc567d7ea30'] = '\"No-picture\" im
 $_LANGADM['AdminLanguages2426cdf3330e330b60bb7004015207ba'] = 'Image displayed when \"no picture found\"';
 $_LANGADM['AdminLanguagesb9f5c797ebbf55adccdd8539a65a0241'] = 'Disabled';
 $_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Status:';
+$_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Status:';
 $_LANGADM['AdminLanguages4c85fb98bf7cfd94c638d0f4e4e39b92'] = 'Allow or disallow this language to be selected by the customer';
 $_LANGADM['AdminLanguages6ed8662bd9b7b3f59b193010be0c0f4a'] = 'Check if a language pack is available for this ISO code...';
 $_LANGADM['AdminLanguages38fb7d24e0d60a048f540ecb18e13376'] = '   Save   ';
@@ -1407,11 +1534,11 @@ $_LANGADM['AdminModulesf7c686a2f449e94bbbafca23e76dd33b'] = 'Icon legend';
 $_LANGADM['AdminModules150854c56046ef1253500d082fdfbbc2'] = 'Module installed and enabled';
 $_LANGADM['AdminModules48a963c9173e950ace0c801509eb8ef2'] = 'Module installed but disabled';
 $_LANGADM['AdminModulesbacc7d9b8003258a090961660729a9b5'] = 'No module found';
+$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'This action will permanently remove the module from the server. Are you sure you want to do this ?';
+$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
 $_LANGADM['AdminModulesbcfaccebf745acfd5e75351095a5394a'] = 'Disable';
 $_LANGADM['AdminModules2faec1f9f8cc7f8f40d521c4dd574f49'] = 'Enable';
 $_LANGADM['AdminModulesf1206f9fadc5ce41694f69129aecac26'] = 'Configure';
-$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'This action will permanently remove the module from the server. Are you sure you want to do this ?';
-$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
 $_LANGADM['AdminModulesPositions51a8b3a61ad63d4e5df2ce86870e39b8'] = 'Transplant a module';
 $_LANGADM['AdminModulesPositions498f79c4c5bbde77f1bceb6c86fd0f6d'] = 'Show';
 $_LANGADM['AdminModulesPositions4ba24d91566786f5315acf453418dbb6'] = 'All modules';
@@ -2268,8 +2395,6 @@ $_LANGADM['AdminScenesc820e0c1d4ae16db218626f49e7916b1'] = 'Kb max.';
 $_LANGADM['AdminScenes0b24516ee8c68a18020951583bc3b8ab'] = 'Automatically resized to';
 $_LANGADM['AdminScenes8a5c9824486e8c1f74cb4c4ec8f9e465'] = '(width x height)';
 $_LANGADM['AdminScenesa5394858079fa378684b20a1abc0e9be'] = 'Note: To change image dimensions, please change the \'thumb_scene\' image type settings to the desired size (in Back Office > Preferences > Images).';
-$_LANGADM['AdminScenes56a8a9eb05f9014da51a4f9b57322ac7'] = 'Category:';
-$_LANGADM['AdminScenes19f2cd1d239a894f67d4ac73058af014'] = 'Mark all checkbox(es) of the categories for which the image map is to appear.';
 $_LANGADM['AdminScenesdf41d831253828e9852a25c72393fde8'] = 'Save Image Map(s)';
 $_LANGADM['AdminScenesf5dae0e1b3d4bc66fadd2840b4f79227'] = 'Please add a picture to continue mapping the image...';
 $_LANGADM['AdminScenes19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
@@ -2690,7 +2815,6 @@ $_LANGADM['AdminTranslations4a4ec3855ac2f9f99d29088b6cc914a1'] = 'Fields to tran
 $_LANGADM['AdminTranslationsd05b6ed7d2345020440df396d6da7f73'] = 'fields';
 $_LANGADM['AdminTranslations7f34f2676cea244eff88e272f03a6e03'] = 'missing translation(s) on %s template(s) for %s';
 $_LANGADM['AdminTranslationsb3cb7b15aa2fb2cb6675414233a3aa1b'] = 'Subject for %s:';
-$_LANGADM['AdminTranslations336b1855d0b132434c887a50f4a425cc'] = 'No Subject was found for %s.';
 $_LANGADM['AdminTranslations078deac9ee43d3b13c460c4fd069b925'] = 'There is a problem getting the Mail files.';
 $_LANGADM['AdminTranslationsd2298f4722b53d97039abbe9d1c11a44'] = 'Please ensure that English files exist in %s folder';
 $_LANGADM['AdminTranslations98ef80a9c71c74e06e1e185dff22a5d3'] = '\"title\" tag:';
diff --git a/translations/fr/admin.php b/translations/fr/admin.php
index 366faa71f..07f126598 100644
--- a/translations/fr/admin.php
+++ b/translations/fr/admin.php
@@ -335,10 +335,6 @@ $_LANGADM['AdminCategories6637b53a5820cef0817b7f2a2553bfc8'] = 'Affichée :';
 $_LANGADM['AdminCategories00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
 $_LANGADM['AdminCategoriesb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
 $_LANGADM['AdminCategories66f2dd0c775eff24ac95c38347bcaf9a'] = 'Catégorie parente :';
-$_LANGADM['AdminCategories8cf04a9734132302f96da8e113e80ce5'] = 'Accueil';
-$_LANGADM['AdminCategoriesef7de3f485174ff47f061ad27d83d0ee'] = 'sélectionné';
-$_LANGADM['AdminCategoriesb56c3bda503a8dc4be356edb0cc31793'] = 'Tout replier';
-$_LANGADM['AdminCategories5ffd7a335dd836b3373f5ec570a58bdc'] = 'Tout étendre';
 $_LANGADM['AdminCategoriesd0042a700e9bdf79689d63ee6846dc0e'] = 'Description :';
 $_LANGADM['AdminCategories461900b74731e07320ca79366df3e809'] = 'Image :';
 $_LANGADM['AdminCategoriesf0eaa209893a6bb5512c9876037b82be'] = 'Charger le logo de la catégorie à partir de votre ordinateur';
@@ -403,7 +399,6 @@ $_LANGADM['AdminCountries00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
 $_LANGADM['AdminCountries5252b12033d3181aa8270eea2fd4c4d4'] = 'Préférences pays';
 $_LANGADM['AdminCountriesd14d3384847c11b0708990b3343c8dbf'] = 'Pays par défaut :';
 $_LANGADM['AdminCountriesb017db41a29dff4007de058af406341e'] = 'Pays par défaut utilisé dans la boutique';
-$_LANGADM['AdminCountries13feb6ab1a436929f78c13ec405ce215'] = 'Restreindre les pays en FO par ceux délivrés par les transporteurs actifs';
 $_LANGADM['AdminCountries91bb198c336e8b4a82bed07cffd78891'] = 'Ré-affichera votre dernière mise en page enregistrer';
 $_LANGADM['AdminCountriesa86a021f16a103f44a8aa1c06e484831'] = 'Ré-affichera une mise en page par défaut pour ce pays';
 $_LANGADM['AdminCountriesfc6bff84b96cbd12e8b2acb2cbe4c979'] = 'Ré-affichera votre dernière édition de mise en page ';
@@ -473,8 +468,6 @@ $_LANGADM['AdminCurrenciese7e915ec26ac2be5f5730752e5fc3b78'] = 'Vous ne pouvez p
 $_LANGADM['AdminCurrencies77428b04a1847555eb9bc52422a377b0'] = 'Taux de change';
 $_LANGADM['AdminCurrencies876ca43ba50351d4e492970f40632661'] = 'Mettre à jour les taux de change';
 $_LANGADM['AdminCurrencies48781284e7a2c2b1479559ce12aa73c5'] = 'Mettre à jour les taux de change en temps réel';
-$_LANGADM['AdminCurrencies5e7ad8ee59bd36302bbc58bc710eeabb'] = 'Mise à jour des taux de change';
-$_LANGADM['AdminCurrencies260f0e6ff1df0aa4f39310176b5d6c44'] = 'Ajoutez cette URL à votre crontab ou appelez-la manuellement chaque jour';
 $_LANGADM['AdminCurrenciesdfcfc43722eef1eab1e4a12e50a068b1'] = 'Devises';
 $_LANGADM['AdminCurrencies77295c7d814e7397c55f64ec06313984'] = 'Devise :';
 $_LANGADM['AdminCurrenciesa5ffda8871e3d3d193c8e67f76686375'] = 'Uniquement les lettres et le tiret sont autorisés';
@@ -780,8 +773,6 @@ $_LANGADM['AdminDiscounts153d0acf0df787b54f7302940a72d280'] = 'Quantité totale
 $_LANGADM['AdminDiscounts9b07d8d7f793121a9a69500562f7e25d'] = 'Quantité par personne :';
 $_LANGADM['AdminDiscounts05be82dd4fff82f72167941221540c9f'] = 'Nombre d\'utilisation maximum par un même utilisateur';
 $_LANGADM['AdminDiscounts9f6e99bdd4184b83dc478d0ab1b4cbf7'] = 'Montant minimum d\'achat';
-$_LANGADM['AdminDiscounts887ee91702c962a70b87cbef07bbcaec'] = 'HT';
-$_LANGADM['AdminDiscountse2e79605fc9450ec17957cf0e910f5c6'] = 'TTC';
 $_LANGADM['AdminDiscounts4f5e701d9688498a831fe5d2c8b14062'] = '0 si non applicable';
 $_LANGADM['AdminDiscountsd7f9e940c5055ccbcdb08849e1eb47df'] = 'Cumulable avec d\'autres bons de réduction';
 $_LANGADM['AdminDiscounts5ee348002fb5ec8e0abee8d46d279c75'] = 'Cumulable avec les promotions';
@@ -863,11 +854,9 @@ $_LANGADM['AdminEmployeesa9e4402481bd9b8e36752bf731f67eb6'] = 'Thème :';
 $_LANGADM['AdminEmployeese4b41fb20213ac1461a81cb0c310bd97'] = 'Mode d\'interface';
 $_LANGADM['AdminEmployeesf177aa999000021a3901ac78a2728b59'] = 'Affichage au survol';
 $_LANGADM['AdminEmployeesd4e0f6342c209912053fec10be72c94b'] = 'Affichage au clic';
-$_LANGADM['AdminEmployees79f79257476673a2aea1b2a41adf3384'] = 'Afficher le screencast :';
+$_LANGADM['AdminEmployees24a23d787190f2c4812ff9ab11847a72'] = 'Statut :';
 $_LANGADM['AdminEmployees00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
 $_LANGADM['AdminEmployeesb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
-$_LANGADM['AdminEmployees4d1f8c97363b784de6d8924bc655cab6'] = 'Afficher la vidéo de présentation sur le tableau de bord du panneau d\'administration';
-$_LANGADM['AdminEmployees24a23d787190f2c4812ff9ab11847a72'] = 'Statut :';
 $_LANGADM['AdminEmployees41bc9496fbde8565bd5fc699e513fbd9'] = 'Autoriser cet employé à se connecter au Back Office';
 $_LANGADM['AdminEmployees9fbf3617c6172a75648e9ac0a864bb56'] = 'Profil :';
 $_LANGADM['AdminEmployees7bc873cba11f035df692c3549366c722'] = '-- Choisissez --';
@@ -1007,7 +996,6 @@ $_LANGADM['AdminGroups19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis';
 $_LANGADM['AdminGroupsc53a3dc4f27d93e065c2c5be5a78b74f'] = 'Nouvelle réduction de groupe';
 $_LANGADM['AdminGroups8135a36c44911a6537e22be046849764'] = 'Attention, la réduction appliqué à une catégorie ne se cumule pas avec la réduction global mais la remplace. Le groupe est automatiquement ajoutée à la catégorie.';
 $_LANGADM['AdminGroups56a8a9eb05f9014da51a4f9b57322ac7'] = 'Catégorie :';
-$_LANGADM['AdminGroups60c4a9a7f56f6b9669f84977ebd0f93d'] = 'Seuls les produits qui ont cette catégorie par défaut seront ajoutés';
 $_LANGADM['AdminGroups567183b8b1122180690be51cc6df2b74'] = 'Réduction (en %) :';
 $_LANGADM['AdminGroups1fe63847218648baf13474e3d25747bb'] = 'Ajouter';
 $_LANGADM['AdminGroups016269c0d83a19a19a2ee0a4294740b4'] = 'Tout déselectionner';
@@ -1078,9 +1066,6 @@ $_LANGADM['AdminImagesed13a29f9258d2b988ea7ba9d11de98b'] = 'Ne décochez cette c
 $_LANGADM['AdminImages729a51874fe901b092899e9e8b31c97a'] = 'Êtes-vous sûr ?';
 $_LANGADM['AdminImages874d3deed67e503cac1d8bc00417794a'] = 'Déplacer les images';
 $_LANGADM['AdminImages0be9bdbde253c5d649e8667c0bae6754'] = 'PrestaShop utilise un nouveau système de stockage des images produits. Ce système offre de meilleures performances si votre boutique a un très grand nombre de produits.';
-$_LANGADM['AdminImages5e869c034d4bd6df7f278053e786e4fb'] = 'Des images de même nom ont été trouvées quand les images produit ont été déplacées. Il s\'agit probablement d\'images de démonstration non utilisées. Veuillez vérifier que le dossier ';
-$_LANGADM['AdminImages6ab89e213e3557e2ab248510d89051d1'] = ' contient seulement des images de démonstration puis supprimez ce dossier.';
-$_LANGADM['AdminImages6713e1295572974656e3e04d18e77ca9'] = 'PrestaShop a détécté que votre configuration serveur n\'est pas compatible avec le nouveau système de stockage des images (directive \'safe_mode\' activée). Vous devez continuer à utiliser le système d\'image actuel.';
 $_LANGADM['AdminImages0fb0d96026cc27f8a45d6cb909289903'] = 'Vous pouvez décider de garder vos images stockées dans l\'ancien système, cela ne pose aucun problème.';
 $_LANGADM['AdminImages6e9b08be274aa15f116c641e4c9b8599'] = 'Vous pouvez aussi décider de déplacer vos images vers le nouveau système de stockage : dans ce cas, cliquez sur le bouton \"Déplacer les images\" ci-dessous. Merci d\'être patient, le processus peut prendre quelques minutes.';
 $_LANGADM['AdminImages1bd266b7c30df50f9b77b0e0f55f2878'] = 'Après avoir déplacé toutes vos images produit, pour des performances optimales allez aux ';
@@ -1122,8 +1107,6 @@ $_LANGADM['AdminImport7a1920d61156abc05a60135aefe8bc67'] = 'Défaut';
 $_LANGADM['AdminImport9b93b45649ec5961b8cc84e905964683'] = 'Position de l\'image';
 $_LANGADM['AdminImport9c163d2934fbdd2775356db804d451fc'] = 'Position de l\'image produit à utiliser pour cette déclinaison. Si vous remplissez ce champ, laissez le champ \"URL de l\'image\" vide.';
 $_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'URL de l\'image';
-$_LANGADM['AdminImport14913d7e9d486e77b5c8d085e3797f94'] = 'Supprimer les images existantes (0 = non, 1 = oui)';
-$_LANGADM['AdminImporte6691747add3b37b9c381b8d9476fd4c'] = 'Si vous ne spécifiez pas cette colonne et vous spécifier la colonne images, toutes les images du produit seront remplacé par celle spécifié dans le fichier d\'import';
 $_LANGADM['AdminImportb718adec73e04ce3ec720dd11a06a308'] = 'Identifiant';
 $_LANGADM['AdminImportfd0dcc6233b026d257763713c133cf72'] = 'Actif (0/1)';
 $_LANGADM['AdminImport2688a544cd5ac33f27ab78c8d8c3acaa'] = 'Nom *';
@@ -1154,8 +1137,9 @@ $_LANGADM['AdminImportf2149c422ab7577f063b69a2884d17f0'] = 'Disponible';
 $_LANGADM['AdminImportb1a2a959c20b1bd847895e73a5fddbc9'] = 'Date d\'ajout d\'un produit';
 $_LANGADM['AdminImporte1a5e653bc356ed6745d6814d50213eb'] = 'Afficher le prix';
 $_LANGADM['AdminImport4d2589e1bcd4263cb99927b59f0f88d2'] = 'URLs des images (x,y,z...)';
-$_LANGADM['AdminImportecde3e896afb64e9a48781b8363b9a03'] = 'Caractéristique(Nom:Valeur:Position)';
-$_LANGADM['AdminImport93b145201f52e9210402f4281ff8c188'] = 'Position de la caractéristique';
+$_LANGADM['AdminImport14913d7e9d486e77b5c8d085e3797f94'] = 'Supprimer les images existantes (0 = non, 1 = oui)';
+$_LANGADM['AdminImporte6691747add3b37b9c381b8d9476fd4c'] = 'Si vous ne spécifiez pas cette colonne et vous spécifier la colonne images, toutes les images du produit seront remplacé par celle spécifié dans le fichier d\'import';
+$_LANGADM['AdminImport21021ea0e52be8e9c599f4dff41e5be0'] = 'Caractéristique';
 $_LANGADM['AdminImport71d0ceacdf562024f2d4c3a76d3b63e4'] = 'Uniquement disponible en ligne';
 $_LANGADM['AdminImport9e2941b3c81256fac10392aaca4ccfde'] = 'Etat';
 $_LANGADM['AdminImportf8a0fa3674c3336359b77bbe8e942a2c'] = 'ID ou nom de la boutique';
@@ -1209,10 +1193,8 @@ $_LANGADM['AdminImportbf8a4a7e7e5c9cff1528294e1b1dd3f0'] = 'Séparateur champs 
 $_LANGADM['AdminImport0450d266974d92724ff4bacc3a51952e'] = 'Supprimer les';
 $_LANGADM['AdminImportb0b5ccb4a195a07fd3eed14affb8695f'] = 'catégories';
 $_LANGADM['AdminImport74b997703c3e7fc1db960f1366ba03ab'] = 'avant l\'import ?';
-$_LANGADM['AdminImport34219bb13b784f30df289c19f5dc0e31'] = 'Utiliser la référence comme clé ?';
 $_LANGADM['AdminImportc290a5941ad6eb0d5fe8752c15c5fd78'] = 'Etape suivante';
 $_LANGADM['AdminImport651463c8be1ff45540a213cfcae30cfc'] = 'Notez que l\'import de catégories ne gère pas les catégories de même nom';
-$_LANGADM['AdminImportfbb6344e653db9f1e291725cd254bd9c'] = 'Notez que les références ne sont pas UNIQUE dans la base de donnée';
 $_LANGADM['AdminImport6fa9eb1f1c5bd853188d93953b6e92b2'] = 'Il n\'y a pas de fichier CSV de disponible, veuillez en charger un.';
 $_LANGADM['AdminImport6a84219217279f2f1ad80deda1c512d8'] = 'Vous pouvez obtenir de nombreuses informations sur l\'importation CSV à l\'adresse suivante:';
 $_LANGADM['AdminImport950770fc8c228bda83a28836b467df5d'] = 'Pour en savoir plus sur le format CSV rendez-vous à l\'adresse suivante:';
@@ -1312,8 +1294,6 @@ $_LANGADM['AdminLanguages8c2857a9ad1d8f31659e35e904e20fa6'] = 'Logo';
 $_LANGADM['AdminLanguages49ee3087348e8d44e1feda1917443987'] = 'Nom';
 $_LANGADM['AdminLanguagesad68f9bafd9bf2dcf3865dac55662fd5'] = 'Code ISO';
 $_LANGADM['AdminLanguagese59a41e120686e63cbb743f003bea4e6'] = 'Code language';
-$_LANGADM['AdminLanguages534fd46732986cba0efeda8701592427'] = 'Format de date';
-$_LANGADM['AdminLanguagesc11566e30920ed4786e534e5332d5b87'] = 'Format de date (complet)';
 $_LANGADM['AdminLanguages00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
 $_LANGADM['AdminLanguages950baf75b9fd48b9cb4a3d30ffeda4ef'] = 'Préférences langues';
 $_LANGADM['AdminLanguages7c89197a7b81992ee832cb5a89fa6d9d'] = 'Langue par défaut:';
@@ -1337,10 +1317,6 @@ $_LANGADM['AdminLanguages3af4c1797da60fd50670ddbb669fc0aa'] = 'Code ISO :';
 $_LANGADM['AdminLanguages6b7af0b6d91545318696c648d6b466ac'] = 'Code ISO sur 2 lettres (ex : fr, en, de)';
 $_LANGADM['AdminLanguages01a3b3d8af14e844c49a3a5acc870c6b'] = 'Code language:';
 $_LANGADM['AdminLanguages8bc0a3b0cb05ff731e0fb30f35264898'] = 'Code language complet (ex : en-us, pt-br)';
-$_LANGADM['AdminLanguages104f1a7d59077b514d4105fcee0e42ff'] = 'Format de date :';
-$_LANGADM['AdminLanguages9d03b9a48a9f2f06a9698d1f9484011b'] = 'Format de date, sans les heures (ex : Y-m-d, d/m/Y)';
-$_LANGADM['AdminLanguages3253758a8726c828bbbdc0cc8de30410'] = 'Format de date (complet)  :';
-$_LANGADM['AdminLanguages4728927eaacb4a87f8661de4a791589b'] = 'Format de date, avec les heures (ex : Y-m-d H:i:s, d/m/Y H:i)';
 $_LANGADM['AdminLanguagesc907a021c935ae6144fa2ccadfe9360d'] = 'Drapeau :';
 $_LANGADM['AdminLanguages581e03e07411d053e8c0f275f90fcabc'] = 'Charger le drapeau du pays à partir de votre ordinateur';
 $_LANGADM['AdminLanguages70212b3d97d23361e0ec0bc567d7ea30'] = 'Image \"Aucune image\" :';
@@ -1784,8 +1760,6 @@ $_LANGADM['AdminPPreferencesdcf765af784bde828a35fc529a1760ef'] = 'Ordre par déf
 $_LANGADM['AdminPPreferences18ab46929929152a148ad898fe038ccf'] = 'Ordre de tri par défaut pour la liste des produits';
 $_LANGADM['AdminPPreferencescf3fb1ff52ea1eed3347ac5401ee7f0c'] = 'Croissant';
 $_LANGADM['AdminPPreferencese3cf5ac19407b1a62c6fccaff675a53b'] = 'Décroissant';
-$_LANGADM['AdminPPreferences14d14736f0cc7bbd49ee5dbc335d7f60'] = 'Description courte taille max';
-$_LANGADM['AdminPPreferences9df736cf267f1f94c5a4997fecbd4e3d'] = 'Définissez la taille maximale de la description du produit courte';
 $_LANGADM['AdminPPreferencesc4d833424eba2cd43c9327d4943dc61f'] = 'Image générée par :';
 $_LANGADM['AdminPPreferences9df22f196a33acd0b372fe502de51211'] = 'auto';
 $_LANGADM['AdminPPreferenceseaae26a6fb20ed3ef54fb23bfa0b1fcc'] = 'largeur';
@@ -1798,9 +1772,6 @@ $_LANGADM['AdminPPreferences9a61f5ce3180789a8455f536681cabc1'] = 'Hauteur :';
 $_LANGADM['AdminPPreferencesdde6c96bcb0af50f18f37572267d904a'] = 'La hauteur maximum des images envoyées par les clients';
 $_LANGADM['AdminPPreferences044a77653804fe33652d68098d98121e'] = 'Activer la compatibilité avec les anciennes images';
 $_LANGADM['AdminPPreferencese7ed00268dc16aecaac5a60aeb6f4c73'] = 'Ce réglage doit rester sur \"Oui\" à moins que vous n’ayez déplacé avec succès les images dans l\'onglet Préférences > Image';
-$_LANGADM['AdminPPreferences88694e637431115721b5241e652a178f'] = 'Prix dégressifs basés sur :';
-$_LANGADM['AdminPPreferences68217d833599eb6fb56f9e6d2ca24196'] = 'Comment calculer les prix dégressifs';
-$_LANGADM['AdminPPreferencesb9208b03bcc9eb4a336258dcdcb66207'] = 'Déclinaisons';
 $_LANGADM['AdminPaymenta75b01d1ff66cd0a327bda1effa71dec'] = 'Liste de modules de paiement';
 $_LANGADM['AdminPayment1f3a05f7b45df8e5c5cafaf0485eedd5'] = 'Cliquez pour voir la liste des modules de paiement.';
 $_LANGADM['AdminPaymentdba77f97d76421a973d8e4903ec1b056'] = 'Restrictions des modules de paiement';
@@ -1928,8 +1899,7 @@ $_LANGADM['AdminPreferencesc173252856179a44a9506a968359de8b'] = 'Fixe un prix po
 $_LANGADM['AdminPreferences0d8bdbe98feb696dd76760ee1374a740'] = 'Tax des emballages cadeaux';
 $_LANGADM['AdminPreferences9311ccba175a9f2fc72e7c6a3dfb6078'] = 'Fixe une taxe pour le prix de l\'emballage cadeau';
 $_LANGADM['AdminPreferences3aadb5e86b174ecada1174e22f5a6368'] = 'Poids maximum des fichiers joints';
-$_LANGADM['AdminPreferences2ca89cca013873c7f841e1acf242b3d6'] = 'Taille maximale des pièces jointes (en Megaoctet)';
-$_LANGADM['AdminPreferences12cbe1a4645659457808631047989afb'] = 'Maximum:';
+$_LANGADM['AdminPreferences0550caa9a256c7672bda5f09a45c9334'] = 'Configurer la limite de tailles des fichiers téléchargeables (en MegaOctets)';
 $_LANGADM['AdminPreferencesb667478ccafce4bff6d427a6bca06269'] = 'Proposer des emballages recyclés';
 $_LANGADM['AdminPreferencese84eed89f38f20639431d99ad2f5ee8a'] = 'Le client choisit de recevoir un colis recyclé';
 $_LANGADM['AdminPreferencese6b03a6bdf49d1cd0655e0f7a3d990cb'] = 'Ré-afficher le panier après identification';
@@ -2205,8 +2175,7 @@ $_LANGADM['AdminProducts32b919d18cfaca89383f6000dcc9c031'] = 'Générer';
 $_LANGADM['AdminProductsb06f68603b4cf2f867480c4d1eb6a611'] = 'URL simplifié basée sur le nom du produit';
 $_LANGADM['AdminProducts92ab5edf4194cb5a84d6808cb8d8b696'] = 'Le lien vers la fiche produit sera :';
 $_LANGADM['AdminProducts234078adec0a64008b6ae77653776cfa'] = 'Résumé :';
-$_LANGADM['AdminProducts38d301f7ef549a79620e99fd8b51fa34'] = 'apparaît dans les listings produits et au haut des fiches produits';
-$_LANGADM['AdminProducts9be976b8052c984a95997e4a4f8eef96'] = 'apparaît sur les pages produits';
+$_LANGADM['AdminProducts83d4043f36afbc6c2549ec9309d9aee8'] = 'apparaîtra dans les moteurs de recherche';
 $_LANGADM['AdminProductsc39ddd7f7c2983a075a10bff9ff14ae5'] = 'Vous souhaitez mettre une image associé à ce produit dans votre description ?';
 $_LANGADM['AdminProducts936ccdb97115e9f35a11d35e3d5b5cad'] = 'Cliquez ici';
 $_LANGADM['AdminProducts8300b58d12ed9de055d7a727c72ef55a'] = 'Sélectionner votre image :';
@@ -2530,14 +2499,8 @@ $_LANGADM['AdminScenesc820e0c1d4ae16db218626f49e7916b1'] = 'Ko max.';
 $_LANGADM['AdminScenes0b24516ee8c68a18020951583bc3b8ab'] = 'Automatiquement redimensionné à';
 $_LANGADM['AdminScenes8a5c9824486e8c1f74cb4c4ec8f9e465'] = '(hauteur x largeur)';
 $_LANGADM['AdminScenesa5394858079fa378684b20a1abc0e9be'] = 'Note : Pour changer la dimension de base des images de scènes,  veuillez modifier le paramètre \'large_scene\' avec les dimensions souhaitées (dans le Back office : Onglet \'Préférences\' > Onglet \'Image\').';
-$_LANGADM['AdminScenes8cf04a9734132302f96da8e113e80ce5'] = 'Accueil';
-$_LANGADM['AdminScenesef7de3f485174ff47f061ad27d83d0ee'] = 'selectionée(s)';
-$_LANGADM['AdminScenesb56c3bda503a8dc4be356edb0cc31793'] = 'Tout replier';
-$_LANGADM['AdminScenes5ffd7a335dd836b3373f5ec570a58bdc'] = 'Tout étendre';
-$_LANGADM['AdminScenes5e9df908eafa83cb51c0a3720e8348c7'] = 'Tout cocher';
-$_LANGADM['AdminScenes9747d23c8cc358c5ef78c51e59cd6817'] = 'Tout décocher';
-$_LANGADM['AdminScenesf16b5952df8d25ea30b25ff95ee8fedf'] = 'Boutiques associées';
-$_LANGADM['AdminScenes8c38776925f7cf41c090646a43157024'] = 'Catégories :';
+$_LANGADM['AdminScenes56a8a9eb05f9014da51a4f9b57322ac7'] = 'Catégorie(s) :';
+$_LANGADM['AdminScenes19f2cd1d239a894f67d4ac73058af014'] = 'Cochez les cases des catégories dans lesquelles la scène doit apparaître.';
 $_LANGADM['AdminScenesdf41d831253828e9852a25c72393fde8'] = 'Enregistrez la scène';
 $_LANGADM['AdminScenesf5dae0e1b3d4bc66fadd2840b4f79227'] = 'Veuillez ajouter une image pour continuer';
 $_LANGADM['AdminScenes19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis';
@@ -2548,7 +2511,9 @@ $_LANGADM['AdminSearchc0bd7654d5b278e65f21cf4e9153fdb4'] = 'Fabriquant';
 $_LANGADM['AdminSearch63d5049791d9d79d86e9a108b0a999ca'] = 'Référence';
 $_LANGADM['AdminSearch49ee3087348e8d44e1feda1917443987'] = 'Nom';
 $_LANGADM['AdminSearch3601146c4e948c32b6424d2c0a7f0118'] = 'Prix';
+$_LANGADM['AdminSearch4b78ac8eb158840e9638a3aeb26c4a9d'] = 'Taxe';
 $_LANGADM['AdminSearch27ce7f8b5623b2e2df568d64cf051607'] = 'Stock';
+$_LANGADM['AdminSearch8c489d0946f66d17d73f26366a4bf620'] = 'Poids';
 $_LANGADM['AdminSearchec53a8c4f07baed5d8825072c89799be'] = 'Statut';
 $_LANGADM['AdminSearch06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions';
 $_LANGADM['AdminSearchdaab80c5dadc81fa2d019c562f805994'] = 'Genre';
@@ -3007,7 +2972,6 @@ $_LANGADM['AdminTranslations53b3cae42737979c884275593a01f468'] = 'Module :';
 $_LANGADM['AdminUpgrade875b8a59022d232837491c0fdfacb4ab'] = 'Ne pas sauver les images';
 $_LANGADM['AdminUpgradea8d6c6734da0083021561b23f2fa88cc'] = 'Vous pouvez exclure le dossier image de la sauvegarde si vous l\'avez déjà sauvegardé d\'une autre manière (non recommandé)';
 $_LANGADM['AdminUpgradeaf98608eaedd4ba7ffd47a0204e84b23'] = 'Conserver le thème \"prestashop\" actuel';
-$_LANGADM['AdminUpgrade4ea56ca1a757e426911ff20889c0e93c'] = 'Si vous avez personnalisé le thème par défaut de PrestaShop, vous pouvez le protéger de la mise à niveau (non recommandé)';
 $_LANGADM['AdminUpgrade8413c63a6ef3717a974094785fd0b588'] = 'Garder les traductions';
 $_LANGADM['AdminUpgrade51bbcf7afb0f8d35501d0a7b28979b06'] = 'Si \"oui\", vous conserverez toutes vos traductions';
 $_LANGADM['AdminUpgrade8c8194a465f0163a6724907755ac1b82'] = 'Mode manuel';
@@ -3015,8 +2979,6 @@ $_LANGADM['AdminUpgradedd9dbd4916653d683244119a067ca467'] = 'Choisissze \"oui\"
 $_LANGADM['AdminUpgradee7b6d601ff4e9069e726927e211274ea'] = 'Utiliser Subversion';
 $_LANGADM['AdminUpgradea15b09729294cf7fea1096f970a0fed4'] = 'Choisissez \"oui\" si vous voulez utiliser une version non stable au lieu de l';
 $_LANGADM['AdminUpgrade36be1130454bc8c4e0a41d36fa062a8b'] = 'Impossible de créer le répertoire %s';
-$_LANGADM['AdminUpgradee21a52b9631b01c3f1821795b8de451c'] = 'Processus de mise à niveau terminé. Félicitations! Vous pouvez maintenant réactive de votre boutique.';
-$_LANGADM['AdminUpgrade7b2f224649ef2ad10a2d73595d67a876'] = 'Démarrage mise à niveau ...';
 $_LANGADM['AdminUpgrade6824d57b7af37f605bd97d34defc3761'] = 'Exportation svn terminée. Suppression des fichiers exemples...';
 $_LANGADM['AdminUpgradef70307d8297e48a8783d41e6f3313d51'] = 'Erreur lors de l\'export SVN';
 $_LANGADM['AdminUpgrade4eecd9c195e46c054ef7da6d9d1a738b'] = 'Extraction terminée. Suppression des fichiers exemples...';
@@ -3062,6 +3024,7 @@ $_LANGADM['AdminUpgradeb0d51f91a1118b7c39ee1835cc6c926a'] = 'Téléchargement te
 $_LANGADM['AdminUpgrade0c0db54fe8212c1a7215005fef75d7dd'] = 'Erreur pendant le téléchargement';
 $_LANGADM['AdminUpgrade93120c07d8c5cee44042627cd493e0e0'] = 'vous avez besoin allow_url_fopen pour le téléchargement automatique. Vous pouvez également placer le fichier manuellement dans %s';
 $_LANGADM['AdminUpgrade3bb38e7d0bfd5a02f7c06cae446fee86'] = 'l\'action %s ignorée';
+$_LANGADM['AdminUpgradeb4302e98d94591ee9afa09e769b2ee63'] = 'action \"%1$s\" non trouvée';
 $_LANGADM['AdminUpgrade19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis';
 $_LANGADM['AdminUpgrade760c4026bc5a0bd5378e6efc3f1370b4'] = 'Trop long !';
 $_LANGADM['AdminUpgrade4f2e28904946a09d8c7f36dd3ee72457'] = 'Les champs sont différents !';
@@ -3126,6 +3089,9 @@ $_LANGADM['AdminUpgrade039552aa1d74b68f01a73821f3078158'] = 'pas de droits d\'é
 $_LANGADM['AdminUpgrade31a962ffeb06a6cc6d58ef3ba5fae2b7'] = 'Autoupgrade autorisé';
 $_LANGADM['AdminUpgrade9c30a74657158984997cca4930d6075b'] = 'Cette version autorise la mise à jour automatique';
 $_LANGADM['AdminUpgradeaf566be1636d11ecc8ddb728a15520b8'] = 'Cette version n\'autorise pas la mise à jour automatique';
+$_LANGADM['AdminUpgrade4d3d769b812b6faa6b76e1a8abaece2d'] = 'Actif';
+$_LANGADM['AdminUpgrade3cab03c00dbd11bc3569afa0748013f0'] = 'Inactif';
+$_LANGADM['AdminUpgradeb2e1c91a22797b8d78f9c4adb01a8f17'] = 'Statut de la boutique';
 $_LANGADM['AdminUpgrade94af5df6182efd3591d0ccccaa04bd5c'] = 'Limite de temps PHP';
 $_LANGADM['AdminUpgrade075ae3d2fc31640504f814f60e5ef713'] = 'désactivée';
 $_LANGADM['AdminUpgrade783e8e29e6a8c3e22baa58a19420eb4f'] = 'secondes';
@@ -3136,9 +3102,14 @@ $_LANGADM['AdminUpgrade80e3d093272bc011b6bc661e408c7423'] = 'La dernière versio
 $_LANGADM['AdminUpgradeb47ba7568788e46dbc7fe81e525db863'] = 'La dernière version de prestashop disponible est:';
 $_LANGADM['AdminUpgradec97dcfb0df6daa46292a0def8a567822'] = 'Sauvegardez la base de données, les fichiers de sauvegarde et faire la mise en un clic pardi !';
 $_LANGADM['AdminUpgradea60ab62ed99ef0358b2efae592be0cdd'] = 'Mettre à jour PrestaShop Maintenant !';
+$_LANGADM['AdminUpgrade943f41a7241dc56c3fbc488f015a4e6a'] = 'Votre boutique est déjà à jour';
 $_LANGADM['AdminUpgrade48c7c41b72e1d678923ce3571aa65b2d'] = 'Etape';
 $_LANGADM['AdminUpgradeeeb5a49c38d2d8c2baa51ed09beccf88'] = 'Etape de mise à jour';
 $_LANGADM['AdminUpgradec5d769685704e7ddcd70e74a6ebe50b7'] = 'Votre configuration actuelle n\'autorise pas la mise à jour.';
+$_LANGADM['AdminUpgrade7f786b903ea8045f5b5b7e3c5a4e0385'] = 'Cette fonction est expérimentale. Il est hautement recommandé de faire une sauvegarde de vos fichiers et de votre base de données avant de commencer le processus de mise à jour.';
+$_LANGADM['AdminUpgrade3a3a651c9a67bca9ac902da789466b93'] = 'Mise à jour instable';
+$_LANGADM['AdminUpgradea22eff458b4f4bce6d3232e367ff0138'] = 'Votre configuration actuelle indique que vous voulez mettre à jour votre système à partir d\'une branche de développement instable, sans numéro de version. Si vous mettez à jour, vous ne pourrez plus appliquer le processus de versions stables officiel.';
+$_LANGADM['AdminUpgradedae8ace18bdcbcc6ae5aece263e14fe8'] = 'Options';
 $_LANGADM['AdminUpgrade6b3930a184368a458be6e4429f409877'] = 'Mise à jour terminée. Vérifiez votre boutique (essayez de faire une commande, vérifier le thème)';
 $_LANGADM['AdminUpgrade91195bbbacc2147a736c849c46368ed8'] = 'Voulez vous restaurer votre boutique';
 $_LANGADM['AdminUpgradea498f9476a893d51ee02b3601678d318'] = 'Cliquez pour restaurer la base de donnée';
@@ -3300,7 +3271,6 @@ $_LANGADM['indexf84b4e2770ec98e3db2926cd49864d2f'] = 'Mes préférences';
 $_LANGADM['indexcbebc850f5f849e8956b5f8075f48f69'] = 'tout';
 $_LANGADM['index46f22f2a56ddd091f4b2b2c35c5ca989'] = 'catalogue';
 $_LANGADM['index4b6f7d34a58ba399f077685951d06738'] = 'clients';
-$_LANGADM['index50d7eaecd64b277cdaac58e0cd48ad83'] = 'adresse IP';
 $_LANGADM['index12c500ed0b7879105fb46af0f246be87'] = 'commandes';
 $_LANGADM['index56deca22a707214865f7ea3ae6391d67'] = 'factures';
 $_LANGADM['index8642a2f37a5d42b54ce53b1fbdd1583f'] = 'paniers';
@@ -3308,7 +3278,7 @@ $_LANGADM['index13348442cc6a27032d2b4aa28b75a5d3'] = 'Recherche';
 $_LANGADM['index4f32a32dea642737580dd71cdfd8d3c0'] = 'Accès rapide';
 $_LANGADM['index891cea3363eb13a9ed383ae32f0b48d8'] = 'Selectionnez votre boutique :';
 $_LANGADM['index53cd939ae14e33855274e17a3c411fdd'] = 'Pour des raisons de sécurité, vous devez :';
-$_LANGADM['indexe99c06952f4336ce189d8df45980dca0'] = 'supprimez le dossier /install';
+$_LANGADM['index362b56674d07160fab60725a927bbf13'] = 'supprimer le dossier /install';
 $_LANGADM['index7286baef44d09300636a4b99c533523c'] = 'Temps de chargement :';
 $_LANGADM['indexbbaff12800505b22a853e8b7f4eb6a22'] = 'Contact';
 $_LANGADM['index3e937d04c1c83492260a33d926ca587c'] = 'Bug Tracker';
diff --git a/translations/fr/errors.php b/translations/fr/errors.php
index b5f12cdbc..2649bb7fc 100644
--- a/translations/fr/errors.php
+++ b/translations/fr/errors.php
@@ -4,6 +4,8 @@ global $_ERRORS;
 $_ERRORS = array();
 $_ERRORS['952ae48b085160f3a632721d37924f47'] = 'images. Merci de vérifier les droits d\'écriture sur le dossier.';
 $_ERRORS['4a86eb1f2e0779658266fd6a8582dc9a'] = 'dans la fonction';
+$_ERRORS['8014d5d92e09a563588869c623bd0abf'] = '%1$s (classe manquante dans %2$s)';
+$_ERRORS['f9c47597596f7159815c61957f4f8ec2'] = '%1$s (erreur de syntaxe dans %2$s)';
 $_ERRORS['77ae44aa6c998166fcf1a87496278ad5'] = 'impossible de charger l\'objet';
 $_ERRORS['870f63caf131889f34772366090cf097'] = '(cliquez pour ouvrir l\'onglet Générateur)';
 $_ERRORS['80ad851953b32bff1d580e054c14bc3f'] = 'Module 404 introuvable';
@@ -78,7 +80,7 @@ $_ERRORS['63a3342bcb133c141890746783007eaa'] = 'une erreur s\'est produite penda
 $_ERRORS['9f0a59f1609218c049435abd2351bd84'] = 'Une erreur est survenue pendant la mise à jour d\'un prix spécifique.';
 $_ERRORS['5636dd80d3968f9b1ce4400bd71c5a7a'] = 'une erreur est apparue lors de l\'upload d\'image';
 $_ERRORS['26e6e2aef679da0451f05fb535ac40d7'] = 'une erreur s\'est produite pendant l\'envoi du fichier';
-$_ERRORS['420530ab27ece9fef8cc0b6835e65d31'] = 'Une erreur s\'est produite, votre message n\'a pas été envoyé s\'il vous plaît contactez votre administrateur système';
+$_ERRORS['401cb6602a1ff8fc8784e89a8cd9c1b2'] = 'Une erreur est survenue, votre message n\'a pas été envoyé. Merci de contacter votre administrateur système.';
 $_ERRORS['b9c1228a8e8c3412befae5d854508114'] = 'Une commande a déjà été passée avec ce panier';
 $_ERRORS['b046e4164fe05012960e96896b7b0c34'] = 'L\'archive ne peut pas pas être téléchargée sur prestashop.com';
 $_ERRORS['44205a67121fcca5ffa925d1ed77b65e'] = 'l\'archive ne peut être extraite';
@@ -148,7 +150,7 @@ $_ERRORS['1a80f28eca93f30e2e333b6432890c10'] = 'une erreur est survenue pendant
 $_ERRORS['efccf3b0fd1b65f88bd6dfa2821060c8'] = 'uen erreur est survenue pendant la mise à jour du statut';
 $_ERRORS['1391c1ff3846b38862bbfc43938b8270'] = 'une erreur s\'est produite pendant le chargement de l\'image ; vous devez changer votre configuration serveur';
 $_ERRORS['76f643ec10f812dbaccd1250fc1a4d15'] = 'Erreur : panier vide';
-$_ERRORS['fa69b19f448f11ac49f8a93b9e8be3f3'] = 'Erreur: invalid flux RSS dans le module blockrss';
+$_ERRORS['fa69b19f448f11ac49f8a93b9e8be3f3'] = 'Erreur : Flux RSS invalide dans le module blockrss';
 $_ERRORS['1769b5ab48b8e2ce733fb38663ec853a'] = 'Erreur : Serveur ou port SMTP invalides';
 $_ERRORS['541bccce99dff82fce896d021034edbd'] = 'Erreur : adresse e-mail invalide';
 $_ERRORS['eb38fc07bb9e959fdf1bc60dd2a69faf'] = 'Erreur : sujet d\'e-mail invalide';
@@ -189,6 +191,7 @@ $_ERRORS['c99348e30ef9822b53fce9b9f0c198c9'] = 'Valeur incorrecte pour une quali
 $_ERRORS['75e3bbc53d0a62d319235ffebf9e219c'] = 'Valeur incorrecte pour une qualité d\'image PNG.';
 $_ERRORS['c1c8a564c10a0efe07bb4e4b20d88cc9'] = 'Identifiant non valide';
 $_ERRORS['bfd99559857dfcfc40cb0d0e6c8aee1b'] = 'Nom invalide';
+$_ERRORS['6df7b457f3065876e5146908a7836fbc'] = 'Numéro de commande invalide';
 $_ERRORS['f9c7939a8397ee022fefee2bdb3407af'] = 'URL invalide';
 $_ERRORS['05f89c31663a09912af64c539524588f'] = 'Numéro de TVA incorrect';
 $_ERRORS['db3f419ede0b78fcf31491509e68db40'] = 'Nom de zone incorrect .';
@@ -276,9 +279,13 @@ $_ERRORS['d29668efafb8068ad1ee29de5f9a0b88'] = 'Erreur(s) de parsing dans le(s)
 $_ERRORS['986641245e5ef77f951298aa30a5616f'] = 'mot de passe manquant';
 $_ERRORS['4b9fa5f1ff63eb63f4f42277ce26f17c'] = 'Merci de choisir une langue et un thème';
 $_ERRORS['3ad0eb10b0de3e0a4720c88034944d78'] = 'Vous devez choisir au moins 1 attribut.';
-$_ERRORS['6310db462253eb49efa3709d8591defc'] = 'merci de remplir le formulaire de recherche';
-$_ERRORS['1b41b4dbfa03ca395fd87cc19b3d06b3'] = 'essayez de vous identifier s\'il vous appartient';
-$_ERRORS['3a65f932fe23b8ca8eb70bffe2b215bf'] = 'Merci de selectionner un type de réduction (montant fixe ou pourcentage)';
+$_ERRORS['6310db462253eb49efa3709d8591defc'] = 'Merci de remplir le formulaire de recherche.';
+$_ERRORS['1b41b4dbfa03ca395fd87cc19b3d06b3'] = 'Merci de vous identifier.';
+$_ERRORS['2f7bd011b50ea512e911fedccc9243f5'] = 'Merci de fournir une adresse e-mail valide';
+$_ERRORS['72ac7ea6f82331cfc457b95489678119'] = 'Merci de fournir votre numéro de commande';
+$_ERRORS['b86d53f8bf21639366f8ed1595e54891'] = 'Merci de fournir votre adresse e-mail';
+$_ERRORS['3a65f932fe23b8ca8eb70bffe2b215bf'] = 'Merci de séelectionner un type de réduction (montant fixe ou pourcentage)';
+$_ERRORS['a09c2526d0dffdc36787664f45dd9d8d'] = 'Merci de sélectionner un sujet dans la liste';
 $_ERRORS['eef627ca3bead3c1ada77104ae218d75'] = 'Veuillez selectionner au moins un contenu à importer.';
 $_ERRORS['3045a21e22221b9d1dbdde7bd26272d7'] = 'Vous devez spécifier une somme pour ce bon de réduction';
 $_ERRORS['044bd5d2c37e732a55e9688189471583'] = 'Veuillez selectionner au moins une catégorie pour ce bon de réduction';
@@ -287,9 +294,9 @@ $_ERRORS['8e4b5b9003a1e89146ecd623f76f4179'] = 'Merci de définir une profondeur
 $_ERRORS['5345a6748df0f8b030b77c55e17c1e3a'] = 'Veuillez selectionner au moins un type de réduction pour ce bon de réduction';
 $_ERRORS['f996dce5bdfb1b1094e41cf996c5fdae'] = 'merci de spécifier l\'URL du module';
 $_ERRORS['a05b582431bd7063de0623ef76b14c73'] = 'Veuillez spécifier les priorités';
-$_ERRORS['27e12c3c443d7165ab71cd376a3b3f10'] = 'merci de saisir votre code postal.';
+$_ERRORS['27e12c3c443d7165ab71cd376a3b3f10'] = 'Merci de saisir votre code postal.';
 $_ERRORS['f1cdcf26d9787f078f7fc0e0645858d7'] = 'Erreur fatale : Format utf-8 non supporté. Merci de vérifier la configuration de votre serveur.';
-$_ERRORS['350bf1d858bae55fa9c344b39ea9afcd'] = 'le produit ne peut pas être chargé';
+$_ERRORS['350bf1d858bae55fa9c344b39ea9afcd'] = 'Le produit ne peut pas être chargé';
 $_ERRORS['fe22b7cb2de47c8eafec2ad82fada9dd'] = 'le produit doit être créé avant d\'ajouter des personnalisations';
 $_ERRORS['96a2d573cabb2e5b3d6164140d28e8da'] = 'le produit doit être créé avant d\'ajouter des caractéristiques';
 $_ERRORS['8f18cd66e999d9695f53141a15b47292'] = 'valeur de la réduction est invalide';
@@ -310,6 +317,7 @@ $_ERRORS['d2bbf245e9591814fe994df3cae95964'] = 'Le fichier est vide';
 $_ERRORS['40f9f62de5a8ccf912bc1cd19d515dd2'] = 'Le fichier est trop volumineux.';
 $_ERRORS['d139abab2541129dfae24c733635104c'] = 'Le fichier a été partiellement transféré';
 $_ERRORS['723c870c1b443e052e290bd96f46e977'] = 'Le champ suivant n\'est pas valide selon la méthode de validation';
+$_ERRORS['c3c17d5f98b33957d8e187a497b4eaa5'] = 'Le ou les modules suivants n\'ont pu être chargés';
 $_ERRORS['5be2397a0b561a7676386e5537995c66'] = 'Le(s) module(s) suivant(s) n\'ont pas été correctement installés : %s';
 $_ERRORS['59e3d45dc17f2e9fc4caac2f887bd075'] = 'La fonction';
 $_ERRORS['8227e4867a9388488b04ea32665bcc18'] = 'Le répertoire du module doit avoir les droits d\'écriture';
@@ -323,11 +331,20 @@ $_ERRORS['0bedafc96db94da3f85caa7101944eb5'] = 'La taille du fichier envoyé dé
 $_ERRORS['3d922fc29b0773435fbc540ec1c02ba4'] = 'La taille du fichier envoyé dépasse la limite autorisée par la directive upload_max_filesize du fichier php.ini. Si votre serveur vous le permet, vous pouvez ajouter une directive dans votre fichier .htaccess. Par exemple :';
 $_ERRORS['4f12b222c9659d62afa795987259933f'] = 'Le fichier n\'a été reçu que partiellement.';
 $_ERRORS['92cfc43b8b3cf7a964f2ef24fd22f8df'] = 'Il n\'y pas de modules dans votre installation de PrestaShop. Utilisez l\'onglet Modules pour les activer ou rendez-vous sur notre site Internet afin de télécharger des modules complémentaires.';
-$_ERRORS['59382adebc7f0d65c42fe773d443e4c7'] = 'ce code ISO est déjà lié à une autre langue';
+$_ERRORS['7edeca37fa1d59ebdbfe10ded0bca2f5'] = 'Il n\'y a pas de compte client associé à cette adresse e-mail';
+$_ERRORS['3c9a4f1e91ee7bb51c29bdc9362077fe'] = 'Il n\'y a aucun compte enregistré avec cette adresse e-mail';
+$_ERRORS['2e857abc0ea5d7f97522254ca00c18bb'] = 'Il n\'y a pas assez de produits en stock';
+$_ERRORS['59382adebc7f0d65c42fe773d443e4c7'] = 'Ce code ISO est déjà lié à une autre langue';
 $_ERRORS['4649093d4d10aa95a212636f146c47fd'] = 'ce compte n\'existe pas';
+$_ERRORS['4649093d4d10aa95a212636f146c47fd'] = 'Ce compte n\'existe pas';
+$_ERRORS['a56b6c43645970e79a8098df1dfc9746'] = 'Cette adresse ne peut pas être effacée';
+$_ERRORS['08b2765dc6c449c903f8b30ac7e55f91'] = 'Cette adresse n\'est pas valide';
+$_ERRORS['baafbb73bdf562b2dcbd2c4b807f758e'] = 'Cette adresse n\'est pas dans une zone valide';
+$_ERRORS['29e1ca45338b1e4861bb4a9bdc5d4387'] = 'Cette adresse n\'est pas la votre.';
 $_ERRORS['b8ab75688d5796c2e61d3047b91acc17'] = 'Cette association contient trop de clés';
 $_ERRORS['71f4f008985ea6abc73e89a668e15197'] = 'Cet attribut existe déjà.';
 $_ERRORS['ecc5c9c627d8b41fc33888b5b17ea1a5'] = 'Cette classe dépend de plusieurs fichiers modifiés dans la version 1.4.5.0 et ne doit pas être utilisé dans une version plus ancienne';
+$_ERRORS['ecc5c9c627d8b41fc33888b5b17ea1a5'] = 'Cette classe dépend de plusieurs fichiers modifiés en v1.4.5 et ne devrait pas être utilisée dans une ancienne version';
 $_ERRORS['e49f206b6d8f0e5e2a6cb13d96b44ed2'] = 'Ce nom de classe n\'existe pas';
 $_ERRORS['e22a6ea51eb74bee7acaa4acf2846c7b'] = 'Cette combinaison existe déjà';
 $_ERRORS['d51499b48399054d809f49bce078923e'] = 'Ce client existent déjà en tant que non-invité.';
@@ -343,6 +360,7 @@ $_ERRORS['d38b0c0b1e5c3d6a89219e4617f85034'] = 'Ce module est déjà désinstall
 $_ERRORS['e8be55bf3a30501aef09d2e74de97976'] = 'ce nom existe déjà';
 $_ERRORS['b74c118d823d908d653cfbf1c877ae55'] = 'ce nom est déjà utilisé par une autre liste';
 $_ERRORS['d312d5c57aff77e76cab1b5981bc5606'] = 'Ce nom n\'est pas autorisé';
+$_ERRORS['4a7d2014a9d009e05729eeeaafc2f4ae'] = 'Cette commande a été passée par un compte client. Merci de vous connecter à votre compte client pour voir cette commande, cette section est réservée aux comptes invités.';
 $_ERRORS['e2b7dec8fa4b498156dfee6e4c84b156'] = 'Ce mode de paiement n\'est pas disponible.';
 $_ERRORS['edd62dfcf50e7a6dea932ca1eca167b2'] = 'Cette propriété n\'existe pas dans la classe ou est interdite';
 $_ERRORS['28c993bca90a1f5a4510d3a21ca2b705'] = 'Cet état est utilisé';
@@ -380,6 +398,7 @@ $_ERRORS['db80d36a89df4c527c779b722bb039f8'] = 'Mauvaise categorie';
 $_ERRORS['2d926c42da8b8f9a808161df413cae5e'] = 'Mauvaise date de début/fin';
 $_ERRORS['db4c57ec9dc07e5858740dac2954afe0'] = 'Vous pouvez désactiver cette fonction sur cette page';
 $_ERRORS['2e7b594686a85c50ecfe23142c44381e'] = 'Vous pouvez régénérer votre mot de passe seulement toutes les';
+$_ERRORS['c36ffc54ea2f11d2e9396a7722c23807'] = 'Vous ne pouvez pas désactiver le transporteur par défaut, choisissez un autre transporteur par défaut au préalable.';
 $_ERRORS['2f236f9450ce8714611e468181064659'] = 'Vous ne pouvez pas changer le statut de la langue par défaut';
 $_ERRORS['f6eef841ad92e89ad56eadb17a242596'] = 'Vous ne pouvez pas supprimer de pays. Si vous souhaitez qu\'il ne soit pas disponible pour vos clients, vous pouvez le désactiver.';
 $_ERRORS['ec5f6f7f65190788d12ef16ab6135009'] = 'vous ne pouvez pas tous les supprimer';
@@ -413,6 +432,8 @@ $_ERRORS['c7cd7ecd5b19e01f74cad32af30c9ac4'] = 'Vous devez avoir au moins un emp
 $_ERRORS['a170d84259d851b7ffd392fceb555ac2'] = 'Vous devez créer au moins une zone';
 $_ERRORS['dcefb46cb90317f0d55e889b153b995e'] = 'Vous devez sélectionner au moins une catégorie';
 $_ERRORS['413744b7b47ee60e054c5a5309a2d62f'] = 'Vous n\'êtes pas autorisé à valider la commande pour des raisons de sécurité.';
+$_ERRORS['aac858f68ca522fc334a050dd2481478'] = 'Votre compte invité a déjà été transformé en compte client. Merci de vous connecter à votre compte client pour consulter cette commande, cette section est réservée aux comptes invités';
+$_ERRORS['0f41d0742e01e4f68e506d9526916ca9'] = 'le mot de passe ne correspond pas avec l\'actuel';
 $_ERRORS['6a2c60a8e4aa4da5cc4a041111325aed'] = 'Votre code postal est invalide.';
 $_ERRORS['702f5592024f4a807d5bd1b145c93300'] = 'la date de début est invalide (format YYYY-mm-dd)';
 $_ERRORS['2a0fad646bb2694202cbd53ce9dcf3f8'] = 'la date de fin est invalide (format YYYY-mm-dd)';
@@ -421,10 +442,12 @@ $_ERRORS['70f4b635847038d056e33959821a7a66'] = 'caractères max';
 $_ERRORS['e0d4da0607fb1793b6e1d348c36d52cb'] = 'config.xml est manquant dans le dossier de votre thème';
 $_ERRORS['1d112c010ef14e32e478b36aca8d3414'] = 'config.xml dans votre dossier de thème n\'est pas un fichier xml valide';
 $_ERRORS['6364b8f0fcf00c1fedb76a7a7b7ad03e'] = 'Le fichier config.xml du thème n\'a pas été créé pour cette version de Prestashop';
+$_ERRORS['297078e9e852ac0f405a4c5a5e783452'] = 'description_short : longueur > ';
 $_ERRORS['b0accee4a4704ec46d245b722309a8be'] = 'n\'existe pas en base de données';
 $_ERRORS['06e3d36fa30cea095545139854ad1fb9'] = 'champ';
 $_ERRORS['1cd6f2b0848e672cb987e15e0598a144'] = 'pour la langue';
 $_ERRORS['1b073c8ca6b9aabf07935221e17b7c42'] = 'obtenir la liste des paramètres est impossible';
+$_ERRORS['94f2741fd4c141e0d7f9b267f1c90742'] = 'l\'identifiant n\'est ni une table ni un identifiant : ';
 $_ERRORS['1d744a9ad1dac20645cfc4a36b77323b'] = 'image(s)';
 $_ERRORS['660785e5dba40753e78220c416e70513'] = 'dossier images. Vérifiez les droits d\'écriture sur le dossier.';
 $_ERRORS['13b5bfe96f3e2fe411c9f66f4a582adf'] = 'en';
@@ -434,11 +457,13 @@ $_ERRORS['8ae0cb74f9724518e1ce68c503377002'] = 'invalide';
 $_ERRORS['ee66f9c9930cb33d2a5dde9b240d3f7e'] = 'requis';
 $_ERRORS['1555da21cb82e9f383dd1fd5aebf32a7'] = 'est trop long en';
 $_ERRORS['4e377ef9ed6efd76fbf2441eb124862f'] = 'trop long';
+$_ERRORS['0063b3a012a82d561927a8f23f72f108'] = 'la clé n\'est pas une table ou un indentifiant, ';
 $_ERRORS['ff30d300e1e8810211e29bb092decdf1'] = 'minute(s)';
 $_ERRORS['c07d1d742561121e6abd49450947c187'] = 'le module ne peut être chargé';
 $_ERRORS['1f1ea9a83dab5b3fc4d3be37fc7fc771'] = 'doit être défini';
 $_ERRORS['a9b036d3e91d53892d6a67c31327e456'] = 'doit avoir les droits d\'écriture';
 $_ERRORS['412e78628d9b033b54bb0e387e6e40f3'] = 'le nom pour la caractéristique';
+$_ERRORS['5e5fe82e71c8495982731e4c43e7ecef'] = 'ni une table ni un identifiant : ';
 $_ERRORS['db5bf82f326c6332a2c3dc1b0dd4598e'] = 'a été re-écrit comme';
 
 ?>
\ No newline at end of file