// Merge -> revision 8507

2011-09-12 16:17:37 +00:00
parent b404900911
commit a1bdb7b35e
67 changed files with 1938 additions and 1509 deletions
@@ -170,7 +170,7 @@ class AdminFeatures extends AdminTab
 					echo '</div>';
 				}
 				echo '
-				'.Module::hookExec('featureForm', array('id_attribute_group' => $obj->id)).'
+				'.Module::hookExec('featureForm', array('id_feature' => $obj->id)).'
 				<div class="margin-form">
 					<input type="submit" value="'.$this->l('   Save   ').'" name="submitAdd'.$this->table.'" class="button" />
 				</div>
@@ -131,13 +131,13 @@ class AdminGenerator extends AdminTab
 				{
 					// PS Comments
 					fwrite($writeFd, "# robots.txt automaticaly generated by PrestaShop e-commerce open-source solution\n");
-					fwrite($writeFd, "# http://www.prestashop.com - http://www.prestashop.com/forums\n\n");
+					fwrite($writeFd, "# http://www.prestashop.com - http://www.prestashop.com/forums\n");
 					fwrite($writeFd, "# This file is to prevent the crawling and indexing of certain parts\n");
 					fwrite($writeFd, "# of your site by web crawlers and spiders run by sites like Yahoo!\n");
 					fwrite($writeFd, "# and Google. By telling these \"robots\" where not to go on your site,\n");
-					fwrite($writeFd, "# you save bandwidth and server resources.\n\n");
+					fwrite($writeFd, "# you save bandwidth and server resources.\n");
 					fwrite($writeFd, "# For more information about the robots.txt standard, see:\n");
-					fwrite($writeFd, "# http://www.robotstxt.org/wc/robots.html\n\n");
+					fwrite($writeFd, "# http://www.robotstxt.org/wc/robots.html\n");

 					//GoogleBot specific
 					fwrite($writeFd, "# GoogleBot specific\n");
@@ -146,7 +146,7 @@ class AdminGenerator extends AdminTab
 						fwrite($writeFd, 'Disallow: '.__PS_BASE_URI__.$GB."\n");
 					
 					// User-Agent
-					fwrite($writeFd, "# All bots\n\n");
+					fwrite($writeFd, "# All bots\n");
 					fwrite($writeFd, "User-agent: *\n");

 					// Directories
@@ -193,4 +193,4 @@ class AdminGenerator extends AdminTab

 		return $tab;
 	}
-}
+}
@@ -443,8 +443,16 @@ class AdminImages extends AdminTab
 		<br /><h2 class="space">'.$this->l('Move images').'</h2>'.
 		$this->l('A new storage system for product images is now used by PrestaShop. It offers better performance if your shop has a very large number of products.').'<br />'.
 		'<br />';
+		if (file_exists(_PS_PROD_IMG_DIR_.'duplicates/'))
+		{
+			echo '<div class="width4">';
+			$this->displayWarning($this->l('Duplicate images were found when moving the product images. It is probably caused by unused demonstration images. Please make sure that the folder ').
+				_PS_PROD_IMG_DIR_.'duplicates/'.
+				$this->l(' only contains demonstration images then delete this folder.'));
+			echo '</div>';
+		}
 		if($safe_mode)
-			echo $this->displayWarning('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.');
+			$this->displayWarning($this->l('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.'));
 		else
 			echo '
 		<form action="'.self::$currentIndex.'&token='.$this->token.'" method="post">
@@ -71,7 +71,7 @@ class AdminPPreferences extends AdminPreferences
 					'PS_PRODUCT_PICTURE_WIDTH' => array('title' => $this->l('Product pictures width:'), 'desc' => $this->l('The maximum width of pictures uploadable by customers'), 'validation' => 'isUnsignedId', 'required' => true, 'cast' => 'intval', 'type' => 'text', 'visibility' => Shop::CONTEXT_ALL),
 					'PS_PRODUCT_PICTURE_HEIGHT' => array('title' => $this->l('Product pictures height:'), 'desc' => $this->l('The maximum height of pictures uploadable by customers'), 'validation' => 'isUnsignedId', 'required' => true, 'cast' => 'intval', 'type' => 'text', 'visibility' => Shop::CONTEXT_ALL),
 					'PS_LEGACY_IMAGES' => array('title' => $this->l('Use the legacy image filesystem:'), 'desc' => $this->l('This should be set to yes unless you successfully moved images in Preferences > Images tab'), 'validation' => 'isBool', 'cast' => 'intval', 'required' => true, 'type' => 'bool', 'visibility' => Shop::CONTEXT_ALL),
-					'PS_QTY_DISCOUNT_ON_COMBINATION' => array('title' => $this->l('Quantity discounts based on:'), 'desc' => $this->l('The way of calculate quantity discounts'), 'cast' => 'intval', 'show' => true, 'required' => true, 'type' => 'radio', 'validation' => 'isBool', 'choices' => array(0 => $this->l('Products'), 1 => $this->l('Combinations')))
+			'PS_QTY_DISCOUNT_ON_COMBINATION' => array('title' => $this->l('Quantity discounts based on:'), 'desc' => $this->l('How to calculate quantity discounts'), 'cast' => 'intval', 'show' => true, 'required' => true, 'type' => 'radio', 'validation' => 'isBool', 'choices' => array(0 => $this->l('Products'), 1 => $this->l('Combinations')))
 				),
 			),
 		);
@@ -1573,9 +1573,17 @@ echo '</script>';
 		$tokenModule = Tools::getAdminToken('AdminModules'.(int)(Tab::getIdFromClassName('AdminModules')).(int)$cookie->id_employee);
 		$tokenAdminTabs =  Tools::getAdminToken('AdminTabs'.(int)(Tab::getIdFromClassName('AdminTabs')).(int)$cookie->id_employee);
 		$tokenAdminTools =  Tools::getAdminToken('AdminTools'.(int)(Tab::getIdFromClassName('AdminTools')).(int)$cookie->id_employee);
+		if (!$idTab = Tab::getIdFromClassName('AdminSelfUpgrade'))
+		{
 		echo '<br/><p id="ContainerActivateButton">
 			<a class="button" id="activateAutoupgradeModule" href="index.php?tab=AdminModules&token='.$tokenModule.'&amp;install=autoupgrade&amp;module_name=autoupgrade">'
 			.$this->l('Activate the module').'</a></p>';
+		}
+		else{
+			$tokenSelfUpgrade =  Tools::getAdminToken('AdminSelfUpgrade'.(int)(Tab::getIdFromClassName('AdminSelfUpgrade')).(int)$cookie->id_employee);
+			echo '	<a class="button" href="index.php?tab=AdminSelfUpgrade&token='.$tokenSelfUpgrade.'">'
+				.$this->l('Use the autoupgrade module').'</a></p>';
+		}
 		echo '<script type="text/javascript">
 			$("#activateAutoupgradeModule").click(function(e){
 				e.preventDefault();
@@ -523,12 +523,14 @@ class ImageCore extends ObjectModel
 	 * If max_execution_time is provided, stops before timeout and returns string "timeout".
 	 * If any image cannot be moved, stops and returns "false"
 	 *
+	 * @param int max_execution_time
 	 * @return mixed success or timeout
 	 */
 	public static function moveToNewFileSystem($max_execution_time = 0)
 	{
 		$start_time = time();
 		$image = null;
+		$tmp_folder = 'duplicates/';
 		foreach (scandir(_PS_PROD_IMG_DIR_) as $file)
 		{
 			// matches the base product image or the thumbnails
@@ -537,17 +539,28 @@ class ImageCore extends ObjectModel
 				// don't recreate an image object for each image type
 				if (!$image || $image->id !== (int)$matches[2])
 					$image = new Image((int)$matches[2]);
-
-				if (Validate::isLoadedObject($image))
+				// image exists in DB and with the correct product?
+				if (Validate::isLoadedObject($image) && $image->id_product == (int)rtrim($matches[1], "-"))
 				{
 				// create the new folder if it does not exist
 				if (!$image->createImgFolder())
 					return false;
 				
-				// move the image
+					// if there's already a file at the new image path, move it to a dump folder
+					// most likely the preexisting image is a demo image not linked to a product and it's ok to replace it
 					$new_path = _PS_PROD_IMG_DIR_.$image->getImgPath().(isset($matches[3]) ? $matches[3] : '').'.jpg';
 				if (file_exists($new_path))
+					{
+						if(!file_exists(_PS_PROD_IMG_DIR_.$tmp_folder))
+						{
+							@mkdir(_PS_PROD_IMG_DIR_.$tmp_folder, 0755);
+							@chmod(_PS_PROD_IMG_DIR_.$tmp_folder, 0755);	
+						}
+						$tmp_path = _PS_PROD_IMG_DIR_.$tmp_folder.basename($file);
+						if (!@rename($new_path, $tmp_path) || !file_exists($tmp_path))
 						return false;
+					}
+					// move the image
 				if (!@rename(_PS_PROD_IMG_DIR_.$file, $new_path) || !file_exists($new_path))
 					return false;
 				}
@@ -393,9 +393,17 @@ class ProductCore extends ObjectModel
 		if (!parent::add($autodate, $nullValues))
 			return false;
 		$this->setStock($this->quantity);
+		Module::hookExec('afterSaveProduct', array('id_product' => $this->id));
 		return true;
 	}

+	public function update($nullValues = false)
+	{
+		$return = parent::update($nullValues);
+		Module::hookExec('afterSaveProduct', array('id_product' => $this->id));
+		return $return;
+	}
+
 	/**
 	* Check then return multilingual fields for database interaction
 	*
@@ -3567,4 +3575,4 @@ class ProductCore extends ObjectModel
 	                
 		return isset($row['reference']);
 	}
-}
+}
@@ -1941,15 +1941,13 @@ FileETag INode MTime Size
 			case 'by' :
 				$orderByPrefix = '';
 				if($prefix) {
-					if ($value == 'id_product' OR	$value == 'date_add')
+					if ($value == 'id_product' || $value == 'date_add' || $value == 'price')
 						$orderByPrefix = 'p.';
 					elseif ($value == 'name')
 						$orderByPrefix = 'pl.';
 					elseif ($value == 'manufacturer')
-					{
 						$orderByPrefix = 'm.';
-					}
-					elseif ($value == 'position')
+					elseif ($value == 'position' || empty($value))
 						$orderByPrefix = 'cp.';
 				}
 				
@@ -40,6 +40,7 @@ class UpgraderCore{
 	public $version_num;
 	public $link;
 	public $autoupgrade;
+	public $autoupgrade_module;
 	public $changelog;
 	public $md5;

@@ -95,6 +96,7 @@ class UpgraderCore{
 	{
 		if (empty($this->link))
 		{
+
 			$lastCheck = Configuration::get('PS_LAST_VERSION_CHECK');
 			// if we use the autoupgrade process, we will never refresh it
 			// except if no check has been done before
@@ -103,12 +105,14 @@ class UpgraderCore{
 			libxml_set_streams_context(stream_context_create(array('http' => array('timeout' => 3))));
 				if ($feed = @simplexml_load_file($this->rss_version_link))
 			{
+
 					$this->version_name = (string)$feed->version->name;
 					$this->version_num = (string)$feed->version->num;
 					$this->link = (string)$feed->download->link;
 					$this->md5 = (string)$feed->download->md5;
 					$this->changelog = (string)$feed->download->changelog;
 					$this->autoupgrade = (int)$feed->autoupgrade;
+					$this->autoupgrade_module = (int)$feed->autoupgrade_module;
 					$this->desc = (string)$feed->desc ;
 					$configLastVersion = array(
 						'name' => $this->version_name,
@@ -116,9 +120,11 @@ class UpgraderCore{
 						'link' => $this->link,
 						'md5' => $this->md5,
 						'autoupgrade' => $this->autoupgrade,
+						'autoupgrade_module' => $this->autoupgrade_module,
 						'changelog' => $this->changelog,
 						'desc' => $this->desc
 					);
+
 					Configuration::updateValue('PS_LAST_VERSION',serialize($configLastVersion));
 					Configuration::updateValue('PS_LAST_VERSION_CHECK',time());
 			}
@@ -130,6 +136,7 @@ class UpgraderCore{
 				$this->version_num = $lastVersionCheck['num'];
 				$this->link = $lastVersionCheck['link'];
 				$this->autoupgrade = $lastVersionCheck['autoupgrade'];
+				$this->autoupgrade_module = $lastVersionCheck['autoupgrade_module'];
 				$this->md5 = $lastVersionCheck['md5'];
 				$this->desc = $lastVersionCheck['desc'];
 				$this->changelog = $lastVersionCheck['changelog'];
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <modules_list>
 	<modules type="native">
+		<module name="autoupgrade"/>
 		<module name="bankwire"/>
 		<module name="birthdaypresent"/>
 		<module name="blockadvertising"/>
@@ -95,6 +96,7 @@
 		<module name="criteo"/>
 		<module name="dejala"/>
 		<module name="dibs"/>
+	  <module name="ebay"/> 
 		<module name="envoimoinscher"/>
 		<module name="ekomi"/>
 		<module name="fedexcarrier"/>
@@ -134,15 +134,12 @@ class CategoryControllerCore extends FrontController
 						'subcategories_nb_total' => sizeof($subCategories),
 						'subcategories_nb_half' => ceil(sizeof($subCategories) / 2)));
 				}
+
 				if ($this->category->id != 1)
-				{
-					$nbProducts = $this->category->getProducts(NULL, NULL, NULL, $this->orderBy, $this->orderWay, true);
-					$this->pagination((int)$nbProducts);
-					$this->context->smarty->assign('nb_products', (int)$nbProducts);
-					$cat_products = $this->category->getProducts($this->context->language->id, (int)($this->p), (int)($this->n), $this->orderBy, $this->orderWay);
-				}
+					$this->productListAssign();
+
 				$this->context->smarty->assign(array(
-					'products' => (isset($cat_products) AND $cat_products) ? $cat_products : NULL,
+					'products' => (isset($this->cat_products) AND $this->cat_products) ? $this->cat_products : NULL,
 					'id_category' => (int)($this->category->id),
 					'id_category_parent' => (int)($this->category->id_parent),
 					'return_category_name' => Tools::safeOutput($this->category->name),
@@ -168,6 +165,21 @@ class CategoryControllerCore extends FrontController
 		));
 	}

+	public function productListAssign()
+	{
+		$hookExecuted = false;
+		Module::hookExec('productListAssign', array('nbProducts' => &$this->nbProducts, 'catProducts' => &$this->cat_products, 'hookExecuted' => &$hookExecuted));
+		if (!$hookExecuted)
+		{
+			$this->nbProducts = $this->category->getProducts(NULL, NULL, NULL, $this->orderBy, $this->orderWay, true);
+			$this->pagination((int)$this->nbProducts);
+			$this->cat_products = $this->category->getProducts($this->context->language->id, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay);
+		}
+		else
+			$this->pagination((int)$this->nbProducts);
+		self::$smarty->assign('nb_products', (int)$this->nbProducts);
+	}
+
 	public function displayContent()
 	{
 		parent::displayContent();
@@ -76,7 +76,7 @@ class OrderConfirmationControllerCore extends FrontController
 				'id_order_formatted' => sprintf('#%06d', $this->id_order)
 			));
 			/* If guest we clear the cookie for security reason */
-			$this->context->customer->logout();
+			$this->context->customer->mylogout();
 		}
 	}
 	
@@ -112,7 +112,7 @@ class OrderControllerCore extends ParentOrderController
 					if ($this->context->customer->is_guest)
 					{
 						$email = $this->context->customer->email;
-						$this->context->customer->logout(); // If guest we clear the cookie for security reason
+						$this->context->customer->mylogout(); // If guest we clear the cookie for security reason
 						Tools::redirect('index.php?controller=guest-tracking&id_order='.(int)$id_order.'&email='.urlencode($email));
 					}
 					else
@@ -40,13 +40,22 @@ class ToolsInstall
 	{
 		// Don't include theses files if classes are already defined
 		if (!class_exists('Validate', false))
-			require_once(INSTALL_PATH.'/../classes/Validate.php');
+		{
+			include_once(INSTALL_PATH.'/../classes/Validate.php');
+			eval('class Validate extends ValidateCore{}');
+		}

 		if (!class_exists('Db', false))
-			require_once(INSTALL_PATH.'/../classes/Db.php');
+		{
+			include_once(INSTALL_PATH.'/../classes/Db.php');
+			eval('abstract class Db extends DbCore{}');
+		}

 		if (!class_exists('MySQL', false))
-			require_once(INSTALL_PATH.'/../classes/MySQL.php');
+		{
+			include_once(INSTALL_PATH.'/../classes/MySQL.php');
+			eval('class MySQL extends MySQLCore{}');
+		}
 		
 		if($posted)
 		{
@@ -813,14 +813,20 @@ if ($lm->getIncludeTradFilename())
 										</tr>
 									</table>';

+									$country_iso_code_default = '';
+									if ($_GET['language'] == 1) $country_iso_code_default = 'FR';
+									else if ($_GET['language'] == 2) $country_iso_code_default = 'ES';
+									else if ($_GET['language'] == 3) $country_iso_code_default = 'DE';
+									else if ($_GET['language'] == 4) $country_iso_code_default = 'IT';
+
 									foreach ($modulesHelpInstall AS $country_iso_code => $modulesList)
 							{
-								echo '<div class="installModuleList'.($country_iso_code == 'FR' ? ' selected' : '').'" id="modulesList'.$country_iso_code.'">';
+										echo '<div class="installModuleList'.($country_iso_code == $country_iso_code_default ? ' selected' : '').'" id="modulesList'.$country_iso_code.'">';
 										foreach ($modulesList AS $module)
 								{
 									echo '
 										<table cellpadding="0" callspacing="0" border="0" class="moduleTable">
-									<tr>
+											<tr style="border-bottom:0px">
 										<td valign="top" style="text-align: center; padding-top:10px; width: 30px;">
 										<span style="padding: 12px 4px 6px 2px;">
 									<input type="checkbox" id="preInstallModules_'.$country_iso_code.'_'.$module.'" value="'.$module.'" class="'.$module.' preInstallModules_'.$country_iso_code.'" style="vertical-align: middle;" />
@@ -989,7 +995,7 @@ if ($lm->getIncludeTradFilename())
 					</tr>
 				</table>

-				<h3 class="infosBlock"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder.'); ?></h3>
+				<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" />
@@ -1357,7 +1363,7 @@ if ($lm->getIncludeTradFilename())
 <ul id="footer">
 	<li><a href="http://www.prestashop.com/forum/" title="<?php echo lang('Official forum'); ?>"><?php echo lang('Official forum'); ?></a> | </li>
 	<li><a href="http://www.prestashop.com" title="PrestaShop.com">PrestaShop.com</a> | </li>
-	<li><a href="http://www.prestashop.com/contact.php" title="<?php echo lang('Contact us'); ?>"><?php echo lang('Contact us'); ?></a> | </li>
+	<li><a href="http://www.prestashop.com/contact.php" title="<?php echo lang('Contact us!'); ?>"><?php echo lang('Contact us!'); ?></a> | </li>
 	<li>&copy; 2005-<?php echo date('Y'); ?></li>
 </ul>
 </body>
@@ -20,7 +20,7 @@ $_LANG['Community Forum'] = 'unser Community-Forum';
 $_LANG['Configure SMTP manually (advanced users only)'] = 'Konfigurieren des SMTP-Sendens (nur f√ºr Experten)';
 $_LANG['Configure your database by filling out the following fields:'] = 'Konfigurieren Sie Ihre Datenbank, indem Sie  folgende Felder ausf√ºllen:';
 $_LANG['Congratulation, your online shop is now ready!'] = 'Herzlichen Gl√ºckwunsch, Ihr Shop installiert!';
-$_LANG['Contact us'] = 'Kontaktieren Sie uns!';
+$_LANG['Contact us!'] = 'Kontaktieren Sie uns!';
 $_LANG['Create new files and folders allowed'] = 'Erstellen neuer Ordner und Dateien zugelassen';
 $_LANG['Data integrity is not valided. Hack attempt?'] = 'Die Integrit√§t der Daten ist nicht best√§tigt.';
 $_LANG['Database Server is available but database is not found'] = 'Der Datenbank-Server steht zur Verf√ºgung, aber die Datenbank wurde nicht gefunden';
@@ -63,7 +63,7 @@ $_LANG['Installation : complete install of the PrestaShop Solution'] = 'Komplett
 $_LANG['Installation is complete!'] = 'Installation abgeschlossen!';
 $_LANG['Installation method'] = 'Installationsmethode';
 $_LANG['Last name:'] = 'Name:';
-$_LANG['License Agreement'] = 'Lizenzvertrag';
+$_LANG['Licenses Agreement'] = 'Lizenzvertrag';
 $_LANG['Login:'] = 'Benutzername:';
 $_LANG['Merchant info'] = 'Informationen √ºber den Verk√§ufer';
 $_LANG['Missing a temporary folder'] = 'Der tempor√§re Ordner Ihrer empfangenen Dateisendungen fehlt. Bitte wenden Sie sich an Ihren Systemadministrator.';
@@ -140,10 +140,10 @@ $_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.'] = '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: 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'] = 'Bienvenue dans l\'installation de PrestaShop %s';
+$_LANG['Welcome to the PrestaShop %s Installer'] = 'Willkommen bei der Installation von PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Sobald die Anwendungsdateien und Ihre Datenbank gesichert sind, werden wir Sie um Best√§tigung bitten. Damit √ºbernehmen Sie die gesamte Haftung eines m√∂glichen Datenverlusts durch die Aktualisierung der PrestaShop-Anwendung.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'Schreibberechtigung f√ºr die Ordner (und deren Unterordner):';
 $_LANG['Write permissions on files and folders:'] = 'Schreibberechtigung f√ºr die Dateien und Ordner:';
@@ -1,39 +1,39 @@
 <?php

-$_LANG['Installer'] = 'Instalaci√≥n';
-$_LANG['Updater'] = 'Actualizati√≥n';
+$_LANG['Installer'] = 'Instalación';
+$_LANG['Updater'] = 'Actualizatión';
 $_LANG['.'] = '.';
 $_LANG['A Prestashop database already exists, please drop it or change the prefix.'] = 'Ya existe una base de datos PrestaShop con este prefijo, debe eliminarla manualmente o cambiar el prefijo.';
-$_LANG['An email has been sent!'] = '¬°Se ha enviado un correo electr√≥nico!';
+$_LANG['An email has been sent!'] = '¬°Se ha enviado un correo electrónico!';
 $_LANG['Access and configure PHP 5.0+ on your hosting server'] = 'Comprobar que su alojamiento web propone PHP5 y/o activarlo';
 $_LANG['An error occurred while resizing the picture.'] = 'Se ha producido un error al cambiar el tama√±o de la imagen.';
-$_LANG['An error occurred while sending email, please verify your parameters.'] = 'Se ha producido un error al enviar el correo electr√≥nico, gracias por verificar la configuraci√≥n.';
+$_LANG['An error occurred while sending email, please verify your parameters.'] = 'Se ha producido un error al enviar el correo electrónico, gracias por verificar la configuración.';
 $_LANG['Available shop languages'] = 'Elija idioma';
 $_LANG['Back'] = 'Anterior';
-$_LANG['Back up your database and all application files (update only)'] = 'Salvaguardar su base de datos y sus archivos (√∫nicamente en caso de actualizaci√≥n de PrestaShop)';
+$_LANG['Back up your database and all application files (update only)'] = 'Salvaguardar su base de datos y sus archivos (únicamente en caso de actualización de PrestaShop)';
 $_LANG['Please backup the database and application files.'] = 'Antes de continuar, debe hacer una copia de sus datos. Por favor copie todos los archivos desde el sitio en una carpeta de copia de seguridad, y guarde su base de datos.';
-$_LANG['By default, the PHP \'mail()\' function is used'] = 'Por defecto, se utilizar√° la funci√≥n PHP \'mail()\'';
-$_LANG['Can\'t create settings file, if /config/settings.inc.php exists, please give the public write permissions to this file, else please create a file named settings.inc.php in config directory.'] = 'Error en la creaci√≥n del archivo de configuraci√≥n, si el archivo /config/settings.inc.php existe, por favor dele derechos p√∫plicos de\escritura; si no, cree un archivo settings.inc.php en el repertorio de configuraci√≥n (/config/)';
-$_LANG['Can\'t find the sql upgrade files. Please verify that the /install/sql/upgrade folder is not empty)'] = 'Imposible encontrar uno de los archivos de puesta al d√≠a SQL. Por favor, compruebe que el archivo /install/sql/upgrade no est√° vac√≠o.';
-$_LANG['Choose the installer language:'] = '¬øEn qu√© idioma quiere efectuar la instalaci√≥n?';
+$_LANG['By default, the PHP \'mail()\' function is used'] = 'Por defecto, se utilizará la función PHP \'mail()\'';
+$_LANG['Can\'t create settings file, if /config/settings.inc.php exists, please give the public write permissions to this file, else please create a file named settings.inc.php in config directory.'] = 'Error en la creación del archivo de configuración, si el archivo /config/settings.inc.php existe, por favor dele derechos púplicos de\escritura; si no, cree un archivo settings.inc.php en el repertorio de configuración (/config/)';
+$_LANG['Can\'t find the sql upgrade files. Please verify that the /install/sql/upgrade folder is not empty)'] = 'Imposible encontrar uno de los archivos de puesta al d√≠a SQL. Por favor, compruebe que el archivo /install/sql/upgrade no está vac√≠o.';
+$_LANG['Choose the installer language:'] = '¬øEn qu√© idioma quiere efectuar la instalación?';
 $_LANG['Community Forum'] = 'en nuestro foro comunitario';
-$_LANG['Configure SMTP manually (advanced users only)'] = 'Configurar el env√≠o SMTP (expertos √∫nicamente)';
+$_LANG['Configure SMTP manually (advanced users only)'] = 'Configurar el env√≠o SMTP (expertos únicamente)';
 $_LANG['Configure your database by filling out the following fields:'] = 'Configure su base de datos rellenando los siguientes campos:';
 $_LANG['Congratulation, your online shop is now ready!'] = '¬°Enhorabuena, su tienda se ha instalado!';
-$_LANG['Contact us'] = '¬°Contacte con nosotros!';
-$_LANG['Create new files and folders allowed'] = 'Creaci√≥n de nuevas carpetas y archivos autorizados';
-$_LANG['Data integrity is not valided. Hack attempt?'] = 'La integridad de los datos no est√° validada.';
-$_LANG['Database Server is available but database is not found'] = 'La base de datos del servidor est√° disponible, pero la base de datos no se ha encontrado ';
+$_LANG['Contact us!'] = '¬°Contacte con nosotros!';
+$_LANG['Create new files and folders allowed'] = 'Creación de nuevas carpetas y archivos autorizados';
+$_LANG['Data integrity is not valided. Hack attempt?'] = 'La integridad de los datos no está validada.';
+$_LANG['Database Server is available but database is not found'] = 'La base de datos del servidor está disponible, pero la base de datos no se ha encontrado ';
 $_LANG['Database Server is not found. Please verify the login, password and server fields.'] = 'La base de datos de servidor no se ha encontrado, por favor, compruebe sus datos de acceso o el nombre de servidor.';
-$_LANG['Database configuration'] = 'Configuraci√≥n de la base de datos';
+$_LANG['Database configuration'] = 'Configuración de la base de datos';
 $_LANG['Database connection is available!'] = '¬°La base de datos se ha encontrado!';
 $_LANG['Database is created!'] = '¬°Base de datos instalada!';
 $_LANG['Database name:'] = 'Nombre de la base de datos:';
 $_LANG['Disclaimer'] = 'Aviso';
-$_LANG['Documentation Wiki'] = 'Documentaci√≥n en Wiki';
-$_LANG['E-mail address:'] = 'Direcci√≥n email:';
-$_LANG['E-mail delivery set-up'] = 'Par√°metros de env√≠o de emails';
-$_LANG['Encryption:'] = 'Encriptaci√≥n:';
+$_LANG['Documentation Wiki'] = 'Documentación en Wiki';
+$_LANG['E-mail address:'] = 'Dirección email:';
+$_LANG['E-mail delivery set-up'] = 'Parámetros de env√≠o de emails';
+$_LANG['Encryption:'] = 'Encriptación:';
 $_LANG['Error!'] = '¬°Falta!';
 $_LANG['Error while creating the /config/settings.inc.php file.'] = 'Error al crear el archivo /config/settings.inc.php.';
 $_LANG['Error while inserting content into the database'] = 'Error al insertar en la base de datos';
@@ -44,70 +44,70 @@ $_LANG['Errors while updating...'] = 'Error al actualizar ...';
 $_LANG['Failed to write file to disk'] = 'No se pueden escribir archivos en el disco';
 $_LANG['Fields are different!'] = '¬°Los campos son diferentes!';
 $_LANG['File upload allowed'] = 'Env√≠o de archivo autorizado';
-$_LANG['File upload stopped by extension'] = 'Carga de archivos interrumpido a causa de la extensi√≥n incorrecta';
+$_LANG['File upload stopped by extension'] = 'Carga de archivos interrumpido a causa de la extensión incorrecta';
 $_LANG['First name:'] = 'Nombre:';
-$_LANG['For more information, please consult our'] = 'Para m√°s informaci√≥n, consulte nuestra';
+$_LANG['For more information, please consult our'] = 'Para más información, consulte nuestra';
 $_LANG['GD Library installed'] = 'Librer√≠a GD instalada';
-$_LANG['GZIP compression is on (recommended)'] = 'La compresi√≥n GZIP est√° activada (aconsejable)';
-$_LANG['Here are your shop information. You can modify them once logged in.'] = 'Aqu√≠ tiene sus datos de conexi√≥n, puede modificarlos posteriormente si lo desea.';
+$_LANG['GZIP compression is on (recommended)'] = 'La compresión GZIP está activada (aconsejable)';
+$_LANG['Here are your shop information. You can modify them once logged in.'] = 'Aqu√≠ tiene sus datos de conexión, puede modificarlos posteriormente si lo desea.';
 $_LANG['However, you must know how to do the following manually:'] = 'No obstante, puede efectuar las siguientes tareas manualmente:';
 $_LANG['I agree to the above terms and conditions.'] = 'Estoy de acuerdo con los t√©rminos y condiciones anteriores.';
 $_LANG['If you have any questions, please visit our '] = 'Si tiene alguna duda o pregunta, eche un vistazo a nuestra ';
 $_LANG['Impossible the access the a MySQL content file.'] = 'No se puede acceder al contenido de un archivo *.sql.';
 $_LANG['Impossible to read the content of a MySQL content file.'] = 'No se puede leer el contenido de un archivo *.sql.';
-$_LANG['Impossible to send the email!'] = '¬°No se puede enviar un correo electr√≥nico!';
+$_LANG['Impossible to send the email!'] = '¬°No se puede enviar un correo electrónico!';
 $_LANG['Impossible to upload the file!'] = '¬°No se puede enviar el archivo!';
 $_LANG['Impossible to write the image /img/logo.jpg. If this image already exists, please delete it.'] = 'No se puede escribir la imagen /img/logo.jpg. Si ya existe, por favor, supr√≠mala manualmente.';
-$_LANG['Installation : complete install of the PrestaShop Solution'] = 'Instalaci√≥n completa de PrestaShop';
-$_LANG['Installation is complete!'] = '¬°Instalaci√≥n terminada! ';
-$_LANG['Installation method'] = 'Modo de instalaci√≥n';
+$_LANG['Installation : complete install of the PrestaShop Solution'] = 'Instalación completa de PrestaShop';
+$_LANG['Installation is complete!'] = '¬°Instalación terminada! ';
+$_LANG['Installation method'] = 'Modo de instalación';
 $_LANG['Last name:'] = 'Apellido:';
-$_LANG['License Agreement'] = 'Contrato de Licencia';
+$_LANG['Licenses Agreement'] = 'Contrato de Licencia';
 $_LANG['Login:'] = 'Nombre de usuario:';
-$_LANG['Merchant info'] = 'Informaci√≥n sobre el vendedor';
+$_LANG['Merchant info'] = 'Información sobre el vendedor';
 $_LANG['Missing a temporary folder'] = 'Carece de la carpeta temporal para recibir su archivo de correo. ¬°Por favor consulte su administrador de sistema!';
-$_LANG['MySQL support is on'] = 'El soporte de MySQL est√° activado';
+$_LANG['MySQL support is on'] = 'El soporte de MySQL está activado';
 $_LANG['Next'] = 'Siguiente';
 $_LANG['No error code available.'] = 'Error desconocido.';
-$_LANG['No file was uploaded.'] = 'No se ha enviado ning√∫n archivo';
-$_LANG['No upgrade is possible.'] = 'No existe actualizaci√≥n';
+$_LANG['No file was uploaded.'] = 'No se ha enviado ningún archivo';
+$_LANG['No upgrade is possible.'] = 'No existe actualización';
 $_LANG['None'] = 'Ninguno';
 $_LANG['Official forum'] = 'Foro Oficial';
-$_LANG['One or more errors have occurred, you can find more informations below or in the log/installation.log file.'] = ' Se han producido uno o m√°s errores';
+$_LANG['One or more errors have occurred, you can find more informations below or in the log/installation.log file.'] = ' Se han producido uno o más errores';
 $_LANG['Open external URLs allowed'] = 'Apertura autorizada de URL externas';
 $_LANG['Optional languages'] = 'Idiomas opcionales';
-$_LANG['Optional set-up'] = 'Par√°metros opcionales';
-$_LANG['PHP \'mail()\' function is available'] = 'La funci√≥n PHP \'mail()\' est√° disponible';
-$_LANG['PHP \'mail()\' function is unavailable'] = 'La funci√≥n PHP \'mail()\' no est√° disponible';
+$_LANG['Optional set-up'] = 'Parámetros opcionales';
+$_LANG['PHP \'mail()\' function is available'] = 'La función PHP \'mail()\' está disponible';
+$_LANG['PHP \'mail()\' function is unavailable'] = 'La función PHP \'mail()\' no está disponible';
 $_LANG['PHP 5.0 or later installed'] = 'PHP 5.0 o superior instalado';
-$_LANG['PHP parameters:'] = 'Par√°metros PHP:';
-$_LANG['PHP register global option is off (recommended)'] = 'La opci√≥n PHP "register global" est√° desactivada (aconsejable)';
+$_LANG['PHP parameters:'] = 'Parámetros PHP:';
+$_LANG['PHP register global option is off (recommended)'] = 'La opción PHP "register global" está desactivada (aconsejable)';
 $_LANG['Password:'] = 'Contrase√±a:';
-$_LANG['Please allow 5-15 minutes to complete the installation process.'] = 'El proceso de instalaci√≥n tardar√° tan solo unos minutos.';
+$_LANG['Please allow 5-15 minutes to complete the installation process.'] = 'El proceso de instalación tardará tan solo unos minutos.';
 $_LANG['Please set a SMTP login'] = 'Introduzca un nombre de usuario de SMTP';
 $_LANG['Please set a SMTP password'] = 'Escriba la contrase√±a SMTP';
 $_LANG['Please set a SMTP server name'] = 'Introduzca un nombre de servidor SMTP';
-$_LANG['Please set a database login'] = 'Introduzca el inicio de sesi√≥n de SQL';
+$_LANG['Please set a database login'] = 'Introduzca el inicio de sesión de SQL';
 $_LANG['Please set a database name'] = 'Introduzca el nombre de la base de datos';
 $_LANG['Please set a database server name'] = 'Introduzca el nombre del servidor de la base de datos';
 $_LANG['Port:'] = 'Puerto:';
-$_LANG['PrestaShop %s Installer'] = 'Instalaci√≥n de PrestaShop %s';
-$_LANG['PrestaShop is ready!'] = '¬°PrestaShop est√° listo!';
+$_LANG['PrestaShop %s Installer'] = 'Instalación de PrestaShop %s';
+$_LANG['PrestaShop is ready!'] = '¬°PrestaShop está listo!';
 $_LANG['Re-type to confirm:'] = 'Confirmar la contrase√±a:';
-$_LANG['Ready, set, go!'] = '¬°PrestaShop est√° instalado!';
+$_LANG['Ready, set, go!'] = '¬°PrestaShop está instalado!';
 $_LANG['Receive notifications by e-mail'] = 'Recibir sus datos por email';
 $_LANG['Refresh these settings'] = 'Comprobar de nuevo';
 $_LANG['Required field'] = 'Los campos obligatorios';
-$_LANG['Required set-up. Please verify the following checklist items are true.'] = 'Aseg√∫rese por favor de que cada uno de los siguientes par√°metros ha sido validado.';
-$_LANG['SMTP connection is available!'] = '¬°Conexi√≥n SMTP disponible!';
-$_LANG['SMTP connection is unavailable'] = 'Conexi√≥n SMTP no est√° disponible.';
+$_LANG['Required set-up. Please verify the following checklist items are true.'] = 'Asegúrese por favor de que cada uno de los siguientes parámetros ha sido validado.';
+$_LANG['SMTP connection is available!'] = '¬°Conexión SMTP disponible!';
+$_LANG['SMTP connection is unavailable'] = 'Conexión SMTP no está disponible.';
 $_LANG['SMTP server:'] = 'Servidor SMTP:';
 $_LANG['SQL errors have occurred.'] = 'Han aparecido errores de SQL.';
-$_LANG['Select the different languages available for your shop'] = 'Seleccione los idiomas que su tienda ofrecer√° a los clientes';
+$_LANG['Select the different languages available for your shop'] = 'Seleccione los idiomas que su tienda ofrecerá a los clientes';
 $_LANG['Send me a test email!'] = '¬°Env√≠eme un email de prueba!';
 $_LANG['Server:'] = 'Servidor:';
 $_LANG['Set permissions on folders & subfolders using Terminal or an FTP client'] = 'Poner los permisos en las carpetas y subcarpetas v√≠a un cliente FTP';
-$_LANG['Shop Configuration'] = 'Configuraci√≥n tienda';
+$_LANG['Shop Configuration'] = 'Configuración tienda';
 $_LANG['Shop logo'] = 'Logo de la tienda';
 $_LANG['Shop name:'] = 'Nombre de la tienda:';
 $_LANG['Shop password:'] = 'Contrase√±a de la tienda:';
@@ -115,98 +115,98 @@ $_LANG['Shop\'s default language'] = 'Idioma por defecto';
 $_LANG['Shop\'s languages'] = 'Idiomas de la tienda';
 $_LANG['System and permissions'] = 'Sistema y permisos';
 $_LANG['System Compatibility'] = 'Compatibilidad del sistema';
-$_LANG['System Configuration'] = 'Configuraci√≥n sistema';
+$_LANG['System Configuration'] = 'Configuración sistema';
 $_LANG['Tables prefix:'] = 'Prefijo de las tablas:';
-$_LANG['Test message - Prestashop'] = 'Instalaci√≥n Prestashop - Prueba del servidor de correo';
-$_LANG['The PrestaShop Installer will do most of the work in just a few clicks.'] = 'El instalador de PrestaShop har√° todo el trabajo en tan solo algunos clics.';
+$_LANG['Test message - Prestashop'] = 'Instalación Prestashop - Prueba del servidor de correo';
+$_LANG['The PrestaShop Installer will do most of the work in just a few clicks.'] = 'El instalador de PrestaShop hará todo el trabajo en tan solo algunos clics.';
 $_LANG['The config/settings.inc.php file was not found. Did you delete or rename this file?'] = 'Config/settings.inc.php no se ha encontrado. ¬øHa eliminado o cambiado de nombre?';
 $_LANG['The password is incorrect (alphanumeric string at least 8 characters).'] = 'Contrase√±a incorrecta (alfa-cadena num√©rica de al menos 8 caracteres)';
-$_LANG['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'El archivo enviado supera el tama√±o m√°ximo permitido.';
-$_LANG['The uploaded file exceeds the upload_max_filesize directive in php.ini'] = 'El archivo enviado supera el tama√±o m√°ximo permitido.';
+$_LANG['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'El archivo enviado supera el tama√±o máximo permitido.';
+$_LANG['The uploaded file exceeds the upload_max_filesize directive in php.ini'] = 'El archivo enviado supera el tama√±o máximo permitido.';
 $_LANG['The uploaded file was only partially uploaded'] = 'El archivo fue parcialmente enviado.';
-$_LANG['There is no older version. Did you delete or rename the config/settings.inc.php file?'] = 'Ninguna versi√≥n anterior detectada. ¬øPuede borrar o renombrar el archivo de configuraci√≥n settings.inc.php archivo?';
+$_LANG['There is no older version. Did you delete or rename the config/settings.inc.php file?'] = 'Ninguna versión anterior detectada. ¬øPuede borrar o renombrar el archivo de configuración settings.inc.php archivo?';
 $_LANG['This PrestaShop database already exists. Please revalidate your authentication informations to the database.'] = 'Esta base de datos ya existe PrestaShop, por favor, valide de nuevo sus credenciales en la base de datos.';
-$_LANG['This application need you to activate Javascript to correctly work.'] = 'Se requiere JavaScript para ejecutar esta aplicaci√≥n.';
-$_LANG['This email adress is wrong!'] = '¬°Direcci√≥n no v√°lida!';
+$_LANG['This application need you to activate Javascript to correctly work.'] = 'Se requiere JavaScript para ejecutar esta aplicación.';
+$_LANG['This email adress is wrong!'] = '¬°Dirección no válida!';
 $_LANG['This installer is too old.'] = 'Este instalador es demasiado viejo.';
 $_LANG['This is a test message, your server is now available to send email'] = 'Este es un mensaje de prueba, el servidor de correo funciona correctamente.';
-$_LANG['This is not a valid file name.'] = 'Esto no es un nombre v√°lido.';
-$_LANG['This is not a valid image file.'] = 'Esto no es una imagen v√°lida.';
+$_LANG['This is not a valid file name.'] = 'Esto no es un nombre válido.';
+$_LANG['This is not a valid image file.'] = 'Esto no es una imagen válida.';
 $_LANG['Too long!'] = '¬°Demasiado largo!';
 $_LANG['Unfortunately,'] = 'Desgraciadamente,';
-$_LANG['Update is complete!'] = '¬°Actualizaci√≥n completa!';
-$_LANG['Upgrade: get the latest stable version!'] = 'Actualizaci√≥n: instale la √∫ltima versi√≥n de PrestaShop';
+$_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.'] = '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['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';
-$_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una vez que los archivos de aplicaci√≥n y su base de datos se hayan guardado, le pediremos que los certifique. Por lo tanto, usted asume plenamente su responsabilidad por cualquier p√©rdida de datos debido a la actualizaci√≥n de la aplicaci√≥n PrestaShop.';
+$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenido a la instalación de PrestaShop %s';
+$_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una vez que los archivos de aplicación y su base de datos se hayan guardado, le pediremos que los certifique. Por lo tanto, usted asume plenamente su responsabilidad por cualquier p√©rdida de datos debido a la actualización de la aplicación PrestaShop.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'en escritura en las carpetas (y sus subcarpetas) :';
 $_LANG['Write permissions on files and folders:'] = 'Derechos en escritura en los archivos y carpetas :';
 $_LANG['Write permissions on folders:'] = 'Permiso de escritura en los archivos de';
-$_LANG['You already have the %s version.'] = 'Ya est√° en posesi√≥n de la versi√≥n %s';
+$_LANG['You already have the %s version.'] = 'Ya está en posesión de la versión %s';
 $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Acaba de instalar y de configurar su tienda en l√≠nea y se lo agradecemos.';
 $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Deba actualizar su tienda en l√≠nea. Se lo agradecemos.';
-$_LANG['Your installation is finished!'] = '¬°La instalaci√≥n est√° terminada!';
-$_LANG['Your update is finished!'] = 'La actualizaci√≥n se ha completado';
+$_LANG['Your installation is finished!'] = '¬°La instalación está terminada!';
+$_LANG['Your update is finished!'] = 'La actualización se ha completado';
 $_LANG['and/or'] = 'y/o';
 $_LANG['enter@your.email'] = 'introduzca@su.email';
-$_LANG['online documentation'] = 'documentaci√≥n en l√≠nea';
-$_LANG['installed version detected'] = 'versi√≥n detectada actualmente';
+$_LANG['online documentation'] = 'documentación en l√≠nea';
+$_LANG['installed version detected'] = 'versión detectada actualmente';
 $_LANG['recommended dimensions: 230px X 75px'] = 'Dimensiones aconsajables: 230px x 75px';
 $_LANG['view the log'] = 'ver el informe';
-$_LANG['(no old version detected)'] = '(no hay ninguna versi√≥n antigua detectada)';
-$_LANG['Can\'t write settings file, please create a file named settings.inc.php in config directory.'] = 'El archivo de par√°metros no pudo escribirse, cree un archivo llamado settings.inc.php en su repertorio de configuraci√≥n.';
+$_LANG['(no old version detected)'] = '(no hay ninguna versión antigua detectada)';
+$_LANG['Can\'t write settings file, please create a file named settings.inc.php in config directory.'] = 'El archivo de parámetros no pudo escribirse, cree un archivo llamado settings.inc.php en su repertorio de configuración.';
 $_LANG['Cannot convert your database\'s data to utf-8.'] = 'No se pueden convertir los datos de su base de datos en UTF-8.';
 $_LANG['Your database server does not support the utf-8 charset.'] = 'La base de datos del servidor no es compatible con UTF-8.';
 $_LANG['Need help?'] = '¬øNecesita ayuda?';
 $_LANG['Forum'] = 'El foro';
 $_LANG['Blog'] = 'El blog';
 $_LANG['Back Office'] = 'Back Office';
-$_LANG['Manage your store with your back office. Manage your orders and customers, add modules, change your theme, etc...'] = 'Administre su tienda con su back office. Gestione pedidos y clientes, agregue m√≥dulos, cambie el tema, etc ...';
+$_LANG['Manage your store with your back office. Manage your orders and customers, add modules, change your theme, etc...'] = 'Administre su tienda con su back office. Gestione pedidos y clientes, agregue módulos, cambie el tema, etc ...';
 $_LANG['Manage your store'] = 'Administre su tienda';
 $_LANG['Front Office'] = 'Front Office';
-$_LANG['Find your store as your future customers will see!'] = '¬°Descubra su tienda tal como la ver√°n sus clientes!';
+$_LANG['Find your store as your future customers will see!'] = '¬°Descubra su tienda tal como la verán sus clientes!';
 $_LANG['Discover your store'] = 'Descubra su tienda';
 $_LANG['Did you know?'] = '¬øSab√≠a que?';
-$_LANG['Prestashop and community offers over 40 different languages for free download on'] = 'La comunidad Prestashop ofrece m√°s de 40 idiomas diferentes para su descarga gratuita en';
+$_LANG['Prestashop and community offers over 40 different languages for free download on'] = 'La comunidad Prestashop ofrece más de 40 idiomas diferentes para su descarga gratuita en';
 $_LANG['Default country:'] = 'Pa√≠s por defecto:';
 $_LANG['Shop\'s timezone:'] = 'Zona horaria de la tienda:';
-$_LANG['Your configuration is valid, click next to continue!'] = 'Su configuraci√≥n es v√°lida, haga clic en Siguiente para continuar';
-$_LANG['Your configuration is invalid. Please fix the issues below:'] = 'Su configuraci√≥n no es v√°lida,<br />gracias por corregir la configuraci√≥n:';
+$_LANG['Your configuration is valid, click next to continue!'] = 'Su configuración es válida, haga clic en Siguiente para continuar';
+$_LANG['Your configuration is invalid. Please fix the issues below:'] = 'Su configuración no es válida,<br />gracias por corregir la configuración:';
 $_LANG['You have to create a database, help available in readme_en.txt'] = 'Debe crear una base de datos, puede encontrar ayuda en el archivo readme_es.txt';
 $_LANG['Discover your store'] = 'Descubra su tienda';
-$_LANG['If you check this box and your mail configuration is wrong, your installation might be blocked. If so, please uncheck the box to go to the next step.'] = 'Esta opci√≥n se puede bloquear si su configuraci√≥n de correo electr√≥nico est√° mal, gracias a desactivarla si usted no puede moverse a la siguiente etapa.';
-$_LANG['A question about PrestaShop or issues during installation or upgrade? Call us!'] = '¬øAlguna pregunta sobre PrestaShop o problemas durante su instalaci√≥n o actualizaci√≥n? ¬°Ll√°menos!';
-$_LANG['Invalid catalog mode'] = 'Campo modo cat√°logo no v√°lido';
-$_LANG['Catalog mode:'] = 'Modo Cat√°logo:';
+$_LANG['If you check this box and your mail configuration is wrong, your installation might be blocked. If so, please uncheck the box to go to the next step.'] = 'Esta opción se puede bloquear si su configuración de correo electrónico está mal, gracias a desactivarla si usted no puede moverse a la siguiente etapa.';
+$_LANG['A question about PrestaShop or issues during installation or upgrade? Call us!'] = '¬øAlguna pregunta sobre PrestaShop o problemas durante su instalación o actualización? ¬°Llámenos!';
+$_LANG['Invalid catalog mode'] = 'Campo modo catálogo no válido';
+$_LANG['Catalog mode:'] = 'Modo Catálogo:';
 $_LANG['Yes'] = 'S√≠';
 $_LANG['No'] = 'No';
-$_LANG['If you activate this feature, all purchase features will be disabled. You can activate this feature later in your back office'] = 'Si activa esta opci√≥n, se desactivar√°n todas las aplicaciones de compra. Puede activar dicha opci√≥n posteriormente en el panel de administraci√≥n.';
+$_LANG['If you activate this feature, all purchase features will be disabled. You can activate this feature later in your back office'] = 'Si activa esta opción, se desactivarán todas las aplicaciones de compra. Puede activar dicha opción posteriormente en el panel de administración.';
 $_LANG['the already installed version detected is too recent, no update available'] = 'la versi‚àö‚â•n instalada que se ha detectado es demasiado reciente, no hay ninguna actualizaci‚àö‚â•n disponible';
-$_LANG['If you do not know how to enable it, use our turnkey solution PrestaBox at'] = 'Si no sabe activarla, utilice nuestra soluci√≥n PrestaBox en';
-$_LANG['Invalid shop name'] = 'Nombre de la tienda no v√°lido';
-$_LANG['Your firstname contains some invalid characters'] = 'Su nombre contiene caracteres no v√°lidos';
-$_LANG['Your lastname contains some invalid characters'] = 'Su apellido contiene caracteres no v√°lidos';
+$_LANG['If you do not know how to enable it, use our turnkey solution PrestaBox at'] = 'Si no sabe activarla, utilice nuestra solución PrestaBox en';
+$_LANG['Invalid shop name'] = 'Nombre de la tienda no válido';
+$_LANG['Your firstname contains some invalid characters'] = 'Su nombre contiene caracteres no válidos';
+$_LANG['Your lastname contains some invalid characters'] = 'Su apellido contiene caracteres no válidos';
 $_LANG['Your MySQL server doesn\'t support this engine, please use another one like MyISAM'] = 'El soporte de este motor de base de datos no se puede soportar, elija otro como por ejemplo MyISAM';
-$_LANG['The file /img/logo.jpg is not writable, please CHMOD 755 this file or CHMOD 777'] = 'El archivo /img/logo.jpg no tiene derechos de escritura, por favor efect√∫e un CHMOD 755 o 777 en el archivo';
-$_LANG['The config/defines.inc.php file was not found. Where did you move it?'] = 'El archivo config/defines.inc.php no se ha encontrado. ¬øD√≥nde se encuentra?';
+$_LANG['The file /img/logo.jpg is not writable, please CHMOD 755 this file or CHMOD 777'] = 'El archivo /img/logo.jpg no tiene derechos de escritura, por favor efectúe un CHMOD 755 o 777 en el archivo';
+$_LANG['The config/defines.inc.php file was not found. Where did you move it?'] = 'El archivo config/defines.inc.php no se ha encontrado. ¬øDónde se encuentra?';
 $_LANG['All tips and advice about PrestaShop'] = 'Todos los trucos y consejos sobre PrestaShop';
 $_LANG['+33 (0)1.40.18.30.04'] = '+33 (0)1.40.18.30.04';
-$_LANG['the already installed version detected is too old, no more update available'] = 'la versi√≥n instalada es demasiado antigua, no existen actualizaciones.';
-$_LANG['Mcrypt is available (recommended)'] = 'Mcrypt est√° disponible (aconsejable)';
-$_LANG['If you do not know how to fix these issues, use turnkey solution PrestaBox at'] = 'Si no puede solucionar estos problemas, utilice nuestra soluci√≥n  PrestaBox en';
+$_LANG['the already installed version detected is too old, no more update available'] = 'la versión instalada es demasiado antigua, no existen actualizaciones.';
+$_LANG['Mcrypt is available (recommended)'] = 'Mcrypt está disponible (aconsejable)';
+$_LANG['If you do not know how to fix these issues, use turnkey solution PrestaBox at'] = 'Si no puede solucionar estos problemas, utilice nuestra solución  PrestaBox en';
 $_LANG['Database Engine:'] = 'Tipo de base de datos:';
-$_LANG['Installation type'] = 'Tipo de instalaci√≥n';
-$_LANG['Simple mode: Basic installation'] = 'Modo b√°sico: instalaci√≥n simplificada';
+$_LANG['Installation type'] = 'Tipo de instalación';
+$_LANG['Simple mode: Basic installation'] = 'Modo básico: instalación simplificada';
 $_LANG['(FREE)'] = '(GRATIS)';
 $_LANG['Full mode: includes'] = 'Modo completo: incluido';
-$_LANG['100+ additional modules'] = '100 m√≥dulos';
-$_LANG['and demo products'] = 'y productos de demostraci√≥n';
+$_LANG['100+ additional modules'] = '100 módulos';
+$_LANG['and demo products'] = 'y productos de demostración';
 $_LANG['(FREE too!)'] = '(¬°TAMBIEN GRATIS!)';
-$_LANG['Shop configuration'] = 'Configuraci√≥n de la tienda';
+$_LANG['Shop configuration'] = 'Configuración de la tienda';
 $_LANG['Main activity:'] = 'Actividad principal';
 $_LANG['-- Please choose your main activity --'] = '-- Elija una actividad --';
 $_LANG['Adult'] = 'Adulto y lencer√≠a';
@@ -214,29 +214,29 @@ $_LANG['Animals and Pets'] = 'Animales';
 $_LANG['Art and Culture'] = 'Cultura y ocio';
 $_LANG['Babies'] = 'Art√≠culos para beb√©s';
 $_LANG['Beauty and Personal Care'] = 'Salud y belleza';
-$_LANG['Cars'] = 'Autom√≥vil y motos';
-$_LANG['Computer Hardware and Software'] = 'Inform√°tica y programas';
+$_LANG['Cars'] = 'Automóvil y motos';
+$_LANG['Computer Hardware and Software'] = 'Informática y programas';
 $_LANG['Download'] = 'Descargas';
 $_LANG['Fashion and accessories'] = 'Ropa y complementos';
 $_LANG['Flowers, Gifts and Crafts'] = 'Flores y regalos';
-$_LANG['Food and beverage'] = 'Alimentaci√≥n y gastronom√≠a';
+$_LANG['Food and beverage'] = 'Alimentación y gastronom√≠a';
 $_LANG['HiFi, Photo and Video'] = 'Hifi, foto y v√≠deo';
 $_LANG['Home and Garden'] = 'Casa y jard√≠n';
 $_LANG['Home Appliances'] = 'Electrodom√©sticos';
 $_LANG['Jewelry'] = 'Joyer√≠a';
-$_LANG['Mobile and Telecom'] = 'Telefon√≠a y comunicaci√≥n';
+$_LANG['Mobile and Telecom'] = 'Telefon√≠a y comunicación';
 $_LANG['Services'] = 'Servicios';
 $_LANG['Shoes and accessories'] = 'Calzado y complementos';
 $_LANG['Sport and Entertainment'] = 'Deporte y ocio';
 $_LANG['Travel'] = 'Viajes y turismo';
-$_LANG['This information isn\'t required, it will be used for statistical purposes. This information doesn\'t change anything in your store.'] = 'Esta informaci√≥n no es obligatoria, solo se utilizar√° para estad√≠sticas. Proporcionarla o no, no cambiar√° nada en su tienda.';
+$_LANG['This information isn\'t required, it will be used for statistical purposes. This information doesn\'t change anything in your store.'] = 'Esta información no es obligatoria, solo se utilizará para estad√≠sticas. Proporcionarla o no, no cambiará nada en su tienda.';
 $_LANG['E-mail:'] = 'Email :';
-$_LANG['I certify that I backed up my database and application files. I assume all responsibility for any data loss or damage related to this upgrade.'] = 'Certifico que he efectuado una copia de seguridad de mi base de datos y de mis archivos. Asumo plenamente la responsabilidad en caso en que se pierdan los datos o se produzca un error relacionado con esta actualizaci√≥n.';
-$_LANG['Upgrade in progress'] = 'Actualizaci√≥n en curso';
-$_LANG['Current query:'] = 'B√∫squeda actual:';
-$_LANG['Details about this upgrade'] = 'Detalles sobre esta actualizaci√≥n';
-$_LANG['Thank you, you will be able to continue the upgrade process by clicking on the "Next" button.'] = 'Gracias, puede continuar la actualizaci√≥n, pulsando en "Siguiente".';
-$_LANG['PrestaShop is upgrading your shop one version after the other, the following upgrade files will be processed:'] = 'PrestaShop actualiza las versiones de su tienda de una en una, los siguientes archivos de actualizaci√≥n van a ser tratados:';
+$_LANG['I certify that I backed up my database and application files. I assume all responsibility for any data loss or damage related to this upgrade.'] = 'Certifico que he efectuado una copia de seguridad de mi base de datos y de mis archivos. Asumo plenamente la responsabilidad en caso en que se pierdan los datos o se produzca un error relacionado con esta actualización.';
+$_LANG['Upgrade in progress'] = 'Actualización en curso';
+$_LANG['Current query:'] = 'Búsqueda actual:';
+$_LANG['Details about this upgrade'] = 'Detalles sobre esta actualización';
+$_LANG['Thank you, you will be able to continue the upgrade process by clicking on the "Next" button.'] = 'Gracias, puede continuar la actualización, pulsando en "Siguiente".';
+$_LANG['PrestaShop is upgrading your shop one version after the other, the following upgrade files will be processed:'] = 'PrestaShop actualiza las versiones de su tienda de una en una, los siguientes archivos de actualización van a ser tratados:';
 $_LANG['Upgrade file'] = 'Archivo de actualizaciones';
 $_LANG['Modifications to process'] = 'Modificaciones que deben tenerse en cuenta';
 $_LANG['(major)'] = '(majeure)';
@@ -247,42 +247,42 @@ $_LANG['minutes'] = 'minutos';
 $_LANG['minute'] = 'minuto';
 $_LANG['seconds'] = 'segundos';
 $_LANG['second'] = 'segundo';
-$_LANG['Depending on your server and the size of your shop'] = 'En funci√≥n de la potencia de su servidor y el tama√±o de su tienda...';
-$_LANG['You did not update your shop for a while,'] = 'No ha actualizado su tienda desde hace alg√∫n tiempo,';
-$_LANG['stable releases have been made ‚Äã‚Äãavailable since.'] = 'hay versiones mayores a disposici√≥n desde entonces.';
-$_LANG['This is not a problem however the update may take several minutes, try to update your shop more frequently.'] = 'No es un problema pero la actualizaci√≥n puede durar algunos minutos. Intente actualizar su tienda m√°s a menudo.';
-$_LANG['No files to process, this might be an error.'] = 'No hay ning√∫n archivo para tratar, se trata sin duda de un error';
-$_LANG['Hosting parameters'] = 'Par√°metros hosting';
-$_LANG['PrestaShop tries to automatically set the best settings for your server in order the update to be successful.'] = 'PrestaShop intenta configurar por usted los par√°metros de su servidor para que la actualizaci√≥n se efect√∫e de manera correcta.';
-$_LANG['PHP parameter'] = 'Par√°metro PHP';
-$_LANG['Description'] = 'Descripci√≥n';
+$_LANG['Depending on your server and the size of your shop'] = 'En función de la potencia de su servidor y el tama√±o de su tienda...';
+$_LANG['You did not update your shop for a while,'] = 'No ha actualizado su tienda desde hace algún tiempo,';
+$_LANG['stable releases have been made ‚Äã‚Äãavailable since.'] = 'hay versiones mayores a disposición desde entonces.';
+$_LANG['This is not a problem however the update may take several minutes, try to update your shop more frequently.'] = 'No es un problema pero la actualización puede durar algunos minutos. Intente actualizar su tienda más a menudo.';
+$_LANG['No files to process, this might be an error.'] = 'No hay ningún archivo para tratar, se trata sin duda de un error';
+$_LANG['Hosting parameters'] = 'Parámetros hosting';
+$_LANG['PrestaShop tries to automatically set the best settings for your server in order the update to be successful.'] = 'PrestaShop intenta configurar por usted los parámetros de su servidor para que la actualización se efectúe de manera correcta.';
+$_LANG['PHP parameter'] = 'Parámetro PHP';
+$_LANG['Description'] = 'Descripción';
 $_LANG['Current value'] = 'Valor actual';
-$_LANG['Maximum allowed time for the upgrade'] = 'Tiempo m√°ximo autorizado para la actualizaci√≥n';
-$_LANG['Maximum memory allowed for the upgrade'] = 'Memoria m√°xima autorizada para la actualizaci√≥n';
-$_LANG['All your settings seem to be OK, go for it!'] = 'Todos los par√°metros son correctos, ¬°adelante!';
-$_LANG['Beware, your settings look correct but are not optimal, if you encounter problems (upgrade too long, memory error...), please ask your hosting provider to increase the values of these parameters (max_execution_time & memory_limit).'] = 'Atenci√≥n, los par√°metros parecen correctos pero no son √≥ptimos, si encuentra una dificultad (actualizaci√≥n bloqueada antes de su finalizaci√≥n, error de memoria...), pida a su hosting que aumente los valores de dichos par√°metros (max_execution_time & memory_limit).';
-$_LANG['We strongly recommend that you inform your hosting provider to modify the settings before process to the update.'] = 'Le aconsejamos que avise a su hosting antes de comenzar la actualizaci√≥n para que modifique los par√°metros PHP.';
+$_LANG['Maximum allowed time for the upgrade'] = 'Tiempo máximo autorizado para la actualización';
+$_LANG['Maximum memory allowed for the upgrade'] = 'Memoria máxima autorizada para la actualización';
+$_LANG['All your settings seem to be OK, go for it!'] = 'Todos los parámetros son correctos, ¬°adelante!';
+$_LANG['Beware, your settings look correct but are not optimal, if you encounter problems (upgrade too long, memory error...), please ask your hosting provider to increase the values of these parameters (max_execution_time & memory_limit).'] = 'Atención, los parámetros parecen correctos pero no son óptimos, si encuentra una dificultad (actualización bloqueada antes de su finalización, error de memoria...), pida a su hosting que aumente los valores de dichos parámetros (max_execution_time & memory_limit).';
+$_LANG['We strongly recommend that you inform your hosting provider to modify the settings before process to the update.'] = 'Le aconsejamos que avise a su hosting antes de comenzar la actualización para que modifique los parámetros PHP.';
 $_LANG['Let\'s go!'] = 'El proceso ha comenzado';
-$_LANG['Click on the "Next" button to start the upgrade, this can take several minutes,'] = 'Pulse en "Siguiente" para comenzar la actualizaci√≥n, esto puede llevar unos minutos,';
+$_LANG['Click on the "Next" button to start the upgrade, this can take several minutes,'] = 'Pulse en "Siguiente" para comenzar la actualización, esto puede llevar unos minutos,';
 $_LANG['do not close the window and be patient.'] = 'no cierre la ventana y espere.';
-$_LANG['Your update is completed!'] = 'La actualizaci√≥n ha concluido con √©xito';
-$_LANG['Your shop version is now'] = 'La versi√≥n de su tienda ya est√°';
+$_LANG['Your update is completed!'] = 'La actualización ha concluido con √©xito';
+$_LANG['Your shop version is now'] = 'La versión de su tienda ya está';
 $_LANG['New features in PrestaShop v'] = 'Nuevas aplicaciones en dans PrestaShop v';
-$_LANG['Module compatibility'] = 'Compatibilidad M√≥dulos';
-$_LANG['It\'s dangerous to keep non-native modules activated during the update. If you really want to take this risk, uncheck the following box.'] = 'Se desaconseja dejar los m√≥dulos no nativos activos durante la actualizaci√≥n. Si realmente desea correr ese riesgo, desactive la siguiente casilla.';
-$_LANG['You will be able to manually reactivate them in your back-office, once the update process has succeeded.'] = 'Despu√©s podr√° reactivarlos manualmente en el back-office, una vez la actualizaci√≥n haya terminado.';
-$_LANG['Ok, please desactivate the following modules, I will reactivate them later:'] = 'De acuerdo, desactive autom√°ticamente los siguientes m√≥dulos, los activar√© yo mismo m√°s tarde:';
+$_LANG['Module compatibility'] = 'Compatibilidad Módulos';
+$_LANG['It\'s dangerous to keep non-native modules activated during the update. If you really want to take this risk, uncheck the following box.'] = 'Se desaconseja dejar los módulos no nativos activos durante la actualización. Si realmente desea correr ese riesgo, desactive la siguiente casilla.';
+$_LANG['You will be able to manually reactivate them in your back-office, once the update process has succeeded.'] = 'Despu√©s podrá reactivarlos manualmente en el back-office, una vez la actualización haya terminado.';
+$_LANG['Ok, please desactivate the following modules, I will reactivate them later:'] = 'De acuerdo, desactive automáticamente los siguientes módulos, los activar√© yo mismo más tarde:';
 $_LANG['Theme compatibility'] = 'Compatibilidad del tema';
-$_LANG['Before updating, you need to check that your theme is compatible with version'] = 'Antes de la actualizaci√≥n, debe comprobar que su tema es compatible con la versi√≥n';
+$_LANG['Before updating, you need to check that your theme is compatible with version'] = 'Antes de la actualización, debe comprobar que su tema es compatible con la versión';
 $_LANG['of PrestaShop.'] = 'de PrestaShop';
 $_LANG['Link to the validator'] = 'Link hacia el validador';
 $_LANG['Online Theme Validator'] = 'Validador del tema en l√≠nea';
-$_LANG['If your theme is not valid, you may experience some problems in your front-office aspect, but don\'t panic ! To solve this, you can make it compatible by correcting the validators errors or by using a theme compatible with '] = 'Si su tema no es v√°lido, podr√≠a tener problemas en la p√°gina de su sitio Web, pero no se preocupe, ¬°puede hacerlo compatible corrigiendo los errores se√±alados por el validador o utilizando un tema compatible con la versi√≥n!' ;
-$_LANG['version'] = 'versi√≥n';
+$_LANG['If your theme is not valid, you may experience some problems in your front-office aspect, but don\'t panic ! To solve this, you can make it compatible by correcting the validators errors or by using a theme compatible with '] = 'Si su tema no es válido, podr√≠a tener problemas en la página de su sitio Web, pero no se preocupe, ¬°puede hacerlo compatible corrigiendo los errores se√±alados por el validador o utilizando un tema compatible con la versión!' ;
+$_LANG['version'] = 'versión';
 $_LANG['In this aim, use our'] = 'En este objetivo, utilice nuestro';
 $_LANG['Additional Benefits'] = 'Otros beneficios';
 $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Ofertas exclusivas dedicadas a los comerciantes PrestaShop';
-$_LANG['PHP magic quotes option is off (recommended)'] = 'La opci√≥n PHP "magic quotes" est√° desactivada (aconsejable)';
+$_LANG['PHP magic quotes option is off (recommended)'] = 'La opción PHP "magic quotes" está desactivada (aconsejable)';
 $_LANG['Other activity...'] = 'Otra actividad...';
 $_LANG['Modules'] = 'Módulos';
 $_LANG['Benefits'] = 'Beneficios';
@@ -141,7 +141,7 @@ $_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.'] = '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: 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';
@@ -20,7 +20,7 @@ $_LANG['Community Forum'] = 'il nostro forum comune';
 $_LANG['Configure SMTP manually (advanced users only)'] = 'Configura l\'invio SMTP (solo per utenti esperti)';
 $_LANG['Configure your database by filling out the following fields:'] = 'Configura il tuo database riempiendo i campi qui sotto:';
 $_LANG['Congratulation, your online shop is now ready!'] = 'Congratulazioni, il tuo negozio è installato!';
-$_LANG['Contact us'] = 'Contattaci!';
+$_LANG['Contact us!'] = 'Contattaci!';
 $_LANG['Create new files and folders allowed'] = 'Autorizzato a creare nuovi file e cartelle';
 $_LANG['Data integrity is not valided. Hack attempt?'] = 'L\'integrità dei dati non è convalidata.';
 $_LANG['Database Server is available but database is not found'] = 'Il server del database è disponibile ma il database non è stato trovato.';
@@ -63,7 +63,7 @@ $_LANG['Installation : complete install of the PrestaShop Solution'] = 'Installa
 $_LANG['Installation is complete!'] = 'Installazione terminata!';
 $_LANG['Installation method'] = 'Metodo di installazione';
 $_LANG['Last name:'] = 'Cognome:';
-$_LANG['License Agreement'] = 'Contratto di Licenza';
+$_LANG['Licenses Agreement'] = 'Contratto di Licenza';
 $_LANG['Login:'] = 'ID';
 $_LANG['Merchant info'] = 'Informazioni sul venditore';
 $_LANG['Missing a temporary folder'] = 'Manca la cartella temporanea di ricezione dell\'invio di file. Consulta il tuo amministratore.';
@@ -140,7 +140,7 @@ $_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.'] = '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: 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';
@@ -179,7 +179,7 @@ $_LANG['Default country:'] = 'Nazione di default:';
 $_LANG['Shop\'s timezone:'] = 'Fuso orario del negozio:';
 $_LANG['Your configuration is valid, click next to continue!'] = 'La tua configurazione è valida,<br />clicca su successivo per continuare!';
 $_LANG['Your configuration is invalid. Please fix the issues below:'] = 'La tua configurazione non è valida,<br />correggi questi problemi:';
-$_LANG['You have to create a database, help available in readme_en.txt'] = 'Devi prima creare un database (aiuto disponibile nel file readme.txt)';
+$_LANG['You have to create a database, help available in readme_en.txt'] = 'Devi prima creare un database (aiuto disponibile nel file readme_it.txt)';
 $_LANG['If you check this box and your mail configuration is wrong, your installation might be blocked. If so, please uncheck the box to go to the next step.'] = 'Se la tua configurazione e-mail è errata, questa opzione può essere bloccata; disattivala se non puoi passare alla fase successiva.';
 $_LANG['Mcrypt is available (recommended)'] = 'Mcrypt è disponibile (consigliato)';
 $_LANG['Your MySQL server doesn\'t support this engine, please use another one like MyISAM'] = 'Il supporto di questo motore di database non è supportato, scegline un altro come MyISAM';
@@ -272,4 +272,4 @@ $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Offerte esclusiv
 $_LANG['PHP magic quotes option is off (recommended)'] = 'Opzione magic quotes PHP è disattivata (consigliato)';
 $_LANG['Other activity...'] = 'Altre attività ...';
 $_LANG['Modules'] = 'Moduli';
-$_LANG['Benefits'] = 'Vantaggi';
+$_LANG['Benefits'] = 'Vantaggi';
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <languages>
-	
 	<lang id="0" label="English" trad_file="/../langs/us.php">
 		<flags>
 			<url>../img/l/1.jpg</url>
@@ -64,7 +64,7 @@ $_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.'] = 'WARNING! For security reasons, you must now delete the \'install\' folder located on your hosting server.';
+$_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.';
@@ -26,6 +26,8 @@
 			if ($result)
 			{
 				$varList = "";
+				if (count($result->field) > 0)
+				{
 				echo '<br clear="left" /><hr /><br clear="left" />';
 				foreach ($result->field AS $field)
 				{
@@ -67,6 +69,7 @@
 					else
 						$varList .= "'&".$field->key."='+ encodeURIComponent($('#".$p."_".$c."_form_".$field->key."').val())+\n";
 				}
+				}
 				echo '
 				<script>'."
 					$('#btNext').click(function() {
@@ -70,11 +70,12 @@ INSERT INTO `PREFIX_hook` (`id_hook`, `name`, `title`, `description`, `position`
 (67, 'attributeGroupForm', 'Add fileds to the form "attribute group"', 'Add fileds to the form "attribute group"', 0, 0),
 (68, 'afterSaveAttributeGroup', 'On saving attribute group', 'On saving attribute group', 0, 0),
 (69, 'afterDeleteAttributeGroup', 'On deleting attribute group', 'On deleting attribute group', 0, 0),
-(70, 'featureForm', 'Add fileds to the form "feature"', 'Add fileds to the form "feature"', 0, 0),
+(70, 'featureForm', 'Add fields to the form "feature"', 'Add fields to the form "feature"', 0, 0),
 (71, 'afterSaveFeature', 'On saving attribute feature', 'On saving attribute feature', 0, 0),
 (72, 'afterDeleteFeature', 'On deleting attribute feature', 'On deleting attribute feature', 0, 0),
-(73, 'taxManager', 'Tax Manager Factory', '' , 0, 0);
-
+(73, 'taxManager', 'Tax Manager Factory', '' , 0, 0),
+(74, 'afterSaveProduct', 'On saving products', 'On saving products', 0, 0),
+(75, 'productListAssign', 'Assign product list to a category', 'Assign product list to a category', 0, 0);

 INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_add`, `date_upd`) VALUES
 (1, 'PS_LANG_DEFAULT', '1', NOW(), NOW()),
@@ -826,8 +827,8 @@ INSERT INTO `PREFIX_tab` (`id_tab`, `class_name`, `id_parent`, `position`) VALUE
 (53, 'AdminBackup', 9, 8),(57, 'AdminCMSContent', 9, 9),(64, 'AdminGenerator', 9, 10),(43, 'AdminSearch', -1, 0),(69, 'AdminInformation', 9, 11),
 (70, 'AdminPerformance', 8, 11),(71, 'AdminCustomerThreads', 29, 4),(72, 'AdminWebservice', 9, 12),(73, 'AdminStockMvt', 1, 9),
 (80, 'AdminAddonsCatalog', 7, 1),(81, 'AdminAddonsMyAccount', 7, 2),(83, 'AdminThemes', 7, 3),(84, 'AdminGeolocation', 8, 12),
-(85, 'AdminTaxRulesGroup', 4, 3),(86, 'AdminLogs', 9, 13), (87,'AdminHome',-1,0),(88,'AdminUpgrade',9,14),
-(89,'AdminShop', 0, 11), (90,'AdminGroupShop', 90, 1),(91, 'AdminShopUrl', 90, 2);
+(85, 'AdminTaxRulesGroup', 4, 3),(86, 'AdminLogs', 9, 13), (87,'AdminHome',-1,0),
+(88,'AdminShop', 0, 11), (89,'AdminGroupShop', 90, 1),(90, 'AdminShopUrl', 90, 2);

 INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 1, id_tab, 1, 1, 1, 1 FROM PREFIX_tab);

@@ -844,7 +845,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (1, 61, 'Search Engines'),(1, 62, 'Referrers'),(1, 63, 'Groups'),(1, 64, 'Generators'),(1, 65, 'Shopping Carts'),(1, 66, 'Tags'),(1, 67, 'Search'),
 (1, 68, 'Attachments'),(1, 69, 'Configuration Information'),(1, 70, 'Performance'),(1, 71, 'Customer Service'),(1, 72, 'Webservice'),(1, 73, 'Stock Movements'),
 (1, 80, 'Modules & Themes Catalog'),(1, 81, 'My Account'),(1, 82, 'Stores'),(1, 83, 'Themes'),(1, 84, 'Geolocation'),(1, 85, 'Tax Rules'),(1, 86, 'Log'),
-(1, 87, 'Home'),(1, 88, 'Upgrade'), (1, 89, 'Shops'), (1, 90, 'Group Shops'), (1, 91, 'Shop Urls');
+(1, 87, 'Home'), (1, 88, 'Shops'), (1, 89, 'Group Shops'), (1, 90, 'Shop Urls');

 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (2, 1, 'Catalogue'),(2, 2, 'Clients'),(2, 3, 'Commandes'),(2, 4, 'Paiement'),(2, 5, 'Transport'),
@@ -859,7 +860,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (2, 62, 'Sites affluents'),(2, 63, 'Groupes'),(2, 64, 'Générateurs'),(2, 65, 'Paniers'),(2, 66, 'Tags'),(2, 67, 'Recherche'),
 (2, 68, 'Documents joints'),(2, 69, 'Informations'),(2, 70, 'Performances'),(2, 71, 'SAV'),(2, 72, 'Service web'),(2, 73, 'Mouvements de Stock'),
 (2, 80, 'Catalogue de modules et thèmes'),(2, 81, 'Mon compte'),(2, 82, 'Magasins'),(2, 83, 'Thèmes'),(2, 84, 'Géolocalisation'),(2, 85, 'Règles de taxes'),(2, 86, 'Log'),
-(2, 87,'Accueil'),(2, 88, 'Mise à jour'), (2, 89, 'Boutiques'), (2, 90, 'Groupes de boutique'), (2, 91, 'URLs de boutique');
+(2, 87,'Accueil'), (2, 88, 'Boutiques'), (2, 89, 'Groupes de boutique'), (2, 90, 'URLs de boutique');

 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (3, 1, 'Catálogo'),(3, 2, 'Clientes'),(3, 3, 'Pedidos'),(3, 4, 'Pago'),(3, 5, 'Transporte'),
@@ -873,7 +874,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (3, 55, 'Albaranes de entrega'),(3, 56, 'SEO & URLs'),(3, 57, 'CMS'),(3, 58, 'Mapeo de la imagen'),(3, 59, 'Mensajes del cliente'),(3, 60, 'Rastreo'),
 (3, 61, 'Motores de búsqueda'),(3, 62, 'Referido'),(3, 63, 'Grupos'),(3, 64, 'Generadores'),(3, 65, 'Carritos'),(3, 66, 'Etiquetas'),(3, 67, 'Búsqueda'),(3, 68, 'Adjuntos'),
 (3, 69, 'Informaciones'),(3, 70, 'Rendimiento'),(3, 72, 'Web service'),(3, 71, 'Servicio al cliente'),(3, 73, 'Movimiento de Stock'), (3, 82, 'Tiendas'),(3, 83, 'Temas'),(3, 84, 'Geolocalización'),(3, 85, 'Reglas de Impuestos'),(3, 86, 'Log'),
-(3, 87,'Home'),(3, 88, 'Mejorar'), (3, 89, 'Shops'), (3, 90, 'Group Shops'), (3, 91, 'Shop Urls');
+(3, 87,'Home'), (3, 88, 'Shops'), (3, 89, 'Group Shops'), (3, 90, 'Shop Urls');

 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 1, 'Katalog'),(4, 2, 'Kunden'),(4, 3, 'Bestellungen'),(4, 4, 'Zahlung'),
@@ -888,7 +889,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 61, 'Suchmaschinen'),(4, 62, 'Referrer'),(4, 63, 'Gruppen'),(4, 64, 'Generatoren'),(4, 65, 'Warenkörbe'),(4, 66, 'Tags'),(4, 67, 'Suche'),
 (4, 68, 'Anhänge'),(4, 69, 'Konfigurationsinformationen'),(4, 70, 'Leistung'),(4, 71, 'Kundenservice'),(4, 72, 'Webservice'),(4, 73, 'Lagerbewegungen'),
 (4, 80, 'Module und Themenkatalog'),(4, 81, 'Mein Konto'),(4, 82, 'Shops'),(4, 83, 'Themen'),(4, 84, 'Geotargeting'),(4, 85, 'Steuerregeln'),(4, 86, 'Log'),
-(4, 87,'Home'),(4, 88, 'Upgrade'), (4, 89, 'Shops'), (4, 90, 'Group Shops'), (4, 91, 'Shop Urls');
+(4, 87,'Home'), (4, 88, 'Shops'), (4, 89, 'Group Shops'), (4, 90, 'Shop Urls');

 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (5, 1, 'Catalogo'),(5, 2, 'Clienti'),(5, 3, 'Ordini'),(5, 4, 'Pagamento'),
@@ -903,7 +904,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (5, 61, 'Motori di ricerca'),(5, 62, 'Referenti'),(5, 63, 'Gruppi'),(5, 64, 'Generatori'),(5, 65, 'Carrelli shopping'),(5, 66, 'Tag'),(5, 67, 'Cerca'),
 (5, 68, 'Allegati'),(5, 69, 'Informazioni di configurazione'),(5, 70, 'Performance'),(5, 71, 'Servizio clienti'),(5, 72, 'Webservice'),(5, 73, 'Movimenti magazzino'),
 (5, 80, 'Moduli & Temi catalogo'),(5, 81, 'Il mio Account'),(5, 82, 'Negozi'),(5, 83, 'Temi'),(5, 84, 'Geolocalizzazione'),(5, 85, 'Regimi fiscali'),(5, 86, 'Log'),
-(5, 87,'Home'),(5, 88, 'Aggiornamento'), (5, 89, 'Shops'), (5, 90, 'Group Shops'), (5, 91, 'Shop Urls');
+(5, 87,'Home'), (5, 88, 'Shops'), (5, 89, 'Group Shops'), (5, 90, 'Shop Urls');

 INSERT IGNORE INTO `PREFIX_tab_lang` (`id_tab`, `id_lang`, `name`)
    (SELECT `id_tab`, id_lang, (SELECT tl.`name`
@@ -75,7 +75,5 @@ CREATE TABLE IF NOT EXISTS `PREFIX_compare_product` (

 DELETE FROM `PREFIX_configuration` WHERE name = 'PS_LAYERED_NAVIGATION_CHECKBOXES' LIMIT 1;

-/* PHP:add_new_tab(AdminUpgrade, en:Upgrade|fr:Mise à jour,  9); */;
-
 /* PHP:alter_productcomments_guest_index(); */;

@@ -20,10 +20,12 @@ UPDATE `PREFIX_order_detail` SET `product_price` = `product_price` /( 1-(`group_
 DELETE FROM `PREFIX_configuration` WHERE name IN ('PS_LAYERED_BITLY_USERNAME', 'PS_LAYERED_BITLY_API_KEY', 'PS_LAYERED_SHARE') LIMIT 3;

 INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edit`) VALUES
-('attributeGroupForm', 'Add fileds to the form "attribute group"', 'Add fileds to the form "attribute group"', 0, 0),
+('attributeGroupForm', 'Add fields to the form "attribute group"', 'Add fields to the form "attribute group"', 0, 0),
 ('afterSaveAttributeGroup', 'On saving attribute group', 'On saving attribute group', 0, 0),
 ('afterDeleteAttributeGroup', 'On deleting attribute group', 'On deleting "attribute group', 0, 0),
 ('featureForm', 'Add fileds to the form "feature"', 'Add fileds to the form "feature"', 0, 0),
 ('afterSaveFeature', 'On saving attribute feature', 'On saving attribute feature', 0, 0),
-('afterDeleteFeature', 'On deleting attribute feature', 'On deleting attribute feature', 0, 0);
+('afterDeleteFeature', 'On deleting attribute feature', 'On deleting attribute feature', 0, 0),
+('afterSaveProduct', 'On saving products', 'On saving products', 0, 0),
+('productListAssign', 'Assign product list to a category', 'Assign product list to a category', 0, 0);

@@ -415,14 +415,17 @@ abstract class AdminSelfTab
 	 */
 	protected function l($string, $class = 'AdminTab', $addslashes = FALSE, $htmlentities = TRUE)
 	{
+		global $_LANGADM;
+		if(empty($_LANGADM))
+			$_LANGADM = array();
 		// if the class is extended by a module, use modules/[module_name]/xx.php lang file
 		$currentClass = get_class($this);
+		if (class_exists('Module') AND method_exists('Module','getModuleNameFromClass'))
 		if (Module::getModuleNameFromClass($currentClass))
 		{
 			$string = str_replace('\'', '\\\'', $string);
 			return Module::findTranslation(Module::$classInModule[$currentClass], $string, $currentClass);
 		}
-		global $_LANGADM;

 		if ($class == __CLASS__)
 				$class = 'AdminTab';
@@ -1294,7 +1297,15 @@ abstract class AdminSelfTab
 				  </script>
 			<div class="warn">';
 			if (!is_array($warn))
-				$str_output .= '<img src="../img/admin/warn2.png" />'.$warn;
+			{
+				if (file_exists(__PS_BASE_URI__.'img/admin/warn2.png'))
+					$str_output .= '<img src="'.__PS_BASE_URI__.'img/admin/warn2.png" />';
+			else
+					$str_output .= '<img src="'.__PS_BASE_URI__.'img/admin/warning.gif" />';
+
+
+				$str_output .= $warn;
+			}
 			else
 			{	$str_output .= '<span style="float:right"><a id="hideWarn" href=""><img alt="X" src="../img/admin/close.png" /></a></span><img src="../img/admin/warn2.png" />'.
 				(count($warn) > 1 ? $this->l('There are') : $this->l('There is')).' '.count($warn).' '.(count($warn) > 1 ? $this->l('warnings') : $this->l('warning'))
@@ -2141,5 +2152,112 @@ abstract class AdminSelfTab
 			<a href="index.php?tab=AdminMeta&token='.Tools14::getAdminTokenLite('AdminMeta').'#SEO%20%26%20URLs">'.
 			$this->l('Click here if you want to modify the main shop domain name').'</a>');
 	}
+	/*
+	* from 1.4 AdminPreferences
+	*/
+	protected function _postConfig($fields)
+	{
+		global $currentIndex, $smarty;
+
+		$languages = Language::getLanguages(false);
+		if (function_exists('Tools','clearCache'))
+			Tools::clearCache($smarty);
+
+		/* Check required fields */
+		foreach ($fields AS $field => $values)
+			if (isset($values['required']) AND $values['required'])
+				if (isset($values['type']) AND $values['type'] == 'textLang')
+				{
+					foreach ($languages as $language)
+						if (($value = Tools::getValue($field.'_'.$language['id_lang'])) == false AND (string)$value != '0')
+							$this->_errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is required.');
+}
+				elseif (($value = Tools::getValue($field)) == false AND (string)$value != '0')
+					$this->_errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is required.');
+
+		/* Check fields validity */
+		foreach ($fields AS $field => $values)
+			if (isset($values['type']) AND $values['type'] == 'textLang')
+			{
+				foreach ($languages as $language)
+					if (Tools::getValue($field.'_'.$language['id_lang']) AND isset($values['validation']))
+						if (!Validate::$values['validation'](Tools::getValue($field.'_'.$language['id_lang'])))
+							$this->_errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is invalid.');
+			}
+			elseif (Tools::getValue($field) AND isset($values['validation']))
+				if (!Validate::$values['validation'](Tools::getValue($field)))
+					$this->_errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is invalid.');
+
+		/* Default value if null */
+		foreach ($fields AS $field => $values)
+			if (!Tools::getValue($field) AND isset($values['default']))
+				$_POST[$field] = $values['default'];
+
+		/* Save process */
+		if (!sizeof($this->_errors))
+		{
+			if (Tools::isSubmit('submitAppearanceconfiguration'))
+			{
+				if (isset($_FILES['PS_LOGO']['tmp_name']) AND $_FILES['PS_LOGO']['tmp_name'])
+				{
+					if ($error = checkImage($_FILES['PS_LOGO'], 300000))
+						$this->_errors[] = $error;
+					if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') OR !move_uploaded_file($_FILES['PS_LOGO']['tmp_name'], $tmpName))
+						return false;
+					elseif (!@imageResize($tmpName, _PS_IMG_DIR_.'logo.jpg'))
+						$this->_errors[] = 'an error occurred during logo copy';
+					unlink($tmpName);
+				}
+				if (isset($_FILES['PS_LOGO_MAIL']['tmp_name']) AND $_FILES['PS_LOGO_MAIL']['tmp_name'])
+				{
+					if ($error = checkImage($_FILES['PS_LOGO_MAIL'], 300000))
+						$this->_errors[] = $error;
+					if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS_MAIL') OR !move_uploaded_file($_FILES['PS_LOGO_MAIL']['tmp_name'], $tmpName))
+						return false;
+					elseif (!@imageResize($tmpName, _PS_IMG_DIR_.'logo_mail.jpg'))
+						$this->_errors[] = 'an error occurred during logo copy';
+					unlink($tmpName);
+				}
+				if (isset($_FILES['PS_LOGO_INVOICE']['tmp_name']) AND $_FILES['PS_LOGO_INVOICE']['tmp_name'])
+				{
+					if ($error = checkImage($_FILES['PS_LOGO_INVOICE'], 300000))
+						$this->_errors[] = $error;
+					if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS_INVOICE') OR !move_uploaded_file($_FILES['PS_LOGO_INVOICE']['tmp_name'], $tmpName))
+						return false;
+					elseif (!@imageResize($tmpName, _PS_IMG_DIR_.'logo_invoice.jpg'))
+						$this->_errors[] = 'an error occurred during logo copy';
+					unlink($tmpName);
+				}
+				if (isset($_FILES['PS_STORES_ICON']['tmp_name']) AND $_FILES['PS_STORES_ICON']['tmp_name'])
+				{
+					if ($error = checkImage($_FILES['PS_STORES_ICON'], 300000))
+						$this->_errors[] = $error;
+					if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS_STORES_ICON') OR !move_uploaded_file($_FILES['PS_STORES_ICON']['tmp_name'], $tmpName))
+						return false;
+					elseif (!@imageResize($tmpName, _PS_IMG_DIR_.'logo_stores.gif'))
+						$this->_errors[] = 'an error occurred during logo copy';
+					unlink($tmpName);
+				}
+				$this->uploadIco('PS_FAVICON', _PS_IMG_DIR_.'favicon.ico');
+			}
+
+			/* Update settings in database */
+			if (!sizeof($this->_errors))
+			{
+				foreach ($fields AS $field => $values)
+				{
+					unset($val);
+					if (isset($values['type']) AND $values['type'] == 'textLang')
+						foreach ($languages as $language)
+							$val[$language['id_lang']] = isset($values['cast']) ? $values['cast'](Tools::getValue($field.'_'.$language['id_lang'])) : Tools::getValue($field.'_'.$language['id_lang']);
+					else
+						$val = isset($values['cast']) ? $values['cast'](Tools::getValue($field)) : Tools::getValue($field);
+
+					Configuration::updateValue($field, $val);
+				}
+				Tools::redirectAdmin($currentIndex.'&conf=6'.'&token='.$this->token);
+			}
+		}
+	}
 }

@@ -31,6 +31,9 @@ if(!defined('_PS_USE_SQL_SLAVE_'))

 if(empty($_POST['action']) OR !in_array($_POST['action'],array('upgradeDb')))
 {
+	if(!defined('_PS_CACHE_ENABLED_'))
+		define('_PS_CACHE_ENABLED_',false);
+
 	if(!defined('PS_ORDER_PROCESS_STANDARD'))
 		define('PS_ORDER_PROCESS_STANDARD',true);
 	if(!defined('PS_ORDER_PROCESS_OPC'))
@@ -40,24 +43,22 @@ if(empty($_POST['action']) OR !in_array($_POST['action'],array('upgradeDb')))
 }
 	require_once(dirname(__FILE__).'/AdminSelfTab.php');
 	require_once(dirname(__FILE__).'/SelfModule.php');
-	if(file_exists(_PS_ROOT_DIR_.'/classes/Upgrader.php'))
-	{
+
+// Add Upgrader class 
+	if(!version_compare(_PS_VERSION_,'1.4.5.0','<') AND file_exists(_PS_ROOT_DIR_.'/classes/Upgrader.php'))
 		require_once(_PS_ROOT_DIR_.'/classes/Upgrader.php');
-	}
 	else
 		require_once(dirname(__FILE__).'/Upgrader.php');

 	if(!class_exists('Upgrader',false))
 	{
 		if(file_exists(_PS_ROOT_DIR_.'/override/classes/Upgrader.php'))
-		{
 			require_once(_PS_ROOT_DIR_.'/override/classes/Upgrader.php');
-		}
 		else
-		{
 			eval('class Upgrader extends UpgraderCore{}');
 		}
-	}
+
+

 require_once(dirname(__FILE__).'/Tools14.php');
 if(!class_exists('Tools',false))
@@ -68,6 +69,9 @@ class AdminSelfUpgrade extends AdminSelfTab
 	public $nextResponseType = 'json'; // json, xml
 	public $next = 'N/A';
 	
+	public $upgrader = null;
+	public $standalone = true;
+	
 	/**
 	 * set to false if the current step is a loop
 	 *
@@ -111,8 +115,8 @@ class AdminSelfUpgrade extends AdminSelfTab
 	public $rootWritable = false;
 	public $svnDir = 'svn';
 	public $destDownloadFilename = 'prestashop.zip';
-	public $toUpgradeFileList = array();
-	public $backupFileList = array();
+	public $toUpgradeFileList = 'filesToUpgrade.list';
+	public $toBackupFileList = 'filesToBackup.list';
 	public $sampleFileList = array();
 	private $backupIgnoreFiles = array();
 	private $backupIgnoreAbsoluteFiles = array();
@@ -165,7 +169,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 		global $cookie;
 		$id_employee = $cookie->id_employee;

-		$cookiePath = __PS_BASE_URI__.str_replace($this->prodRootDir,'',trim($this->adminDir,'/'));
+		$cookiePath = __PS_BASE_URI__.str_replace($this->prodRootDir,'',trim($this->adminDir,DIRECTORY_SEPARATOR));
 		setcookie('id_employee', $id_employee, time()+3600, $cookiePath);
 		setcookie('id_tab', $this->id, time()+3600, $cookiePath);
 		setcookie('autoupgrade', $this->encrypt($id_employee), time()+3600, $cookiePath);
@@ -221,7 +225,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 	private function _setFields()
 	{
 		$this->_fieldsAutoUpgrade['PS_AUTOUP_DONT_SAVE_IMAGES'] = array(
-			'title' => $this->l('Don\'t save images'), 'cast' => 'intval', 'validation' => 'isBool',
+			'title' => $this->l('Also save images'), 'cast' => 'intval', 'validation' => 'isBool',
 			'type' => 'bool', 'desc'=>$this->l('You can exclude the image directory from backup if you already saved it by another method (not recommended)'),
 		);

@@ -259,6 +263,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 	{
 		$allowed = (ConfigurationTest::test_fopen() && $this->rootWritable);
 		$allowed &= !Configuration::get('PS_SHOP_ENABLE');
+		$allowed &= (Configuration::get('PS_AUTOUP_KEEP_TRAD') !== false);

 		return $allowed;
 	}
@@ -272,7 +277,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 		$allowed = (ConfigurationTest::test_fopen() && $this->rootWritable);

 		if (!defined('_PS_MODE_DEV_') OR !_PS_MODE_DEV_)
-			$allowed &= $this->upgrader->autoupgrade;
+			$allowed &= $this->upgrader->autoupgrade_module;

 		return $allowed;
 	}
@@ -289,8 +294,11 @@ class AdminSelfUpgrade extends AdminSelfTab
 		$this->prodRootDir = _PS_ROOT_DIR_;
 		$this->adminDir = _PS_ADMIN_DIR_;

+		// from $_POST or $_GET
+		$this->action = empty($_REQUEST['action'])?null:$_REQUEST['action'];
+		$this->currentParams = empty($_REQUEST['params'])?null:$_REQUEST['params'];
 		// test writable recursively
-		if(version_compare(_PS_VERSION_,'1.4.4.0','<'))
+		if(version_compare(_PS_VERSION_,'1.4.5.0','<'))
 		{
 			require_once('ConfigurationTest.php');
 			if(!class_exists('ConfigurationTest', false) AND class_exists('ConfigurationTestCore'))
@@ -299,25 +307,28 @@ class AdminSelfUpgrade extends AdminSelfTab
 		if (ConfigurationTest::test_dir($this->prodRootDir,true))
 			$this->rootWritable = true;

+		if (!in_array($this->action,array('upgradeFile', 'upgradeDb', 'upgradeComplete','rollback','restoreFiles','restoreDb')))
+		{
 		// checkPSVersion will be not 
-		$this->upgrader = new Upgrader(true);
+			$this->upgrader = new Upgrader();
 		$this->upgrader->checkPSVersion();
-		if (version_compare(_PS_VERSION_,'1.4.4.0','<') OR $this->upgrader->need_standalone)
+			$this->currentParams['install_version'] = $this->upgrader->version_num;
+
+			if ($this->upgrader->autoupgrade_module)
 			$this->standalone = true;
 		else
 			$this->standalone = false;
+$this->standalone = true;
+		}
 		// If you have defined this somewhere, you know what you do
 		if (defined('_PS_ALLOW_UPGRADE_UNSTABLE_') AND _PS_ALLOW_UPGRADE_UNSTABLE_ AND function_exists('svn_checkout'))
 		{
-			if(version_compare(_PS_VERSION_,'1.4.4.0','<') OR class_exists('Configuration',false))
+			if(version_compare(_PS_VERSION_,'1.4.5.0','<') OR class_exists('Configuration',false))
 				$this->useSvn = Configuration::get('PS_AUTOUP_USE_SVN');
 		}
 		else
 			$this->useSvn = false;
 		
-		// from $_POST or $_GET
-		$this->action = empty($_REQUEST['action'])?null:$_REQUEST['action'];
-		$this->currentParams = empty($_REQUEST['params'])?null:$_REQUEST['params'];

 		// If not exists in this sessions, "create"
 		// session handling : from current to next params
@@ -327,6 +338,18 @@ class AdminSelfUpgrade extends AdminSelfTab
 		if (isset($this->currentParams['filesToUpgrade']))
 			$this->nextParams['filesToUpgrade'] = $this->currentParams['filesToUpgrade'];

+		// set autoupgradePath, to be used in backupFiles and backupDb config values
+		$this->autoupgradePath = $this->adminDir.DIRECTORY_SEPARATOR.$this->autoupgradeDir;
+
+		if (!file_exists($this->autoupgradePath))
+			if (!@mkdir($this->autoupgradePath,0777))
+				$this->_errors[] = Tools::displayError(sprintf($this->l('unable to create directory %s'),$this->autoupgradePath));
+
+		$latest = $this->autoupgradePath.DIRECTORY_SEPARATOR.'latest';
+		if (!file_exists($latest))
+			if (!@mkdir($latest,0777))
+				$this->_errors[] = Tools::displayError(sprintf($this->l('unable to create directory %s'),$latest));
+
 		if (class_exists('Configuration',false))
 		{
 			$time = time();
@@ -351,26 +374,16 @@ class AdminSelfUpgrade extends AdminSelfTab
 			// backupFilesFilename should never etc.
 			$this->backupFilesFilename = $this->currentParams['backupFilesFilename'];
 		}
-		$this->autoupgradePath = $this->adminDir.DIRECTORY_SEPARATOR.$this->autoupgradeDir;
-
-		if (!file_exists($this->autoupgradePath))
-			if (!@mkdir($this->autoupgradePath,0777))
-				$this->_errors[] = Tools::displayError(sprintf($this->l('unable to create directory %s'),$this->autoupgradePath));
-
-		$latest = $this->autoupgradePath.DIRECTORY_SEPARATOR.'latest';
-		if (!file_exists($latest))
-			if (!@mkdir($latest,0777))
-				$this->_errors[] = Tools::displayError(sprintf($this->l('unable to create directory %s'),$latest));

 		$this->latestRootDir = $latest.DIRECTORY_SEPARATOR.'prestashop';
 		$this->adminDir = str_replace($this->prodRootDir,'',$this->adminDir);
-		// @TODO future option
+		// @TODO future option "install in test dir"
 		//	$this->testRootDir = $this->autoupgradePath.DIRECTORY_SEPARATOR.'test';

 		/* option */
 		if (class_exists('Configuration',false))
 		{
-			$this->dontBackupImages = Configuration::get('PS_AUTOUP_DONT_SAVE_IMAGES');
+			$this->dontBackupImages = !Configuration::get('PS_AUTOUP_DONT_SAVE_IMAGES');
 			$this->keepDefaultTheme = Configuration::get('PS_AUTOUP_KEEP_DEFAULT_THEME');
 			$this->keepTrad = Configuration::get('PS_AUTOUP_KEEP_TRAD');
 			$this->manualMode = Configuration::get('PS_AUTOUP_MANUAL_MODE');
@@ -382,7 +395,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 			$this->keepDefaultTheme = $this->currentParams['keepDefaultTheme'];
 			$this->keepTrad = $this->currentParams['keepTrad'];
 			$this->manualMode = $this->currentParams['manualMode'];
-			$this->desactivateCustomModule = $this->current['desactivateCustomModule'];
+			$this->desactivateCustomModule = $this->currentParams['desactivateCustomModule'];
 		}
 		// We can add any file or directory in the exclude dir : theses files will be not removed or overwritten	
 		// @TODO cache should be ignored recursively, but we have to reconstruct it after upgrade
@@ -398,6 +411,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 		$this->excludeFilesFromUpgrade[] = '.svn';
 		$this->excludeFilesFromUpgrade[] = 'install';
 		$this->excludeFilesFromUpgrade[] = 'settings.inc.php';
+		// this will exclude autoupgrade dir from admin, and autoupgrade from modules
 		$this->excludeFilesFromUpgrade[] = 'autoupgrade';
 		$this->backupIgnoreFiles[] = '.';
 		$this->backupIgnoreFiles[] = '..';
@@ -493,7 +507,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 	}

 	public function ajaxProcessUnzip(){
-		if(version_compare(_PS_VERSION_,'1.4.4.0','<')
+		if(version_compare(_PS_VERSION_,'1.4.5.0','<')
 			AND !class_exists('Tools',false)
 		)
 			require_once('Tools.php');
@@ -556,9 +570,12 @@ class AdminSelfUpgrade extends AdminSelfTab

 	public function _listBackupFiles($dir)
 	{
+		static $list = array();
 		$allFiles = scandir($dir);
 		foreach ($allFiles as $file)
 		{
+			if ($file[0] != '.')
+			{
 			$fullPath = $dir.DIRECTORY_SEPARATOR.$file;
 			
 			if (!$this->_skipFile($file, $fullPath,'backup'))
@@ -566,16 +583,18 @@ class AdminSelfUpgrade extends AdminSelfTab
 					if (is_dir($fullPath))
 						$this->_listBackupFiles($fullPath);
 					else
-						$this->backupFileList[] = $fullPath;					
+						$list[] = $fullPath;					
 			}
 			else
-					$this->backupIgnoreFiles[] = $fullPath;
-
+					$list[] = $fullPath;
 		}
 	}
+		file_put_contents($this->autoupgradePath.DIRECTORY_SEPARATOR.$this->toBackupFileList,serialize($list));
+	}

 	public function _listFilesToUpgrade($dir)
 	{
+		static $list = array();
 		$allFiles = scandir($dir);
 		foreach ($allFiles as $file)
 		{
@@ -583,20 +602,15 @@ class AdminSelfUpgrade extends AdminSelfTab
 			
 			if (!$this->_skipFile($file, $fullPath, "upgrade"))
 			{
+				$list[] = $fullPath;
+				// if is_dir, we will create it :)
 				if (is_dir($fullPath))
-				{
-						// if is_dir, we will create it :)e it :)
-						$this->toUpgradeFileList[] = $fullPath;
 							if (strpos($dir.DIRECTORY_SEPARATOR.$file, 'install') === false)
-							{
 								$this->_listFilesToUpgrade($fullPath);
 							}
 				}
-				else
-						$this->toUpgradeFileList[] = $fullPath;
-			}
-		}

+		file_put_contents($this->autoupgradePath.DIRECTORY_SEPARATOR.$this->toUpgradeFileList,serialize($list));
 		$this->nextParams['filesToUpgrade'] = $this->toUpgradeFileList;
 	}

@@ -615,9 +629,9 @@ class AdminSelfUpgrade extends AdminSelfTab
 		// @TODO :
 		// foreach files in latest, copy
 		$this->next = 'upgradeFiles';
-		if (!is_array($this->nextParams['filesToUpgrade']))
+		$filesToUpgrade = @unserialize(file_get_contents($this->nextParams['filesToUpgrade']));
+		if (!is_array($filesToUpgrade))
 		{
-			error($this->nextParams);
 			$this->next = 'error';
 			$this->nextDesc = $this->l('filesToUpgrade is not an array');
 			$this->nextQuickInfo[] = $this->l('filesToUpgrade is not an array');
@@ -627,29 +641,31 @@ class AdminSelfUpgrade extends AdminSelfTab
 		// @TODO : does not upgrade files in modules, translations if they have not a correct md5 (or crc32, or whatever) from previous version
 		for ($i=0;$i<self::$loopUpgradeFiles;$i++)
 		{
-			if (sizeof($this->nextParams['filesToUpgrade'])<=0)
+			if (sizeof($filesToUpgrade)<=0)
 			{
 				$this->next = 'upgradeDb';
+				unlink($this->nextParams['filesToUpgrade']);
 				$this->nextDesc = $this->l('All files upgraded. Now upgrading database');
 				$this->nextResponseType = 'xml';
 				break;
 			}

-			//$file = array_shift($this->nextParams['filesToUpgrade']);
-			$file = array_shift($this->nextParams['filesToUpgrade']);
+			$file = array_shift($filesToUpgrade);
 			if (!$this->upgradeThisFile($file))
 			{
 				// put the file back to the begin of the list
-				$totalFiles = array_unshift($this->nextParams['filesToUpgrade'],$file);
+				$totalFiles = array_unshift($filesToUpgrade,$file);
 				$this->next = 'error';
 				$this->nextQuickInfo[] = sprintf($this->l('error when trying to upgrade %s'),$file);
 				break;
 			}
 			else{
+				$this->nextQuickInfo[] = sprintf($this->l('copied %1$s. %2$s files left to upgrade.'),$file, sizeof($filesToUpgrade));
 				// @TODO : maybe put several files at the same times ?
-				$this->nextDesc = sprintf($this->l('%2$s files left to upgrade.'),$file,sizeof($this->nextParams['filesToUpgrade']));
+				$this->nextDesc = sprintf($this->l('%2$s files left to upgrade.'),$file,sizeof($filesToUpgrade));
 			}
 		}
+		file_put_contents($this->nextParams['filesToUpgrade'],serialize($filesToUpgrade));
 	}

 	/**
@@ -692,10 +708,14 @@ class AdminSelfUpgrade extends AdminSelfTab
 		///////////////////////
 		// Copy from model.php
 		///////////////////////
+		if (!is_object($this->upgrader))
+			$this->upgrader = new Upgrader();
+
 		$upgrader = $this->upgrader;
+
 		$upgrader->checkPSVersion();

-		define('INSTALL_VERSION', $upgrader->version_num);
+		define('INSTALL_VERSION', $this->currentParams['install_version']);
 		// now the install dir to use is in a subdirectory of the admin dir
 		define('INSTALL_PATH', realpath($this->latestRootDir.DIRECTORY_SEPARATOR.'install'));

@@ -733,14 +753,12 @@ class AdminSelfUpgrade extends AdminSelfTab
 		// 2) confirm config is correct (r/w rights)
 		//	install/model.php?method=checkConfig&firsttime=0
 		// later
-
 		// 3) save current activated modules in nextParams, or don't desactivate them ?
 		// @TODO
 		// 4) upgrade
 		//	install/model.php?_=1309193641470&method=doUpgrade&customModule=desactivate
 		if (!empty($this->currentParams['desactivateCustomModule']))
 			$_GET['customModule'] = 'desactivate';
-
 		if (!$this->_modelDoUpgrade())
 		{
 			$this->next = 'error';
@@ -775,13 +793,14 @@ class AdminSelfUpgrade extends AdminSelfTab

 			if (is_dir($file))
 			{
+				// if $dest is not a directory (that can happen), just remove that file
+				if (!is_dir($dest) AND file_exists($dest))
+					unlink($dest);
+
 				if (!file_exists($dest))
 				{
 					if (@mkdir($dest))
-					{
-						$this->nextQuickInfo[] = sprintf($this->l('created dir %2$s. %3$s files left to upgrade.'),$file, $dest, sizeof($this->nextParams['filesToUpgrade']));
 						return true;
-					}
 					else
 					{
 						$this->next = 'error';
@@ -791,18 +810,13 @@ class AdminSelfUpgrade extends AdminSelfTab
 					}
 				}
 				else
-				{
 					// directory already exists
 					return true;
 				}
-			}
 			else
 			{
 				if (copy($file,$dest))
-				{
-					$this->nextQuickInfo[] = sprintf($this->l('copied %1$s in %2$s. %3$s files left to upgrade.'),$file, $dest, sizeof($this->nextParams['filesToUpgrade']));
 					return true;
-				}
 				else
 				{
 					$this->next = 'error';
@@ -824,7 +838,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 		{
 			$this->next = 'restoreFiles';
 			$this->status = 'ok';
-			$this->nextDesc = $this->l('Files restored, now restoring database.');
+			$this->nextDesc = $this->l('Restoring files...');
 		}
 		else
 		{
@@ -832,7 +846,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 			{
 				$this->next = 'restoreDb';
 				$this->status = 'ok';
-				$this->nextDesc = $this->l('Database restored');
+				$this->nextDesc = $this->l('restoring Database ...');
 			}
 			else
 			{
@@ -841,6 +855,9 @@ class AdminSelfUpgrade extends AdminSelfTab
 				// all theses cases are handled by the method ajaxRequestRollback()
 				$this->next = ''; // next is empty : nothing next :)
 				$this->status = 'ok';
+				if (isset($this->currentParams['firstTime']))
+						$this->nextDesc = $this->l('Nothing has to be restored');
+					else
 				$this->nextDesc = $this->l('All your site is restored... ');
 			}
 		}
@@ -866,19 +883,18 @@ class AdminSelfUpgrade extends AdminSelfTab
 				$filepath = $this->backupFilesFilename;
 				$destExtract = $this->prodRootDir;

+
 				if (self::ZipExtract($filepath, $destExtract))
 				{
-					// once it's restored, delete the file !
-					unlink($this->backupFilesFilename);
-					Configuration::updateValue('UPGRADER_BACKUPFILES_FILENAME', '');
-					if (!empty($this->backupDbFilename))
+					// once it's restored, do not delete the archive file. This has to be done manually
+					if (!empty($this->backupDbFilename) AND file_exists($this->backupDbFilename) )
 					{
 						$this->nextDesc = $this->l('Files restored. No database backup found. Restoration done.');
-						$this->next = '';
+						$this->next = 'rollback';
 					}
 					else
 					{
-						$this->nextDesc = $this->l('Files restored.');
+						$this->nextDesc = $this->l('Files restored. No database backup found. Restoration done.');
 						$this->next = 'rollback';
 					}
 					return true;
@@ -906,6 +922,8 @@ class AdminSelfUpgrade extends AdminSelfTab
 	*/
 	public function ajaxProcessRestoreDb()
 	{
+		$this->_loadDbRelatedClasses();
+
 		$exts = explode('.', $this->backupDbFilename);
 		$fileext = $exts[count($exts)-1];
 		$requests = array();
@@ -947,12 +965,12 @@ class AdminSelfUpgrade extends AdminSelfTab
 		// This way we avoid extra blank lines
 		// option s (PCRE_DOTALL) added
 		// @TODO need to check if a ";" in description could block that (I suppose it can at the end of a line)
-		preg_match_all('/.*;[\n]\+/s', $content, $requests);
+		preg_match_all('/(.*;)[\n\r]+/Usm', $content, $requests);
 		/* @TODO maybe improve regex pattern ... */
 		$db = Db::getInstance();	
-		if (count($requests)>0)
+		if (count($requests[0])>0)
 		{
-			foreach ($requests as $request)
+			foreach ($requests[1] as $request)
 				if (!empty($request))
 					if (!$db->Execute($request))
 						$this->nextQuickInfo[] = $db->getMsgError();
@@ -968,8 +986,9 @@ class AdminSelfUpgrade extends AdminSelfTab
 		$this->nextDesc = 'Database restore done.';
 	}

-	public function ajaxProcessBackupDb()
+	private function _loadDbRelatedClasses()
 	{
+		// Manual inclusion of all classes used
 		if(!class_exists('ObjectModel',false))
 		{
 			require_once(_PS_ROOT_DIR_.'/classes/ObjectModel.php');
@@ -983,12 +1002,6 @@ class AdminSelfUpgrade extends AdminSelfTab
 			if(!class_exists('Language',false))
 				eval('Class Language extends LanguageCore{}');
 		}
-		if(!class_exists('Validate',false))
-		{
-			require_once(_PS_ROOT_DIR_.'/classes/Validate.php');
-			if(!class_exists('Validate',false))
-				eval('Class Validate extends ValidateCore{}');
-		}
 		if(!class_exists('Db',false))
 		{
 			require_once(_PS_ROOT_DIR_.'/classes/Db.php');
@@ -1001,6 +1014,13 @@ class AdminSelfUpgrade extends AdminSelfTab
 			if(!class_exists('MySQL',false))
 				eval('Class MySQL extends MySQLCore{}');
 		}
+		
+		if(!class_exists('Validate',false))
+		{
+			require_once(_PS_ROOT_DIR_.'/classes/Validate.php');
+			if(!class_exists('Validate',false))
+				eval('Class Validate extends ValidateCore{}');
+		}
 		if(!class_exists('Configuration',false))
 		{
 			require_once(_PS_ROOT_DIR_.'/classes/Configuration.php');
@@ -1021,6 +1041,11 @@ class AdminSelfUpgrade extends AdminSelfTab
 			define('_PS_MAGIC_QUOTES_GPC_', get_magic_quotes_gpc());
 		if(!defined('_PS_MYSQL_REAL_ESCAPE_STRING_'))
 			define('_PS_MYSQL_REAL_ESCAPE_STRING_', function_exists('mysql_real_escape_string'));
+		Configuration::loadConfiguration();
+	}
+	public function ajaxProcessBackupDb()
+	{
+		$this->_loadDbRelatedClasses();

 		$backup = new Backup();
 		// for backup db, use autoupgrade directory
@@ -1050,8 +1075,8 @@ class AdminSelfUpgrade extends AdminSelfTab
 		if (!isset($this->nextParams['filesForBackup']))
 		{
 			$list = $this->_listBackupFiles($this->prodRootDir);
-			$this->nextQuickInfo[] = sprintf($this->l('%s Files to backup.'), sizeof($this->backupFileList));
-			$this->nextParams['filesForBackup'] = $this->backupFileList;
+			$this->nextQuickInfo[] = sprintf($this->l('%s Files to backup.'), sizeof($this->toBackupFileList));
+			$this->nextParams['filesForBackup'] = $this->toBackupFileList;

 			// delete old backup, create new
 			if (file_exists($this->backupFilesFilename))
@@ -1059,12 +1084,13 @@ class AdminSelfUpgrade extends AdminSelfTab

 			$this->nextQuickInfo[]	= sprintf($this->l('backup files initialized in %s'), $this->backupFilesFilename);
 		}
+		$filesToBackup = unserialize(file_get_contents($this->toBackupFileList));

 		/////////////////////
 		$this->next = 'backupFiles';
 		// @TODO : display % instead of this
-		$this->nextDesc = sprintf($this->l('Backup files in progress. %s files left'), sizeof($this->nextParams['filesForBackup']));
-		if (is_array($this->nextParams['filesForBackup']))
+		$this->nextDesc = sprintf($this->l('Backup files in progress. %s files left'), sizeof($filesToBackup));
+		if (is_array($filesToBackup))
 		{
 			// @TODO later
 			// 1) calculate crc32 of next file
@@ -1089,7 +1115,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 					// @TODO min(self::$loopBackupFiles, sizeof())
 					for($i=0;$i<self::$loopBackupFiles;$i++)
 					{
-						if (sizeof($this->nextParams['filesForBackup'])<=0)
+						if (sizeof($filesToBackup)<=0)
 						{
 							$this->stepok = true;
 							$this->status = 'ok';
@@ -1099,11 +1125,11 @@ class AdminSelfUpgrade extends AdminSelfTab
 							break;
 						}
 						// filesForBackup already contains all the correct files
-						$file = array_shift($this->nextParams['filesForBackup']);
-						$archiveFilename = str_replace($this->prodRootDir,'',$file);
+						$file = array_shift($filesToBackup);
+						$archiveFilename = ltrim(str_replace($this->prodRootDir,'',$file),DIRECTORY_SEPARATOR);
 						// @TODO : maybe put several files at the same times ?
 						if ($zip->addFile($file,$archiveFilename))
-							$this->nextQuickInfo[] = sprintf($this->l('%1$s added to archive. %2$s left.'),$file, sizeof($this->nextParams['filesForBackup']));
+							$this->nextQuickInfo[] = sprintf($this->l('%1$s added to archive. %2$s left.'),$file, sizeof($filesToBackup));
 						else
 						{
 						// if an error occur, it's more safe to delete the corrupted backup
@@ -1115,6 +1141,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 						}
 					}
 					$zip->close();
+					file_put_contents($this->autoupgradePath.DIRECTORY_SEPARATOR.$this->toBackupFileList,serialize($filesToBackup));
 					return true;
 				}
 				else{
@@ -1157,7 +1184,6 @@ class AdminSelfUpgrade extends AdminSelfTab

 	public function ajaxProcessRemoveSamples(){
 		$this->stepDone = false;
-		// @TODO : list exaustive list of files to remove :
 		// all images from img dir exept admin ?
 		// all images like logo, favicon, ?.
 		// all custom image from modules ?
@@ -1306,8 +1332,8 @@ class AdminSelfUpgrade extends AdminSelfTab
 	{
 		if(!$this->standalone)
 		{
-			if (version_compare(_PS_VERSION_,'1.4.4.0','<') AND false)
-				$this->_errors[] = Tools::displayError('This class depends of several files modified in 1.4.4.0 version and should not be used in an older version');
+			if (version_compare(_PS_VERSION_,'1.4.5.0','<') AND false)
+				$this->_errors[] = Tools::displayError('This class depends of several files modified in 1.4.5.0 version and should not be used in an older version');
 		}
 		parent::displayConf();
 		
@@ -1336,7 +1362,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 			}
 		}

-		if ($this->apacheModExists('mod_evasive'))
+		if ($this->apacheModExists('evasive'))
 			sleep(1);
 	}
 	/**
@@ -1357,9 +1383,11 @@ class AdminSelfUpgrade extends AdminSelfTab
 	
 			// we need strpos (example can be evasive20
 			foreach($apacheModuleList as $module)
-				if (strpos($name, $module)!==false)
+			{
+				if (strpos($module, $name)!==false)
 					return true;
 		}
+		}
 		else{
 			// If apache_get_modules does not exists,
 			// one solution should be parsing httpd.conf, 
@@ -1377,7 +1405,7 @@ class AdminSelfUpgrade extends AdminSelfTab

 	private function _getJsErrorMsgs()
 	{
-		$INSTALL_VERSION = $this->upgrader->version_num;
+		$INSTALL_VERSION = $this->currentParams['install_version'];
 		$ret = '
 var txtError = new Array();
 txtError[0] = "'.$this->l('Required field').'";
@@ -1501,11 +1529,11 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 				$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/>';

-			if ($this->rootWritable)
-				$srcRootWritable = '../img/admin/enabled.gif';
+			if (($testConfigDone = Configuration::get('PS_AUTOUP_DONT_SAVE_IMAGES')) !== false)
+				$configurationDone = '../img/admin/enabled.gif';
 			else
-				$srcRootWritable = '../img/admin/disabled.gif';
-			echo '<b>'.$this->l('Root directory').' : </b>'.'<img src="'.$srcRootWritable.'" /> '.($this->rootWritable?$this->l('writable recursively'):$this->l('not writable recursively')).'. <br/><br/>';
+				$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/>';

 			echo '<a class="button" id="scrollToOptions" href="#options">'.$this->l('Modify your options').'</a>';
 			echo '</fieldset>';
@@ -1556,7 +1584,7 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 		
 		

-			if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_)
+			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>';
@@ -1623,6 +1651,7 @@ echo '</script>';
 #upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .processing {border:2px outset grey;margin-top:1px;overflow: auto;}
+#dbResultCheck{ padding-left:20px;}
 </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.'));

@@ -1716,6 +1745,7 @@ function addQuickInfo(arrQuickInfo){
 	$js .= '
 var firstTimeParams = '.$this->buildAjaxResult().';
 firstTimeParams = firstTimeParams.nextParams;
+firstTimeParams.firstTime = "1";

 $(document).ready(function(){
 	$(".upgradestep").click(function(e)
@@ -1757,7 +1787,7 @@ function parseXMLResult(xmlRet)
 		$("#dbCreateResultCheck")
 			.hide("slow");

-		// difference with the original function
+		// as xml is only after upgradeDb, the next step is always upgradeComplete
 		ret = {next:"upgradeComplete",nextParams:{typeResult:"json"},status:"ok"};

 	}
@@ -1812,12 +1842,14 @@ function afterBackupFiles()
 }

 function doAjaxRequest(action, nextParams){
+		// myNext, used when json is not available but response is correct
+		myNext = nextParams;
 		req = $.ajax({
 			type:"POST",
-			url : "'.($this->standalone? __PS_BASE_URI__ . trim($this->adminDir,'/').'/autoupgrade/ajax-upgradetab.php' : str_replace('index','ajax-tab',$currentIndex)).'",
+			url : "'.($this->standalone? __PS_BASE_URI__ . trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php' : str_replace('index','ajax-tab',$currentIndex)).'",
 			async: true,
 			data : {
-				dir:"'.trim($this->adminDir,'/').'",
+				dir:"'.trim($this->adminDir,DIRECTORY_SEPARATOR).'",
 				ajaxMode : "1",
 				token : "'.$this->token.'",
 				tab : "'.get_class($this).'",
@@ -1912,8 +1944,6 @@ function doAjaxRequest(action, nextParams){
 */
 function prepareNextButton(button_selector, nextParams)
 {
-//	myNext;
-	myNext = nextParams;
 	$(button_selector).unbind();
 	$(button_selector).click(function(e){
 		e.preventDefault();
@@ -49,6 +49,7 @@ class BackupCore
 		if ($filename)
 			$this->id = $this->getRealBackupPath($filename);

+			Configuration::loadConfiguration();
 			$psBackupAll = Configuration::get('PS_BACKUP_ALL');
 			$psBackupDropTable = Configuration::get('PS_BACKUP_DROP_TABLE');
 			$this->psBackupAll = $psBackupAll !== false ? $psBackupAll : true;
@@ -40,6 +40,7 @@ class UpgraderCore{
 	public $version_num;
 	public $link;
 	public $autoupgrade;
+	public $autoupgrade_module;
 	public $changelog;
 	public $md5;

@@ -95,7 +96,10 @@ class UpgraderCore{
 	{
 		if (empty($this->link))
 		{
+			if (class_exists('Configuration'))
 			$lastCheck = Configuration::get('PS_LAST_VERSION_CHECK');
+			else
+				$lastCheck = 0;
 			// if we use the autoupgrade process, we will never refresh it
 			// except if no check has been done before
 			if ($force OR ($lastCheck < time() - (3600 * Upgrader::DEFAULT_CHECK_VERSION_DELAY_HOURS)) )
@@ -103,12 +107,14 @@ class UpgraderCore{
 				libxml_set_streams_context(stream_context_create(array('http' => array('timeout' => 3))));
 				if ($feed = @simplexml_load_file($this->rss_version_link))
 				{
+
 					$this->version_name = (string)$feed->version->name;
 					$this->version_num = (string)$feed->version->num;
 					$this->link = (string)$feed->download->link;
 					$this->md5 = (string)$feed->download->md5;
 					$this->changelog = (string)$feed->download->changelog;
 					$this->autoupgrade = (int)$feed->autoupgrade;
+					$this->autoupgrade_module = (int)$feed->autoupgrade_module;
 					$this->desc = (string)$feed->desc ;
 					$configLastVersion = array(
 						'name' => $this->version_name,
@@ -116,13 +122,17 @@ class UpgraderCore{
 						'link' => $this->link,
 						'md5' => $this->md5,
 						'autoupgrade' => $this->autoupgrade,
+						'autoupgrade_module' => $this->autoupgrade_module,
 						'changelog' => $this->changelog,
 						'desc' => $this->desc
 					);
+					if (class_exists('Configuration'))
+					{
 					Configuration::updateValue('PS_LAST_VERSION',serialize($configLastVersion));
 					Configuration::updateValue('PS_LAST_VERSION_CHECK',time());
 				}
 			}
+			}
 			else
 			{
 				$lastVersionCheck = @unserialize(Configuration::get('PS_LAST_VERSION'));
@@ -130,6 +140,7 @@ class UpgraderCore{
 				$this->version_num = $lastVersionCheck['num'];
 				$this->link = $lastVersionCheck['link'];
 				$this->autoupgrade = $lastVersionCheck['autoupgrade'];
+				$this->autoupgrade_module = $lastVersionCheck['autoupgrade_module'];
 				$this->md5 = $lastVersionCheck['md5'];
 				$this->desc = $lastVersionCheck['desc'];
 				$this->changelog = $lastVersionCheck['changelog'];
@@ -28,19 +28,22 @@
 if($_POST['action'] == 'upgradeDb')
 		require_once(dirname(__FILE__).'/../../config/config.inc.php');

-// require('Tools.php');
-// require('../../config/config.autoupgrade.inc.php');
+// ajax-upgrade-tab is located in admin/autoupgrade directory
 if(!defined('_PS_ROOT_DIR_'))
-	define('_PS_ROOT_DIR_', dirname(__FILE__).'/../../');
+	define('_PS_ROOT_DIR_', realpath(dirname(__FILE__).'/../../'));
 require_once(_PS_ROOT_DIR_.'/config/settings.inc.php');
 if(!defined('_PS_MODULE_DIR_'))
-	define('_PS_MODULE_DIR_', _PS_ROOT_DIR_ .'modules/');
+	define('_PS_MODULE_DIR_', _PS_ROOT_DIR_ .'/modules/');
+
 define('AUTOUPGRADE_MODULE_DIR', _PS_MODULE_DIR_.'autoupgrade/');
 require_once(AUTOUPGRADE_MODULE_DIR.'functions.php');
 if(!defined('_PS_USE_SQL_SLAVE_'))
 	define('_PS_USE_SQL_SLAVE_',0);
 // dir = admin-dev
-define('_PS_ADMIN_DIR_', _PS_ROOT_DIR_.'/'.$_POST['dir']);
+if ( _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$_POST['dir'] !==  realpath(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$_POST['dir']))
+	die('not allowed');
+
+define('_PS_ADMIN_DIR_', _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$_POST['dir']);
 define('PS_ADMIN_DIR', _PS_ADMIN_DIR_); // Retro-compatibility
 //require(_PS_ADMIN_DIR_.'/functions.php');
 include(AUTOUPGRADE_MODULE_DIR.'init.php');
@@ -26,14 +26,9 @@ class Autoupgrade extends Module
 	}
 	function install()
 	{
-		$autoupgradeCanWork = true;
-		if (!$autoupgradeCanWork)
-			return false;

 		$res = true;
 		// before adding AdminSelfUpgrade, we should remove AdminUpgrade
-		if (version_compare(_PS_VERSION_,'1.4.4.0','==') OR version_compare(_PS_VERSION_,'1.4.4.1','=='))
-		{
 			$idTab = Tab::getIdFromClassName('AdminUpgrade');

 			if ($idTab)
@@ -41,7 +36,6 @@ class Autoupgrade extends Module
 			$tab = new Tab($idTab);
 				$res &= $tab->delete();
 		}
-		}
 		
 		$idTab = Tab::getIdFromClassName('AdminSelfUpgrade');
 		// Then we add AdminSelfUpgrade only if not exists
@@ -55,9 +49,7 @@ class Autoupgrade extends Module
 			$res &= $tab->save();
 		}
 		else
-		{
 			$tab = new Tab($idTab);
-		}
 			Configuration::updateValue('PS_AUTOUPDATE_MODULE_IDTAB',$tab->id);

 		$autoupgradeDir = _PS_ADMIN_DIR_.DIRECTORY_SEPARATOR.'autoupgrade';
@@ -68,6 +60,7 @@ class Autoupgrade extends Module
 		$path = dirname(__FILE__).'/';
 		
 		$res &= copy($path.'ajax-upgradetab.php',$autoupgradeDir . DIRECTORY_SEPARATOR . 'ajax-upgradetab.php');
+		$res &= copy($path.'logo.gif',_PS_ROOT_DIR_. DIRECTORY_SEPARATOR . 'img/t/AdminSelfUpgrade.gif');
 		
 		if (!$res 
 			OR !Tab::getIdFromClassName('AdminSelfUpgrade')
@@ -94,6 +87,7 @@ class Autoupgrade extends Module
 			$res = $tab->save();
 		}
 		
+		if (file_exists(_PS_ADMIN_DIR_.DIRECTORY_SEPARATOR.'autoupgrade'.DIRECTORY_SEPARATOR.'ajax-upgradetab.php'))
 		$res &= @unlink(_PS_ADMIN_DIR_.DIRECTORY_SEPARATOR.'autoupgrade'.DIRECTORY_SEPARATOR.'ajax-upgradetab.php');
 		if($res OR !parent::uninstall())
 			return false;
@@ -1,56 +1,56 @@
 <?php
+
 global $_MODULE;
 $_MODULE = array();
-
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_19f823c6453c2b1ffd09cb715214813d'] = 'Pflichtfelder';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_760c4026bc5a0bd5378e6efc3f1370b4'] = 'Zu lang!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_4f2e28904946a09d8c7f36dd3ee72457'] = 'Die Felder sind unterschiedlich!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_43b01d1a6c5065545c65f42003b0ab5c'] = 'Falsche Adresse!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_2e170dfd78c2171a25605ececc0950a4'] = 'Kann E-Mail nicht senden!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_6deee80e4bdb8894331994116818558e'] = 'Fehler beim Erstellen der Konfigurationsdatei, wenn die Datei /config/ settings.inc.php existiert, geben Sie ihr bitte die offiziellen Schreibrechte, ansonsten erstellen Sie bitte eine Datei settings.inc.php im Konfigurationsverzeichnis (/config/)';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_aa946cb00b1c23ff6553b6f9e05da151'] = 'Die Settings-Datei konnte nicht geschrieben werden, erstellen Sie bitte eine Datei namens settings.inc.php in Ihrem Konfigurationsverzeichnis.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_e930e2474c664a3a7e89ecfb8793694b'] = 'Kann Datei nicht senden!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_774fc7a0f56391abc5d8856f2436ca07'] = 'Die Integrität der Daten ist nicht bestätigt.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_8fd007bf08e0717537825a3e91cb4fcc'] = 'Kann den Inhalt einer *.sql-Datei nicht lesen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_c71e825f6873f64b91efc26313614eab'] = 'Kann nicht auf den Inhalt einer *.sql-Datei zugreifen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_3d5c8f1d29b1a1dc4ea0673122e0d277'] = 'Fehler beim Einfügen in die Datenbank:';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_17e1581d01152347bfaacd153b961379'] = 'Falsches Kennwort (alpha-numerischer String aus mindestens 8 Zeichen)';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_9b9f3b2f8a4dffcad9188c8fc4b468c8'] = 'Eine PrestaShop Datenbank existiert bereits mit diesem Präfix, Sie müssen sie manuell löschen oder das Präfix ändern.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_bc5e1163a15106f9e941a7603124709d'] = 'Dies ist kein gültiger Name.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_a9d82945b8603f0c8807958d7db9a24d'] = 'Dies ist kein gültiges Bild.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_b37eef07b764ea58eec9afe624e20a40'] = 'Fehler beim Erstellen der Datei /config/settings.inc.php.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_3d9f514d46849760ef1b1412e314fd99'] = 'Fehler:';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_504053ab4c6d648edf11624f1bea4bb4'] = 'Diese PrestaShop-Datenbank existiert schon, bitte bestätigen Sie der Datenbank erneut Ihre Kennungen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_d7a99f61bb284d096ea4f221784af85a'] = 'Bei der Änderung des Bildmaßstabs ist ein Fehler aufgetreten.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_428c933bafbf262d693fbf1c22c03e5d'] = 'Die Datenbank wurde gefunden!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_76bd190129b7aefb90fdf42f09ec3ec7'] = 'Der Datenbank-Server steht zur Verfügung, aber die Datenbank wurde nicht gefunden';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_045f4b5c3f990e5a26e2837495d68259'] = 'Der Datenbank-Server wurde nicht gefunden, bitte prüfen Sie Ihren Benutzernamen oder den Server-Namen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_757fc72e8d69106dd2cf9da22cc7adb1'] = 'Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte prüfen Sie Ihre Einstellungen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_d18ad19290b3bfc3cd0d7badbb6cb6a3'] = 'Kann Bild /img/logo.jpg nicht schreiben. Falls es bereits existiert, löschen Sie es bitte manuell.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_2368e33e3e01d53abb9b60061ab83903'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_a10ef376d9f4c877ac86d8e4350116bf'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_f8fe8cba1625eaf8e5c253b041d57dbd'] = 'Die Datei wurde teilweise gesendet.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_8c9067e52e4440d8a20e74fdc745b0c6'] = 'Es ist keine Datei gesandt worden';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_2384d693d9af53b4727c092af7570a19'] = 'Der temporäre Ordner Ihrer empfangenen Dateisendungen fehlt. Bitte wenden Sie sich an Ihren Systemadministrator.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_f5985b2c059d5cc36968baab7585baba'] = 'Kann die Datei nicht auf die Festplatte schreiben';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_9e54dfe54e03b0010c1fe70bd65cd5e6'] = 'Datei Senden unterbrochen aufgrund falscher Erweiterung';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_32af3a59b50e98d254d6c03c5b320a94'] = 'Kann die Daten aus Ihrer Datenbank nicht in UTF-8 zu konvertieren.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_989a45a4ca01ee222f4370172bf8850d'] = 'Ungültiger Shopname';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_68499acecfba9d3bf0ca8711f300d3ed'] = 'Ihr Vorname enthält ungültige Zeichen';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_2399cf4ca7b49f2706f6e147a32efa78'] = 'Ihr Nachname enthält ungültige Zeichen';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_7d72600fcff52fb3a2d2f73572117311'] = 'Ihr Datenbank-Server unterstützt keinen UTF-8-Zeichensatz.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_5b9bbadcf96f15e7f112c13a9e5f076e'] = 'Diese Datenbank-Engine wird nicht unterstützt, bitte wählen Sie eine andere als MyISAM';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_24b481455c1b72b0c2539e7d516b9582'] = 'Die Datei /img/logo.jpg kann nicht geschrieben werden, bitte ändern Sie die Dateirechte mit CHMOD 755 oder CHMOD 777';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_5746b74663148afffd1350c97d4fcdfe'] = 'Feld Katalog-Modus ungültig';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_dafe44b99256a7783bc37f4f949da373'] = 'Der Installer ist zu alt.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_37ce0f29c7377c827e7247fe5645a782'] = 'Sie besitzen bereits die Version. %s';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_89928a14f2090aec4fd7aff9ea983f95'] = 'Keine frühere Version erkannt. Haben Sie die Datei settings.inc.php aus dem Ordner config gelöscht oder umbenannt?';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_5276a8cbd9e3e467396089b267564f51'] = 'Die Datei config/settings.inc.php wurde nicht gefunden. Haben Sie sie gelöscht oder umbenannt?';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_24784d9e80638781b74c017b33d8ca0c'] = 'Kann eine der SQL-Update-Dateien nicht finden. Bitte stellen Sie sicher, dass der Ordner /install/sql/upgrade nicht leer ist.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_580e4b216e324f675f0237cdb34b6c2d'] = 'Kein Update verfügbar';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_f15e7e7292b0c72894cf45a893e0d497'] = 'Fehler beim Öffnen der SQL-Datei';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_b8286438fbb6c7df9129fadc5316c19f'] = 'Fehler beim Einfügen in die Datenbank';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_229ee8046cafc09ddaf46fb9db710e91'] = 'Leider';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_e805a556799b7cef40e9760c81d99218'] = 'Es sind SQL-Fehler aufgetreten.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_5627353fd6ac678497af3ece05087068'] = 'Die Datei config/defines.inc.php wurde nicht gefunden. Wo ist sie?';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_783e8e29e6a8c3e22baa58a19420eb4f'] = 'Sekunden';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_19f823c6453c2b1ffd09cb715214813d'] = 'Pflichtfelder';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_760c4026bc5a0bd5378e6efc3f1370b4'] = 'Zu lang!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4f2e28904946a09d8c7f36dd3ee72457'] = 'Die Felder sind unterschiedlich!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_43b01d1a6c5065545c65f42003b0ab5c'] = 'Falsche Adresse!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2e170dfd78c2171a25605ececc0950a4'] = 'Kann E-Mail nicht senden!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6deee80e4bdb8894331994116818558e'] = 'Fehler beim Erstellen der Konfigurationsdatei, wenn die Datei /config/ settings.inc.php existiert, geben Sie ihr bitte die offiziellen Schreibrechte, ansonsten erstellen Sie bitte eine Datei settings.inc.php im Konfigurationsverzeichnis (/config/)';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_aa946cb00b1c23ff6553b6f9e05da151'] = 'Die Settings-Datei konnte nicht geschrieben werden, erstellen Sie bitte eine Datei namens settings.inc.php in Ihrem Konfigurationsverzeichnis.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e930e2474c664a3a7e89ecfb8793694b'] = 'Kann Datei nicht senden!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_774fc7a0f56391abc5d8856f2436ca07'] = 'Die Integrität der Daten ist nicht bestätigt.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8fd007bf08e0717537825a3e91cb4fcc'] = 'Kann den Inhalt einer *.sql-Datei nicht lesen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c71e825f6873f64b91efc26313614eab'] = 'Kann nicht auf den Inhalt einer *.sql-Datei zugreifen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3d5c8f1d29b1a1dc4ea0673122e0d277'] = 'Fehler beim Einfügen in die Datenbank:';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_17e1581d01152347bfaacd153b961379'] = 'Falsches Kennwort (alpha-numerischer String aus mindestens 8 Zeichen)';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_9b9f3b2f8a4dffcad9188c8fc4b468c8'] = 'Eine PrestaShop Datenbank existiert bereits mit diesem Präfix, Sie müssen sie manuell löschen oder das Präfix ändern.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_bc5e1163a15106f9e941a7603124709d'] = 'Dies ist kein gültiger Name.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a9d82945b8603f0c8807958d7db9a24d'] = 'Dies ist kein gültiges Bild.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b37eef07b764ea58eec9afe624e20a40'] = 'Fehler beim Erstellen der Datei /config/settings.inc.php.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3d9f514d46849760ef1b1412e314fd99'] = 'Fehler:';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_504053ab4c6d648edf11624f1bea4bb4'] = 'Diese PrestaShop-Datenbank existiert schon, bitte bestätigen Sie der Datenbank erneut Ihre Kennungen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d7a99f61bb284d096ea4f221784af85a'] = 'Bei der Änderung des Bildmaßstabs ist ein Fehler aufgetreten.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_428c933bafbf262d693fbf1c22c03e5d'] = 'Die Datenbank wurde gefunden!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_76bd190129b7aefb90fdf42f09ec3ec7'] = 'Der Datenbank-Server steht zur Verfügung, aber die Datenbank wurde nicht gefunden';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_045f4b5c3f990e5a26e2837495d68259'] = 'Der Datenbank-Server wurde nicht gefunden, bitte prüfen Sie Ihren Benutzernamen oder den Server-Namen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_757fc72e8d69106dd2cf9da22cc7adb1'] = 'Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte prüfen Sie Ihre Einstellungen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d18ad19290b3bfc3cd0d7badbb6cb6a3'] = 'Kann Bild /img/logo.jpg nicht schreiben. Falls es bereits existiert, löschen Sie es bitte manuell.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2368e33e3e01d53abb9b60061ab83903'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a10ef376d9f4c877ac86d8e4350116bf'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f8fe8cba1625eaf8e5c253b041d57dbd'] = 'Die Datei wurde teilweise gesendet.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8c9067e52e4440d8a20e74fdc745b0c6'] = 'Es ist keine Datei gesandt worden';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2384d693d9af53b4727c092af7570a19'] = 'Der temporäre Ordner Ihrer empfangenen Dateisendungen fehlt. Bitte wenden Sie sich an Ihren Systemadministrator.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f5985b2c059d5cc36968baab7585baba'] = 'Kann die Datei nicht auf die Festplatte schreiben';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_9e54dfe54e03b0010c1fe70bd65cd5e6'] = 'Datei Senden unterbrochen aufgrund falscher Erweiterung';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_32af3a59b50e98d254d6c03c5b320a94'] = 'Kann die Daten aus Ihrer Datenbank nicht in UTF-8 zu konvertieren.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_989a45a4ca01ee222f4370172bf8850d'] = 'Ungültiger Shopname';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_68499acecfba9d3bf0ca8711f300d3ed'] = 'Ihr Vorname enthält ungültige Zeichen';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2399cf4ca7b49f2706f6e147a32efa78'] = 'Ihr Nachname enthält ungültige Zeichen';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_7d72600fcff52fb3a2d2f73572117311'] = 'Ihr Datenbank-Server unterstützt keinen UTF-8-Zeichensatz.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5b9bbadcf96f15e7f112c13a9e5f076e'] = 'Diese Datenbank-Engine wird nicht unterstützt, bitte wählen Sie eine andere als MyISAM';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_24b481455c1b72b0c2539e7d516b9582'] = 'Die Datei /img/logo.jpg kann nicht geschrieben werden, bitte ändern Sie die Dateirechte mit CHMOD 755 oder CHMOD 777';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5746b74663148afffd1350c97d4fcdfe'] = 'Feld Katalog-Modus ungültig';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_dafe44b99256a7783bc37f4f949da373'] = 'Der Installer ist zu alt.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_37ce0f29c7377c827e7247fe5645a782'] = 'Sie besitzen bereits die Version. %s';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_89928a14f2090aec4fd7aff9ea983f95'] = 'Keine frühere Version erkannt. Haben Sie die Datei settings.inc.php aus dem Ordner config gelöscht oder umbenannt?';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5276a8cbd9e3e467396089b267564f51'] = 'Die Datei config/settings.inc.php wurde nicht gefunden. Haben Sie sie gelöscht oder umbenannt?';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_24784d9e80638781b74c017b33d8ca0c'] = 'Kann eine der SQL-Update-Dateien nicht finden. Bitte stellen Sie sicher, dass der Ordner /install/sql/upgrade nicht leer ist.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_580e4b216e324f675f0237cdb34b6c2d'] = 'Kein Update verfügbar';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f15e7e7292b0c72894cf45a893e0d497'] = 'Fehler beim Öffnen der SQL-Datei';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b8286438fbb6c7df9129fadc5316c19f'] = 'Fehler beim Einfügen in die Datenbank';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_229ee8046cafc09ddaf46fb9db710e91'] = 'Leider';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e805a556799b7cef40e9760c81d99218'] = 'Es sind SQL-Fehler aufgetreten.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5627353fd6ac678497af3ece05087068'] = 'Die Datei config/defines.inc.php wurde nicht gefunden. Wo ist sie?';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_783e8e29e6a8c3e22baa58a19420eb4f'] = 'Sekunden';
@@ -2,7 +2,6 @@

 global $_MODULE;
 $_MODULE = array();
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_875b8a59022d232837491c0fdfacb4ab'] = 'Ne pas sauver 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é)';
@@ -31,12 +30,9 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_63ded4905ba41ac4bf00373df273
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_11978affb3b0dbb16c50d571fd05de6d'] = 'erreur lors  de la création du répertoire %s';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_1b854285afc1988b6f83414fde5943ab'] = '%1$s copié dans %2$s. encore %3$s fichiers à mettre à jour.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0e06ce0972ad338e1d96e8589dc21b9c'] = 'erreur lors de la copie de %1$s vers %2$s';
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0511620a3a1d6036d3fbe47b131d7c4b'] = 'Fichiers restorés. Restauration de la base de données.';
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_791403f158965a3e19f8627c7b744126'] = 'Base de données restaurée.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5f7f50973696d0a42c1efcc07f7820a0'] = 'Votre site est maintenant restauré.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_28517b8a291c50d80aa53a078407065b'] = 'Répertoire racine nettoyée.';
 $_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_cb7dce5f6a1934d54c0d3335c7ffe841'] = 'Fichiers restaurés.';
 $_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.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_09a362e2dd3800f8fbc55d3446513f65'] = 'Rien à restaurer (aucune requête trouvée)';
@@ -28,6 +28,10 @@
 /* Getting cookie or logout */
 include(dirname(__FILE__).'/../../config/config.inc.php');
 require_once(dirname(__FILE__).'/../../init.php');
+
+if (substr(Tools::encrypt('blocklayered/index'),0,10) != Tools::getValue('layered_token') || !Module::isInstalled('blocklayered'))
+	die('Bad token');
+
 include(dirname(__FILE__).'/blocklayered.php');

 /* Clean categoryBox before use */
@@ -5,7 +5,7 @@ include(dirname(__FILE__).'/../../init.php');
 include(dirname(__FILE__).'/blocklayered.php');

 if (substr(Tools::encrypt('blocklayered/index'),0,10) != Tools::getValue('token') || !Module::isInstalled('blocklayered'))
-	die;
+	die('Bad token');

 if(Tools::getValue('full'))
 	echo BlockLayered::fullindexProcess((int)Tools::getValue('cursor'), (int)Tools::getValue('ajax'), true);
@@ -0,0 +1,11 @@
+<?php
+
+include(dirname(__FILE__).'/../../config/config.inc.php');
+include(dirname(__FILE__).'/../../init.php');
+include(dirname(__FILE__).'/blocklayered.php');
+
+if (substr(Tools::encrypt('blocklayered/index'),0,10) != Tools::getValue('token') || !Module::isInstalled('blocklayered'))
+	die('Bad token');
+
+$blockLayered = new BlockLayered();
+echo $blockLayered->indexUrl((int)Tools::getValue('id_category'), (int)Tools::getValue('truncate'));
@@ -26,6 +26,8 @@

 var ajaxQueries = new Array();
 var ajaxLoaderOn = 0;
+var sliderList = new Array();
+var slidersInit = false;

 $(document).ready(function()
 {
@@ -54,9 +56,76 @@ $(document).ready(function()
 		  }
 		});
 	paginationButton();
+	initLayered();
 	reloadContent();
 });

+function addSlider(type, data, unit)
+{
+	sliderList.push({
+		type: type,
+		data: data,
+		unit: unit
+	});
+}
+
+function initSliders()
+{
+	$(sliderList).each(function(i, slider){
+		$('#layered_'+slider['type']+'_slider').slider(slider['data']);
+		$('#layered_'+slider['type']+'_range').html($('#layered_'+slider['type']+'_slider').slider('values', 0)+slider['unit']+
+			' - ' + $('#layered_'+slider['type']+'_slider').slider('values', 1 )+slider['unit']);
+	});
+}
+
+function initLayered()
+{
+	initSliders();
+	var params = document.location.toString().split('#');
+	params.shift();
+	$(params).each(function(it, val)
+	{
+		if (val.split('=')[0] == 'price' || val.split('=')[0] == 'weight')
+		{
+			$("#layered_"+val.split('=')[0]+"_slider").slider('values', 0, val.split('=')[1].split('_')[0]);
+			$("#layered_"+val.split('=')[0]+"_slider").slider('values', 1, val.split('=')[1].split('_')[1]);
+			$("#layered_"+val.split('=')[0]+"_slider").slider('option', 'slide')(0,{values:[val.split('=')[1].split('_')[0], val.split('=')[1].split('_')[1]]});
+		}
+		else
+		{
+			$('#'+val.split('=')[0]).click();
+		}
+	});
+}
+
+function updatelink(link)
+{
+	baseUrl = link.split('#');
+	linkFilterUpdate = baseUrl[0]+getValueSelected();
+	return linkFilterUpdate;
+}
+
+function  getValueSelected(){
+	
+	var checkboxChecked = "";
+	$("#layered_form input:checkbox:checked").each(function(){
+		checkboxChecked += '#' + $(this).attr('id')+"="+$(this).val();
+	});
+	$("#layered_form input:hidden").each(function(){
+		checkboxChecked += '#' + $(this).attr('name')+"="+$(this).val();
+	});
+	$(['price','weight']).each(function(i, filter) {
+		if ($("#layered_"+filter+"_slider").length)
+		{
+			if (typeof($("#layered_"+filter+"_slider").slider('values', 0)) != 'object')
+			{
+				checkboxChecked += '#'+filter+'='+$("#layered_"+filter+"_slider").slider('values', 0)+'_'+$("#layered_"+filter+"_slider").slider('values', 1);
+			}
+		}
+	});
+	return checkboxChecked;
+}
+
 function paginationButton() {
 	$('#pagination li').not('.current, .disabled').each( function () {
 		var nbPage = 0;
@@ -82,8 +151,17 @@ function cancelFilter()
 {
 	$('#enabled_filters a').live('click', function(e)
 	{
+		if($(this).attr('rel').search(/_slider$/) > 0)
+		{
+			$('#'+$(this).attr('rel')).slider("values" , 0, $('#'+$(this).attr('rel')).slider( "option" , 'min' ));
+			$('#'+$(this).attr('rel')).slider("values" , 1, $('#'+$(this).attr('rel')).slider( "option" , 'max' ));
+			$('#'+$(this).attr('rel')).slider('option', 'slide')(0,{values:[$('#'+$(this).attr('rel')).slider( "option" , 'min' ), $('#'+$(this).attr('rel')).slider( "option" , 'max' )]});
+		}
+		else
+		{
 		$('#'+$(this).attr('rel')).attr('checked', false);
 		$('#layered_form input[name='+$(this).attr('rel')+']:hidden').remove();
+		}
 		reloadContent();
 		e.preventDefault();
 	});
@@ -110,6 +188,7 @@ function openCloseFilter()

 function reloadContent(params_plus)
 {
+	window.location =  updatelink( window.location.href);
 	for(i = 0; i < ajaxQueries.length; i++)
 		ajaxQueries[i].abort();
 	ajaxQueries = new Array();
@@ -157,6 +236,8 @@ function reloadContent(params_plus)
 			$('#layered_block_left').after('<div id="tmp_layered_block_left"></div>').remove();
 			$('#tmp_layered_block_left').html(result.filtersBlock).attr('id', 'layered_block_left');

+			$('.category-product-count').html(result.categoryCount);
+
 			$('#product_list').html(result.productList).html();
 			$('#product_list').css('opacity', '1');
 			$('div#pagination').html(result.pagination);
@@ -182,6 +263,7 @@ function reloadContent(params_plus)
 			if(typeof(reloadProductComparison) == 'function') {
 				reloadProductComparison();
 		}
+			initSliders();
 		}
 	});
 	ajaxQueries.push(ajaxQuery);
@@ -36,18 +36,19 @@
 					<span class="layered_subtitle" style="float: none;">{l s='Enabled filters:' mod='blocklayered'}</span>
 					<ul>
 					{foreach from=$selected_filters key=filter_type item=filter_values}
-						{foreach from=$filter_values item=filter_value name=f_values}
+						{foreach from=$filter_values key=filter_key item=filter_value name=f_values}
 							{foreach from=$filters item=filter}
 								{if $filter.type == $filter_type && isset($filter.values)}
 									{if isset($filter.slider) && $smarty.foreach.f_values.first}
 										<li>
-											- {$filter.name|escape:html:'UTF-8'}{l s=':'} 
+											<a href="#" rel="layered_{$filter.type}_slider" title="{l s='Cancel' mod='blocklayered'}">x</a>
+											{$filter.name|escape:html:'UTF-8'}{l s=':'} 
 											{$filter.values[0]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'} - 
 											{$filter.values[1]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'}
 										</li>
 									{else}
 										{foreach from=$filter.values key=id_value item=value}
-											{if $id_value == $filter_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'}
 												<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'}
@@ -64,16 +65,20 @@
 				{/if}
 				{foreach from=$filters item=filter}
 					{if isset($filter.values)}
+						{if isset($filter.slider)}
+						<div class="layered_{$filter.type}" style="display: none;">
+						{else}
 					<div>
+						{/if}
 						<span class="layered_subtitle">{$filter.name|escape:html:'UTF-8'}</span>
 						<span class="layered_close"><a href="#" rel="layered_{$filter.type}_{$filter.id_key}">v</a></span>
 						<div class="clear"></div>
-						<ul id="layered_{$filter.type}_{$filter.id_key}">
+						<ul id="ul_layered_{$filter.type}_{$filter.id_key}">
 						{if !isset($filter.slider)}
 							{foreach from=$filter.values key=id_value item=value}
 								<li class="nomargin">
 								{if isset($filter.is_color_group) && $filter.is_color_group}
-									<input type="button" name="layered_{$filter.type_lite}_{$id_value}" rel="{$id_value}_{$filter.id_key}" id="layered_attribute_{$id_value}" {if !$value.nbr} value="X" disabled="disabled"{/if} style="background: {if isset($value.color)}{$value.color}{else}#CCC{/if}; margin-left: 0; width: 16px; height: 16px; padding:0; border: 1px solid {if isset($value.checked) && $value.checked}red{else}#666{/if};" />
+									<input type="button" name="layered_{$filter.type_lite}_{$id_value}" rel="{$id_value}_{$filter.id_key}" id="layered_id_attribute_group_{$id_value}" {if !$value.nbr} value="X" disabled="disabled"{/if} style="background: {if isset($value.color)}{$value.color}{else}#CCC{/if}; margin-left: 0; width: 16px; height: 16px; padding:0; border: 1px solid {if isset($value.checked) && $value.checked}red{else}#666{/if};" />
 									{if isset($value.checked) && $value.checked}<input type="hidden" name="layered_{$filter.type_lite}_{$id_value}" value="{$id_value}" />{/if}
 								{else}
 										<input type="checkbox" class="checkbox" name="layered_{$filter.type_lite}_{$id_value}" id="layered_{$filter.type_lite}{if $id_value || $filter.type == 'quantity'}_{$id_value}{/if}" value="{$id_value}{if $filter.id_key}_{$filter.id_key}{/if}"{if isset($value.checked)} checked="checked"{/if}{if !$value.nbr} disabled="disabled"{/if} /> 
@@ -88,9 +93,7 @@
 							</div>
 							<script type="text/javascript">
 							{literal}
-								$(document).ready(function()
-								{
-									$('#layered_{/literal}{$filter.type}{literal}_slider').slider({
+								addSlider('{/literal}{$filter.type}{literal}',{
 										range: true,
 										min: {/literal}{$filter.min}{literal},
 										max: {/literal}{$filter.max}{literal},
@@ -101,10 +104,11 @@
 										stop: function () {
 											reloadContent();
 										}
+								}, '{/literal}{$filter.unit}{literal}');
+								$(document).ready(function()
+								{
+									$('.layered_{/literal}{$filter.type}{literal}').show();
 									});
-									$('#layered_{/literal}{$filter.type}{literal}_range').html($('#layered_{/literal}{$filter.type}{literal}_slider').slider('values', 0 ) +'{/literal}{$filter.unit}{literal}'+
-										' - ' + $('#layered_{/literal}{$filter.type}{literal}_slider').slider('values', 1 )+'{/literal}{$filter.unit}{literal}');
-								});
 							{/literal}
 							</script>
 						{/if}
@@ -4,34 +4,20 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{blocklayered}prestashop>blocklayered_84241e458cdd5162745500a59a3680f3'] = 'Layered Navigation-Block';
 $_MODULE['<{blocklayered}prestashop>blocklayered_2d08fa8e157fe3f1875402cbd98aee1b'] = 'Zeigt einen Block mit Layered Navigation-Filter an';
-$_MODULE['<{blocklayered}prestashop>blocklayered_7ad3f384bcf30d783b5a6f6c810b4762'] = 'Layered Navigation Datanbank wurde erfolgreich initialisiert';
 $_MODULE['<{blocklayered}prestashop>blocklayered_fe016d3b990c2a9dd72ab6b45892f2ae'] = 'Einstellungen erfolgreich gespeichert';
 $_MODULE['<{blocklayered}prestashop>blocklayered_09da2b6f1217055bb22caa6ea08d9b80'] = 'Layered Navigation';
-$_MODULE['<{blocklayered}prestashop>blocklayered_382a0cf3c7ea26e9c7d0642d6d0ec07d'] = 'Das Modul ist noch in der Beta Version und wird weiter entwickelt';
-$_MODULE['<{blocklayered}prestashop>blocklayered_016d6031144c99f759b36c5e00c79e91'] = '10 weitere Neuerungen';
-$_MODULE['<{blocklayered}prestashop>blocklayered_b77ae7b3f227f97fdbfbaee819c048d6'] = 'Echtzeit-Aktualisierung der Cache-Tabelle';
-$_MODULE['<{blocklayered}prestashop>blocklayered_3cd881c5805a5564b080022968081652'] = 'Zusätzliche Filter (Preise, Gewicht)';
-$_MODULE['<{blocklayered}prestashop>blocklayered_f67587ba40eff59a15796352c9037ddf'] = 'Fähigkeit, Filter nach Kategorie in der Modulkonfiguration zu verwalten ';
-$_MODULE['<{blocklayered}prestashop>blocklayered_559175435fec02f846564385b20b98e2'] = 'Fähigkeit, Filtergruppen zu verbergen, die keine Werte und Filter-Werte mit 0 Produkten haben';
-$_MODULE['<{blocklayered}prestashop>blocklayered_abb461f7d4d8271a12ceead064d13cd0'] = 'Statistik und Analyse';
-$_MODULE['<{blocklayered}prestashop>blocklayered_6af4dd46928a781eda42b940d3394ca6'] = 'Produktsortierung & Paginierung verwalten ';
-$_MODULE['<{blocklayered}prestashop>blocklayered_b4ecb2bd1ea5153550669329db53277d'] = 'Kontrolle zur Kategorie-Gruppentabelle hinzufügen';
-$_MODULE['<{blocklayered}prestashop>blocklayered_d99bf479cc40101e28f1f0ba1bfb6150'] = 'SEO Links & Echtzeit URL einrichten (Fähigkeit, die URL jemandem zu geben)';
-$_MODULE['<{blocklayered}prestashop>blocklayered_27c7b93d882068a1137a9350c7f1a132'] = 'Weitere Optionen zur Modul-Konfiguration hinzufügen';
-$_MODULE['<{blocklayered}prestashop>blocklayered_fb8082696a8d7a40fa62ea0e89b18c32'] = 'Leistungsverbesserungen';
 $_MODULE['<{blocklayered}prestashop>blocklayered_af1b98adf7f686b84cd0b443e022b7a0'] = 'Kategorien';
-$_MODULE['<{blocklayered}prestashop>blocklayered_9e2941b3c81256fac10392aaca4ccfde'] = 'Zustand';
+$_MODULE['<{blocklayered}prestashop>blocklayered_8524de963f07201e5c086830d370797f'] = 'Lädt...';
+$_MODULE['<{blocklayered}prestashop>blocklayered_8c489d0946f66d17d73f26366a4bf620'] = 'Gewicht';
 $_MODULE['<{blocklayered}prestashop>blocklayered_03c2e7e41ffc181a4e84080b4710e81e'] = 'Neu';
 $_MODULE['<{blocklayered}prestashop>blocklayered_019d1ca7d50cc54b995f60d456435e87'] = 'Gebraucht';
 $_MODULE['<{blocklayered}prestashop>blocklayered_6da03a74721a0554b7143254225cc08a'] = 'Überholt';
-$_MODULE['<{blocklayered}prestashop>blocklayered_faeaec9eda6bc4c8cb6e1a9156a858be'] = 'Verfügbarkeit';
-$_MODULE['<{blocklayered}prestashop>blocklayered_fcebe56087b9373f15514831184fa572'] = 'Auf Lager';
+$_MODULE['<{blocklayered}prestashop>blocklayered_9e2941b3c81256fac10392aaca4ccfde'] = 'Zustand';
 $_MODULE['<{blocklayered}prestashop>blocklayered_2d25c72c1b18e562f6654fff8e11711e'] = 'Nicht verfügbar';
+$_MODULE['<{blocklayered}prestashop>blocklayered_fcebe56087b9373f15514831184fa572'] = 'Auf Lager';
+$_MODULE['<{blocklayered}prestashop>blocklayered_faeaec9eda6bc4c8cb6e1a9156a858be'] = 'Verfügbarkeit';
 $_MODULE['<{blocklayered}prestashop>blocklayered_c0bd7654d5b278e65f21cf4e9153fdb4'] = 'Hersteller';
-$_MODULE['<{blocklayered}prestashop>blocklayered_8c489d0946f66d17d73f26366a4bf620'] = 'Gewicht';
 $_MODULE['<{blocklayered}prestashop>blocklayered_c32516babc5b6c47eb8ce1bfc223253c'] = 'Katalog';
 $_MODULE['<{blocklayered}prestashop>blocklayered_1262d1b9fbffb3a8e85ac9e4b449e989'] = 'Aktivierte Filter:';
 $_MODULE['<{blocklayered}prestashop>blocklayered_853ae90f0351324bd73ea615e6487517'] = ':';
 $_MODULE['<{blocklayered}prestashop>blocklayered_ea4788705e6873b424c65e91c2846b19'] = 'Abbrechen';
-$_MODULE['<{blocklayered}prestashop>blocklayered_87ba2ecc8b6915e8bd6f5089918229fd'] = 'Bereich';
-$_MODULE['<{blocklayered}prestashop>blocklayered_8524de963f07201e5c086830d370797f'] = 'Lädt...';
@@ -4,13 +4,10 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{blocklayered}prestashop>blocklayered_84241e458cdd5162745500a59a3680f3'] = 'Bloc navigation à facettes';
 $_MODULE['<{blocklayered}prestashop>blocklayered_2d08fa8e157fe3f1875402cbd98aee1b'] = 'Affiche un bloc avec les filtres de la navigation à facettes';
-$_MODULE['<{blocklayered}prestashop>blocklayered_1b90c001d668d0ec894392d8e6695054'] = 'Vous devez activer l\'extension cURL sur votre serveur si vous désirez utiliser des liens courts.';
-$_MODULE['<{blocklayered}prestashop>blocklayered_7ad3f384bcf30d783b5a6f6c810b4762'] = 'La base de données de la navigation à facettes à été initialisée avec succès';
 $_MODULE['<{blocklayered}prestashop>blocklayered_817c37b9c1f5cd4a450dad384e63e6c7'] = 'Votre filtre';
 $_MODULE['<{blocklayered}prestashop>blocklayered_3185cefd67b575e582063148e4f15860'] = 'a été mis à jour avec succès.';
 $_MODULE['<{blocklayered}prestashop>blocklayered_7ccab4d8de5d6b9bb61e99c7bba343ab'] = 'a été ajouté avec succès.';
 $_MODULE['<{blocklayered}prestashop>blocklayered_fe016d3b990c2a9dd72ab6b45892f2ae'] = 'Paramètres enregistrés avec succès';
-$_MODULE['<{blocklayered}prestashop>blocklayered_bb291cb01196158549fba8f6fe636d4a'] = 'Paramètres non enregistré:';
 $_MODULE['<{blocklayered}prestashop>blocklayered_4ad0f0fe31d93e0d8dd7a7fc69a72784'] = 'Modèle de filtres supprimé, catégories mises à jour (Modèle par défaut appliqué).';
 $_MODULE['<{blocklayered}prestashop>blocklayered_91e77d047f2496b7ba8c9def96d03324'] = 'Modèle de filtres non trouvé';
 $_MODULE['<{blocklayered}prestashop>blocklayered_09da2b6f1217055bb22caa6ea08d9b80'] = 'Navigation à facettes';
@@ -54,16 +51,16 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_93cba07454f06a4a960172bbd6e2a43
 $_MODULE['<{blocklayered}prestashop>blocklayered_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non';
 $_MODULE['<{blocklayered}prestashop>blocklayered_8531c73de81b9ed94322dda7cf947daa'] = 'Afficher le nombre de produits qui correspondent';
 $_MODULE['<{blocklayered}prestashop>blocklayered_cf565402d32b79d33f626252949a6941'] = 'Configuration enregistré';
-$_MODULE['<{blocklayered}prestashop>blocklayered_9e2941b3c81256fac10392aaca4ccfde'] = 'Etat';
+$_MODULE['<{blocklayered}prestashop>blocklayered_3601146c4e948c32b6424d2c0a7f0118'] = 'Prix';
+$_MODULE['<{blocklayered}prestashop>blocklayered_8c489d0946f66d17d73f26366a4bf620'] = 'Poids';
 $_MODULE['<{blocklayered}prestashop>blocklayered_03c2e7e41ffc181a4e84080b4710e81e'] = 'Neuf';
 $_MODULE['<{blocklayered}prestashop>blocklayered_019d1ca7d50cc54b995f60d456435e87'] = 'Occasion';
 $_MODULE['<{blocklayered}prestashop>blocklayered_6da03a74721a0554b7143254225cc08a'] = 'Reconditionné';
-$_MODULE['<{blocklayered}prestashop>blocklayered_faeaec9eda6bc4c8cb6e1a9156a858be'] = 'Disponibilité';
-$_MODULE['<{blocklayered}prestashop>blocklayered_fcebe56087b9373f15514831184fa572'] = 'En stock';
+$_MODULE['<{blocklayered}prestashop>blocklayered_9e2941b3c81256fac10392aaca4ccfde'] = 'Etat';
 $_MODULE['<{blocklayered}prestashop>blocklayered_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible';
+$_MODULE['<{blocklayered}prestashop>blocklayered_fcebe56087b9373f15514831184fa572'] = 'En stock';
+$_MODULE['<{blocklayered}prestashop>blocklayered_faeaec9eda6bc4c8cb6e1a9156a858be'] = 'Disponibilité';
 $_MODULE['<{blocklayered}prestashop>blocklayered_c0bd7654d5b278e65f21cf4e9153fdb4'] = 'Fabricant';
-$_MODULE['<{blocklayered}prestashop>blocklayered_8c489d0946f66d17d73f26366a4bf620'] = 'Poids';
-$_MODULE['<{blocklayered}prestashop>blocklayered_3601146c4e948c32b6424d2c0a7f0118'] = 'Prix';
 $_MODULE['<{blocklayered}prestashop>blocklayered_308edffd52afae39cc6277e246ec5df8'] = 'Filtres disponibles';
 $_MODULE['<{blocklayered}prestashop>blocklayered_cfbc982f8fb7a0cc3abb3c85c795ab41'] = 'Filtre sous-catégories';
 $_MODULE['<{blocklayered}prestashop>blocklayered_cd50ff1c5332f9920acf8173c4aab425'] = 'Filtre stock du produit';
@@ -5,7 +5,10 @@ if (file_exists($configPath))
 {
 	include('../../../config/config.inc.php');
 	if (!Tools::getValue('token') || Tools::getValue('token') != Configuration::get('EBAY_SECURITY_TOKEN'))
-		die('ERROR :X');
+		die('ERROR : INVALID TOKEN');
+
+	// Fix for limit db sql request in time
+	sleep(1);

 	$currentPath = Db::getInstance()->getRow('
 	SELECT ecc.`id_ebay_category`, ec.`id_category_ref`, ec.`id_category_ref_parent`, ec.`level`
@@ -1086,7 +1086,8 @@ class eBayRequest
 		if (isset($this->response->OrderArray))
 			foreach ($this->response->OrderArray->Order as $order)
 			{
-				$name = explode(' ', (string)$order->ShippingAddress->Name);
+				$name = str_replace(array('_', ',', '  '), array('', '', ' '), (string)$order->ShippingAddress->Name); 
+				$name = explode(' ', $name);
 				$itemList = array();
 				for ($i = 0; isset($order->TransactionArray->Transaction[$i]); $i++)
 				{
@@ -359,8 +359,8 @@ class Ebay extends Module
 							$id_customer = (int)Db::getInstance()->getValue('SELECT `id_customer` FROM `'._DB_PREFIX_.'customer` WHERE `active` = 1 AND `email` = \''.pSQL($order['email']).'\' AND `deleted` = 0'.(substr(_PS_VERSION_, 0, 3) == '1.3' ? '' : ' AND `is_guest` = 0'));

 							// Check for empty name
-							$order['firstname'] = str_replace('_', '', trim($order['firstname']));
-							$order['familyname'] = str_replace('_', '', trim($order['familyname']));
+							$order['firstname'] = trim($order['firstname']);
+							$order['familyname'] = trim($order['familyname']);
 							if (empty($order['familyname']))
 								$order['familyname'] = $order['firstname'];
 							if (empty($order['firstname']))
@@ -966,6 +966,7 @@ class Ebay extends Module
 			function loadCategoryMatch(id_category)
 			{
 				$.ajax({
+				  async: false,
 				  url: "'._MODULE_DIR_.'ebay/ajax/loadCategoryMatch.php?token='.Configuration::get('EBAY_SECURITY_TOKEN').'&id_category=" + id_category + "&time='.pSQL(date('Ymdhis')).'",
 				  success: function(data) { $("#categoryPath" + id_category).html(data); }
 				});
@@ -2,7 +2,7 @@
 <module>
 	<name>fedexcarrier</name>
 	<displayName><![CDATA[Fedex Carrier]]></displayName>
-	<version><![CDATA[1.1]]></version>
+	<version><![CDATA[1.2]]></version>
 	<description><![CDATA[Offer your customers, different delivery methods with Fedex]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[shipping_logistics]]></tab>
@@ -56,7 +56,7 @@ class FedexCarrier extends CarrierModule
 	{
 		$this->name = 'fedexcarrier';
 		$this->tab = 'shipping_logistics';
-		$this->version = '1.1';
+		$this->version = '1.2';
 		$this->author = 'PrestaShop';
 		$this->limited_countries = array('us');

@@ -1636,7 +1636,7 @@ class FedexCarrier extends CarrierModule

 		// Enable Php Soap
 		ini_set("soap.wsdl_cache_enabled", "0");
-		$client = new SoapClient($dir.'/RateService_v9.wsdl', array('trace' => 1)); // Refer to http://us3.php.net/manual/en/ref.soap.php for more information
+		$client = new SoapClient($dir.'/RateService_v10.wsdl', array('trace' => 1)); // Refer to http://us3.php.net/manual/en/ref.soap.php for more information

 		// Country / State
 		$shipper_country = Db::getInstance()->getRow('SELECT `iso_code` FROM `'._DB_PREFIX_.'country` WHERE `id_country` = '.(int)(Configuration::get('FEDEX_CARRIER_COUNTRY')));
@@ -1645,8 +1645,8 @@ class FedexCarrier extends CarrierModule
 		// Generating soap request
 		$request['WebAuthenticationDetail']['UserCredential'] = array('Key' => Configuration::get('FEDEX_CARRIER_API_KEY'), 'Password' => Configuration::get('FEDEX_CARRIER_PASSWORD')); 
 		$request['ClientDetail'] = array('AccountNumber' => Configuration::get('FEDEX_CARRIER_ACCOUNT'), 'MeterNumber' => Configuration::get('FEDEX_CARRIER_METER'));
-		$request['TransactionDetail'] = array('CustomerTransactionId' => ' *** Rate Available Services Request v9 using PHP ***');
-		$request['Version'] = array('ServiceId' => 'crs', 'Major' => '9', 'Intermediate' => '0', 'Minor' => '0');
+		$request['TransactionDetail'] = array('CustomerTransactionId' => ' *** Rate Available Services Request v10 using PHP ***');
+		$request['Version'] = array('ServiceId' => 'crs', 'Major' => '10', 'Intermediate' => '0', 'Minor' => '0');
 		$request['ReturnTransitAndCommit'] = true;
 		$request['RequestedShipment']['DropoffType'] = Configuration::get('FEDEX_CARRIER_PICKUP_TYPE'); // valid values REGULAR_PICKUP, REQUEST_COURIER, ...
 		$request['RequestedShipment']['ShipTimestamp'] = date('c');
@@ -1659,9 +1659,8 @@ class FedexCarrier extends CarrierModule
 		$request['RequestedShipment']['ShippingChargesPayment'] = array('PaymentType' => 'SENDER', 'Payor' => array('AccountNumber' => Configuration::get('FEDEX_CARRIER_ACCOUNT'), 'CountryCode' => 'US'));
 		$request['RequestedShipment']['RateRequestTypes'] = 'ACCOUNT'; 
 		$request['RequestedShipment']['RateRequestTypes'] = 'LIST'; 
-		$request['RequestedShipment']['PackageCount'] = '2';
-		$request['RequestedShipment']['PackageDetail'] = 'INDIVIDUAL_PACKAGES';
-		$request['RequestedShipment']['RequestedPackageLineItems'] = array('0' => array('Weight' => array('Value' => 2.0, 'Units' => 'LB'), 'Dimensions' => array('Length' => 10, 'Width' => 10, 'Height' => 3, 'Units' => 'IN')));
+		$request['RequestedShipment']['PackageCount'] = '1';
+		$request['RequestedShipment']['RequestedPackageLineItems'] = array('0' => array('SequenceNumber' => 1, 'GroupPackageCount' => 1, 'Weight' => array('Value' => 2.0, 'Units' => 'LB'), 'Dimensions' => array('Length' => 10, 'Width' => 10, 'Height' => 3, 'Units' => 'IN')));


 		// Unit or Large Test
@@ -1683,7 +1682,10 @@ class FedexCarrier extends CarrierModule
 			if ($resultTabTmp)
 				$resultTab = unserialize($resultTabTmp);
 			else
-				$resultTab = $client->getRates($request);
+			{
+				try { $resultTab = $client->getRates($request); }
+				catch (Exception $e) { }				
+			}

 			// Cache test result
 			if (empty($resultTabTmp) && isset($resultTab->HighestSeverity) && ($resultTab->HighestSeverity == 'SUCCESS' OR $resultTab->HighestSeverity == 'ERROR'))
@@ -1722,7 +1724,7 @@ class FedexCarrier extends CarrierModule

 		// Enable Php Soap
 		ini_set("soap.wsdl_cache_enabled", "0");
-		$client = new SoapClient($dir.'/RateService_v9.wsdl', array('trace' => 1)); // Refer to http://us3.php.net/manual/en/ref.soap.php for more information
+		$client = new SoapClient($dir.'/RateService_v10.wsdl', array('trace' => 1)); // Refer to http://us3.php.net/manual/en/ref.soap.php for more information

 		// Country / State
 		$shipper_country = Db::getInstance()->getRow('SELECT `iso_code` FROM `'._DB_PREFIX_.'country` WHERE `id_country` = '.(int)(Configuration::get('FEDEX_CARRIER_COUNTRY')));
@@ -1731,8 +1733,8 @@ class FedexCarrier extends CarrierModule
 		// Generating soap request
 		$request['WebAuthenticationDetail']['UserCredential'] = array('Key' => Configuration::get('FEDEX_CARRIER_API_KEY'), 'Password' => Configuration::get('FEDEX_CARRIER_PASSWORD')); 
 		$request['ClientDetail'] = array('AccountNumber' => Configuration::get('FEDEX_CARRIER_ACCOUNT'), 'MeterNumber' => Configuration::get('FEDEX_CARRIER_METER'));
-		$request['TransactionDetail'] = array('CustomerTransactionId' => ' *** Rate Available Services Request v9 using PHP ***');
-		$request['Version'] = array('ServiceId' => 'crs', 'Major' => '9', 'Intermediate' => '0', 'Minor' => '0');
+		$request['TransactionDetail'] = array('CustomerTransactionId' => ' *** Rate Available Services Request v10 using PHP ***');
+		$request['Version'] = array('ServiceId' => 'crs', 'Major' => '10', 'Intermediate' => '0', 'Minor' => '0');
 		$request['ReturnTransitAndCommit'] = true;
 		$request['RequestedShipment']['DropoffType'] = Configuration::get('FEDEX_CARRIER_PICKUP_TYPE'); // valid values REGULAR_PICKUP, REQUEST_COURIER, ...
 		$request['RequestedShipment']['ShipTimestamp'] = date('c');
@@ -1746,14 +1748,22 @@ class FedexCarrier extends CarrierModule
 		$request['RequestedShipment']['RateRequestTypes'] = 'ACCOUNT'; 
 		$request['RequestedShipment']['RateRequestTypes'] = 'LIST'; 
 		$request['RequestedShipment']['PackageCount'] = '2';
-		$request['RequestedShipment']['PackageDetail'] = 'INDIVIDUAL_PACKAGES';
+		$count = 1;
 		foreach ($wsParams['package_list'] as $p)
-			$request['RequestedShipment']['RequestedPackageLineItems'][] = array('Weight' => array('Value' => $p['weight'], 'Units' => substr($this->_weightUnit, 0, 2)), 'Dimensions' => array('Length' => $p['depth'], 'Width' => $p['width'], 'Height' => $p['height'], 'Units' => $this->_dimensionUnit));
+		{
+			$request['RequestedShipment']['RequestedPackageLineItems'][] = array(
+				'SequenceNumber' => $count,
+				'GroupPackageCount' => $count,
+				'Weight' => array('Value' => $p['weight'], 'Units' => substr($this->_weightUnit, 0, 2)),
+				'Dimensions' => array('Length' => $p['depth'], 'Width' => $p['width'], 'Height' => $p['height'], 'Units' => $this->_dimensionUnit));
+			$count++;
+		}
 		$request['RequestedShipment']['PackageCount'] = count($request['RequestedShipment']['RequestedPackageLineItems']);


 		// Get Rates
-		$resultTab = $client->getRates($request);
+		try { $resultTab = $client->getRates($request); }
+		catch (Exception $e) { return array('connect' => false, 'cost' => 0); }


 		// Check currency
@@ -152,7 +152,8 @@ class GAnalytics extends Module
 	function hookHeader($params)
 	{
 		// hookOrderConfirmation() already send the sats bypass this step
-		if (strpos($_SERVER['REQUEST_URI'], __PS_BASE_URI__.'order-confirmation.php') === 0) return '';
+		if (strpos($_SERVER['REQUEST_URI'], __PS_BASE_URI__.'order-confirmation.php') === 0)
+			return '';
 	
 		// Otherwise, create Google Analytics stats
 		$ganalytics_id = Configuration::get('GANALYTICS_ID');
@@ -169,7 +170,8 @@ class GAnalytics extends Module
 	function hookFooter($params)
 	{
 		// for retrocompatibility
-		if (!$this->isRegisteredInHook('header')) $this->registerHook('header');
+		if (!$this->isRegisteredInHook('header'))
+			$this->registerHook('header');
 		return ;
 	}

@@ -191,7 +193,8 @@ class GAnalytics extends Module
 			}

 			// Order general information
-		$trans = array('id' => intval($order->id),				// order ID - required
+			$trans = array(
+				'id' => intval($order->id),				// order ID - required
 						'store' => htmlentities(Configuration::get('PS_SHOP_NAME')), // affiliation or store name
 						'total' => Tools::ps_round(floatval($order->total_paid) / floatval($conversion_rate), 2),		// total - required
 						'tax' => '0', // tax
@@ -210,7 +213,8 @@ class GAnalytics extends Module
 								WHERE `id_product` = '.intval($product['product_id']).' AND `id_category_default` = `id_category` 
 								AND `id_lang` = '.intval($parameters['PS_LANG_DEFAULT']));
 				
-				$items[] = array('OrderId' => intval($order->id),				// order ID - required
+				$items[] = array(
+					'OrderId' => intval($order->id),								// order ID - required
 								'SKU' => addslashes($product['product_id']),		// SKU/code - required
 								'Product' => addslashes($product['product_name']),		// product name
 								'Category' => addslashes($category['name']),			// category or variation
@@ -219,11 +223,10 @@ class GAnalytics extends Module
 								);
 			}
 			$ganalytics_id = Configuration::get('GANALYTICS_ID');
-			$pageTrack = (strpos($_SERVER['REQUEST_URI'], __PS_BASE_URI__.'order.php') === 0 ? '/order/step'.intval($step).'.html' : '');
+
 			$this->context->smarty->assign('items', $items);
 			$this->context->smarty->assign('trans', $trans);
 			$this->context->smarty->assign('ganalytics_id', $ganalytics_id);
-			$this->context->smarty->assign('pageTrack', $pageTrack);
 			$this->context->smarty->assign('isOrder', true);
 			return $this->display(__FILE__, 'header.tpl');
 		}
@@ -1,7 +1,7 @@
 <script type="text/javascript">
 var _gaq = _gaq || [];
 _gaq.push(['_setAccount', '{$ganalytics_id}']);
-_gaq.push(['_trackPageview', '{$pageTrack}']);
+{if isset($pageTrack)}_gaq.push(['_trackPageview', '{$pageTrack}']);{/if}
 _gaq.push(['_trackPageLoadTime']);
 {if $isOrder eq true}		{* If it's an order we need more data for stats *}
  _gaq.push(['_addTrans',
@@ -24,8 +24,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Nei
 $_MODULE['<{loyalty}prestashop>loyalty_ade45d72ab6ba1ab576d8b9deb0c2438'] = 'Punkte werden vergeben, wenn die Bestellung';
 $_MODULE['<{loyalty}prestashop>loyalty_9611a682e61c503c32e2dc58fdbc8ddf'] = 'Punkte werden gelöscht, wenn die Bestellung';
 $_MODULE['<{loyalty}prestashop>loyalty_2a46cccdea2f18fdfdfacf99a98b758d'] = 'Gutscheine, die vom Treue-System erstellt wurden, können in den folgenden Kategorien verwendet werden:';
-$_MODULE['<{loyalty}prestashop>loyalty_b718adec73e04ce3ec720dd11a06a308'] = 'ID';
-$_MODULE['<{loyalty}prestashop>loyalty_49ee3087348e8d44e1feda1917443987'] = 'Name';
+$_MODULE['<{loyalty}prestashop>loyalty_8cf04a9734132302f96da8e113e80ce5'] = 'Start';
 $_MODULE['<{loyalty}prestashop>loyalty_c2a7db7dec4de1bdb143ccd790f5a62c'] = 'Markieren Sie alle Kontrollkästchen der Kategorien, in denen Treue-Gutscheine nutzbar sind';
 $_MODULE['<{loyalty}prestashop>loyalty_30e793698766edbaaf84a74d4c377f72'] = 'Treuepunkte-Fortschritt';
 $_MODULE['<{loyalty}prestashop>loyalty_4f2a91e15af2631ff9424564b8a45fb2'] = 'Ursprünglich';
@@ -80,7 +79,6 @@ $_MODULE['<{loyalty}prestashop>loyalty_a16cf3ec5200cc519f4fe48e34b1df83'] = 'Die
 $_MODULE['<{loyalty}prestashop>loyalty_8e69341aca5dbf9f55c2e75a2ed5df3c'] = 'Noch keine Gutscheine.';
 $_MODULE['<{loyalty}prestashop>loyalty_00d56a5e37c19c59d521530fc8e7f337'] = 'Noch keine Bonuspunkte.';
 $_MODULE['<{loyalty}prestashop>loyalty_0b3db27bc15f682e92ff250ebb167d4b'] = 'Zurück zu Ihrem Konto';
-$_MODULE['<{loyalty}prestashop>loyalty_8cf04a9734132302f96da8e113e80ce5'] = 'Start';
 $_MODULE['<{loyalty}prestashop>my-account_c540093e64d84440025b2d8201f04336'] = 'Meine Treuepunkte';
 $_MODULE['<{loyalty}prestashop>product_ded9088edfbcc1041c3a642b031c8f72'] = 'Treueprogramm';
 $_MODULE['<{loyalty}prestashop>product_08ef6b34ab8e7039ef0ee69378f0ac0b'] = 'Sammeln Sie mit dem Kauf dieses Produktes Sie bis zu';
@@ -33,12 +33,10 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_cb5e100e5a9a3e7f6d1fd9751221528
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_350c1cc4343826a89f08a33bb49c6d98'] = 'Mondial Relay Bewertungsmodul konfigurieren';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_d21a9f93917604d5490ad529a7cf1ff9'] = 'So erstellen Sie eine Mondial Relay Lieferanten';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_c6a2e6af5fff47adb3afd780b97d9b4b'] = 'Geben Sie Ihre Mondial Relay-Konto-Einstellungen ein und speichern Sie sie';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_abfc836cd1df9d6d2bdfd2fc98e6fa93'] = 'Erstellen Sie einen Lieferanten';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_b962d8fb95f5a439f50502152f3bad71'] = 'Definieren Sie einen Preis für Ihren Lieferanten auf';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_faf1247ae6846a9955a466d4f301bbe4'] = 'Der Lieferanten-Seite';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_10d78806b84b97ebc774e9f6277af6ac'] = 'Um Labels zu generieren, müssen Sie eine gültige und registrierte Adresse Ihres Shops auf Ihrer';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_af5efea250326c1c34d69aa9364b482c'] = 'Kontakt-Seite haben';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_fcf5b2122da1d5a5f5c7253b96a3f9d9'] = 'URL Cron Task:';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_362dff77f7403550e886db901404856c'] = 'Löschen erfolgreich';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_66661dacf33146201b60dc16520ddd68'] = 'Fügen Sie eine Versandart hinzu';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_b651efdb98a5d6bd2b3935d0c3f4a5e2'] = 'Erforderlich';
@@ -66,17 +64,12 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_907eba32d950bfab68227fd7ea22999
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_0c24ec05a02c710cedd400e3680d8b81'] = 'Versandart-Liste';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_14039af96b01e718a9c9d9c1259b6472'] = 'Keine Versandmethoden erstellt';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_8596361cec00f8d2438d264827eee737'] = 'Versand konfigurieren';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_fcf5b2122da1d5a5f5c7253b96a3f9d9'] = 'URL Cron Task:';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_f4f70727dc34561dfde1a3c529b6205c'] = 'Einstellungen';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_d02bbc3cb147c272b0445ac5ca7d1a36'] = 'Bestellstatus';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_818f954f4838ecad839c5dcbd287d291'] = 'Wählen Sie den Bestellstatus für Marken. Sie können die Marken auf';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_5117e194c641ad4fc55417b554aead3c'] = 'der Mondial Relay Verwaltungsseite verwalten';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_235072af42d72915159f0e6c9d6a870c'] = 'Google map';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Aktiviert';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_93cba07454f06a4a960172bbd6e2a435'] = 'Ja';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_b9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Nein';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_9c5c09beb32c36129b857c2a40c861b6'] = 'Anzeige einer Google-Karte auf Ihre Mondial Relay Lieferantenseite, kann das Laden der Lieferantenseite verlangsameN';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_1ba3935c9858ffb8e19a35ca640b8505'] = 'Mondial Relay Kontoeinstellungen';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_12a3fbd35c1cab4b1101b91d708efd15'] = 'mr_marke_WebService:';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_6f0434b67007b555dfd1201f4e0d5254'] = 'mr_code_marke:';
@@ -104,12 +97,3 @@ $_MODULE['<{mondialrelay}prestashop>mrgettickets_ea5f761be4e4888eabf4e1501d7817d
 $_MODULE['<{mondialrelay}prestashop>mrgettickets_2653c23b8c0daac59571e4be5e8fa7d0'] = 'Der Webservice von Mondial Relay ist zu r Zeit nicht erreichbar';
 $_MODULE['<{mondialrelay}prestashop>mrmanagement_a42bb0eaa485682166770a54469385f6'] = 'Einige Einträge konnten nicht entfernt werden, bitte versuchen Sie es noch einmal.';
 $_MODULE['<{mondialrelay}prestashop>mrmanagement_11744bfebb33e52be37a66a530b7045d'] = 'Bitte wählen Sie mindestens ein Verlaufselement aus';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_03f4a47830f97377a35321051685071e'] = 'Geschlossen';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_6f8522e0610541f1ef215a22ffa66ff6'] = 'Montag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_5792315f09a5d54fb7e3d066672b507f'] = 'Dienstag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_796c163589f295373e171842f37265d5'] = 'Mitwoch';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_78ae6f0cd191d25147e252dc54768238'] = 'Donnerstag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_c33b138a163847cdb6caeeb7c9a126b4'] = 'Freitag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_8b7051187b9191cdcdae6ed5a10e5adc'] = 'Samstag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_9d1a0949c39e66a0cd65240bc0ac9177'] = 'Sonntag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_621895c388c9bb22abbbc69fad001846'] = 'Wählen Sie ein Relay Point aus';
@@ -87,7 +87,6 @@ $_MODULE['<{referralprogram}prestashop>referralprogram_edf7f0a17b8a8f1732f12856f
 $_MODULE['<{referralprogram}prestashop>referralprogram_8465d83b5c1b569299af284c14d957bb'] = 'Gutscheinbeschreibung:';
 $_MODULE['<{referralprogram}prestashop>referralprogram_b17f3f4dcf653a5776792498a9b44d6a'] = 'Einstellungen aktualisieren';
 $_MODULE['<{referralprogram}prestashop>referralprogram_562ad64cf21ac2da656134355115133d'] = 'Ihr Text ist leer.';
-$_MODULE['<{referralprogram}prestashop>referralprogram_01705c0177ebf5fbcbf4e882bc454405'] = 'Referral Programm Regeln';
 $_MODULE['<{referralprogram}prestashop>referralprogram_c5afb9c76a7880978cba32872d01f068'] = 'Aktualisieren Sie den Text';
 $_MODULE['<{referralprogram}prestashop>referralprogram_6b31baf25848e7a6563ecc3946626c80'] = 'Referral Programm';
 $_MODULE['<{referralprogram}prestashop>referralprogram_7790d51a3d62c85aae65464dee12ee8b'] = 'Kundensponsor:';
@@ -59,11 +59,6 @@ $_MODULE['<{shopimporter}prestashop>shopimporter_60474e812295a5adc371de63dc62a16
 $_MODULE['<{shopimporter}prestashop>shopimporter_05f4be265d59ea66f3a1fb12ba103583'] = 'Wählen Sie Ihren Import';
 $_MODULE['<{shopimporter}prestashop>shopimporter_961f2247a2070bedff9f9cd8d64e2650'] = 'Wählen';
 $_MODULE['<{shopimporter}prestashop>shopimporter_151a0fbfcc4894aa53335091c2512de5'] = 'Kein Import-Modul installiert';
-$_MODULE['<{shopimporter}prestashop>shopimporter_9aa1b03934893d7134a660af4204f2a9'] = 'Server';
-$_MODULE['<{shopimporter}prestashop>shopimporter_8f9bfe9d1345237cb3b2b205864da075'] = 'Benutzer';
-$_MODULE['<{shopimporter}prestashop>shopimporter_dc647eb65e6711e155375218212b3964'] = 'Kennwort';
-$_MODULE['<{shopimporter}prestashop>shopimporter_e307db07b3975fef922a80d07455ee5e'] = 'Datenbank';
-$_MODULE['<{shopimporter}prestashop>shopimporter_dac130bdd2c5492a8108a4145bd9f04a'] = 'Datenbank-Präfix';
 $_MODULE['<{shopimporter}prestashop>shopimporter_2bb4cbbf4c51025867d47131e79ad05f'] = 'Nächster Schritt';
 $_MODULE['<{shopimporter}prestashop>shopimporter_72dd98a453e92ccc01697f29bb5dbeb9'] = 'Import-Optionen';
 $_MODULE['<{shopimporter}prestashop>shopimporter_9dfc5d5738312210c3c75e68a468691d'] = 'Advanced-Optionen';
@@ -57,7 +57,6 @@ $_MODULE['<{socolissimo}prestashop>socolissimo_00d23a76e43b46dae9ec7aa9dcbebb32'
 $_MODULE['<{socolissimo}prestashop>socolissimo_b9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert';
 $_MODULE['<{socolissimo}prestashop>socolissimo_fdd526b84abc0b8fc17060e62d022b84'] = 'Verfügbarkeit von Service SoColissimo erlauben oder nicht erlauben ';
 $_MODULE['<{socolissimo}prestashop>socolissimo_32996bdf4214d6cb8bf7fa02273813c8'] = 'URL Kontrolle';
-$_MODULE['<{socolissimo}prestashop>socolissimo_995a56aecac4198b9bc0a17a976561b5'] = 'URL der Kontrolle';
 $_MODULE['<{socolissimo}prestashop>socolissimo_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern';
 $_MODULE['<{socolissimo}prestashop>socolissimo_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Information';
 $_MODULE['<{socolissimo}prestashop>socolissimo_3e387f5ebd657c6372f0594c8226863e'] = 'Hier sind zwei Adressen, die Sie in Ihrem Back Office SoColissimo ausfüllen müssen ';
@@ -4,7 +4,6 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_fff01a1de50e0559f82501a927654d1b'] = 'Import / Export eines Themas';
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_83ebbd7865677d356ffde5ad7e12784f'] = 'Exportieren oder installieren Sie ein Thema und seine Module auf Ihren Shop';
-$_MODULE['<{themeinstallator}prestashop>themeinstallator_e10ed1f81b51bd4c7f86eeb84bcd1359'] = 'zip ist nicht auf Ihrem Server installiert. Erkundigen Sie sich bei Ihrem Provider.';
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_25b9e1d82d8200d70be2b22a1a283957'] = 'Ein Fehler ist beim Hochladen der Datei aufgetreten.';
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_050991b5b76aad0be75563b7cb93a33e'] = 'Nur zip-Dateien sind erlaubt';
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_57c1ed81b02e5d3361323c7930897295'] = 'Ein Fehler ist beim Kopieren der Datei aufgetreten.';
@@ -2,7 +2,7 @@
 <module>
 	<name>trustedshops</name>
 	<displayName><![CDATA[Trusted Shops trust solutions]]></displayName>
-	<version><![CDATA[1.3]]></version>
+	<version><![CDATA[1.3.1]]></version>
 	<description><![CDATA[Build confidence in your online shop with the Trusted Shops quality seal, buyer protection and customer rating.]]></description>
 	<author><![CDATA[]]></author>
 	<tab><![CDATA[payment_security]]></tab>
@@ -3,7 +3,7 @@
 global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops Käuferschutz (empfohlen)';
-$_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Käuferschutz ab';
+$_MODULE['<{trustedshops}prestashop>display_products_1107bf75ac50728edbeb497ab803a104'] = 'Käuferschutz bis';
 $_MODULE['<{trustedshops}prestashop>display_products_69db1ddc2a15253abb0a11beb1eae734'] = 'inkl. MwSt.';
 $_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'Die im Käuferschutz enthaltene Trusted Shops Garantie sichert Ihren Online-Kauf ab. Mit der Übermittlung und';
 $_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'Speicherung';
@@ -78,7 +78,7 @@ var TS = (function()
 	</div>
 	<div id="ts-list-items">
 		{foreach from=$buyer_protection_items item=product}
-			<p><input id="ts-product-{$product.id_product}" type="checkbox" value="{$product.id_product}" name="item_product"> {l s='Buyer protection from' mod='trustedshops'} {$product.protected_amount_decimal} {$currency_iso_code} ({$price|round:2} {$currency_iso_code} {l s='incl. VAT' mod='trustedshops'})</p>
+			<p><input id="ts-product-{$product.id_product}" type="checkbox" value="{$product.id_product}" name="item_product"> {l s='Buyer protection up to' mod='trustedshops'} {$product.protected_amount_decimal} {$currency_iso_code} ({$price|round:2} {$currency_iso_code} {l s='incl. VAT' mod='trustedshops'})</p>
 		{/foreach}
 		<div id="content_checkout" style="margin-left:100px">
 		<p>{l s='The Trusted Shops Buyer Protection secures your online purchase. I agree to my email address being transferred and' mod='trustedshops'} <b><a href="http://www.trustedshops.com/shop/data_privacy.php?shop_id={$shop_id}" target="_blank">{l s='saved' mod='trustedshops'}</a></b> {l s='for the purposes of Buyer Protection processing by Trusted Shops.' mod='trustedshops'} <b><a href="http://www.trustedshops.com/shop/protection_conditions.php?shop_id={$shop_id}" target="_blank">{l s='Conditions' mod='trustedshops'}</a></b> {l s='for Buyer Protection.' mod='trustedshops'}</p></div>
@@ -3,7 +3,7 @@
 global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops protection acheteur (recommandée)';
-$_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Protection acheteur jusqu\'à';
+$_MODULE['<{trustedshops}prestashop>display_products_1107bf75ac50728edbeb497ab803a104'] = 'Protection acheteur jusqu\'à';
 $_MODULE['<{trustedshops}prestashop>display_products_69db1ddc2a15253abb0a11beb1eae734'] = 'TVA incluse';
 $_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'La protection acheteur Trusted Shops sécurise votre achat en ligne. J’accepte le transfert et la';
 $_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'sauvegarde';
@@ -1207,6 +1207,17 @@ class TSBuyerProtection extends AbsTrustedShops
 			TSBuyerProtection::$smarty->assign('onlineshop_name', ConfigurationCore::get('PS_SHOP_NAME'));
 			$url = str_replace(array('#shop_id#', '#shop_name#'), array(TSBuyerProtection::$CERTIFICATE[$lang]['tsID'], urlencode(str_replace('_', '-', ConfigurationCore::get('PS_SHOP_NAME')))), TSBuyerProtection::$certificate_link[$lang]);
 			TSBuyerProtection::$smarty->assign('trusted_shops_url', $url);
+
+			$displayWidget = false;
+			foreach (TSBuyerProtection::$CERTIFICATE as $lang => $certificate)
+			{
+				$certificate = (array)$certificate;
+				if (isset($certificate['tsID']) && $certificate['tsID'] !== '' && $certificate['user'] != '')
+					$displayWidget = true;
+			}
+			if ($displayWidget == false)
+				return '';
+
 			return $this->display(TSBuyerProtection::$module_name, 'seal_of_approval.tpl');
 		}
 	}
@@ -1233,6 +1244,8 @@ class TSBuyerProtection extends AbsTrustedShops
 		// If login parameters missing for the certificate an error occurred
 		if ((TSBuyerProtection::$CERTIFICATE[$lang]['user'] == '' OR TSBuyerProtection::$CERTIFICATE[$lang]['password'] == '') AND TSBuyerProtection::$CERTIFICATE[$lang]['typeEnum'] == 'EXCELLENCE')
 		{
+			return '';
+			// Display here has been deprecated by Trusted Shop
 			return '
 			<p style="color:red;text-align:center;font-size:14px;font-weight:bold;">'
 			.$this->l('The Trusted Shop Buyer Protection needs a login to succeed. Please contact the shop administrator.')
@@ -1347,8 +1360,8 @@ class TSBuyerProtection extends AbsTrustedShops
 		$return = '';
 		if (!empty($this->errors))
 			$return = '<p style="color:red">'.implode('<br />', $this->errors).'</p>';
-		else
-			$return = '<p>'.$this->l('You will receive an e-mail by Trusted Shops about your guarantee number.').'</p>';
+		//else
+		//	$return = '<p>'.$this->l('You will receive an e-mail by Trusted Shops about your guarantee number.').'</p>';
 		return $return;
 	}

@@ -360,11 +360,11 @@ class TrustedShopsRating extends AbsTrustedShops
 	{
 		$link = '';
 		if (strtolower(Context::getContext()->language->iso_code) == 'de')
-			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="https://www.trustedshops.de/shopbetreiber/kundenbewertung_anmeldung.html?partnerPackage=PrestaShop&ratingProduct=RATING_PRO&et_cid=14en&et_lid=29069" target="_blank">Jetzt bei Trusted Shops anmelden!</a></b></p><br />';
+			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="https://www.trustedshops.de/shopbetreiber/kundenbewertung_anmeldung.html?shopsw=PRESTA&partnerPackage=PrestaShop&ratingProduct=RATING_PRO&et_cid=14en&et_lid=29069" target="_blank">Jetzt bei Trusted Shops anmelden!</a></b></p><br />';
 		if (strtolower(Context::getContext()->language->iso_code) == 'en')
-			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.com/merchants/membership.html?shopsw=PRESTA&et_cid=53&et_lid=3361" target="_blank">Apply now!</a></b></p><br />';
+			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.com/merchants/membership.html?shopsw=PRESTA&partnerPackage=PrestaShop&et_cid=53&et_lid=3361" target="_blank">Apply now!</a></b></p><br />';
 		if (strtolower(Context::getContext()->language->iso_code) == 'fr')
-			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.fr/marchands/tarifs.html?shopsw=PRESTA&et_cid=53&et_lid=3362" target="_blank">Enregistrement Trusted Shops</a></b></p><br />';
+			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.fr/marchands/tarifs.html?shopsw=PRESTA&partnerPackage=PrestaShop&et_cid=53&et_lid=3362" target="_blank">Enregistrement Trusted Shops</a></b></p><br />';

 		return '<fieldset>
 					<legend><img src="'.__PS_BASE_URI__.'modules/'.self::$module_name.'/logo.gif" alt="" />'.$this->l('Learn More').'</legend>
@@ -444,6 +444,16 @@ class TrustedShopsRating extends AbsTrustedShops
 		if (Configuration::get('TS_TAB0_DISPLAY_RATING_FRONT_END'))
 			self::$smarty->assign(array('rating_url' => $this->getRatingUrl(), 'language' => Language::getIsoById((int)($params['cookie']->id_lang))));
 		
+		$displayWidget = false;
+		foreach (TSBuyerProtection::$CERTIFICATE as $lang => $certificate)
+		{
+			$certificate = (array)$certificate;
+			if (isset($certificate['tsID']) && $certificate['tsID'] !== '' && $certificate['user'] != '')
+				$displayWidget = true;
+		}
+		if ($displayWidget == false)
+			return '';
+		
 		return $this->display(self::$module_name, 'widget.tpl');
 	}
 	
@@ -48,7 +48,7 @@ class TrustedShops extends Module
 	{
 		$this->name = 'trustedshops';
 		$this->tab = 'payment_security';
-		$this->version = 1.3;
+		$this->version = '1.3.1';

 		parent::__construct();

@@ -2,7 +2,6 @@

 global $_MODULE;
 $_MODULE = array();
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_5947e2ae63c0a33524cf81c44a1db580'] = 'USPS Carrier';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_098087ab799def1028233142cafeeafd'] = 'Bieten Sie Ihren Kunden unterschiedliche Liefermethoden mit USPS';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_883fa0069f4b0454e2277dd567ab3991'] = '\'Gewichtseinheit (la oder kg).\'';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_5a3ceec65d417f5d92c26dbf0dccc00d'] = '\'Maßeinheit (cm oder in).\'';
@@ -26,6 +25,7 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_f8320b26d30ab433c5a54546d21f414c'
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f827cf462f62848df37c5e1e94a4da74'] = 'Richtig';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_386aad80d82f8245e9ef80352a2240e8'] = 'Alle Einheiten im Paket';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f35eb2a913a3fd6fd8e661012cf0ebd8'] = 'In eine Einheit pro Paket aufteilen';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_5947e2ae63c0a33524cf81c44a1db580'] = 'USPS Carrier';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f57cff5425b6e64843c5f066c5b310d0'] = 'Usps Modulstatus';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_09bdd414ce843927aa3dceadc8bce034'] = 'USPS Carrier ist richtig konfiguriert und online!';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_ec8b84c83dfee20afa4c2f35245a254b'] = 'USPS Carrier ist noch nicht konfiguriert, Sie müssen:';
@@ -0,0 +1,31 @@
+{*
+* 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$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+{if $category->id == 1 OR $nb_products == 0}{l s='There are no products.'}
+{else}
+	{if $nb_products == 1}{l s='There is'}{else}{l s='There are'}{/if}&#160;
+	{$nb_products}&#160;
+	{if $nb_products == 1}{l s='product.'}{else}{l s='products.'}{/if}
+{/if}
@@ -29,16 +29,14 @@

 {if isset($category)}
 	{if $category->id AND $category->active}
-		<h1>{strip}
+
+		<h1>
+			{strip}
 			{$category->name|escape:'htmlall':'UTF-8'}
-			<span>
-				{if $category->id == 1 OR $nb_products == 0}{l s='There are no products.'}
-				{else}
-					{if $nb_products == 1}{l s='There is'}{else}{l s='There are'}{/if}&#160;
-					{$nb_products}&#160;
-					{if $nb_products == 1}{l s='product.'}{else}{l s='products.'}{/if}
-				{/if}
-			</span>{/strip}
+				<span class="category-product-count">
+					{include file="$tpl_dir./category-count.tpl"}
+				</span>
+			{/strip}
 		</h1>

 		{if $scenes}
@@ -149,7 +149,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 			<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large')}"
 				{if $jqZoomEnabled}class="jqzoom" alt="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'thickbox')}"{else} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" {/if} id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}" />
 		{else}
-			<img src="{$img_prod_dir}{$lang_iso}-default-large.jpg" id="bigpic" alt="" title="{$product->name|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
+			<img src="{$img_prod_dir}{$lang_iso}-default-large.jpg" id="bigpic" alt="" title="{$cover.legend|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
 		{/if}
 		</div>